[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:44 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=f4258b7
The following commit has been merged in the master branch:
commit f4258b75065343ff8eaaf20476654c0b9f2efdd6
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Wed Dec 21 18:24:07 2011 +0100
rename-fury: Rename macros
---
CMakeLists.txt | 4 ++--
KTp/CMakeLists.txt | 6 +++---
KTp/Models/CMakeLists.txt | 6 +++---
KTp/Models/accounts-filter-model.h | 2 +-
KTp/Models/accounts-model-item.h | 2 +-
KTp/Models/accounts-model.h | 2 +-
KTp/Models/contact-model-item.h | 2 +-
KTp/Models/groups-model-item.h | 2 +-
KTp/Models/groups-model.h | 2 +-
KTp/Models/proxy-tree-node.h | 2 +-
KTp/Models/tree-node.h | 2 +-
KTp/circular-countdown.h | 2 +-
KTp/error-dictionary.h | 4 ++--
KTp/global-presence.h | 2 +-
KTp/ktelepathy-export.h | 14 +++++++-------
KTp/presence.h | 2 +-
KTp/service-availability-checker.h | 2 +-
KTp/telepathy-handler-application.h | 2 +-
KTp/text-parser.h | 4 ++--
KTp/wallet-interface.h | 2 +-
20 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3250b4..84cbf77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,9 +5,9 @@ set (CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
-set (KTELEPATHY_VERSION "0.3.0")
+set (KTP_VERSION "0.3.0")
# Bump for every 0.x release, or whenever BC changes
-set (KTELEPATHY_SONUMBER 0)
+set (KTP_SONUMBER 0)
find_package (KDE4 REQUIRED)
find_package (TelepathyQt4 0.8.9 REQUIRED)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 0938730..32064fd 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -31,9 +31,9 @@ kde4_add_library (ktpcommoninternalsprivate SHARED
#Raise SOVERSION for every 0.x cycle
set_target_properties(ktpcommoninternalsprivate PROPERTIES
- VERSION ${KTELEPATHY_VERSION}
- SOVERSION ${KTELEPATHY_SONUMBER}
- DEFINE_SYMBOL MAKE_KTELEPATHY_LIB)
+ VERSION ${KTP_VERSION}
+ SOVERSION ${KTP_SONUMBER}
+ DEFINE_SYMBOL MAKE_KTP_LIB)
target_link_libraries (ktpcommoninternalsprivate
${KDE4_KDECORE_LIBS}
diff --git a/KTp/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
index c68ddcf..ed34e41 100644
--- a/KTp/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -31,9 +31,9 @@ kde4_add_library (ktpmodelsprivate SHARED
#Raise SOVERSION for every 0.x cycle
set_target_properties(ktpmodelsprivate PROPERTIES
- VERSION ${KTELEPATHY_VERSION}
- SOVERSION ${KTELEPATHY_SONUMBER}
- DEFINE_SYMBOL MAKE_KTELEPATHY_LIB)
+ VERSION ${KTP_VERSION}
+ SOVERSION ${KTP_SONUMBER}
+ DEFINE_SYMBOL MAKE_KTP_LIB)
target_link_libraries (ktpmodelsprivate
${KDE4_KDECORE_LIBS}
diff --git a/KTp/Models/accounts-filter-model.h b/KTp/Models/accounts-filter-model.h
index fb4a283..5ff181b 100644
--- a/KTp/Models/accounts-filter-model.h
+++ b/KTp/Models/accounts-filter-model.h
@@ -38,7 +38,7 @@ class ContactModelItem;
* By name
* By presence
*/
-class KTELEPATHY_EXPORT AccountsFilterModel : public QSortFilterProxyModel
+class KTP_EXPORT AccountsFilterModel : public QSortFilterProxyModel
{
Q_OBJECT
diff --git a/KTp/Models/accounts-model-item.h b/KTp/Models/accounts-model-item.h
index 64f676c..37b5120 100644
--- a/KTp/Models/accounts-model-item.h
+++ b/KTp/Models/accounts-model-item.h
@@ -33,7 +33,7 @@
#include <KTp/Models/tree-node.h>
-class KTELEPATHY_EXPORT AccountsModelItem : public TreeNode
+class KTP_EXPORT AccountsModelItem : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(AccountsModelItem)
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index 2628ba1..833e37c 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -35,7 +35,7 @@
class ContactModelItem;
class TreeNode;
-class KTELEPATHY_EXPORT AccountsModel : public QAbstractItemModel
+class KTP_EXPORT AccountsModel : public QAbstractItemModel
{
Q_OBJECT
Q_DISABLE_COPY(AccountsModel)
diff --git a/KTp/Models/contact-model-item.h b/KTp/Models/contact-model-item.h
index b04912b..ef90cc7 100644
--- a/KTp/Models/contact-model-item.h
+++ b/KTp/Models/contact-model-item.h
@@ -31,7 +31,7 @@
#include <KTp/Models/tree-node.h>
-class KTELEPATHY_EXPORT ContactModelItem : public TreeNode
+class KTP_EXPORT ContactModelItem : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(ContactModelItem)
diff --git a/KTp/Models/groups-model-item.h b/KTp/Models/groups-model-item.h
index 4dd8f7e..97870d0 100644
--- a/KTp/Models/groups-model-item.h
+++ b/KTp/Models/groups-model-item.h
@@ -36,7 +36,7 @@
class ContactModelItem;
class ProxyTreeNode;
-class KTELEPATHY_EXPORT GroupsModelItem : public TreeNode
+class KTP_EXPORT GroupsModelItem : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(GroupsModelItem)
diff --git a/KTp/Models/groups-model.h b/KTp/Models/groups-model.h
index 6955fd0..82495b0 100644
--- a/KTp/Models/groups-model.h
+++ b/KTp/Models/groups-model.h
@@ -38,7 +38,7 @@ class AccountsModel;
class ProxyTreeNode;
class TreeNode;
-class KTELEPATHY_EXPORT GroupsModel : public QAbstractItemModel
+class KTP_EXPORT GroupsModel : public QAbstractItemModel
{
Q_OBJECT
// Q_DISABLE_COPY(GroupsModel)const AccountsModel& am, QObject* parentconst AccontsModel& am, QObject* parent
diff --git a/KTp/Models/proxy-tree-node.h b/KTp/Models/proxy-tree-node.h
index f4e1901..27e82cb 100644
--- a/KTp/Models/proxy-tree-node.h
+++ b/KTp/Models/proxy-tree-node.h
@@ -29,7 +29,7 @@
#include <KTp/Models/tree-node.h>
class ContactModelItem;
-class KTELEPATHY_EXPORT ProxyTreeNode : public TreeNode
+class KTP_EXPORT ProxyTreeNode : public TreeNode
{
Q_OBJECT
Q_DISABLE_COPY(ProxyTreeNode)
diff --git a/KTp/Models/tree-node.h b/KTp/Models/tree-node.h
index fb51f7b..1276797 100644
--- a/KTp/Models/tree-node.h
+++ b/KTp/Models/tree-node.h
@@ -28,7 +28,7 @@
#include <KTp/ktelepathy-export.h>
-class KTELEPATHY_EXPORT TreeNode : public QObject
+class KTP_EXPORT TreeNode : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(TreeNode)
diff --git a/KTp/circular-countdown.h b/KTp/circular-countdown.h
index 94d9394..aff023b 100644
--- a/KTp/circular-countdown.h
+++ b/KTp/circular-countdown.h
@@ -27,7 +27,7 @@
namespace KTp
{
-class KTELEPATHY_EXPORT CircularCountdown : public QWidget
+class KTP_EXPORT CircularCountdown : public QWidget
{
Q_OBJECT
diff --git a/KTp/error-dictionary.h b/KTp/error-dictionary.h
index 8611f6a..2689659 100644
--- a/KTp/error-dictionary.h
+++ b/KTp/error-dictionary.h
@@ -30,10 +30,10 @@ namespace KTp
namespace ErrorDictionary
{
///Returns a verbose error message usable for displaying to the user
- KTELEPATHY_EXPORT QString displayVerboseErrorMessage(const QString& dbusErrorName);
+ KTP_EXPORT QString displayVerboseErrorMessage(const QString& dbusErrorName);
///Returns a short error message usable for little space
- KTELEPATHY_EXPORT QString displayShortErrorMessage(const QString& dbusErrorName);
+ KTP_EXPORT QString displayShortErrorMessage(const QString& dbusErrorName);
}
}
diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index 2e4de5c..d7d50f9 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -35,7 +35,7 @@ namespace KTp
* It shows the highest current available presence, indicates if any accounts are changing, and what they are changing to.
*/
-class KTELEPATHY_EXPORT GlobalPresence : public QObject
+class KTP_EXPORT GlobalPresence : public QObject
{
Q_OBJECT
public:
diff --git a/KTp/ktelepathy-export.h b/KTp/ktelepathy-export.h
index 22bb37e..e172dee 100644
--- a/KTp/ktelepathy-export.h
+++ b/KTp/ktelepathy-export.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KTELEPATHY_EXPORT_H
-#define KTELEPATHY_EXPORT_H
+#ifndef KTP_EXPORT_H
+#define KTP_EXPORT_H
/**
ile ktelepathy-export.h
rief Contains Macros for exporting symbols
@@ -29,15 +29,15 @@
#include <QtCore/QtGlobal>
-#ifndef KTELEPATHY_EXPORT
-# if defined(MAKE_KTELEPATHY_LIB)
+#ifndef KTP_EXPORT
+# if defined(MAKE_KTP_LIB)
/* We are building this library */
-# define KTELEPATHY_EXPORT Q_DECL_EXPORT
+# define KTP_EXPORT Q_DECL_EXPORT
# else
/* We are using this library */
-# define KTELEPATHY_EXPORT Q_DECL_IMPORT
+# define KTP_EXPORT Q_DECL_IMPORT
# endif
#endif
-#endif /*KTELEPATHY_EXPORT_H*/
+#endif /*KTP_EXPORT_H*/
diff --git a/KTp/presence.h b/KTp/presence.h
index 331f418..7a015fe 100644
--- a/KTp/presence.h
+++ b/KTp/presence.h
@@ -30,7 +30,7 @@
namespace KTp
{
-class KTELEPATHY_EXPORT Presence : public Tp::Presence
+class KTP_EXPORT Presence : public Tp::Presence
{
public:
Presence();
diff --git a/KTp/service-availability-checker.h b/KTp/service-availability-checker.h
index c62daed..51ed5a2 100644
--- a/KTp/service-availability-checker.h
+++ b/KTp/service-availability-checker.h
@@ -31,7 +31,7 @@ namespace KTp
* This class watches if a given d-bus service is either
* available on the bus or can be activated on demand.
*/
-class KTELEPATHY_EXPORT ServiceAvailabilityChecker : public QObject
+class KTP_EXPORT ServiceAvailabilityChecker : public QObject
{
Q_OBJECT
public:
diff --git a/KTp/telepathy-handler-application.h b/KTp/telepathy-handler-application.h
index dec49a9..49c2574 100644
--- a/KTp/telepathy-handler-application.h
+++ b/KTp/telepathy-handler-application.h
@@ -37,7 +37,7 @@ namespace KTp
* - Enables telepathy-qt4 warnings
* - Use Tp-Qt4 callback for redirecting debug output into KDebug
*/
-class KTELEPATHY_EXPORT TelepathyHandlerApplication : public KApplication
+class KTP_EXPORT TelepathyHandlerApplication : public KApplication
{
Q_OBJECT
diff --git a/KTp/text-parser.h b/KTp/text-parser.h
index 04082ed..01bfb34 100644
--- a/KTp/text-parser.h
+++ b/KTp/text-parser.h
@@ -37,7 +37,7 @@ namespace KTp
* @var QList urlRanges
* @var QStringList fixedUrls
*/
-struct KTELEPATHY_EXPORT TextUrlData
+struct KTP_EXPORT TextUrlData
{
QList<QPair<int, int> > urlRanges;
QStringList fixedUrls;
@@ -47,7 +47,7 @@ struct KTELEPATHY_EXPORT TextUrlData
* TextParser
*
*/
-class KTELEPATHY_EXPORT TextParser : public QObject
+class KTP_EXPORT TextParser : public QObject
{
public:
diff --git a/KTp/wallet-interface.h b/KTp/wallet-interface.h
index ea36193..49da46b 100644
--- a/KTp/wallet-interface.h
+++ b/KTp/wallet-interface.h
@@ -32,7 +32,7 @@
namespace KTp
{
-class KTELEPATHY_EXPORT WalletInterface
+class KTP_EXPORT WalletInterface
{
public:
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list