[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:07:23 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b30aa08
The following commit has been merged in the master branch:
commit b30aa08a7978cbd9365f5059f0f3994273eaedb8
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Mon Jan 2 12:31:55 2012 +0100
Port to Telepathy-Qt 0.9
---
kpeople/nepomuk-feeder/CMakeLists.txt | 2 +-
kpeople/nepomuk-feeder/abstract-storage.h | 8 ++---
kpeople/nepomuk-feeder/account.cpp | 8 ++---
kpeople/nepomuk-feeder/account.h | 4 +--
.../cmake/modules/FindTelepathyQt4.cmake | 40 ----------------------
kpeople/nepomuk-feeder/contact.cpp | 8 ++---
kpeople/nepomuk-feeder/contact.h | 6 ++--
kpeople/nepomuk-feeder/controller.cpp | 2 +-
kpeople/nepomuk-feeder/controller.h | 4 +--
kpeople/nepomuk-feeder/nepomuk-storage.cpp | 9 ++---
kpeople/nepomuk-feeder/nepomuk-storage.h | 4 +--
kpeople/nepomuk-feeder/service.cpp | 2 +-
12 files changed, 29 insertions(+), 68 deletions(-)
diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index fc3f69f..f501d1e 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -9,7 +9,7 @@ set (CMAKE_MODULE_PATH
set(KDE_MIN_VERSION "4.4.75")
find_package (KDE4 ${KDE_MIN_VERSION} REQUIRED)
find_package (Nepomuk REQUIRED)
-find_package (TelepathyQt4 REQUIRED)
+find_package (TelepathyQt4 0.8.9 REQUIRED)
set(SDO_MIN_VERSION "0.6.50")
find_package(SharedDesktopOntologies ${SDO_MIN_VERSION} REQUIRED)
diff --git a/kpeople/nepomuk-feeder/abstract-storage.h b/kpeople/nepomuk-feeder/abstract-storage.h
index 8850965..b6aa32e 100644
--- a/kpeople/nepomuk-feeder/abstract-storage.h
+++ b/kpeople/nepomuk-feeder/abstract-storage.h
@@ -25,9 +25,9 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/Types>
/**
* Abstract interface class for storage implementations. This allows fake storage classes to be used
@@ -74,7 +74,7 @@ public Q_SLOTS:
* being invoked does not indicate that the Telepathy Account has actually been removed by the
* user, simply that the object in the Telepathy Nepomuk Service that wraps the Account has
* been destroyed.
- *
+ *
* \param path the object path (unique identifier) of the account
*/
virtual void destroyAccount(const QString &path) = 0;
diff --git a/kpeople/nepomuk-feeder/account.cpp b/kpeople/nepomuk-feeder/account.cpp
index 75652a4..ebba079 100644
--- a/kpeople/nepomuk-feeder/account.cpp
+++ b/kpeople/nepomuk-feeder/account.cpp
@@ -25,10 +25,10 @@
#include <KDebug>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
Account::Account(const Tp::AccountPtr &account, QObject *parent)
: QObject(parent),
diff --git a/kpeople/nepomuk-feeder/account.h b/kpeople/nepomuk-feeder/account.h
index e1c46da..0cac18c 100644
--- a/kpeople/nepomuk-feeder/account.h
+++ b/kpeople/nepomuk-feeder/account.h
@@ -26,8 +26,8 @@
#include <QtCore/QObject>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Connection>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Connection>
namespace Tp {
class PendingOperation;
diff --git a/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake b/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
deleted file mode 100644
index 8569415..0000000
--- a/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# Try to find the Qt binding of the Telepathy library
-# TELEPATHY_QT_FOUND - system has TelepathyQt4
-# TELEPATHY_QT_INCLUDE_DIR - the TelepathyQt4 include directory
-# TELEPATHY_QT_LIBRARIES - Link these to use TelepathyQt4
-
-# Copyright (c) 2008, Allen Winter <winter at kde.org>
-# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko at gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-set(TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
-if(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
- # Already in cache, be silent
- set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
-endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.7.0)
-endif(PKG_CONFIG_FOUND)
-
-find_path(TELEPATHY_QT4_INCLUDE_DIR
- NAMES TelepathyQt4/Types
- HINTS
- ${PC_TELEPATHY_QT4_INCLUDEDIR}/telepathy-1.0
- ${PC_TELEPATHY_QT4_INCLUDE_DIRS}/telepathy-1.0
- ${PC_TELEPATHY_QT4_INCLUDES}/telepathy-1.0
-)
-
-find_library(TELEPATHY_QT4_LIBRARIES
- NAMES telepathy-qt4
- HINTS
- ${PC_TELEPATHY_QT4_LIBDIR}
- ${PC_TELEPATHY_QT4_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(TELEPATHY_QT4 DEFAULT_MSG
- TELEPATHY_QT4_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR)
diff --git a/kpeople/nepomuk-feeder/contact.cpp b/kpeople/nepomuk-feeder/contact.cpp
index 9b77c65..2e1a95e 100644
--- a/kpeople/nepomuk-feeder/contact.cpp
+++ b/kpeople/nepomuk-feeder/contact.cpp
@@ -21,10 +21,10 @@
#include "contact.h"
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/ContactManager>
#include <KDebug>
diff --git a/kpeople/nepomuk-feeder/contact.h b/kpeople/nepomuk-feeder/contact.h
index de1500d..e8d7044 100644
--- a/kpeople/nepomuk-feeder/contact.h
+++ b/kpeople/nepomuk-feeder/contact.h
@@ -24,9 +24,9 @@
#include <QtCore/QObject>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Presence>
/**
* This class wraps one Telepathy Contact.
diff --git a/kpeople/nepomuk-feeder/controller.cpp b/kpeople/nepomuk-feeder/controller.cpp
index f70d94c..8e7dcf8 100644
--- a/kpeople/nepomuk-feeder/controller.cpp
+++ b/kpeople/nepomuk-feeder/controller.cpp
@@ -26,7 +26,7 @@
#include <KDebug>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/PendingReady>
Controller::Controller(AbstractStorage *storage, QObject *parent)
: QObject(parent),
diff --git a/kpeople/nepomuk-feeder/controller.h b/kpeople/nepomuk-feeder/controller.h
index c84d29d..b358c8e 100644
--- a/kpeople/nepomuk-feeder/controller.h
+++ b/kpeople/nepomuk-feeder/controller.h
@@ -24,8 +24,8 @@
#include <QtCore/QObject>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountManager>
namespace Tp {
class PendingOperation;
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index b276b62..df9fe11 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -24,8 +24,6 @@
#include "nepomuk-storage.h"
#include "ontologies/contactgroup.h"
-#include "ontologies/nco.h"
-#include "ontologies/pimo.h"
#include "ontologies/telepathy.h"
#include "ontologies/imcapability.h"
#include "ontologies/personcontact.h"
@@ -43,6 +41,9 @@
#include <Nepomuk/Thing>
#include <Nepomuk/Variant>
+#include <Nepomuk/Vocabulary/NCO>
+#include <Nepomuk/Vocabulary/PIMO>
+
#include <Nepomuk/Query/Query>
#include <Nepomuk/Query/AndTerm>
#include <Nepomuk/Query/ComparisonTerm>
@@ -56,8 +57,8 @@
#include <QtCore/QSharedData>
#include <QtCore/QTimer>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/AvatarData>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/AvatarData>
using namespace Nepomuk::Vocabulary;
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.h b/kpeople/nepomuk-feeder/nepomuk-storage.h
index 4c1f4bb..f721b01 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.h
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.h
@@ -31,8 +31,8 @@
#include <QtCore/QSharedDataPointer>
#include <QtCore/QString>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Types>
namespace Nepomuk {
class ResourceManager;
diff --git a/kpeople/nepomuk-feeder/service.cpp b/kpeople/nepomuk-feeder/service.cpp
index d4821c0..ba91811 100644
--- a/kpeople/nepomuk-feeder/service.cpp
+++ b/kpeople/nepomuk-feeder/service.cpp
@@ -30,7 +30,7 @@
#include <Nepomuk/ResourceManager>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
TelepathyService::TelepathyService(QObject *parent, const QVariantList &)
: Nepomuk::Service(parent, true)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list