1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
From bb8654db870d983d5b6558d9f16b22f443315eaf Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Mon, 3 Nov 2014 16:30:27 +0300
Subject: [PATCH 3/3] protocol/astral: migrate to qt-telepaphy API v0.9
---
protocols/astral/src/astralaccount.cpp | 12 ++++++------
protocols/astral/src/astralaccount.h | 14 +++++++-------
protocols/astral/src/astralcontact.h | 6 +++---
protocols/astral/src/astralplugin.cpp | 6 +++---
protocols/astral/src/astralroster.cpp | 14 +++++++-------
protocols/astral/src/astralsession.h | 4 ++--
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/protocols/astral/src/astralaccount.cpp b/protocols/astral/src/astralaccount.cpp
index 1d51707..e9bf729 100644
--- a/protocols/astral/src/astralaccount.cpp
+++ b/protocols/astral/src/astralaccount.cpp
@@ -26,9 +26,9 @@
#include "astralprotocol.h"
#include "astralroster.h"
#include "astralsessionmanager.h"
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingChannel>
#include <QDebug>
struct AstralAccountPrivate
@@ -146,14 +146,14 @@ void AstralAccount::onNewChannels(const Tp::ChannelDetailsList &channels)
qDebug() << "AstralAccount::onNewChannels";
foreach (const Tp::ChannelDetails &details, channels)
{
- QString channelType = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")).toString();
- bool requested = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".Requested")).toBool();
+ QString channelType = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")).toString();
+ bool requested = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".Requested")).toBool();
qDebug() << " channelType:" << channelType;
qDebug() << " requested :" << requested;
qDebug() << " channelPath:" << details.channel.path();
qDebug() << " properties :" << details.properties;
- if (channelType == TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT && !requested)
+ if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT && !requested)
{
TextChannelPtr channel = TextChannel::create(p->conn,
details.channel.path(),
diff --git a/protocols/astral/src/astralaccount.h b/protocols/astral/src/astralaccount.h
index 2781fb9..6e4378d 100644
--- a/protocols/astral/src/astralaccount.h
+++ b/protocols/astral/src/astralaccount.h
@@ -26,13 +26,13 @@
#define ASTRALACCOUNT_H
#include <qutim/account.h>
-#include <TelepathyQt4/ConnectionManager>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingConnection>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/ConnectionManager>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingConnection>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
#include "astralroster.h"
diff --git a/protocols/astral/src/astralcontact.h b/protocols/astral/src/astralcontact.h
index ce0e9dd..5adfb07 100644
--- a/protocols/astral/src/astralcontact.h
+++ b/protocols/astral/src/astralcontact.h
@@ -26,9 +26,9 @@
#define ASTRALCONTACT_H
#include <qutim/contact.h>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Connection>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Connection>
using namespace Tp;
using namespace qutim_sdk_0_3;
diff --git a/protocols/astral/src/astralplugin.cpp b/protocols/astral/src/astralplugin.cpp
index e907866..d79642e 100644
--- a/protocols/astral/src/astralplugin.cpp
+++ b/protocols/astral/src/astralplugin.cpp
@@ -24,9 +24,9 @@
****************************************************************************/
#include "astralplugin.h"
#include <QtCore/QtDebug>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
//#include <TelepathyQt4/ConnectionInterfaceAvatarsInterface>
AstralPlugin::AstralPlugin()
diff --git a/protocols/astral/src/astralroster.cpp b/protocols/astral/src/astralroster.cpp
index 9eb209f..588cc55 100644
--- a/protocols/astral/src/astralroster.cpp
+++ b/protocols/astral/src/astralroster.cpp
@@ -24,13 +24,13 @@
****************************************************************************/
#include "astralroster.h"
#include "astralaccount.h"
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingConnection>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingConnection>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
struct AstralRosterPrivate
{
diff --git a/protocols/astral/src/astralsession.h b/protocols/astral/src/astralsession.h
index fa78e45..a5dd1c3 100644
--- a/protocols/astral/src/astralsession.h
+++ b/protocols/astral/src/astralsession.h
@@ -26,8 +26,8 @@
#define ASTRALSESSION_H
#include <qutim/chatunit.h>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/Message>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/Message>
using namespace qutim_sdk_0_3;
using namespace Tp;
--
2.0.4
|
GitWeb