[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/krdc
From:       George Kiagiadakis <kiagiadakis.george () gmail ! com>
Date:       2012-03-06 16:54:20
Message-ID: 20120306165420.1D10BAC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1283921 by gkiagia:

Port to tp-qt

 M  +6 -6      krdc_approver/approver.cpp  
 M  +1 -1      krdc_approver/approver.h  
 M  +9 -9      krdc_approver/approvermanager.cpp  
 M  +1 -1      krdc_approver/approvermanager.h  
 M  +3 -3      krdc_approver/main.cpp  
 M  +2 -2      tubesmanager.cpp  
 M  +1 -1      tubesmanager.h  


--- trunk/KDE/kdenetwork/krdc/krdc_approver/approver.cpp #1283920:1283921
@@ -27,11 +27,11 @@
 #include <KNotification>
 #include <KLocalizedString>
 
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ReferencedHandles>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/ChannelDispatchOperation>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ReferencedHandles>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/ChannelDispatchOperation>
 
 Approver::Approver(const Tp::MethodInvocationContextPtr<> &context,
             const QList<Tp::ChannelPtr> &channels,
@@ -122,7 +122,7 @@
 void Approver::onAccepted()
 {
     kDebug() << "Channel approved";
-    m_dispatchOp->handleWith(TELEPATHY_INTERFACE_CLIENT ".krdc_rfb_handler");
+    m_dispatchOp->handleWith(TP_QT_IFACE_CLIENT + ".krdc_rfb_handler");
 
     emit finished();
 }
--- trunk/KDE/kdenetwork/krdc/krdc_approver/approver.h #1283920:1283921
@@ -27,7 +27,7 @@
 
 #include <QObject>
 
-#include <TelepathyQt4/Channel>
+#include <TelepathyQt/Channel>
 
 class KNotification;
 
--- trunk/KDE/kdenetwork/krdc/krdc_approver/approvermanager.cpp #1283920:1283921
@@ -31,21 +31,21 @@
 #include <KApplication>
 #include <KDebug>
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/ChannelClassSpecList>
-#include <TelepathyQt4/ChannelDispatchOperation>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/Debug>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/ChannelClassSpecList>
+#include <TelepathyQt/ChannelDispatchOperation>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/Debug>
 
 static inline Tp::ChannelClassSpecList channelClassSpecList()
 {
     Tp::ChannelClassSpec spec = Tp::ChannelClassSpec();
-    spec.setChannelType(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE);
+    spec.setChannelType(TP_QT_IFACE_CHANNEL_TYPE_STREAM_TUBE);
     spec.setTargetHandleType(Tp::HandleTypeContact);
     spec.setRequested(false);
-    spec.setProperty(QString(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE) + ".Service",
+    spec.setProperty(TP_QT_IFACE_CHANNEL_TYPE_STREAM_TUBE + ".Service",
                      QVariant("rfb"));
     return Tp::ChannelClassSpecList() << spec;
 }
--- trunk/KDE/kdenetwork/krdc/krdc_approver/approvermanager.h #1283920:1283921
@@ -25,7 +25,7 @@
 #ifndef APPROVERMANAGER_H
 #define APPROVERMANAGER_H
 
-#include <TelepathyQt4/AbstractClientApprover>
+#include <TelepathyQt/AbstractClientApprover>
 
 class Approver;
 
--- trunk/KDE/kdenetwork/krdc/krdc_approver/main.cpp #1283920:1283921
@@ -29,9 +29,9 @@
 #include <KLocalizedString>
 #include <KUniqueApplication>
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/ClientRegistrar>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/ClientRegistrar>
 
 int main(int argc, char **argv)
 {
--- trunk/KDE/kdenetwork/krdc/tubesmanager.cpp #1283920:1283921
@@ -24,8 +24,8 @@
 
 #include "tubesmanager.h"
 
-#include <TelepathyQt4/IncomingStreamTubeChannel>
-#include <TelepathyQt4/Debug>
+#include <TelepathyQt/IncomingStreamTubeChannel>
+#include <TelepathyQt/Debug>
 
 #include <KDebug>
 
--- trunk/KDE/kdenetwork/krdc/tubesmanager.h #1283920:1283921
@@ -25,7 +25,7 @@
 #ifndef TUBESMANAGER_H
 #define TUBESMANAGER_H
 
-#include <TelepathyQt4/StreamTubeClient>
+#include <TelepathyQt/StreamTubeClient>
 #include <QtNetwork/QHostAddress>
 #include <KUrl>
 
[prev in list] [next in list] [prev in thread] [next in thread]