From 9122d5b2df70e72eb941b8d1e1a16d646a90c9fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 26 Sep 2004 18:36:07 +0000 Subject: [PATCH] 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 | 3 ++- src/frontends/gtk/ChangeLog | 6 +++++- src/frontends/gtk/FileDialog.C | 20 +++++++++++--------- src/frontends/gtk/FileDialogPrivate.C | 8 ++++---- src/frontends/gtk/GAboutlyx.C | 8 ++++---- src/frontends/gtk/GBC.C | 1 - src/frontends/gtk/GBC.h | 4 ++-- src/frontends/gtk/GLyXKeySym.C | 6 +++--- src/frontends/gtk/GMathDelim.C | 7 ++++--- src/frontends/gtk/GMathDelim.h | 3 ++- src/frontends/gtk/GMathPanel.C | 5 ++--- src/frontends/gtk/GMathPanel.h | 4 +++- src/frontends/gtk/GMenubar.C | 1 - src/frontends/gtk/GMenubar.h | 3 +++ src/frontends/gtk/GMiniBuffer.C | 3 +-- src/frontends/gtk/GPainter.C | 6 ++++-- src/frontends/gtk/GPainter.h | 3 ++- src/frontends/gtk/GPrint.C | 6 +++--- src/frontends/gtk/GScreen.C | 1 - src/frontends/gtk/GScreen.h | 2 ++ src/frontends/gtk/GSearch.C | 2 +- src/frontends/gtk/GTableCreate.C | 11 +++++------ src/frontends/gtk/GTableCreate.h | 2 ++ src/frontends/gtk/GText.C | 10 ++++++---- src/frontends/gtk/GTimeout.C | 3 ++- src/frontends/gtk/GToolbar.C | 25 ++++++++++++------------- src/frontends/gtk/GToolbar.h | 4 ++-- src/frontends/gtk/GUrl.C | 7 ++++--- src/frontends/gtk/GView.C | 1 - src/frontends/gtk/GView.h | 2 ++ src/frontends/gtk/GViewBase.C | 1 - src/frontends/gtk/GViewBase.h | 10 ++++++---- src/frontends/gtk/GWorkArea.C | 2 -- src/frontends/gtk/GWorkArea.h | 5 +++-- src/frontends/gtk/IdSc.C | 1 + src/frontends/gtk/LyXScreenFactory.C | 5 +---- src/frontends/gtk/WorkAreaFactory.C | 5 +++-- src/frontends/gtk/lyx_gui.C | 23 ++++++++++++----------- src/frontends/gtk/xftFontLoader.C | 4 ---- src/frontends/gtk/xftFontLoader.h | 1 + src/frontends/gtk/xftFontMetrics.C | 3 ++- 41 files changed, 122 insertions(+), 105 deletions(-) diff --git a/src/frontends/gtk/Alert_pimpl.C b/src/frontends/gtk/Alert_pimpl.C index 8372e41ca7..b745de4de9 100644 --- a/src/frontends/gtk/Alert_pimpl.C +++ b/src/frontends/gtk/Alert_pimpl.C @@ -9,11 +9,12 @@ */ #include -#include #include "frontends/Alert.h" #include "frontends/Alert_pimpl.h" +#include + using std::string; diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index 1e950297a5..9deab6c40d 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,5 +1,9 @@ 2004-09-26 Lars Gullik Bjonnes - John Spray + + * Reordered and a lot of includes in a lot of files. + +2004-09-26 Lars Gullik Bjonnes + John Spray * Initial move to gtk 2.4. diff --git a/src/frontends/gtk/FileDialog.C b/src/frontends/gtk/FileDialog.C index 9670049052..2bfa33a7a0 100644 --- a/src/frontends/gtk/FileDialog.C +++ b/src/frontends/gtk/FileDialog.C @@ -9,7 +9,6 @@ */ #include -#include #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 fe8bcf36d6..46d36c440f 100644 --- a/src/frontends/gtk/FileDialogPrivate.C +++ b/src/frontends/gtk/FileDialogPrivate.C @@ -9,7 +9,6 @@ */ #include -#include #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 3e97e2b24e..a6ac4c12c2 100644 --- a/src/frontends/gtk/GAboutlyx.C +++ b/src/frontends/gtk/GAboutlyx.C @@ -9,16 +9,16 @@ */ #include -#include - -#include -#include #include "ControlAboutlyx.h" #include "GAboutlyx.h" #include "ghelpers.h" #include "version.h" +#include + +#include + using std::ostringstream; using std::string; diff --git a/src/frontends/gtk/GBC.C b/src/frontends/gtk/GBC.C index 8144453641..cb3e882837 100644 --- a/src/frontends/gtk/GBC.C +++ b/src/frontends/gtk/GBC.C @@ -9,7 +9,6 @@ */ #include -#include #include "GBC.h" diff --git a/src/frontends/gtk/GBC.h b/src/frontends/gtk/GBC.h index c7178a7898..14885b4448 100644 --- a/src/frontends/gtk/GBC.h +++ b/src/frontends/gtk/GBC.h @@ -12,12 +12,12 @@ #ifndef GBUTTONCONTROLLER_H #define GBUTTONCONTROLLER_H -#include - #include "ButtonController.h" #include "BCView.h" #include "gettext.h" +#include + namespace lyx { namespace frontend { diff --git a/src/frontends/gtk/GLyXKeySym.C b/src/frontends/gtk/GLyXKeySym.C index 37b5330adc..86d7855ddd 100644 --- a/src/frontends/gtk/GLyXKeySym.C +++ b/src/frontends/gtk/GLyXKeySym.C @@ -9,13 +9,13 @@ */ #include -#include -#include #include "GLyXKeySym.h" - #include "kbmap.h" +#include +#include + using std::string; diff --git a/src/frontends/gtk/GMathDelim.C b/src/frontends/gtk/GMathDelim.C index b58add6eeb..5002b08c2f 100644 --- a/src/frontends/gtk/GMathDelim.C +++ b/src/frontends/gtk/GMathDelim.C @@ -9,9 +9,6 @@ */ #include -#include -#include -#include #include "ControlMath.h" #include "GMathDelim.h" @@ -19,6 +16,10 @@ #include "support/lstrings.h" +#include + +#include + #include "delim.xbm" #include "delim0.xpm" diff --git a/src/frontends/gtk/GMathDelim.h b/src/frontends/gtk/GMathDelim.h index 0c825a6727..80928c2f21 100644 --- 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 92e543331a..7233c38e76 100644 --- a/src/frontends/gtk/GMathPanel.C +++ b/src/frontends/gtk/GMathPanel.C @@ -9,9 +9,6 @@ */ #include -#include - -#include #include "ControlMath.h" #include "GMathPanel.h" @@ -19,6 +16,8 @@ #include "support/lstrings.h" +#include + #include "deco.xpm" #include "delim.xpm" #include "equation.xpm" diff --git a/src/frontends/gtk/GMathPanel.h b/src/frontends/gtk/GMathPanel.h index b3a1a0a591..67179c2a33 100644 --- 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 e83b1e2197..df2b90ac92 100644 --- a/src/frontends/gtk/GMenubar.C +++ b/src/frontends/gtk/GMenubar.C @@ -9,7 +9,6 @@ */ #include -#include #include "GMenubar.h" #include "GView.h" diff --git a/src/frontends/gtk/GMenubar.h b/src/frontends/gtk/GMenubar.h index afcd9e5b29..2cab7e4e6c 100644 --- a/src/frontends/gtk/GMenubar.h +++ b/src/frontends/gtk/GMenubar.h @@ -14,6 +14,9 @@ #include "frontends/Menubar.h" #include "MenuBackend.h" + +#include + #include class LyXView; diff --git a/src/frontends/gtk/GMiniBuffer.C b/src/frontends/gtk/GMiniBuffer.C index 3e8c129321..aeff395a5d 100644 --- a/src/frontends/gtk/GMiniBuffer.C +++ b/src/frontends/gtk/GMiniBuffer.C @@ -9,7 +9,6 @@ */ #include -#include #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 9e09423401..78e59d786b 100644 --- a/src/frontends/gtk/GPainter.C +++ b/src/frontends/gtk/GPainter.C @@ -9,7 +9,6 @@ */ #include -#include #include "GPainter.h" #include "debug.h" @@ -25,10 +24,13 @@ #include "support/lstrings.h" -#include +#include +#include #include +#include + #include using std::string; diff --git a/src/frontends/gtk/GPainter.h b/src/frontends/gtk/GPainter.h index e64cbbc61e..7741feb022 100644 --- a/src/frontends/gtk/GPainter.h +++ b/src/frontends/gtk/GPainter.h @@ -14,9 +14,10 @@ #include "frontends/Painter.h" -#include #include +#include + #include class LyXFont; diff --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C index 0347d197b6..9489503e56 100644 --- a/src/frontends/gtk/GPrint.C +++ b/src/frontends/gtk/GPrint.C @@ -9,17 +9,18 @@ */ #include -#include -#include #include "GPrint.h" #include "ControlPrint.h" #include "ghelpers.h" #include "PrinterParams.h" + #include "support/lstrings.h" #include "support/tostr.h" +#include + 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 1e8a199fc3..d69c54e4f7 100644 --- a/src/frontends/gtk/GScreen.C +++ b/src/frontends/gtk/GScreen.C @@ -9,7 +9,6 @@ */ #include -#include #include "GScreen.h" diff --git a/src/frontends/gtk/GScreen.h b/src/frontends/gtk/GScreen.h index 596e74980f..d6551385c2 100644 --- a/src/frontends/gtk/GScreen.h +++ b/src/frontends/gtk/GScreen.h @@ -14,6 +14,8 @@ #include "screen.h" +#include + namespace lyx { namespace frontend { diff --git a/src/frontends/gtk/GSearch.C b/src/frontends/gtk/GSearch.C index e6d748fbfa..0a9e1b1370 100644 --- a/src/frontends/gtk/GSearch.C +++ b/src/frontends/gtk/GSearch.C @@ -9,11 +9,11 @@ */ #include -#include #include "GSearch.h" #include "ControlSearch.h" #include "ghelpers.h" + #include using std::string; diff --git a/src/frontends/gtk/GTableCreate.C b/src/frontends/gtk/GTableCreate.C index 753df0b52a..24a9fcb1fa 100644 --- a/src/frontends/gtk/GTableCreate.C +++ b/src/frontends/gtk/GTableCreate.C @@ -9,15 +9,14 @@ */ #include -#include -#include - -#include "ControlTabularCreate.h" #include "GTableCreate.h" #include "ghelpers.h" + #include "support/lstrings.h" +#include + 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 4a8302dfae..db8301eb2b 100644 --- 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 14c2595ef9..58041e25ae 100644 --- a/src/frontends/gtk/GText.C +++ b/src/frontends/gtk/GText.C @@ -9,15 +9,17 @@ */ #include -#include -#include -#include "support/lstrings.h" -#include "ControlCommand.h" #include "GText.h" +#include "ControlCommand.h" #include "ghelpers.h" #include "IdSc.h" +#include "support/lstrings.h" + +#include +#include + using std::string; namespace lyx { diff --git a/src/frontends/gtk/GTimeout.C b/src/frontends/gtk/GTimeout.C index 0ed30abc0e..200dba64a4 100644 --- a/src/frontends/gtk/GTimeout.C +++ b/src/frontends/gtk/GTimeout.C @@ -11,11 +11,12 @@ */ #include -#include #include "GTimeout.h" #include "debug.h" +#include + 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 6ab4586fa6..d27042cf37 100644 --- a/src/frontends/gtk/GToolbar.C +++ b/src/frontends/gtk/GToolbar.C @@ -9,7 +9,6 @@ */ #include -#include #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(&const_cast(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(&const_cast(func))); tooltips_.set_tip(*toolbutton, tip, tip); toolbutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, - >oolbar::clicked), FuncRequest(func))); + >oolbar::clicked), FuncRequest(func))); toolbar_.insert(*toolbutton,-1); break; } diff --git a/src/frontends/gtk/GToolbar.h b/src/frontends/gtk/GToolbar.h index fd291d9a24..2f675de7f7 100644 --- a/src/frontends/gtk/GToolbar.h +++ b/src/frontends/gtk/GToolbar.h @@ -15,10 +15,10 @@ #include "frontends/Toolbars.h" -#include - #include +#include + namespace lyx { namespace frontend { diff --git a/src/frontends/gtk/GUrl.C b/src/frontends/gtk/GUrl.C index 3a564e83d2..194a037002 100644 --- a/src/frontends/gtk/GUrl.C +++ b/src/frontends/gtk/GUrl.C @@ -9,15 +9,16 @@ */ #include -#include - -#include #include "ControlCommand.h" #include "GUrl.h" #include "ghelpers.h" + #include "support/lstrings.h" +#include +#include + using std::string; namespace lyx { diff --git a/src/frontends/gtk/GView.C b/src/frontends/gtk/GView.C index c6e7622077..0864f8a3f3 100644 --- a/src/frontends/gtk/GView.C +++ b/src/frontends/gtk/GView.C @@ -9,7 +9,6 @@ */ #include -#include #include "GView.h" #include "GMenubar.h" diff --git a/src/frontends/gtk/GView.h b/src/frontends/gtk/GView.h index e5c827e093..f9e9070776 100644 --- 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 + #include namespace lyx { diff --git a/src/frontends/gtk/GViewBase.C b/src/frontends/gtk/GViewBase.C index af627b88e9..43642e848a 100644 --- a/src/frontends/gtk/GViewBase.C +++ b/src/frontends/gtk/GViewBase.C @@ -9,7 +9,6 @@ */ #include -#include #include "GViewBase.h" #include "support/filetools.h" diff --git a/src/frontends/gtk/GViewBase.h b/src/frontends/gtk/GViewBase.h index ed0cde0f13..f0799eb757 100644 --- a/src/frontends/gtk/GViewBase.h +++ b/src/frontends/gtk/GViewBase.h @@ -12,13 +12,15 @@ #ifndef GVIEWBASE_H #define GVIEWBASE_H -#include -#include -#include #include "Dialog.h" #include "ButtonPolicies.h" #include "GBC.h" +#include +#include + +#include + namespace lyx { namespace frontend { @@ -57,7 +59,7 @@ template 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_; }; diff --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C index d052e6c3ae..8399c38004 100644 --- a/src/frontends/gtk/GWorkArea.C +++ b/src/frontends/gtk/GWorkArea.C @@ -9,8 +9,6 @@ */ #include -#include -#include #include "GWorkArea.h" #include "GView.h" diff --git a/src/frontends/gtk/GWorkArea.h b/src/frontends/gtk/GWorkArea.h index 23e330746b..aa53daf51c 100644 --- a/src/frontends/gtk/GWorkArea.h +++ b/src/frontends/gtk/GWorkArea.h @@ -13,11 +13,12 @@ #define GWORKAREA_H #include "GPainter.h" -#include -#include #include "frontends/WorkArea.h" +#include +#include + #include class LColor_color; diff --git a/src/frontends/gtk/IdSc.C b/src/frontends/gtk/IdSc.C index f2506c8102..e89ec0dc2c 100644 --- a/src/frontends/gtk/IdSc.C +++ b/src/frontends/gtk/IdSc.C @@ -11,6 +11,7 @@ #include #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 3b72c9905a..5afc877e55 100644 --- a/src/frontends/gtk/LyXScreenFactory.C +++ b/src/frontends/gtk/LyXScreenFactory.C @@ -10,13 +10,10 @@ #include -#include -#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 3b54e273b0..d40ce1b9aa 100644 --- a/src/frontends/gtk/WorkAreaFactory.C +++ b/src/frontends/gtk/WorkAreaFactory.C @@ -9,11 +9,12 @@ */ #include -#include + +#include "GWorkArea.h" #include "frontends/WorkAreaFactory.h" -#include "GWorkArea.h" +#include namespace WorkAreaFactory { diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C index 9fbf7a1b6e..f215c60c74 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -11,15 +11,9 @@ */ #include -#include #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 + #include #include #include @@ -56,11 +62,6 @@ #include #include -//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 e2e495b1fa..4c7daedaef 100644 --- a/src/frontends/gtk/xftFontLoader.C +++ b/src/frontends/gtk/xftFontLoader.C @@ -10,7 +10,6 @@ #include -#include #include "xftFontLoader.h" #include "FontInfo.h" #include "gettext.h" @@ -25,9 +24,6 @@ #include "support/systemcall.h" #include "support/filetools.h" - -#include - #include // fabs() #include diff --git a/src/frontends/gtk/xftFontLoader.h b/src/frontends/gtk/xftFontLoader.h index 8437a6a619..2279a4c557 100644 --- a/src/frontends/gtk/xftFontLoader.h +++ b/src/frontends/gtk/xftFontLoader.h @@ -14,6 +14,7 @@ #include "lyxfont.h" +#include #include class GWorkArea; diff --git a/src/frontends/gtk/xftFontMetrics.C b/src/frontends/gtk/xftFontMetrics.C index 91c36dfd61..466feffba1 100644 --- a/src/frontends/gtk/xftFontMetrics.C +++ b/src/frontends/gtk/xftFontMetrics.C @@ -11,7 +11,6 @@ #include #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 #include -- 2.39.2