Make it clearer where include files are comming from.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9197 a592a061-630c-0410-9148-cb99ea01b6c8

src/support/ChangeLog

@@ -1,3 +1,7 @@
+2004-11-07  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* Make it clearer where include files are comming from. 
+
 2004-11-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* translator.h: use bind, equal_to instead of equal_1st_in_pair

src/support/FileInfo.C

@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "FileInfo.h"
+#include "support/FileInfo.h"
 
 #include <boost/assert.hpp>
 

src/support/FileMonitor.C

@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "FileMonitor.h"
-
-#include "frontends/Timeout.h"
-
+#include "support/FileMonitor.h"
 #include "support/FileInfo.h"
 #include "support/lyxlib.h"
 
+// FIXME Interface violation
+#include "frontends/Timeout.h"
+
 #include <boost/bind.hpp>
 #include <boost/signals/trackable.hpp>
 

src/support/abort.C

@@ -10,9 +10,10 @@
 
 #include <config.h>
 
+#include "support/lyxlib.h"
+
 #include <stdlib.h>
 
-#include "support/lyxlib.h"
 
 void lyx::support::abort()
 {

src/support/atoi.C

@@ -11,9 +11,9 @@
 
 #include <config.h>
 
-#include <cstdlib>
+#include "support/lyxlib.h"
 
-#include "lyxlib.h"
+#include <cstdlib>
 
 #ifndef CXX_GLOBAL_CSTD
 using std::atoi;

src/support/chdir.C

@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include <unistd.h>
-
 #include "support/lyxlib.h"
 
+#include <unistd.h>
+
 int lyx::support::chdir(std::string const & name)
 {
 #ifndef __EMX__

src/support/filename.C

@@ -10,11 +10,10 @@
 
 #include <config.h>
 
-#include "filename.h"
-
-#include "filetools.h"
-#include "lstrings.h"
-#include "os.h"
+#include "support/filename.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/os.h"
 
 #include <boost/assert.hpp>
 

src/support/filetools.C

@@ -21,20 +21,21 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "support/tostr.h"
 #include "support/systemcall.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/FileInfo.h"
+#include "support/forkedcontr.h"
+#include "support/path.h"
+#include "support/path_defines.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
 
-#include "filetools.h"
-//#include "format.h"
-#include "lstrings.h"
-#include "FileInfo.h"
-#include "forkedcontr.h"
-#include "path.h"
-#include "path_defines.h"
+// FIXME Interface violation
 #include "gettext.h"
-#include "lyxlib.h"
-#include "os.h"
+#include "debug.h"
+//#include "format.h"
 
 #include <boost/assert.hpp>
 #include <boost/regex.hpp>

src/support/forkedcall.C

@@ -24,13 +24,15 @@
 
 #include <config.h>
 
-#include "forkedcall.h"
-#include "forkedcontr.h"
-#include "lstrings.h"
-#include "lyxlib.h"
-#include "filetools.h"
-#include "os.h"
+#include "support/forkedcall.h"
+#include "support/forkedcontr.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "support/filetools.h"
+#include "support/os.h"
+
 #include "debug.h"
+
 #include "frontends/Timeout.h"
 
 #include <boost/bind.hpp>

src/support/forkedcallqueue.C

@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "forkedcallqueue.h"
+#include "support/forkedcallqueue.h"
 
 #include "debug.h"
 

src/support/forkedcallqueue.h

@@ -18,7 +18,7 @@
 #ifndef FORKEDCALLQUEUE_H
 #define FORKEDCALLQUEUE_H
 
-#include "forkedcall.h"
+#include "support/forkedcall.h"
 
 #include <queue>
 #include <utility>

src/support/forkedcontr.C

@@ -14,8 +14,8 @@
 
 #include <config.h>
 
-#include "forkedcontr.h"
-#include "forkedcall.h"
+#include "support/forkedcontr.h"
+#include "support/forkedcall.h"
 
 #include "debug.h"
 

src/support/forkedcontr.h

@@ -17,6 +17,7 @@
 #define FORKEDCONTR_H
 
 #include <boost/shared_ptr.hpp>
+
 #include <csignal>
 //#include <sys/types.h> // needed for pid_t
 #include <list>

src/support/getcwd.C

@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include <cerrno>
-#include <unistd.h>
-
 #include "support/lyxlib.h"
 
 #include <boost/scoped_array.hpp>
 
+#include <cerrno>
+#include <unistd.h>
+
 using boost::scoped_array;
 
 using std::string;

src/support/globbing.C

@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "globbing.h"
+#include "support/globbing.h"
+#include "support/lstrings.h"
+#include "support/path.h"
 
+// FIXME Interface violation
 #include "gettext.h"
 
-#include "lstrings.h"
-#include "path.h"
-
 #include <boost/regex.hpp>
 #include <boost/tokenizer.hpp>
 

src/support/kill.C

@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "lyxlib.h"
+#include "support/lyxlib.h"
 
 #include <sys/types.h>
 #include <csignal>

src/support/lstrings.C

@@ -11,20 +11,20 @@
 
 #include <config.h>
 
-#include "lstrings.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "support/tostr.h"
+
 #include "debug.h"
-#include "lyxlib.h"
-#include "tostr.h"
 
 #include <boost/tokenizer.hpp>
 #include <boost/assert.hpp>
 #include <boost/format.hpp>
 
-#include <algorithm>
-
 #include <cctype>
 #include <cstdlib>
 
+#include <algorithm>
 #include <sstream>
 
 using std::transform;

src/support/lyxsum.C

@@ -11,13 +11,14 @@
 #include <config.h>
 
 #include "support/lyxlib.h"
+
 #include "debug.h"
 
-#include <algorithm>
 #include <boost/crc.hpp>
 
-using std::endl;
+#include <algorithm>
 
+using std::endl;
 using std::string;
 
 

src/support/lyxtime.C

@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "lyxtime.h"
+#include "support/lyxtime.h"
 
 namespace lyx {
 

src/support/mkdir.C

@@ -10,13 +10,13 @@
 
 #include <config.h>
 
+#include "support/lyxlib.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "lyxlib.h"
-
 int lyx::support::mkdir(std::string const & pathname, unsigned long int mode)
 {
 	// FIXME: why don't we have mode_t in lyx::mkdir prototype ??

src/support/os_os2.C

@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "os.h"
+#include "support/os.h"
 #include "support/filetools.h"
 #define INCL_DOSFILEMGR
 #define INCL_DOSMODULEMGR

src/support/os_unix.C

@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "os.h"
+#include "support/os.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 

src/support/os_win32.C

@@ -12,9 +12,10 @@
 
 #include <config.h>
 
-#include "os.h"
+#include "support/os.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+
 #include "debug.h"
 
 #include <windows.h>

src/support/path.C

@@ -13,8 +13,8 @@
 // Needed to prevent the definition of the unnamed_Path macro in the header file.
 #define PATH_C
 
-#include "path.h"
-#include "lyxlib.h"
+#include "support/path.h"
+#include "support/lyxlib.h"
 
 
 using std::string;

src/support/putenv.C

@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "lyxlib.h"
+#include "support/lyxlib.h"
 
 #include <cstdlib>
 #include <string>

src/support/rename.C

@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include <cstdio>
-
 #include "support/lyxlib.h"
 
+#include <cstdio>
+
 
 using std::string;
 

src/support/rmdir.C

@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include <unistd.h>
+#include "support/lyxlib.h"
 
-#include "lyxlib.h"
+#include <unistd.h>
 
 int lyx::support::rmdir(std::string const & dir)
 {

src/support/socktools.C

@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "socktools.h"
+#include "support/socktools.h"
+#include "support/lyxlib.h"
+
 #include "debug.h"
-#include "lyxlib.h"
 
 #include <sys/socket.h>
 #include <sys/un.h>

src/support/systemcall.C

@@ -13,8 +13,8 @@
 
 #include <config.h>
 
-#include "systemcall.h"
-#include "os.h"
+#include "support/systemcall.h"
+#include "support/os.h"
 
 #include <cstdlib>
 

src/support/tempname.C

@@ -10,17 +10,18 @@
 
 #include <config.h>
 
-#include <cstdlib>
-#include <unistd.h>
-
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/tostr.h"
+#include "support/os.h"
+
 #include "debug.h"
-#include "os.h"
 
 #include <boost/scoped_array.hpp>
 
+#include <cstdlib>
+#include <unistd.h>
+
 using boost::scoped_array;
 
 using std::string;

src/support/unlink.C

@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include <unistd.h>
+#include "support/lyxlib.h"
 
-#include "lyxlib.h"
+#include <unistd.h>
 
 int lyx::support::unlink(std::string const & pathname)
 {

src/support/userinfo.C

@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "userinfo.h"
-#include "filetools.h"
+#include "support/userinfo.h"
+#include "support/filetools.h"
 
 #include <boost/assert.hpp>