From 8d6798da07af3270cbcca6b2bf8e82d00f5f4e43 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Tue, 4 Sep 2012 18:40:25 +0000 Subject: [PATCH] fix some more header includes --- src/alarm/alarm.cpp | 2 +- src/alarm/alarm.h | 2 +- src/app/application.cpp | 2 +- src/app/main.cpp | 10 +++++----- src/gui/eventdialog.h | 2 +- src/gui/mainwindow.cpp | 16 ++++++++-------- src/gui/mainwindow.h | 2 +- src/gui/settingsdialog.cpp | 2 +- src/gui/tabcontainer.cpp | 4 ++-- src/gui/tabcontainer.h | 8 ++++---- src/mvc/conference.h | 2 +- src/mvc/event.h | 2 +- src/mvc/room.h | 2 +- src/mvc/track.h | 2 +- src/sql/sqlengine.cpp | 4 ++-- src/test/mvc/eventtest.cpp | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp index e41984f..a5f051b 100644 --- a/src/alarm/alarm.cpp +++ b/src/alarm/alarm.cpp @@ -27,7 +27,7 @@ #include -//#include +//#include "dbus-1.0/dbus/dbus-protocol.h" int Alarm::addAlarm(int conferenceId, int eventId, QString eventTitle, const QDateTime &alarmDateTime) { cookie_t alarmCookie = 0; diff --git a/src/alarm/alarm.h b/src/alarm/alarm.h index 1aa54f1..2cafd8e 100644 --- a/src/alarm/alarm.h +++ b/src/alarm/alarm.h @@ -25,7 +25,7 @@ extern "C" { -#include +#include "alarmd/libalarm.h" } #define APPID "confclerk-alarm" diff --git a/src/app/application.cpp b/src/app/application.cpp index d70d06a..b903498 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -20,7 +20,7 @@ #include "application.h" #include "errormessage.h" -#include +#include "ormrecord.h" // if the application uses exceptions, // there is always a possibility that some will leak uncached from event handler diff --git a/src/app/main.cpp b/src/app/main.cpp index c61652b..6f8a6ba 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -17,17 +17,17 @@ * You should have received a copy of the GNU General Public License along with * ConfClerk. If not, see . */ -#include +#include "mainwindow.h" -#include +#include "sqlengine.h" #include "eventdialog.h" #include "application.h" #ifdef MAEMO -//#include -#include -#include +//#include "alarmdialog.h" +#include "alarmdbus.h" +#include "alarmdbusadaptorp.h" #endif /* MAEMO */ diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h index bcb70cd..cd7f1ba 100644 --- a/src/gui/eventdialog.h +++ b/src/gui/eventdialog.h @@ -22,7 +22,7 @@ #include #include "ui_eventdialog.h" -#include +#include "event.h" class EventDialog : public QDialog, Ui::EventDialog { diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a54b7f1..b626224 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -25,27 +25,27 @@ #include #include -#include +#include "sqlengine.h" -#include -#include -#include +#include "track.h" +#include "eventmodel.h" +#include "delegate.h" -#include +#include "conference.h" #include #include #include "ui_about.h" -#include +#include "eventdialog.h" #include "daynavigatorwidget.h" #include "settingsdialog.h" #include "conferenceeditor.h" #include "schedulexmlparser.h" #include "errormessage.h" -#include -#include +#include "tabcontainer.h" +#include "appsettings.h" const QString PROXY_USERNAME; const QString PROXY_PASSWD; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 611f45d..42f417a 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -22,7 +22,7 @@ #include -#include +#include "ui_mainwindow.h" #include "conferencemodel.h" diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 1d57797..9fd6dd9 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -19,7 +19,7 @@ */ #include "settingsdialog.h" -#include +#include "appsettings.h" #include SettingsDialog::SettingsDialog(QWidget *aParent) diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp index 522860e..a6be863 100644 --- a/src/gui/tabcontainer.cpp +++ b/src/gui/tabcontainer.cpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include "treeview.h" +#include "delegate.h" #include "eventdialog.h" #include "room.h" diff --git a/src/gui/tabcontainer.h b/src/gui/tabcontainer.h index fe03b54..35b6fdd 100644 --- a/src/gui/tabcontainer.h +++ b/src/gui/tabcontainer.h @@ -23,10 +23,10 @@ #include #include "ui_tabcontainer.h" -#include -#include -#include -#include +#include "conference.h" +#include "sqlengine.h" +#include "conference.h" +#include "eventmodel.h" class TabContainer : public QWidget, public Ui::TabContainer { diff --git a/src/mvc/conference.h b/src/mvc/conference.h index adf8ff9..bc296dd 100644 --- a/src/mvc/conference.h +++ b/src/mvc/conference.h @@ -24,7 +24,7 @@ #include #include -#include +#include "ormrecord.h" class Conference : public OrmRecord { diff --git a/src/mvc/event.h b/src/mvc/event.h index 3dc6b8f..1792271 100644 --- a/src/mvc/event.h +++ b/src/mvc/event.h @@ -24,7 +24,7 @@ #include #include -#include +#include "ormrecord.h" class Room; diff --git a/src/mvc/room.h b/src/mvc/room.h index 542a722..94e168f 100644 --- a/src/mvc/room.h +++ b/src/mvc/room.h @@ -21,7 +21,7 @@ #ifndef ROOM_H_ #define ROOM_H_ -#include +#include "ormrecord.h" class Room : public OrmRecord { diff --git a/src/mvc/track.h b/src/mvc/track.h index d654cc5..aeb3521 100644 --- a/src/mvc/track.h +++ b/src/mvc/track.h @@ -21,7 +21,7 @@ #ifndef TRACK_H_ #define TRACK_H_ -#include +#include "ormrecord.h" class Track : public OrmRecord { diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp index be60c05..c210b84 100644 --- a/src/sql/sqlengine.cpp +++ b/src/sql/sqlengine.cpp @@ -27,8 +27,8 @@ #include #include #include "sqlengine.h" -#include -#include +#include "track.h" +#include "conference.h" #include diff --git a/src/test/mvc/eventtest.cpp b/src/test/mvc/eventtest.cpp index 5184b87..109816e 100644 --- a/src/test/mvc/eventtest.cpp +++ b/src/test/mvc/eventtest.cpp @@ -24,7 +24,7 @@ #include -#include +#include "event.h" void EventTest::initTestCase() { -- 2.39.5