From 560701e208dca70916c80f176e8b06a14bf38d5a Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sat, 2 Sep 2017 12:07:04 +0200 Subject: [PATCH] Untangle include forrest Every change in connectionwindow.h led to a heavy project compile, as the header was included in other headers. Avoid this by using forward declarations and only include connectionwindow.h in the C++ files that actually use it. --- connections/canconnectionmodel.h | 3 +-- mainwindow.cpp | 1 + mainwindow.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connections/canconnectionmodel.h b/connections/canconnectionmodel.h index 190dd27..f4a0094 100644 --- a/connections/canconnectionmodel.h +++ b/connections/canconnectionmodel.h @@ -5,9 +5,8 @@ #include #include "canbus.h" -#include "connections/canconnection.h" -#include "connectionwindow.h" +class CANConnection; class CANConnectionModel : public QAbstractTableModel { diff --git a/mainwindow.cpp b/mainwindow.cpp index c346ff0..9cf225d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -5,6 +5,7 @@ #include #include #include "connections/canconmanager.h" +#include "connections/connectionwindow.h" #include "utility.h" /* diff --git a/mainwindow.h b/mainwindow.h index abdd0a2..fffe39f 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -22,7 +22,6 @@ #include "mainsettingsdialog.h" #include "firmwareuploaderwindow.h" #include "re/discretestatewindow.h" -#include "connections/connectionwindow.h" #include "scriptingwindow.h" #include "re/rangestatewindow.h" #include "dbc/dbcloadsavewindow.h" @@ -33,6 +32,7 @@ #include "motorcontrollerconfigwindow.h" #include "signalviewerwindow.h" +class CANConnection; class ConnectionWindow; class ISOTP_InterpreterWindow; class ScriptingWindow;