From 9d4c8d4121cb63300c11aabe6a32ea357e83bbef Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Mon, 18 Feb 2013 16:24:15 +0100
Subject: Make the example compile with Qt5.

Change-Id: I765d38e8470ebed68d3a9e660bee7b4b9df304bb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 examples/testapp/componentselectiondialog.cpp |  4 ++--
 examples/testapp/componentselectiondialog.h   |  2 +-
 examples/testapp/main.cpp                     |  2 +-
 examples/testapp/mainwindow.cpp               | 15 ++++++++-------
 examples/testapp/mainwindow.h                 |  2 +-
 examples/testapp/updateagent.cpp              |  3 ++-
 examples/testapp/updatesettingsdialog.cpp     |  5 ++---
 examples/testapp/updatesettingsdialog.h       |  2 +-
 examples/testapp/updatesettingswidget.cpp     |  5 ++---
 examples/testapp/updatesettingswidget.h       |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'examples')

diff --git a/examples/testapp/componentselectiondialog.cpp b/examples/testapp/componentselectiondialog.cpp
index 6a4635f63..c56ee5413 100644
--- a/examples/testapp/componentselectiondialog.cpp
+++ b/examples/testapp/componentselectiondialog.cpp
@@ -46,8 +46,8 @@
 #include <componentmodel.h>
 #include <packagemanagercore.h>
 
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
+#include <QHeaderView>
+#include <QPushButton>
 
 using namespace QInstaller;
 
diff --git a/examples/testapp/componentselectiondialog.h b/examples/testapp/componentselectiondialog.h
index 3d4b3b014..cb0134481 100644
--- a/examples/testapp/componentselectiondialog.h
+++ b/examples/testapp/componentselectiondialog.h
@@ -42,7 +42,7 @@
 #ifndef COMPONENTSELECTIONDIALOG_H
 #define COMPONENTSELECTIONDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace QInstaller {
     class PackageManagerCore;
diff --git a/examples/testapp/main.cpp b/examples/testapp/main.cpp
index 79fd8fb8e..b1b039822 100644
--- a/examples/testapp/main.cpp
+++ b/examples/testapp/main.cpp
@@ -45,7 +45,7 @@
 
 #include <kdselfrestarter.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 
 
 int main(int argc, char *argv[])
diff --git a/examples/testapp/mainwindow.cpp b/examples/testapp/mainwindow.cpp
index cbd255567..016b568af 100644
--- a/examples/testapp/mainwindow.cpp
+++ b/examples/testapp/mainwindow.cpp
@@ -50,12 +50,12 @@
 
 #include <kdselfrestarter.h>
 
-#include <QtGui/QAbstractButton>
-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
-#include <QtGui/QMenuBar>
-#include <QtGui/QMessageBox>
-#include <QtGui/QProgressDialog>
+#include <QAbstractButton>
+#include <QApplication>
+#include <QLabel>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QProgressDialog>
 
 using namespace QInstaller;
 using namespace QInstallerCreator;
@@ -97,7 +97,8 @@ void MainWindow::checkForUpdates()
 
     UpdateSettings settings;
     try {
-        m_core.setTemporaryRepositories(settings.repositories());
+        // TODO: check what this should have done
+        //m_core.setTemporaryRepositories(settings.repositories());
         settings.setLastCheck(QDateTime::currentDateTime());
 
         if (!m_core.fetchRemotePackagesTree()) {
diff --git a/examples/testapp/mainwindow.h b/examples/testapp/mainwindow.h
index 0901396d2..7a0466dd1 100644
--- a/examples/testapp/mainwindow.h
+++ b/examples/testapp/mainwindow.h
@@ -43,7 +43,7 @@
 #include <packagemanagercore.h>
 #include <settings.h>
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 
 class UpdateSettingsDialog;
 
diff --git a/examples/testapp/updateagent.cpp b/examples/testapp/updateagent.cpp
index 19422378f..0523f6da7 100644
--- a/examples/testapp/updateagent.cpp
+++ b/examples/testapp/updateagent.cpp
@@ -85,7 +85,8 @@ public:
                     handler->setComponentIndex(QInstallerCreator::ComponentIndex());
 
                     PackageManagerCore core(QInstaller::MagicUpdaterMarker);
-                    core.setTemporaryRepositories(settings.repositories());
+                    // TODO: check what this should have done
+                    //core.setTemporaryRepositories(settings.repositories());
                     if (!core.fetchRemotePackagesTree())
                         throw Error(tr("Software Update failed."));
                     settings.setLastResult(tr("Software Update run successfully."));
diff --git a/examples/testapp/updatesettingsdialog.cpp b/examples/testapp/updatesettingsdialog.cpp
index e4498fabf..9013da67c 100644
--- a/examples/testapp/updatesettingsdialog.cpp
+++ b/examples/testapp/updatesettingsdialog.cpp
@@ -44,9 +44,8 @@
 #include <repository.h>
 #include <updatesettings.h>
 
-#include <QtCore/QDateTime>
-
-#include <QtGui/QStringListModel>
+#include <QDateTime>
+#include <QStringListModel>
 
 using namespace QInstaller;
 
diff --git a/examples/testapp/updatesettingsdialog.h b/examples/testapp/updatesettingsdialog.h
index 193131ff3..e952d4d2d 100644
--- a/examples/testapp/updatesettingsdialog.h
+++ b/examples/testapp/updatesettingsdialog.h
@@ -42,7 +42,7 @@
 #ifndef UPDATESETTINGSDIALOG_H
 #define UPDATESETTINGSDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 class UpdateSettingsDialog : public QDialog
 {
diff --git a/examples/testapp/updatesettingswidget.cpp b/examples/testapp/updatesettingswidget.cpp
index cb63eba79..b1f36304d 100644
--- a/examples/testapp/updatesettingswidget.cpp
+++ b/examples/testapp/updatesettingswidget.cpp
@@ -44,9 +44,8 @@
 #include <repository.h>
 #include <updatesettings.h>
 
-#include <QtCore/QDateTime>
-
-#include <QtGui/QStringListModel>
+#include <QDateTime>
+#include <QStringListModel>
 
 using namespace QInstaller;
 
diff --git a/examples/testapp/updatesettingswidget.h b/examples/testapp/updatesettingswidget.h
index 6ba788127..11ab70bf3 100644
--- a/examples/testapp/updatesettingswidget.h
+++ b/examples/testapp/updatesettingswidget.h
@@ -42,7 +42,7 @@
 #ifndef UPDATESETTINGSWIDGET_H
 #define UPDATESETTINGSWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class UpdateSettingsWidget : public QWidget
 {
-- 
cgit v1.2.3