Clean up #includes.

(qtcreator is helpful but only partially.)

diff --git a/src/app/application.h b/src/app/application.h
index b237866c3491eef63b14b72ad0a13d46f9f34fb5..2f4e1c2ea43c791cfdec8d3529c0368cdb32eae1 100644 (file)
--- a/src/app/application.h
+++ b/src/app/application.h
@@ -21,7 +21,7 @@
 #define APPLICATION_H
 
 #include <QApplication>
-#include <conference.h>
+#include "conference.h"
 
 class Application : public QApplication
 {

diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp
index 918d90766e64ea824a06643e0ee4ebc60aa9d83d..dcda38f327f7c8284133682d2fa3acd68a2d6932 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-#include "daynavigatorwidget.h"
 
 #include <QPainter>
 #include <QLabel>
-#include <conference.h>
-#include <application.h>
+
+#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 83b1a646a34971b933c23be1a6668840454a76d8..6d74823fed3ed8068de66706fcff4994fce4051a 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -25,20 +25,15 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QSslConfiguration>
+#include <QDialog>
+#include <QMessageBox>
 
 #include "sqlengine.h"
-
 #include "track.h"
 #include "eventmodel.h"
 #include "delegate.h"
 #include "room.h"
-
 #include "conference.h"
-
-#include <QDialog>
-#include <QMessageBox>
-#include <application.h>
-
 #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 aa25627df639c6cacde9a7fb916a3d7b40cb7e9c..55bf4c88f10831188f2ad67f51e084371550b306 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-#include "delegate.h"
-#include "eventmodel.h"
-#include "track.h"
-
 #include <QDebug>
 #include <QPainter>
-#include <application.h>
 
+#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 8f978d9c3a8bc67ff25bd522c350d4c48ee7773b..c92a76da8d11473c25f20426d6128f2a6604ed74 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -21,8 +21,7 @@
 #include "conference.h"
 #include "track.h"
 #include "room.h"
-
-#include <application.h>
+#include "application.h"
 
 const QString EventModel::COMMA_SEPARATOR = ", ";