From b049f3997abd18c6961f4a2d52e6766077cde91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 7 Nov 2004 13:22:51 +0000 Subject: [PATCH] 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 | 4 ++++ src/support/FileInfo.C | 2 +- src/support/FileMonitor.C | 8 ++++---- src/support/abort.C | 3 ++- src/support/atoi.C | 4 ++-- src/support/chdir.C | 4 ++-- src/support/filename.C | 9 ++++----- src/support/filetools.C | 21 +++++++++++---------- src/support/forkedcall.C | 14 ++++++++------ src/support/forkedcallqueue.C | 2 +- src/support/forkedcallqueue.h | 2 +- src/support/forkedcontr.C | 4 ++-- src/support/forkedcontr.h | 1 + src/support/getcwd.C | 6 +++--- src/support/globbing.C | 8 ++++---- src/support/kill.C | 2 +- src/support/lstrings.C | 10 +++++----- src/support/lyxsum.C | 5 +++-- src/support/lyxtime.C | 2 +- src/support/mkdir.C | 4 ++-- src/support/os_os2.C | 2 +- src/support/os_unix.C | 2 +- src/support/os_win32.C | 3 ++- src/support/path.C | 4 ++-- src/support/putenv.C | 2 +- src/support/rename.C | 4 ++-- src/support/rmdir.C | 4 ++-- src/support/socktools.C | 5 +++-- src/support/systemcall.C | 4 ++-- src/support/tempname.C | 9 +++++---- src/support/unlink.C | 4 ++-- src/support/userinfo.C | 4 ++-- 32 files changed, 87 insertions(+), 75 deletions(-) diff --git a/src/support/ChangeLog b/src/support/ChangeLog index d61036b6fd..18eddf71bc 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,7 @@ +2004-11-07 Lars Gullik Bjonnes + + * Make it clearer where include files are comming from. + 2004-11-06 Lars Gullik Bjonnes * translator.h: use bind, equal_to instead of equal_1st_in_pair diff --git a/src/support/FileInfo.C b/src/support/FileInfo.C index 204e85541e..ba0d2ab512 100644 --- a/src/support/FileInfo.C +++ b/src/support/FileInfo.C @@ -10,7 +10,7 @@ #include -#include "FileInfo.h" +#include "support/FileInfo.h" #include diff --git a/src/support/FileMonitor.C b/src/support/FileMonitor.C index 4a7fa07bf3..aa7cc4b319 100644 --- a/src/support/FileMonitor.C +++ b/src/support/FileMonitor.C @@ -10,13 +10,13 @@ #include -#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 #include diff --git a/src/support/abort.C b/src/support/abort.C index 754d1c393e..97eda87747 100644 --- a/src/support/abort.C +++ b/src/support/abort.C @@ -10,9 +10,10 @@ #include +#include "support/lyxlib.h" + #include -#include "support/lyxlib.h" void lyx::support::abort() { diff --git a/src/support/atoi.C b/src/support/atoi.C index db6f2c0410..674c2edef3 100644 --- a/src/support/atoi.C +++ b/src/support/atoi.C @@ -11,9 +11,9 @@ #include -#include +#include "support/lyxlib.h" -#include "lyxlib.h" +#include #ifndef CXX_GLOBAL_CSTD using std::atoi; diff --git a/src/support/chdir.C b/src/support/chdir.C index abc79d1605..a3065fb26a 100644 --- a/src/support/chdir.C +++ b/src/support/chdir.C @@ -10,10 +10,10 @@ #include -#include - #include "support/lyxlib.h" +#include + int lyx::support::chdir(std::string const & name) { #ifndef __EMX__ diff --git a/src/support/filename.C b/src/support/filename.C index a36af32567..32f1715dd4 100644 --- a/src/support/filename.C +++ b/src/support/filename.C @@ -10,11 +10,10 @@ #include -#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 diff --git a/src/support/filetools.C b/src/support/filetools.C index 00f38fc3b0..c3cc31cd60 100644 --- a/src/support/filetools.C +++ b/src/support/filetools.C @@ -21,20 +21,21 @@ #include -#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 #include diff --git a/src/support/forkedcall.C b/src/support/forkedcall.C index 7fa823cf4c..10431ffb7e 100644 --- a/src/support/forkedcall.C +++ b/src/support/forkedcall.C @@ -24,13 +24,15 @@ #include -#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 diff --git a/src/support/forkedcallqueue.C b/src/support/forkedcallqueue.C index 20997271d4..38b35ba8be 100644 --- a/src/support/forkedcallqueue.C +++ b/src/support/forkedcallqueue.C @@ -10,7 +10,7 @@ #include -#include "forkedcallqueue.h" +#include "support/forkedcallqueue.h" #include "debug.h" diff --git a/src/support/forkedcallqueue.h b/src/support/forkedcallqueue.h index 5d33034dc6..20b939791b 100644 --- a/src/support/forkedcallqueue.h +++ b/src/support/forkedcallqueue.h @@ -18,7 +18,7 @@ #ifndef FORKEDCALLQUEUE_H #define FORKEDCALLQUEUE_H -#include "forkedcall.h" +#include "support/forkedcall.h" #include #include diff --git a/src/support/forkedcontr.C b/src/support/forkedcontr.C index 07546eeee8..24b5e53815 100644 --- a/src/support/forkedcontr.C +++ b/src/support/forkedcontr.C @@ -14,8 +14,8 @@ #include -#include "forkedcontr.h" -#include "forkedcall.h" +#include "support/forkedcontr.h" +#include "support/forkedcall.h" #include "debug.h" diff --git a/src/support/forkedcontr.h b/src/support/forkedcontr.h index b5dbe72340..9e88d68289 100644 --- a/src/support/forkedcontr.h +++ b/src/support/forkedcontr.h @@ -17,6 +17,7 @@ #define FORKEDCONTR_H #include + #include //#include // needed for pid_t #include diff --git a/src/support/getcwd.C b/src/support/getcwd.C index 95f7c5ddd9..2514c15af1 100644 --- a/src/support/getcwd.C +++ b/src/support/getcwd.C @@ -10,13 +10,13 @@ #include -#include -#include - #include "support/lyxlib.h" #include +#include +#include + using boost::scoped_array; using std::string; diff --git a/src/support/globbing.C b/src/support/globbing.C index eb25cc50b4..190b38e5e4 100644 --- a/src/support/globbing.C +++ b/src/support/globbing.C @@ -10,13 +10,13 @@ #include -#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 #include diff --git a/src/support/kill.C b/src/support/kill.C index 830978a2c0..019c97949d 100644 --- a/src/support/kill.C +++ b/src/support/kill.C @@ -10,7 +10,7 @@ #include -#include "lyxlib.h" +#include "support/lyxlib.h" #include #include diff --git a/src/support/lstrings.C b/src/support/lstrings.C index 9910d54007..dae295717c 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -11,20 +11,20 @@ #include -#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 #include #include -#include - #include #include +#include #include using std::transform; diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C index c5c88a5c5a..3ce7994eba 100644 --- a/src/support/lyxsum.C +++ b/src/support/lyxsum.C @@ -11,13 +11,14 @@ #include #include "support/lyxlib.h" + #include "debug.h" -#include #include -using std::endl; +#include +using std::endl; using std::string; diff --git a/src/support/lyxtime.C b/src/support/lyxtime.C index 6bcc4ff87f..cbe6223bbb 100644 --- a/src/support/lyxtime.C +++ b/src/support/lyxtime.C @@ -10,7 +10,7 @@ #include -#include "lyxtime.h" +#include "support/lyxtime.h" namespace lyx { diff --git a/src/support/mkdir.C b/src/support/mkdir.C index 546bbf8e65..21e4b0679c 100644 --- a/src/support/mkdir.C +++ b/src/support/mkdir.C @@ -10,13 +10,13 @@ #include +#include "support/lyxlib.h" + #include #include #include #include -#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 ?? diff --git a/src/support/os_os2.C b/src/support/os_os2.C index bf73d8e505..4fa61287ab 100644 --- a/src/support/os_os2.C +++ b/src/support/os_os2.C @@ -12,7 +12,7 @@ #include -#include "os.h" +#include "support/os.h" #include "support/filetools.h" #define INCL_DOSFILEMGR #define INCL_DOSMODULEMGR diff --git a/src/support/os_unix.C b/src/support/os_unix.C index a408622f39..8c556da253 100644 --- a/src/support/os_unix.C +++ b/src/support/os_unix.C @@ -12,7 +12,7 @@ #include -#include "os.h" +#include "support/os.h" #include "support/filetools.h" #include "support/lstrings.h" diff --git a/src/support/os_win32.C b/src/support/os_win32.C index 37dc599947..f8500a3ea5 100644 --- a/src/support/os_win32.C +++ b/src/support/os_win32.C @@ -12,9 +12,10 @@ #include -#include "os.h" +#include "support/os.h" #include "support/filetools.h" #include "support/lstrings.h" + #include "debug.h" #include diff --git a/src/support/path.C b/src/support/path.C index b3e46221d6..59593145ed 100644 --- a/src/support/path.C +++ b/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; diff --git a/src/support/putenv.C b/src/support/putenv.C index 83e4e739df..efb26fa9e5 100644 --- a/src/support/putenv.C +++ b/src/support/putenv.C @@ -11,7 +11,7 @@ #include -#include "lyxlib.h" +#include "support/lyxlib.h" #include #include diff --git a/src/support/rename.C b/src/support/rename.C index bfa0a82bff..fc9b78ebc9 100644 --- a/src/support/rename.C +++ b/src/support/rename.C @@ -10,10 +10,10 @@ #include -#include - #include "support/lyxlib.h" +#include + using std::string; diff --git a/src/support/rmdir.C b/src/support/rmdir.C index fa9ce896f1..b8eb223ab4 100644 --- a/src/support/rmdir.C +++ b/src/support/rmdir.C @@ -10,9 +10,9 @@ #include -#include +#include "support/lyxlib.h" -#include "lyxlib.h" +#include int lyx::support::rmdir(std::string const & dir) { diff --git a/src/support/socktools.C b/src/support/socktools.C index 1e6a0af1de..4b4edd60f4 100644 --- a/src/support/socktools.C +++ b/src/support/socktools.C @@ -10,9 +10,10 @@ #include -#include "socktools.h" +#include "support/socktools.h" +#include "support/lyxlib.h" + #include "debug.h" -#include "lyxlib.h" #include #include diff --git a/src/support/systemcall.C b/src/support/systemcall.C index ac4baaf44c..c18e08881f 100644 --- a/src/support/systemcall.C +++ b/src/support/systemcall.C @@ -13,8 +13,8 @@ #include -#include "systemcall.h" -#include "os.h" +#include "support/systemcall.h" +#include "support/os.h" #include diff --git a/src/support/tempname.C b/src/support/tempname.C index 408e332a80..8c6480bdbc 100644 --- a/src/support/tempname.C +++ b/src/support/tempname.C @@ -10,17 +10,18 @@ #include -#include -#include - #include "support/lyxlib.h" #include "support/filetools.h" #include "support/tostr.h" +#include "support/os.h" + #include "debug.h" -#include "os.h" #include +#include +#include + using boost::scoped_array; using std::string; diff --git a/src/support/unlink.C b/src/support/unlink.C index e3ca60afe1..5ddcc9a983 100644 --- a/src/support/unlink.C +++ b/src/support/unlink.C @@ -10,9 +10,9 @@ #include -#include +#include "support/lyxlib.h" -#include "lyxlib.h" +#include int lyx::support::unlink(std::string const & pathname) { diff --git a/src/support/userinfo.C b/src/support/userinfo.C index 6624b5cbcd..0225f5d29d 100644 --- a/src/support/userinfo.C +++ b/src/support/userinfo.C @@ -10,8 +10,8 @@ #include -#include "userinfo.h" -#include "filetools.h" +#include "support/userinfo.h" +#include "support/filetools.h" #include