From: Lars Gullik Bjønnes Date: Tue, 16 Sep 2003 11:03:20 +0000 (+0000) Subject: fix some namespace issues for gcc 3.4 X-Git-Tag: 1.6.10~16078 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=83256c8f88cc10bd09b462d4834656653a319d3a;p=features.git fix some namespace issues for gcc 3.4 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7770 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/ChangeLog b/src/ChangeLog index 31d9637b2c..0846ab4e37 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2003-09-16 Lars Gullik Bjønnes + + * main.C: + * lyx_main.C: + * lyx_cb.C: + * buffer.C: + * LaTeX.C: use namespace alias for lyx::support::os + 2003-09-16 Angus Leeming * bufferparams.C: diff --git a/src/LaTeX.C b/src/LaTeX.C index 9f82bc8400..e0ad719331 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -39,7 +39,6 @@ using lyx::support::FileInfo; using lyx::support::findtexfile; using lyx::support::getcwd; using lyx::support::OnlyFilename; -using lyx::support::os; using lyx::support::prefixIs; using lyx::support::QuoteName; using lyx::support::rtrim; @@ -48,6 +47,8 @@ using lyx::support::suffixIs; using lyx::support::Systemcall; using lyx::support::unlink; +namespace os = lyx::support::os; + using boost::regex; using boost::smatch; diff --git a/src/buffer.C b/src/buffer.C index d8a6b5bab1..19d4103fc8 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -95,7 +95,6 @@ using lyx::support::MakeDisplayPath; using lyx::support::MakeLatexName; using lyx::support::OnlyFilename; using lyx::support::OnlyPath; -using lyx::support::os; using lyx::support::Path; using lyx::support::QuoteName; using lyx::support::removeAutosaveFile; @@ -107,6 +106,8 @@ using lyx::support::subst; using lyx::support::tempName; using lyx::support::trim; +namespace os = lyx::support::os; + using std::endl; using std::for_each; using std::make_pair; diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 6a8b603d77..957601669d 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2003-09-16 Lars Gullik Bjønnes + + * lyx_gui.C: use namespace alias for lyx::support::os + 2003-09-16 Angus Leeming * FormDocument.C: add #include "LColor.h". diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C index c5a09dc7d2..52326b410e 100644 --- a/src/frontends/xforms/lyx_gui.C +++ b/src/frontends/xforms/lyx_gui.C @@ -44,9 +44,10 @@ #include using lyx::support::AddName; -using lyx::support::os; using lyx::support::user_lyxdir; +namespace os = lyx::support::os; + #ifndef CXX_GLOBAL_CSTD using std::exit; #endif diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 49fca4448c..0798436326 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2003-09-16 Lars Gullik Bjønnes + + * insetgraphics.C: + * insetbibtex.C: use namespace alias for lyx::support::os + 2003-09-16 Angus Leeming * insetcollapsable.h: remove ununsed framecolor variable. @@ -29,7 +34,7 @@ * insetcollapsable.h: add #include "LColor.h" (for its framecolor member variable). - + 2003-09-16 Angus Leeming * insetenv.C (constructor): use accessor functions to access InsetText variables. diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C index d880674ea2..d9c86160cb 100644 --- a/src/insets/insetbibtex.C +++ b/src/insets/insetbibtex.C @@ -34,7 +34,6 @@ using lyx::support::findtexfile; using lyx::support::IsFileReadable; using lyx::support::ltrim; using lyx::support::MakeAbsPath; -using lyx::support::os; using lyx::support::Path; using lyx::support::prefixIs; using lyx::support::rtrim; @@ -43,6 +42,8 @@ using lyx::support::subst; using lyx::support::tokenPos; using lyx::support::trim; +namespace os = lyx::support::os; + using std::endl; using std::getline; diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 5c303d867d..4875613620 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -92,12 +92,13 @@ using lyx::support::GetExtension; using lyx::support::getExtFromContents; using lyx::support::IsFileReadable; using lyx::support::LibFileSearch; -using lyx::support::os; using lyx::support::rtrim; using lyx::support::Systemcall; using lyx::support::unzipFile; using lyx::support::unzippedFileName; +namespace os = lyx::support::os; + using std::endl; using std::auto_ptr; diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 6149734b94..216f3aca04 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -56,7 +56,6 @@ using lyx::support::MakeAbsPath; using lyx::support::MakeDisplayPath; using lyx::support::OnlyFilename; using lyx::support::OnlyPath; -using lyx::support::os; using lyx::support::Path; using lyx::support::removeAutosaveFile; using lyx::support::rename; @@ -67,6 +66,8 @@ using lyx::support::tempName; using lyx::support::unlink; using lyx::support::user_lyxdir; +namespace os = lyx::support::os; + using std::back_inserter; using std::copy; using std::endl; diff --git a/src/lyx_main.C b/src/lyx_main.C index f82b70bd7c..776dec52ee 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -64,13 +64,14 @@ using lyx::support::GetEnv; using lyx::support::GetEnvPath; using lyx::support::i18nLibFileSearch; using lyx::support::LibFileSearch; -using lyx::support::os; using lyx::support::Path; using lyx::support::rtrim; using lyx::support::setLyxPaths; using lyx::support::system_lyxdir; using lyx::support::user_lyxdir; +namespace os = lyx::support::os; + using std::endl; using std::vector; diff --git a/src/main.C b/src/main.C index c4d12b50ac..3dbd1ea067 100644 --- a/src/main.C +++ b/src/main.C @@ -19,7 +19,8 @@ #include #endif -using lyx::support::os; + +namespace os = lyx::support::os; int main(int argc, char * argv[])