header file reorder

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

diff --git a/src/frontends/gtk/Alert_pimpl.C b/src/frontends/gtk/Alert_pimpl.C
index 8372e41ca77e7c8d1d5c070ec3d8ecf6ebc7f894..b745de4de999ddf68ae03f33b9146e330621f767 100644 (file)
--- a/src/frontends/gtk/Alert_pimpl.C
+++ b/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;
 
 

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 1e950297a5f6bfbbe12244044784fe9f147f6938..9deab6c40d0b512311f02c5c984284bc59d7926b 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/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.
 

diff --git a/src/frontends/gtk/FileDialog.C b/src/frontends/gtk/FileDialog.C
index 9670049052df2dbb85ebad2d1a9256ad87191bb5..2bfa33a7a006b8d28728d93f56787c69085b3f30 100644 (file)
--- a/src/frontends/gtk/FileDialog.C
+++ b/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);
 }

diff --git a/src/frontends/gtk/FileDialogPrivate.C b/src/frontends/gtk/FileDialogPrivate.C
index fe8bcf36d6b2f113b5f53a1b025dc43617a4229d..46d36c440fdb3d4e081eb6bc1914e6ad56a6dc19 100644 (file)
--- a/src/frontends/gtk/FileDialogPrivate.C
+++ b/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();

diff --git a/src/frontends/gtk/GAboutlyx.C b/src/frontends/gtk/GAboutlyx.C
index 3e97e2b24eba8fd2abc1f181b3cd03f4d47a8755..a6ac4c12c22263c4242f843be290b48f3faf9dab 100644 (file)
--- a/src/frontends/gtk/GAboutlyx.C
+++ b/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;
 

diff --git a/src/frontends/gtk/GBC.C b/src/frontends/gtk/GBC.C
index 81444536415749ee826ef2fef1a862d664b6d2af..cb3e882837232b89e9b2c61842cad934e3195d7a 100644 (file)
--- a/src/frontends/gtk/GBC.C
+++ b/src/frontends/gtk/GBC.C
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GBC.h"
 

diff --git a/src/frontends/gtk/GBC.h b/src/frontends/gtk/GBC.h
index c7178a7898156af9fa3b77050f5e6d75999fffb7..14885b44485e21b8366824eb5e65f8a3cdf28ad5 100644 (file)
--- a/src/frontends/gtk/GBC.h
+++ b/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 {
 

diff --git a/src/frontends/gtk/GLyXKeySym.C b/src/frontends/gtk/GLyXKeySym.C
index 37b5330adcc08cb3c9d71a5e3c792eb5c82f6d79..86d7855ddd92561bd088526622451e659421fe83 100644 (file)
--- a/src/frontends/gtk/GLyXKeySym.C
+++ b/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;
 
 

diff --git a/src/frontends/gtk/GMathDelim.C b/src/frontends/gtk/GMathDelim.C
index b58add6eebbbcef89d7782fbbd2a5f0767ecc17b..5002b08c2f08e1571804ce1beec8b6ba7059b334 100644 (file)
--- a/src/frontends/gtk/GMathDelim.C
+++ b/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"
 

diff --git a/src/frontends/gtk/GMathDelim.h b/src/frontends/gtk/GMathDelim.h
index 0c825a6727f396936b13e374259d66084a9b7d23..80928c2f21e0a11c942bcdaa54c234eecad5f9e6 100644 (file)
--- a/src/frontends/gtk/GMathDelim.h
+++ b/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 {
 

diff --git a/src/frontends/gtk/GMathPanel.C b/src/frontends/gtk/GMathPanel.C
index 92e543331ade1568e77276fb310cb24c5ca35d03..7233c38e76a22da753642515fe2cbf8152a61157 100644 (file)
--- a/src/frontends/gtk/GMathPanel.C
+++ b/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"

diff --git a/src/frontends/gtk/GMathPanel.h b/src/frontends/gtk/GMathPanel.h
index b3a1a0a5911e3ed9ff26c55e86bc15edc1c43a79..67179c2a337ac930e985c7a3ff4000fad85677ee 100644 (file)
--- a/src/frontends/gtk/GMathPanel.h
+++ b/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 {
 

diff --git a/src/frontends/gtk/GMenubar.C b/src/frontends/gtk/GMenubar.C
index e83b1e2197213db9df169eb5568f2ad09cf2ce1c..df2b90ac92cb08ed2b64aceaa548bf5796bfe9b1 100644 (file)
--- a/src/frontends/gtk/GMenubar.C
+++ b/src/frontends/gtk/GMenubar.C
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GMenubar.h"
 #include "GView.h"

diff --git a/src/frontends/gtk/GMenubar.h b/src/frontends/gtk/GMenubar.h
index afcd9e5b298939031c6a40ccb50167f5e2981579..2cab7e4e6c0a69b4a73e3298fe9e4bdf40c134d5 100644 (file)
--- a/src/frontends/gtk/GMenubar.h
+++ b/src/frontends/gtk/GMenubar.h
@@ -14,6 +14,9 @@
 
 #include "frontends/Menubar.h"
 #include "MenuBackend.h"
+
+#include <gtkmm.h>
+
 #include <vector>
 
 class LyXView;

diff --git a/src/frontends/gtk/GMiniBuffer.C b/src/frontends/gtk/GMiniBuffer.C
index 3e8c1293210c38b31804cfae953ba14e7957d683..aeff395a5deff299e69c7f66a42b1746db874753 100644 (file)
--- a/src/frontends/gtk/GMiniBuffer.C
+++ b/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;

diff --git a/src/frontends/gtk/GPainter.C b/src/frontends/gtk/GPainter.C
index 9e094234015e60a7cbff1e61f4718e4c39447aa0..78e59d786b95245f91b2870ff6a3fa1631f406c2 100644 (file)
--- a/src/frontends/gtk/GPainter.C
+++ b/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;

diff --git a/src/frontends/gtk/GPainter.h b/src/frontends/gtk/GPainter.h
index e64cbbc61ea0d8cd3041932e3e946323079a047d..7741feb02272a7140318f5a1295d1dd479a75fad 100644 (file)
--- a/src/frontends/gtk/GPainter.h
+++ b/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;

diff --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C
index 0347d197b61ae7d2dded96488e7555dfcd9a2716..9489503e568dffa4646a7cedb67ae777d7507984 100644 (file)
--- a/src/frontends/gtk/GPrint.C
+++ b/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);
 

diff --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C
index 1e8a199fc3747b3b5fa9ae583a003e26f5c58579..d69c54e4f7af01a10b313e6002b85b3c885dc484 100644 (file)
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GScreen.h"
 

diff --git a/src/frontends/gtk/GScreen.h b/src/frontends/gtk/GScreen.h
index 596e74980f8f1137537a0746378f852eb0de04a1..d6551385c2fbfc0b308966f26ed27be9f75eb6e4 100644 (file)
--- a/src/frontends/gtk/GScreen.h
+++ b/src/frontends/gtk/GScreen.h
@@ -14,6 +14,8 @@
 
 #include "screen.h"
 
+#include <gtkmm.h>
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/gtk/GSearch.C b/src/frontends/gtk/GSearch.C
index e6d748fbfa78bbd71712005767b99568e80ce1a8..0a9e1b1370ec1c30e0017c7c063a2e1c282bc9bd 100644 (file)
--- a/src/frontends/gtk/GSearch.C
+++ b/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;

diff --git a/src/frontends/gtk/GTableCreate.C b/src/frontends/gtk/GTableCreate.C
index 753df0b52ac0707c5de0c0569821694d4bf5cca0..24a9fcb1fa559006a50a50e6d7f5ce0aad2bf09b 100644 (file)
--- a/src/frontends/gtk/GTableCreate.C
+++ b/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);
 }
 

diff --git a/src/frontends/gtk/GTableCreate.h b/src/frontends/gtk/GTableCreate.h
index 4a8302dfaee701672669868b638542f6754f8d3d..db8301eb2be2107de59ffda9aeb9952fffe32a49 100644 (file)
--- a/src/frontends/gtk/GTableCreate.h
+++ b/src/frontends/gtk/GTableCreate.h
@@ -14,6 +14,8 @@
 
 #include "GViewBase.h"
 
+#include "ControlTabularCreate.h"
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/gtk/GText.C b/src/frontends/gtk/GText.C
index 14c2595ef90aa17cd62bd6914153cf98fdae5acd..58041e25aeca5f3afb54e88af91d539c148cc6e2 100644 (file)
--- a/src/frontends/gtk/GText.C
+++ b/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 {

diff --git a/src/frontends/gtk/GTimeout.C b/src/frontends/gtk/GTimeout.C
index 0ed30abc0e846007711712845145675e26bf1e5a..200dba64a440dfe152e679859352be9ea9040d34 100644 (file)
--- a/src/frontends/gtk/GTimeout.C
+++ b/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)),

diff --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C
index 6ab4586fa68888887b2b0897dcdcd1e0807a9e2d..d27042cf37e19205aa6d617a70936bd906fe556b 100644 (file)
--- a/src/frontends/gtk/GToolbar.C
+++ b/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;
        }

diff --git a/src/frontends/gtk/GToolbar.h b/src/frontends/gtk/GToolbar.h
index fd291d9a24b0fa0642542d0994f89d4256d1cfa5..2f675de7f72c29252801c601303065e4a0b4c10d 100644 (file)
--- a/src/frontends/gtk/GToolbar.h
+++ b/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 {
 

diff --git a/src/frontends/gtk/GUrl.C b/src/frontends/gtk/GUrl.C
index 3a564e83d2401d9f9af877e1403fc3dea197466f..194a037002fc568e2b31fc25d128aff2256d04ce 100644 (file)
--- a/src/frontends/gtk/GUrl.C
+++ b/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 {

diff --git a/src/frontends/gtk/GView.C b/src/frontends/gtk/GView.C
index c6e76220773075b222a91aa6310f0e82b47b9fd2..0864f8a3f3eafccb2fcf9dc8d19cbb925699dcac 100644 (file)
--- a/src/frontends/gtk/GView.C
+++ b/src/frontends/gtk/GView.C
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GView.h"
 #include "GMenubar.h"

diff --git a/src/frontends/gtk/GView.h b/src/frontends/gtk/GView.h
index e5c827e09328517e5157192b0e081259d49a9b85..f9e9070776066d2c7d989d57c97d474c1d686d9d 100644 (file)
--- a/src/frontends/gtk/GView.h
+++ b/src/frontends/gtk/GView.h
@@ -15,6 +15,8 @@
 #include "frontends/LyXView.h"
 #include "bufferview_funcs.h"
 
+#include <gtkmm.h>
+
 #include <map>
 
 namespace lyx {

diff --git a/src/frontends/gtk/GViewBase.C b/src/frontends/gtk/GViewBase.C
index af627b88e9597cc30f1a062292b463dc5221dbe3..43642e848ae2ab512e0c20a8de0c64c7dbf3fc82 100644 (file)
--- a/src/frontends/gtk/GViewBase.C
+++ b/src/frontends/gtk/GViewBase.C
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
 #include "GViewBase.h"
 #include "support/filetools.h"

diff --git a/src/frontends/gtk/GViewBase.h b/src/frontends/gtk/GViewBase.h
index ed0cde0f13cb17731753ca660c7c978e5f1ad6ff..f0799eb75723ff140af0f871a903a6772e568bdb 100644 (file)
--- a/src/frontends/gtk/GViewBase.h
+++ b/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_;
 };

diff --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C
index d052e6c3ae7b1ddc3a5f8f3b703543bd4468217d..8399c380040df140eaae4c914a6ccce19f8c0b73 100644 (file)
--- a/src/frontends/gtk/GWorkArea.C
+++ b/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"

diff --git a/src/frontends/gtk/GWorkArea.h b/src/frontends/gtk/GWorkArea.h
index 23e330746bde4b6628fa19be0718b22eebd961d3..aa53daf51c9636ed8492bbcabb1ff79976148b63 100644 (file)
--- a/src/frontends/gtk/GWorkArea.h
+++ b/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;

diff --git a/src/frontends/gtk/IdSc.C b/src/frontends/gtk/IdSc.C
index f2506c810280513862a92980e04738df042d8e7d..e89ec0dc2ca0d2ca4df3f4023942bf6a8250ff60 100644 (file)
--- a/src/frontends/gtk/IdSc.C
+++ b/src/frontends/gtk/IdSc.C
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "IdSc.h"
+
 #include "support/lstrings.h"
 
 using lyx::support::split;

diff --git a/src/frontends/gtk/LyXScreenFactory.C b/src/frontends/gtk/LyXScreenFactory.C
index 3b72c9905a909945f9ec4fd937b1efacecb2e711..5afc877e55fc9d82ca8824b3cd6ef3042999dc79 100644 (file)
--- a/src/frontends/gtk/LyXScreenFactory.C
+++ b/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 {
 

diff --git a/src/frontends/gtk/WorkAreaFactory.C b/src/frontends/gtk/WorkAreaFactory.C
index 3b54e273b0043425093e3fcb375191fd59b4bec3..d40ce1b9aacb245d1650bd358686d2f2f696f39e 100644 (file)
--- a/src/frontends/gtk/WorkAreaFactory.C
+++ b/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 {

diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index 9fbf7a1b6e8a1355c067c25bdbcf7bd2dda9048c..f215c60c748eccae5d7bd5789c2e88a4ee15928c 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/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;

diff --git a/src/frontends/gtk/xftFontLoader.C b/src/frontends/gtk/xftFontLoader.C
index e2e495b1fa92844094d2736bb5dd85e9ed8da2ce..4c7daedaef47203a7851b332161950690aee9eca 100644 (file)
--- a/src/frontends/gtk/xftFontLoader.C
+++ b/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>
 

diff --git a/src/frontends/gtk/xftFontLoader.h b/src/frontends/gtk/xftFontLoader.h
index 8437a6a619e234889a54cf41cad207f04023a920..2279a4c557b5ac778e4167f3b76bc54d3aef14ed 100644 (file)
--- a/src/frontends/gtk/xftFontLoader.h
+++ b/src/frontends/gtk/xftFontLoader.h
@@ -14,6 +14,7 @@
 
 #include "lyxfont.h"
 
+#include <gtkmm.h>
 #include <X11/Xft/Xft.h>
 
 class GWorkArea;

diff --git a/src/frontends/gtk/xftFontMetrics.C b/src/frontends/gtk/xftFontMetrics.C
index 91c36dfd61c54929a7ceb4482602ded5e488392f..466feffba1432d2de78137b3c6b44aeddb3a9861 100644 (file)
--- a/src/frontends/gtk/xftFontMetrics.C
+++ b/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>