Some updates, but not enough to get it compiling

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

diff --git a/src/frontends/gtk/GMenubar.C b/src/frontends/gtk/GMenubar.C
index 7028ece4d402e9b38a2b9644e0aea45145226803..50706d57b0313b5912e21e9ed27097c873074463 100644 (file)
--- a/src/frontends/gtk/GMenubar.C
+++ b/src/frontends/gtk/GMenubar.C
@@ -30,9 +30,6 @@
 #include "support/docstring.h"
 #include "lyxfunc.h"
 
-using lyx::char_type;
-using lyx::docstring;
-
 using std::string;
 
 namespace lyx {
@@ -48,7 +45,7 @@ class LyxMenu : public Gtk::Menu {
 public:
        LyxMenu() { menu_.reset(new ::Menu); }
 
-       ::Menu& getBackMenu() { return *menu_.get(); }
+       ::Menu & getBackMenu() { return *menu_.get(); }
 
        void clearBackMenu() { menu_.reset(new ::Menu); }
 private:

diff --git a/src/frontends/gtk/GMenubar.h b/src/frontends/gtk/GMenubar.h
index accb1a61c2bc9609e50bf7cc562d553fc2113f18..2936d6882f113a7e2e53ac3a0b734d7985a1b5c3 100644 (file)
--- a/src/frontends/gtk/GMenubar.h
+++ b/src/frontends/gtk/GMenubar.h
@@ -19,9 +19,10 @@
 
 #include <vector>
 
+namespace lyx {
+
 class LyXView;
 
-namespace lyx {
 namespace frontend {
 
 class GMenubar : public Menubar, public sigc::trackable {

diff --git a/src/frontends/gtk/GTimeout.C b/src/frontends/gtk/GTimeout.C
index afb3a46763083ba67783f0fcd94dfe3d27e151a3..50176c132e27bc1a0ba7e9fa9ca9a8c48a5a78da 100644 (file)
--- a/src/frontends/gtk/GTimeout.C
+++ b/src/frontends/gtk/GTimeout.C
@@ -26,12 +26,13 @@
 #include <gtkmm.h>
 
 
+namespace lyx {
+
 Timeout::Timeout(unsigned int msec, Type t)
        : pimpl_(new lyx::frontend::GTimeout(*this)),
          type(t), timeout_ms(msec)
 {}
 
-namespace lyx {
 namespace frontend {
 
 GTimeout::GTimeout(Timeout & owner)

diff --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C
index 8ada3e7b541c49e2300fc532254885b58f0660a4..98e20cc284eb46851736963943275675b37b1f9d 100644 (file)
--- a/src/frontends/gtk/GToolbar.C
+++ b/src/frontends/gtk/GToolbar.C
@@ -177,10 +177,6 @@ void GLayoutBox::selected()
        layoutSelected(owner_, layoutGuiName);
 }
 
-} // namespace frontend
-} // namespace lyx
-
-
 Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
                                  LyXView & owner)
 {
@@ -188,9 +184,6 @@ Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
        return Toolbars::ToolbarPtr(new GToolbar(tbb, owner));
 }
 
-namespace lyx {
-namespace frontend {
-
 GToolbar::GToolbar(ToolbarBackend::Toolbar const & tbb, LyXView & owner)
        : owner_(dynamic_cast<GView &>(owner))
 {

diff --git a/src/frontends/gtk/GToolbar.h b/src/frontends/gtk/GToolbar.h
index db850630e90001bb4b0177ee9a4656035092b9de..e8f49db9cf9552ef4cddf301fa647ae2a9e603e2 100644 (file)
--- a/src/frontends/gtk/GToolbar.h
+++ b/src/frontends/gtk/GToolbar.h
@@ -79,9 +79,10 @@ private:
 };
 
 } // namespace frontend
-} // namespace lyx
 
 Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
                                  LyXView & owner);
 
+} // namespace lyx
+
 #endif // NOT GTOOLBAR_H

diff --git a/src/frontends/gtk/GWorkArea.h b/src/frontends/gtk/GWorkArea.h
index aef07a43495124da0af9c64d234c8411bda529d3..7870a2d164efd2c16c12d634f4bc0a1d7459361f 100644 (file)
--- a/src/frontends/gtk/GWorkArea.h
+++ b/src/frontends/gtk/GWorkArea.h
@@ -24,10 +24,11 @@
 // FIXME: defined in X.h, spuriously pulled in by some gui headers
 #undef CursorShape
 
+namespace lyx {
+
 class LColor_color;
 class LyXView;
 
-namespace lyx {
 namespace frontend {
 
 class ColorCache {

diff --git a/src/frontends/gtk/GuiApplication.C b/src/frontends/gtk/GuiApplication.C
index eefd320b8fc768aebc411eb88393f0facdadffca..72991eac1f81ca714f4c87e9472067bd84019f8b 100644 (file)
--- a/src/frontends/gtk/GuiApplication.C
+++ b/src/frontends/gtk/GuiApplication.C
@@ -45,8 +45,6 @@
 #include <iomanip>
 
 
-using lyx::support::subst;
-
 using std::string;
 using std::endl;
 
@@ -69,6 +67,8 @@ int getDPI()
 
 namespace lyx {
 
+using support::subst;
+
 frontend::Application * createApplication(int & argc, char * argv[])
 {
        return new frontend::GuiApplication(argc, argv);

diff --git a/src/frontends/gtk/pch.h b/src/frontends/gtk/pch.h
index 6b969cd7663e605b039036eda33f7ac665f67f33..d26953e6cd9275605a54465748e5b1e19a3e16f1 100644 (file)
--- a/src/frontends/gtk/pch.h
+++ b/src/frontends/gtk/pch.h
@@ -1,5 +1 @@
 #include <config.h>
-
-
-namespace lyx {
-

diff --git a/src/frontends/gtk/xftFontMetrics.h b/src/frontends/gtk/xftFontMetrics.h
index 825d8b0913f191318aa6700fb42651bd5f0d1bec..40c41dc093f21f2a358aeb19454bc67218f10733 100644 (file)
--- a/src/frontends/gtk/xftFontMetrics.h
+++ b/src/frontends/gtk/xftFontMetrics.h
@@ -47,8 +47,8 @@ public:
 private:
        XftFont * font;
        XftFont * fontS;
-
+};
 
 } // namespace lyx
-};
+
 #endif // XFT_FONT_METRICS_H