# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1337763008 -7200
# Node ID 252a86f8fe62707a47708fe48194e2888b2981fd
# Parent  adad007cd018208ed1bf089b547db3a92f3b3679
Restructured source files.

* FileEditor: Moved into editor/.
* lexeroctavegui: Moved into editor/.
* src.pro: Corrected source file entries according to the changes made.
* MainWindow.h: Corrected includes.

diff --git a/gui/src/MainWindow.h b/gui/src/MainWindow.h
--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -32,7 +32,7 @@
 
 // QScintilla includes
 #include <Qsci/qsciapis.h>
-#include "lexer/lexeroctavegui.h"
+#include "lexeroctavegui.h"
 
 // QTerminal includes
 #include "QTerminal.h"
diff --git a/gui/src/FileEditor.cpp b/gui/src/editor/FileEditor.cpp
rename from gui/src/FileEditor.cpp
rename to gui/src/editor/FileEditor.cpp
diff --git a/gui/src/FileEditor.h b/gui/src/editor/FileEditor.h
rename from gui/src/FileEditor.h
rename to gui/src/editor/FileEditor.h
--- a/gui/src/FileEditor.h
+++ b/gui/src/editor/FileEditor.h
@@ -29,7 +29,7 @@
 #include <Qsci/qsciscintilla.h>
 // Not available in the Debian repos yet!
 // #include <Qsci/qscilexeroctave.h>
-#include "lexer/lexeroctavegui.h"
+#include "lexeroctavegui.h"
 
 const char UNNAMED_FILE[]     = "<unnamed>";
 const char SAVE_FILE_FILTER[] = "Octave Files (*.m);;All Files (*.*)";
diff --git a/gui/src/lexer/lexeroctavegui.cpp b/gui/src/editor/lexeroctavegui.cpp
rename from gui/src/lexer/lexeroctavegui.cpp
rename to gui/src/editor/lexeroctavegui.cpp
diff --git a/gui/src/lexer/lexeroctavegui.h b/gui/src/editor/lexeroctavegui.h
rename from gui/src/lexer/lexeroctavegui.h
rename to gui/src/editor/lexeroctavegui.h
diff --git a/gui/src/src.pro b/gui/src/src.pro
--- a/gui/src/src.pro
+++ b/gui/src/src.pro
@@ -40,7 +40,7 @@
 }
 
 # Includepaths and libraries to link against:
-INCLUDEPATH         += . backend ../qterminal/libqterminal \
+INCLUDEPATH         += . backend editor ../qterminal/libqterminal \
                        $$system(mkoctfile -p INCFLAGS)
 INCFLAGS            += $$system(mkoctfile -p INCFLAGS)
 mac {
@@ -74,7 +74,7 @@
 
 # Files associated with the project:
 SOURCES +=\
-    lexer/lexeroctavegui.cpp \
+    editor/lexeroctavegui.cpp \
     MainWindow.cpp \
     WorkspaceView.cpp \
     HistoryDockWidget.cpp \
@@ -85,11 +85,11 @@
     backend/OctaveLink.cpp \
     backend/OctaveMainThread.cpp \
     WelcomeWizard.cpp \
-    FileEditor.cpp \
+    editor/FileEditor.cpp \
     WorkspaceModel.cpp
 
 HEADERS += \
-    lexer/lexeroctavegui.h \
+    editor/lexeroctavegui.h \
     MainWindow.h \
     WorkspaceView.h \
     HistoryDockWidget.h \
@@ -99,7 +99,7 @@
     backend/OctaveLink.h \
     backend/OctaveMainThread.h \
     WelcomeWizard.h \
-    FileEditor.h \
+    editor/FileEditor.h \
     WorkspaceModel.h
 
 FORMS += \