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

The following commit has been merged in the master branch:
commit b9766ad87d308d023773fc49931da1509f65707c
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Tue Nov 22 20:07:53 2011 +0100

    Move namespace to KTp instead of KTelepathy
---
 circular-countdown.cpp            | 2 +-
 circular-countdown.h              | 2 +-
 error-dictionary.cpp              | 2 +-
 error-dictionary.h                | 2 +-
 global-presence.cpp               | 2 +-
 global-presence.h                 | 2 +-
 models/accounts-filter-model.cpp  | 2 +-
 models/contact-model-item.cpp     | 2 +-
 presence.cpp                      | 2 +-
 presence.h                        | 2 +-
 service-availability-checker.cpp  | 2 +-
 service-availability-checker.h    | 2 +-
 telepathy-handler-application.cpp | 4 ++--
 telepathy-handler-application.h   | 4 ++--
 text-parser.cpp                   | 2 +-
 text-parser.h                     | 2 +-
 wallet-interface.cpp              | 2 +-
 wallet-interface.h                | 4 ++--
 18 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/circular-countdown.cpp b/circular-countdown.cpp
index 7f3c851..4cbb896 100644
--- a/circular-countdown.cpp
+++ b/circular-countdown.cpp
@@ -23,7 +23,7 @@
 #include <QPaintEvent>
 #include <QTimeLine>
 
-namespace KTelepathy
+namespace KTp
 {
 
 class CircularCountdown::Private
diff --git a/circular-countdown.h b/circular-countdown.h
index 5d57fca..df54cd6 100644
--- a/circular-countdown.h
+++ b/circular-countdown.h
@@ -24,7 +24,7 @@
 
 #include <ktelepathy-export.h>
 
-namespace KTelepathy
+namespace KTp
 {
 
 class KTELEPATHY_EXPORT CircularCountdown : public QWidget
diff --git a/error-dictionary.cpp b/error-dictionary.cpp
index d503b87..17c29d7 100644
--- a/error-dictionary.cpp
+++ b/error-dictionary.cpp
@@ -28,7 +28,7 @@
 #include <KLocale>
 #include <KDebug>
 
-namespace KTelepathy
+namespace KTp
 {
 
 QString ErrorDictionary::displayVerboseErrorMessage(const QString& dbusErrorName)
diff --git a/error-dictionary.h b/error-dictionary.h
index 373cd90..c654170 100644
--- a/error-dictionary.h
+++ b/error-dictionary.h
@@ -25,7 +25,7 @@
 
 #include <ktelepathy-export.h>
 
-namespace KTelepathy
+namespace KTp
 {
 namespace ErrorDictionary
 {
diff --git a/global-presence.cpp b/global-presence.cpp
index 39dcc74..8d13d72 100644
--- a/global-presence.cpp
+++ b/global-presence.cpp
@@ -27,7 +27,7 @@
 
 #include <KDebug>
 
-namespace KTelepathy
+namespace KTp
 {
 
 GlobalPresence::GlobalPresence(QObject *parent)
diff --git a/global-presence.h b/global-presence.h
index 01e06db..6898d4c 100644
--- a/global-presence.h
+++ b/global-presence.h
@@ -27,7 +27,7 @@
 
 #include <ktelepathy-export.h>
 
-namespace KTelepathy
+namespace KTp
 {
 
 /** This class handles the presence between all enabled accounts
diff --git a/models/accounts-filter-model.cpp b/models/accounts-filter-model.cpp
index 9ec30ee..ca7aa91 100644
--- a/models/accounts-filter-model.cpp
+++ b/models/accounts-filter-model.cpp
@@ -160,7 +160,7 @@ bool AccountsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &r
                 return false;
             }
 
-            return KTelepathy::Presence::sortPriority(leftPresence) < KTelepathy::Presence::sortPriority(rightPresence);
+            return KTp::Presence::sortPriority(leftPresence) < KTp::Presence::sortPriority(rightPresence);
         }
     } else {
         return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
diff --git a/models/contact-model-item.cpp b/models/contact-model-item.cpp
index 40e4d9a..d87e21f 100644
--- a/models/contact-model-item.cpp
+++ b/models/contact-model-item.cpp
@@ -35,7 +35,7 @@
 
 
 
-K_GLOBAL_STATIC_WITH_ARGS(KTelepathy::ServiceAvailabilityChecker, s_krfbAvailableChecker,
+K_GLOBAL_STATIC_WITH_ARGS(KTp::ServiceAvailabilityChecker, s_krfbAvailableChecker,
                           (QLatin1String("org.freedesktop.Telepathy.Client.krfb_rfb_handler")));
 
 
diff --git a/presence.cpp b/presence.cpp
index fefa714..b9e6aff 100644
--- a/presence.cpp
+++ b/presence.cpp
@@ -22,7 +22,7 @@
 
 #include <KLocalizedString>
 
-namespace KTelepathy
+namespace KTp
 {
 
 Presence::Presence() :
diff --git a/presence.h b/presence.h
index 0e6ec42..d0755ba 100644
--- a/presence.h
+++ b/presence.h
@@ -27,7 +27,7 @@
 
 #include <ktelepathy-export.h>
 
-namespace KTelepathy
+namespace KTp
 {
 
 class KTELEPATHY_EXPORT Presence : public Tp::Presence
diff --git a/service-availability-checker.cpp b/service-availability-checker.cpp
index 50a56b5..e1f7e51 100644
--- a/service-availability-checker.cpp
+++ b/service-availability-checker.cpp
@@ -24,7 +24,7 @@
 
 #include <KDebug>
 
-namespace KTelepathy
+namespace KTp
 {
 
 struct ServiceAvailabilityChecker::Private
diff --git a/service-availability-checker.h b/service-availability-checker.h
index 2a9101e..b15ac01 100644
--- a/service-availability-checker.h
+++ b/service-availability-checker.h
@@ -24,7 +24,7 @@
 
 class QDBusPendingCallWatcher;
 
-namespace KTelepathy
+namespace KTp
 {
 
 /**
diff --git a/telepathy-handler-application.cpp b/telepathy-handler-application.cpp
index 6791096..a27d524 100644
--- a/telepathy-handler-application.cpp
+++ b/telepathy-handler-application.cpp
@@ -29,7 +29,7 @@
 
 extern bool kde_kdebug_enable_dbus_interface;
 
-namespace KTelepathy
+namespace KTp
 {
 
 namespace {
@@ -216,6 +216,6 @@ void TelepathyHandlerApplication::jobFinished()
     }
 }
 
-} // namespace KTelepathy
+} // namespace KTp
 
 #include "telepathy-handler-application.moc"
diff --git a/telepathy-handler-application.h b/telepathy-handler-application.h
index 617d9d9..204ee80 100644
--- a/telepathy-handler-application.h
+++ b/telepathy-handler-application.h
@@ -23,7 +23,7 @@
 
 #include <ktelepathy-export.h>
 
-namespace KTelepathy
+namespace KTp
 {
 
 /**
@@ -69,6 +69,6 @@ private:
     Q_PRIVATE_SLOT(d, void _k_onTimeout())
 };
 
-} // namespace KTelepathy
+} // namespace KTp
 
 #endif // TELEPATHY_HANDLER_APPLICATION_H
diff --git a/text-parser.cpp b/text-parser.cpp
index 6ed8165..dc4c57b 100644
--- a/text-parser.cpp
+++ b/text-parser.cpp
@@ -23,7 +23,7 @@
 
 #include <QtCore/QLatin1String>
 
-namespace KTelepathy
+namespace KTp
 {
 
 TextParser* TextParser::s_instance = NULL;
diff --git a/text-parser.h b/text-parser.h
index 0db01c1..4ea9fcf 100644
--- a/text-parser.h
+++ b/text-parser.h
@@ -28,7 +28,7 @@
 
 #include <ktelepathy-export.h>
 
-namespace KTelepathy
+namespace KTp
 {
 
 /**
diff --git a/wallet-interface.cpp b/wallet-interface.cpp
index 497926c..6e271fe 100644
--- a/wallet-interface.cpp
+++ b/wallet-interface.cpp
@@ -22,7 +22,7 @@
 
 #include <KDebug>
 
-using KTelepathy::WalletInterface;
+using KTp::WalletInterface;
 
 const QLatin1String WalletInterface::s_folderName = QLatin1String("telepathy-kde");
 const QLatin1String WalletInterface::s_mapsPrefix = QLatin1String("maps/");
diff --git a/wallet-interface.h b/wallet-interface.h
index a3e6d98..86dbdc1 100644
--- a/wallet-interface.h
+++ b/wallet-interface.h
@@ -29,7 +29,7 @@
 
 #include <ktelepathy-export.h>
 
-namespace KTelepathy
+namespace KTp
 {
 
 class KTELEPATHY_EXPORT WalletInterface
@@ -81,6 +81,6 @@ private:
 
 };
 
-} // namespace KTelepathy
+} // namespace KTp
 
 #endif // WALLETINTERFACE_H

-- 
ktp-common-internals packaging