From 7070d9305c598ccf25e6979e7acfb9b4f4870a3e Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Sep 2003 14:56:51 +0000 Subject: [PATCH] Strip out another 350 redundant #includes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7678 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/Alert_pimpl.C | 9 +++------ src/frontends/qt2/BulletsModule.C | 4 ---- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/Dialogs.C | 2 -- src/frontends/qt2/Dialogs2.C | 5 ----- src/frontends/qt2/FileDialog.C | 4 ---- src/frontends/qt2/FileDialog_private.C | 5 ----- src/frontends/qt2/LyXKeySymFactory.C | 1 - src/frontends/qt2/LyXScreenFactory.C | 1 - src/frontends/qt2/QAbout.C | 2 -- src/frontends/qt2/QBibitem.C | 2 -- src/frontends/qt2/QBibitemDialog.C | 1 - src/frontends/qt2/QBibtex.C | 3 --- src/frontends/qt2/QBibtexDialog.C | 6 ------ src/frontends/qt2/QBrowseBox.C | 5 ----- src/frontends/qt2/QChangesDialog.C | 1 - src/frontends/qt2/QCharacter.C | 5 ----- src/frontends/qt2/QCharacterDialog.C | 3 --- src/frontends/qt2/QCitation.C | 3 --- src/frontends/qt2/QCitationDialog.C | 5 ----- src/frontends/qt2/QCommandBuffer.C | 4 ---- src/frontends/qt2/QContentPane.C | 4 ---- src/frontends/qt2/QDelimiterDialog.C | 3 --- src/frontends/qt2/QDialogView.C | 5 ----- src/frontends/qt2/QDocument.C | 11 ----------- src/frontends/qt2/QDocumentDialog.C | 16 ---------------- src/frontends/qt2/QERT.C | 1 - src/frontends/qt2/QErrorList.C | 4 ---- src/frontends/qt2/QErrorListDialog.C | 2 -- src/frontends/qt2/QExternal.C | 1 - src/frontends/qt2/QExternalDialog.C | 2 -- src/frontends/qt2/QFloat.C | 3 --- src/frontends/qt2/QFloatDialog.C | 3 --- src/frontends/qt2/QGraphics.C | 8 -------- src/frontends/qt2/QGraphicsDialog.C | 6 ------ src/frontends/qt2/QInclude.C | 1 - src/frontends/qt2/QIncludeDialog.C | 5 ----- src/frontends/qt2/QLImage.C | 2 -- src/frontends/qt2/QLMenubar.C | 10 ---------- src/frontends/qt2/QLPainter.C | 10 ---------- src/frontends/qt2/QLPopupMenu.C | 3 --- src/frontends/qt2/QLPrintDialog.C | 4 ---- src/frontends/qt2/QLToolbar.C | 10 ---------- src/frontends/qt2/QLog.C | 1 - src/frontends/qt2/QLogDialog.C | 4 ---- src/frontends/qt2/QLyXKeySym.C | 1 - src/frontends/qt2/QMath.C | 1 - src/frontends/qt2/QMathDialog.C | 7 ------- src/frontends/qt2/QMathMatrixDialog.C | 2 -- src/frontends/qt2/QMinipage.C | 3 --- src/frontends/qt2/QMinipageDialog.C | 4 ---- src/frontends/qt2/QNote.C | 1 - src/frontends/qt2/QParagraph.C | 5 ----- src/frontends/qt2/QParagraphDialog.C | 1 - src/frontends/qt2/QPrefs.C | 6 ------ src/frontends/qt2/QPrefsDialog.C | 6 ------ src/frontends/qt2/QPrint.C | 2 -- src/frontends/qt2/QRef.C | 2 -- src/frontends/qt2/QRefDialog.C | 2 -- src/frontends/qt2/QSearch.C | 3 --- src/frontends/qt2/QSearchDialog.C | 2 -- src/frontends/qt2/QSendto.C | 2 -- src/frontends/qt2/QSendtoDialog.C | 8 -------- src/frontends/qt2/QShowFileDialog.C | 1 - src/frontends/qt2/QSpellchecker.C | 2 -- src/frontends/qt2/QSpellcheckerDialog.C | 2 -- src/frontends/qt2/QTabular.C | 3 --- src/frontends/qt2/QTabularCreate.C | 2 -- src/frontends/qt2/QTabularCreateDialog.C | 2 -- src/frontends/qt2/QTabularDialog.C | 4 ---- src/frontends/qt2/QTexinfo.C | 3 --- src/frontends/qt2/QTexinfoDialog.C | 3 --- src/frontends/qt2/QThesaurus.C | 1 - src/frontends/qt2/QThesaurusDialog.C | 2 -- src/frontends/qt2/QToc.C | 4 ---- src/frontends/qt2/QURL.C | 1 - src/frontends/qt2/QVCLog.C | 2 -- src/frontends/qt2/QVCLogDialog.C | 4 ---- src/frontends/qt2/QWorkArea.C | 3 --- src/frontends/qt2/QWrap.C | 3 --- src/frontends/qt2/QWrapDialog.C | 4 ---- src/frontends/qt2/Qt2BC.C | 1 - src/frontends/qt2/Qt2Base.C | 5 ----- src/frontends/qt2/QtView.C | 9 --------- src/frontends/qt2/WorkAreaFactory.C | 1 - src/frontends/qt2/iconpalette.C | 1 - src/frontends/qt2/lengthcombo.C | 2 -- src/frontends/qt2/lyx_gui.C | 15 --------------- src/frontends/qt2/qcoloritem.C | 2 -- src/frontends/qt2/qfont_loader.C | 8 -------- src/frontends/qt2/qfont_metrics.C | 5 ----- src/frontends/qt2/qscreen.C | 7 ------- src/frontends/qt2/qsetborder.C | 2 -- src/frontends/qt2/qt_helpers.C | 2 -- src/frontends/qt2/qttableview.C | 4 +--- 95 files changed, 8 insertions(+), 354 deletions(-) diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C index 5a29fd89a6..615728cebc 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -10,6 +10,9 @@ #include +#include "Alert_pimpl.h" +#include "Alert.h" + #include #include #include @@ -19,12 +22,6 @@ #include -#include "Alert.h" -#include "Alert_pimpl.h" - -#include "support/BoostFormat.h" -#include "gettext.h" - using std::pair; using std::make_pair; using lyx::support::bformat; diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C index e3f202a6b5..34b17505bc 100644 --- a/src/frontends/qt2/BulletsModule.C +++ b/src/frontends/qt2/BulletsModule.C @@ -14,16 +14,12 @@ #include "support/filetools.h" #include "support/LAssert.h" -#include "debug.h" -#include "Bullet.h" -#include "ui/BulletsModuleBase.h" #include "QBrowseBox.h" #include "BulletsModule.h" #include #include -#include #include #include diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 481d396b7b..617ec8c180 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2003-09-05 Angus Leeming + + * *.C: strip out redundant #includes. (352 in total.) + 2003-09-03 Juergen Spitzmueller * ui/QTabularDialogBase.ui: fix typo in tooltip. diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index b3b56aa571..a72c78b81c 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -11,7 +11,6 @@ #include #include "Dialogs.h" -#include "Dialog.h" #include "ControlAboutlyx.h" #include "ControlBibtex.h" @@ -33,7 +32,6 @@ #include "ControlShowFile.h" #include "ControlTabular.h" #include "ControlTabularCreate.h" -#include "ControlTexinfo.h" #include "ControlToc.h" #include "ControlVCLog.h" #include "ControlWrap.h" diff --git a/src/frontends/qt2/Dialogs2.C b/src/frontends/qt2/Dialogs2.C index a54da69030..e6ab5fb5c6 100644 --- a/src/frontends/qt2/Dialogs2.C +++ b/src/frontends/qt2/Dialogs2.C @@ -17,15 +17,11 @@ #include "ButtonController.h" #include "ControlDocument.h" -#include "ControlForks.h" -#include "ControlPrefs.h" #include "ControlPrint.h" #include "ControlSearch.h" #include "ControlSendto.h" #include "ControlSpellchecker.h" -#include "QCharacter.h" -#include "QCharacterDialog.h" #include "QDocument.h" #include "QDocumentDialog.h" //#include "QForks.h" @@ -44,7 +40,6 @@ #include "QSpellchecker.h" #include "QSpellcheckerDialog.h" -#include "Qt2BC.h" diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C index 4f6b1fd5d5..5434d6bae3 100644 --- a/src/frontends/qt2/FileDialog.C +++ b/src/frontends/qt2/FileDialog.C @@ -11,16 +11,12 @@ #include -#include "lfuns.h" -#include "LString.h" #include "frontends/FileDialog.h" #include "FileDialog_private.h" #include "debug.h" #include "qt_helpers.h" #include "gettext.h" -#include - #include using std::make_pair; diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt2/FileDialog_private.C index 2caef9d874..b583d96003 100644 --- a/src/frontends/qt2/FileDialog_private.C +++ b/src/frontends/qt2/FileDialog_private.C @@ -11,17 +11,12 @@ #include -#include "QtLyXView.h" -#include "debug.h" -#include "funcrequest.h" -#include "lyxfunc.h" #include "FileDialog_private.h" #include "qt_helpers.h" #include "support/lstrings.h" #include -#include #include using namespace lyx::support; diff --git a/src/frontends/qt2/LyXKeySymFactory.C b/src/frontends/qt2/LyXKeySymFactory.C index a750ade81d..13826ad794 100644 --- a/src/frontends/qt2/LyXKeySymFactory.C +++ b/src/frontends/qt2/LyXKeySymFactory.C @@ -10,7 +10,6 @@ #include - #include "frontends/LyXKeySymFactory.h" #include "QLyXKeySym.h" diff --git a/src/frontends/qt2/LyXScreenFactory.C b/src/frontends/qt2/LyXScreenFactory.C index 88a6d85ced..6bcb0183d9 100644 --- a/src/frontends/qt2/LyXScreenFactory.C +++ b/src/frontends/qt2/LyXScreenFactory.C @@ -10,7 +10,6 @@ #include - #include "frontends/LyXScreenFactory.h" #include "QWorkArea.h" diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C index 26339ce92c..9e5789dc2b 100644 --- a/src/frontends/qt2/QAbout.C +++ b/src/frontends/qt2/QAbout.C @@ -13,9 +13,7 @@ #include "support/lstrings.h" #include "Lsstream.h" -#include "debug.h" #include "qt_helpers.h" -#include "LyXView.h" #include "ButtonController.h" #include "ControlAboutlyx.h" diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt2/QBibitem.C index dbeef7aacd..68db3c66d4 100644 --- a/src/frontends/qt2/QBibitem.C +++ b/src/frontends/qt2/QBibitem.C @@ -11,11 +11,9 @@ #include -#include "support/lstrings.h" #include "ControlCommand.h" #include "qt_helpers.h" -#include "debug.h" #include #include diff --git a/src/frontends/qt2/QBibitemDialog.C b/src/frontends/qt2/QBibitemDialog.C index 3ba8b651fb..768aa424a2 100644 --- a/src/frontends/qt2/QBibitemDialog.C +++ b/src/frontends/qt2/QBibitemDialog.C @@ -11,7 +11,6 @@ #include #include -#include #include "QBibitemDialog.h" #include "QBibitem.h" diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index fab93a10c0..5a5c4ccc7c 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -16,12 +16,9 @@ #include "ControlBibtex.h" #include "qt_helpers.h" -#include "debug.h" #include "support/filetools.h" // ChangeExtension -#include "support/lstrings.h" // getVectorFromString -#include #include #include #include diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C index 7ab503df65..626c30af9a 100644 --- a/src/frontends/qt2/QBibtexDialog.C +++ b/src/frontends/qt2/QBibtexDialog.C @@ -11,26 +11,20 @@ #include -#include "ControlBibtex.h" #include "qt_helpers.h" -#include "debug.h" #include "support/filetools.h" -#include "support/lyxalgo.h" // eliminate_duplicates -#include #include #include #include #include -#include #include #include "ui/QBibtexAddDialogBase.h" #include "QBibtexDialog.h" #include "QBibtex.h" -#include using namespace lyx::support; diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt2/QBrowseBox.C index 0e4ea87487..5b09b6b76e 100644 --- a/src/frontends/qt2/QBrowseBox.C +++ b/src/frontends/qt2/QBrowseBox.C @@ -10,19 +10,14 @@ #include -#include #include -#include #include #include #include #include -#include #include "QBrowseBox.h" -#include -#include QBrowseBox::QBrowseBox(int rows, int cols, QWidget* parent, const char * name, WFlags f) diff --git a/src/frontends/qt2/QChangesDialog.C b/src/frontends/qt2/QChangesDialog.C index f24884672f..d6927ef5f1 100644 --- a/src/frontends/qt2/QChangesDialog.C +++ b/src/frontends/qt2/QChangesDialog.C @@ -10,7 +10,6 @@ #include -#include "ControlChanges.h" #include diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C index 90bfe51272..d372f35795 100644 --- a/src/frontends/qt2/QCharacter.C +++ b/src/frontends/qt2/QCharacter.C @@ -14,17 +14,12 @@ #include "ControlCharacter.h" #include "QCharacterDialog.h" -#include "QCharacter.h" #include "Qt2BC.h" #include "qt_helpers.h" -#include "support/lstrings.h" -#include -#include #include -#include using namespace frnt; using std::vector; diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt2/QCharacterDialog.C index f0c0778600..6649cd12eb 100644 --- a/src/frontends/qt2/QCharacterDialog.C +++ b/src/frontends/qt2/QCharacterDialog.C @@ -13,10 +13,7 @@ #include "QCharacterDialog.h" -#include -#include #include -#include QCharacterDialog::QCharacterDialog(QCharacter * form) diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C index 868c450323..93030b036f 100644 --- a/src/frontends/qt2/QCitation.C +++ b/src/frontends/qt2/QCitation.C @@ -23,13 +23,10 @@ #include #include -#include "QtLyXView.h" #include "Qt2BC.h" #include "ControlCitation.h" -#include "debug.h" #include "qt_helpers.h" #include "support/lstrings.h" -#include "helper_funcs.h" using namespace lyx::support; diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C index ffdfcf0e63..7673bf436e 100644 --- a/src/frontends/qt2/QCitationDialog.C +++ b/src/frontends/qt2/QCitationDialog.C @@ -11,24 +11,19 @@ #include -#include #include "qt_helpers.h" #include "controllers/ControlCitation.h" -#include "debug.h" #include -#include #include #include #include #include -#include #include "ui/QCitationFindDialogBase.h" #include "QCitationDialog.h" #include "QCitation.h" -#include "support/lstrings.h" using std::vector; using std::find; diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C index b1bedcf1d7..34d4c9e914 100644 --- a/src/frontends/qt2/QCommandBuffer.C +++ b/src/frontends/qt2/QCommandBuffer.C @@ -14,20 +14,16 @@ #include "support/filetools.h" #include "controllers/ControlCommandBuffer.h" #include "qt_helpers.h" -#include "debug.h" #include "QtView.h" #include "QCommandBuffer.h" #include "QCommandEdit.h" -#include #include -#include #include #include #include -#include "LString.h" using namespace lyx::support; diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C index 7f3fc3f19f..5735402c4b 100644 --- a/src/frontends/qt2/QContentPane.C +++ b/src/frontends/qt2/QContentPane.C @@ -11,18 +11,14 @@ #include -#include "debug.h" #include "QWorkArea.h" #include "QLyXKeySym.h" #include "funcrequest.h" -#include "qt_helpers.h" -#include #include #include #include -#include using std::endl; diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C index 64b9444ac5..3d93d688ef 100644 --- a/src/frontends/qt2/QDelimiterDialog.C +++ b/src/frontends/qt2/QDelimiterDialog.C @@ -11,9 +11,7 @@ #include -#include "support/filetools.h" #include "qt_helpers.h" -#include "debug.h" #include "ControlMath.h" #include "QMath.h" @@ -23,7 +21,6 @@ #include #include -#include #include namespace { diff --git a/src/frontends/qt2/QDialogView.C b/src/frontends/qt2/QDialogView.C index b7fcb4690d..be09daa4ca 100644 --- a/src/frontends/qt2/QDialogView.C +++ b/src/frontends/qt2/QDialogView.C @@ -11,16 +11,11 @@ #include -#include -#include -#include "debug.h" #include "qt_helpers.h" -#include "QtLyXView.h" #include "QDialogView.h" #include "Qt2BC.h" #include "ButtonController.h" -#include "support/LAssert.h" QDialogView::QDialogView(Dialog & parent, string const & t) diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 240bcdd9f6..188453d435 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -15,38 +15,27 @@ #include "ControlDocument.h" #include "QDocument.h" #include "QDocumentDialog.h" -#include "Qt2BC.h" #include "language.h" #include "helper_funcs.h" // getSecond() -#include "insets/insetquotes.h" #include "frnt_lang.h" #include "lyxrc.h" // defaultUnit #include "tex-strings.h" // tex_graphics #include "support/tostr.h" #include "support/lstrings.h" -#include "support/filetools.h" // LibFileSearch() -#include "support/BoostFormat.h" #include "lyxtextclasslist.h" -#include "vspace.h" -#include "bufferparams.h" -#include "qt_helpers.h" #include "floatplacement.h" #include #include #include -#include #include #include #include -#include #include "lengthcombo.h" -#include "QBrowseBox.h" -#include using std::vector; using lyx::support::bformat; diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index a15326771d..7112f29376 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -10,7 +10,6 @@ #include -#include "buffer.h" //*here* because of braindead qt headers's #define signals #include "qt_helpers.h" @@ -20,33 +19,18 @@ #include "QDocumentDialog.h" -#include "ui/TextLayoutModuleBase.h" -#include "ui/MathsModuleBase.h" -#include "ui/LaTeXModuleBase.h" -#include "ui/PageLayoutModuleBase.h" -#include "ui/LanguageModuleBase.h" -#include "ui/BulletsModuleBase.h" -#include "BulletsModule.h" -#include "ui/BiblioModuleBase.h" -#include "ui/NumberingModuleBase.h" -#include "ui/MarginsModuleBase.h" -#include "ui/PreambleModuleBase.h" #include "panelstack.h" #include "floatplacement.h" -#include "Spacing.h" #include "support/lstrings.h" #include "lyxrc.h" -#include -#include #include #include #include #include #include -#include #include #include #include diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt2/QERT.C index c8ba365b90..a9e450439e 100644 --- a/src/frontends/qt2/QERT.C +++ b/src/frontends/qt2/QERT.C @@ -12,7 +12,6 @@ #include "ControlERT.h" -#include "qt_helpers.h" #include #include diff --git a/src/frontends/qt2/QErrorList.C b/src/frontends/qt2/QErrorList.C index 1bfde1a0a4..da89c04933 100644 --- a/src/frontends/qt2/QErrorList.C +++ b/src/frontends/qt2/QErrorList.C @@ -10,11 +10,7 @@ #include -#include "LyXView.h" -#include "errorlist.h" #include "qt_helpers.h" -#include "support/lstrings.h" -#include "debug.h" #include "ControlErrorList.h" #include "QErrorList.h" diff --git a/src/frontends/qt2/QErrorListDialog.C b/src/frontends/qt2/QErrorListDialog.C index 424a321a66..72f1efefd8 100644 --- a/src/frontends/qt2/QErrorListDialog.C +++ b/src/frontends/qt2/QErrorListDialog.C @@ -13,10 +13,8 @@ #include "QErrorList.h" #include "QErrorListDialog.h" -#include "qt_helpers.h" #include -#include #include diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C index 0d476b1937..2ad19f3ffc 100644 --- a/src/frontends/qt2/QExternal.C +++ b/src/frontends/qt2/QExternal.C @@ -29,7 +29,6 @@ #include "QExternal.h" #include "Qt2BC.h" -#include using namespace lyx::support; diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C index 5ff2e5afa0..78f6f43dcd 100644 --- a/src/frontends/qt2/QExternalDialog.C +++ b/src/frontends/qt2/QExternalDialog.C @@ -14,10 +14,8 @@ #include "qt_helpers.h" #include "ControlExternal.h" -#include #include #include -#include #include #include #include diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C index 83885139d4..0b2312f406 100644 --- a/src/frontends/qt2/QFloat.C +++ b/src/frontends/qt2/QFloat.C @@ -14,14 +14,11 @@ #include "QFloatDialog.h" #include "QFloat.h" #include "Qt2BC.h" -#include "qt_helpers.h" #include "floatplacement.h" #include "insets/insetfloat.h" -#include "support/lstrings.h" #include -#include typedef QController > base_class; diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C index fd651a41d9..ebb70581b6 100644 --- a/src/frontends/qt2/QFloatDialog.C +++ b/src/frontends/qt2/QFloatDialog.C @@ -11,14 +11,11 @@ #include -#include "LString.h" -#include "ControlFloat.h" #include "floatplacement.h" #include -#include #include "QFloatDialog.h" #include "QFloat.h" diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 4bd606530a..a2e3f72d2a 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -12,13 +12,10 @@ #include -#include "QtLyXView.h" #include "ControlGraphics.h" #include "controllers/helper_funcs.h" #include "support/lstrings.h" #include "support/tostr.h" -#include "support/FileInfo.h" -#include "support/filetools.h" #include "support/lyxlib.h" #include "insets/insetgraphicsParams.h" //#include "bufferparams.h" @@ -26,16 +23,11 @@ #include "lengthcombo.h" #include "qt_helpers.h" #include "lengthcommon.h" -#include "lyxlength.h" -#include "debug.h" #include #include #include -#include -#include #include -#include #include #include "QGraphicsDialog.h" diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C index b7a431b206..b7af1442d6 100644 --- a/src/frontends/qt2/QGraphicsDialog.C +++ b/src/frontends/qt2/QGraphicsDialog.C @@ -15,21 +15,15 @@ #include "ControlGraphics.h" #include "debug.h" #include "qt_helpers.h" -#include "LString.h" -#include #include #include -#include -#include -#include #include "lengthcombo.h" #include "QGraphicsDialog.h" #include "QGraphics.h" -#include QGraphicsDialog::QGraphicsDialog(QGraphics * form) diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C index 795e99b9b6..a989a09858 100644 --- a/src/frontends/qt2/QInclude.C +++ b/src/frontends/qt2/QInclude.C @@ -13,7 +13,6 @@ #include "ControlInclude.h" #include "qt_helpers.h" -#include "debug.h" #include "QIncludeDialog.h" #include "QInclude.h" diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt2/QIncludeDialog.C index 22116ad16c..16addf6b20 100644 --- a/src/frontends/qt2/QIncludeDialog.C +++ b/src/frontends/qt2/QIncludeDialog.C @@ -11,11 +11,7 @@ #include -#include "ControlInclude.h" -#include "debug.h" -#include "LString.h" -#include #include #include #include @@ -23,7 +19,6 @@ #include "QIncludeDialog.h" #include "QInclude.h" -#include QIncludeDialog::QIncludeDialog(QInclude * form) diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C index c94fe43103..6d06884df0 100644 --- a/src/frontends/qt2/QLImage.C +++ b/src/frontends/qt2/QLImage.C @@ -16,13 +16,11 @@ #include "graphics/GraphicsParams.h" #include "format.h" #include "debug.h" -#include "support/LAssert.h" #include "support/lstrings.h" // lowercase #include "support/lyxfunctional.h" // compare_memfun #include "qt_helpers.h" #include -#include #include #include diff --git a/src/frontends/qt2/QLMenubar.C b/src/frontends/qt2/QLMenubar.C index 55d8bab79c..d9a20ecb77 100644 --- a/src/frontends/qt2/QLMenubar.C +++ b/src/frontends/qt2/QLMenubar.C @@ -11,15 +11,6 @@ #include #include "MenuBackend.h" -#include "LyXAction.h" -#include "kbmap.h" -#include "buffer.h" -#include "lyxfunc.h" -#include "FloatList.h" -#include "support/lstrings.h" -#include "support/LAssert.h" -#include "qt_helpers.h" -#include "debug.h" #include "QtView.h" #include "QLMenubar.h" @@ -28,7 +19,6 @@ #include #include -#include using std::endl; using std::vector; diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C index 10105fe916..e9d6a6715c 100644 --- a/src/frontends/qt2/QLPainter.C +++ b/src/frontends/qt2/QLPainter.C @@ -12,27 +12,17 @@ #include "font_metrics.h" -#include "support/lstrings.h" -#include "lyxrc.h" #include "debug.h" -#include "LyXView.h" -#include "encoding.h" #include "language.h" #include "QWorkArea.h" #include "qfont_loader.h" -#include "QLPainter.h" #include "QLImage.h" -#include "qt_helpers.h" #include "lcolorcache.h" -#include #include -#include -#include -#include using std::endl; diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C index 396392f075..5461dfc03a 100644 --- a/src/frontends/qt2/QLPopupMenu.C +++ b/src/frontends/qt2/QLPopupMenu.C @@ -13,8 +13,6 @@ #include "support/lstrings.h" #include "MenuBackend.h" -#include "lyxfunc.h" -#include "debug.h" #include "QtView.h" @@ -22,7 +20,6 @@ #include "QLPopupMenu.h" #include "qt_helpers.h" -#include using namespace lyx::support; diff --git a/src/frontends/qt2/QLPrintDialog.C b/src/frontends/qt2/QLPrintDialog.C index 1347baaf39..8679e77b4b 100644 --- a/src/frontends/qt2/QLPrintDialog.C +++ b/src/frontends/qt2/QLPrintDialog.C @@ -13,19 +13,15 @@ #include "qt_helpers.h" -#include "support/filetools.h" -#include "support/lstrings.h" #include "QPrint.h" #include "QLPrintDialog.h" #include #include -#include #include #include #include -#include QLPrintDialog::QLPrintDialog(QPrint * f) diff --git a/src/frontends/qt2/QLToolbar.C b/src/frontends/qt2/QLToolbar.C index 4b00eda082..8f088fa8ca 100644 --- a/src/frontends/qt2/QLToolbar.C +++ b/src/frontends/qt2/QLToolbar.C @@ -18,24 +18,14 @@ #include "lyxfunc.h" #include "funcrequest.h" #include "FuncStatus.h" -#include "BufferView.h" #include "buffer.h" -#include "LyXAction.h" -#include "qt_helpers.h" -#include "support/LAssert.h" -#include "support/filetools.h" -#include "support/lstrings.h" -#include #include "QtView.h" #include "QLToolbar.h" -#include #include -#include -#include using std::endl; diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C index 9ee37326e8..8a3496524a 100644 --- a/src/frontends/qt2/QLog.C +++ b/src/frontends/qt2/QLog.C @@ -11,7 +11,6 @@ #include -#include "LyXView.h" #include "qt_helpers.h" #include "ControlLog.h" #include "Lsstream.h" diff --git a/src/frontends/qt2/QLogDialog.C b/src/frontends/qt2/QLogDialog.C index 1cba12d2df..c0ad20f694 100644 --- a/src/frontends/qt2/QLogDialog.C +++ b/src/frontends/qt2/QLogDialog.C @@ -11,16 +11,12 @@ #include -#include "LyXView.h" -#include "ControlLog.h" #include -#include #include "QLogDialog.h" #include "QLog.h" -#include QLogDialog::QLogDialog(QLog * form) diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C index 45fcf70d87..63e6dd3218 100644 --- a/src/frontends/qt2/QLyXKeySym.C +++ b/src/frontends/qt2/QLyXKeySym.C @@ -20,7 +20,6 @@ #include #include -#include using std::endl; using std::map; diff --git a/src/frontends/qt2/QMath.C b/src/frontends/qt2/QMath.C index 3cd33c825f..1060a29805 100644 --- a/src/frontends/qt2/QMath.C +++ b/src/frontends/qt2/QMath.C @@ -12,7 +12,6 @@ #include "gettext.h" -#include "ControlMath.h" #include "QMathDialog.h" #include "QMathMatrixDialog.h" #include "QDelimiterDialog.h" diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C index e5ab47c750..9388054fa3 100644 --- a/src/frontends/qt2/QMathDialog.C +++ b/src/frontends/qt2/QMathDialog.C @@ -11,9 +11,7 @@ #include -#include "support/filetools.h" #include "qt_helpers.h" -#include "debug.h" #include "ControlMath.h" @@ -22,16 +20,11 @@ #include "iconpalette.h" -#include #include #include #include #include -#include -#include -#include #include -#include using std::min; using std::max; diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C index 42e3d12126..264dcb8479 100644 --- a/src/frontends/qt2/QMathMatrixDialog.C +++ b/src/frontends/qt2/QMathMatrixDialog.C @@ -12,7 +12,6 @@ #include "qt_helpers.h" -#include "support/lstrings.h" #include "Lsstream.h" #include "ControlMath.h" @@ -20,7 +19,6 @@ #include "QMathMatrixDialog.h" #include -#include #include #include #include diff --git a/src/frontends/qt2/QMinipage.C b/src/frontends/qt2/QMinipage.C index b4f2e0be0a..7a0c7439ae 100644 --- a/src/frontends/qt2/QMinipage.C +++ b/src/frontends/qt2/QMinipage.C @@ -10,11 +10,9 @@ #include -#include "debug.h" #include "qt_helpers.h" #include "support/tostr.h" #include "support/lstrings.h" -#include "LyXView.h" #include "ControlMinipage.h" #include "QMinipage.h" @@ -23,7 +21,6 @@ #include "lengthcombo.h" #include -#include #include using namespace lyx::support; diff --git a/src/frontends/qt2/QMinipageDialog.C b/src/frontends/qt2/QMinipageDialog.C index 4a7f8526cf..884dd00b2b 100644 --- a/src/frontends/qt2/QMinipageDialog.C +++ b/src/frontends/qt2/QMinipageDialog.C @@ -11,16 +11,12 @@ #include -#include "ControlMinipage.h" #include "QMinipage.h" #include "QMinipageDialog.h" #include -#include -#include "lengthcombo.h" -#include QMinipageDialog::QMinipageDialog(QMinipage * form) diff --git a/src/frontends/qt2/QNote.C b/src/frontends/qt2/QNote.C index dc10f0457e..25ad1eeef9 100644 --- a/src/frontends/qt2/QNote.C +++ b/src/frontends/qt2/QNote.C @@ -11,7 +11,6 @@ #include #include "ControlNote.h" -#include "qt_helpers.h" #include "insets/insetnote.h" #include diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C index 2565bc58f4..11e9ed2e6e 100644 --- a/src/frontends/qt2/QParagraph.C +++ b/src/frontends/qt2/QParagraph.C @@ -17,14 +17,10 @@ #include "ParagraphParameters.h" #include "lyxrc.h" // to set the deafult length values #include "qt_helpers.h" -#include "layout.h" // LyXAlignment #include "helper_funcs.h" -#include "lyxgluelength.h" -#include "vspace.h" #include "support/lstrings.h" #include "support/tostr.h" -#include "support/LAssert.h" #include #include @@ -33,7 +29,6 @@ #include #include -#include using namespace lyx::support; diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C index a4a9c02756..fb0e6cf458 100644 --- a/src/frontends/qt2/QParagraphDialog.C +++ b/src/frontends/qt2/QParagraphDialog.C @@ -23,7 +23,6 @@ #include "qt_helpers.h" -#include "helper_funcs.h" using std::vector; diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index 818f7e7963..967e0adf80 100644 --- a/src/frontends/qt2/QPrefs.C +++ b/src/frontends/qt2/QPrefs.C @@ -26,8 +26,6 @@ #include "ui/QPrefDisplayModule.h" #include "ui/QPrefPathsModule.h" #include "ui/QPrefSpellcheckerModule.h" -#include "ui/QPrefConvertersModule.h" -#include "ui/QPrefFileformatsModule.h" #include "ui/QPrefLanguageModule.h" #include "ui/QPrefPrinterModule.h" #include "ui/QPrefUIModule.h" @@ -35,13 +33,11 @@ #include "lyx_gui.h" #include "QPrefs.h" #include "Qt2BC.h" -#include "lyxrc.h" #include "lyxfont.h" #include "frnt_lang.h" #include "helper_funcs.h" #include "qt_helpers.h" #include "lcolorcache.h" -#include "debug.h" #include @@ -50,9 +46,7 @@ #include #include #include -#include #include -#include #include "qcoloritem.h" using namespace lyx::support; diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C index 0195b9bc84..bee666f740 100644 --- a/src/frontends/qt2/QPrefsDialog.C +++ b/src/frontends/qt2/QPrefsDialog.C @@ -33,22 +33,16 @@ #include "ui/QPrefUIModule.h" #include "ui/QPrefIdentityModule.h" -#include "support/lstrings.h" -#include "lyxrc.h" -#include "debug.h" #include "gettext.h" #include "panelstack.h" #include -#include #include #include #include #include #include -#include #include -#include #include "qcoloritem.h" #include "qfontexample.h" diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C index b7e9f33382..56eca6bded 100644 --- a/src/frontends/qt2/QPrint.C +++ b/src/frontends/qt2/QPrint.C @@ -12,10 +12,8 @@ #include -#include "LyXView.h" #include "PrinterParams.h" #include "ControlPrint.h" -#include "support/lstrings.h" #include "qt_helpers.h" #include "QPrint.h" diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C index a1debaf030..98310bfe55 100644 --- a/src/frontends/qt2/QRef.C +++ b/src/frontends/qt2/QRef.C @@ -25,8 +25,6 @@ #include #include -#include "helper_funcs.h" // getStringFromVector -#include "support/lstrings.h" // frontStrip, strip #include "qt_helpers.h" using std::find; diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C index b179e9daa9..1bae4f0976 100644 --- a/src/frontends/qt2/QRefDialog.C +++ b/src/frontends/qt2/QRefDialog.C @@ -12,8 +12,6 @@ #include -#include "ControlRef.h" -#include "debug.h" #include "QRef.h" #include "QRefDialog.h" diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C index dfbb326560..6023887337 100644 --- a/src/frontends/qt2/QSearch.C +++ b/src/frontends/qt2/QSearch.C @@ -11,16 +11,13 @@ #include -#include "LyXView.h" #include "ControlSearch.h" -#include "qt_helpers.h" #include "QSearch.h" #include "QSearchDialog.h" #include "Qt2BC.h" #include -#include #include diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C index 07cd5acbe6..b9e0715c38 100644 --- a/src/frontends/qt2/QSearchDialog.C +++ b/src/frontends/qt2/QSearchDialog.C @@ -14,14 +14,12 @@ #include "ControlSearch.h" #include "QSearchDialog.h" #include "QSearch.h" -#include "debug.h" #include "qt_helpers.h" #include #include #include #include -#include namespace { diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt2/QSendto.C index 5de676ab45..524c14e3ad 100644 --- a/src/frontends/qt2/QSendto.C +++ b/src/frontends/qt2/QSendto.C @@ -17,11 +17,9 @@ #include "QSendto.h" #include -#include #include #include -#include "debug.h" #include "qt_helpers.h" #include "format.h" diff --git a/src/frontends/qt2/QSendtoDialog.C b/src/frontends/qt2/QSendtoDialog.C index 78318658e8..a3b0695a62 100644 --- a/src/frontends/qt2/QSendtoDialog.C +++ b/src/frontends/qt2/QSendtoDialog.C @@ -11,16 +11,8 @@ #include -#include -#include "ControlSendto.h" -#include "qt_helpers.h" -#include "debug.h" -#include "LString.h" -#include -#include -#include #include #include "QSendtoDialog.h" diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt2/QShowFileDialog.C index 6b223b0c49..c3552a9ba1 100644 --- a/src/frontends/qt2/QShowFileDialog.C +++ b/src/frontends/qt2/QShowFileDialog.C @@ -14,7 +14,6 @@ #include "QShowFile.h" #include "QShowFileDialog.h" -#include #include diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C index ff82d5566e..f6121b7d9c 100644 --- a/src/frontends/qt2/QSpellchecker.C +++ b/src/frontends/qt2/QSpellchecker.C @@ -16,10 +16,8 @@ #include "QSpellchecker.h" #include "Qt2BC.h" #include "qt_helpers.h" -#include "debug.h" #include -#include #include #include #include diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C index bfd6da76dd..11fb821525 100644 --- a/src/frontends/qt2/QSpellcheckerDialog.C +++ b/src/frontends/qt2/QSpellcheckerDialog.C @@ -13,10 +13,8 @@ #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" -#include "qt_helpers.h" #include -#include #include #include diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C index f0fc3df869..9db9f9c298 100644 --- a/src/frontends/qt2/QTabular.C +++ b/src/frontends/qt2/QTabular.C @@ -13,11 +13,8 @@ #include #include "ControlTabular.h" -#include "insets/insettabular.h" #include "qt_helpers.h" -#include "support/lstrings.h" #include "support/tostr.h" -#include "lyxrc.h" #include "QTabularDialog.h" #include "QTabular.h" diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt2/QTabularCreate.C index 794bf75685..d2444a2a05 100644 --- a/src/frontends/qt2/QTabularCreate.C +++ b/src/frontends/qt2/QTabularCreate.C @@ -15,8 +15,6 @@ #include "QTabularCreateDialog.h" #include "QTabularCreate.h" #include "Qt2BC.h" -#include "qt_helpers.h" -#include "debug.h" #include #include diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt2/QTabularCreateDialog.C index 5e3ee07e76..99a19d3bce 100644 --- a/src/frontends/qt2/QTabularCreateDialog.C +++ b/src/frontends/qt2/QTabularCreateDialog.C @@ -12,9 +12,7 @@ #include -#include "qt_helpers.h" -#include "support/lstrings.h" #include "QTabularCreate.h" #include "QTabularCreateDialog.h" diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C index 94144e25d9..e28fcb87f3 100644 --- a/src/frontends/qt2/QTabularDialog.C +++ b/src/frontends/qt2/QTabularDialog.C @@ -17,11 +17,7 @@ #include "QTabular.h" #include "QTabularDialog.h" -#include "tabular.h" -#include "lengthcombo.h" -#include "qsetborder.h" #include "qt_helpers.h" -#include "debug.h" #include #include diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C index d4542fcdd8..42caeb5671 100644 --- a/src/frontends/qt2/QTexinfo.C +++ b/src/frontends/qt2/QTexinfo.C @@ -11,15 +11,12 @@ #include -#include "ControlTexinfo.h" #include "QTexinfoDialog.h" #include "QTexinfo.h" #include "Qt2BC.h" #include "qt_helpers.h" -#include "helper_funcs.h" #include "support/filetools.h" -#include "support/lstrings.h" #include #include diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt2/QTexinfoDialog.C index ff5fe0706f..2fabfd854b 100644 --- a/src/frontends/qt2/QTexinfoDialog.C +++ b/src/frontends/qt2/QTexinfoDialog.C @@ -11,12 +11,9 @@ #include -#include "LString.h" -#include "ControlTexinfo.h" #include "QTexinfoDialog.h" #include "QTexinfo.h" -#include "qt_helpers.h" #include #include diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt2/QThesaurus.C index 3834fb25a4..8588845480 100644 --- a/src/frontends/qt2/QThesaurus.C +++ b/src/frontends/qt2/QThesaurus.C @@ -19,7 +19,6 @@ #include #include -#include typedef QController > base_class; diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt2/QThesaurusDialog.C index 0baecb4048..784b133315 100644 --- a/src/frontends/qt2/QThesaurusDialog.C +++ b/src/frontends/qt2/QThesaurusDialog.C @@ -11,7 +11,6 @@ #include -#include "LString.h" #include "ControlThesaurus.h" #include "QThesaurusDialog.h" @@ -22,7 +21,6 @@ #include #include -#include QThesaurusDialog::QThesaurusDialog(QThesaurus * form) diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C index 8fd825c491..3be90bd239 100644 --- a/src/frontends/qt2/QToc.C +++ b/src/frontends/qt2/QToc.C @@ -13,17 +13,13 @@ #include -#include "LyXView.h" #include "qt_helpers.h" -#include "support/lstrings.h" -#include "debug.h" #include "ControlToc.h" #include "QToc.h" #include "QTocDialog.h" #include "Qt2BC.h" -#include #include #include #include diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C index c76e929514..8b16a4bb1f 100644 --- a/src/frontends/qt2/QURL.C +++ b/src/frontends/qt2/QURL.C @@ -11,7 +11,6 @@ #include #include "ControlCommand.h" -#include "debug.h" #include "qt_helpers.h" #include "QURL.h" diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C index ad96cfa6d9..da4884bbbf 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -14,7 +14,6 @@ #include "Lsstream.h" #include "qt_helpers.h" #include "support/lstrings.h" -#include "LyXView.h" #include "ControlVCLog.h" #include "QVCLog.h" @@ -24,7 +23,6 @@ #include #include -#include "support/BoostFormat.h" using namespace lyx::support; diff --git a/src/frontends/qt2/QVCLogDialog.C b/src/frontends/qt2/QVCLogDialog.C index cdd30447ba..7b255121c0 100644 --- a/src/frontends/qt2/QVCLogDialog.C +++ b/src/frontends/qt2/QVCLogDialog.C @@ -11,16 +11,12 @@ #include -#include -#include "LyXView.h" -#include "ControlVCLog.h" #include "QVCLog.h" #include "QVCLogDialog.h" #include -#include QVCLogDialog::QVCLogDialog(QVCLog * form) diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C index fd2c5054b9..8bfee1c6b3 100644 --- a/src/frontends/qt2/QWorkArea.C +++ b/src/frontends/qt2/QWorkArea.C @@ -13,13 +13,11 @@ #include "QWorkArea.h" #include "debug.h" -#include "lfuns.h" #include "qt_helpers.h" #include "lcolorcache.h" #include "funcrequest.h" #include -#include #include #include #include @@ -30,7 +28,6 @@ #include #endif -#include using std::endl; diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C index 0ac37676fc..cd7ac3d201 100644 --- a/src/frontends/qt2/QWrap.C +++ b/src/frontends/qt2/QWrap.C @@ -10,11 +10,9 @@ #include -#include "debug.h" #include "qt_helpers.h" #include "support/tostr.h" #include "support/lstrings.h" -#include "LyXView.h" #include "ControlWrap.h" #include "QWrap.h" @@ -25,7 +23,6 @@ #include "insets/insetwrap.h" #include -#include #include using namespace lyx::support; diff --git a/src/frontends/qt2/QWrapDialog.C b/src/frontends/qt2/QWrapDialog.C index 98be96df7d..fdb78ba7a7 100644 --- a/src/frontends/qt2/QWrapDialog.C +++ b/src/frontends/qt2/QWrapDialog.C @@ -11,16 +11,12 @@ #include -#include "ControlWrap.h" #include "QWrap.h" #include "QWrapDialog.h" #include -#include -#include "lengthcombo.h" -#include QWrapDialog::QWrapDialog(QWrap * form) diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C index b0ddfad8d2..8a84a98229 100644 --- a/src/frontends/qt2/Qt2BC.C +++ b/src/frontends/qt2/Qt2BC.C @@ -12,7 +12,6 @@ #include #include "Qt2BC.h" -#include "debug.h" #include "qt_helpers.h" #include diff --git a/src/frontends/qt2/Qt2Base.C b/src/frontends/qt2/Qt2Base.C index df0748c198..426d22cbb9 100644 --- a/src/frontends/qt2/Qt2Base.C +++ b/src/frontends/qt2/Qt2Base.C @@ -10,17 +10,12 @@ #include -#include -#include -#include "debug.h" #include "qt_helpers.h" -#include "QtLyXView.h" #include "Qt2Base.h" #include "Qt2BC.h" #include "ButtonController.h" #include "ControlButtons.h" -#include "support/LAssert.h" Qt2Base::Qt2Base(string const & t) diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C index c3c92e8da3..343614aa69 100644 --- a/src/frontends/qt2/QtView.C +++ b/src/frontends/qt2/QtView.C @@ -12,17 +12,12 @@ #include -#include "debug.h" -#include "intl.h" #include "lyx_cb.h" #include "support/filetools.h" #include "MenuBackend.h" -#include "ToolbarBackend.h" #include "lyxfunc.h" #include "BufferView.h" -#include "frontends/Dialogs.h" -#include "frontends/Timeout.h" #include @@ -31,12 +26,8 @@ #include "QLMenubar.h" #include "qfont_loader.h" #include "QCommandBuffer.h" -#include "qt_helpers.h" #include -#include -#include -#include #include using namespace lyx::support; diff --git a/src/frontends/qt2/WorkAreaFactory.C b/src/frontends/qt2/WorkAreaFactory.C index 28bb3de005..c66d29c747 100644 --- a/src/frontends/qt2/WorkAreaFactory.C +++ b/src/frontends/qt2/WorkAreaFactory.C @@ -11,7 +11,6 @@ #include -#include "frontends/WorkAreaFactory.h" #include "QWorkArea.h" diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C index 875c9c24c5..0b4f6b006b 100644 --- a/src/frontends/qt2/iconpalette.C +++ b/src/frontends/qt2/iconpalette.C @@ -18,7 +18,6 @@ #include #include -#include #include using std::endl; diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt2/lengthcombo.C index ed96e65375..3113c1853b 100644 --- a/src/frontends/qt2/lengthcombo.C +++ b/src/frontends/qt2/lengthcombo.C @@ -13,10 +13,8 @@ #include "lengthcombo.h" -#include #include "lengthcommon.h" -#include "qt_helpers.h" LengthCombo::LengthCombo(QWidget * parent, char * name) diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C index 7ca5247cba..989ec96989 100644 --- a/src/frontends/qt2/lyx_gui.C +++ b/src/frontends/qt2/lyx_gui.C @@ -12,31 +12,21 @@ #include -#include "support/lyxlib.h" -#include "support/os.h" -#include "support/filetools.h" #include "support/lstrings.h" -#include "debug.h" #include "qt_helpers.h" #include "lyx_gui.h" -#include "lyx_main.h" -#include "lyxrc.h" -#include "lyxfont.h" #include "funcrequest.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" // Dear Lord, deliver us from Evil, // aka the Qt headers -#include -#include #include #include @@ -47,13 +37,8 @@ #include "lcolorcache.h" #include -#include #include -#include -#include -#include -#include using namespace lyx::support; diff --git a/src/frontends/qt2/qcoloritem.C b/src/frontends/qt2/qcoloritem.C index 683d6ddb9f..279828d50b 100644 --- a/src/frontends/qt2/qcoloritem.C +++ b/src/frontends/qt2/qcoloritem.C @@ -12,8 +12,6 @@ #include "qcoloritem.h" -#include -#include #include QColorItem::QColorItem(QColor c, QString const & t) diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C index f3d98ca1ef..a976b80c3e 100644 --- a/src/frontends/qt2/qfont_loader.C +++ b/src/frontends/qt2/qfont_loader.C @@ -15,18 +15,10 @@ #include "qfont_loader.h" #include "qt_helpers.h" #include "debug.h" -#include "lyxrc.h" -#include "BufferView.h" -#include "qt_helpers.h" -#include -#include -#include -#include #include "support/lstrings.h" #include "frontends/lyx_gui.h" -#include #include #ifdef Q_WS_X11 diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C index ecb7a52ff1..cbc0449927 100644 --- a/src/frontends/qt2/qfont_metrics.C +++ b/src/frontends/qt2/qfont_metrics.C @@ -12,15 +12,10 @@ #include #include "frontends/lyx_gui.h" -#include "support/lstrings.h" #include "font_metrics.h" #include "qfont_loader.h" -#include "debug.h" -#include "encoding.h" #include "language.h" -#include -#include namespace { diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C index a6c1536f5f..4efd6dcbaa 100644 --- a/src/frontends/qt2/qscreen.C +++ b/src/frontends/qt2/qscreen.C @@ -11,16 +11,9 @@ #include -#include -#include -#include "LColor.h" #include "QWorkArea.h" #include "qscreen.h" -#include "lyxtext.h" -#include "Painter.h" -#include "BufferView.h" -#include "insets/insettext.h" #include "debug.h" #include diff --git a/src/frontends/qt2/qsetborder.C b/src/frontends/qt2/qsetborder.C index 7543521c57..548512f4ab 100644 --- a/src/frontends/qt2/qsetborder.C +++ b/src/frontends/qt2/qsetborder.C @@ -12,8 +12,6 @@ #include #include -#include -#include #include "qsetborder.h" diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt2/qt_helpers.C index b8ccf68a66..0c0971c4e2 100644 --- a/src/frontends/qt2/qt_helpers.C +++ b/src/frontends/qt2/qt_helpers.C @@ -16,11 +16,9 @@ #include "lengthcombo.h" -#include #include #include -#include using std::pair; using std::make_pair; diff --git a/src/frontends/qt2/qttableview.C b/src/frontends/qt2/qttableview.C index 9cf3eb5135..c2f1267253 100644 --- a/src/frontends/qt2/qttableview.C +++ b/src/frontends/qt2/qttableview.C @@ -1,5 +1,5 @@ /********************************************************************** -** $Id: qttableview.C,v 1.4 2002/11/04 00:15:54 larsbj Exp $ +** $Id: qttableview.C,v 1.5 2003/09/05 14:56:51 leeming Exp $ ** ** Implementation of QtTableView class ** @@ -18,8 +18,6 @@ #ifndef QT_NO_QTTABLEVIEW #include "qscrollbar.h" #include "qpainter.h" -#include "qdrawutil.h" -#include /* Added by J. Levon for compilation with Qt 2.3.1 */ #ifndef Q_CHECK_PTR -- 2.39.2