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

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-09-26 01:46:14 +0000 (Mon, 26 Sep 2005)
New Revision: 236

Modified:
   pinfo/branches/cxx/src/colors.cxx
   pinfo/branches/cxx/src/common_includes.h
   pinfo/branches/cxx/src/filehandling_functions.cxx
   pinfo/branches/cxx/src/mainfunction.cxx
   pinfo/branches/cxx/src/manual.cxx
   pinfo/branches/cxx/src/pinfo.cxx
   pinfo/branches/cxx/src/utils.cxx
   pinfo/branches/cxx/src/video.cxx
Log:
More include file cleanup.


Modified: pinfo/branches/cxx/src/colors.cxx
===================================================================
--- pinfo/branches/cxx/src/colors.cxx	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/colors.cxx	2005-09-26 01:46:14 UTC (rev 236)
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "common_includes.h"
+#include "colors.h"
 
 #ifndef NO_COLOR_CURSES
 struct colours cols =

Modified: pinfo/branches/cxx/src/common_includes.h
===================================================================
--- pinfo/branches/cxx/src/common_includes.h	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/common_includes.h	2005-09-26 01:46:14 UTC (rev 236)
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 1999  Przemek Borys <pborys at dione.ids.pl>
  *  Copyright (C) 2005  Bas Zoetekouw <bas at debian.org>
+ *  Copyright 2005  Nathanael Nerode <neroden at gcc.gnu.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of version 2 of the GNU General Public License as
@@ -47,10 +48,8 @@
 
 #include "datatypes.h"
 #include "filehandling_functions.h"
-#include "video.h"
 #include "mainfunction.h"
 #include "utils.h"
-#include "colors.h"
 #include "parse_config.h"
 #include "keyboard.h"
 #include "initializelinks.h"

Modified: pinfo/branches/cxx/src/filehandling_functions.cxx
===================================================================
--- pinfo/branches/cxx/src/filehandling_functions.cxx	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/filehandling_functions.cxx	2005-09-26 01:46:14 UTC (rev 236)
@@ -21,13 +21,16 @@
  ***************************************************************************/
 
 #include "common_includes.h"
-#include "utils.h"
-#include "tmpfiles.h"
+
 #include <string>
 using std::string;
 #include <vector>
 using std::vector;
 
+#include "colors.h"
+#include "tmpfiles.h"
+#include "utils.h"
+
 vector<string> infopaths;
 
 /******************************************************************************

Modified: pinfo/branches/cxx/src/mainfunction.cxx
===================================================================
--- pinfo/branches/cxx/src/mainfunction.cxx	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/mainfunction.cxx	2005-09-26 01:46:14 UTC (rev 236)
@@ -30,8 +30,10 @@
 
 #include <ctype.h>
 
+#include "colors.h"
 #include "printinfo.h"
 #include "regexp_search.h"
+#include "video.h"
 
 #ifndef MIN
 #define        MIN(a,b)(((a)<(b))?(a):(b))

Modified: pinfo/branches/cxx/src/manual.cxx
===================================================================
--- pinfo/branches/cxx/src/manual.cxx	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/manual.cxx	2005-09-26 01:46:14 UTC (rev 236)
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
+#include "colors.h"
 #include "regexp_search.h"
 #include "tmpfiles.h"
 #include "manual.h"

Modified: pinfo/branches/cxx/src/pinfo.cxx
===================================================================
--- pinfo/branches/cxx/src/pinfo.cxx	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/pinfo.cxx	2005-09-26 01:46:14 UTC (rev 236)
@@ -31,11 +31,12 @@
  #include <getopt.h>
 #endif
 
+#include "colors.h"
+#include "manual.h"
+#include "regexp_search.h"
 #include "signal_handler.h"
+#include "tmpfiles.h"
 #include "utils.h"
-#include "tmpfiles.h"
-#include "regexp_search.h"
-#include "manual.h"
 
 const char * const version = VERSION;
 int DontHandleWithoutTagTable = 0;

Modified: pinfo/branches/cxx/src/utils.cxx
===================================================================
--- pinfo/branches/cxx/src/utils.cxx	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/utils.cxx	2005-09-26 01:46:14 UTC (rev 236)
@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 #include "common_includes.h"
-#include "tmpfiles.h"
+
 #include <string>
 using std::string;
 #include <vector>
@@ -29,6 +29,9 @@
 
 #include <ctype.h>
 
+#include "colors.h"
+#include "tmpfiles.h"
+
 string safe_user = "nobody";
 string safe_group = "nogroup";
 

Modified: pinfo/branches/cxx/src/video.cxx
===================================================================
--- pinfo/branches/cxx/src/video.cxx	2005-09-26 01:40:08 UTC (rev 235)
+++ pinfo/branches/cxx/src/video.cxx	2005-09-26 01:46:14 UTC (rev 236)
@@ -20,12 +20,14 @@
  *  USA
  ***************************************************************************/
 
+#include "common_includes.h"
+
 #include <string>
 using std::string;
 #include <vector>
 using std::vector;
 
-#include "common_includes.h"
+#include "colors.h"
 #include "regexp_search.h"
 
 void info_add_highlights(int pos, int cursor, int column, const vector <string> message);