[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=bbcda91

The following commit has been merged in the master branch:
commit bbcda91cf45118654c0d4880b6aff96109600761
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Feb 17 20:47:46 2014 +0100

    Normalise ImPersonsDataSourcePlugin into 1 file
---
 kpeople/datasourceplugin/CMakeLists.txt                    |  1 -
 kpeople/datasourceplugin/im-persons-data-source-plugin.cpp |  9 ---------
 kpeople/datasourceplugin/im-persons-data-source.cpp        | 10 +++++++++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/kpeople/datasourceplugin/CMakeLists.txt b/kpeople/datasourceplugin/CMakeLists.txt
index fa49544..408e31f 100644
--- a/kpeople/datasourceplugin/CMakeLists.txt
+++ b/kpeople/datasourceplugin/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories(${KPEOPLE_INCLUDES})
 
 set (im_persons_data_source_SRCS
-     im-persons-data-source-plugin.cpp
      im-persons-data-source.cpp
 )
 
diff --git a/kpeople/datasourceplugin/im-persons-data-source-plugin.cpp b/kpeople/datasourceplugin/im-persons-data-source-plugin.cpp
deleted file mode 100644
index ce5ff62..0000000
--- a/kpeople/datasourceplugin/im-persons-data-source-plugin.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <KPluginFactory>
-#include <KPluginLoader>
-
-#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
-
-K_PLUGIN_FACTORY( IMPersonsDataSourceFactory, registerPlugin<IMPersonsDataSource>(); )
-K_EXPORT_PLUGIN( IMPersonsDataSourceFactory("im_persons_data_source_plugin") )
diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 6b9977b..94d8de1 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -1,5 +1,7 @@
 /*
     Copyright (C) 2013  Martin Klapetek <mklapetek at kde.org>
+    Copyright (C) 2014  David Edmundson <davidedmundson at kde.org>
+
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -36,6 +38,8 @@
 #include <KDebug>
 #include <KGlobal>
 #include <KStandardDirs>
+#include <KPluginFactory>
+#include <KPluginLoader>
 
 #include <QSqlDatabase>
 #include <QSqlQuery>
@@ -249,4 +253,8 @@ AllContactsMonitor* IMPersonsDataSource::createAllContactsMonitor()
     return new KTpAllContacts();
 }
 
-#include "im-persons-data-source.moc"
+K_PLUGIN_FACTORY( IMPersonsDataSourceFactory, registerPlugin<IMPersonsDataSource>(); )
+K_EXPORT_PLUGIN( IMPersonsDataSourceFactory("im_persons_data_source_plugin") )
+
+
+#include "im-persons-data-source.moc"
\ No newline at end of file

-- 
ktp-common-internals packaging