# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1338495593 -7200
# Node ID 674740c44c09bbb7c3fa76ce60aa75c51a3334d8
# Parent  f86884be20fcf75dfdecb74203e1abfcf040c011
Changed various files to matche file naming conventions.

diff --git a/gui/gui.pro b/gui/solution.pro
rename from gui/gui.pro
rename to gui/solution.pro
diff --git a/gui/src/filesdockwidget.cc b/gui/src/files-dockwidget.cc
rename from gui/src/filesdockwidget.cc
rename to gui/src/files-dockwidget.cc
--- a/gui/src/filesdockwidget.cc
+++ b/gui/src/files-dockwidget.cc
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resourcemanager.h"
-#include "filesdockwidget.h"
+#include "resource-manager.h"
+#include "files-dockwidget.h"
 
 #include <QApplication>
 #include <QFileInfo>
diff --git a/gui/src/filesdockwidget.h b/gui/src/files-dockwidget.h
rename from gui/src/filesdockwidget.h
rename to gui/src/files-dockwidget.h
diff --git a/gui/src/historydockwidget.cc b/gui/src/history-dockwidget.cc
rename from gui/src/historydockwidget.cc
rename to gui/src/history-dockwidget.cc
--- a/gui/src/historydockwidget.cc
+++ b/gui/src/history-dockwidget.cc
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "historydockwidget.h"
+#include "history-dockwidget.h"
 #include <QVBoxLayout>
 
 HistoryDockWidget::HistoryDockWidget (QWidget * parent):QDockWidget (parent)
diff --git a/gui/src/historydockwidget.h b/gui/src/history-dockwidget.h
rename from gui/src/historydockwidget.h
rename to gui/src/history-dockwidget.h
--- a/gui/src/historydockwidget.h
+++ b/gui/src/history-dockwidget.h
@@ -22,7 +22,7 @@
 #include <QLineEdit>
 #include <QListView>
 #include <QSortFilterProxyModel>
-#include "octavelink.h"
+#include "octave-link.h"
 
 class HistoryDockWidget:public QDockWidget
 {
diff --git a/gui/src/editor/fileeditorinterface.h b/gui/src/m-editor/file-editor-interface.h
rename from gui/src/editor/fileeditorinterface.h
rename to gui/src/m-editor/file-editor-interface.h
diff --git a/gui/src/editor/fileeditortab.cc b/gui/src/m-editor/file-editor-tab.cc
rename from gui/src/editor/fileeditortab.cc
rename to gui/src/m-editor/file-editor-tab.cc
--- a/gui/src/editor/fileeditortab.cc
+++ b/gui/src/m-editor/file-editor-tab.cc
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fileeditortab.h"
-#include "fileeditor.h"
+#include "file-editor-tab.h"
+#include "file-editor.h"
 #include <QMessageBox>
 #include <QVBoxLayout>
 
diff --git a/gui/src/editor/fileeditortab.h b/gui/src/m-editor/file-editor-tab.h
rename from gui/src/editor/fileeditortab.h
rename to gui/src/m-editor/file-editor-tab.h
diff --git a/gui/src/editor/fileeditor.cc b/gui/src/m-editor/file-editor.cc
rename from gui/src/editor/fileeditor.cc
rename to gui/src/m-editor/file-editor.cc
--- a/gui/src/editor/fileeditor.cc
+++ b/gui/src/m-editor/file-editor.cc
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fileeditor.h"
+#include "file-editor.h"
 #include <QVBoxLayout>
 #include <QApplication>
 #include <QFile>
diff --git a/gui/src/editor/fileeditor.h b/gui/src/m-editor/file-editor.h
rename from gui/src/editor/fileeditor.h
rename to gui/src/m-editor/file-editor.h
--- a/gui/src/editor/fileeditor.h
+++ b/gui/src/m-editor/file-editor.h
@@ -18,9 +18,9 @@
 #ifndef FILEEDITORMDISUBWINDOW_H
 #define FILEEDITORMDISUBWINDOW_H
 
-#include "mainwindow.h"
-#include "fileeditorinterface.h"
-#include "fileeditortab.h"
+#include "main-window.h"
+#include "file-editor-interface.h"
+#include "file-editor-tab.h"
 
 #include <QToolBar>
 #include <QAction>
@@ -31,7 +31,7 @@
 #include <Qsci/qsciapis.h>
 // Not available in the Debian repos yet!
 // #include <Qsci/qscilexeroctave.h>
-#include "lexeroctavegui.h"
+#include "lexer-octave-gui.h"
 
 const char UNNAMED_FILE[]     = "<unnamed>";
 const char SAVE_FILE_FILTER[] = "Octave Files (*.m);;All Files (*.*)";
diff --git a/gui/src/editor/lexeroctavegui.cc b/gui/src/m-editor/lexer-octave-gui.cc
rename from gui/src/editor/lexeroctavegui.cc
rename to gui/src/m-editor/lexer-octave-gui.cc
--- a/gui/src/editor/lexeroctavegui.cc
+++ b/gui/src/m-editor/lexer-octave-gui.cc
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lexeroctavegui.h"
+#include "lexer-octave-gui.h"
 #include <qcolor.h>
 #include <qfont.h>
 
diff --git a/gui/src/editor/lexeroctavegui.h b/gui/src/m-editor/lexer-octave-gui.h
rename from gui/src/editor/lexeroctavegui.h
rename to gui/src/m-editor/lexer-octave-gui.h
--- a/gui/src/editor/lexeroctavegui.h
+++ b/gui/src/m-editor/lexer-octave-gui.h
@@ -18,7 +18,7 @@
 #ifndef LEXEROCTAVE_H
 #define LEXEROCTAVE_H
 
-#include "resourcemanager.h"
+#include "resource-manager.h"
 #include <QObject>
 #include <Qsci/qsciglobal.h>
 #include <Qsci/qscilexer.h>
diff --git a/gui/src/mainwindow.cc b/gui/src/main-window.cc
rename from gui/src/mainwindow.cc
rename to gui/src/main-window.cc
--- a/gui/src/mainwindow.cc
+++ b/gui/src/main-window.cc
@@ -26,9 +26,9 @@
 #include <QMessageBox>
 #include <QIcon>
 
-#include "mainwindow.h"
-#include "fileeditor.h"
-#include "settingsdialog.h"
+#include "main-window.h"
+#include "file-editor.h"
+#include "settings-dialog.h"
 
 MainWindow::MainWindow (QWidget * parent):QMainWindow (parent)
 {
diff --git a/gui/src/mainwindow.h b/gui/src/main-window.h
rename from gui/src/mainwindow.h
rename to gui/src/main-window.h
--- a/gui/src/mainwindow.h
+++ b/gui/src/main-window.h
@@ -32,18 +32,18 @@
 #include <QComboBox>
 
 // Editor includes
-#include "fileeditorinterface.h"
+#include "file-editor-interface.h"
 
 // QTerminal includes
 #include "QTerminal.h"
 
 // Own includes
-#include "resourcemanager.h"
-#include "octavelink.h"
-#include "workspaceview.h"
-#include "historydockwidget.h"
-#include "filesdockwidget.h"
-#include "terminaldockwidget.h"
+#include "resource-manager.h"
+#include "octave-link.h"
+#include "workspace-view.h"
+#include "history-dockwidget.h"
+#include "files-dockwidget.h"
+#include "terminal-dockwidget.h"
 
 /**
   * \class MainWindow
diff --git a/gui/src/backend/octavelink.cc b/gui/src/octave-adapter/octave-link.cc
rename from gui/src/backend/octavelink.cc
rename to gui/src/octave-adapter/octave-link.cc
--- a/gui/src/backend/octavelink.cc
+++ b/gui/src/octave-adapter/octave-link.cc
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "octavelink.h"
+#include "octave-link.h"
 #include "load-path.h"
 #include "oct-env.h"
 #include <QDir>
diff --git a/gui/src/backend/octavelink.h b/gui/src/octave-adapter/octave-link.h
rename from gui/src/backend/octavelink.h
rename to gui/src/octave-adapter/octave-link.h
--- a/gui/src/backend/octavelink.h
+++ b/gui/src/octave-adapter/octave-link.h
@@ -73,9 +73,9 @@
 #include <QStringListModel>
 #include <QTimer>
 
-#include "workspacemodel.h"
-#include "octavemainthread.h"
-#include "symbolinformation.h"
+#include "workspace-model.h"
+#include "octave-main-thread.h"
+#include "symbol-information.h"
 
 /**
   * \class OctaveLink
diff --git a/gui/src/backend/octavemainthread.cc b/gui/src/octave-adapter/octave-main-thread.cc
rename from gui/src/backend/octavemainthread.cc
rename to gui/src/octave-adapter/octave-main-thread.cc
--- a/gui/src/backend/octavemainthread.cc
+++ b/gui/src/octave-adapter/octave-main-thread.cc
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "octavemainthread.h"
-#include "octavelink.h"
+#include "octave-main-thread.h"
+#include "octave-link.h"
 
 OctaveMainThread::OctaveMainThread (QObject * parent):QThread (parent)
 {
diff --git a/gui/src/backend/octavemainthread.h b/gui/src/octave-adapter/octave-main-thread.h
rename from gui/src/backend/octavemainthread.h
rename to gui/src/octave-adapter/octave-main-thread.h
diff --git a/gui/src/backend/symbolinformation.h b/gui/src/octave-adapter/symbol-information.h
rename from gui/src/backend/symbolinformation.h
rename to gui/src/octave-adapter/symbol-information.h
diff --git a/gui/src/octavegui.cc b/gui/src/octave-gui.cc
rename from gui/src/octavegui.cc
rename to gui/src/octave-gui.cc
--- a/gui/src/octavegui.cc
+++ b/gui/src/octave-gui.cc
@@ -18,9 +18,9 @@
 #include <QtGui/QApplication>
 #include <QTranslator>
 #include <QSettings>
-#include "welcomewizard.h"
-#include "resourcemanager.h"
-#include "mainwindow.h"
+#include "welcome-wizard.h"
+#include "resource-manager.h"
+#include "main-window.h"
 
 int
 main (int argc, char *argv[])
diff --git a/gui/src/resourcemanager.cc b/gui/src/resource-manager.cc
rename from gui/src/resourcemanager.cc
rename to gui/src/resource-manager.cc
--- a/gui/src/resourcemanager.cc
+++ b/gui/src/resource-manager.cc
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resourcemanager.h"
+#include "resource-manager.h"
 #include <QFile>
 #include <QNetworkProxy>
 
diff --git a/gui/src/resourcemanager.h b/gui/src/resource-manager.h
rename from gui/src/resourcemanager.h
rename to gui/src/resource-manager.h
diff --git a/gui/src/settingsdialog.cc b/gui/src/settings-dialog.cc
rename from gui/src/settingsdialog.cc
rename to gui/src/settings-dialog.cc
--- a/gui/src/settingsdialog.cc
+++ b/gui/src/settings-dialog.cc
@@ -15,9 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resourcemanager.h"
-#include "settingsdialog.h"
-#include "ui_settingsdialog.h"
+#include "resource-manager.h"
+#include "settings-dialog.h"
+#include "ui_settings-dialog.h"
 #include <QSettings>
 
 SettingsDialog::SettingsDialog (QWidget * parent):
diff --git a/gui/src/settingsdialog.h b/gui/src/settings-dialog.h
rename from gui/src/settingsdialog.h
rename to gui/src/settings-dialog.h
diff --git a/gui/src/settingsdialog.ui b/gui/src/settings-dialog.ui
rename from gui/src/settingsdialog.ui
rename to gui/src/settings-dialog.ui
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 editor ../qterminal/libqterminal /usr/include/qt4 \
+INCLUDEPATH         += . octave-adapter m-editor ../qterminal/libqterminal /usr/include/qt4 \
                        $$system(mkoctfile -p INCFLAGS)
 INCFLAGS            += $$system(mkoctfile -p INCFLAGS)
 mac {
@@ -74,40 +74,40 @@
 
 # Files associated with the project:
 SOURCES +=\
-    backend/octavelink.cc \
-    backend/octavemainthread.cc \
-    editor/lexeroctavegui.cc \
-    editor/fileeditor.cc \
-    editor/fileeditortab.cc \
-    mainwindow.cc \
-    workspaceview.cc \
-    historydockwidget.cc \
-    filesdockwidget.cc \
-    settingsdialog.cc \
-    octavegui.cc \
-    resourcemanager.cc \
-    welcomewizard.cc \
-    workspacemodel.cc \
-    terminaldockwidget.cc
+    octave-adapter/octave-link.cc \
+    octave-adapter/octave-main-thread.cc \
+    m-editor/lexer-octave-gui.cc \
+    m-editor/file-editor.cc \
+    m-editor/file-editor-tab.cc \
+    main-window.cc \
+    workspace-view.cc \
+    history-dockwidget.cc \
+    files-dockwidget.cc \
+    settings-dialog.cc \
+    octave-gui.cc \
+    resource-manager.cc \
+    welcome-wizard.cc \
+    workspace-model.cc \
+    terminal-dockwidget.cc
 
 HEADERS += \
-    backend/octavelink.h \
-    backend/octavemainthread.h \
-    backend/symbolinformation.h \
-    editor/lexeroctavegui.h \
-    editor/fileeditor.h \
-    editor/fileeditorinterface.h \
-    editor/fileeditortab.h \
-    mainwindow.h \
-    workspaceview.h \
-    historydockwidget.h \
-    filesdockwidget.h \
-    settingsdialog.h \
-    resourcemanager.h \
-    welcomewizard.h \
-    workspacemodel.h \
-    terminaldockwidget.h
+    octave-adapter/octave-link.h \
+    octave-adapter/octave-main-thread.h \
+    octave-adapter/symbol-information.h \
+    m-editor/lexer-octave-gui.h \
+    m-editor/file-editor.h \
+    m-editor/file-editor-interface.h \
+    m-editor/file-editor-tab.h \
+    main-window.h \
+    workspace-view.h \
+    history-dockwidget.h \
+    files-dockwidget.h \
+    settings-dialog.h \
+    resource-manager.h \
+    welcome-wizard.h \
+    workspace-model.h \
+    terminal-dockwidget.h
 
 FORMS += \
-    settingsdialog.ui \
-    welcomewizard.ui
+    settings-dialog.ui \
+    welcome-wizard.ui
diff --git a/gui/src/terminaldockwidget.cc b/gui/src/terminal-dockwidget.cc
rename from gui/src/terminaldockwidget.cc
rename to gui/src/terminal-dockwidget.cc
--- a/gui/src/terminaldockwidget.cc
+++ b/gui/src/terminal-dockwidget.cc
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "terminaldockwidget.h"
+#include "terminal-dockwidget.h"
 
 TerminalDockWidget::TerminalDockWidget (QTerminal *terminal, QWidget *parent)
   : QDockWidget (parent)
diff --git a/gui/src/terminaldockwidget.h b/gui/src/terminal-dockwidget.h
rename from gui/src/terminaldockwidget.h
rename to gui/src/terminal-dockwidget.h
diff --git a/gui/src/welcomewizard.cc b/gui/src/welcome-wizard.cc
rename from gui/src/welcomewizard.cc
rename to gui/src/welcome-wizard.cc
--- a/gui/src/welcomewizard.cc
+++ b/gui/src/welcome-wizard.cc
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "welcomewizard.h"
-#include "ui_welcomewizard.h"
+#include "welcome-wizard.h"
+#include "ui_welcome-wizard.h"
 
 WelcomeWizard::WelcomeWizard (QWidget *parent) :
   QDialog (parent),
diff --git a/gui/src/welcomewizard.h b/gui/src/welcome-wizard.h
rename from gui/src/welcomewizard.h
rename to gui/src/welcome-wizard.h
diff --git a/gui/src/welcomewizard.ui b/gui/src/welcome-wizard.ui
rename from gui/src/welcomewizard.ui
rename to gui/src/welcome-wizard.ui
diff --git a/gui/src/workspacemodel.cc b/gui/src/workspace-model.cc
rename from gui/src/workspacemodel.cc
rename to gui/src/workspace-model.cc
--- a/gui/src/workspacemodel.cc
+++ b/gui/src/workspace-model.cc
@@ -15,10 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "workspacemodel.h"
+#include "workspace-model.h"
 #include <QTreeWidget>
 #include <QTime>
-#include "octavelink.h"
+#include "octave-link.h"
 
 WorkspaceModel::WorkspaceModel(QObject *parent)
   : QAbstractItemModel(parent)
diff --git a/gui/src/workspacemodel.h b/gui/src/workspace-model.h
rename from gui/src/workspacemodel.h
rename to gui/src/workspace-model.h
diff --git a/gui/src/workspaceview.cc b/gui/src/workspace-view.cc
rename from gui/src/workspaceview.cc
rename to gui/src/workspace-view.cc
--- a/gui/src/workspaceview.cc
+++ b/gui/src/workspace-view.cc
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "workspaceview.h"
+#include "workspace-view.h"
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QPushButton>
diff --git a/gui/src/workspaceview.h b/gui/src/workspace-view.h
rename from gui/src/workspaceview.h
rename to gui/src/workspace-view.h
--- a/gui/src/workspaceview.h
+++ b/gui/src/workspace-view.h
@@ -21,7 +21,7 @@
 #include <QDockWidget>
 #include <QTreeView>
 #include <QSemaphore>
-#include "octavelink.h"
+#include "octave-link.h"
 
 class WorkspaceView:public QDockWidget
 {