[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes:
| | If you're saying that such commands should be filtered out before
| | they get to the ASSERT, then that's fair enough, but some work is
| | needed because at the moment I can trigger the ASSERT as simply as this:
>
| Sure. We have a bug, but it is not in funcHasFlag.
Angus, can you try this patch and see if it fixes things?
Index: kbmap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/kbmap.C,v
retrieving revision 1.51
diff -u -p -r1.51 kbmap.C
--- kbmap.C 6 Oct 2003 15:42:15 -0000 1.51
+++ kbmap.C 15 Oct 2003 16:07:51 -0000
@@ -60,7 +60,7 @@ string::size_type kb_keymap::bind(string
if (lyxerr.debugging(Debug::KBMAP)) {
lyxerr << "BIND: Sequence `"
<< seq << "' Action `"
- << func.action << '\'' << endl;
+ << func.action << '(' << func.argument << ")'" << endl;
}
kb_sequence k(0, 0);
@@ -122,7 +122,8 @@ bool kb_keymap::read(string const & bind
continue;
case BN_BIND:
{
- string seq, cmd;
+ string seq;
+ string cmd;
if (lexrc.next()) {
seq = lexrc.getString();
@@ -141,7 +142,7 @@ bool kb_keymap::read(string const & bind
}
FuncRequest func = lyxaction.lookupFunc(cmd);
- if (func. action == LFUN_UNKNOWN_ACTION) {
+ if (func.action == LFUN_UNKNOWN_ACTION) {
lexrc.printError("BN_BIND: Unknown LyX"
" function `$$Token'");
error = true;
Index: lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.515
diff -u -p -r1.515 lyxfunc.C
--- lyxfunc.C 14 Oct 2003 13:01:39 -0000 1.515
+++ lyxfunc.C 15 Oct 2003 16:07:51 -0000
@@ -288,6 +288,7 @@ FuncStatus LyXFunc::getStatus(FuncReques
case LFUN_THESAURUS_ENTRY:
#endif
flag.unknown(true);
+ flag.disabled(true);
break;
default:
flag |= lyx_gui::getStatus(ev);
Index: frontends/qt2/Alert_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Alert_pimpl.C,v
retrieving revision 1.24
diff -u -p -r1.24 Alert_pimpl.C
--- frontends/qt2/Alert_pimpl.C 6 Oct 2003 15:42:49 -0000 1.24
+++ frontends/qt2/Alert_pimpl.C 15 Oct 2003 16:07:52 -0000
@@ -10,8 +10,8 @@
#include <config.h>
-#include "Alert_pimpl.h"
-#include "Alert.h"
+#include "frontends/Alert_pimpl.h"
+#include "frontends/Alert.h"
#include <qmessagebox.h>
#include <qlabel.h>
Index: frontends/qt2/Dialogs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Dialogs.C,v
retrieving revision 1.96
diff -u -p -r1.96 Dialogs.C
--- frontends/qt2/Dialogs.C 6 Oct 2003 15:42:49 -0000 1.96
+++ frontends/qt2/Dialogs.C 15 Oct 2003 16:07:52 -0000
@@ -10,34 +10,34 @@
#include <config.h>
-#include "Dialogs.h"
+#include "frontends/Dialogs.h"
-#include "ControlAboutlyx.h"
-#include "ControlBibtex.h"
-#include "ControlChanges.h"
-#include "ControlCharacter.h"
-#include "ControlCitation.h"
-#include "ControlErrorList.h"
-#include "ControlERT.h"
-#include "ControlExternal.h"
-#include "ControlFloat.h"
-#include "ControlGraphics.h"
-#include "ControlInclude.h"
-#include "ControlLog.h"
-#include "ControlMath.h"
-#include "ControlMinipage.h"
-#include "ControlNote.h"
-#include "ControlParagraph.h"
-#include "ControlRef.h"
-#include "ControlShowFile.h"
-#include "ControlTabular.h"
-#include "ControlTabularCreate.h"
-#include "ControlToc.h"
-#include "ControlVCLog.h"
-#include "ControlWrap.h"
+#include "frontends/controllers/ControlAboutlyx.h"
+#include "frontends/controllers/ControlBibtex.h"
+#include "frontends/controllers/ControlChanges.h"
+#include "frontends/controllers/ControlCharacter.h"
+#include "frontends/controllers/ControlCitation.h"
+#include "frontends/controllers/ControlErrorList.h"
+#include "frontends/controllers/ControlERT.h"
+#include "frontends/controllers/ControlExternal.h"
+#include "frontends/controllers/ControlFloat.h"
+#include "frontends/controllers/ControlGraphics.h"
+#include "frontends/controllers/ControlInclude.h"
+#include "frontends/controllers/ControlLog.h"
+#include "frontends/controllers/ControlMath.h"
+#include "frontends/controllers/ControlMinipage.h"
+#include "frontends/controllers/ControlNote.h"
+#include "frontends/controllers/ControlParagraph.h"
+#include "frontends/controllers/ControlRef.h"
+#include "frontends/controllers/ControlShowFile.h"
+#include "frontends/controllers/ControlTabular.h"
+#include "frontends/controllers/ControlTabularCreate.h"
+#include "frontends/controllers/ControlToc.h"
+#include "frontends/controllers/ControlVCLog.h"
+#include "frontends/controllers/ControlWrap.h"
#include "Qt2BC.h"
-#include "ButtonController.h"
+#include "frontends/controllers/ButtonController.h"
#include "QAbout.h"
#include "QBibitem.h"
#include "QBibtex.h"
Index: frontends/qt2/Dialogs2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Dialogs2.C,v
retrieving revision 1.42
diff -u -p -r1.42 Dialogs2.C
--- frontends/qt2/Dialogs2.C 29 Sep 2003 10:50:50 -0000 1.42
+++ frontends/qt2/Dialogs2.C 15 Oct 2003 16:07:52 -0000
@@ -13,15 +13,15 @@
#include <config.h>
#include "debug.h"
-#include "Dialogs.h"
-#include "controllers/GUI.h"
-#include "ButtonController.h"
+#include "frontends/Dialogs.h"
+#include "frontends/controllers/GUI.h"
+#include "frontends/controllers/ButtonController.h"
-#include "ControlDocument.h"
-#include "ControlPrint.h"
-#include "ControlSearch.h"
-#include "ControlSendto.h"
-#include "ControlSpellchecker.h"
+#include "frontends/controllers/ControlDocument.h"
+#include "frontends/controllers/ControlPrint.h"
+#include "frontends/controllers/ControlSearch.h"
+#include "frontends/controllers/ControlSendto.h"
+#include "frontends/controllers/ControlSpellchecker.h"
#include "QDocument.h"
#include "QDocumentDialog.h"
Index: frontends/qt2/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Makefile.am,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile.am
--- frontends/qt2/Makefile.am 2 Aug 2003 20:01:51 -0000 1.84
+++ frontends/qt2/Makefile.am 15 Oct 2003 16:07:52 -0000
@@ -5,10 +5,8 @@ SUBDIRS = ui moc
EXTRA_DIST = Makefile.dialogs
-INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
- -I$(top_srcdir)/images \
- $(QT_INCLUDES) $(BOOST_INCLUDES) \
- -I$(top_srcdir)/src/frontends/controllers
+INCLUDES = -I$(top_srcdir)/images \
+ $(QT_INCLUDES) $(BOOST_INCLUDES)
noinst_LTLIBRARIES = libqt2.la
Index: frontends/qt2/QAbout.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QAbout.C,v
retrieving revision 1.32
diff -u -p -r1.32 QAbout.C
--- frontends/qt2/QAbout.C 6 Oct 2003 15:42:49 -0000 1.32
+++ frontends/qt2/QAbout.C 15 Oct 2003 16:07:52 -0000
@@ -14,8 +14,8 @@
#include "support/lstrings.h"
#include "support/std_sstream.h"
#include "qt_helpers.h"
-#include "ButtonController.h"
-#include "ControlAboutlyx.h"
+#include "frontends/controllers/ButtonController.h"
+#include "frontends/controllers/ControlAboutlyx.h"
#include <qlabel.h>
#include <qpushbutton.h>
Index: frontends/qt2/QBibitem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QBibitem.C,v
retrieving revision 1.18
diff -u -p -r1.18 QBibitem.C
--- frontends/qt2/QBibitem.C 29 Sep 2003 10:50:50 -0000 1.18
+++ frontends/qt2/QBibitem.C 15 Oct 2003 16:07:52 -0000
@@ -13,7 +13,7 @@
#include "debug.h"
-#include "ControlCommand.h"
+#include "frontends/controllers/ControlCommand.h"
#include "qt_helpers.h"
#include <qlineedit.h>
Index: frontends/qt2/QBibtex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QBibtex.C,v
retrieving revision 1.34
diff -u -p -r1.34 QBibtex.C
--- frontends/qt2/QBibtex.C 6 Oct 2003 15:42:50 -0000 1.34
+++ frontends/qt2/QBibtex.C 15 Oct 2003 16:07:52 -0000
@@ -14,7 +14,7 @@
#include "debug.h"
#include "support/lstrings.h"
-#include "ControlBibtex.h"
+#include "frontends/controllers/ControlBibtex.h"
#include "qt_helpers.h"
#include "support/filetools.h" // ChangeExtension
Index: frontends/qt2/QChanges.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QChanges.C,v
retrieving revision 1.9
diff -u -p -r1.9 QChanges.C
--- frontends/qt2/QChanges.C 6 Oct 2003 15:42:50 -0000 1.9
+++ frontends/qt2/QChanges.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlChanges.h"
+#include "frontends/controllers/ControlChanges.h"
#include "qt_helpers.h"
#include <qpushbutton.h>
Index: frontends/qt2/QCharacter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCharacter.C,v
retrieving revision 1.25
diff -u -p -r1.25 QCharacter.C
--- frontends/qt2/QCharacter.C 29 Sep 2003 10:50:50 -0000 1.25
+++ frontends/qt2/QCharacter.C 15 Oct 2003 16:07:52 -0000
@@ -13,7 +13,7 @@
#include "debug.h"
#include "QCharacter.h"
-#include "ControlCharacter.h"
+#include "frontends/controllers/ControlCharacter.h"
#include "QCharacterDialog.h"
#include "Qt2BC.h"
Index: frontends/qt2/QCharacter.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCharacter.h,v
retrieving revision 1.13
diff -u -p -r1.13 QCharacter.h
--- frontends/qt2/QCharacter.h 7 Sep 2003 21:25:34 -0000 1.13
+++ frontends/qt2/QCharacter.h 15 Oct 2003 16:07:52 -0000
@@ -15,8 +15,8 @@
#include "QDialogView.h"
-#include "controllers/character.h"
-#include "controllers/frnt_lang.h"
+#include "frontends/controllers/character.h"
+#include "frontends/controllers/frnt_lang.h"
#include <vector>
Index: frontends/qt2/QCitation.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCitation.C,v
retrieving revision 1.28
diff -u -p -r1.28 QCitation.C
--- frontends/qt2/QCitation.C 6 Oct 2003 15:42:50 -0000 1.28
+++ frontends/qt2/QCitation.C 15 Oct 2003 16:07:52 -0000
@@ -25,7 +25,7 @@
#include <qlabel.h>
#include "Qt2BC.h"
-#include "ControlCitation.h"
+#include "frontends/controllers/ControlCitation.h"
#include "qt_helpers.h"
#include "support/lstrings.h"
Index: frontends/qt2/QCitationDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCitationDialog.C,v
retrieving revision 1.26
diff -u -p -r1.26 QCitationDialog.C
--- frontends/qt2/QCitationDialog.C 6 Oct 2003 15:42:50 -0000 1.26
+++ frontends/qt2/QCitationDialog.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "qt_helpers.h"
-#include "controllers/ControlCitation.h"
+#include "frontends/controllers/ControlCitation.h"
#include <qcheckbox.h>
#include <qlineedit.h>
Index: frontends/qt2/QCitationDialog.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCitationDialog.h,v
retrieving revision 1.10
diff -u -p -r1.10 QCitationDialog.h
--- frontends/qt2/QCitationDialog.h 23 Aug 2003 00:16:38 -0000 1.10
+++ frontends/qt2/QCitationDialog.h 15 Oct 2003 16:07:52 -0000
@@ -14,7 +14,7 @@
#include "ui/QCitationDialogBase.h"
-#include "controllers/biblio.h"
+#include "frontends/controllers/biblio.h"
class QCitation;
class QCitationFindDialogBase;
Index: frontends/qt2/QCommandBuffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QCommandBuffer.C,v
retrieving revision 1.23
diff -u -p -r1.23 QCommandBuffer.C
--- frontends/qt2/QCommandBuffer.C 6 Oct 2003 15:42:50 -0000 1.23
+++ frontends/qt2/QCommandBuffer.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "support/filetools.h"
-#include "controllers/ControlCommandBuffer.h"
+#include "frontends/controllers/ControlCommandBuffer.h"
#include "qt_helpers.h"
#include "QtView.h"
Index: frontends/qt2/QDelimiterDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDelimiterDialog.C,v
retrieving revision 1.17
diff -u -p -r1.17 QDelimiterDialog.C
--- frontends/qt2/QDelimiterDialog.C 6 Oct 2003 15:42:50 -0000 1.17
+++ frontends/qt2/QDelimiterDialog.C 15 Oct 2003 16:07:52 -0000
@@ -13,7 +13,7 @@
#include "qt_helpers.h"
-#include "ControlMath.h"
+#include "frontends/controllers/ControlMath.h"
#include "QMath.h"
#include "QDelimiterDialog.h"
Index: frontends/qt2/QDialogView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDialogView.C,v
retrieving revision 1.9
diff -u -p -r1.9 QDialogView.C
--- frontends/qt2/QDialogView.C 6 Oct 2003 15:42:50 -0000 1.9
+++ frontends/qt2/QDialogView.C 15 Oct 2003 16:07:52 -0000
@@ -13,7 +13,7 @@
#include "Qt2BC.h"
-#include "ButtonController.h"
+#include "frontends/controllers/ButtonController.h"
#include "qt_helpers.h"
#include "QDialogView.h"
Index: frontends/qt2/QDialogView.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDialogView.h,v
retrieving revision 1.9
diff -u -p -r1.9 QDialogView.h
--- frontends/qt2/QDialogView.h 6 Oct 2003 15:42:50 -0000 1.9
+++ frontends/qt2/QDialogView.h 15 Oct 2003 16:07:52 -0000
@@ -12,7 +12,7 @@
#ifndef QDIALOGVIEW_H
#define QDIALOGVIEW_H
-#include "Dialog.h"
+#include "frontends/controllers/Dialog.h"
#include <boost/scoped_ptr.hpp>
#include <qapplication.h>
Index: frontends/qt2/QDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDocument.C,v
retrieving revision 1.60
diff -u -p -r1.60 QDocument.C
--- frontends/qt2/QDocument.C 6 Oct 2003 15:42:50 -0000 1.60
+++ frontends/qt2/QDocument.C 15 Oct 2003 16:07:52 -0000
@@ -13,14 +13,14 @@
#include "debug.h"
#include "qt_helpers.h"
-#include "ControlDocument.h"
+#include "frontends/controllers/ControlDocument.h"
#include "QDocument.h"
#include "QDocumentDialog.h"
#include "bufferparams.h"
#include "language.h"
-#include "helper_funcs.h" // getSecond()
-#include "frnt_lang.h"
+#include "frontends/controllers/helper_funcs.h" // getSecond()
+#include "frontends/controllers/frnt_lang.h"
#include "lyxrc.h" // defaultUnit
#include "tex-strings.h" // tex_graphics
#include "support/tostr.h"
Index: frontends/qt2/QDocumentDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDocumentDialog.C,v
retrieving revision 1.38
diff -u -p -r1.38 QDocumentDialog.C
--- frontends/qt2/QDocumentDialog.C 6 Oct 2003 15:42:50 -0000 1.38
+++ frontends/qt2/QDocumentDialog.C 15 Oct 2003 16:07:52 -0000
@@ -13,7 +13,7 @@
#include "debug.h"
#include "qt_helpers.h"
-#include "ControlDocument.h"
+#include "frontends/controllers/ControlDocument.h"
#include "QDocument.h"
#include "QDocumentDialog.h"
Index: frontends/qt2/QERT.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QERT.C,v
retrieving revision 1.18
diff -u -p -r1.18 QERT.C
--- frontends/qt2/QERT.C 29 Sep 2003 10:50:51 -0000 1.18
+++ frontends/qt2/QERT.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlERT.h"
+#include "frontends/controllers/ControlERT.h"
#include <qradiobutton.h>
#include <qpushbutton.h>
Index: frontends/qt2/QErrorList.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QErrorList.C,v
retrieving revision 1.7
diff -u -p -r1.7 QErrorList.C
--- frontends/qt2/QErrorList.C 29 Sep 2003 10:50:51 -0000 1.7
+++ frontends/qt2/QErrorList.C 15 Oct 2003 16:07:52 -0000
@@ -13,7 +13,7 @@
#include "debug.h"
#include "qt_helpers.h"
-#include "ControlErrorList.h"
+#include "frontends/controllers/ControlErrorList.h"
#include "QErrorList.h"
#include "QErrorListDialog.h"
#include "Qt2BC.h"
Index: frontends/qt2/QExternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QExternal.C,v
retrieving revision 1.33
diff -u -p -r1.33 QExternal.C
--- frontends/qt2/QExternal.C 7 Oct 2003 22:59:56 -0000 1.33
+++ frontends/qt2/QExternal.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlExternal.h"
+#include "frontends/controllers/ControlExternal.h"
#include "qt_helpers.h"
#include "insets/ExternalTemplate.h"
Index: frontends/qt2/QExternalDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QExternalDialog.C,v
retrieving revision 1.16
diff -u -p -r1.16 QExternalDialog.C
--- frontends/qt2/QExternalDialog.C 7 Oct 2003 22:59:56 -0000 1.16
+++ frontends/qt2/QExternalDialog.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "qt_helpers.h"
-#include "ControlExternal.h"
+#include "frontends/controllers/ControlExternal.h"
#include <qcombobox.h>
#include <qpushbutton.h>
Index: frontends/qt2/QFloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QFloat.C,v
retrieving revision 1.21
diff -u -p -r1.21 QFloat.C
--- frontends/qt2/QFloat.C 29 Sep 2003 10:50:51 -0000 1.21
+++ frontends/qt2/QFloat.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlFloat.h"
+#include "frontends/controllers/ControlFloat.h"
#include "QFloatDialog.h"
#include "QFloat.h"
#include "Qt2BC.h"
Index: frontends/qt2/QGraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QGraphics.C,v
retrieving revision 1.42
diff -u -p -r1.42 QGraphics.C
--- frontends/qt2/QGraphics.C 6 Oct 2003 15:42:50 -0000 1.42
+++ frontends/qt2/QGraphics.C 15 Oct 2003 16:07:52 -0000
@@ -13,8 +13,8 @@
#include <config.h>
#include "debug.h"
-#include "ControlGraphics.h"
-#include "controllers/helper_funcs.h"
+#include "frontends/controllers/ControlGraphics.h"
+#include "frontends/controllers/helper_funcs.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "support/lyxlib.h"
Index: frontends/qt2/QGraphicsDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QGraphicsDialog.C,v
retrieving revision 1.22
diff -u -p -r1.22 QGraphicsDialog.C
--- frontends/qt2/QGraphicsDialog.C 6 Oct 2003 15:42:50 -0000 1.22
+++ frontends/qt2/QGraphicsDialog.C 15 Oct 2003 16:07:52 -0000
@@ -12,7 +12,7 @@
#include <config.h>
-#include "ControlGraphics.h"
+#include "frontends/controllers/ControlGraphics.h"
#include "debug.h"
#include "qt_helpers.h"
Index: frontends/qt2/QInclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QInclude.C,v
retrieving revision 1.26
diff -u -p -r1.26 QInclude.C
--- frontends/qt2/QInclude.C 6 Oct 2003 15:42:50 -0000 1.26
+++ frontends/qt2/QInclude.C 15 Oct 2003 16:07:52 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlInclude.h"
+#include "frontends/controllers/ControlInclude.h"
#include "qt_helpers.h"
#include "QIncludeDialog.h"
Index: frontends/qt2/QIndex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QIndex.C,v
retrieving revision 1.27
diff -u -p -r1.27 QIndex.C
--- frontends/qt2/QIndex.C 6 Oct 2003 15:42:50 -0000 1.27
+++ frontends/qt2/QIndex.C 15 Oct 2003 16:07:52 -0000
@@ -11,13 +11,13 @@
#include <config.h>
#include "debug.h"
-#include "ControlCommand.h"
+#include "frontends/controllers/ControlCommand.h"
#include "qt_helpers.h"
#include "QIndexDialog.h"
#include "QIndex.h"
#include "Qt2BC.h"
-#include "ButtonController.h"
+#include "frontends/controllers/ButtonController.h"
#include <qlabel.h>
#include <qlineedit.h>
#include <qpushbutton.h>
Index: frontends/qt2/QLPainter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLPainter.C,v
retrieving revision 1.30
diff -u -p -r1.30 QLPainter.C
--- frontends/qt2/QLPainter.C 6 Oct 2003 15:42:50 -0000 1.30
+++ frontends/qt2/QLPainter.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "QLPainter.h"
-#include "font_metrics.h"
+#include "frontends/font_metrics.h"
#include "debug.h"
#include "language.h"
#include "LColor.h"
Index: frontends/qt2/QLPainter.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLPainter.h,v
retrieving revision 1.13
diff -u -p -r1.13 QLPainter.h
--- frontends/qt2/QLPainter.h 6 Oct 2003 15:42:50 -0000 1.13
+++ frontends/qt2/QLPainter.h 15 Oct 2003 16:07:53 -0000
@@ -12,7 +12,13 @@
#ifndef QLPAINTER_H
#define QLPAINTER_H
+<<<<<<< QLPainter.h
+
+#include "frontends/Painter.h"
+#include "support/std_string.h"
+=======
#include "Painter.h"
+>>>>>>> 1.13
#include <boost/scoped_ptr.hpp>
Index: frontends/qt2/QLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLog.C,v
retrieving revision 1.22
diff -u -p -r1.22 QLog.C
--- frontends/qt2/QLog.C 6 Oct 2003 15:42:50 -0000 1.22
+++ frontends/qt2/QLog.C 15 Oct 2003 16:07:53 -0000
@@ -12,7 +12,7 @@
#include "debug.h"
#include "qt_helpers.h"
-#include "ControlLog.h"
+#include "frontends/controllers/ControlLog.h"
#include "support/std_sstream.h"
#include <qtextview.h>
Index: frontends/qt2/QMathDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QMathDialog.C,v
retrieving revision 1.36
diff -u -p -r1.36 QMathDialog.C
--- frontends/qt2/QMathDialog.C 6 Oct 2003 15:42:50 -0000 1.36
+++ frontends/qt2/QMathDialog.C 15 Oct 2003 16:07:53 -0000
@@ -13,7 +13,7 @@
#include "qt_helpers.h"
-#include "ControlMath.h"
+#include "frontends/controllers/ControlMath.h"
#include "QMathDialog.h"
#include "QMath.h"
Index: frontends/qt2/QMathMatrixDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QMathMatrixDialog.C,v
retrieving revision 1.16
diff -u -p -r1.16 QMathMatrixDialog.C
--- frontends/qt2/QMathMatrixDialog.C 6 Oct 2003 15:42:50 -0000 1.16
+++ frontends/qt2/QMathMatrixDialog.C 15 Oct 2003 16:07:53 -0000
@@ -13,7 +13,7 @@
#include "qt_helpers.h"
#include "support/std_sstream.h"
-#include "ControlMath.h"
+#include "frontends/controllers/ControlMath.h"
#include "QMath.h"
#include "QMathMatrixDialog.h"
Index: frontends/qt2/QMinipage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QMinipage.C,v
retrieving revision 1.24
diff -u -p -r1.24 QMinipage.C
--- frontends/qt2/QMinipage.C 6 Oct 2003 15:42:50 -0000 1.24
+++ frontends/qt2/QMinipage.C 15 Oct 2003 16:07:53 -0000
@@ -14,7 +14,7 @@
#include "qt_helpers.h"
#include "support/tostr.h"
#include "support/lstrings.h"
-#include "ControlMinipage.h"
+#include "frontends/controllers/ControlMinipage.h"
#include "QMinipage.h"
#include "QMinipageDialog.h"
Index: frontends/qt2/QNote.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QNote.C,v
retrieving revision 1.7
diff -u -p -r1.7 QNote.C
--- frontends/qt2/QNote.C 6 Oct 2003 15:42:50 -0000 1.7
+++ frontends/qt2/QNote.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlNote.h"
+#include "frontends/controllers/ControlNote.h"
#include "insets/insetnote.h"
#include <qradiobutton.h>
Index: frontends/qt2/QParagraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QParagraph.C,v
retrieving revision 1.30
diff -u -p -r1.30 QParagraph.C
--- frontends/qt2/QParagraph.C 6 Oct 2003 15:42:50 -0000 1.30
+++ frontends/qt2/QParagraph.C 15 Oct 2003 16:07:53 -0000
@@ -11,14 +11,14 @@
#include <config.h>
#include "debug.h"
-#include "ControlParagraph.h"
+#include "frontends/controllers/ControlParagraph.h"
#include "QParagraph.h"
#include "QParagraphDialog.h"
#include "Qt2BC.h"
#include "ParagraphParameters.h"
#include "lyxrc.h" // to set the deafult length values
#include "qt_helpers.h"
-#include "helper_funcs.h"
+#include "frontends/controllers/helper_funcs.h"
#include "Spacing.h"
#include "vspace.h"
Index: frontends/qt2/QPrefs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefs.C,v
retrieving revision 1.49
diff -u -p -r1.49 QPrefs.C
--- frontends/qt2/QPrefs.C 6 Oct 2003 15:42:51 -0000 1.49
+++ frontends/qt2/QPrefs.C 15 Oct 2003 16:07:53 -0000
@@ -16,7 +16,7 @@
#include "support/std_sstream.h"
#include <iomanip>
-#include "ControlPrefs.h"
+#include "frontends/controllers/ControlPrefs.h"
#include "QPrefsDialog.h"
#include "ui/QPrefAsciiModule.h"
#include "ui/QPrefDateModule.h"
@@ -31,12 +31,12 @@
#include "ui/QPrefPrinterModule.h"
#include "ui/QPrefUIModule.h"
#include "ui/QPrefIdentityModule.h"
-#include "lyx_gui.h"
+#include "frontends/lyx_gui.h"
#include "QPrefs.h"
#include "Qt2BC.h"
#include "lyxfont.h"
-#include "frnt_lang.h"
-#include "helper_funcs.h"
+#include "frontends/controllers/frnt_lang.h"
+#include "frontends/controllers/helper_funcs.h"
#include "qt_helpers.h"
#include "lcolorcache.h"
Index: frontends/qt2/QPrefs.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefs.h,v
retrieving revision 1.8
diff -u -p -r1.8 QPrefs.h
--- frontends/qt2/QPrefs.h 6 Oct 2003 15:42:51 -0000 1.8
+++ frontends/qt2/QPrefs.h 15 Oct 2003 16:07:53 -0000
@@ -15,7 +15,7 @@
#include "converter.h"
#include "format.h"
-#include "ControlPrefs.h"
+#include "frontends/controllers/ControlPrefs.h"
#include "Qt2Base.h"
Index: frontends/qt2/QPrefsDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefsDialog.C,v
retrieving revision 1.29
diff -u -p -r1.29 QPrefsDialog.C
--- frontends/qt2/QPrefsDialog.C 6 Oct 2003 15:42:51 -0000 1.29
+++ frontends/qt2/QPrefsDialog.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "qt_helpers.h"
-#include "ControlPrefs.h"
+#include "frontends/controllers/ControlPrefs.h"
#include "QPrefs.h"
Index: frontends/qt2/QPrint.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrint.C,v
retrieving revision 1.20
diff -u -p -r1.20 QPrint.C
--- frontends/qt2/QPrint.C 29 Sep 2003 10:50:51 -0000 1.20
+++ frontends/qt2/QPrint.C 15 Oct 2003 16:07:53 -0000
@@ -13,7 +13,7 @@
#include "debug.h"
#include "PrinterParams.h"
-#include "ControlPrint.h"
+#include "frontends/controllers/ControlPrint.h"
#include "qt_helpers.h"
#include "QPrint.h"
Index: frontends/qt2/QRef.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QRef.C,v
retrieving revision 1.31
diff -u -p -r1.31 QRef.C
--- frontends/qt2/QRef.C 6 Oct 2003 15:42:51 -0000 1.31
+++ frontends/qt2/QRef.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlRef.h"
+#include "frontends/controllers/ControlRef.h"
#include "insets/insetref.h"
#include "QRef.h"
Index: frontends/qt2/QSearch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QSearch.C,v
retrieving revision 1.19
diff -u -p -r1.19 QSearch.C
--- frontends/qt2/QSearch.C 6 Oct 2003 15:42:51 -0000 1.19
+++ frontends/qt2/QSearch.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlSearch.h"
+#include "frontends/controllers/ControlSearch.h"
#include "QSearch.h"
#include "QSearchDialog.h"
Index: frontends/qt2/QSearchDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QSearchDialog.C,v
retrieving revision 1.14
diff -u -p -r1.14 QSearchDialog.C
--- frontends/qt2/QSearchDialog.C 6 Oct 2003 15:42:51 -0000 1.14
+++ frontends/qt2/QSearchDialog.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
-#include "ControlSearch.h"
+#include "frontends/controllers/ControlSearch.h"
#include "QSearchDialog.h"
#include "QSearch.h"
#include "qt_helpers.h"
Index: frontends/qt2/QSendto.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QSendto.C,v
retrieving revision 1.13
diff -u -p -r1.13 QSendto.C
--- frontends/qt2/QSendto.C 6 Oct 2003 15:42:51 -0000 1.13
+++ frontends/qt2/QSendto.C 15 Oct 2003 16:07:53 -0000
@@ -12,7 +12,7 @@
#include "Qt2BC.h"
-#include "ControlSendto.h"
+#include "frontends/controllers/ControlSendto.h"
#include "QSendtoDialog.h"
#include "QSendto.h"
Index: frontends/qt2/QShowFile.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QShowFile.C,v
retrieving revision 1.16
diff -u -p -r1.16 QShowFile.C
--- frontends/qt2/QShowFile.C 6 Oct 2003 15:42:51 -0000 1.16
+++ frontends/qt2/QShowFile.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlShowFile.h"
+#include "frontends/controllers/ControlShowFile.h"
#include "qt_helpers.h"
#include "QShowFile.h"
Index: frontends/qt2/QSpellchecker.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QSpellchecker.C,v
retrieving revision 1.27
diff -u -p -r1.27 QSpellchecker.C
--- frontends/qt2/QSpellchecker.C 6 Oct 2003 15:42:51 -0000 1.27
+++ frontends/qt2/QSpellchecker.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlSpellchecker.h"
+#include "frontends/controllers/ControlSpellchecker.h"
#include "QSpellcheckerDialog.h"
#include "QSpellchecker.h"
#include "Qt2BC.h"
Index: frontends/qt2/QTabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QTabular.C,v
retrieving revision 1.29
diff -u -p -r1.29 QTabular.C
--- frontends/qt2/QTabular.C 6 Oct 2003 15:42:52 -0000 1.29
+++ frontends/qt2/QTabular.C 15 Oct 2003 16:07:53 -0000
@@ -13,14 +13,14 @@
#include <config.h>
#include "debug.h"
-#include "ControlTabular.h"
+#include "frontends/controllers/ControlTabular.h"
#include "qt_helpers.h"
#include "support/tostr.h"
#include "QTabularDialog.h"
#include "QTabular.h"
#include "Qt2BC.h"
-#include "ButtonController.h"
+#include "frontends/controllers/ButtonController.h"
#include <qpushbutton.h>
#include <qlineedit.h>
Index: frontends/qt2/QTabularCreate.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QTabularCreate.C,v
retrieving revision 1.16
diff -u -p -r1.16 QTabularCreate.C
--- frontends/qt2/QTabularCreate.C 29 Sep 2003 10:50:51 -0000 1.16
+++ frontends/qt2/QTabularCreate.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlTabularCreate.h"
+#include "frontends/controllers/ControlTabularCreate.h"
#include "QTabularCreateDialog.h"
#include "QTabularCreate.h"
#include "Qt2BC.h"
Index: frontends/qt2/QTabularDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QTabularDialog.C,v
retrieving revision 1.19
diff -u -p -r1.19 QTabularDialog.C
--- frontends/qt2/QTabularDialog.C 6 Oct 2003 15:42:52 -0000 1.19
+++ frontends/qt2/QTabularDialog.C 15 Oct 2003 16:07:53 -0000
@@ -13,7 +13,7 @@
#include <config.h>
-#include "ControlTabular.h"
+#include "frontends/controllers/ControlTabular.h"
#include "QTabular.h"
#include "QTabularDialog.h"
Index: frontends/qt2/QTexinfo.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QTexinfo.h,v
retrieving revision 1.13
diff -u -p -r1.13 QTexinfo.h
--- frontends/qt2/QTexinfo.h 6 Oct 2003 15:42:52 -0000 1.13
+++ frontends/qt2/QTexinfo.h 15 Oct 2003 16:07:53 -0000
@@ -14,7 +14,7 @@
#include "QDialogView.h"
-#include "ControlTexinfo.h"
+#include "frontends/controllers/ControlTexinfo.h"
#include <map>
#include <vector>
Index: frontends/qt2/QThesaurus.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QThesaurus.C,v
retrieving revision 1.19
diff -u -p -r1.19 QThesaurus.C
--- frontends/qt2/QThesaurus.C 29 Sep 2003 10:50:51 -0000 1.19
+++ frontends/qt2/QThesaurus.C 15 Oct 2003 16:07:53 -0000
@@ -11,7 +11,7 @@
#include <config.h>
#include "debug.h"
-#include "ControlThesaurus.h"
+#include "frontends/controllers/ControlThesaurus.h"
#include "QThesaurusDialog.h"
#include "QThesaurus.h"
#include "Qt2BC.h"
Index: frontends/qt2/QThesaurusDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QThesaurusDialog.C,v
retrieving revision 1.14
diff -u -p -r1.14 QThesaurusDialog.C
--- frontends/qt2/QThesaurusDialog.C 6 Oct 2003 15:42:52 -0000 1.14
+++ frontends/qt2/QThesaurusDialog.C 15 Oct 2003 16:07:53 -0000
@@ -12,7 +12,7 @@
-#include "ControlThesaurus.h"
+#include "frontends/controllers/ControlThesaurus.h"
#include "QThesaurusDialog.h"
#include "QThesaurus.h"
#include "qt_helpers.h"
Index: frontends/qt2/QToc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QToc.C,v
retrieving revision 1.26
diff -u -p -r1.26 QToc.C
--- frontends/qt2/QToc.C 6 Oct 2003 15:42:52 -0000 1.26
+++ frontends/qt2/QToc.C 15 Oct 2003 16:07:53 -0000
@@ -15,7 +15,7 @@
#include "qt_helpers.h"
-#include "ControlToc.h"
+#include "frontends/controllers/ControlToc.h"
#include "QToc.h"
#include "QTocDialog.h"
#include "Qt2BC.h"
Index: frontends/qt2/QURL.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QURL.C,v
retrieving revision 1.25
diff -u -p -r1.25 QURL.C
--- frontends/qt2/QURL.C 6 Oct 2003 15:42:52 -0000 1.25
+++ frontends/qt2/QURL.C 15 Oct 2003 16:07:53 -0000
@@ -11,13 +11,13 @@
#include <config.h>
#include "debug.h"
-#include "ControlCommand.h"
+#include "frontends/controllers/ControlCommand.h"
#include "qt_helpers.h"
#include "QURL.h"
#include "QURLDialog.h"
#include "Qt2BC.h"
-#include "ButtonController.h"
+#include "frontends/controllers/ButtonController.h"
#include <qcheckbox.h>
#include <qpushbutton.h>
Index: frontends/qt2/QVCLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QVCLog.C,v
retrieving revision 1.24
diff -u -p -r1.24 QVCLog.C
--- frontends/qt2/QVCLog.C 29 Sep 2003 10:50:51 -0000 1.24
+++ frontends/qt2/QVCLog.C 15 Oct 2003 16:07:54 -0000
@@ -14,7 +14,7 @@
#include "support/std_sstream.h"
#include "qt_helpers.h"
#include "support/lstrings.h"
-#include "ControlVCLog.h"
+#include "frontends/controllers/ControlVCLog.h"
#include "QVCLog.h"
#include "QVCLogDialog.h"
Index: frontends/qt2/QWorkArea.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QWorkArea.h,v
retrieving revision 1.13
diff -u -p -r1.13 QWorkArea.h
--- frontends/qt2/QWorkArea.h 6 Oct 2003 15:42:52 -0000 1.13
+++ frontends/qt2/QWorkArea.h 15 Oct 2003 16:07:54 -0000
@@ -13,7 +13,7 @@
#ifndef QWORKAREA_H
#define QWORKAREA_H
-#include "WorkArea.h"
+#include "frontends/WorkArea.h"
#include "QLPainter.h"
#include "QContentPane.h"
Index: frontends/qt2/QWrap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QWrap.C,v
retrieving revision 1.17
diff -u -p -r1.17 QWrap.C
--- frontends/qt2/QWrap.C 6 Oct 2003 15:42:52 -0000 1.17
+++ frontends/qt2/QWrap.C 15 Oct 2003 16:07:54 -0000
@@ -14,7 +14,7 @@
#include "qt_helpers.h"
#include "support/tostr.h"
#include "support/lstrings.h"
-#include "ControlWrap.h"
+#include "frontends/controllers/ControlWrap.h"
#include "QWrap.h"
#include "QWrapDialog.h"
Index: frontends/qt2/Qt2BC.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Qt2BC.h,v
retrieving revision 1.8
diff -u -p -r1.8 Qt2BC.h
--- frontends/qt2/Qt2BC.h 6 Oct 2003 15:42:52 -0000 1.8
+++ frontends/qt2/Qt2BC.h 15 Oct 2003 16:07:54 -0000
@@ -15,7 +15,7 @@
#define QT2BC_H
-#include "BCView.h"
+#include "frontends/controllers/BCView.h"
#include "gettext.h"
class QWidget;
Index: frontends/qt2/Qt2Base.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Qt2Base.C,v
retrieving revision 1.26
diff -u -p -r1.26 Qt2Base.C
--- frontends/qt2/Qt2Base.C 6 Oct 2003 15:42:52 -0000 1.26
+++ frontends/qt2/Qt2Base.C 15 Oct 2003 16:07:54 -0000
@@ -14,8 +14,8 @@
#include "qt_helpers.h"
#include "Qt2Base.h"
#include "Qt2BC.h"
-#include "ButtonController.h"
-#include "ControlButtons.h"
+#include "frontends/controllers/ButtonController.h"
+#include "frontends/controllers/ControlButtons.h"
using std::string;
Index: frontends/qt2/Qt2Base.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Qt2Base.h,v
retrieving revision 1.29
diff -u -p -r1.29 Qt2Base.h
--- frontends/qt2/Qt2Base.h 6 Oct 2003 15:42:52 -0000 1.29
+++ frontends/qt2/Qt2Base.h 15 Oct 2003 16:07:54 -0000
@@ -13,7 +13,7 @@
#define QT2BASE_H
-#include "ViewBase.h"
+#include "frontends/controllers/ViewBase.h"
#include <boost/scoped_ptr.hpp>
#include <qapplication.h>
Index: frontends/qt2/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/lyx_gui.C,v
retrieving revision 1.58
diff -u -p -r1.58 lyx_gui.C
--- frontends/qt2/lyx_gui.C 14 Oct 2003 21:30:21 -0000 1.58
+++ frontends/qt2/lyx_gui.C 15 Oct 2003 16:07:54 -0000
@@ -16,7 +16,7 @@
#include "support/os.h"
#include "qt_helpers.h"
-#include "lyx_gui.h"
+#include "frontends/lyx_gui.h"
#include "funcrequest.h"
#include "graphics/LoaderQueue.h"
Index: frontends/qt2/qfont_metrics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qfont_metrics.C,v
retrieving revision 1.26
diff -u -p -r1.26 qfont_metrics.C
--- frontends/qt2/qfont_metrics.C 6 Oct 2003 15:42:52 -0000 1.26
+++ frontends/qt2/qfont_metrics.C 15 Oct 2003 16:07:54 -0000
@@ -11,7 +11,7 @@
#include <config.h>
-#include "font_metrics.h"
+#include "frontends/font_metrics.h"
#include "frontends/lyx_gui.h"
#include "qfont_loader.h"
#include "language.h"
Index: frontends/qt2/qscreen.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qscreen.h,v
retrieving revision 1.11
diff -u -p -r1.11 qscreen.h
--- frontends/qt2/qscreen.h 5 Sep 2003 15:06:13 -0000 1.11
+++ frontends/qt2/qscreen.h 15 Oct 2003 16:07:54 -0000
@@ -13,7 +13,7 @@
#define QSCREEN_H
-#include "screen.h"
+#include "frontends/screen.h"
#include <qrect.h>
#include <boost/scoped_ptr.hpp>
Index: frontends/qt2/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/moc/Makefile.am,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile.am
--- frontends/qt2/moc/Makefile.am 2 Aug 2003 20:01:51 -0000 1.26
+++ frontends/qt2/moc/Makefile.am 15 Oct 2003 16:07:54 -0000
@@ -3,12 +3,8 @@ include $(srcdir)/../Makefile.dialogs
DISTCLEANFILES += *.C
-INCLUDES = -I$(top_srcdir)/src/ \
- -I$(top_srcdir)/src/frontends/ \
- -I$(top_srcdir)/src/frontends/controllers \
- -I$(top_builddir)/src/frontends/qt2 \
- $(QT_INCLUDES) \
- $(BOOST_INCLUDES)
+INCLUDES = -I$(top_builddir)/src/frontends/qt2 \
+ $(QT_INCLUDES) $(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
Index: frontends/qt2/ui/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/Makefile.am,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile.am
--- frontends/qt2/ui/Makefile.am 2 Aug 2003 20:01:51 -0000 1.22
+++ frontends/qt2/ui/Makefile.am 15 Oct 2003 16:07:54 -0000
@@ -7,10 +7,8 @@ SUBDIRS = . moc
EXTRA_DIST = $(UIFILES)
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
- -I$(top_srcdir)/src/frontends/qt2 \
- $(QT_INCLUDES) $(BOOST_INCLUDES) \
- -I$(top_srcdir)/src/frontends/controllers
+INCLUDES = -I$(top_srcdir)/src/frontends/qt2 \
+ $(QT_INCLUDES) $(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
Index: frontends/qt2/ui/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/moc/Makefile.am,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.am
--- frontends/qt2/ui/moc/Makefile.am 3 Aug 2003 18:07:51 -0000 1.16
+++ frontends/qt2/ui/moc/Makefile.am 15 Oct 2003 16:07:54 -0000
@@ -3,11 +3,7 @@ include $(srcdir)/../../Makefile.dialogs
DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
-INCLUDES = -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/frontends \
- -I$(top_srcdir)/src/frontends/controllers \
- $(QT_INCLUDES) \
- $(BOOST_INCLUDES)
+INCLUDES = $(QT_INCLUDES) $(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
--
Lgb
