mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

Remove TomahawkVersion.h and QtCrypto includes from public QtScriptResolver header

Browse Source
This commit is contained in:
Dominik Schmidt
2013-05-22 16:56:26 +02:00
parent 2d9519163c
commit 4f19f85bde
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/resolvers/QtScriptResolver.cpp
View File

@@ -27,6 +27,7 @@
#include "ScriptCollection.h" #include "ScriptCollection.h"
#include "SourceList.h" #include "SourceList.h"
#include "TomahawkSettings.h" #include "TomahawkSettings.h"
#include "TomahawkVersion.h"
#include "accounts/AccountConfigWidget.h" #include "accounts/AccountConfigWidget.h"
@@ -48,6 +49,11 @@
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QSslError> #include <QSslError>
#ifdef QCA2_FOUND
#include <QtCrypto>
#endif
#include <boost/bind.hpp> #include <boost/bind.hpp>
// FIXME: bloody hack, remove this for 0.3 // FIXME: bloody hack, remove this for 0.3

8
src/libtomahawk/resolvers/QtScriptResolver.h
View File

@@ -25,7 +25,6 @@
#include "Query.h" #include "Query.h"
#include "utils/TomahawkUtils.h" #include "utils/TomahawkUtils.h"
#include "config.h" #include "config.h"
#include "TomahawkVersion.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include <QDir> #include <QDir>
@@ -34,10 +33,6 @@
#include <QWebPage> #include <QWebPage>
#include <QWebFrame> #include <QWebFrame>
#ifdef QCA2_FOUND
#include <QtCrypto>
#endif
#include "DllMacro.h" #include "DllMacro.h"
class QtScriptResolver; class QtScriptResolver;
@@ -89,9 +84,6 @@ private:
bool m_urlCallbackIsAsync; bool m_urlCallbackIsAsync;
QVariantMap m_resolverConfig; QVariantMap m_resolverConfig;
QtScriptResolver* m_resolver; QtScriptResolver* m_resolver;
#ifdef QCA2_FOUND
QCA::Initializer m_qcaInit;
#endif
}; };
class DLLEXPORT ScriptEngine : public QWebPage class DLLEXPORT ScriptEngine : public QWebPage