From 4f19f85bdec7b7292335e7caa9774f9fc4a69e79 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <domme@tomahawk-player.org>
Date: Wed, 22 May 2013 16:56:26 +0200
Subject: [PATCH] Remove TomahawkVersion.h and QtCrypto includes from public
 QtScriptResolver header

---
 src/libtomahawk/resolvers/QtScriptResolver.cpp | 6 ++++++
 src/libtomahawk/resolvers/QtScriptResolver.h   | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp
index fdac7206e..3c0990ef1 100644
--- a/src/libtomahawk/resolvers/QtScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp
@@ -27,6 +27,7 @@
 #include "ScriptCollection.h"
 #include "SourceList.h"
 #include "TomahawkSettings.h"
+#include "TomahawkVersion.h"
 
 #include "accounts/AccountConfigWidget.h"
 
@@ -48,6 +49,11 @@
 #include <QCryptographicHash>
 #include <QSslError>
 
+#ifdef QCA2_FOUND
+#include <QtCrypto>
+#endif
+
+
 #include <boost/bind.hpp>
 
 // FIXME: bloody hack, remove this for 0.3
diff --git a/src/libtomahawk/resolvers/QtScriptResolver.h b/src/libtomahawk/resolvers/QtScriptResolver.h
index 1e7d5ebfd..226b10b5d 100644
--- a/src/libtomahawk/resolvers/QtScriptResolver.h
+++ b/src/libtomahawk/resolvers/QtScriptResolver.h
@@ -25,7 +25,6 @@
 #include "Query.h"
 #include "utils/TomahawkUtils.h"
 #include "config.h"
-#include "TomahawkVersion.h"
 #include "utils/Logger.h"
 
 #include <QDir>
@@ -34,10 +33,6 @@
 #include <QWebPage>
 #include <QWebFrame>
 
-#ifdef QCA2_FOUND
-#include <QtCrypto>
-#endif
-
 #include "DllMacro.h"
 
 class QtScriptResolver;
@@ -89,9 +84,6 @@ private:
     bool m_urlCallbackIsAsync;
     QVariantMap m_resolverConfig;
     QtScriptResolver* m_resolver;
-#ifdef QCA2_FOUND
-    QCA::Initializer m_qcaInit;
-#endif
 };
 
 class DLLEXPORT ScriptEngine : public QWebPage