[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=3cea62f
The following commit has been merged in the master branch:
commit 3cea62fe74648d72e22d4ace3bd62a8eb79a185f
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Mon Nov 21 18:35:06 2011 +0100
Add our own export rules
---
CMakeLists.txt | 2 +-
circular-countdown.h | 4 ++--
error-dictionary.h | 6 +++---
global-presence.h | 4 ++--
ktelepathy-export.h | 43 +++++++++++++++++++++++++++++++++++++++++
models/CMakeLists.txt | 2 +-
models/accounts-filter-model.h | 4 ++--
models/accounts-model-item.h | 4 ++--
models/accounts-model.h | 4 ++--
models/contact-model-item.h | 4 ++--
models/groups-model.h | 4 ++--
models/proxy-tree-node.h | 4 ++--
models/tree-node.h | 4 ++--
presence.h | 4 ++--
service-availability-checker.h | 4 ++--
telepathy-handler-application.h | 4 ++--
text-parser.h | 6 +++---
wallet-interface.h | 4 ++--
18 files changed, 77 insertions(+), 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4358ef..fab29e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ kde4_add_library (telepathykdecommoninternalsprivate SHARED
set_target_properties(telepathykdecommoninternalsprivate PROPERTIES
VERSION ${KTELEPATHY_VERSION}
SOVERSION ${KTELEPATHY_SONUMBER}
- )
+ DEFINE_SYMBOL MAKE_KTELEPATHY_LIB)
target_link_libraries (telepathykdecommoninternalsprivate
${KDE4_KDECORE_LIBS}
diff --git a/circular-countdown.h b/circular-countdown.h
index 3c80f65..5d57fca 100644
--- a/circular-countdown.h
+++ b/circular-countdown.h
@@ -22,12 +22,12 @@
#include <QWidget>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
namespace KTelepathy
{
-class KDE_EXPORT CircularCountdown : public QWidget
+class KTELEPATHY_EXPORT CircularCountdown : public QWidget
{
Q_OBJECT
diff --git a/error-dictionary.h b/error-dictionary.h
index a4971d2..373cd90 100644
--- a/error-dictionary.h
+++ b/error-dictionary.h
@@ -23,17 +23,17 @@
#include <QString>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
namespace KTelepathy
{
namespace ErrorDictionary
{
///Returns a verbose error message usable for displaying to the user
- KDE_EXPORT QString displayVerboseErrorMessage(const QString& dbusErrorName);
+ KTELEPATHY_EXPORT QString displayVerboseErrorMessage(const QString& dbusErrorName);
///Returns a short error message usable for little space
- KDE_EXPORT QString displayShortErrorMessage(const QString& dbusErrorName);
+ KTELEPATHY_EXPORT QString displayShortErrorMessage(const QString& dbusErrorName);
}
}
diff --git a/global-presence.h b/global-presence.h
index ae8f39a..01e06db 100644
--- a/global-presence.h
+++ b/global-presence.h
@@ -25,7 +25,7 @@
#include <TelepathyQt4/AccountManager>
#include <TelepathyQt4/AccountSet>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
namespace KTelepathy
{
@@ -34,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 KDE_EXPORT GlobalPresence : public QObject
+class KTELEPATHY_EXPORT GlobalPresence : public QObject
{
Q_OBJECT
public:
diff --git a/ktelepathy-export.h b/ktelepathy-export.h
new file mode 100644
index 0000000..22bb37e
--- /dev/null
+++ b/ktelepathy-export.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 Dario Freddi <drf at kde.org>
+ * Copyright (C) 2007 David Faure <faure at kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KTELEPATHY_EXPORT_H
+#define KTELEPATHY_EXPORT_H
+
+/**
ile ktelepathy-export.h
+ rief Contains Macros for exporting symbols
+
+ This file contains macros needed for exporting/importing symbols
+*/
+
+#include <QtCore/QtGlobal>
+
+#ifndef KTELEPATHY_EXPORT
+# if defined(MAKE_KTELEPATHY_LIB)
+/* We are building this library */
+# define KTELEPATHY_EXPORT Q_DECL_EXPORT
+# else
+/* We are using this library */
+# define KTELEPATHY_EXPORT Q_DECL_IMPORT
+# endif
+#endif
+
+#endif /*KTELEPATHY_EXPORT_H*/
+
diff --git a/models/CMakeLists.txt b/models/CMakeLists.txt
index 94bf8cd..f4aa2df 100644
--- a/models/CMakeLists.txt
+++ b/models/CMakeLists.txt
@@ -33,7 +33,7 @@ kde4_add_library (telepathykdemodelsprivate SHARED
set_target_properties(telepathykdemodelsprivate PROPERTIES
VERSION ${KTELEPATHY_VERSION}
SOVERSION ${KTELEPATHY_SONUMBER}
- )
+ DEFINE_SYMBOL MAKE_KTELEPATHY_LIB)
target_link_libraries (telepathykdemodelsprivate
${KDE4_KDECORE_LIBS}
diff --git a/models/accounts-filter-model.h b/models/accounts-filter-model.h
index cc20a89..d100ef2 100644
--- a/models/accounts-filter-model.h
+++ b/models/accounts-filter-model.h
@@ -23,7 +23,7 @@
#include <QSortFilterProxyModel>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
class AccountsModelItem;
class ContactModelItem;
@@ -38,7 +38,7 @@ class ContactModelItem;
* By name
* By presence
*/
-class KDE_EXPORT AccountsFilterModel : public QSortFilterProxyModel
+class KTELEPATHY_EXPORT AccountsFilterModel : public QSortFilterProxyModel
{
Q_OBJECT
diff --git a/models/accounts-model-item.h b/models/accounts-model-item.h
index 0d9f0e8..28f0463 100644
--- a/models/accounts-model-item.h
+++ b/models/accounts-model-item.h
@@ -29,11 +29,11 @@
#include <QtCore/QVariant> //needed for declare metatype
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
#include "tree-node.h"
-class KDE_EXPORT AccountsModelItem : public TreeNode
+class KTELEPATHY_EXPORT AccountsModelItem : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(AccountsModelItem)
diff --git a/models/accounts-model.h b/models/accounts-model.h
index 788c8f2..dbc9c22 100644
--- a/models/accounts-model.h
+++ b/models/accounts-model.h
@@ -30,12 +30,12 @@
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Types>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
class ContactModelItem;
class TreeNode;
-class KDE_EXPORT AccountsModel : public QAbstractItemModel
+class KTELEPATHY_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 2b011ef..884324e 100644
--- a/models/contact-model-item.h
+++ b/models/contact-model-item.h
@@ -27,11 +27,11 @@
#include <QtCore/QVariant> //needed for declare metatype
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
#include "tree-node.h"
-class KDE_EXPORT ContactModelItem : public TreeNode
+class KTELEPATHY_EXPORT ContactModelItem : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(ContactModelItem)
diff --git a/models/groups-model.h b/models/groups-model.h
index 3167bce..620acbd 100644
--- a/models/groups-model.h
+++ b/models/groups-model.h
@@ -30,7 +30,7 @@
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Types>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
class ContactModelItem;
class GroupsModelItem;
@@ -38,7 +38,7 @@ class AccountsModel;
class ProxyTreeNode;
class TreeNode;
-class KDE_EXPORT GroupsModel : public QAbstractItemModel
+class KTELEPATHY_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 7b15a62..528a473 100644
--- a/models/proxy-tree-node.h
+++ b/models/proxy-tree-node.h
@@ -24,12 +24,12 @@
#include <QObject>
#include <QVariant>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
#include "tree-node.h"
class ContactModelItem;
-class KDE_EXPORT ProxyTreeNode : public TreeNode
+class KTELEPATHY_EXPORT ProxyTreeNode : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(ProxyTreeNode)
diff --git a/models/tree-node.h b/models/tree-node.h
index cf80964..27faa01 100644
--- a/models/tree-node.h
+++ b/models/tree-node.h
@@ -26,9 +26,9 @@
#include <QObject>
#include <QVariant>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
-class KDE_EXPORT TreeNode : public QObject
+class KTELEPATHY_EXPORT TreeNode : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(TreeNode)
diff --git a/presence.h b/presence.h
index d74e76d..0e6ec42 100644
--- a/presence.h
+++ b/presence.h
@@ -25,12 +25,12 @@
#include <KIcon>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
namespace KTelepathy
{
-class KDE_EXPORT Presence : public Tp::Presence
+class KTELEPATHY_EXPORT Presence : public Tp::Presence
{
public:
Presence();
diff --git a/service-availability-checker.h b/service-availability-checker.h
index 8434431..2a9101e 100644
--- a/service-availability-checker.h
+++ b/service-availability-checker.h
@@ -20,7 +20,7 @@
#include <QtCore/QObject>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
class QDBusPendingCallWatcher;
@@ -31,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 KDE_EXPORT ServiceAvailabilityChecker : public QObject
+class KTELEPATHY_EXPORT ServiceAvailabilityChecker : public QObject
{
Q_OBJECT
public:
diff --git a/telepathy-handler-application.h b/telepathy-handler-application.h
index 03bc972..617d9d9 100644
--- a/telepathy-handler-application.h
+++ b/telepathy-handler-application.h
@@ -21,7 +21,7 @@
#include <KApplication>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
namespace KTelepathy
{
@@ -37,7 +37,7 @@ namespace KTelepathy
* - Enables telepathy-qt4 warnings
* - Use Tp-Qt4 callback for redirecting debug output into KDebug
*/
-class KDE_EXPORT TelepathyHandlerApplication : public KApplication
+class KTELEPATHY_EXPORT TelepathyHandlerApplication : public KApplication
{
Q_OBJECT
diff --git a/text-parser.h b/text-parser.h
index 7f8d8e5..0db01c1 100644
--- a/text-parser.h
+++ b/text-parser.h
@@ -26,7 +26,7 @@
#include <QPair>
#include <QStringList>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
namespace KTelepathy
{
@@ -37,7 +37,7 @@ namespace KTelepathy
* @var QList urlRanges
* @var QStringList fixedUrls
*/
-struct KDE_EXPORT TextUrlData
+struct KTELEPATHY_EXPORT TextUrlData
{
QList<QPair<int, int> > urlRanges;
QStringList fixedUrls;
@@ -47,7 +47,7 @@ struct KDE_EXPORT TextUrlData
* TextParser
*
*/
-class KDE_EXPORT TextParser : public QObject
+class KTELEPATHY_EXPORT TextParser : public QObject
{
public:
diff --git a/wallet-interface.h b/wallet-interface.h
index 1d0d743..a3e6d98 100644
--- a/wallet-interface.h
+++ b/wallet-interface.h
@@ -27,12 +27,12 @@
#include <QScopedPointer>
-#include <kdemacros.h>
+#include <ktelepathy-export.h>
namespace KTelepathy
{
-class KDE_EXPORT WalletInterface
+class KTELEPATHY_EXPORT WalletInterface
{
public:
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list