From 0d4dfc9b48973173f16e4e59d5ab33fcbaaa49e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 29 Sep 2003 10:50:51 +0000 Subject: [PATCH] Fix compilaton issues by including debug.h first. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7835 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 5 +++++ src/frontends/qt2/Dialogs.C | 6 +++--- src/frontends/qt2/Dialogs2.C | 1 + src/frontends/qt2/FileDialog.C | 2 +- src/frontends/qt2/QAbout.C | 1 + src/frontends/qt2/QBibitem.C | 1 + src/frontends/qt2/QBibtex.C | 1 + src/frontends/qt2/QChanges.C | 1 + src/frontends/qt2/QCharacter.C | 1 + src/frontends/qt2/QCitation.C | 1 + src/frontends/qt2/QDialogView.C | 4 ++-- src/frontends/qt2/QDocument.C | 1 + src/frontends/qt2/QDocumentDialog.C | 1 + src/frontends/qt2/QERT.C | 2 +- src/frontends/qt2/QErrorList.C | 2 +- src/frontends/qt2/QExternal.C | 2 +- src/frontends/qt2/QFloat.C | 1 + src/frontends/qt2/QGraphics.C | 1 + src/frontends/qt2/QInclude.C | 4 ++-- src/frontends/qt2/QIndex.C | 2 +- src/frontends/qt2/QLImage.C | 3 +-- src/frontends/qt2/QLog.C | 1 + src/frontends/qt2/QLyXKeySym.C | 2 +- src/frontends/qt2/QMinipage.C | 1 + src/frontends/qt2/QNote.C | 2 +- src/frontends/qt2/QParagraph.C | 1 + src/frontends/qt2/QPrefs.C | 1 + src/frontends/qt2/QPrint.C | 2 +- src/frontends/qt2/QRef.C | 2 +- src/frontends/qt2/QSearch.C | 2 +- src/frontends/qt2/QShowFile.C | 2 +- src/frontends/qt2/QSpellchecker.C | 2 +- src/frontends/qt2/QTabular.C | 1 + src/frontends/qt2/QTabularCreate.C | 2 +- src/frontends/qt2/QTexinfo.C | 2 +- src/frontends/qt2/QThesaurus.C | 2 +- src/frontends/qt2/QToc.C | 1 + src/frontends/qt2/QURL.C | 1 + src/frontends/qt2/QVCLog.C | 1 + src/frontends/qt2/QWorkArea.C | 2 +- src/frontends/qt2/QWrap.C | 1 + src/frontends/qt2/Qt2Base.C | 2 +- src/frontends/qt2/qfont_loader.C | 3 +-- src/frontends/qt2/qscreen.C | 2 +- src/frontends/qt2/qtTimeout.C | 2 +- 45 files changed, 53 insertions(+), 30 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 70522abae7..07b3aa790d 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2003-09-29 Lars Gullik Bjønnes + + * several .C files: add debug.h at top to avoid compilation + errors. + 2003-09-25 Angus Leeming * QExternal.C (update_contents, apply): InsetExternal::Params:: diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index a72c78b81c..2f325ce6a6 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -36,6 +36,8 @@ #include "ControlVCLog.h" #include "ControlWrap.h" +#include "Qt2BC.h" +#include "ButtonController.h" #include "QAbout.h" #include "QBibitem.h" #include "QBibtex.h" @@ -73,8 +75,6 @@ #include "QThesaurus.h" #endif -#include "Qt2BC.h" -#include "ButtonController.h" #include "qt_helpers.h" @@ -110,7 +110,7 @@ private: bool Dialogs::isValidName(string const & name) const { - return std::find_if(dialognames, end_dialognames, + return std::find_if(dialognames, end_dialognames, cmpCStr(name.c_str())) != end_dialognames; } diff --git a/src/frontends/qt2/Dialogs2.C b/src/frontends/qt2/Dialogs2.C index e6ab5fb5c6..583f714dff 100644 --- a/src/frontends/qt2/Dialogs2.C +++ b/src/frontends/qt2/Dialogs2.C @@ -12,6 +12,7 @@ #include +#include "debug.h" #include "Dialogs.h" #include "controllers/GUI.h" #include "ButtonController.h" diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C index f452a3578f..671ade6810 100644 --- a/src/frontends/qt2/FileDialog.C +++ b/src/frontends/qt2/FileDialog.C @@ -11,9 +11,9 @@ #include +#include "debug.h" #include "frontends/FileDialog.h" #include "FileDialog_private.h" -#include "debug.h" #include "qt_helpers.h" #include "gettext.h" diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C index 77e407ae4f..4e6534085d 100644 --- a/src/frontends/qt2/QAbout.C +++ b/src/frontends/qt2/QAbout.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "support/lstrings.h" #include "support/std_sstream.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt2/QBibitem.C index 68db3c66d4..5257319126 100644 --- a/src/frontends/qt2/QBibitem.C +++ b/src/frontends/qt2/QBibitem.C @@ -12,6 +12,7 @@ +#include "debug.h" #include "ControlCommand.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index 9e78349a71..bd6a45c571 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -12,6 +12,7 @@ #include +#include "debug.h" #include "support/lstrings.h" #include "ControlBibtex.h" diff --git a/src/frontends/qt2/QChanges.C b/src/frontends/qt2/QChanges.C index bab64c4d00..2bfdd00717 100644 --- a/src/frontends/qt2/QChanges.C +++ b/src/frontends/qt2/QChanges.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "ControlChanges.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C index bb192bec5d..1977c71d1a 100644 --- a/src/frontends/qt2/QCharacter.C +++ b/src/frontends/qt2/QCharacter.C @@ -11,6 +11,7 @@ #include +#include "debug.h" #include "QCharacter.h" #include "ControlCharacter.h" #include "QCharacterDialog.h" diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C index cc407bab53..0fdc416c54 100644 --- a/src/frontends/qt2/QCitation.C +++ b/src/frontends/qt2/QCitation.C @@ -11,6 +11,7 @@ #include +#include "debug.h" #include "ui/QCitationFindDialogBase.h" #include "QCitationDialog.h" #include "QCitation.h" diff --git a/src/frontends/qt2/QDialogView.C b/src/frontends/qt2/QDialogView.C index be09daa4ca..c58814c7de 100644 --- a/src/frontends/qt2/QDialogView.C +++ b/src/frontends/qt2/QDialogView.C @@ -12,10 +12,10 @@ -#include "qt_helpers.h" -#include "QDialogView.h" #include "Qt2BC.h" #include "ButtonController.h" +#include "qt_helpers.h" +#include "QDialogView.h" QDialogView::QDialogView(Dialog & parent, string const & t) diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index ba5a459002..414b03835d 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "qt_helpers.h" #include "ControlDocument.h" diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 24b0b4800a..700e9741bc 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "qt_helpers.h" #include "ControlDocument.h" diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt2/QERT.C index a9e450439e..4ad8d7bc0d 100644 --- a/src/frontends/qt2/QERT.C +++ b/src/frontends/qt2/QERT.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlERT.h" #include diff --git a/src/frontends/qt2/QErrorList.C b/src/frontends/qt2/QErrorList.C index da89c04933..1f43fc2d29 100644 --- a/src/frontends/qt2/QErrorList.C +++ b/src/frontends/qt2/QErrorList.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "qt_helpers.h" #include "ControlErrorList.h" @@ -56,4 +57,3 @@ void QErrorList::update_contents() dialog_->errorsLB->setSelected(0, true); } - diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C index 9d1e593d67..493e0fd43d 100644 --- a/src/frontends/qt2/QExternal.C +++ b/src/frontends/qt2/QExternal.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlExternal.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C index 0b2312f406..df292388ea 100644 --- a/src/frontends/qt2/QFloat.C +++ b/src/frontends/qt2/QFloat.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "ControlFloat.h" #include "QFloatDialog.h" #include "QFloat.h" diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 181479cf90..c3144c7fc0 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -12,6 +12,7 @@ #include +#include "debug.h" #include "ControlGraphics.h" #include "controllers/helper_funcs.h" #include "support/lstrings.h" diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C index eba7b30bc5..5c23e724be 100644 --- a/src/frontends/qt2/QInclude.C +++ b/src/frontends/qt2/QInclude.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlInclude.h" #include "qt_helpers.h" @@ -66,7 +66,7 @@ void QInclude::update_contents() dialog_->typeCO->setCurrentItem(0); dialog_->previewCB->setEnabled(true); dialog_->previewCB->setChecked(params.preview()); - + } else if (cmdname == "include") { dialog_->typeCO->setCurrentItem(1); diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt2/QIndex.C index 29ddc76ac5..912dc1f37a 100644 --- a/src/frontends/qt2/QIndex.C +++ b/src/frontends/qt2/QIndex.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlCommand.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C index 7b7d246f8b..1dfe188a56 100644 --- a/src/frontends/qt2/QLImage.C +++ b/src/frontends/qt2/QLImage.C @@ -11,11 +11,10 @@ #include - +#include "debug.h" #include "QLImage.h" #include "graphics/GraphicsParams.h" #include "format.h" -#include "debug.h" #include "support/lstrings.h" // lowercase #include "support/lyxfunctional.h" // compare_memfun #include "qt_helpers.h" diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C index 124fbd3cdb..02988d67d1 100644 --- a/src/frontends/qt2/QLog.C +++ b/src/frontends/qt2/QLog.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "qt_helpers.h" #include "ControlLog.h" #include "support/std_sstream.h" diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C index 8fa058e9d1..8fab811c1d 100644 --- a/src/frontends/qt2/QLyXKeySym.C +++ b/src/frontends/qt2/QLyXKeySym.C @@ -11,9 +11,9 @@ #include +#include "debug.h" #include "QLyXKeySym.h" #include "qlkey.h" -#include "debug.h" #include "qt_helpers.h" #include diff --git a/src/frontends/qt2/QMinipage.C b/src/frontends/qt2/QMinipage.C index 2e3b68e7bf..972dddfe8d 100644 --- a/src/frontends/qt2/QMinipage.C +++ b/src/frontends/qt2/QMinipage.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "qt_helpers.h" #include "support/tostr.h" #include "support/lstrings.h" diff --git a/src/frontends/qt2/QNote.C b/src/frontends/qt2/QNote.C index 08200b2b9e..959c61e685 100644 --- a/src/frontends/qt2/QNote.C +++ b/src/frontends/qt2/QNote.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "ControlNote.h" #include "insets/insetnote.h" @@ -67,4 +68,3 @@ void QNote::apply() controller().params().type = type; } - diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C index b5ace6096b..e6faf88475 100644 --- a/src/frontends/qt2/QParagraph.C +++ b/src/frontends/qt2/QParagraph.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "ControlParagraph.h" #include "QParagraph.h" #include "QParagraphDialog.h" diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index c23b99cf0b..adf0cfc9c9 100644 --- a/src/frontends/qt2/QPrefs.C +++ b/src/frontends/qt2/QPrefs.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "support/lstrings.h" #include "support/tostr.h" #include "support/std_sstream.h" diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C index 56eca6bded..b5a39b1396 100644 --- a/src/frontends/qt2/QPrint.C +++ b/src/frontends/qt2/QPrint.C @@ -11,7 +11,7 @@ #include - +#include "debug.h" #include "PrinterParams.h" #include "ControlPrint.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C index 902b122f55..4c9bc004c9 100644 --- a/src/frontends/qt2/QRef.C +++ b/src/frontends/qt2/QRef.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlRef.h" #include "insets/insetref.h" diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C index 6023887337..9a1d94bdd8 100644 --- a/src/frontends/qt2/QSearch.C +++ b/src/frontends/qt2/QSearch.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlSearch.h" #include "QSearch.h" diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt2/QShowFile.C index 7796a65ce6..86cd120963 100644 --- a/src/frontends/qt2/QShowFile.C +++ b/src/frontends/qt2/QShowFile.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlShowFile.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C index f6121b7d9c..2b20d11d90 100644 --- a/src/frontends/qt2/QSpellchecker.C +++ b/src/frontends/qt2/QSpellchecker.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlSpellchecker.h" #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C index eeca1aed0f..1bf239ca5b 100644 --- a/src/frontends/qt2/QTabular.C +++ b/src/frontends/qt2/QTabular.C @@ -12,6 +12,7 @@ #include +#include "debug.h" #include "ControlTabular.h" #include "qt_helpers.h" #include "support/tostr.h" diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt2/QTabularCreate.C index d2444a2a05..5b4aab3074 100644 --- a/src/frontends/qt2/QTabularCreate.C +++ b/src/frontends/qt2/QTabularCreate.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlTabularCreate.h" #include "QTabularCreateDialog.h" #include "QTabularCreate.h" diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C index 4ec666b1e3..daea80fc5b 100644 --- a/src/frontends/qt2/QTexinfo.C +++ b/src/frontends/qt2/QTexinfo.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "QTexinfoDialog.h" #include "QTexinfo.h" #include "Qt2BC.h" diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt2/QThesaurus.C index 8588845480..09f344d8ad 100644 --- a/src/frontends/qt2/QThesaurus.C +++ b/src/frontends/qt2/QThesaurus.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "ControlThesaurus.h" #include "QThesaurusDialog.h" #include "QThesaurus.h" diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C index 507bcbaeb8..71cc8c9588 100644 --- a/src/frontends/qt2/QToc.C +++ b/src/frontends/qt2/QToc.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include #include "qt_helpers.h" diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C index 8b16a4bb1f..8ddc24d4af 100644 --- a/src/frontends/qt2/QURL.C +++ b/src/frontends/qt2/QURL.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "ControlCommand.h" #include "qt_helpers.h" diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C index 83d3af2eea..7ebbeadeda 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "support/std_sstream.h" #include "qt_helpers.h" #include "support/lstrings.h" diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C index 2110423cde..e8e35d20ca 100644 --- a/src/frontends/qt2/QWorkArea.C +++ b/src/frontends/qt2/QWorkArea.C @@ -10,8 +10,8 @@ #include -#include "QWorkArea.h" #include "debug.h" +#include "QWorkArea.h" #include "LColor.h" #include "qt_helpers.h" #include "lcolorcache.h" diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C index eaef2d5f76..1c02f0c1cd 100644 --- a/src/frontends/qt2/QWrap.C +++ b/src/frontends/qt2/QWrap.C @@ -10,6 +10,7 @@ #include +#include "debug.h" #include "qt_helpers.h" #include "support/tostr.h" #include "support/lstrings.h" diff --git a/src/frontends/qt2/Qt2Base.C b/src/frontends/qt2/Qt2Base.C index 426d22cbb9..4e7f9b39ac 100644 --- a/src/frontends/qt2/Qt2Base.C +++ b/src/frontends/qt2/Qt2Base.C @@ -10,7 +10,7 @@ #include - +#include "debug.h" #include "qt_helpers.h" #include "Qt2Base.h" #include "Qt2BC.h" diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C index 788a58e08d..d226706dc8 100644 --- a/src/frontends/qt2/qfont_loader.C +++ b/src/frontends/qt2/qfont_loader.C @@ -11,10 +11,9 @@ #include - +#include "debug.h" #include "qfont_loader.h" #include "qt_helpers.h" -#include "debug.h" #include "lyxrc.h" #include "support/lstrings.h" diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C index beac468056..9419f6c361 100644 --- a/src/frontends/qt2/qscreen.C +++ b/src/frontends/qt2/qscreen.C @@ -10,9 +10,9 @@ #include +#include "debug.h" #include "QWorkArea.h" #include "qscreen.h" -#include "debug.h" #include "LColor.h" #include diff --git a/src/frontends/qt2/qtTimeout.C b/src/frontends/qt2/qtTimeout.C index 001ed385bc..b8768c792d 100644 --- a/src/frontends/qt2/qtTimeout.C +++ b/src/frontends/qt2/qtTimeout.C @@ -10,8 +10,8 @@ #include -#include "qtTimeout.h" #include "debug.h" +#include "qtTimeout.h" Timeout::Timeout(unsigned int msec, Type t)