generic: adjust to Katie changes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/bluedevil/src/daemon/kded/filereceiver/obexagent.cpp b/bluedevil/src/daemon/kded/filereceiver/obexagent.cpp
index 91ade7d..f177ecb 100644 (file)
--- a/bluedevil/src/daemon/kded/filereceiver/obexagent.cpp
+++ b/bluedevil/src/daemon/kded/filereceiver/obexagent.cpp
@@ -41,7 +41,7 @@ ObexAgent::~ObexAgent()
 
 }
 
-QString ObexAgent::AuthorizePush(const QDBusObjectPath& path, const QDBusMessage &msg)
+QString ObexAgent::AuthorizePush(const QDBusObjectPath& path, QDBusMessage msg)
 {
     kDebug(dblue());
 

diff --git a/bluedevil/src/daemon/kded/filereceiver/obexagent.h b/bluedevil/src/daemon/kded/filereceiver/obexagent.h
index f38c8d7..e28adaa 100644 (file)
--- a/bluedevil/src/daemon/kded/filereceiver/obexagent.h
+++ b/bluedevil/src/daemon/kded/filereceiver/obexagent.h
@@ -36,7 +36,7 @@ class ObexAgent : public QDBusAbstractAdaptor
         virtual ~ObexAgent();
 
     public Q_SLOTS:
-        QString AuthorizePush(const QDBusObjectPath &path, const QDBusMessage &msg);
+        QString AuthorizePush(const QDBusObjectPath &path, QDBusMessage msg);
 
         void Release();
         void Cancel();
@@ -44,4 +44,4 @@ class ObexAgent : public QDBusAbstractAdaptor
         KComponentData m_componentData;
 };
 
-#endif //OBEX_AGENT_H
\ No newline at end of file
+#endif //OBEX_AGENT_H

diff --git a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.cpp b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.cpp
index d811291..e7d846c 100644 (file)
--- a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.cpp
+++ b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.cpp
@@ -123,7 +123,7 @@ bool ObexFtpDaemon::isOnline()
     return d->m_status == Private::Online;
 }
 
-QString ObexFtpDaemon::session(const QString &address, const QString &target, const QDBusMessage& msg)
+QString ObexFtpDaemon::session(const QString &address, const QString &target, QDBusMessage msg)
 {
     if (d->m_sessionMap.contains(address)) {
         return d->m_sessionMap[address];

diff --git a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
index 238e3e3..f1c2e71 100644 (file)
--- a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
+++ b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
@@ -40,7 +40,7 @@ public:
 
 public Q_SLOTS:
     Q_SCRIPTABLE bool isOnline();
-    Q_SCRIPTABLE QString session(const QString &address, const QString &target, const QDBusMessage &msg);
+    Q_SCRIPTABLE QString session(const QString &address, const QString &target, QDBusMessage msg);
     Q_SCRIPTABLE bool cancelTransfer(const QString &transfer);
 
 private Q_SLOTS:

diff --git a/lokalize/src/glossary/glossary.cpp b/lokalize/src/glossary/glossary.cpp
index 131b2a9..3f30194 100644 (file)
--- a/lokalize/src/glossary/glossary.cpp
+++ b/lokalize/src/glossary/glossary.cpp
@@ -33,7 +33,7 @@
 
 #include <QFile>
 #include <QtXml/qxml.h>
-#include <QtCore/qxmlstream.h>
+#include <qxmlstream.h>
 #include <QBuffer>
 #include <QApplication>
 

diff --git a/lokalize/src/tm/jobs.cpp b/lokalize/src/tm/jobs.cpp
index 6a722ee..74d8ca8 100644 (file)
--- a/lokalize/src/tm/jobs.cpp
+++ b/lokalize/src/tm/jobs.cpp
@@ -1910,7 +1910,7 @@ void ImportTmxJob::run()
 
 
 
-#include <QtCore/qxmlstream.h>
+#include <qxmlstream.h>
 
 ExportTmxJob::ExportTmxJob(const QString& filename,//const KUrl& url,
                      const QString& dbName,

diff --git a/okular/generators/ooo/manifest.cpp b/okular/generators/ooo/manifest.cpp
index 1d6c893..9a05498 100644 (file)
--- a/okular/generators/ooo/manifest.cpp
+++ b/okular/generators/ooo/manifest.cpp
@@ -11,7 +11,7 @@
 #include "debug.h"
 
 #include <QBuffer>
-#include <QtCore/qxmlstream.h>
+#include <qxmlstream.h>
 
 #include <KFilterDev>
 #include <KLocale>

diff --git a/okular/generators/xps/generator_xps.h b/okular/generators/xps/generator_xps.h
index 9bd7443..28f63f4 100644 (file)
--- a/okular/generators/xps/generator_xps.h
+++ b/okular/generators/xps/generator_xps.h
@@ -27,7 +27,7 @@
 #include <QtXml/qdom.h>
 #include <QFontDatabase>
 #include <QImage>
-#include <QtCore/qxmlstream.h>
+#include <qxmlstream.h>
 #include <QtXml/qxml.h>
 #include <QStack>
 #include <QVariant>