[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=ca094e2

The following commit has been merged in the master branch:
commit ca094e2625a85e36b851d0290db32fdf09f4ca9d
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jul 20 18:21:36 2015 +0200

    Remove obsolete PluginMacros
---
 plugins/sunshine/sunshine-account-ui-plugin.cpp |  2 --
 src/KCMTelepathyAccounts/CMakeLists.txt         |  2 --
 src/KCMTelepathyAccounts/PluginMacros           |  7 ------
 src/KCMTelepathyAccounts/plugin-macros.h        | 31 -------------------------
 4 files changed, 42 deletions(-)

diff --git a/plugins/sunshine/sunshine-account-ui-plugin.cpp b/plugins/sunshine/sunshine-account-ui-plugin.cpp
index d4db25b..4c85fc5 100644
--- a/plugins/sunshine/sunshine-account-ui-plugin.cpp
+++ b/plugins/sunshine/sunshine-account-ui-plugin.cpp
@@ -21,8 +21,6 @@
 #include "sunshine-account-ui-plugin.h"
 #include "sunshine-account-ui.h"
 
-#include <KCMTelepathyAccounts/PluginMacros>
-
 #include <KPluginFactory>
 
 #include <QtCore/QVariantList>
diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
index 8b894a4..1fe7c09 100644
--- a/src/KCMTelepathyAccounts/CMakeLists.txt
+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
@@ -32,7 +32,6 @@ set (libktpaccountskcminternal_HDRS
      abstract-account-parameters-widget.h
      generic-advanced-options-widget.h
      account-edit-widget.h
-     plugin-macros.h
      plugin-manager.h
      profile-list-model.h
      profile-select-widget.h
@@ -49,7 +48,6 @@ set (libktpaccountskcminternal_PRETTY_HDRS
      AbstractAccountParametersWidget
      GenericAdvancedOptionsWidget
      AccountEditWidget
-     PluginMacros
      ConnectionManagerItem
      PluginManager
      ProtocolSelectWidget
diff --git a/src/KCMTelepathyAccounts/PluginMacros b/src/KCMTelepathyAccounts/PluginMacros
deleted file mode 100644
index 93fac7e..0000000
--- a/src/KCMTelepathyAccounts/PluginMacros
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_PRETTY_H
-#define LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_PRETTY_H
-
-#include <KCMTelepathyAccounts/plugin-macros.h>
-
-#endif
-
diff --git a/src/KCMTelepathyAccounts/plugin-macros.h b/src/KCMTelepathyAccounts/plugin-macros.h
deleted file mode 100644
index a258fc7..0000000
--- a/src/KCMTelepathyAccounts/plugin-macros.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of telepathy-accounts-kcm
- *
- * Copyright (C) 2009 Collabora Ltd. <info at collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_H
-#define LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_H
-
-#include <kdemacros.h>
-#include <KPluginFactory>
-
-#define KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT(libname,classname) \
-  K_PLUGIN_FACTORY(factory,registerPlugin<classname>();) \
-  K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_"#libname))
-
-#endif  // Header guard

-- 
ktp-accounts-kcm packaging