[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=f43e37f

The following commit has been merged in the master branch:
commit f43e37fb306495542546a0835e4fa38b6d1d7c27
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 13 23:44:44 2014 +0100

    Move IMPersonsDataSource to kpeople/datasource folder
---
 KTp/CMakeLists.txt                                           | 6 ------
 kpeople/datasourceplugin/CMakeLists.txt                      | 3 +++
 kpeople/datasourceplugin/im-persons-data-source-plugin.cpp   | 2 +-
 {KTp => kpeople/datasourceplugin}/im-persons-data-source.cpp | 8 ++++----
 {KTp => kpeople/datasourceplugin}/im-persons-data-source.h   | 0
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 2679d89..01a24b4 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -70,7 +70,6 @@ set (ktp_private_LIBS
                        ${KDE4_KIO_LIBS}
                        ${TELEPATHY_QT4_LIBRARIES}
                        ${KDE4_KDEUI_LIBS}
-                       ${QT_QTSQL_LIBRARIES}
                        ${KDEPIMLIBS_KABC_LIBS}
 )
 
@@ -84,11 +83,6 @@ endif (TELEPATHY_LOGGER_QT4_FOUND)
 if (KPEOPLE_FOUND)
     include_directories(${KPEOPLE_INCLUDES})
 
-    set (ktp_common_internals_private_SRCS
-         ${ktp_common_internals_private_SRCS}
-         im-persons-data-source.cpp
-         )
-
     set (ktp_private_LIBS
          ${ktp_private_LIBS}
          ${KPEOPLE_LIBS}
diff --git a/kpeople/datasourceplugin/CMakeLists.txt b/kpeople/datasourceplugin/CMakeLists.txt
index f0c796b..fa49544 100644
--- a/kpeople/datasourceplugin/CMakeLists.txt
+++ b/kpeople/datasourceplugin/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories(${KPEOPLE_INCLUDES})
 
 set (im_persons_data_source_SRCS
      im-persons-data-source-plugin.cpp
+     im-persons-data-source.cpp
 )
 
 kde4_add_plugin (im_persons_data_source_plugin
@@ -10,9 +11,11 @@ kde4_add_plugin (im_persons_data_source_plugin
 
 target_link_libraries (im_persons_data_source_plugin
     ${QT_LIBRARIES}
+    ${QT_QTSQL_LIBRARIES}
     ${TELEPATHY_QT4_LIBRARIES}
     ${KDE4_KDEUI_LIBS}
     ${KPEOPLE_LIBS}
+    ${KDEPIMLIBS_KABC_LIBS}
     ktpcommoninternalsprivate
 )
 
diff --git a/kpeople/datasourceplugin/im-persons-data-source-plugin.cpp b/kpeople/datasourceplugin/im-persons-data-source-plugin.cpp
index 6ee5862..ce5ff62 100644
--- a/kpeople/datasourceplugin/im-persons-data-source-plugin.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source-plugin.cpp
@@ -1,7 +1,7 @@
 #include <KPluginFactory>
 #include <KPluginLoader>
 
-#include "KTp/im-persons-data-source.h"
+#include "im-persons-data-source.h"
 
 //this is a new file so that IMPluginDataSource can be used from it's own plugin (this) and from the normal plugin
 
diff --git a/KTp/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
similarity index 96%
rename from KTp/im-persons-data-source.cpp
rename to kpeople/datasourceplugin/im-persons-data-source.cpp
index 97ea471..3db1cde 100644
--- a/KTp/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -78,11 +78,11 @@ KTpAllContacts::~KTpAllContacts()
 
 void KTpAllContacts::loadCache()
 {
-    QSqlDatabase m_db = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), QLatin1String("ktpCache"));
-    m_db.setDatabaseName(KGlobal::dirs()->locateLocal("data", QLatin1String("ktp/cache.db")));
-    m_db.open();
+    QSqlDatabase db = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), QLatin1String("ktpCache"));
+    db.setDatabaseName(KGlobal::dirs()->locateLocal("data", QLatin1String("ktp/cache.db")));
+    db.open();
 
-    QSqlQuery query(QLatin1String("SELECT accountId, contactId, alias, avatarFileName FROM contacts"), m_db);
+    QSqlQuery query(QLatin1String("SELECT accountId, contactId, alias, avatarFileName FROM contacts"), db);
 
     query.exec();
 
diff --git a/KTp/im-persons-data-source.h b/kpeople/datasourceplugin/im-persons-data-source.h
similarity index 100%
rename from KTp/im-persons-data-source.h
rename to kpeople/datasourceplugin/im-persons-data-source.h

-- 
ktp-common-internals packaging