From fa656fe56a34300e9718a3c83c9db21f56b94ac5 Mon Sep 17 00:00:00 2001
From: Manjeet Dahiya <manjeetdahiya@gmail.com>
Date: Tue, 28 Jan 2014 22:13:02 +0530
Subject: Fixes to support Qt5.

---
 examples/GuiClient/GuiClient.pro        | 3 ++-
 examples/GuiClient/main.cpp             | 2 +-
 examples/GuiClient/statusTextWidget.cpp | 4 ++--
 examples/GuiClient/utils.cpp            | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'examples')

diff --git a/examples/GuiClient/GuiClient.pro b/examples/GuiClient/GuiClient.pro
index aec6064f..60306171 100644
--- a/examples/GuiClient/GuiClient.pro
+++ b/examples/GuiClient/GuiClient.pro
@@ -58,6 +58,7 @@ FORMS += mainDialog.ui \
     aboutDialog.ui
 
 QT += network \
-    xml
+    xml \
+    widgets
 
 RESOURCES += resources.qrc
diff --git a/examples/GuiClient/main.cpp b/examples/GuiClient/main.cpp
index 11f86460..68fb382c 100644
--- a/examples/GuiClient/main.cpp
+++ b/examples/GuiClient/main.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDir>
 
 #include "mainDialog.h"
diff --git a/examples/GuiClient/statusTextWidget.cpp b/examples/GuiClient/statusTextWidget.cpp
index a0cc7f8a..157f97a1 100644
--- a/examples/GuiClient/statusTextWidget.cpp
+++ b/examples/GuiClient/statusTextWidget.cpp
@@ -26,8 +26,8 @@
 #include <QHBoxLayout>
 #include <QMenu>
 
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOptionFrameV2>
+#include <QStyle>
+#include <QStyleOptionFrameV2>
 
 QSize statusLineEdit::sizeHint() const
 {
diff --git a/examples/GuiClient/utils.cpp b/examples/GuiClient/utils.cpp
index e50cdcb8..b4c99b28 100644
--- a/examples/GuiClient/utils.cpp
+++ b/examples/GuiClient/utils.cpp
@@ -24,7 +24,7 @@
 
 #include "utils.h"
 #include <QDir>
-#include <QDesktopServices>
+#include <QStandardPaths>
 
 int comparisonWeightsPresenceStatusType(QXmppPresence::AvailableStatusType statusType)
 {
@@ -99,7 +99,8 @@ QString presenceToStatusText(const QXmppPresence& presence)
 
 QString getSettingsDir(const QString& bareJid)
 {
-    QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    QStringList dirList = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
+    QString dir = dirList.size() > 0 ? dirList.at(0) : "";
     if(bareJid.isEmpty())
         return dir + "/";
     else
-- 
cgit v1.2.3