[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:59:15 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=ce94aaf
The following commit has been merged in the master branch:
commit ce94aaf5ebc78dfbeb8017509f0a2c1f54439499
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date: Mon Feb 21 15:19:54 2011 +0100
Replace KDE_EXPORT with KCM_TELEPATHY_ACCOUNTS_EXPORT.
Reviewed-by: George Kiagiadakis <kiagiadakis.george at gmail.com>
---
src/KCMTelepathyAccounts/CMakeLists.txt | 3 ++
.../abstract-account-parameters-widget.h | 4 +--
.../abstract-account-ui-plugin.h | 4 +--
src/KCMTelepathyAccounts/abstract-account-ui.h | 4 +--
src/KCMTelepathyAccounts/account-edit-widget.h | 4 +--
.../generic-advanced-options-widget.h | 4 +--
.../kcm_telepathy_accounts_export.h | 40 ++++++++++++++++++++++
src/KCMTelepathyAccounts/parameter-edit-model.h | 4 +--
src/KCMTelepathyAccounts/parameter-edit-widget.h | 4 +--
src/KCMTelepathyAccounts/plugin-manager.h | 4 +--
src/KCMTelepathyAccounts/profile-item.h | 4 +--
src/KCMTelepathyAccounts/profile-select-widget.h | 4 +--
src/KCMTelepathyAccounts/unsigned-integer-edit.h | 4 +--
src/edit-account-dialog.h | 4 +--
14 files changed, 66 insertions(+), 25 deletions(-)
diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
index 5138922..67d83df 100644
--- a/src/KCMTelepathyAccounts/CMakeLists.txt
+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
@@ -4,6 +4,8 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
+add_definitions (-DMAKE_KCM_TELEPATHY_ACCOUNTS_LIB)
+
set (libkcmtelepathyaccounts_SRCS
abstract-account-ui-plugin.cpp
abstract-account-ui.cpp
@@ -86,6 +88,7 @@ install (TARGETS kcmtelepathyaccounts
install (FILES
${libkcmtelepathyaccounts_HDRS}
${libkcmtelepathyaccounts_PRETTY_HDRS}
+ kcm_telepathy_accounts_export.h
DESTINATION ${INCLUDE_INSTALL_DIR}/KCMTelepathyAccounts COMPONENT Devel
)
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
index 1e2d5b6..a357757 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
@@ -23,7 +23,7 @@
#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_PARAMETERS_WIDGET_H
#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_PARAMETERS_WIDGET_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QtCore/QMap>
#include <QtCore/QVariant>
@@ -36,7 +36,7 @@ class ParameterEditModel;
typedef QMap<Tp::ProtocolParameter, QWidget*> ParametersWidgetsMap;
-class KDE_EXPORT AbstractAccountParametersWidget : public QWidget
+class KCM_TELEPATHY_ACCOUNTS_EXPORT AbstractAccountParametersWidget : public QWidget
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
index ee095f2..67c68c0 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
+++ b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
@@ -21,7 +21,7 @@
#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_PLUGIN_H
#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_PLUGIN_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QtCore/QMap>
#include <QtCore/QObject>
@@ -29,7 +29,7 @@
class AbstractAccountUi;
-class KDE_EXPORT AbstractAccountUiPlugin : public QObject
+class KCM_TELEPATHY_ACCOUNTS_EXPORT AbstractAccountUiPlugin : public QObject
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui.h b/src/KCMTelepathyAccounts/abstract-account-ui.h
index c158ea5..3641442 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui.h
+++ b/src/KCMTelepathyAccounts/abstract-account-ui.h
@@ -21,7 +21,7 @@
#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_H
#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QtCore/QList>
#include <QtCore/QMap>
@@ -33,7 +33,7 @@
class AbstractAccountParametersWidget;
class ParameterEditModel;
-class KDE_EXPORT AbstractAccountUi : public QObject
+class KCM_TELEPATHY_ACCOUNTS_EXPORT AbstractAccountUi : public QObject
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index e365195..8e0c7ea 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -22,7 +22,7 @@
#ifndef KCM_TELEPATHY_ACCOUNTS_ACCOUNT_EDIT_WIDGET_H
#define KCM_TELEPATHY_ACCOUNTS_ACCOUNT_EDIT_WIDGET_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QWidget>
@@ -30,7 +30,7 @@
#include "parameter-edit-model.h"
-class KDE_EXPORT AccountEditWidget : public QWidget
+class KCM_TELEPATHY_ACCOUNTS_EXPORT AccountEditWidget : public QWidget
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.h b/src/KCMTelepathyAccounts/generic-advanced-options-widget.h
index b1bca8a..08d6a1c 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.h
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.h
@@ -21,11 +21,11 @@
#ifndef KCMTELEPATHYACCOUNTS_GENERIC_ADVANCED_OPTIONS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_GENERIC_ADVANCED_OPTIONS_WIDGET_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include "abstract-account-parameters-widget.h"
-class KDE_EXPORT GenericAdvancedOptionsWidget : public AbstractAccountParametersWidget
+class KCM_TELEPATHY_ACCOUNTS_EXPORT GenericAdvancedOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h b/src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h
new file mode 100644
index 0000000..a495e74
--- /dev/null
+++ b/src/KCMTelepathyAccounts/kcm_telepathy_accounts_export.h
@@ -0,0 +1,40 @@
+/* This file is part of the KDE project
+ 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 KCM_TELEPATHY_ACCOUNTS_EXPORT_H
+#define KCM_TELEPATHY_ACCOUNTS_EXPORT_H
+
+/* needed for KCM_TELEPATHY_ACCOUNTS_EXPORT and KDE_IMPORT macros */
+#include <kdemacros.h>
+
+#ifndef KCM_TELEPATHY_ACCOUNTS_EXPORT
+# if defined(MAKE_KCM_TELEPATHY_ACCOUNTS_LIB_LIB)
+ /* We are building this library */
+# define KCM_TELEPATHY_ACCOUNTS_EXPORT KCM_TELEPATHY_ACCOUNTS_EXPORT
+# else
+ /* We are using this library */
+# define KCM_TELEPATHY_ACCOUNTS_EXPORT KDE_IMPORT
+# endif
+#endif
+
+# ifndef KCM_TELEPATHY_ACCOUNTS_EXPORT_DEPRECATED
+# define KCM_TELEPATHY_ACCOUNTS_EXPORT_DEPRECATED KDE_DEPRECATED KCM_TELEPATHY_ACCOUNTS_EXPORT
+# endif
+
+#endif
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index 145fc22..ecd04e7 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -23,7 +23,7 @@
#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_MODEL_H
#define LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_MODEL_H
-#include "kdemacros.h"
+#include "kcm_telepathy_accounts_export.h"
#include <QtCore/QAbstractListModel>
@@ -37,7 +37,7 @@ namespace Tp {
class Parameter;
}
-class KDE_EXPORT ParameterEditModel : public QAbstractListModel
+class KCM_TELEPATHY_ACCOUNTS_EXPORT ParameterEditModel : public QAbstractListModel
{
Q_OBJECT
Q_DISABLE_COPY(ParameterEditModel);
diff --git a/src/KCMTelepathyAccounts/parameter-edit-widget.h b/src/KCMTelepathyAccounts/parameter-edit-widget.h
index 4e48478..e86dff4 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-widget.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-widget.h
@@ -24,11 +24,11 @@
#include <KCMTelepathyAccounts/abstract-account-parameters-widget.h>
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <TelepathyQt4/ConnectionManager>
-class KDE_EXPORT ParameterEditWidget : public AbstractAccountParametersWidget
+class KCM_TELEPATHY_ACCOUNTS_EXPORT ParameterEditWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/plugin-manager.h b/src/KCMTelepathyAccounts/plugin-manager.h
index 6ac4df6..dd8df10 100644
--- a/src/KCMTelepathyAccounts/plugin-manager.h
+++ b/src/KCMTelepathyAccounts/plugin-manager.h
@@ -21,7 +21,7 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_PLUGIN_MANAGER_H
#define TELEPATHY_ACCOUNTS_KCM_PLUGIN_MANAGER_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QtCore/QList>
#include <QtCore/QObject>
@@ -29,7 +29,7 @@
class AbstractAccountUi;
class AbstractAccountUiPlugin;
-class KDE_EXPORT PluginManager : public QObject
+class KCM_TELEPATHY_ACCOUNTS_EXPORT PluginManager : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(PluginManager)
diff --git a/src/KCMTelepathyAccounts/profile-item.h b/src/KCMTelepathyAccounts/profile-item.h
index 41a030f..853c9ff 100644
--- a/src/KCMTelepathyAccounts/profile-item.h
+++ b/src/KCMTelepathyAccounts/profile-item.h
@@ -22,7 +22,7 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_PROTOCOL_ITEM_H
#define TELEPATHY_ACCOUNTS_KCM_PROTOCOL_ITEM_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QtCore/QObject>
@@ -31,7 +31,7 @@
class ProfileListModel;
class KIcon;
-class KDE_EXPORT ProfileItem : public QObject
+class KCM_TELEPATHY_ACCOUNTS_EXPORT ProfileItem : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(ProfileItem);
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.h b/src/KCMTelepathyAccounts/profile-select-widget.h
index 3f741f0..4bb92a1 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.h
+++ b/src/KCMTelepathyAccounts/profile-select-widget.h
@@ -22,7 +22,7 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_PROFILE_SELECT_WIDGET_H
#define TELEPATHY_ACCOUNTS_KCM_PROFILE_SELECT_WIDGET_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QtGui/QWidget>
@@ -35,7 +35,7 @@ class QItemSelection;
class QModelIndex;
-class KDE_EXPORT ProfileSelectWidget : public QWidget
+class KCM_TELEPATHY_ACCOUNTS_EXPORT ProfileSelectWidget : public QWidget
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/unsigned-integer-edit.h b/src/KCMTelepathyAccounts/unsigned-integer-edit.h
index 6ccf16c..c4c7538 100644
--- a/src/KCMTelepathyAccounts/unsigned-integer-edit.h
+++ b/src/KCMTelepathyAccounts/unsigned-integer-edit.h
@@ -21,13 +21,13 @@
#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_UNSIGNED_INTEGER_EDIT_H
#define LIB_KCM_TELEPATHY_ACCOUNTS_UNSIGNED_INTEGER_EDIT_H
-#include <kdemacros.h>
+#include "kcm_telepathy_accounts_export.h"
#include <QtCore/QPair>
#include <QtGui/QLineEdit>
#include <QtGui/QValidator>
-class KDE_EXPORT UnsignedIntegerEdit : public QLineEdit
+class KCM_TELEPATHY_ACCOUNTS_EXPORT UnsignedIntegerEdit : public QLineEdit
{
Q_OBJECT
diff --git a/src/edit-account-dialog.h b/src/edit-account-dialog.h
index a5c0270..35db803 100644
--- a/src/edit-account-dialog.h
+++ b/src/edit-account-dialog.h
@@ -23,11 +23,9 @@
#include "account-item.h"
-#include <kdemacros.h>
-
#include <KDialog>
-class KDE_EXPORT EditAccountDialog : public KDialog
+class EditAccountDialog : public KDialog
{
Q_OBJECT
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list