Mercurial > hg > octave-nkf
changeset 14674:252a86f8fe62 gui
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.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Wed, 23 May 2012 10:50:08 +0200 |
parents | adad007cd018 |
children | 35512b788af2 |
files | gui/src/FileEditor.cpp gui/src/FileEditor.h gui/src/MainWindow.h gui/src/editor/FileEditor.cpp gui/src/editor/FileEditor.h gui/src/editor/lexeroctavegui.cpp gui/src/editor/lexeroctavegui.h gui/src/lexer/lexeroctavegui.cpp gui/src/lexer/lexeroctavegui.h gui/src/src.pro |
diffstat | 6 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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"
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 (*.*)";
--- 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 += \