[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 09:13:18 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=c13092c
The following commit has been merged in the master branch:
commit c13092ce5dafff2d64bd5b8cd7f4d4db8cfadc06
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Sat Dec 10 14:54:11 2011 +0100
port-to-0.9: Rename relevant include paths and variables
---
src/approverdaemon.cpp | 4 ++--
src/approverdaemon.h | 2 +-
src/channelapprover.cpp | 4 ++--
src/channelapprover.h | 2 +-
src/dispatchoperation.cpp | 2 +-
src/dispatchoperation.h | 2 +-
src/filetransferchannelapprover.cpp | 4 ++--
src/filetransferchannelapprover.h | 2 +-
src/handlewithcaller.cpp | 10 +++++-----
src/handlewithcaller.h | 2 +-
src/textchannelapprover.cpp | 8 ++++----
src/textchannelapprover.h | 4 ++--
src/tpkdeapprovermodule.cpp | 12 ++++++------
13 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/approverdaemon.cpp b/src/approverdaemon.cpp
index 4b61aa9..d8239b7 100644
--- a/src/approverdaemon.cpp
+++ b/src/approverdaemon.cpp
@@ -17,8 +17,8 @@
*/
#include "approverdaemon.h"
#include "dispatchoperation.h"
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/ChannelDispatchOperation>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/ChannelDispatchOperation>
static inline Tp::ChannelClassSpecList channelClassSpecList()
{
diff --git a/src/approverdaemon.h b/src/approverdaemon.h
index 03bc787..4d41414 100644
--- a/src/approverdaemon.h
+++ b/src/approverdaemon.h
@@ -18,7 +18,7 @@
#ifndef APPROVERDAEMON_H
#define APPROVERDAEMON_H
-#include <TelepathyQt4/AbstractClientApprover>
+#include <TelepathyQt/AbstractClientApprover>
class ApproverDaemon : public QObject, public Tp::AbstractClientApprover
{
diff --git a/src/channelapprover.cpp b/src/channelapprover.cpp
index 310405c..4130a86 100644
--- a/src/channelapprover.cpp
+++ b/src/channelapprover.cpp
@@ -21,11 +21,11 @@
ChannelApprover *ChannelApprover::create(const Tp::ChannelPtr & channel, QObject *parent)
{
- if (channel->channelType() == TP_QT4_IFACE_CHANNEL_TYPE_TEXT) {
+ if (channel->channelType() == TP_QT_IFACE_CHANNEL_TYPE_TEXT) {
return new TextChannelApprover(Tp::TextChannelPtr::dynamicCast(channel), parent);
}
- if (channel->channelType() == TP_QT4_IFACE_CHANNEL_TYPE_FILE_TRANSFER) {
+ if (channel->channelType() == TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER) {
return new FileTransferChannelApprover(
Tp::FileTransferChannelPtr::dynamicCast(channel),
parent);
diff --git a/src/channelapprover.h b/src/channelapprover.h
index 65fec51..5846249 100644
--- a/src/channelapprover.h
+++ b/src/channelapprover.h
@@ -19,7 +19,7 @@
#define CHANNELAPPROVER_H
#include <QtCore/QObject>
-#include <TelepathyQt4/Channel>
+#include <TelepathyQt/Channel>
class ChannelApprover : public QObject
{
diff --git a/src/dispatchoperation.cpp b/src/dispatchoperation.cpp
index 35e0508..a1a3327 100644
--- a/src/dispatchoperation.cpp
+++ b/src/dispatchoperation.cpp
@@ -19,7 +19,7 @@
#include "channelapprover.h"
#include "handlewithcaller.h"
#include <KDebug>
-#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt/PendingOperation>
DispatchOperation::DispatchOperation(const Tp::ChannelDispatchOperationPtr & dispatchOperation,
QObject *parent)
diff --git a/src/dispatchoperation.h b/src/dispatchoperation.h
index 39ee5cb..8808d42 100644
--- a/src/dispatchoperation.h
+++ b/src/dispatchoperation.h
@@ -19,7 +19,7 @@
#define DISPATCHOPERATION_H
#include <QtCore/QObject>
-#include <TelepathyQt4/ChannelDispatchOperation>
+#include <TelepathyQt/ChannelDispatchOperation>
class ChannelApprover;
diff --git a/src/filetransferchannelapprover.cpp b/src/filetransferchannelapprover.cpp
index 2e2e070..f4ddc40 100644
--- a/src/filetransferchannelapprover.cpp
+++ b/src/filetransferchannelapprover.cpp
@@ -23,8 +23,8 @@
#include <KAboutData>
#include <KActionCollection>
#include <KMenu>
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/Contact>
FileTransferChannelApprover::FileTransferChannelApprover(
const Tp::FileTransferChannelPtr & channel,
diff --git a/src/filetransferchannelapprover.h b/src/filetransferchannelapprover.h
index 003dcd8..8b5a1d4 100644
--- a/src/filetransferchannelapprover.h
+++ b/src/filetransferchannelapprover.h
@@ -20,7 +20,7 @@
#include "channelapprover.h"
#include <QtCore/QSharedPointer>
-#include <TelepathyQt4/IncomingFileTransferChannel>
+#include <TelepathyQt/IncomingFileTransferChannel>
class KStatusNotifierItem;
class KNotification;
diff --git a/src/handlewithcaller.cpp b/src/handlewithcaller.cpp
index 2781733..e26a1c4 100644
--- a/src/handlewithcaller.cpp
+++ b/src/handlewithcaller.cpp
@@ -20,8 +20,8 @@
#include <KConfig>
#include <KConfigGroup>
#include <KDebug>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/Channel>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/Channel>
HandleWithCaller::HandleWithCaller(const Tp::ChannelDispatchOperationPtr & dispatchOperation,
QObject *parent)
@@ -83,9 +83,9 @@ void HandleWithCaller::callHandleWith()
void HandleWithCaller::onHandleWithFinished(Tp::PendingOperation* operation)
{
if (operation->isError()) {
- if (operation->errorName() == TP_QT4_ERROR_INVALID_ARGUMENT ||
- operation->errorName() == TP_QT4_ERROR_NOT_AVAILABLE ||
- operation->errorName() == TP_QT4_ERROR_NOT_IMPLEMENTED)
+ if (operation->errorName() == TP_QT_ERROR_INVALID_ARGUMENT ||
+ operation->errorName() == TP_QT_ERROR_NOT_AVAILABLE ||
+ operation->errorName() == TP_QT_ERROR_NOT_IMPLEMENTED)
{
//remove the handler that we just tried and try the next one
m_possibleHandlers.removeFirst();
diff --git a/src/handlewithcaller.h b/src/handlewithcaller.h
index 4478f59..6e2325f 100644
--- a/src/handlewithcaller.h
+++ b/src/handlewithcaller.h
@@ -19,7 +19,7 @@
#define HANDLEWITHCALLER_H
#include <QtCore/QObject>
-#include <TelepathyQt4/ChannelDispatchOperation>
+#include <TelepathyQt/ChannelDispatchOperation>
class HandleWithCaller : public QObject
{
diff --git a/src/textchannelapprover.cpp b/src/textchannelapprover.cpp
index 2328910..d80a1f3 100644
--- a/src/textchannelapprover.cpp
+++ b/src/textchannelapprover.cpp
@@ -23,10 +23,10 @@
#include <KGlobal>
#include <KDebug>
#include <KAboutData>
-#include <TelepathyQt4/ReceivedMessage>
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt/ReceivedMessage>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingContacts>
TextChannelApprover::TextChannelApprover(const Tp::TextChannelPtr & channel, QObject *parent)
: ChannelApprover(parent), m_notifierItem(getNotifierItem())
diff --git a/src/textchannelapprover.h b/src/textchannelapprover.h
index b6301f7..b69e876 100644
--- a/src/textchannelapprover.h
+++ b/src/textchannelapprover.h
@@ -21,8 +21,8 @@
#include "channelapprover.h"
#include <QtCore/QSet>
#include <QtCore/QSharedPointer>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/ReceivedMessage>
class KStatusNotifierItem;
class KNotification;
diff --git a/src/tpkdeapprovermodule.cpp b/src/tpkdeapprovermodule.cpp
index 76b93b8..cbf2f95 100644
--- a/src/tpkdeapprovermodule.cpp
+++ b/src/tpkdeapprovermodule.cpp
@@ -23,12 +23,12 @@
#include <KComponentData>
#include <KDEDModule>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/IncomingFileTransferChannel>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/IncomingFileTransferChannel>
class TpKDEApproverModule : public KDEDModule
{
--
ktp-approver packaging
More information about the pkg-kde-commits
mailing list