summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. Harish Navnit <[email protected]>2016-01-28 22:01:31 +0530
committerPali Roh├ír <[email protected]>2017-12-22 09:10:20 +0100
commit1c5910a9274bd7b8738cdf093efd3c0370c2138d (patch)
treed8cc14f17732842d4f708f08cd892bced5a068dd
parent9ea40cda8e6517c707eb22c2358ce96922d0311f (diff)
Port the privacy plugin to KF5
-rw-r--r--plugins/privacy/privacyguiclient.cpp2
-rw-r--r--plugins/privacy/privacyplugin.cpp3
-rw-r--r--plugins/privacy/privacypreferences.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/plugins/privacy/privacyguiclient.cpp b/plugins/privacy/privacyguiclient.cpp
index fbac08c..93b22ec 100644
--- a/plugins/privacy/privacyguiclient.cpp
+++ b/plugins/privacy/privacyguiclient.cpp
@@ -34,7 +34,7 @@ class PrivacyPlugin;
PrivacyGUIClient::PrivacyGUIClient(Kopete::ChatSession *parent)
: QObject(parent), KXMLGUIClient(parent)
{
- setComponentData(PrivacyPlugin::plugin()->componentData());
+ //setComponentData(PrivacyPlugin::plugin()->componentData());
m_manager = parent;
diff --git a/plugins/privacy/privacyplugin.cpp b/plugins/privacy/privacyplugin.cpp
index 6efe6f6..2c652af 100644
--- a/plugins/privacy/privacyplugin.cpp
+++ b/plugins/privacy/privacyplugin.cpp
@@ -40,12 +40,11 @@
#include <kactioncollection.h>
K_PLUGIN_FACTORY( PrivacyPluginFactory, registerPlugin<PrivacyPlugin>(); )
-K_EXPORT_PLUGIN( PrivacyPluginFactory( "kopete_privacy" ) )
PrivacyPlugin * PrivacyPlugin::pluginStatic_ = 0L;
PrivacyPlugin::PrivacyPlugin( QObject *parent, const QVariantList & )
-: Kopete::Plugin( PrivacyPluginFactory::componentData(), parent )
+: Kopete::Plugin( parent )
{
kDebug(14313) ;
if( !pluginStatic_ )
diff --git a/plugins/privacy/privacypreferences.cpp b/plugins/privacy/privacypreferences.cpp
index 5c94d71..1d0b025 100644
--- a/plugins/privacy/privacypreferences.cpp
+++ b/plugins/privacy/privacypreferences.cpp
@@ -36,10 +36,9 @@
#include "privacyaccountlistmodel.h"
K_PLUGIN_FACTORY( PrivacyPreferencesFactory, registerPlugin<PrivacyPreferences>(); )
-K_EXPORT_PLUGIN( PrivacyPreferencesFactory( "kcm_kopete_privacy" ) )
PrivacyPreferences::PrivacyPreferences(QWidget *parent, const QVariantList &args)
- : KCModule(PrivacyPreferencesFactory::componentData(), parent, args)
+ : KCModule(parent, args)
{
kDebug(14313) << "called.";