From f5f2c37184f7ab4e5712b4c74d4456ca6da87eb8 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 9 Nov 2015 18:14:20 -0200 Subject: Remove the PluginSystem But keep the Interface so it's still userfull to create a new SocialNetwork when needed, but it will be part of the code, and not a plugin. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/mainwindow.cpp | 7 ++++--- desktop-widgets/plugins/facebook/facebook_integration.cpp | 2 +- desktop-widgets/plugins/facebook/facebook_integration.h | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 58778f394..41d0fd592 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -260,15 +260,16 @@ void MainWindow::setupSocialNetworkMenu() QMenu *connections = new QMenu(tr("Connect to")); FacebookPlugin *facebookPlugin = new FacebookPlugin(); QAction *toggle_connection = new QAction(this); + QObject *obj = qobject_cast(facebookPlugin); toggle_connection->setText(facebookPlugin->socialNetworkName()); toggle_connection->setIcon(QIcon(facebookPlugin->socialNetworkIcon())); - toggle_connection->setData(QVariant::fromValue(facebookPlugin)); + toggle_connection->setData(QVariant::fromValue(obj)); connect(toggle_connection, SIGNAL(triggered()), this, SLOT(socialNetworkRequestConnect())); QAction *share_on = new QAction(this); share_on->setText(facebookPlugin->socialNetworkName()); share_on->setIcon(QIcon(facebookPlugin->socialNetworkIcon())); - share_on->setData(QVariant::fromValue(facebookPlugin)); + share_on->setData(QVariant::fromValue(obj)); ui.menuShare_on->addAction(share_on); connections->addAction(toggle_connection); connect(share_on, SIGNAL(triggered()), this, SLOT(socialNetworkRequestUpload())); @@ -280,7 +281,7 @@ void MainWindow::setupSocialNetworkMenu() void MainWindow::socialNetworkRequestConnect() { QAction *action = qobject_cast(sender()); - FacebookPlugin *plugin = action->data().value(); + ISocialNetworkIntegration *plugin = qobject_cast(action->data().value()); if (plugin->isConnected()) plugin->requestLogoff(); else diff --git a/desktop-widgets/plugins/facebook/facebook_integration.cpp b/desktop-widgets/plugins/facebook/facebook_integration.cpp index f817f9df8..21ad6f733 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.cpp +++ b/desktop-widgets/plugins/facebook/facebook_integration.cpp @@ -3,7 +3,7 @@ #include -FacebookPlugin::FacebookPlugin(QObject* parent): QObject(parent), +FacebookPlugin::FacebookPlugin(QObject* parent) : fbConnectWidget(new FacebookConnectWidget()), fbUploadDialog(new SocialNetworkDialog()) { diff --git a/desktop-widgets/plugins/facebook/facebook_integration.h b/desktop-widgets/plugins/facebook/facebook_integration.h index 714f636fc..40b16917d 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.h +++ b/desktop-widgets/plugins/facebook/facebook_integration.h @@ -8,10 +8,8 @@ class FacebookConnectWidget; class SocialNetworkDialog; class FacebookManager; -class FacebookPlugin : public QObject, public ISocialNetworkIntegration { +class FacebookPlugin : public ISocialNetworkIntegration { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.subsurface.plugins.ISocialNetworkIntegration") - Q_INTERFACES(ISocialNetworkIntegration) public: explicit FacebookPlugin(QObject* parent = 0); virtual bool isConnected(); -- cgit v1.2.3-70-g09d2