From 604962d968bc5f3c026bf85943c7b76012dfabad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Sat, 21 Oct 2006 09:31:21 +0000
Subject: [PATCH] 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
---
 src/frontends/gtk/GMenubar.C       | 5 +----
 src/frontends/gtk/GMenubar.h       | 3 ++-
 src/frontends/gtk/GTimeout.C       | 3 ++-
 src/frontends/gtk/GToolbar.C       | 7 -------
 src/frontends/gtk/GToolbar.h       | 3 ++-
 src/frontends/gtk/GWorkArea.h      | 3 ++-
 src/frontends/gtk/GuiApplication.C | 4 ++--
 src/frontends/gtk/pch.h            | 4 ----
 src/frontends/gtk/xftFontMetrics.h | 4 ++--
 9 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/frontends/gtk/GMenubar.C b/src/frontends/gtk/GMenubar.C
index 7028ece4d4..50706d57b0 100644
--- 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 accb1a61c2..2936d6882f 100644
--- 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 afb3a46763..50176c132e 100644
--- 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 8ada3e7b54..98e20cc284 100644
--- 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 db850630e9..e8f49db9cf 100644
--- 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 aef07a4349..7870a2d164 100644
--- 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 eefd320b8f..72991eac1f 100644
--- 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 6b969cd766..d26953e6cd 100644
--- 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 825d8b0913..40c41dc093 100644
--- 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