From a0b5f452730d0316b10dfbbf82576b834e9de2a9 Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Mon, 10 Feb 2014 20:16:15 +0100
Subject: [PATCH] cleanup

---
 src/core/plugins/plugincontainer.h                  | 5 ++---
 src/plugins/frontends/snarlnetwork/snarlnetwork.cpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/plugins/plugincontainer.h b/src/core/plugins/plugincontainer.h
index 36eea55..f2d7fcd 100644
--- a/src/core/plugins/plugincontainer.h
+++ b/src/core/plugins/plugincontainer.h
@@ -51,6 +51,8 @@ public:
     static const QList<SnorePlugin::PluginTypes> &types();
 
 private:
+    static QHash<SnorePlugin::PluginTypes, QHash<QString,PluginContainer*> > s_pluginCache;
+
     void static updatePluginCache();
     static const QDir &pluginDir();
     static inline const QString pluginExtention()
@@ -63,9 +65,6 @@ private:
         return QLatin1String("dylib");
 #endif
     }
-
-    static QHash<SnorePlugin::PluginTypes, QHash<QString,PluginContainer*> > s_pluginCache;
-
     static inline QSettings &cache()
     {
         static QSettings *_cache = NULL;
diff --git a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
index a96ea3e..5679e02 100644
--- a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
+++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
@@ -128,7 +128,7 @@ void SnarlNetworkFrontend::handleMessages()
 
 void SnarlNetworkFrontend::callback(Notification &sn, const QString msg)
 {
-    QTcpSocket *client = (QTcpSocket*)qvariant_cast<QObject*>(sn.hints().privateValue(this, "clientSocket"));
+    QTcpSocket *client = qobject_cast<QTcpSocket*>(sn.hints().privateValue(this, "clientSocket").value<QObject*>());
     if(client && !msg.isEmpty())
     {
         write(client, QString("%1%2\r\n").arg(msg, QString::number(sn.id())));