[Pinfo-devel] r257 - pinfo/branches/cxx/src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-09-26 06:58:05 +0000 (Mon, 26 Sep 2005)
New Revision: 257

Modified:
   pinfo/branches/cxx/src/common_includes.h
   pinfo/branches/cxx/src/filehandling_functions.cxx
   pinfo/branches/cxx/src/filehandling_functions.h
   pinfo/branches/cxx/src/mainfunction.cxx
   pinfo/branches/cxx/src/manual.cxx
   pinfo/branches/cxx/src/parse_config.cxx
   pinfo/branches/cxx/src/pinfo.cxx
   pinfo/branches/cxx/src/printinfo.cxx
   pinfo/branches/cxx/src/regexp_search.cxx
   pinfo/branches/cxx/src/signal_handler.cxx
   pinfo/branches/cxx/src/video.cxx
Log:
Remove the last of the common_includes includes of our header files.
Remove includes of ctype.h (although that doesn't work so well).


Modified: pinfo/branches/cxx/src/common_includes.h
===================================================================
--- pinfo/branches/cxx/src/common_includes.h	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/common_includes.h	2005-09-26 06:58:05 UTC (rev 257)
@@ -56,10 +56,6 @@
 #include <grp.h>
 #include <ctype.h>
 
-#include "datatypes.h"
-#include "filehandling_functions.h"
-#include "mainfunction.h"
-
 /* I hear voices, that it is needed by RH5.2 ;) */
 #define _REGEX_RE_COMP
 

Modified: pinfo/branches/cxx/src/filehandling_functions.cxx
===================================================================
--- pinfo/branches/cxx/src/filehandling_functions.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/filehandling_functions.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -30,6 +30,7 @@
 
 #include "colors.h"
 #include "curse_utils.h"
+#include "filehandling_functions.h"
 #include "tmpfiles.h"
 #include "utils.h"
 

Modified: pinfo/branches/cxx/src/filehandling_functions.h
===================================================================
--- pinfo/branches/cxx/src/filehandling_functions.h	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/filehandling_functions.h	2005-09-26 06:58:05 UTC (rev 257)
@@ -23,14 +23,11 @@
 #ifndef __FILEHANDLING_FUNCTIONS_H
 #define __FILEHANDLING_FUNCTIONS_H
 
+#include <string>
+
 #include <dirent.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
 
-#include <string>
-
 #define INFO_TAG (char)0x1f
 #define INDIRECT_TAG (char)0x7f
 

Modified: pinfo/branches/cxx/src/mainfunction.cxx
===================================================================
--- pinfo/branches/cxx/src/mainfunction.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/mainfunction.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -27,13 +27,14 @@
 using std::vector;
 #include <exception> // For 'throw'
 #include <stdexcept> // For std::invalid_argument
+#include <cctype> // For isdigit
 
-#include <ctype.h>
-
 #include "colors.h"
 #include "curse_utils.h"
+#include "filehandling_functions.h"
 #include "initializelinks.h"
 #include "keyboard.h"
+#include "mainfunction.h"
 #include "printinfo.h"
 #include "regexp_search.h"
 #include "utils.h"

Modified: pinfo/branches/cxx/src/manual.cxx
===================================================================
--- pinfo/branches/cxx/src/manual.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/manual.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -26,8 +26,8 @@
 #include <vector>
 using std::vector;
 #include <algorithm> // for std::sort and std::find
+#include <cctype>
 
-#include <ctype.h>
 #include <sys/stat.h>
 
 #include "colors.h"

Modified: pinfo/branches/cxx/src/parse_config.cxx
===================================================================
--- pinfo/branches/cxx/src/parse_config.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/parse_config.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -25,9 +25,8 @@
 using std::string;
 #include <vector>
 using std::vector;
+#include <cctype>
 
-#include <ctype.h>
-
 #include "colors.h"
 #include "datatypes.h"
 #include "keyboard.h"

Modified: pinfo/branches/cxx/src/pinfo.cxx
===================================================================
--- pinfo/branches/cxx/src/pinfo.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/pinfo.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -31,8 +31,13 @@
  #include <getopt.h>
 #endif
 
+#include <pwd.h>
+#include <grp.h>
+
 #include "colors.h"
 #include "curse_utils.h"
+#include "filehandling_functions.h"
+#include "mainfunction.h"
 #include "manual.h"
 #include "parse_config.h"
 #include "regexp_search.h"

Modified: pinfo/branches/cxx/src/printinfo.cxx
===================================================================
--- pinfo/branches/cxx/src/printinfo.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/printinfo.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -26,6 +26,8 @@
 #include <vector>
 using std::vector;
 
+#include "datatypes.h"
+
 /*
  * Algorithm: We first print highlights, then we send `\r' to the printer,
  * and we draw the base line. Thus highlights are printed `twice', and

Modified: pinfo/branches/cxx/src/regexp_search.cxx
===================================================================
--- pinfo/branches/cxx/src/regexp_search.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/regexp_search.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -25,9 +25,9 @@
 using std::vector;
 
 #ifndef ___DONT_USE_REGEXP_SEARCH___
+#include <cctype>
 
 #include <regex.h>
-#include <ctype.h>
 
 vector<regex_t> h_regexp;	/* configured regexps to highlight */
 regex_t current_regex; /* Selected interactively */

Modified: pinfo/branches/cxx/src/signal_handler.cxx
===================================================================
--- pinfo/branches/cxx/src/signal_handler.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/signal_handler.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -20,14 +20,14 @@
  ***************************************************************************/
 #include "common_includes.h"
 
+#include <signal.h>
+
 #ifndef HAVE_SIGBLOCK
 #include "sigblock.h"
 #endif
 
-#include <termios.h>
-#include <sys/ioctl.h>
-
 #include "curse_utils.h"
+#include "datatypes.h"
 #include "keyboard.h"
 
 void

Modified: pinfo/branches/cxx/src/video.cxx
===================================================================
--- pinfo/branches/cxx/src/video.cxx	2005-09-26 06:18:38 UTC (rev 256)
+++ pinfo/branches/cxx/src/video.cxx	2005-09-26 06:58:05 UTC (rev 257)
@@ -29,6 +29,7 @@
 
 #include "colors.h"
 #include "curse_utils.h"
+#include "datatypes.h"
 #include "initializelinks.h" // for bletchulous calculate_len
 #include "regexp_search.h"