From b538a4c8fefd6831cd660265c7ba04ad4cf0d0f2 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Sep 2003 13:15:43 +0000 Subject: [PATCH] Strip out another 180 #includes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7675 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Alert_pimpl.h | 3 ++ src/frontends/xforms/Alert_pimpl.C | 11 ++++--- src/frontends/xforms/ChangeLog | 5 +++ src/frontends/xforms/Color.C | 10 +++--- src/frontends/xforms/ColorHandler.C | 13 ++++---- src/frontends/xforms/Dialogs.C | 5 --- src/frontends/xforms/Dialogs2.C | 1 - src/frontends/xforms/FileDialog.C | 13 +++----- src/frontends/xforms/FontInfo.C | 12 +++---- src/frontends/xforms/FormBase.C | 14 ++++----- src/frontends/xforms/FormBibitem.C | 15 +++++---- src/frontends/xforms/FormBibtex.C | 16 +++++----- src/frontends/xforms/FormBranch.C | 12 ++++--- src/frontends/xforms/FormBrowser.C | 2 +- src/frontends/xforms/FormChanges.C | 6 ++-- src/frontends/xforms/FormCharacter.C | 18 +++++------ src/frontends/xforms/FormCitation.C | 15 ++++----- src/frontends/xforms/FormColorpicker.C | 8 ++--- src/frontends/xforms/FormDialogView.C | 14 ++++----- src/frontends/xforms/FormDocument.C | 31 +++++++----------- src/frontends/xforms/FormDocument.h | 2 +- src/frontends/xforms/FormERT.C | 11 +++---- src/frontends/xforms/FormErrorList.C | 10 ++---- src/frontends/xforms/FormExternal.C | 11 +++---- src/frontends/xforms/FormFiledialog.C | 31 +++++++++--------- src/frontends/xforms/FormFloat.C | 10 ++++-- src/frontends/xforms/FormForks.C | 15 +++++---- src/frontends/xforms/FormGraphics.C | 15 +++------ src/frontends/xforms/FormInclude.C | 13 ++++---- src/frontends/xforms/FormLog.C | 9 +++--- src/frontends/xforms/FormMathsBitmap.C | 18 +++++------ src/frontends/xforms/FormMathsDelim.C | 8 ++--- src/frontends/xforms/FormMathsMatrix.C | 9 +++--- src/frontends/xforms/FormMathsPanel.C | 4 +-- src/frontends/xforms/FormMathsSpace.C | 2 +- src/frontends/xforms/FormMathsStyle.C | 5 ++- src/frontends/xforms/FormMinipage.C | 14 ++++++--- src/frontends/xforms/FormNote.C | 10 +++--- src/frontends/xforms/FormParagraph.C | 23 ++++++-------- src/frontends/xforms/FormPreamble.C | 7 +++-- src/frontends/xforms/FormPreferences.C | 38 ++++++---------------- src/frontends/xforms/FormPreferences.h | 1 + src/frontends/xforms/FormPrint.C | 13 ++++---- src/frontends/xforms/FormRef.C | 14 +++++---- src/frontends/xforms/FormSearch.C | 7 +++-- src/frontends/xforms/FormSendto.C | 12 ++++--- src/frontends/xforms/FormShowFile.C | 8 ++--- src/frontends/xforms/FormSpellchecker.C | 5 +-- src/frontends/xforms/FormTabular.C | 22 +++++-------- src/frontends/xforms/FormTabularCreate.C | 10 +++--- src/frontends/xforms/FormTexinfo.C | 9 +++--- src/frontends/xforms/FormText.C | 9 ++++-- src/frontends/xforms/FormThesaurus.C | 10 +++--- src/frontends/xforms/FormToc.C | 14 ++++----- src/frontends/xforms/FormUrl.C | 8 +++-- src/frontends/xforms/FormVCLog.C | 11 ++++--- src/frontends/xforms/LyXKeySymFactory.C | 1 + src/frontends/xforms/LyXScreenFactory.C | 3 +- src/frontends/xforms/RadioButtonGroup.C | 11 +++---- src/frontends/xforms/Tooltips.C | 8 +++-- src/frontends/xforms/WorkAreaFactory.C | 2 +- src/frontends/xforms/XFormsMenubar.C | 21 +++++++------ src/frontends/xforms/XFormsToolbar.C | 21 ++++++------- src/frontends/xforms/XFormsView.C | 22 ++++++------- src/frontends/xforms/XLyXKeySym.C | 3 +- src/frontends/xforms/XMiniBuffer.C | 7 ++--- src/frontends/xforms/XPainter.C | 19 ++++------- src/frontends/xforms/checkedwidgets.C | 4 +-- src/frontends/xforms/fdesign_base.C | 1 - src/frontends/xforms/forms_gettext.C | 9 +++--- src/frontends/xforms/input_validators.C | 15 +++++---- src/frontends/xforms/input_validators.h | 1 + src/frontends/xforms/lyx_gui.C | 40 +++++++++++------------- src/frontends/xforms/xfont_loader.C | 11 +++---- src/frontends/xforms/xfont_metrics.C | 9 ++++-- src/frontends/xforms/xforms_helpers.C | 10 +++--- src/frontends/xforms/xscreen.C | 25 ++++++--------- src/frontends/xforms/xscreen.h | 4 ++- 78 files changed, 418 insertions(+), 471 deletions(-) diff --git a/src/frontends/Alert_pimpl.h b/src/frontends/Alert_pimpl.h index d128d7de1a..d53cb93bcf 100644 --- a/src/frontends/Alert_pimpl.h +++ b/src/frontends/Alert_pimpl.h @@ -11,6 +11,9 @@ // GUI-specific implementations +#include "LString.h" + + int prompt_pimpl(string const & title, string const & question, int default_button, int escape_button, string const & b1, string const & b2, string const & b3); diff --git a/src/frontends/xforms/Alert_pimpl.C b/src/frontends/xforms/Alert_pimpl.C index 52ea544475..892bd49560 100644 --- a/src/frontends/xforms/Alert_pimpl.C +++ b/src/frontends/xforms/Alert_pimpl.C @@ -10,21 +10,22 @@ #include -#include "Alert.h" #include "Alert_pimpl.h" + #include "forms_gettext.h" -#include "gettext.h" #include "xforms_helpers.h" #include "debug.h" +#include "gettext.h" -#include #include + #include "lyx_forms.h" -using std::pair; -using std::make_pair; using std::endl; +using std::make_pair; +using std::pair; + void warning_pimpl(string const &, string const & message) { diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 9b3374b957..bc1d057f01 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2003-09-05 Angus Leeming + + * *.C: strip out redundant #includes. (180 in total.) + Reorder remaining #includes in consistent fashion. + 2003-09-04 Angus Leeming * Alert_pimpl.C: move #include "debug.h" out of the header file. diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C index 51913f0a9c..75493e7013 100644 --- a/src/frontends/xforms/Color.C +++ b/src/frontends/xforms/Color.C @@ -10,14 +10,14 @@ #include - #include "Color.h" -#include // max -#include // floor -#include + +#include "support/LAssert.h" + #include "lyx_forms.h" + #include "Lsstream.h" -#include "support/LAssert.h" +#include namespace support = lyx::support; diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C index 343922c585..7ad8090a20 100644 --- a/src/frontends/xforms/ColorHandler.C +++ b/src/frontends/xforms/ColorHandler.C @@ -10,17 +10,17 @@ #include - #include "ColorHandler.h" -#include "LColor.h" -#include "gettext.h" + #include "debug.h" +#include "gettext.h" -#include -#include "support/tostr.h" #include "support/lstrings.h" +#include "support/tostr.h" -#include +#include "lyx_forms.h" + +#include using namespace lyx::support; @@ -30,7 +30,6 @@ using std::pow; using std::endl; -#include "lyx_forms.h" namespace { diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C index 03702cb7e7..b8670042e9 100644 --- a/src/frontends/xforms/Dialogs.C +++ b/src/frontends/xforms/Dialogs.C @@ -11,7 +11,6 @@ #include #include "Dialogs.h" -#include "Dialog.h" #include "Tooltips.h" @@ -19,9 +18,7 @@ #include "ControlBibtex.h" #include "ControlBranch.h" #include "ControlChanges.h" -#include "ControlCharacter.h" #include "ControlCitation.h" -#include "ControlCommand.h" #include "ControlErrorList.h" #include "ControlERT.h" #include "ControlExternal.h" @@ -37,7 +34,6 @@ #include "ControlShowFile.h" #include "ControlTabular.h" #include "ControlTabularCreate.h" -#include "ControlTexinfo.h" #include "ControlToc.h" #include "ControlVCLog.h" #include "ControlWrap.h" @@ -99,7 +95,6 @@ #include "ams_nrel.xbm" #include "ams_ops.xbm" -#include namespace { diff --git a/src/frontends/xforms/Dialogs2.C b/src/frontends/xforms/Dialogs2.C index efc2630a57..24d301f3bb 100644 --- a/src/frontends/xforms/Dialogs2.C +++ b/src/frontends/xforms/Dialogs2.C @@ -15,7 +15,6 @@ #include "controllers/GUI.h" #include "ButtonController.h" -#include "Tooltips.h" #include "xformsBC.h" #include "ControlDocument.h" diff --git a/src/frontends/xforms/FileDialog.C b/src/frontends/xforms/FileDialog.C index 95dd4e9608..5729a7966f 100644 --- a/src/frontends/xforms/FileDialog.C +++ b/src/frontends/xforms/FileDialog.C @@ -10,22 +10,19 @@ #include - #include "FormFiledialog.h" -#include "frontends/FileDialog.h" -#include "frontends/LyXView.h" -#include "bufferview_funcs.h" -#include "gettext.h" -#include "lfuns.h" + #include "debug.h" +#include "gettext.h" + #include "support/lstrings.h" -#include using namespace lyx::support; +using std::endl; using std::make_pair; using std::pair; -using std::endl; + FileDialog::FileDialog(string const &t, kb_action s, Button b1, Button b2) : private_(0), title_(t), success_(s) diff --git a/src/frontends/xforms/FontInfo.C b/src/frontends/xforms/FontInfo.C index 77425fb6a3..262627f0ed 100644 --- a/src/frontends/xforms/FontInfo.C +++ b/src/frontends/xforms/FontInfo.C @@ -12,23 +12,23 @@ #include #include "FontInfo.h" + #include "debug.h" #include "lyxrc.h" // lyxrc.use_scalable_fonts -#include "support/tostr.h" +#include "frontends/lyx_gui.h" + #include "support/lstrings.h" #include "support/lyxlib.h" +#include "support/tostr.h" -#include "frontends/lyx_gui.h" - -#include // abs() +#include "lyx_forms.h" using namespace lyx::support; -using std::endl; using std::abs; +using std::endl; -#include "lyx_forms.h" /// Load font close to this size string const FontInfo::getFontname(int size) diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C index 04be532f6a..5b25b5cb29 100644 --- a/src/frontends/xforms/FormBase.C +++ b/src/frontends/xforms/FormBase.C @@ -12,23 +12,23 @@ #include "FormBase.h" -#include "ControlButtons.h" -#include "xformsBC.h" -#include "ButtonController.h" -#include "xforms_resize.h" #include "Tooltips.h" #include "xforms_helpers.h" // formatted +#include "xforms_resize.h" +#include "xformsBC.h" -#include "gettext.h" // _() +#include "controllers/ButtonController.h" +#include "controllers/ControlButtons.h" -#include "support/lstrings.h" -#include "support/LAssert.h" #include "support/filetools.h" // LibFileSearch +#include "support/LAssert.h" +#include "support/lstrings.h" #include "lyx_forms.h" using namespace lyx::support; + extern "C" { #if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0) diff --git a/src/frontends/xforms/FormBibitem.C b/src/frontends/xforms/FormBibitem.C index aecefb20d1..1b9622a742 100644 --- a/src/frontends/xforms/FormBibitem.C +++ b/src/frontends/xforms/FormBibitem.C @@ -9,19 +9,22 @@ * Full author contact details are available in file CREDITS. */ - #include -#include "xformsBC.h" -#include "ControlCommand.h" + #include "FormBibitem.h" -#include "Tooltips.h" +#include "ControlCommand.h" #include "forms/form_bibitem.h" -#include "lyx_forms.h" -#include "gettext.h" + +#include "Tooltips.h" +#include "xformsBC.h" + #include "support/lstrings.h" // compare +#include "lyx_forms.h" + using namespace lyx::support; + typedef FormController > base_class; FormBibitem::FormBibitem(Dialog & parent) diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C index ed236a1ad9..0dee28b1e1 100644 --- a/src/frontends/xforms/FormBibtex.C +++ b/src/frontends/xforms/FormBibtex.C @@ -11,26 +11,26 @@ * Full author contact details are available in file CREDITS. */ - #include -#include "xformsBC.h" -#include "ControlBibtex.h" + #include "FormBibtex.h" +#include "ControlBibtex.h" #include "forms/form_bibtex.h" + #include "Tooltips.h" #include "xforms_helpers.h" -#include "lyx_forms.h" +#include "xformsBC.h" -#include "helper_funcs.h" -#include "gettext.h" -#include "support/lstrings.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "support/lyxalgo.h" +#include "lyx_forms.h" + using namespace lyx::support; -using std::vector; using std::sort; +using std::vector; typedef FormController > base_class; diff --git a/src/frontends/xforms/FormBranch.C b/src/frontends/xforms/FormBranch.C index 9257fd43ee..5b6c68d9f7 100644 --- a/src/frontends/xforms/FormBranch.C +++ b/src/frontends/xforms/FormBranch.C @@ -11,14 +11,16 @@ #include -#include "xformsBC.h" -#include "ControlBranch.h" #include "FormBranch.h" +#include "ControlBranch.h" #include "forms/form_branch.h" -#include "xforms_helpers.h" // formatted -#include "lyx_forms.h" + +#include "xformsBC.h" + #include "insets/insetbranch.h" -#include "debug.h" + +#include "lyx_forms.h" + typedef FormController > base_class; diff --git a/src/frontends/xforms/FormBrowser.C b/src/frontends/xforms/FormBrowser.C index 7dd422bb1e..095dd66096 100644 --- a/src/frontends/xforms/FormBrowser.C +++ b/src/frontends/xforms/FormBrowser.C @@ -10,11 +10,11 @@ #include - #include "FormBrowser.h" #include "forms/form_browser.h" #include "xformsBC.h" + FormBrowser::FormBrowser(Dialog & parent, string const & title, bool allowResize) : FormView(parent, title, allowResize) diff --git a/src/frontends/xforms/FormChanges.C b/src/frontends/xforms/FormChanges.C index b5405dbd98..103a20b382 100644 --- a/src/frontends/xforms/FormChanges.C +++ b/src/frontends/xforms/FormChanges.C @@ -10,14 +10,16 @@ #include -#include "xformsBC.h" -#include "ControlChanges.h" #include "FormChanges.h" +#include "ControlChanges.h" #include "forms/form_changes.h" + +#include "xformsBC.h" #include "xforms_helpers.h" #include "lyx_forms.h" + typedef FormController > base_class; FormChanges::FormChanges(Dialog & parent) diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C index 33191778c2..dc457b3041 100644 --- a/src/frontends/xforms/FormCharacter.C +++ b/src/frontends/xforms/FormCharacter.C @@ -11,27 +11,25 @@ #include -#include "xformsBC.h" -#include "ButtonController.h" -#include "ControlCharacter.h" #include "FormCharacter.h" #include "forms/form_character.h" -#include "gettext.h" -#include "helper_funcs.h" + #include "xforms_helpers.h" -#include "lyx_forms.h" -#include "combox.h" +#include "xformsBC.h" -#include "frnt_lang.h" +#include "controllers/frnt_lang.h" +#include "controllers/helper_funcs.h" #include "support/lstrings.h" -#include +#include "lyx_forms.h" +#include "combox.h" using namespace lyx::support; -using std::vector; using std::find; +using std::vector; + using namespace frnt; diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C index 290920ec42..74b8d18275 100644 --- a/src/frontends/xforms/FormCitation.C +++ b/src/frontends/xforms/FormCitation.C @@ -11,31 +11,28 @@ #include -#include "xformsBC.h" -#include "ControlCitation.h" #include "FormCitation.h" +#include "ControlCitation.h" #include "forms/form_citation.h" -#include "Kernel.h" + #include "Tooltips.h" -#include "helper_funcs.h" #include "xforms_helpers.h" -#include "lyx_forms.h" +#include "xformsBC.h" -#include "gettext.h" -#include "support/LAssert.h" #include "support/lstrings.h" -#include +#include "lyx_forms.h" using namespace lyx::support; using std::find; using std::max; using std::min; -using std::pair; using std::sort; +using std::pair; using std::vector; + namespace { // shamelessly stolen from Menubar_pimpl.C diff --git a/src/frontends/xforms/FormColorpicker.C b/src/frontends/xforms/FormColorpicker.C index 12a755cda0..a1bcf4aafd 100644 --- a/src/frontends/xforms/FormColorpicker.C +++ b/src/frontends/xforms/FormColorpicker.C @@ -13,22 +13,18 @@ #include "FormColorpicker.h" #include "forms/form_colorpicker.h" -#include "xforms_resize.h" #include "Tooltips.h" -#include "Color.h" +#include "xforms_resize.h" #include "gettext.h" #include "lyxrc.h" -#include "support/LAssert.h" #include "support/filetools.h" // LibFileSearch +#include "support/LAssert.h" #include "support/tostr.h" #include "lyx_forms.h" -#include "Lsstream.h" -#include - namespace { diff --git a/src/frontends/xforms/FormDialogView.C b/src/frontends/xforms/FormDialogView.C index 43eaae937a..49ad1bf6e7 100644 --- a/src/frontends/xforms/FormDialogView.C +++ b/src/frontends/xforms/FormDialogView.C @@ -12,24 +12,24 @@ #include "FormDialogView.h" -#include "Dialog.h" -#include "xformsBC.h" -#include "ButtonController.h" -#include "xforms_resize.h" #include "Tooltips.h" #include "xforms_helpers.h" // formatted +#include "xforms_resize.h" +#include "xformsBC.h" + +#include "controllers/ButtonController.h" -#include "gettext.h" // _() #include "lyxrc.h" -#include "support/lstrings.h" -#include "support/LAssert.h" #include "support/filetools.h" // LibFileSearch +#include "support/LAssert.h" +#include "support/lstrings.h" #include "lyx_forms.h" using namespace lyx::support; + extern "C" { #if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0) diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index 0c2df39091..bf1b760137 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -13,53 +13,44 @@ #include -#include "ControlDocument.h" #include "FormDocument.h" +#include "ControlDocument.h" #include "forms/form_document.h" -#include "xformsBC.h" -#include "ButtonController.h" -#include "FormColorpicker.h" -#include "LColor.h" -#include "Lsstream.h" #include "bmtable.h" #include "checkedwidgets.h" -#include "Tooltips.h" +#include "ColorHandler.h" +#include "combox.h" +#include "FormColorpicker.h" #include "input_validators.h" // fl_unsigned_float_filter +#include "Tooltips.h" #include "xforms_helpers.h" +#include "xformsBC.h" + +#include "controllers/ButtonController.h" +#include "controllers/frnt_lang.h" +#include "controllers/helper_funcs.h" -#include "bufferparams.h" -#include "CutAndPaste.h" -#include "debug.h" #include "language.h" #include "lyxrc.h" #include "lyxtextclasslist.h" #include "tex-strings.h" -#include "ColorHandler.h" - -#include "controllers/frnt_lang.h" -#include "controllers/helper_funcs.h" #include "support/tostr.h" #include "support/lstrings.h" // contains_functor, getStringFromVector #include "support/filetools.h" // LibFileSearch #include "lyx_xpm.h" -#include "lyx_forms.h" -#include "combox.h" - -#include -#include #include using namespace lyx::support; using std::bind2nd; -using std::vector; using std::endl; using std::setw; using std::setfill; +using std::vector; namespace { diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h index 54a010c1bc..fd24896fb6 100644 --- a/src/frontends/xforms/FormDocument.h +++ b/src/frontends/xforms/FormDocument.h @@ -12,8 +12,8 @@ #ifndef FORM_DOCUMENT_H #define FORM_DOCUMENT_H - #include "FormBase.h" +#include "BranchList.h" #include diff --git a/src/frontends/xforms/FormERT.C b/src/frontends/xforms/FormERT.C index 54a00cf306..ab2db618d6 100644 --- a/src/frontends/xforms/FormERT.C +++ b/src/frontends/xforms/FormERT.C @@ -10,16 +10,15 @@ #include - -#include "xformsBC.h" -#include "ControlERT.h" #include "FormERT.h" +#include "ControlERT.h" #include "forms/form_ert.h" -#include "support/lstrings.h" -#include "helper_funcs.h" -#include "debug.h" + +#include "xformsBC.h" + #include "lyx_forms.h" + typedef FormController > base_class; FormERT::FormERT(Dialog & parent) diff --git a/src/frontends/xforms/FormErrorList.C b/src/frontends/xforms/FormErrorList.C index 42d545db0e..7ba8af2d17 100644 --- a/src/frontends/xforms/FormErrorList.C +++ b/src/frontends/xforms/FormErrorList.C @@ -10,16 +10,12 @@ #include - -#include "errorlist.h" #include "FormErrorList.h" -#include "xformsBC.h" -#include "xforms_helpers.h" #include "ControlErrorList.h" #include "forms/form_errorlist.h" -#include "support/lstrings.h" // frontStrip, strip -#include "debug.h" -#include "gettext.h" + +#include "xformsBC.h" +#include "xforms_helpers.h" #include "lyx_forms.h" diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C index 4babf83879..7afcb273db 100644 --- a/src/frontends/xforms/FormExternal.C +++ b/src/frontends/xforms/FormExternal.C @@ -12,26 +12,25 @@ #include -#include "xformsBC.h" -#include "ControlExternal.h" #include "FormExternal.h" +#include "ControlExternal.h" #include "forms/form_external.h" -#include "helper_funcs.h" #include "input_validators.h" #include "Tooltips.h" #include "xforms_helpers.h" - -#include "gettext.h" +#include "xformsBC.h" #include "insets/ExternalTemplate.h" -#include "support/tostr.h" #include "support/lstrings.h" +#include "support/tostr.h" + #include "lyx_forms.h" using namespace lyx::support; + typedef FormController > base_class; FormExternal::FormExternal(Dialog & parent) diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C index 7321b5673e..e4f3bf51b8 100644 --- a/src/frontends/xforms/FormFiledialog.C +++ b/src/frontends/xforms/FormFiledialog.C @@ -11,32 +11,29 @@ #include -#include -#include -#include -#include -#include -#include - -using std::map; -using std::max; -using std::sort; +#include "FormFiledialog.h" +#include "forms/form_filedialog.h" -#include "gettext.h" #include "forms_gettext.h" #include "xforms_helpers.h" +#include "frontends/Dialogs.h" + #include "support/FileInfo.h" #include "support/lyxlib.h" #include "support/lstrings.h" #include "support/tostr.h" #include "support/filetools.h" -#include "frontends/Alert.h" -#include "frontends/Dialogs.h" +#include "lyx_forms.h" #include +#include +#include +#include +#include + //#ifdef HAVE_ERRNO_H //#include //#endif @@ -56,13 +53,13 @@ using std::sort; # endif #endif - -#include "FormFiledialog.h" -#include "forms/form_filedialog.h" -#include "lyx_forms.h" +using std::max; +using std::sort; +using std::map; using namespace lyx::support; + namespace { // six months, in seconds diff --git a/src/frontends/xforms/FormFloat.C b/src/frontends/xforms/FormFloat.C index 41847ee3e3..5e85946c21 100644 --- a/src/frontends/xforms/FormFloat.C +++ b/src/frontends/xforms/FormFloat.C @@ -12,19 +12,23 @@ #include - -#include "xformsBC.h" -#include "ControlFloat.h" #include "FormFloat.h" +#include "ControlFloat.h" #include "forms/form_float.h" + #include "Tooltips.h" #include "xforms_helpers.h" +#include "xformsBC.h" + #include "insets/insetfloat.h" + #include "support/lstrings.h" + #include "lyx_forms.h" using namespace lyx::support; + namespace { enum { diff --git a/src/frontends/xforms/FormForks.C b/src/frontends/xforms/FormForks.C index 9f20422ff0..81555e5d9f 100644 --- a/src/frontends/xforms/FormForks.C +++ b/src/frontends/xforms/FormForks.C @@ -11,24 +11,27 @@ #include -#include "xformsBC.h" -#include "ButtonController.h" #include "FormForks.h" #include "ControlForks.h" #include "forms/form_forks.h" + #include "Tooltips.h" -#include "helper_funcs.h" #include "xforms_helpers.h" -#include "gettext.h" +#include "xformsBC.h" + +#include "controllers/ButtonController.h" + #include "support/lstrings.h" -#include "lyx_forms.h" #include "support/tostr.h" +#include "lyx_forms.h" + using namespace lyx::support; -using std::vector; using std::find; using std::find_if; +using std::vector; + typedef FormCB > base_class; diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index 4f28ae5666..d3e54ec07a 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -12,31 +12,26 @@ #include -#include "xformsBC.h" -#include "ControlGraphics.h" #include "FormGraphics.h" +#include "ControlGraphics.h" #include "forms/form_graphics.h" +#include "controllers/helper_funcs.h" // for getStringFromVector + #include "checkedwidgets.h" #include "input_validators.h" #include "Tooltips.h" #include "xforms_helpers.h" +#include "xformsBC.h" -#include "debug.h" // for lyxerr #include "lyxrc.h" // for lyxrc.display_graphics #include "insets/insetgraphicsParams.h" -#include "controllers/helper_funcs.h" // for getStringFromVector - #include "frontends/Alert.h" -#include "support/tostr.h" -#include "support/lstrings.h" // for strToDbl #include "support/lyxlib.h" // for float_equal -#include "support/filetools.h" // for MakeAbsPath etc - -#include "support/BoostFormat.h" +#include "support/tostr.h" #include "lyx_forms.h" diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C index f430ac8adf..6c517666d5 100644 --- a/src/frontends/xforms/FormInclude.C +++ b/src/frontends/xforms/FormInclude.C @@ -12,22 +12,21 @@ #include -#include "debug.h" - -#include "xformsBC.h" -#include "ControlInclude.h" #include "FormInclude.h" +#include "ControlInclude.h" #include "forms/form_include.h" -#include "insets/insetinclude.h" + #include "Tooltips.h" #include "xforms_helpers.h" // setEnabled +#include "xformsBC.h" + #include "support/lstrings.h" // strip -#include "lyx_forms.h" -#include +#include "lyx_forms.h" using namespace lyx::support; + typedef FormController > base_class; FormInclude::FormInclude(Dialog & parent) diff --git a/src/frontends/xforms/FormLog.C b/src/frontends/xforms/FormLog.C index 92c39c64f8..9b0c1418b5 100644 --- a/src/frontends/xforms/FormLog.C +++ b/src/frontends/xforms/FormLog.C @@ -10,14 +10,15 @@ #include - -#include "xformsBC.h" -#include "ControlLog.h" #include "FormLog.h" +#include "ControlLog.h" #include "forms/form_browser.h" -#include "gettext.h" + +#include "xformsBC.h" + #include "lyx_forms.h" + FormLog::FormLog(Dialog & parent) : FormController(parent, _("LaTeX Log")) {} diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C index b97fc84255..1f80642439 100644 --- a/src/frontends/xforms/FormMathsBitmap.C +++ b/src/frontends/xforms/FormMathsBitmap.C @@ -12,29 +12,25 @@ #include - #include "FormMathsBitmap.h" -#include "ControlMath.h" -#include "xformsBC.h" #include "bmtable.h" #include "forms_gettext.h" -#include "gettext.h" -#include "support/LAssert.h" - -#include "lyx_xpm.h" +#include "xformsBC.h" -#include +#include "ControlMath.h" -extern "C" void C_FormDialogView_CancelCB(FL_OBJECT *, long); -extern "C" void C_FormDialogView_InputCB(FL_OBJECT *, long); +#include "support/LAssert.h" using namespace lyx::support; -using std::vector; using std::max; +using std::vector; +extern "C" void C_FormDialogView_CancelCB(FL_OBJECT *, long); +extern "C" void C_FormDialogView_InputCB(FL_OBJECT *, long); + FD_maths_bitmap::~FD_maths_bitmap() { if (form->visible) fl_hide_form(form); diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C index f1e3004bdd..916126f60e 100644 --- a/src/frontends/xforms/FormMathsDelim.C +++ b/src/frontends/xforms/FormMathsDelim.C @@ -13,21 +13,17 @@ #include - #include "FormMathsDelim.h" #include "forms/form_maths_delim.h" #include "ControlMath.h" -#include "xformsBC.h" -#include "ButtonController.h" #include "bmtable.h" +#include "xformsBC.h" -#include "support/lstrings.h" +#include "controllers/ButtonController.h" #include "Lsstream.h" -#include "lyx_forms.h" - #include "delim.xbm" #include "delim0.xpm" #include "delim1.xpm" diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C index 694822381f..b84027102e 100644 --- a/src/frontends/xforms/FormMathsMatrix.C +++ b/src/frontends/xforms/FormMathsMatrix.C @@ -13,21 +13,20 @@ #include - #include "FormMathsMatrix.h" #include "forms/form_maths_matrix.h" #include "ControlMath.h" + #include "xformsBC.h" -#include "ButtonController.h" + +#include "controllers/ButtonController.h" #include "support/LAssert.h" #include "support/lyxalgo.h" // lyx::count -#include "Lsstream.h" - #include "lyx_forms.h" -#include +#include "Lsstream.h" using namespace lyx::support; diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C index 668c31dd0c..b6a1f0bf51 100644 --- a/src/frontends/xforms/FormMathsPanel.C +++ b/src/frontends/xforms/FormMathsPanel.C @@ -13,10 +13,10 @@ #include - -#include "ControlMath.h" #include "FormMathsPanel.h" +#include "ControlMath.h" #include "forms/form_maths_panel.h" + #include "xformsBC.h" #include "lyx_forms.h" diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C index 22043f7fdc..03cce878ca 100644 --- a/src/frontends/xforms/FormMathsSpace.C +++ b/src/frontends/xforms/FormMathsSpace.C @@ -13,7 +13,6 @@ #include - #include "FormMathsSpace.h" #include "forms/form_maths_space.h" #include "ControlMath.h" @@ -21,6 +20,7 @@ #include "lyx_forms.h" + extern char * latex_mathspace[]; typedef FormController > base_class; diff --git a/src/frontends/xforms/FormMathsStyle.C b/src/frontends/xforms/FormMathsStyle.C index f00d82ad3e..b9de12dc42 100644 --- a/src/frontends/xforms/FormMathsStyle.C +++ b/src/frontends/xforms/FormMathsStyle.C @@ -14,19 +14,18 @@ #include - #include "FormMathsStyle.h" #include "forms/form_maths_style.h" #include "ControlMath.h" #include "xformsBC.h" -#include "bmtable.h" - #include "lyx_forms.h" +#include "bmtable.h" #include "style.xbm" #include "font.xbm" + char const * latex_mathstyle[] = { "displaystyle", "textstyle", "scriptstyle", "scriptscriptstyle" }; diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C index e531ae29b8..73f7724054 100644 --- a/src/frontends/xforms/FormMinipage.C +++ b/src/frontends/xforms/FormMinipage.C @@ -10,19 +10,23 @@ #include -#include "xformsBC.h" -#include "ControlMinipage.h" #include "FormMinipage.h" +#include "ControlMinipage.h" #include "forms/form_minipage.h" + +#include "xforms_helpers.h" +#include "xformsBC.h" + +#include "controllers/helper_funcs.h" + #include "support/lstrings.h" #include "support/tostr.h" -#include "helper_funcs.h" -#include "debug.h" -#include "xforms_helpers.h" + #include "lyx_forms.h" using namespace lyx::support; + typedef FormController > base_class; FormMinipage::FormMinipage(Dialog & parent) diff --git a/src/frontends/xforms/FormNote.C b/src/frontends/xforms/FormNote.C index fcaafdf97b..b60e01f6b0 100644 --- a/src/frontends/xforms/FormNote.C +++ b/src/frontends/xforms/FormNote.C @@ -11,16 +11,16 @@ #include -#include "xformsBC.h" -#include "ControlNote.h" #include "FormNote.h" +#include "ControlNote.h" #include "forms/form_note.h" + #include "Tooltips.h" -#include "lyx_forms.h" +#include "xformsBC.h" + #include "insets/insetnote.h" -#include "debug.h" -#include +#include "lyx_forms.h" using std::vector; diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index 4114013b2e..d4323fbf22 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -11,35 +11,32 @@ #include -#include "ControlParagraph.h" #include "FormParagraph.h" +#include "ControlParagraph.h" #include "forms/form_paragraph.h" + +#include "checkedwidgets.h" +#include "input_validators.h" #include "Tooltips.h" +#include "xforms_helpers.h" +#include "xformsBC.h" -#include "ParagraphParameters.h" +#include "controllers/helper_funcs.h" -#include "xforms_helpers.h" #include "lyxrc.h" // to set the deafult length values -#include "input_validators.h" -#include "helper_funcs.h" -#include "checkedwidgets.h" -#include "gettext.h" -#include "xformsBC.h" -#include "layout.h" // LyXAlignment +#include "ParagraphParameters.h" +#include "support/LAssert.h" #include "support/lstrings.h" #include "support/tostr.h" -#include "support/LAssert.h" #include "lyx_forms.h" -#include - using namespace lyx::support; -using std::vector; using std::bind2nd; using std::remove_if; +using std::vector; namespace diff --git a/src/frontends/xforms/FormPreamble.C b/src/frontends/xforms/FormPreamble.C index 7c80fffd88..ff1fb401f5 100644 --- a/src/frontends/xforms/FormPreamble.C +++ b/src/frontends/xforms/FormPreamble.C @@ -10,15 +10,16 @@ #include - -#include "xformsBC.h" -#include "ControlPreamble.h" #include "FormPreamble.h" +#include "ControlPreamble.h" #include "forms/form_preamble.h" + #include "xforms_helpers.h" +#include "xformsBC.h" #include "lyx_forms.h" + typedef FormCB > base_class; FormPreamble::FormPreamble() diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index 93b5a78149..231179bf08 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -10,63 +10,45 @@ #include -#include "ControlPrefs.h" #include "FormPreferences.h" +#include "ControlPrefs.h" #include "forms/form_preferences.h" -#include "xformsBC.h" -#include "ButtonController.h" #include "FormColorpicker.h" -#include "Color.h" -#include "input_validators.h" #include "forms_gettext.h" -#include "xforms_helpers.h" -#include "helper_funcs.h" // getSecond +#include "input_validators.h" +#include "xformsBC.h" + +#include "controllers/helper_funcs.h" // getSecond #include "buffer.h" #include "converter.h" #include "format.h" -#include "debug.h" -#include "language.h" #include "frnt_lang.h" -#include "lyxlex.h" -#include "lyxrc.h" -#include "LColor.h" -#include "Lsstream.h" -#include "funcrequest.h" -#include "author.h" +#include "support/LAssert.h" #include "support/lstrings.h" -#include "support/lyxfunctional.h" -#include "support/lyxmanip.h" #include "support/tostr.h" #include "support/path_defines.h" #include "support/filetools.h" -#include "support/LAssert.h" - -#include "graphics/GraphicsCache.h" -#include "graphics/GraphicsTypes.h" - -#include #include "lyx_forms.h" #include "combox.h" -#include #include -#include using std::endl; -using std::pair; using std::make_pair; using std::max; using std::min; -using std::vector; -using std::setw; using std::setfill; +using std::setw; +using std::pair; +using std::vector; using namespace lyx::support; + namespace { // These should probably go inside the class definition... diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h index 7fbaf3343b..fbdd557076 100644 --- a/src/frontends/xforms/FormPreferences.h +++ b/src/frontends/xforms/FormPreferences.h @@ -26,6 +26,7 @@ class ControlPrefs; class Dialogs; +class LyXRC; class LyXView; class RGBColor; class FormColorpicker; diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C index 77141b5fc7..8fc58c280f 100644 --- a/src/frontends/xforms/FormPrint.C +++ b/src/frontends/xforms/FormPrint.C @@ -11,23 +11,24 @@ #include -#include "xformsBC.h" -#include "ControlPrint.h" #include "FormPrint.h" +#include "ControlPrint.h" #include "forms/form_print.h" + +#include "input_validators.h" #include "Tooltips.h" +#include "xforms_helpers.h" +#include "xformsBC.h" #include "PrinterParams.h" -#include "input_validators.h" -#include "xforms_helpers.h" +#include "support/tostr.h" #include "lyx_forms.h" -#include "support/tostr.h" -#include "support/lstrings.h" using namespace lyx::support; + typedef FormCB > base_class; diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C index b087175bcb..ed670c6470 100644 --- a/src/frontends/xforms/FormRef.C +++ b/src/frontends/xforms/FormRef.C @@ -10,18 +10,19 @@ #include -#include "xformsBC.h" -#include "ControlRef.h" #include "FormRef.h" -#include "Tooltips.h" +#include "ControlRef.h" #include "forms/form_ref.h" + +#include "Tooltips.h" #include "xforms_helpers.h" +#include "xformsBC.h" + #include "insets/insetref.h" -#include "helper_funcs.h" // getStringFromVector + #include "support/lstrings.h" // trim -#include "lyx_forms.h" -#include +#include "lyx_forms.h" using namespace lyx::support; @@ -30,6 +31,7 @@ using std::max; using std::sort; using std::vector; + typedef FormController > base_class; FormRef::FormRef(Dialog & parent) diff --git a/src/frontends/xforms/FormSearch.C b/src/frontends/xforms/FormSearch.C index 1f5c7f0d9d..d48206335f 100644 --- a/src/frontends/xforms/FormSearch.C +++ b/src/frontends/xforms/FormSearch.C @@ -10,16 +10,17 @@ #include - -#include "xformsBC.h" -#include "ControlSearch.h" #include "FormSearch.h" +#include "ControlSearch.h" #include "forms/form_search.h" + #include "Tooltips.h" #include "xforms_helpers.h" +#include "xformsBC.h" #include "lyx_forms.h" + typedef FormCB > base_class; FormSearch::FormSearch() diff --git a/src/frontends/xforms/FormSendto.C b/src/frontends/xforms/FormSendto.C index ed51f74b92..6c86a2cfd6 100644 --- a/src/frontends/xforms/FormSendto.C +++ b/src/frontends/xforms/FormSendto.C @@ -11,20 +11,24 @@ #include #include "FormSendto.h" -#include "forms/form_sendto.h" #include "ControlSendto.h" -#include "xformsBC.h" +#include "forms/form_sendto.h" + #include "Tooltips.h" #include "xforms_helpers.h" +#include "xformsBC.h" + #include "format.h" -#include "gettext.h" -#include "lyx_forms.h" + #include "support/lstrings.h" +#include "lyx_forms.h" + using namespace lyx::support; using std::vector; + typedef FormCB > base_class; FormSendto::FormSendto() diff --git a/src/frontends/xforms/FormShowFile.C b/src/frontends/xforms/FormShowFile.C index d348e1273a..594a87d158 100644 --- a/src/frontends/xforms/FormShowFile.C +++ b/src/frontends/xforms/FormShowFile.C @@ -10,12 +10,12 @@ #include - -#include "xformsBC.h" -#include "ControlShowFile.h" #include "FormShowFile.h" +#include "ControlShowFile.h" #include "forms/form_browser.h" -#include "gettext.h" + +#include "xformsBC.h" + #include "lyx_forms.h" diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C index 5273d8d6f4..9982b04650 100644 --- a/src/frontends/xforms/FormSpellchecker.C +++ b/src/frontends/xforms/FormSpellchecker.C @@ -10,20 +10,21 @@ #include -#include "xformsBC.h" #include "FormSpellchecker.h" #include "ControlSpellchecker.h" #include "forms/form_spellchecker.h" -#include "forms_gettext.h" #include "Tooltips.h" #include "xforms_helpers.h" +#include "xformsBC.h" + #include "support/tostr.h" #include "lyx_forms.h" using std::endl; + typedef FormCB > base_class; FormSpellchecker::FormSpellchecker() diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C index 0156f34b5d..96fc8631d7 100644 --- a/src/frontends/xforms/FormTabular.C +++ b/src/frontends/xforms/FormTabular.C @@ -10,30 +10,24 @@ #include -#include "ControlTabular.h" -#include "xformsBC.h" -#include "ButtonController.h" -#include "insets/insettabular.h" - #include "FormTabular.h" +#include "ControlTabular.h" #include "forms/form_tabular.h" -#include "debug.h" + #include "xforms_helpers.h" -#include "gettext.h" -#include "lyxrc.h" -#include "helper_funcs.h" -#include "input_validators.h" +#include "xformsBC.h" + +#include "controllers/ButtonController.h" +#include "controllers/helper_funcs.h" + #include "support/lstrings.h" #include "lyx_forms.h" -#include -#include - using namespace lyx::support; -using std::vector; using std::bind2nd; +using std::vector; namespace { diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C index c0d9a30868..ba1eb4811b 100644 --- a/src/frontends/xforms/FormTabularCreate.C +++ b/src/frontends/xforms/FormTabularCreate.C @@ -9,17 +9,15 @@ */ #include -#include - -#include "xformsBC.h" -#include "ControlTabularCreate.h" #include "FormTabularCreate.h" +#include "ControlTabularCreate.h" #include "forms/form_tabular_create.h" + #include "Tooltips.h" -#include "support/lstrings.h" -#include "lyx_forms.h" +#include "xformsBC.h" +#include "lyx_forms.h" using std::make_pair; diff --git a/src/frontends/xforms/FormTexinfo.C b/src/frontends/xforms/FormTexinfo.C index 387af22073..21a35feeac 100644 --- a/src/frontends/xforms/FormTexinfo.C +++ b/src/frontends/xforms/FormTexinfo.C @@ -10,20 +10,19 @@ #include -#include "xformsBC.h" #include "FormTexinfo.h" #include "forms/form_texinfo.h" + #include "Tooltips.h" -#include "gettext.h" -#include "xforms_helpers.h" -#include "support/LAssert.h" -#include "support/lstrings.h" +#include "xformsBC.h" + #include "support/filetools.h" #include "lyx_forms.h" using namespace lyx::support; + typedef FormController > base_class; FormTexinfo::FormTexinfo(Dialog & parent) diff --git a/src/frontends/xforms/FormText.C b/src/frontends/xforms/FormText.C index 67f406f9a7..8b9ad1a650 100644 --- a/src/frontends/xforms/FormText.C +++ b/src/frontends/xforms/FormText.C @@ -10,19 +10,22 @@ #include -#include "xformsBC.h" -#include "ButtonController.h" -#include "ControlCommand.h" #include "FormText.h" +#include "ControlCommand.h" #include "forms/form_text.h" + +#include "xformsBC.h" #include "forms_gettext.h" +#include "controllers/ButtonController.h" + #include "support/lstrings.h" #include "lyx_forms.h" using namespace lyx::support; + typedef FormController > base_class; FormText::FormText(Dialog & parent, string const & title, string const & label) diff --git a/src/frontends/xforms/FormThesaurus.C b/src/frontends/xforms/FormThesaurus.C index 7d2a043f1f..ed3d23aa36 100644 --- a/src/frontends/xforms/FormThesaurus.C +++ b/src/frontends/xforms/FormThesaurus.C @@ -10,16 +10,16 @@ #include -#include "ControlThesaurus.h" #include "FormThesaurus.h" +#include "ControlThesaurus.h" #include "forms/form_thesaurus.h" -#include "xformsBC.h" + #include "xforms_helpers.h" -#include "debug.h" +#include "xformsBC.h" + #include "support/lstrings.h" -#include "lyx_forms.h" -#include +#include "lyx_forms.h" using namespace lyx::support; diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C index dd7c268fa5..3ec8fcba04 100644 --- a/src/frontends/xforms/FormToc.C +++ b/src/frontends/xforms/FormToc.C @@ -10,23 +10,21 @@ #include - #include "FormToc.h" -#include "xformsBC.h" -#include "xforms_helpers.h" #include "ControlToc.h" #include "forms/form_toc.h" + +#include "xforms_helpers.h" +#include "xformsBC.h" + #include "support/lstrings.h" // frontStrip, strip -#include "debug.h" -#include "gettext.h" -#include "lyx_forms.h" -#include +#include "lyx_forms.h" using namespace lyx::support; -using std::vector; using std::endl; +using std::vector; typedef FormController > base_class; diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C index 82ca50c438..9d52023ac9 100644 --- a/src/frontends/xforms/FormUrl.C +++ b/src/frontends/xforms/FormUrl.C @@ -11,13 +11,15 @@ #include - -#include "xformsBC.h" -#include "ControlCommand.h" #include "FormUrl.h" +#include "ControlCommand.h" #include "forms/form_url.h" + +#include "xformsBC.h" + #include "lyx_forms.h" + typedef FormController > base_class; FormUrl::FormUrl(Dialog & parent) diff --git a/src/frontends/xforms/FormVCLog.C b/src/frontends/xforms/FormVCLog.C index fd74688463..6ac73101a8 100644 --- a/src/frontends/xforms/FormVCLog.C +++ b/src/frontends/xforms/FormVCLog.C @@ -9,16 +9,17 @@ */ #include -#include "Lsstream.h" - -#include "xformsBC.h" -#include "ControlVCLog.h" #include "FormVCLog.h" +#include "ControlVCLog.h" #include "forms/form_browser.h" -#include "gettext.h" + +#include "xformsBC.h" + #include "lyx_forms.h" +#include "Lsstream.h" + FormVCLog::FormVCLog(Dialog & parent) : FormController(parent, _("Version Control Log")) diff --git a/src/frontends/xforms/LyXKeySymFactory.C b/src/frontends/xforms/LyXKeySymFactory.C index f16becfb78..928482e5d4 100644 --- a/src/frontends/xforms/LyXKeySymFactory.C +++ b/src/frontends/xforms/LyXKeySymFactory.C @@ -14,6 +14,7 @@ #include "XLyXKeySym.h" + namespace LyXKeySymFactory { LyXKeySym * create() diff --git a/src/frontends/xforms/LyXScreenFactory.C b/src/frontends/xforms/LyXScreenFactory.C index 4aeca687f3..b17a549d9f 100644 --- a/src/frontends/xforms/LyXScreenFactory.C +++ b/src/frontends/xforms/LyXScreenFactory.C @@ -12,8 +12,9 @@ #include "frontends/LyXScreenFactory.h" -#include "XWorkArea.h" #include "xscreen.h" +#include "XWorkArea.h" + namespace LyXScreenFactory { diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C index a12937aca0..d859db950e 100644 --- a/src/frontends/xforms/RadioButtonGroup.C +++ b/src/frontends/xforms/RadioButtonGroup.C @@ -11,22 +11,21 @@ #include - #include "RadioButtonGroup.h" -#include "lyx_forms.h" + #include "xforms_helpers.h" +#include "debug.h" + #include "support/LAssert.h" -#include "debug.h" // for lyxerr #include "support/lyxfunctional.h" -#include -#include +#include "lyx_forms.h" using namespace lyx::support; -using std::find_if; using std::endl; +using std::find_if; void RadioButtonGroup::init(FL_OBJECT * ob, size_type value) diff --git a/src/frontends/xforms/Tooltips.C b/src/frontends/xforms/Tooltips.C index 693063ea5a..76cbf85e1c 100644 --- a/src/frontends/xforms/Tooltips.C +++ b/src/frontends/xforms/Tooltips.C @@ -16,18 +16,20 @@ #include - #include "Tooltips.h" + #include "xforms_helpers.h" // formatted -#include "gettext.h" -#include "support/lstrings.h" + #include "support/LAssert.h" +#include "support/lstrings.h" + #include "lyx_forms.h" #include using namespace lyx::support; + bool Tooltips::enabled_ = true; boost::signal0 Tooltips::toggled; diff --git a/src/frontends/xforms/WorkAreaFactory.C b/src/frontends/xforms/WorkAreaFactory.C index 5d7cb3e1dc..4f194df64f 100644 --- a/src/frontends/xforms/WorkAreaFactory.C +++ b/src/frontends/xforms/WorkAreaFactory.C @@ -11,9 +11,9 @@ #include #include "frontends/WorkAreaFactory.h" - #include "XWorkArea.h" + namespace WorkAreaFactory { WorkArea * create(int x, int y, int w, int h) diff --git a/src/frontends/xforms/XFormsMenubar.C b/src/frontends/xforms/XFormsMenubar.C index 9aa5654da8..424b855319 100644 --- a/src/frontends/xforms/XFormsMenubar.C +++ b/src/frontends/xforms/XFormsMenubar.C @@ -12,27 +12,28 @@ #include #include "XFormsMenubar.h" -#include "MenuBackend.h" + #include "XFormsView.h" + +#include "debug.h" +#include "gettext.h" #include "lyxfunc.h" +#include "MenuBackend.h" + +#include "support/LAssert.h" #include "support/lstrings.h" #include "support/tostr.h" -#include "support/LAssert.h" -#include "gettext.h" -#include "debug.h" -#include "lyx_forms.h" - -//#include -#include +#include "lyx_forms.h" using namespace lyx::support; using std::endl; -using std::vector; +using std::for_each; using std::max; using std::min; -using std::for_each; +using std::vector; + typedef vector::size_type size_type; diff --git a/src/frontends/xforms/XFormsToolbar.C b/src/frontends/xforms/XFormsToolbar.C index 88a448d354..8cc94a499f 100644 --- a/src/frontends/xforms/XFormsToolbar.C +++ b/src/frontends/xforms/XFormsToolbar.C @@ -13,28 +13,25 @@ #include - #include "XFormsToolbar.h" -#include "debug.h" + +#include "Tooltips.h" +#include "xforms_helpers.h" #include "XFormsView.h" -#include "lyxfunc.h" -#include "FuncStatus.h" + #include "buffer.h" +#include "debug.h" #include "funcrequest.h" +#include "FuncStatus.h" #include "gettext.h" -#include "Tooltips.h" +#include "lyxfunc.h" + #include "lyx_forms.h" #include "combox.h" -#include "xforms_helpers.h" - -#include "LyXAction.h" - -#include "support/LAssert.h" -#include "support/filetools.h" -#include "support/lstrings.h" using std::endl; + // some constants const int standardspacing = 2; // the usual space between items const int sepspace = 6; // extra space diff --git a/src/frontends/xforms/XFormsView.C b/src/frontends/xforms/XFormsView.C index 4ce0bae8c6..4c9595a68a 100644 --- a/src/frontends/xforms/XFormsView.C +++ b/src/frontends/xforms/XFormsView.C @@ -10,33 +10,29 @@ #include - #include "XFormsView.h" -#include "lyx_forms.h" -#include "XMiniBuffer.h" #include "XFormsMenubar.h" #include "XFormsToolbar.h" +#include "XMiniBuffer.h" + +#include "BufferView.h" #include "debug.h" -#include "intl.h" -#include "lyxrc.h" -#include "support/filetools.h" // OnlyFilename() -#include "frontends/Timeout.h" -#include "frontends/Dialogs.h" -#include "MenuBackend.h" -#include "ToolbarBackend.h" #include "lyxfunc.h" -#include "bufferview_funcs.h" -#include "BufferView.h" +#include "MenuBackend.h" + +#include "frontends/Dialogs.h" + +#include "support/filetools.h" // OnlyFilename() #include -#include using namespace lyx::support; using std::abs; using std::endl; + //extern void AutoSave(BufferView *); extern void QuitLyX(); diff --git a/src/frontends/xforms/XLyXKeySym.C b/src/frontends/xforms/XLyXKeySym.C index 3d052724c0..d32b15ba8d 100644 --- a/src/frontends/xforms/XLyXKeySym.C +++ b/src/frontends/xforms/XLyXKeySym.C @@ -10,16 +10,15 @@ #include - #include "XLyXKeySym.h" #include "debug.h" -#include #include using std::endl; + XLyXKeySym::XLyXKeySym() : LyXKeySym(), keysym_(NoSymbol) { diff --git a/src/frontends/xforms/XMiniBuffer.C b/src/frontends/xforms/XMiniBuffer.C index f111364c82..968973d3e0 100644 --- a/src/frontends/xforms/XMiniBuffer.C +++ b/src/frontends/xforms/XMiniBuffer.C @@ -12,19 +12,18 @@ #include #include "XMiniBuffer.h" -#include "ControlCommandBuffer.h" + #include "freebrowser.h" #include "xforms_helpers.h" -#include "gettext.h" +#include "controllers/ControlCommandBuffer.h" #include "frontends/Timeout.h" -#include "support/lstrings.h" +#include "gettext.h" #include -#include #ifndef CXX_GLOBAL_CSTD using std::isprint; diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C index 190700b543..7a937d34f9 100644 --- a/src/frontends/xforms/XPainter.C +++ b/src/frontends/xforms/XPainter.C @@ -12,25 +12,18 @@ #include #include "XPainter.h" -#include "LString.h" -#include "debug.h" -#include "XWorkArea.h" -#include "xfont_metrics.h" -#include "lyxfont.h" + #include "ColorHandler.h" -#include "lyxrc.h" +#include "xfont_metrics.h" +#include "xformsImage.h" +#include "XWorkArea.h" + #include "encoding.h" #include "language.h" +#include "lyxfont.h" -#include "xformsImage.h" - -#include "support/LAssert.h" #include "support/lstrings.h" -#include - -#include - using namespace lyx::support; using std::endl; diff --git a/src/frontends/xforms/checkedwidgets.C b/src/frontends/xforms/checkedwidgets.C index f526eee31f..1088a8fd4f 100644 --- a/src/frontends/xforms/checkedwidgets.C +++ b/src/frontends/xforms/checkedwidgets.C @@ -13,16 +13,16 @@ #include "checkedwidgets.h" #include "xforms_helpers.h" -#include "lyxlength.h" #include "lyxgluelength.h" + #include "support/LAssert.h" #include "support/lstrings.h" -#include "LString.h" #include "lyx_forms.h" using namespace lyx::support; + void addCheckedLyXLength(BCView & bcview, FL_OBJECT * input, FL_OBJECT * label) { diff --git a/src/frontends/xforms/fdesign_base.C b/src/frontends/xforms/fdesign_base.C index 1b530ec679..3a9add497f 100644 --- a/src/frontends/xforms/fdesign_base.C +++ b/src/frontends/xforms/fdesign_base.C @@ -10,7 +10,6 @@ #include - #include "fdesign_base.h" #include "lyx_forms.h" diff --git a/src/frontends/xforms/forms_gettext.C b/src/frontends/xforms/forms_gettext.C index 377eb20554..c2126a3886 100644 --- a/src/frontends/xforms/forms_gettext.C +++ b/src/frontends/xforms/forms_gettext.C @@ -9,16 +9,17 @@ */ #include - #include "forms_gettext.h" + #include "support/lstrings.h" -using namespace lyx::support; +namespace support = lyx::support; + // Extract shortcut from "|" string string const scex(string const & str) { - return split(str, '|'); + return support::split(str, '|'); } @@ -26,6 +27,6 @@ string const scex(string const & str) string const idex(string const & str) { string identifier; - split(str, identifier, '|'); + support::split(str, identifier, '|'); return identifier; } diff --git a/src/frontends/xforms/input_validators.C b/src/frontends/xforms/input_validators.C index f07e2343f3..c4e3389f0b 100644 --- a/src/frontends/xforms/input_validators.C +++ b/src/frontends/xforms/input_validators.C @@ -10,11 +10,14 @@ #include -#include "lyx_forms.h" -#include "support/lstrings.h" #include "input_validators.h" -using namespace lyx::support; +#include "support/lstrings.h" + +#include "lyx_forms.h" + +namespace support = lyx::support; + #if defined(__cplusplus) extern "C" @@ -26,7 +29,7 @@ int fl_int_filter(FL_OBJECT * ob, { if (c == 0 /* final test before handing contents to app */ || strchr("0123456789+-", c)) { - if (isStrInt(fl_get_input(ob))) + if (support::isStrInt(fl_get_input(ob))) return FL_VALID; } return FL_INVALID|FL_RINGBELL; @@ -50,7 +53,7 @@ int fl_float_filter(FL_OBJECT * ob, { if (c == 0 /* final test before handing contents to app */ || strchr("0123456789.+-", c)) { - if (isStrDbl(fl_get_input(ob))) + if (support::isStrDbl(fl_get_input(ob))) return FL_VALID; } return FL_INVALID|FL_RINGBELL; @@ -64,7 +67,7 @@ int fl_unsigned_float_filter(FL_OBJECT * ob, { if (c == 0 /* final test before handing contents to app */ || strchr("0123456789.", c)) { - if (isStrDbl(fl_get_input(ob))) + if (support::isStrDbl(fl_get_input(ob))) return FL_VALID; } return FL_INVALID|FL_RINGBELL; diff --git a/src/frontends/xforms/input_validators.h b/src/frontends/xforms/input_validators.h index 24cf49ec4d..1de507c9d8 100644 --- a/src/frontends/xforms/input_validators.h +++ b/src/frontends/xforms/input_validators.h @@ -18,6 +18,7 @@ #ifndef INPUT_VALIDATORS_H #define INPUT_VALIDATORS_H +#include "forms_fwd.h" #if defined(__cplusplus) extern "C" diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C index f4dec197f3..95b752e9b9 100644 --- a/src/frontends/xforms/lyx_gui.C +++ b/src/frontends/xforms/lyx_gui.C @@ -12,38 +12,35 @@ #include #include "lyx_gui.h" +#include "ColorHandler.h" +#include "xfont_loader.h" +#include "xforms_helpers.h" +#include "xformsImage.h" +#include "XFormsView.h" -#include "support/lyxlib.h" -#include "support/os.h" -#include "support/filetools.h" -#include "support/path_defines.h" - +#include "bufferlist.h" +#include "BufferView.h" #include "debug.h" #include "gettext.h" - #include "lyx_main.h" +#include "lyxfunc.h" #include "lyxrc.h" -#include "lyxfont.h" +#include "lyxserver.h" + #include "graphics/LoaderQueue.h" -// FIXME: move this stuff out again -#include "bufferlist.h" -#include "buffer_funcs.h" -#include "lyxfunc.h" -#include "lyxserver.h" -#include "BufferView.h" -#include "XFormsView.h" +#include "support/lyxlib.h" +#include "support/os.h" +#include "support/filetools.h" +#include "support/path_defines.h" #include "lyx_forms.h" -#include "ColorHandler.h" -#include "xforms_helpers.h" -#include "xfont_loader.h" -#include "xformsImage.h" + +#include #include "Lsstream.h" #include #include -#include using namespace lyx::support; @@ -51,13 +48,14 @@ using namespace lyx::support; using std::exit; #endif -using std::vector; -using std::hex; using std::dec; using std::endl; +using std::hex; using std::setbase; using std::setfill; using std::setw; +using std::vector; + extern BufferList bufferlist; diff --git a/src/frontends/xforms/xfont_loader.C b/src/frontends/xforms/xfont_loader.C index f1fc103592..9a8e9b7a26 100644 --- a/src/frontends/xforms/xfont_loader.C +++ b/src/frontends/xforms/xfont_loader.C @@ -9,19 +9,17 @@ */ #include -#include // fabs() - #include "xfont_loader.h" #include "FontInfo.h" -#include "gettext.h" + #include "debug.h" #include "lyxrc.h" // lyxrc.font_* -#include "BufferView.h" -#include "frontends/LyXView.h" + #include "frontends/lyx_gui.h" -#include "support/systemcall.h" + #include "support/filetools.h" +#include "support/systemcall.h" #include "lyx_forms.h" @@ -29,6 +27,7 @@ using namespace lyx::support; using std::endl; + // The global fontloader xfont_loader fontloader; diff --git a/src/frontends/xforms/xfont_metrics.C b/src/frontends/xforms/xfont_metrics.C index 294cc9fe5d..9139707d39 100644 --- a/src/frontends/xforms/xfont_metrics.C +++ b/src/frontends/xforms/xfont_metrics.C @@ -11,18 +11,21 @@ #include -#include "support/lstrings.h" -#include "frontends/lyx_gui.h" #include "xfont_metrics.h" #include "xfont_loader.h" -#include "lyxrc.h" + #include "encoding.h" #include "language.h" +#include "frontends/lyx_gui.h" + +#include "support/lstrings.h" + #include using namespace lyx::support; + namespace { inline diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C index 71a656e754..4eb4b5db74 100644 --- a/src/frontends/xforms/xforms_helpers.C +++ b/src/frontends/xforms/xforms_helpers.C @@ -12,17 +12,15 @@ #include "xforms_helpers.h" -#include "lyxlex.h" #include "gettext.h" -#include "lyxlength.h" #include "lyxgluelength.h" -#include "Lsstream.h" +#include "lyxlex.h" -#include "support/LAssert.h" #include "support/FileInfo.h" #include "support/filetools.h" -#include "support/tostr.h" +#include "support/LAssert.h" #include "support/lstrings.h" // frontStrip, strip +#include "support/tostr.h" #include "lyx_forms.h" #include "combox.h" @@ -31,10 +29,10 @@ using namespace lyx::support; +using std::make_pair; using std::ofstream; using std::pair; using std::vector; -using std::make_pair; bool isActive(FL_OBJECT * ob) diff --git a/src/frontends/xforms/xscreen.C b/src/frontends/xforms/xscreen.C index 4ef197adfc..7521699b0d 100644 --- a/src/frontends/xforms/xscreen.C +++ b/src/frontends/xforms/xscreen.C @@ -11,29 +11,18 @@ #include - -#include -#include - -#include "frontends/screen.h" -#include "frontends/font_metrics.h" -#include "XWorkArea.h" #include "xscreen.h" -#include "lyxtext.h" -#include "lyxrow.h" -#include "Painter.h" -#include "WorkArea.h" -#include "buffer.h" -#include "BufferView.h" -#include "insets/insettext.h" + #include "ColorHandler.h" -#include "language.h" +#include "XWorkArea.h" + #include "debug.h" using std::endl; using std::max; using std::min; + namespace { GC createGC() @@ -69,6 +58,12 @@ XScreen::~XScreen() } +WorkArea & XScreen::workarea() const +{ + return owner_; +} + + void XScreen::setCursorColor() { if (!lyxColorHandler.get()) diff --git a/src/frontends/xforms/xscreen.h b/src/frontends/xforms/xscreen.h index 420c31db0f..68eb4cca0f 100644 --- a/src/frontends/xforms/xscreen.h +++ b/src/frontends/xforms/xscreen.h @@ -17,8 +17,10 @@ #include "screen.h" #include // for Pixmap, GC +class WorkArea; class XWorkArea; + /** The class XScreen is used for the main Textbody. Concretely, the screen is held in a pixmap. This pixmap is kept up to date and used to optimize drawing on the screen. @@ -37,7 +39,7 @@ public: protected: /// get the work area - virtual WorkArea & workarea() const { return owner_; } + virtual WorkArea & workarea() const; /// Copies specified area of pixmap to screen virtual void expose(int x, int y, int w, int h); -- 2.39.2