[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=d01ba7a
The following commit has been merged in the master branch:
commit d01ba7ac0d4b337b725b51a863851e30d52b2b5e
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Sat Nov 19 00:04:33 2011 +0100
Export the classes
---
circular-countdown.h | 4 +++-
error-dictionary.h | 6 ++++--
global-presence.h | 4 +++-
kpresence.h | 4 +++-
models/accounts-filter-model.h | 4 +++-
models/accounts-model-item.h | 4 +++-
models/accounts-model.h | 5 +++--
models/contact-model-item.h | 4 +++-
models/groups-model.cpp | 1 +
models/groups-model.h | 4 +++-
models/proxy-tree-node.h | 5 ++++-
models/tree-node.h | 4 +++-
service-availability-checker.h | 4 +++-
telepathy-handler-application.h | 3 ++-
text-parser.h | 6 ++++--
wallet-interface.h | 4 +++-
16 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/circular-countdown.h b/circular-countdown.h
index 7a37cda..3c80f65 100644
--- a/circular-countdown.h
+++ b/circular-countdown.h
@@ -22,10 +22,12 @@
#include <QWidget>
+#include <kdemacros.h>
+
namespace KTelepathy
{
-class CircularCountdown : public QWidget
+class KDE_EXPORT CircularCountdown : public QWidget
{
Q_OBJECT
diff --git a/error-dictionary.h b/error-dictionary.h
index b1a97db..a4971d2 100644
--- a/error-dictionary.h
+++ b/error-dictionary.h
@@ -23,15 +23,17 @@
#include <QString>
+#include <kdemacros.h>
+
namespace KTelepathy
{
namespace ErrorDictionary
{
///Returns a verbose error message usable for displaying to the user
- QString displayVerboseErrorMessage(const QString& dbusErrorName);
+ KDE_EXPORT QString displayVerboseErrorMessage(const QString& dbusErrorName);
///Returns a short error message usable for little space
- QString displayShortErrorMessage(const QString& dbusErrorName);
+ KDE_EXPORT QString displayShortErrorMessage(const QString& dbusErrorName);
}
}
diff --git a/global-presence.h b/global-presence.h
index 949eb63..ae8f39a 100644
--- a/global-presence.h
+++ b/global-presence.h
@@ -25,6 +25,8 @@
#include <TelepathyQt4/AccountManager>
#include <TelepathyQt4/AccountSet>
+#include <kdemacros.h>
+
namespace KTelepathy
{
@@ -32,7 +34,7 @@ namespace KTelepathy
* It shows the highest current available presence, indicates if any accounts are changing, and what they are changing to.
*/
-class GlobalPresence : public QObject
+class KDE_EXPORT GlobalPresence : public QObject
{
Q_OBJECT
public:
diff --git a/kpresence.h b/kpresence.h
index e558581..89f8a9d 100644
--- a/kpresence.h
+++ b/kpresence.h
@@ -25,10 +25,12 @@
#include <KIcon>
+#include <kdemacros.h>
+
namespace KTelepathy
{
-class KPresence : public Tp::Presence
+class KDE_EXPORT KPresence : public Tp::Presence
{
public:
KPresence();
diff --git a/models/accounts-filter-model.h b/models/accounts-filter-model.h
index 3a42be7..cc20a89 100644
--- a/models/accounts-filter-model.h
+++ b/models/accounts-filter-model.h
@@ -23,6 +23,8 @@
#include <QSortFilterProxyModel>
+#include <kdemacros.h>
+
class AccountsModelItem;
class ContactModelItem;
@@ -36,7 +38,7 @@ class ContactModelItem;
* By name
* By presence
*/
-class AccountsFilterModel : public QSortFilterProxyModel
+class KDE_EXPORT AccountsFilterModel : public QSortFilterProxyModel
{
Q_OBJECT
diff --git a/models/accounts-model-item.h b/models/accounts-model-item.h
index e3748b7..0d9f0e8 100644
--- a/models/accounts-model-item.h
+++ b/models/accounts-model-item.h
@@ -29,9 +29,11 @@
#include <QtCore/QVariant> //needed for declare metatype
+#include <kdemacros.h>
+
#include "tree-node.h"
-class AccountsModelItem : public TreeNode
+class KDE_EXPORT AccountsModelItem : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(AccountsModelItem)
diff --git a/models/accounts-model.h b/models/accounts-model.h
index 825f113..788c8f2 100644
--- a/models/accounts-model.h
+++ b/models/accounts-model.h
@@ -30,11 +30,12 @@
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Types>
-#include "accounts-model-item.h"
+#include <kdemacros.h>
class ContactModelItem;
+class TreeNode;
-class AccountsModel : public QAbstractItemModel
+class KDE_EXPORT AccountsModel : public QAbstractItemModel
{
Q_OBJECT
Q_DISABLE_COPY(AccountsModel)
diff --git a/models/contact-model-item.h b/models/contact-model-item.h
index c69d12f..2b011ef 100644
--- a/models/contact-model-item.h
+++ b/models/contact-model-item.h
@@ -27,9 +27,11 @@
#include <QtCore/QVariant> //needed for declare metatype
+#include <kdemacros.h>
+
#include "tree-node.h"
-class ContactModelItem : public TreeNode
+class KDE_EXPORT ContactModelItem : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(ContactModelItem)
diff --git a/models/groups-model.cpp b/models/groups-model.cpp
index e73cbeb..a0dd683 100644
--- a/models/groups-model.cpp
+++ b/models/groups-model.cpp
@@ -26,6 +26,7 @@
#include <TelepathyQt4/Contact>
#include <TelepathyQt4/PendingReady>
+#include "accounts-model-item.h"
#include "groups-model-item.h"
#include "proxy-tree-node.h"
#include "accounts-model.h"
diff --git a/models/groups-model.h b/models/groups-model.h
index ef9b28e..3167bce 100644
--- a/models/groups-model.h
+++ b/models/groups-model.h
@@ -30,13 +30,15 @@
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Types>
+#include <kdemacros.h>
+
class ContactModelItem;
class GroupsModelItem;
class AccountsModel;
class ProxyTreeNode;
class TreeNode;
-class GroupsModel : public QAbstractItemModel
+class KDE_EXPORT GroupsModel : public QAbstractItemModel
{
Q_OBJECT
// Q_DISABLE_COPY(GroupsModel)const AccountsModel& am, QObject* parentconst AccontsModel& am, QObject* parent
diff --git a/models/proxy-tree-node.h b/models/proxy-tree-node.h
index ae123d1..7b15a62 100644
--- a/models/proxy-tree-node.h
+++ b/models/proxy-tree-node.h
@@ -23,10 +23,13 @@
#include <QObject>
#include <QVariant>
+
+#include <kdemacros.h>
+
#include "tree-node.h"
class ContactModelItem;
-class ProxyTreeNode : public TreeNode
+class KDE_EXPORT ProxyTreeNode : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(ProxyTreeNode)
diff --git a/models/tree-node.h b/models/tree-node.h
index 9f675ab..cf80964 100644
--- a/models/tree-node.h
+++ b/models/tree-node.h
@@ -26,7 +26,9 @@
#include <QObject>
#include <QVariant>
-class TreeNode : public QObject
+#include <kdemacros.h>
+
+class KDE_EXPORT TreeNode : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(TreeNode)
diff --git a/service-availability-checker.h b/service-availability-checker.h
index ca43cc4..8434431 100644
--- a/service-availability-checker.h
+++ b/service-availability-checker.h
@@ -20,6 +20,8 @@
#include <QtCore/QObject>
+#include <kdemacros.h>
+
class QDBusPendingCallWatcher;
namespace KTelepathy
@@ -29,7 +31,7 @@ namespace KTelepathy
* This class watches if a given d-bus service is either
* available on the bus or can be activated on demand.
*/
-class ServiceAvailabilityChecker : public QObject
+class KDE_EXPORT ServiceAvailabilityChecker : public QObject
{
Q_OBJECT
public:
diff --git a/telepathy-handler-application.h b/telepathy-handler-application.h
index d708ce3..03bc972 100644
--- a/telepathy-handler-application.h
+++ b/telepathy-handler-application.h
@@ -21,6 +21,7 @@
#include <KApplication>
+#include <kdemacros.h>
namespace KTelepathy
{
@@ -36,7 +37,7 @@ namespace KTelepathy
* - Enables telepathy-qt4 warnings
* - Use Tp-Qt4 callback for redirecting debug output into KDebug
*/
-class TelepathyHandlerApplication : public KApplication
+class KDE_EXPORT TelepathyHandlerApplication : public KApplication
{
Q_OBJECT
diff --git a/text-parser.h b/text-parser.h
index bd40a3f..7f8d8e5 100644
--- a/text-parser.h
+++ b/text-parser.h
@@ -26,6 +26,8 @@
#include <QPair>
#include <QStringList>
+#include <kdemacros.h>
+
namespace KTelepathy
{
@@ -35,7 +37,7 @@ namespace KTelepathy
* @var QList urlRanges
* @var QStringList fixedUrls
*/
-struct TextUrlData
+struct KDE_EXPORT TextUrlData
{
QList<QPair<int, int> > urlRanges;
QStringList fixedUrls;
@@ -45,7 +47,7 @@ struct TextUrlData
* TextParser
*
*/
-class TextParser : public QObject
+class KDE_EXPORT TextParser : public QObject
{
public:
diff --git a/wallet-interface.h b/wallet-interface.h
index 629dbe1..1d0d743 100644
--- a/wallet-interface.h
+++ b/wallet-interface.h
@@ -27,10 +27,12 @@
#include <QScopedPointer>
+#include <kdemacros.h>
+
namespace KTelepathy
{
-class WalletInterface
+class KDE_EXPORT WalletInterface
{
public:
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list