header file reorder

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

src/frontends/gtk/Alert_pimpl.C

@@ -9,11 +9,12 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "frontends/Alert.h"
 #include "frontends/Alert_pimpl.h"
 
+#include <gtkmm.h>
+
 using std::string;
 
 

src/frontends/gtk/ChangeLog

@@ -1,5 +1,9 @@
 2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
-	John Spray  <spray_john@users.sourceforge.net>
+
+	* Reordered and a lot of includes in a lot of files.
+
+2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
+	    John Spray  <spray_john@users.sourceforge.net>
 
 	* Initial move to gtk 2.4.
 

src/frontends/gtk/FileDialog.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "FileDialogPrivate.h"
 
@@ -31,24 +30,27 @@ FileDialog::~FileDialog()
 }
 
 
-FileDialog::Result const FileDialog::open(string const & path,
-					  lyx::support::FileFilterList const & filters,
-					  string const & suggested)
+FileDialog::Result const
+FileDialog::open(string const & path,
+		 lyx::support::FileFilterList const & filters,
+		 string const & suggested)
 {
 	return private_->open(path, filters, suggested);
 }
 
 
-FileDialog::Result const FileDialog::opendir(string const & path,
-					     string const & suggested)
+FileDialog::Result const
+FileDialog::opendir(string const & path,
+		    string const & suggested)
 {
 	return private_->opendir(path, suggested);
 }
 
 
-FileDialog::Result const FileDialog::save(string const & path,
-					  lyx::support::FileFilterList const & filters,
-					  string const & suggested)
+FileDialog::Result const
+FileDialog::save(string const & path,
+		 lyx::support::FileFilterList const & filters,
+		 string const & suggested)
 {
 	return private_->save(path, filters, suggested);
 }

src/frontends/gtk/FileDialogPrivate.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "FileDialogPrivate.h"
 
@@ -60,9 +59,10 @@ void FileDialog::Private::onButton2Clicked()
 }
 
 
-FileDialog::Result const FileDialog::Private::open(string const & path,
-						   lyx::support::FileFilterList const & /*filters*/,
-						   string const & /*suggested*/)
+FileDialog::Result const
+FileDialog::Private::open(string const & path,
+			  lyx::support::FileFilterList const & /*filters*/,
+			  string const & /*suggested*/)
 {
 	fileSelection_.set_filename(path);
 	fileSelection_.get_file_list()->get_parent()->show();

src/frontends/gtk/GAboutlyx.C

@@ -9,16 +9,16 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-
-#include <libglademm.h>
-#include <sstream>
 
 #include "ControlAboutlyx.h"
 #include "GAboutlyx.h"
 #include "ghelpers.h"
 #include "version.h"
 
+#include <libglademm.h>
+
+#include <sstream>
+
 using std::ostringstream;
 using std::string;
 

src/frontends/gtk/GBC.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GBC.h"
 

src/frontends/gtk/GBC.h

@@ -12,12 +12,12 @@
 #ifndef GBUTTONCONTROLLER_H
 #define GBUTTONCONTROLLER_H
 
-#include <gtkmm.h>
-
 #include "ButtonController.h"
 #include "BCView.h"
 #include "gettext.h"
 
+#include <gtkmm.h>
+
 namespace lyx {
 namespace frontend {
 

src/frontends/gtk/GLyXKeySym.C

@@ -9,13 +9,13 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
-#include <gdk/gdkkeysyms.h>
 #include "GLyXKeySym.h"
-
 #include "kbmap.h"
 
+#include <gtkmm.h>
+#include <gdk/gdkkeysyms.h>
+
 using std::string;
 
 

src/frontends/gtk/GMathDelim.C

@@ -9,9 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-#include <libglademm.h>
-#include <sstream>
 
 #include "ControlMath.h"
 #include "GMathDelim.h"
@@ -19,6 +16,10 @@
 
 #include "support/lstrings.h"
 
+#include <libglademm.h>
+
+#include <sstream>
+
 #include "delim.xbm"
 #include "delim0.xpm"
 

src/frontends/gtk/GMathDelim.h

@@ -13,9 +13,10 @@
 #define GMATH_DELIM_H
 
 #include "GViewBase.h"
-#include "support/lstrings.h"
 #include "GXpmBtnTbl.h"
 
+#include "support/lstrings.h"
+
 namespace lyx {
 namespace frontend {
 

src/frontends/gtk/GMathPanel.C

@@ -9,9 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-
-#include <libglademm.h>
 
 #include "ControlMath.h"
 #include "GMathPanel.h"
@@ -19,6 +16,8 @@
 
 #include "support/lstrings.h"
 
+#include <libglademm.h>
+
 #include "deco.xpm"
 #include "delim.xpm"
 #include "equation.xpm"

src/frontends/gtk/GMathPanel.h

@@ -13,9 +13,11 @@
 #define GMATH_PANEL_H
 
 #include "GViewBase.h"
-#include "support/lstrings.h"
 #include "GXpmBtnTbl.h"
 
+#include "support/lstrings.h"
+
+
 namespace lyx {
 namespace frontend {
 

src/frontends/gtk/GMenubar.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GMenubar.h"
 #include "GView.h"

src/frontends/gtk/GMenubar.h

@@ -14,6 +14,9 @@
 
 #include "frontends/Menubar.h"
 #include "MenuBackend.h"
+
+#include <gtkmm.h>
+
 #include <vector>
 
 class LyXView;

src/frontends/gtk/GMiniBuffer.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GView.h"
 #include "GMiniBuffer.h"
@@ -227,7 +226,7 @@ bool GMiniBuffer::onKeyPress(GdkEventKey * event)
 						new_input_locale);
 		Glib::ustring new_input =
 			Glib::locale_to_utf8(new_input_locale);
-		
+
 		if (comp.empty() && new_input == input) {
 			showInfo("[no match]");
 			break;

src/frontends/gtk/GPainter.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GPainter.h"
 #include "debug.h"
@@ -25,10 +24,13 @@
 
 #include "support/lstrings.h"
 
-#include <boost/scoped_array.hpp>
+#include <gtkmm.h>
+#include <gdk/gdkx.h>
 
 #include <X11/Xft/Xft.h>
 
+#include <boost/scoped_array.hpp>
+
 #include <cmath>
 
 using std::string;

src/frontends/gtk/GPainter.h

@@ -14,9 +14,10 @@
 
 #include "frontends/Painter.h"
 
-#include <X11/Xft/Xft.h>
 #include <gtkmm.h>
 
+#include <X11/Xft/Xft.h>
+
 #include <map>
 
 class LyXFont;

src/frontends/gtk/GPrint.C

@@ -9,17 +9,18 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-#include <libglademm.h>
 
 #include "GPrint.h"
 #include "ControlPrint.h"
 #include "ghelpers.h"
 
 #include "PrinterParams.h"
+
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
+#include <libglademm.h>
+
 using std::string;
 using namespace lyx::support;
 
@@ -147,7 +148,6 @@ void GPrint::doBuild()
 
 	Gtk::Button * ok;
 	Gtk::Button * cancel;
-	Gtk::Button * apply;
 	xml_->get_widget("PrintButton", ok);
 	xml_->get_widget("CancelButton", cancel);
 

src/frontends/gtk/GScreen.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GScreen.h"
 

src/frontends/gtk/GScreen.h

@@ -14,6 +14,8 @@
 
 #include "screen.h"
 
+#include <gtkmm.h>
+
 namespace lyx {
 namespace frontend {
 

src/frontends/gtk/GSearch.C

@@ -9,11 +9,11 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GSearch.h"
 #include "ControlSearch.h"
 #include "ghelpers.h"
+
 #include <libglademm.h>
 
 using std::string;

src/frontends/gtk/GTableCreate.C

@@ -9,15 +9,14 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
-#include <libglademm.h>
-
-#include "ControlTabularCreate.h"
 #include "GTableCreate.h"
 #include "ghelpers.h"
+
 #include "support/lstrings.h"
 
+#include <libglademm.h>
+
 using std::string;
 
 namespace lyx {
@@ -49,8 +48,8 @@ void GTableCreate::doBuild()
 
 void GTableCreate::apply()
 {
-	int rows = rows_->get_value_as_int();
-	int columns = columns_->get_value_as_int();
+	int const rows = rows_->get_value_as_int();
+	int const columns = columns_->get_value_as_int();
 	controller().params() = std::make_pair(columns, rows);
 }
 

src/frontends/gtk/GTableCreate.h

@@ -14,6 +14,8 @@
 
 #include "GViewBase.h"
 
+#include "ControlTabularCreate.h"
+
 namespace lyx {
 namespace frontend {
 

src/frontends/gtk/GText.C

@@ -9,15 +9,17 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-#include <libglademm.h>
 
-#include "support/lstrings.h"
-#include "ControlCommand.h"
 #include "GText.h"
+#include "ControlCommand.h"
 #include "ghelpers.h"
 #include "IdSc.h"
 
+#include "support/lstrings.h"
+
+#include <gtkmm.h>
+#include <libglademm.h>
+
 using std::string;
 
 namespace lyx {

src/frontends/gtk/GTimeout.C

@@ -11,11 +11,12 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GTimeout.h"
 #include "debug.h"
 
+#include <gtkmm.h>
+
 
 Timeout::Timeout(unsigned int msec, Type t)
 	: pimpl_(new lyx::frontend::GTimeout(*this)),

src/frontends/gtk/GToolbar.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GToolbar.h"
 #include "GView.h"
@@ -79,7 +78,7 @@ GLayoutBox::GLayoutBox(LyXView & owner,
 	combo_.get_entry()->unset_flags(Gtk::CAN_FOCUS | Gtk::CAN_DEFAULT);
 	comboClear(combo_);
 
- 	combo_.get_entry()->signal_changed().connect(
+	combo_.get_entry()->signal_changed().connect(
 		sigc::mem_fun(*this,&GLayoutBox::selected));
 
 	combo_.show();
@@ -87,7 +86,7 @@ GLayoutBox::GLayoutBox(LyXView & owner,
 	combo_.set_data(
 		gToolData,
 		reinterpret_cast<void*>(&const_cast<FuncRequest &>(func)));
-		
+
 	Gtk::ToolItem * toolitem = Gtk::manage(new Gtk::ToolItem);
 	toolitem->add(combo_);
 	toolbar.insert(*toolitem,-1);
@@ -199,28 +198,28 @@ GToolbar::GToolbar(ToolbarBackend::Toolbar const & tbb, LyXView & owner)
 
 	owner_.getBox(position).children().push_back(
 		Gtk::Box_Helpers::Element(toolbar_, Gtk::PACK_SHRINK));
-		
+
 	tooltips_.enable();
 }
 
 void GToolbar::add(FuncRequest const & func, string const & tooltip)
 {
- 	switch (func.action) {
+	switch (func.action) {
 	case ToolbarBackend::SEPARATOR: {
 		Gtk::SeparatorToolItem * space =
 			Gtk::manage(new Gtk::SeparatorToolItem);
 		toolbar_.insert(*space,-1);
- 		break;
+		break;
 	}
 
- 	case ToolbarBackend::MINIBUFFER:
- 		// Not supported yet.
- 		break;
+	case ToolbarBackend::MINIBUFFER:
+		// Not supported yet.
+		break;
 
 	case ToolbarBackend::LAYOUTS: {
 		layout_.reset(new GLayoutBox(owner_, toolbar_, func));
- 		break;
- 	}
+		break;
+	}
 
 	default: {
 		Glib::ustring xpmName =
@@ -235,13 +234,13 @@ void GToolbar::add(FuncRequest const & func, string const & tooltip)
 			toolbutton = Gtk::manage(new Gtk::ToolButton(*image));
 		}
 		// This code is putting a function reference into the GObject data field
-		// named gToolData.  That's how we know how to update the status of the 
+		// named gToolData.  That's how we know how to update the status of the
 		// toolitem later.
 		toolbutton->set_data(gToolData,
 			reinterpret_cast<void*>(&const_cast<FuncRequest &>(func)));
 		tooltips_.set_tip(*toolbutton, tip, tip);
 		toolbutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,
-			&GToolbar::clicked), FuncRequest(func)));		
+			&GToolbar::clicked), FuncRequest(func)));
 		toolbar_.insert(*toolbutton,-1);
 		break;
 	}

src/frontends/gtk/GToolbar.h

@@ -15,10 +15,10 @@
 
 #include "frontends/Toolbars.h"
 
-#include <boost/scoped_ptr.hpp>
-
 #include <gtkmm.h>
 
+#include <boost/scoped_ptr.hpp>
+
 namespace lyx {
 namespace frontend {
 

src/frontends/gtk/GUrl.C

@@ -9,15 +9,16 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-
-#include <libglademm.h>
 
 #include "ControlCommand.h"
 #include "GUrl.h"
 #include "ghelpers.h"
+
 #include "support/lstrings.h"
 
+#include <gtkmm.h>
+#include <libglademm.h>
+
 using std::string;
 
 namespace lyx {

src/frontends/gtk/GView.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GView.h"
 #include "GMenubar.h"

src/frontends/gtk/GView.h

@@ -15,6 +15,8 @@
 #include "frontends/LyXView.h"
 #include "bufferview_funcs.h"
 
+#include <gtkmm.h>
+
 #include <map>
 
 namespace lyx {

src/frontends/gtk/GViewBase.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GViewBase.h"
 #include "support/filetools.h"

src/frontends/gtk/GViewBase.h

@@ -12,13 +12,15 @@
 #ifndef GVIEWBASE_H
 #define GVIEWBASE_H
 
-#include <gtkmm.h>
-#include <libglademm.h>
-#include <boost/scoped_ptr.hpp>
 #include "Dialog.h"
 #include "ButtonPolicies.h"
 #include "GBC.h"
 
+#include <gtkmm.h>
+#include <libglademm.h>
+
+#include <boost/scoped_ptr.hpp>
+
 namespace lyx {
 namespace frontend {
 
@@ -57,7 +59,7 @@ template <class Dialog>
 class GViewDB : public GViewBase {
 protected:
 	GViewDB(Dialog &, std::string const &, bool allowResize);
-	virtual const Gtk::Window * window() const;
+	virtual Gtk::Window const * window() const;
 	virtual Gtk::Window * window();
 	boost::scoped_ptr<Dialog> dialog_;
 };

src/frontends/gtk/GWorkArea.C

@@ -9,8 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
-#include <X11/Xft/Xft.h>
 
 #include "GWorkArea.h"
 #include "GView.h"

src/frontends/gtk/GWorkArea.h

@@ -13,11 +13,12 @@
 #define GWORKAREA_H
 
 #include "GPainter.h"
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
 
 #include "frontends/WorkArea.h"
 
+#include <gtkmm.h>
+#include <gtk/gtk.h>
+
 #include <X11/Xft/Xft.h>
 
 class LColor_color;

src/frontends/gtk/IdSc.C

@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "IdSc.h"
+
 #include "support/lstrings.h"
 
 using lyx::support::split;

src/frontends/gtk/LyXScreenFactory.C

@@ -10,13 +10,10 @@
 
 #include <config.h>
 
-#include <gtkmm.h>
-#include "frontends/LyXScreenFactory.h"
 #include "GWorkArea.h"
 #include "GScreen.h"
 
-
-
+#include "frontends/LyXScreenFactory.h"
 
 namespace LyXScreenFactory {
 

src/frontends/gtk/WorkAreaFactory.C

@@ -9,11 +9,12 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
+
+#include "GWorkArea.h"
 
 #include "frontends/WorkAreaFactory.h"
 
-#include "GWorkArea.h"
+#include <gtkmm.h>
 
 
 namespace WorkAreaFactory {

src/frontends/gtk/lyx_gui.C

@@ -11,15 +11,9 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "lyx_gui.h"
 
-#include "support/lyxlib.h"
-#include "support/os.h"
-#include "support/filetools.h"
-#include "support/path_defines.h"
-
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
@@ -47,6 +41,18 @@
 #include "xftFontLoader.h"
 #include "GWorkArea.h"
 
+//just for xforms
+#include "lyx_forms.h"
+#include "xformsImage.h"
+#include "xforms_helpers.h"
+
+#include "support/lyxlib.h"
+#include "support/os.h"
+#include "support/filetools.h"
+#include "support/path_defines.h"
+
+#include <gtkmm.h>
+
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
@@ -56,11 +62,6 @@
 #include <sstream>
 #include <iomanip>
 
-//just for xforms
-#include "lyx_forms.h"
-#include "xformsImage.h"
-#include "xforms_helpers.h"
-
 namespace os = lyx::support::os;
 
 using std::ostringstream;

src/frontends/gtk/xftFontLoader.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-#include <gtkmm.h>
 #include "xftFontLoader.h"
 #include "FontInfo.h"
 #include "gettext.h"
@@ -25,9 +24,6 @@
 #include "support/systemcall.h"
 #include "support/filetools.h"
 
-
-#include <X11/Xft/Xft.h>
-
 #include <cmath>	// fabs()
 #include <vector>
 

src/frontends/gtk/xftFontLoader.h

@@ -14,6 +14,7 @@
 
 #include "lyxfont.h"
 
+#include <gtkmm.h>
 #include <X11/Xft/Xft.h>
 
 class GWorkArea;

src/frontends/gtk/xftFontMetrics.C

@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "GtkmmX.h"
-#include "support/lstrings.h"
 #include "xftFontLoader.h"
 #include "font_metrics.h"
 #include "lyxrc.h"
@@ -19,6 +18,8 @@
 #include "language.h"
 #include "codeConvert.h"
 
+#include "support/lstrings.h"
+
 #include <gtkmm.h>
 
 #include <boost/scoped_array.hpp>