Fix scons and a file inclusion problem in ControlCommand.h

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20816 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 475c852ee948ccaf24cfba9a4385a75158aea805..6753debe4ea5f5f27590ce8c6b1530d23ea5e832 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -716,18 +716,8 @@ src_frontends_controllers_header_files = Split('''
     ButtonPolicy.h
     ControlCommand.h
     ControlCommandBuffer.h
-    ControlDocument.h
-    ControlExternal.h
-    ControlGraphics.h
     ControlMath.h
     ControlParagraph.h
-    ControlPrefs.h
-    ControlPrint.h
-    ControlSearch.h
-    ControlSendto.h
-    ControlSpellchecker.h
-    ControlThesaurus.h
-    ControlToc.h
     Dialog.h
     frontend_helpers.h
 ''')
@@ -737,18 +727,8 @@ src_frontends_controllers_files = Split('''
     ButtonPolicy.cpp
     ControlCommand.cpp
     ControlCommandBuffer.cpp
-    ControlDocument.cpp
-    ControlExternal.cpp
-    ControlGraphics.cpp
     ControlMath.cpp
     ControlParagraph.cpp
-    ControlPrefs.cpp
-    ControlPrint.cpp
-    ControlSearch.cpp
-    ControlSendto.cpp
-    ControlSpellchecker.cpp
-    ControlThesaurus.cpp
-    ControlToc.cpp
     Dialog.cpp
     frontend_helpers.cpp
 ''')
@@ -848,6 +828,7 @@ src_frontends_qt4_header_files = Split('''
     GuiWrap.h
     IconPalette.h
     InsertTableWidget.h
+    LaTeXHighlighter.h
     LengthCombo.h
     LyXFileDialog.h
     PanelStack.h
@@ -933,6 +914,7 @@ src_frontends_qt4_files = Split('''
     IconPalette.cpp
     InsertTableWidget.cpp
     LengthCombo.cpp
+    LaTeXHighlighter.cpp
     LyXFileDialog.cpp
     PanelStack.cpp
     TocModel.cpp

diff --git a/src/frontends/controllers/ControlCommand.h b/src/frontends/controllers/ControlCommand.h
index caf7cb788b3bc3cba578b132cc83b07a6dfe175b..3680fea14f2e7d6bd14fec85714a29f1457cd41b 100644 (file)
--- a/src/frontends/controllers/ControlCommand.h
+++ b/src/frontends/controllers/ControlCommand.h
@@ -15,7 +15,7 @@
 #ifndef CONTROLCOMMAND_H
 #define CONTROLCOMMAND_H
 
-#include "controllers/Dialog.h"
+#include "Dialog.h"
 #include "insets/InsetCommandParams.h"
 
 namespace lyx {