[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:04:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=633dc86
The following commit has been merged in the master branch:
commit 633dc86dc4df2c2bc14b4ee20d8cc5df46cbaada
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Fri Nov 18 23:53:50 2011 +0100
Add KTelepathy namespace to base classes
---
circular-countdown.cpp | 5 +++++
circular-countdown.h | 5 +++++
error-dictionary.cpp | 5 +++++
error-dictionary.h | 5 ++++-
global-presence.cpp | 5 +++++
global-presence.h | 4 ++++
kpresence.cpp | 5 +++++
kpresence.h | 5 +++++
models/accounts-filter-model.cpp | 2 +-
models/contact-model-item.cpp | 2 +-
service-availability-checker.cpp | 5 +++++
service-availability-checker.h | 5 +++++
telepathy-handler-application.cpp | 4 ++--
telepathy-handler-application.h | 3 ++-
text-parser.cpp | 5 +++++
text-parser.h | 5 +++++
16 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/circular-countdown.cpp b/circular-countdown.cpp
index 9a05384..7f3c851 100644
--- a/circular-countdown.cpp
+++ b/circular-countdown.cpp
@@ -23,6 +23,9 @@
#include <QPaintEvent>
#include <QTimeLine>
+namespace KTelepathy
+{
+
class CircularCountdown::Private
{
public:
@@ -112,3 +115,5 @@ void CircularCountdown::pause() {
void CircularCountdown::resume() {
d->timeLine->resume();
}
+
+}
diff --git a/circular-countdown.h b/circular-countdown.h
index 039ce75..7a37cda 100644
--- a/circular-countdown.h
+++ b/circular-countdown.h
@@ -22,6 +22,9 @@
#include <QWidget>
+namespace KTelepathy
+{
+
class CircularCountdown : public QWidget
{
Q_OBJECT
@@ -52,4 +55,6 @@ private:
Private * const d;
};
+}
+
#endif // CIRCULARCOUNTDOWN_H
diff --git a/error-dictionary.cpp b/error-dictionary.cpp
index e3893e5..d503b87 100644
--- a/error-dictionary.cpp
+++ b/error-dictionary.cpp
@@ -28,6 +28,9 @@
#include <KLocale>
#include <KDebug>
+namespace KTelepathy
+{
+
QString ErrorDictionary::displayVerboseErrorMessage(const QString& dbusErrorName)
{
if (dbusErrorName == QLatin1String(TP_QT4_ERROR_ALREADY_CONNECTED)) {
@@ -243,3 +246,5 @@ QString ErrorDictionary::displayShortErrorMessage(const QString& dbusErrorName)
return i18nc("User visible error string", "Unknown error");
}
}
+
+}
diff --git a/error-dictionary.h b/error-dictionary.h
index 3444539..b1a97db 100644
--- a/error-dictionary.h
+++ b/error-dictionary.h
@@ -23,6 +23,8 @@
#include <QString>
+namespace KTelepathy
+{
namespace ErrorDictionary
{
///Returns a verbose error message usable for displaying to the user
@@ -30,6 +32,7 @@ namespace ErrorDictionary
///Returns a short error message usable for little space
QString displayShortErrorMessage(const QString& dbusErrorName);
-};
+}
+}
#endif // ERROR_DICTIONARY_H
diff --git a/global-presence.cpp b/global-presence.cpp
index 61f1457..8bb392b 100644
--- a/global-presence.cpp
+++ b/global-presence.cpp
@@ -27,6 +27,9 @@
#include <KDebug>
+namespace KTelepathy
+{
+
GlobalPresence::GlobalPresence(QObject *parent)
: QObject(parent),
m_requestedPresence(Tp::Presence::offline()),
@@ -164,4 +167,6 @@ Tp::AccountSetPtr GlobalPresence::onlineAccounts() const
return m_onlineAccounts;
}
+}
+
#include "global-presence.moc"
diff --git a/global-presence.h b/global-presence.h
index d782c3e..949eb63 100644
--- a/global-presence.h
+++ b/global-presence.h
@@ -25,6 +25,8 @@
#include <TelepathyQt4/AccountManager>
#include <TelepathyQt4/AccountSet>
+namespace KTelepathy
+{
/** This class handles the presence between all enabled accounts
* It shows the highest current available presence, indicates if any accounts are changing, and what they are changing to.
@@ -91,4 +93,6 @@ private:
bool m_changingPresence;
};
+}
+
#endif // GLOBALPRESENCE_H
diff --git a/kpresence.cpp b/kpresence.cpp
index 609ac24..beb8c99 100644
--- a/kpresence.cpp
+++ b/kpresence.cpp
@@ -21,6 +21,9 @@
#include "kpresence.h"
#include <KLocalizedString>
+namespace KTelepathy
+{
+
KPresence::KPresence() :
Tp::Presence()
{
@@ -107,3 +110,5 @@ int KPresence::sortPriority(const Tp::ConnectionPresenceType &type)
return -1;
}
+
+}
diff --git a/kpresence.h b/kpresence.h
index 81e702f..e558581 100644
--- a/kpresence.h
+++ b/kpresence.h
@@ -25,6 +25,9 @@
#include <KIcon>
+namespace KTelepathy
+{
+
class KPresence : public Tp::Presence
{
public:
@@ -41,4 +44,6 @@ public:
static int sortPriority(const Tp::ConnectionPresenceType &type);
};
+}
+
#endif // KPRESENCE_H
diff --git a/models/accounts-filter-model.cpp b/models/accounts-filter-model.cpp
index e7fa831..eaa0470 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 KPresence::sortPriority(leftPresence) < KPresence::sortPriority(rightPresence);
+ return KTelepathy::KPresence::sortPriority(leftPresence) < KTelepathy::KPresence::sortPriority(rightPresence);
}
} else {
return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
diff --git a/models/contact-model-item.cpp b/models/contact-model-item.cpp
index 21dec3a..40e4d9a 100644
--- a/models/contact-model-item.cpp
+++ b/models/contact-model-item.cpp
@@ -35,7 +35,7 @@
-K_GLOBAL_STATIC_WITH_ARGS(ServiceAvailabilityChecker, s_krfbAvailableChecker,
+K_GLOBAL_STATIC_WITH_ARGS(KTelepathy::ServiceAvailabilityChecker, s_krfbAvailableChecker,
(QLatin1String("org.freedesktop.Telepathy.Client.krfb_rfb_handler")));
diff --git a/service-availability-checker.cpp b/service-availability-checker.cpp
index 9b9e1d5..50a56b5 100644
--- a/service-availability-checker.cpp
+++ b/service-availability-checker.cpp
@@ -24,6 +24,9 @@
#include <KDebug>
+namespace KTelepathy
+{
+
struct ServiceAvailabilityChecker::Private
{
QString serviceName;
@@ -104,4 +107,6 @@ void ServiceAvailabilityChecker::onServiceOwnerChanged(const QString & service,
}
}
+}
+
#include "service-availability-checker.moc"
diff --git a/service-availability-checker.h b/service-availability-checker.h
index 8883fe6..ca43cc4 100644
--- a/service-availability-checker.h
+++ b/service-availability-checker.h
@@ -22,6 +22,9 @@
class QDBusPendingCallWatcher;
+namespace KTelepathy
+{
+
/**
* This class watches if a given d-bus service is either
* available on the bus or can be activated on demand.
@@ -47,4 +50,6 @@ private:
Private * const d;
};
+}
+
#endif // SERVICE_AVAILABILITY_CHECKER_H
diff --git a/telepathy-handler-application.cpp b/telepathy-handler-application.cpp
index ce28c26..6791096 100644
--- a/telepathy-handler-application.cpp
+++ b/telepathy-handler-application.cpp
@@ -29,8 +29,8 @@
extern bool kde_kdebug_enable_dbus_interface;
-namespace KTelepathy {
-
+namespace KTelepathy
+{
namespace {
int s_tpqt4DebugArea;
diff --git a/telepathy-handler-application.h b/telepathy-handler-application.h
index 455463d..d708ce3 100644
--- a/telepathy-handler-application.h
+++ b/telepathy-handler-application.h
@@ -22,7 +22,8 @@
#include <KApplication>
-namespace KTelepathy {
+namespace KTelepathy
+{
/**
* rief A KApplication that exits the application when there are no running jobs
diff --git a/text-parser.cpp b/text-parser.cpp
index 14beb13..6ed8165 100644
--- a/text-parser.cpp
+++ b/text-parser.cpp
@@ -23,6 +23,9 @@
#include <QtCore/QLatin1String>
+namespace KTelepathy
+{
+
TextParser* TextParser::s_instance = NULL;
/**
@@ -87,3 +90,5 @@ TextUrlData TextParser::extractUrlData(const QString& text, bool doUrlFixup)
TextParser::~TextParser()
{
}
+
+}
diff --git a/text-parser.h b/text-parser.h
index 7790b14..bd40a3f 100644
--- a/text-parser.h
+++ b/text-parser.h
@@ -26,6 +26,9 @@
#include <QPair>
#include <QStringList>
+namespace KTelepathy
+{
+
/**
* Usefull data container
*
@@ -85,4 +88,6 @@ private:
static TextParser *s_instance;
};
+}
+
#endif // TEXT_PARSER_H
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list