[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=55af51d

The following commit has been merged in the master branch:
commit 55af51d2fb5ad74c350402bb6aecf83bd1152312
Author: Alin M Elena <alinm.elena at gmail.com>
Date:   Fri Dec 23 12:36:17 2011 +0000

    change tpkde to ktp in filenames and in factory
    Reviewed by: George Kiagiadakis <kiagiadakis.george at gmail.com>
---
 src/CMakeLists.txt                                     |  2 +-
 src/handlewithcaller.cpp                               |  4 ++--
 src/{tpkdeapproverfactory.h => ktpapproverfactory.h}   |  8 ++++----
 src/{tpkdeapprovermodule.cpp => ktpapprovermodule.cpp} | 10 +++++-----
 src/textchannelapprover.cpp                            |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69026df..1d6f697 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(ktp_approver_SRCS
-    tpkdeapprovermodule.cpp
+    ktpapprovermodule.cpp
     approverdaemon.cpp
     dispatchoperation.cpp
     handlewithcaller.cpp
diff --git a/src/handlewithcaller.cpp b/src/handlewithcaller.cpp
index e26a1c4..6e35c49 100644
--- a/src/handlewithcaller.cpp
+++ b/src/handlewithcaller.cpp
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "handlewithcaller.h"
-#include "tpkdeapproverfactory.h"
+#include "ktpapproverfactory.h"
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDebug>
@@ -37,7 +37,7 @@ HandleWithCaller::HandleWithCaller(const Tp::ChannelDispatchOperationPtr & dispa
 
 void HandleWithCaller::findHandlers()
 {
-    KConfig config(TpKDEApproverFactory::componentData());
+    KConfig config(KTpApproverFactory::componentData());
     KConfigGroup group(&config, "HandlerPreferences");
 
     //realistically, dispatch operations only have one channel
diff --git a/src/tpkdeapproverfactory.h b/src/ktpapproverfactory.h
similarity index 85%
rename from src/tpkdeapproverfactory.h
rename to src/ktpapproverfactory.h
index d92a2c3..84cc258 100644
--- a/src/tpkdeapproverfactory.h
+++ b/src/ktpapproverfactory.h
@@ -15,11 +15,11 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef TPKDEAPPROVERFACTORY_H
-#define TPKDEAPPROVERFACTORY_H
+#ifndef KTPAPPROVERFACTORY_H
+#define KTPAPPROVERFACTORY_H
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_DECLARATION(TpKDEApproverFactory)
+K_PLUGIN_FACTORY_DECLARATION(KTpApproverFactory)
 
-#endif //TPKDEAPPROVERFACTORY_H
+#endif //KTPAPPROVERFACTORY_H
diff --git a/src/tpkdeapprovermodule.cpp b/src/ktpapprovermodule.cpp
similarity index 91%
rename from src/tpkdeapprovermodule.cpp
rename to src/ktpapprovermodule.cpp
index 4baf900..2529984 100644
--- a/src/tpkdeapprovermodule.cpp
+++ b/src/ktpapprovermodule.cpp
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "approverdaemon.h"
-#include "tpkdeapproverfactory.h"
+#include "ktpapproverfactory.h"
 
 #include <KAboutData>
 #include <KLocale>
@@ -30,10 +30,10 @@
 #include <TelepathyQt/TextChannel>
 #include <TelepathyQt/IncomingFileTransferChannel>
 
-class TpKDEApproverModule : public KDEDModule
+class KTpApproverModule : public KDEDModule
 {
 public:
-    TpKDEApproverModule(QObject *parent, const QVariantList & args)
+    KTpApproverModule(QObject *parent, const QVariantList & args)
         : KDEDModule(parent)
     {
         Q_UNUSED(args);
@@ -81,5 +81,5 @@ private:
     Tp::ClientRegistrarPtr m_registrar;
 };
 
-K_PLUGIN_FACTORY_DEFINITION(TpKDEApproverFactory, registerPlugin<TpKDEApproverModule>();)
-K_EXPORT_PLUGIN(TpKDEApproverFactory(TpKDEApproverModule::aboutData()))
+K_PLUGIN_FACTORY_DEFINITION(KTpApproverFactory, registerPlugin<KTpApproverModule>();)
+K_EXPORT_PLUGIN(KTpApproverFactory(KTpApproverModule::aboutData()))
diff --git a/src/textchannelapprover.cpp b/src/textchannelapprover.cpp
index d80a1f3..0540335 100644
--- a/src/textchannelapprover.cpp
+++ b/src/textchannelapprover.cpp
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "textchannelapprover.h"
-#include "tpkdeapproverfactory.h"
+#include "ktpapproverfactory.h"
 #include <KNotification>
 #include <KStatusNotifierItem>
 #include <KLocale>

-- 
ktp-approver packaging