Further source file restructuring

OwlSurf · Dec 12, 2016 · b7a1afc · b7a1afc
1 parent 0b46f56
commit b7a1afc
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 756 deletions.
diff --git a/SavvyCAN.pro b/SavvyCAN.pro
@@ -21,22 +21,16 @@ SOURCES += main.cpp\
     canframemodel.cpp \
     utility.cpp \
     qcustomplot.cpp \
-    graphingwindow.cpp \
-    newgraphdialog.cpp \
     frameplaybackwindow.cpp \
-    serialworker.cpp \
     candatagrid.cpp \
     framesenderwindow.cpp \
     framefileio.cpp \
     mainsettingsdialog.cpp \
     firmwareuploaderwindow.cpp \
-    connectionwindow.cpp \
     scriptingwindow.cpp \
     scriptcontainer.cpp \
     canfilter.cpp \
     can_structs.cpp \
-    canconnectionmodel.cpp \
-    canbus.cpp \
     motorcontrollerconfigwindow.cpp \
     connections/canconnection.cpp \
     connections/socketcan.cpp \
@@ -59,30 +53,29 @@ SOURCES += main.cpp\
     re/isotp_handler.cpp \
     re/isotp_interpreterwindow.cpp \
     re/rangestatewindow.cpp \
-    re/udsscanwindow.cpp
+    re/udsscanwindow.cpp \
+    connections/canbus.cpp \
+    connections/canconnectionmodel.cpp \
+    connections/connectionwindow.cpp \
+    re/graphingwindow.cpp \
+    re/newgraphdialog.cpp
 
 HEADERS  += mainwindow.h \
     can_structs.h \
     canframemodel.h \
     utility.h \
     qcustomplot.h \
-    graphingwindow.h \
-    newgraphdialog.h \
     frameplaybackwindow.h \
-    serialworker.h \
     candatagrid.h \
     framesenderwindow.h \
     can_trigger_structs.h \
     framefileio.h \
     config.h \
     mainsettingsdialog.h \
     firmwareuploaderwindow.h \
-    connectionwindow.h \
     scriptingwindow.h \
     scriptcontainer.h \
     canfilter.h \
-    canconnectionmodel.h \
-    canbus.h \
     utils/lfqueue.h \
     motorcontrollerconfigwindow.h \
     connections/canconnection.h \
@@ -107,7 +100,12 @@ HEADERS  += mainwindow.h \
     re/isotp_handler.h \
     re/isotp_interpreterwindow.h \
     re/rangestatewindow.h \
-    re/udsscanwindow.h
+    re/udsscanwindow.h \
+    connections/canbus.h \
+    connections/canconnectionmodel.h \
+    connections/connectionwindow.h \
+    re/graphingwindow.h \
+    re/newgraphdialog.h
 
 FORMS    += ui/candatagrid.ui \
     ui/connectionwindow.ui \

diff --git a/canbus.cpp → connections/canbus.cpp b/canbus.cpp → connections/canbus.cpp
diff --git a/canbus.h → connections/canbus.h b/canbus.h → connections/canbus.h
diff --git a/canconnectionmodel.cpp → connections/canconnectionmodel.cpp b/canconnectionmodel.cpp → connections/canconnectionmodel.cpp
diff --git a/canconnectionmodel.h → connections/canconnectionmodel.h b/canconnectionmodel.h → connections/canconnectionmodel.h
diff --git a/connectionwindow.cpp → connections/connectionwindow.cpp b/connectionwindow.cpp → connections/connectionwindow.cpp
diff --git a/connectionwindow.h → connections/connectionwindow.h b/connectionwindow.h → connections/connectionwindow.h
diff --git a/firmwareuploaderwindow.h b/firmwareuploaderwindow.h
@@ -5,7 +5,6 @@
 #include <QTimer>
 #include "can_structs.h"
 #include "utility.h"
-#include "serialworker.h"
 
 namespace Ui {
 class FirmwareUploaderWindow;

diff --git a/frameplaybackwindow.h b/frameplaybackwindow.h
@@ -5,7 +5,6 @@
 #include <QListWidget>
 #include <QTimer>
 #include "can_structs.h"
-#include "serialworker.h"
 #include "framefileio.h"
 
 namespace Ui {

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -6,7 +6,6 @@
 #include <QtSerialPort/QSerialPortInfo>
 #include "connections/canconmanager.h"
 #include "utility.h"
-#include "serialworker.h"
 
 /*
 Compile for all platforms and create release (remember to include QScintilla libs) and make Win32 binary.

diff --git a/mainwindow.h b/mainwindow.h
@@ -8,7 +8,7 @@
 #include "canframemodel.h"
 #include "can_structs.h"
 #include "framefileio.h"
-#include "graphingwindow.h"
+#include "re/graphingwindow.h"
 #include "re/frameinfowindow.h"
 #include "frameplaybackwindow.h"
 #include "re/flowviewwindow.h"
@@ -19,7 +19,7 @@
 #include "mainsettingsdialog.h"
 #include "firmwareuploaderwindow.h"
 #include "re/discretestatewindow.h"
-#include "connectionwindow.h"
+#include "connections/connectionwindow.h"
 #include "scriptingwindow.h"
 #include "re/rangestatewindow.h"
 #include "dbc/dbcloadsavewindow.h"

diff --git a/graphingwindow.cpp → re/graphingwindow.cpp b/graphingwindow.cpp → re/graphingwindow.cpp
diff --git a/graphingwindow.h → re/graphingwindow.h b/graphingwindow.h → re/graphingwindow.h
diff --git a/newgraphdialog.cpp → re/newgraphdialog.cpp b/newgraphdialog.cpp → re/newgraphdialog.cpp
diff --git a/newgraphdialog.h → re/newgraphdialog.h b/newgraphdialog.h → re/newgraphdialog.h