Use the installed headers

This fixes synqt warnings about incorrect inclusions in public headers.
Also deals with extra- and duplicate includes, forward declaration,
namespacing issues, and circular dependencies...
...and Qt-ifies the headers after all.

Change-Id: Ia373d6fb93e0fecedd2a2334fbeb4c2005a67a4c
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

22 files changed, 36 insertions, 32 deletions

diff --git a/examples/organizer/calendardemo/src/addcalendarpage.cpp b/examples/organizer/calendardemo/src/addcalendarpage.cpp
index 9c479b2af..60b4ca2aa 100644
--- a/examples/organizer/calendardemo/src/addcalendarpage.cpp
+++ b/examples/organizer/calendardemo/src/addcalendarpage.cpp
@@ -40,7 +40,7 @@
 #include "addcalendarpage.h"
 
 #include <QtWidgets>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/addcalendarpage.h b/examples/organizer/calendardemo/src/addcalendarpage.h
index 3c6816c2b..16c247ba8 100644
--- a/examples/organizer/calendardemo/src/addcalendarpage.h
+++ b/examples/organizer/calendardemo/src/addcalendarpage.h
@@ -41,7 +41,7 @@
 #define ADDCALENDARPAGE_H
 
 #include <QWidget>
-#include <qorganizercollection.h>
+#include <QtOrganizer/qorganizercollection.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/calendardemo.cpp b/examples/organizer/calendardemo/src/calendardemo.cpp
index afa0f6641..ea1dd1d72 100644
--- a/examples/organizer/calendardemo/src/calendardemo.cpp
+++ b/examples/organizer/calendardemo/src/calendardemo.cpp
@@ -56,7 +56,7 @@
 #endif
 #include <QtWidgets>
 #include <QDesktopServices>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/calendardemo.h b/examples/organizer/calendardemo/src/calendardemo.h
index a8773ed7f..2ed4140bb 100644
--- a/examples/organizer/calendardemo/src/calendardemo.h
+++ b/examples/organizer/calendardemo/src/calendardemo.h
@@ -43,8 +43,8 @@
 
 #include <QMainWindow>
 #include <QDate>
-#include <qorganizeritemsaverequest.h>
-#include <qorganizeritemremovebyidrequest.h>
+#include <QtOrganizer/qorganizeritemsaverequest.h>
+#include <QtOrganizer/qorganizeritemremovebyidrequest.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/daypage.cpp b/examples/organizer/calendardemo/src/daypage.cpp
index 54f9aabeb..c2d055601 100644
--- a/examples/organizer/calendardemo/src/daypage.cpp
+++ b/examples/organizer/calendardemo/src/daypage.cpp
@@ -42,7 +42,7 @@
 
 #include "calendardemo.h"
 #include <QtWidgets>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/daypage.h b/examples/organizer/calendardemo/src/daypage.h
index 260e42f20..40fa0cb82 100644
--- a/examples/organizer/calendardemo/src/daypage.h
+++ b/examples/organizer/calendardemo/src/daypage.h
@@ -43,7 +43,7 @@
 
 #include <QWidget>
 #include <QDate>
-#include <qorganizeritemid.h>
+#include <QtOrganizer/qorganizeritemid.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/editcalendarspage.cpp b/examples/organizer/calendardemo/src/editcalendarspage.cpp
index 4b9e1be35..1f81998e4 100644
--- a/examples/organizer/calendardemo/src/editcalendarspage.cpp
+++ b/examples/organizer/calendardemo/src/editcalendarspage.cpp
@@ -41,7 +41,7 @@
 
 #include "calendardemo.h"
 #include <QtWidgets>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/editcalendarspage.h b/examples/organizer/calendardemo/src/editcalendarspage.h
index c5213ad33..e4fff5d9a 100644
--- a/examples/organizer/calendardemo/src/editcalendarspage.h
+++ b/examples/organizer/calendardemo/src/editcalendarspage.h
@@ -41,7 +41,7 @@
 #define EDITCALENDARSPAGE_H
 
 #include <QWidget>
-#include <qorganizercollection.h>
+#include <QtOrganizer/qorganizercollection.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/eventeditpage.cpp b/examples/organizer/calendardemo/src/eventeditpage.cpp
index f2351fe69..af97076e2 100644
--- a/examples/organizer/calendardemo/src/eventeditpage.cpp
+++ b/examples/organizer/calendardemo/src/eventeditpage.cpp
@@ -40,7 +40,7 @@
 #include "eventeditpage.h"
 
 #include <QtWidgets>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/eventeditpage.h b/examples/organizer/calendardemo/src/eventeditpage.h
index 3e3741f1b..1cccf9729 100644
--- a/examples/organizer/calendardemo/src/eventeditpage.h
+++ b/examples/organizer/calendardemo/src/eventeditpage.h
@@ -42,9 +42,9 @@
 
 #include <QWidget>
 #include <QDate>
-#include <qorganizeritemid.h>
-#include <qorganizerevent.h>
-#include <qorganizercollection.h>
+#include <QtOrganizer/qorganizeritemid.h>
+#include <QtOrganizer/qorganizerevent.h>
+#include <QtOrganizer/qorganizercollection.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
index 11acf9926..519f40b05 100644
--- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
+++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
@@ -40,7 +40,7 @@
 #include "eventoccurrenceeditpage.h"
 
 #include <QtWidgets>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
index c50b5489a..a093255e2 100644
--- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
+++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
@@ -42,9 +42,9 @@
 
 #include <QWidget>
 #include <QDate>
-#include <qorganizeritemid.h>
-#include <qorganizerevent.h>
-#include <qorganizereventoccurrence.h>
+#include <QtOrganizer/qorganizeritemid.h>
+#include <QtOrganizer/qorganizerevent.h>
+#include <QtOrganizer/qorganizereventoccurrence.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/journaleditpage.cpp b/examples/organizer/calendardemo/src/journaleditpage.cpp
index 7e5128398..356e1b7e7 100644
--- a/examples/organizer/calendardemo/src/journaleditpage.cpp
+++ b/examples/organizer/calendardemo/src/journaleditpage.cpp
@@ -41,7 +41,7 @@
 
 #include <QtWidgets>
 #include <QComboBox>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/journaleditpage.h b/examples/organizer/calendardemo/src/journaleditpage.h
index e8d36226f..e2e67c535 100644
--- a/examples/organizer/calendardemo/src/journaleditpage.h
+++ b/examples/organizer/calendardemo/src/journaleditpage.h
@@ -43,9 +43,9 @@
 
 #include <QWidget>
 #include <QDate>
-#include <qorganizeritemid.h>
-#include <qorganizerjournal.h>
-#include <qorganizercollection.h>
+#include <QtOrganizer/qorganizeritemid.h>
+#include <QtOrganizer/qorganizerjournal.h>
+#include <QtOrganizer/qorganizercollection.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/monthpage.cpp b/examples/organizer/calendardemo/src/monthpage.cpp
index 3f2f443b5..850f517d2 100644
--- a/examples/organizer/calendardemo/src/monthpage.cpp
+++ b/examples/organizer/calendardemo/src/monthpage.cpp
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 #include <QtWidgets>
-#include <qorganizer.h>
-#include <qorganizerabstractrequest.h>
+#include <QtOrganizer/qorganizer.h>
+#include <QtOrganizer/qorganizerabstractrequest.h>
 
 #include "monthpage.h"
 #include "calendardemo.h"
diff --git a/examples/organizer/calendardemo/src/monthpage.h b/examples/organizer/calendardemo/src/monthpage.h
index 1d8c83833..11e3b6275 100644
--- a/examples/organizer/calendardemo/src/monthpage.h
+++ b/examples/organizer/calendardemo/src/monthpage.h
@@ -43,7 +43,7 @@
 
 #include <QWidget>
 #include <QDate>
-#include <qorganizerglobal.h>
+#include <QtOrganizer/qorganizerglobal.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/calendardemo/src/todoeditpage.cpp b/examples/organizer/calendardemo/src/todoeditpage.cpp
index 25db0402c..c3eaaca8a 100644
--- a/examples/organizer/calendardemo/src/todoeditpage.cpp
+++ b/examples/organizer/calendardemo/src/todoeditpage.cpp
@@ -41,7 +41,7 @@
 
 #include <QtWidgets>
 #include <QComboBox>
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/calendardemo/src/todoeditpage.h b/examples/organizer/calendardemo/src/todoeditpage.h
index c0e0a8c84..3fe6981ad 100644
--- a/examples/organizer/calendardemo/src/todoeditpage.h
+++ b/examples/organizer/calendardemo/src/todoeditpage.h
@@ -42,9 +42,9 @@
 
 #include <QWidget>
 #include <QDate>
-#include <qorganizeritemid.h>
-#include <qorganizertodo.h>
-#include <qorganizercollection.h>
+#include <QtOrganizer/qorganizeritemid.h>
+#include <QtOrganizer/qorganizertodo.h>
+#include <QtOrganizer/qorganizercollection.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;
diff --git a/examples/organizer/todo/todoeditor.cpp b/examples/organizer/todo/todoeditor.cpp
index eed35ab7c..6d2acf67b 100644
--- a/examples/organizer/todo/todoeditor.cpp
+++ b/examples/organizer/todo/todoeditor.cpp
@@ -40,10 +40,12 @@
 
 #include <QtWidgets>
 
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 #include "todoeditor.h"
 
+QTORGANIZER_USE_NAMESPACE
+
 TodoEditor::TodoEditor()
 {
     setupGui();
diff --git a/examples/organizer/todo/todoeditor.h b/examples/organizer/todo/todoeditor.h
index b215ac883..3a6c48d3e 100644
--- a/examples/organizer/todo/todoeditor.h
+++ b/examples/organizer/todo/todoeditor.h
@@ -43,7 +43,7 @@
 
 #include <QWidget>
 
-#include <qorganizertodo.h>
+#include <QtOrganizer/qorganizertodo.h>
 
 QTORGANIZER_USE_NAMESPACE
 
diff --git a/examples/organizer/todo/window.cpp b/examples/organizer/todo/window.cpp
index 0eab1be1c..198d51ae3 100644
--- a/examples/organizer/todo/window.cpp
+++ b/examples/organizer/todo/window.cpp
@@ -40,11 +40,13 @@
 
 #include <QtWidgets>
 
-#include <qorganizer.h>
+#include <QtOrganizer/qorganizer.h>
 
 #include "window.h"
 #include "todoeditor.h"
 
+QTORGANIZER_USE_NAMESPACE
+
 //! [0]
 Window::Window()
 {
diff --git a/examples/organizer/todo/window.h b/examples/organizer/todo/window.h
index a1997ca7d..f46cbf933 100644
--- a/examples/organizer/todo/window.h
+++ b/examples/organizer/todo/window.h
@@ -42,7 +42,7 @@
 #define WINDOW_H
 
 #include <QWidget>
-#include <qorganizerglobal.h>
+#include <QtOrganizer/qorganizerglobal.h>
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 class QOrganizerManager;