[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes:
| Dekel Tsur <[EMAIL PROTECTED]> writes:
>
| | g++ -DHAVE_CONFIG_H -I. -I. -I../../../src -I../../../src/
-I../../../src/frontends/ -I../../../images -I/usr/include/qt3 -I../../../boost
-I../../../src/frontends/controllers -I/usr/X11R6/include -DQT_CLEAN_NAMESPACE
-DQT_GENUINE_STR -DQT_NO_TRANSLATION -O -fno-exceptions -W -Wall -MT QDialogView.lo
-MD -MP -MF .deps/QDialogView.Tpo -c QDialogView.C
| | In file included from ../../../src/debug.h:18,
| | from ../../../src/frontends/controllers/BCView.tmpl:20,
| | from ../../../src/frontends/controllers/BCView.h:139,
| | from Qt2BC.h:18,
| | from QDialogView.C:17:
| | ../../../src/support/debugstream.h:28: error: syntax error before
| | `=' token
>
| Right. I am fixing them now.
| (kindo...)
This patch fixes the compile, but does not allow us to use the
debugstream featuers. F.ex. Debug::DEBUG cannot be used.
Another solution where we make sure to "#undef DEBUG" before the body
of the .C file is compiled might be better, but I think that can come
as a addon later.
Index: Dialogs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Dialogs.C,v
retrieving revision 1.94
diff -u -p -r1.94 Dialogs.C
--- Dialogs.C 5 Sep 2003 14:56:50 -0000 1.94
+++ Dialogs.C 29 Sep 2003 09:58:48 -0000
@@ -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;
}
Index: Dialogs2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Dialogs2.C,v
retrieving revision 1.41
diff -u -p -r1.41 Dialogs2.C
--- Dialogs2.C 5 Sep 2003 14:56:50 -0000 1.41
+++ Dialogs2.C 29 Sep 2003 09:58:48 -0000
@@ -12,6 +12,7 @@
#include <config.h>
+#include "debug.h"
#include "Dialogs.h"
#include "controllers/GUI.h"
#include "ButtonController.h"
Index: FileDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/FileDialog.C,v
retrieving revision 1.21
diff -u -p -r1.21 FileDialog.C
--- FileDialog.C 8 Sep 2003 00:33:34 -0000 1.21
+++ FileDialog.C 29 Sep 2003 09:58:48 -0000
@@ -11,9 +11,9 @@
#include <config.h>
+#include "debug.h"
#include "frontends/FileDialog.h"
#include "FileDialog_private.h"
-#include "debug.h"
#include "qt_helpers.h"
#include "gettext.h"
Index: QAbout.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QAbout.C,v
retrieving revision 1.30
diff -u -p -r1.30 QAbout.C
--- QAbout.C 15 Sep 2003 12:00:03 -0000 1.30
+++ QAbout.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "support/lstrings.h"
#include "support/std_sstream.h"
#include "qt_helpers.h"
Index: QBibitem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QBibitem.C,v
retrieving revision 1.17
diff -u -p -r1.17 QBibitem.C
--- QBibitem.C 5 Sep 2003 14:56:50 -0000 1.17
+++ QBibitem.C 29 Sep 2003 09:58:49 -0000
@@ -12,6 +12,7 @@
+#include "debug.h"
#include "ControlCommand.h"
#include "qt_helpers.h"
Index: QBibtex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QBibtex.C,v
retrieving revision 1.32
diff -u -p -r1.32 QBibtex.C
--- QBibtex.C 9 Sep 2003 22:13:39 -0000 1.32
+++ QBibtex.C 29 Sep 2003 09:58:49 -0000
@@ -12,6 +12,7 @@
#include <config.h>
+#include "debug.h"
#include "support/lstrings.h"
#include "ControlBibtex.h"
Index: QChanges.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QChanges.C,v
retrieving revision 1.7
diff -u -p -r1.7 QChanges.C
--- QChanges.C 23 Aug 2003 00:16:37 -0000 1.7
+++ QChanges.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "ControlChanges.h"
#include "qt_helpers.h"
Index: QCharacter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCharacter.C,v
retrieving revision 1.24
diff -u -p -r1.24 QCharacter.C
--- QCharacter.C 16 Sep 2003 09:01:11 -0000 1.24
+++ QCharacter.C 29 Sep 2003 09:58:49 -0000
@@ -11,6 +11,7 @@
#include <config.h>
+#include "debug.h"
#include "QCharacter.h"
#include "ControlCharacter.h"
#include "QCharacterDialog.h"
Index: QCitation.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCitation.C,v
retrieving revision 1.26
diff -u -p -r1.26 QCitation.C
--- QCitation.C 9 Sep 2003 22:13:39 -0000 1.26
+++ QCitation.C 29 Sep 2003 09:58:49 -0000
@@ -11,6 +11,7 @@
#include <config.h>
+#include "debug.h"
#include "ui/QCitationFindDialogBase.h"
#include "QCitationDialog.h"
#include "QCitation.h"
Index: QDialogView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDialogView.C,v
retrieving revision 1.7
diff -u -p -r1.7 QDialogView.C
--- QDialogView.C 5 Sep 2003 14:56:50 -0000 1.7
+++ QDialogView.C 29 Sep 2003 09:58:49 -0000
@@ -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)
Index: QDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDocument.C,v
retrieving revision 1.58
diff -u -p -r1.58 QDocument.C
--- QDocument.C 9 Sep 2003 17:25:28 -0000 1.58
+++ QDocument.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "qt_helpers.h"
#include "ControlDocument.h"
Index: QDocumentDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDocumentDialog.C,v
retrieving revision 1.36
diff -u -p -r1.36 QDocumentDialog.C
--- QDocumentDialog.C 9 Sep 2003 22:13:39 -0000 1.36
+++ QDocumentDialog.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "qt_helpers.h"
#include "ControlDocument.h"
Index: QERT.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QERT.C,v
retrieving revision 1.17
diff -u -p -r1.17 QERT.C
--- QERT.C 5 Sep 2003 14:56:50 -0000 1.17
+++ QERT.C 29 Sep 2003 09:58:49 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlERT.h"
#include <qradiobutton.h>
Index: QErrorList.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QErrorList.C,v
retrieving revision 1.6
diff -u -p -r1.6 QErrorList.C
--- QErrorList.C 5 Sep 2003 14:56:50 -0000 1.6
+++ QErrorList.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "qt_helpers.h"
#include "ControlErrorList.h"
@@ -56,4 +57,3 @@ void QErrorList::update_contents()
dialog_->errorsLB->setSelected(0, true);
}
-
Index: QExternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QExternal.C,v
retrieving revision 1.28
diff -u -p -r1.28 QExternal.C
--- QExternal.C 25 Sep 2003 10:49:12 -0000 1.28
+++ QExternal.C 29 Sep 2003 09:58:49 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlExternal.h"
#include "qt_helpers.h"
Index: QFloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QFloat.C,v
retrieving revision 1.20
diff -u -p -r1.20 QFloat.C
--- QFloat.C 5 Sep 2003 14:56:50 -0000 1.20
+++ QFloat.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "ControlFloat.h"
#include "QFloatDialog.h"
#include "QFloat.h"
Index: QGraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QGraphics.C,v
retrieving revision 1.40
diff -u -p -r1.40 QGraphics.C
--- QGraphics.C 9 Sep 2003 22:13:39 -0000 1.40
+++ QGraphics.C 29 Sep 2003 09:58:49 -0000
@@ -12,6 +12,7 @@
#include <config.h>
+#include "debug.h"
#include "ControlGraphics.h"
#include "controllers/helper_funcs.h"
#include "support/lstrings.h"
Index: QInclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QInclude.C,v
retrieving revision 1.24
diff -u -p -r1.24 QInclude.C
--- QInclude.C 19 Sep 2003 10:16:32 -0000 1.24
+++ QInclude.C 29 Sep 2003 09:58:49 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#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);
Index: QIndex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QIndex.C,v
retrieving revision 1.25
diff -u -p -r1.25 QIndex.C
--- QIndex.C 23 Aug 2003 00:16:38 -0000 1.25
+++ QIndex.C 29 Sep 2003 09:58:49 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlCommand.h"
#include "qt_helpers.h"
Index: QLImage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLImage.C,v
retrieving revision 1.26
diff -u -p -r1.26 QLImage.C
--- QLImage.C 16 Sep 2003 15:34:39 -0000 1.26
+++ QLImage.C 29 Sep 2003 09:58:49 -0000
@@ -11,11 +11,10 @@
#include <config.h>
-
+#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"
Index: QLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLog.C,v
retrieving revision 1.20
diff -u -p -r1.20 QLog.C
--- QLog.C 8 Sep 2003 00:33:34 -0000 1.20
+++ QLog.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "qt_helpers.h"
#include "ControlLog.h"
#include "support/std_sstream.h"
Index: QLyXKeySym.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLyXKeySym.C,v
retrieving revision 1.27
diff -u -p -r1.27 QLyXKeySym.C
--- QLyXKeySym.C 8 Sep 2003 00:33:34 -0000 1.27
+++ QLyXKeySym.C 29 Sep 2003 09:58:49 -0000
@@ -11,9 +11,9 @@
#include <config.h>
+#include "debug.h"
#include "QLyXKeySym.h"
#include "qlkey.h"
-#include "debug.h"
#include "qt_helpers.h"
#include <qevent.h>
Index: QMinipage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QMinipage.C,v
retrieving revision 1.22
diff -u -p -r1.22 QMinipage.C
--- QMinipage.C 9 Sep 2003 22:13:39 -0000 1.22
+++ QMinipage.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "qt_helpers.h"
#include "support/tostr.h"
#include "support/lstrings.h"
Index: QNote.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QNote.C,v
retrieving revision 1.5
diff -u -p -r1.5 QNote.C
--- QNote.C 7 Sep 2003 01:45:38 -0000 1.5
+++ QNote.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "ControlNote.h"
#include "insets/insetnote.h"
@@ -67,4 +68,3 @@ void QNote::apply()
controller().params().type = type;
}
-
Index: QParagraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QParagraph.C,v
retrieving revision 1.28
diff -u -p -r1.28 QParagraph.C
--- QParagraph.C 9 Sep 2003 22:13:39 -0000 1.28
+++ QParagraph.C 29 Sep 2003 09:58:49 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "ControlParagraph.h"
#include "QParagraph.h"
#include "QParagraphDialog.h"
Index: QPrefs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefs.C,v
retrieving revision 1.47
diff -u -p -r1.47 QPrefs.C
--- QPrefs.C 16 Sep 2003 09:01:11 -0000 1.47
+++ QPrefs.C 29 Sep 2003 09:58:50 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "support/std_sstream.h"
Index: QPrint.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrint.C,v
retrieving revision 1.19
diff -u -p -r1.19 QPrint.C
--- QPrint.C 5 Sep 2003 14:56:50 -0000 1.19
+++ QPrint.C 29 Sep 2003 09:58:50 -0000
@@ -11,7 +11,7 @@
#include <config.h>
-
+#include "debug.h"
#include "PrinterParams.h"
#include "ControlPrint.h"
#include "qt_helpers.h"
Index: QRef.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QRef.C,v
retrieving revision 1.29
diff -u -p -r1.29 QRef.C
--- QRef.C 8 Sep 2003 00:33:34 -0000 1.29
+++ QRef.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlRef.h"
#include "insets/insetref.h"
Index: QSearch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QSearch.C,v
retrieving revision 1.17
diff -u -p -r1.17 QSearch.C
--- QSearch.C 5 Sep 2003 14:56:50 -0000 1.17
+++ QSearch.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlSearch.h"
#include "QSearch.h"
Index: QShowFile.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QShowFile.C,v
retrieving revision 1.14
diff -u -p -r1.14 QShowFile.C
--- QShowFile.C 23 Aug 2003 00:16:38 -0000 1.14
+++ QShowFile.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlShowFile.h"
#include "qt_helpers.h"
Index: QSpellchecker.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QSpellchecker.C,v
retrieving revision 1.25
diff -u -p -r1.25 QSpellchecker.C
--- QSpellchecker.C 5 Sep 2003 14:56:50 -0000 1.25
+++ QSpellchecker.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlSpellchecker.h"
#include "QSpellcheckerDialog.h"
#include "QSpellchecker.h"
Index: QTabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QTabular.C,v
retrieving revision 1.27
diff -u -p -r1.27 QTabular.C
--- QTabular.C 7 Sep 2003 01:45:38 -0000 1.27
+++ QTabular.C 29 Sep 2003 09:58:50 -0000
@@ -12,6 +12,7 @@
#include <config.h>
+#include "debug.h"
#include "ControlTabular.h"
#include "qt_helpers.h"
#include "support/tostr.h"
Index: QTabularCreate.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QTabularCreate.C,v
retrieving revision 1.15
diff -u -p -r1.15 QTabularCreate.C
--- QTabularCreate.C 5 Sep 2003 14:56:50 -0000 1.15
+++ QTabularCreate.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlTabularCreate.h"
#include "QTabularCreateDialog.h"
#include "QTabularCreate.h"
Index: QTexinfo.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QTexinfo.C,v
retrieving revision 1.22
diff -u -p -r1.22 QTexinfo.C
--- QTexinfo.C 9 Sep 2003 22:13:39 -0000 1.22
+++ QTexinfo.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "QTexinfoDialog.h"
#include "QTexinfo.h"
#include "Qt2BC.h"
Index: QThesaurus.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QThesaurus.C,v
retrieving revision 1.18
diff -u -p -r1.18 QThesaurus.C
--- QThesaurus.C 5 Sep 2003 14:56:50 -0000 1.18
+++ QThesaurus.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "ControlThesaurus.h"
#include "QThesaurusDialog.h"
#include "QThesaurus.h"
Index: QToc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QToc.C,v
retrieving revision 1.24
diff -u -p -r1.24 QToc.C
--- QToc.C 8 Sep 2003 00:33:34 -0000 1.24
+++ QToc.C 29 Sep 2003 09:58:50 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include <stack>
#include "qt_helpers.h"
Index: QURL.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QURL.C,v
retrieving revision 1.23
diff -u -p -r1.23 QURL.C
--- QURL.C 5 Sep 2003 14:56:51 -0000 1.23
+++ QURL.C 29 Sep 2003 09:58:50 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "ControlCommand.h"
#include "qt_helpers.h"
Index: QVCLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QVCLog.C,v
retrieving revision 1.23
diff -u -p -r1.23 QVCLog.C
--- QVCLog.C 9 Sep 2003 22:13:39 -0000 1.23
+++ QVCLog.C 29 Sep 2003 09:58:50 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "support/std_sstream.h"
#include "qt_helpers.h"
#include "support/lstrings.h"
Index: QWorkArea.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QWorkArea.C,v
retrieving revision 1.20
diff -u -p -r1.20 QWorkArea.C
--- QWorkArea.C 15 Sep 2003 15:20:17 -0000 1.20
+++ QWorkArea.C 29 Sep 2003 09:58:50 -0000
@@ -10,8 +10,8 @@
#include <config.h>
-#include "QWorkArea.h"
#include "debug.h"
+#include "QWorkArea.h"
#include "LColor.h"
#include "qt_helpers.h"
#include "lcolorcache.h"
Index: QWrap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QWrap.C,v
retrieving revision 1.15
diff -u -p -r1.15 QWrap.C
--- QWrap.C 9 Sep 2003 22:13:39 -0000 1.15
+++ QWrap.C 29 Sep 2003 09:58:50 -0000
@@ -10,6 +10,7 @@
#include <config.h>
+#include "debug.h"
#include "qt_helpers.h"
#include "support/tostr.h"
#include "support/lstrings.h"
Index: Qt2Base.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Qt2Base.C,v
retrieving revision 1.24
diff -u -p -r1.24 Qt2Base.C
--- Qt2Base.C 5 Sep 2003 14:56:51 -0000 1.24
+++ Qt2Base.C 29 Sep 2003 09:58:50 -0000
@@ -10,7 +10,7 @@
#include <config.h>
-
+#include "debug.h"
#include "qt_helpers.h"
#include "Qt2Base.h"
#include "Qt2BC.h"
Index: qfont_loader.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qfont_loader.C,v
retrieving revision 1.42
diff -u -p -r1.42 qfont_loader.C
--- qfont_loader.C 9 Sep 2003 22:13:40 -0000 1.42
+++ qfont_loader.C 29 Sep 2003 09:58:50 -0000
@@ -11,10 +11,9 @@
#include <config.h>
-
+#include "debug.h"
#include "qfont_loader.h"
#include "qt_helpers.h"
-#include "debug.h"
#include "lyxrc.h"
#include "support/lstrings.h"
Index: qscreen.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qscreen.C,v
retrieving revision 1.26
diff -u -p -r1.26 qscreen.C
--- qscreen.C 15 Sep 2003 15:20:17 -0000 1.26
+++ qscreen.C 29 Sep 2003 09:58:50 -0000
@@ -10,9 +10,9 @@
#include <config.h>
+#include "debug.h"
#include "QWorkArea.h"
#include "qscreen.h"
-#include "debug.h"
#include "LColor.h"
#include <qapplication.h>
Index: qtTimeout.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qtTimeout.C,v
retrieving revision 1.2
diff -u -p -r1.2 qtTimeout.C
--- qtTimeout.C 23 Aug 2003 00:16:40 -0000 1.2
+++ qtTimeout.C 29 Sep 2003 09:58:50 -0000
@@ -10,8 +10,8 @@
#include <config.h>
-#include "qtTimeout.h"
#include "debug.h"
+#include "qtTimeout.h"
Timeout::Timeout(unsigned int msec, Type t)
--
Lgb
