[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=0752822
The following commit has been merged in the master branch:
commit 07528224cea101a7d17d5e2d02763e17f58744e9
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Wed Dec 21 18:25:50 2011 +0100
rename-fury: Rename the export macro files
---
KTp/CMakeLists.txt | 2 +-
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 | 2 +-
KTp/global-presence.h | 2 +-
KTp/{ktelepathy-export.h => ktp-export.h} | 2 +-
KTp/presence.h | 2 +-
KTp/service-availability-checker.h | 2 +-
KTp/telepathy-handler-application.h | 2 +-
KTp/text-parser.h | 2 +-
KTp/wallet-interface.h | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 32064fd..8103375 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -22,7 +22,7 @@ set (telepathy_common_internals_private_HDRS
text-parser.h
wallet-interface.h
- ktelepathy-export.h
+ ktp-export.h
)
kde4_add_library (ktpcommoninternalsprivate SHARED
diff --git a/KTp/Models/accounts-filter-model.h b/KTp/Models/accounts-filter-model.h
index 5ff181b..36f8288 100644
--- a/KTp/Models/accounts-filter-model.h
+++ b/KTp/Models/accounts-filter-model.h
@@ -23,7 +23,7 @@
#include <QSortFilterProxyModel>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
class AccountsModelItem;
class ContactModelItem;
diff --git a/KTp/Models/accounts-model-item.h b/KTp/Models/accounts-model-item.h
index 37b5120..11554a9 100644
--- a/KTp/Models/accounts-model-item.h
+++ b/KTp/Models/accounts-model-item.h
@@ -29,7 +29,7 @@
#include <QtCore/QVariant> //needed for declare metatype
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
#include <KTp/Models/tree-node.h>
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index 833e37c..21c68af 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -30,7 +30,7 @@
#include <TelepathyQt/TextChannel>
#include <TelepathyQt/Types>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
class ContactModelItem;
class TreeNode;
diff --git a/KTp/Models/contact-model-item.h b/KTp/Models/contact-model-item.h
index ef90cc7..2bb845c 100644
--- a/KTp/Models/contact-model-item.h
+++ b/KTp/Models/contact-model-item.h
@@ -27,7 +27,7 @@
#include <QtCore/QVariant> //needed for declare metatype
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
#include <KTp/Models/tree-node.h>
diff --git a/KTp/Models/groups-model-item.h b/KTp/Models/groups-model-item.h
index 97870d0..26dcb00 100644
--- a/KTp/Models/groups-model-item.h
+++ b/KTp/Models/groups-model-item.h
@@ -31,7 +31,7 @@
#include <KTp/Models/tree-node.h>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
class ContactModelItem;
class ProxyTreeNode;
diff --git a/KTp/Models/groups-model.h b/KTp/Models/groups-model.h
index 82495b0..8f6d497 100644
--- a/KTp/Models/groups-model.h
+++ b/KTp/Models/groups-model.h
@@ -30,7 +30,7 @@
#include <TelepathyQt/TextChannel>
#include <TelepathyQt/Types>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
class ContactModelItem;
class GroupsModelItem;
diff --git a/KTp/Models/proxy-tree-node.h b/KTp/Models/proxy-tree-node.h
index 27e82cb..598bcd5 100644
--- a/KTp/Models/proxy-tree-node.h
+++ b/KTp/Models/proxy-tree-node.h
@@ -24,7 +24,7 @@
#include <QObject>
#include <QVariant>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
#include <KTp/Models/tree-node.h>
diff --git a/KTp/Models/tree-node.h b/KTp/Models/tree-node.h
index 1276797..0d13255 100644
--- a/KTp/Models/tree-node.h
+++ b/KTp/Models/tree-node.h
@@ -26,7 +26,7 @@
#include <QObject>
#include <QVariant>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
class KTP_EXPORT TreeNode : public QObject
{
diff --git a/KTp/circular-countdown.h b/KTp/circular-countdown.h
index aff023b..10be991 100644
--- a/KTp/circular-countdown.h
+++ b/KTp/circular-countdown.h
@@ -22,7 +22,7 @@
#include <QWidget>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
namespace KTp
{
diff --git a/KTp/error-dictionary.h b/KTp/error-dictionary.h
index 2689659..b92a43b 100644
--- a/KTp/error-dictionary.h
+++ b/KTp/error-dictionary.h
@@ -23,7 +23,7 @@
#include <QString>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
namespace KTp
{
diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index d7d50f9..01706b0 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -25,7 +25,7 @@
#include <TelepathyQt/AccountManager>
#include <TelepathyQt/AccountSet>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
#include "presence.h"
namespace KTp
diff --git a/KTp/ktelepathy-export.h b/KTp/ktp-export.h
similarity index 97%
rename from KTp/ktelepathy-export.h
rename to KTp/ktp-export.h
index e172dee..909c3ca 100644
--- a/KTp/ktelepathy-export.h
+++ b/KTp/ktp-export.h
@@ -21,7 +21,7 @@
#ifndef KTP_EXPORT_H
#define KTP_EXPORT_H
-/**
ile ktelepathy-export.h
+/**
ile ktp-export.h
rief Contains Macros for exporting symbols
This file contains macros needed for exporting/importing symbols
diff --git a/KTp/presence.h b/KTp/presence.h
index 7a015fe..07f3576 100644
--- a/KTp/presence.h
+++ b/KTp/presence.h
@@ -25,7 +25,7 @@
#include <KIcon>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
namespace KTp
{
diff --git a/KTp/service-availability-checker.h b/KTp/service-availability-checker.h
index 51ed5a2..67613ee 100644
--- a/KTp/service-availability-checker.h
+++ b/KTp/service-availability-checker.h
@@ -20,7 +20,7 @@
#include <QtCore/QObject>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
class QDBusPendingCallWatcher;
diff --git a/KTp/telepathy-handler-application.h b/KTp/telepathy-handler-application.h
index 49c2574..a020629 100644
--- a/KTp/telepathy-handler-application.h
+++ b/KTp/telepathy-handler-application.h
@@ -21,7 +21,7 @@
#include <KApplication>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
namespace KTp
{
diff --git a/KTp/text-parser.h b/KTp/text-parser.h
index 01bfb34..3de198a 100644
--- a/KTp/text-parser.h
+++ b/KTp/text-parser.h
@@ -26,7 +26,7 @@
#include <QPair>
#include <QStringList>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
namespace KTp
{
diff --git a/KTp/wallet-interface.h b/KTp/wallet-interface.h
index 49da46b..070ef3b 100644
--- a/KTp/wallet-interface.h
+++ b/KTp/wallet-interface.h
@@ -27,7 +27,7 @@
#include <QScopedPointer>
-#include <KTp/ktelepathy-export.h>
+#include <KTp/ktp-export.h>
namespace KTp
{
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list