From a5e1f50036ade973072b46ce0c9954da1b7ed6f4 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Fri, 30 Jul 2021 00:39:19 +0200 Subject: [PATCH] Clean up #includes. (qtcreator is helpful but only partially.) --- src/app/application.h | 2 +- src/gui/daynavigatorwidget.cpp | 7 ++++--- src/gui/mainwindow.cpp | 11 +++-------- src/mvc/delegate.cpp | 9 ++++----- src/mvc/eventmodel.cpp | 3 +-- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/app/application.h b/src/app/application.h index b237866..2f4e1c2 100644 --- a/src/app/application.h +++ b/src/app/application.h @@ -21,7 +21,7 @@ #define APPLICATION_H #include -#include +#include "conference.h" class Application : public QApplication { diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp index 918d907..dcda38f 100644 --- a/src/gui/daynavigatorwidget.cpp +++ b/src/gui/daynavigatorwidget.cpp @@ -17,12 +17,13 @@ * You should have received a copy of the GNU General Public License along with * ConfClerk. If not, see . */ -#include "daynavigatorwidget.h" #include #include -#include -#include + +#include "daynavigatorwidget.h" +#include "conference.h" +#include "application.h" DayNavigatorWidget::DayNavigatorWidget(QWidget *aParent): QWidget(aParent) { diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 83b1a64..6d74823 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -25,20 +25,15 @@ #include #include #include +#include +#include #include "sqlengine.h" - #include "track.h" #include "eventmodel.h" #include "delegate.h" #include "room.h" - #include "conference.h" - -#include -#include -#include - #include "ui_about.h" #include "eventdialog.h" #include "daynavigatorwidget.h" @@ -46,9 +41,9 @@ #include "conferenceeditor.h" #include "schedulexmlparser.h" #include "errormessage.h" - #include "tabcontainer.h" #include "appsettings.h" +#include "application.h" MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) { setupUi(this); diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp index aa25627..55bf4c8 100644 --- a/src/mvc/delegate.cpp +++ b/src/mvc/delegate.cpp @@ -17,16 +17,15 @@ * You should have received a copy of the GNU General Public License along with * ConfClerk. If not, see . */ -#include "delegate.h" -#include "eventmodel.h" -#include "track.h" - #include #include -#include +#include "delegate.h" +#include "eventmodel.h" +#include "track.h" #include "conference.h" #include "room.h" +#include "application.h" const int SPACER = 10; diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp index 8f978d9..c92a76d 100644 --- a/src/mvc/eventmodel.cpp +++ b/src/mvc/eventmodel.cpp @@ -21,8 +21,7 @@ #include "conference.h" #include "track.h" #include "room.h" - -#include +#include "application.h" const QString EventModel::COMMA_SEPARATOR = ", "; -- 2.39.5