[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:11:55 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=ad39cb6
The following commit has been merged in the master branch:
commit ad39cb66fe47e2f524bf3dae5993693b635fbbb1
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Sat Dec 10 15:20:18 2011 +0100
port-to-0.9: Rename relevant include paths and variables
---
src/config.h | 2 +-
src/contact-wrapper.cpp | 10 +++++-----
src/contact-wrapper.h | 4 ++--
src/telepathy-contact.cpp | 10 +++++-----
src/telepathy-contact.h | 4 ++--
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/config.h b/src/config.h
index 36e8266..20686df 100644
--- a/src/config.h
+++ b/src/config.h
@@ -23,7 +23,7 @@
#include "ui_config.h"
#include <KDialog>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
namespace Ui {
class Config;
diff --git a/src/contact-wrapper.cpp b/src/contact-wrapper.cpp
index 2f379c2..0068efa 100644
--- a/src/contact-wrapper.cpp
+++ b/src/contact-wrapper.cpp
@@ -22,11 +22,11 @@
#include <KToolInvocation>
#include <KUrl>
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingChannelRequest>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingChannelRequest>
+#include <TelepathyQt/Presence>
#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDE.TextUi"
diff --git a/src/contact-wrapper.h b/src/contact-wrapper.h
index c94cf70..da94a5a 100644
--- a/src/contact-wrapper.h
+++ b/src/contact-wrapper.h
@@ -22,8 +22,8 @@
#include <QtCore/QObject>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Contact>
class ContactWrapper : public QObject
{
diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index 2c94265..fa56a7c 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -30,11 +30,11 @@
#include <QtGui/QPainter>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/Types>
TelepathyContact::TelepathyContact(QObject* parent, const QVariantList& args)
diff --git a/src/telepathy-contact.h b/src/telepathy-contact.h
index 0b18698..6d4505f 100644
--- a/src/telepathy-contact.h
+++ b/src/telepathy-contact.h
@@ -25,8 +25,8 @@
#include <Plasma/Applet>
#include <Plasma/DeclarativeWidget>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/Contact>
class Config;
class ContactWrapper;
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list