From a5fd16c143caf72de3ec89142f6b84feae236e48 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Tue, 16 Jul 2013 19:57:38 +0200 Subject: [PATCH 1/4] make tomahawk compile on windows again --- src/libtomahawk/playlist/dynamic/GeneratorFactory.h | 2 +- src/tomahawk/main.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/playlist/dynamic/GeneratorFactory.h b/src/libtomahawk/playlist/dynamic/GeneratorFactory.h index 3cbb30968..ddbff9290 100644 --- a/src/libtomahawk/playlist/dynamic/GeneratorFactory.h +++ b/src/libtomahawk/playlist/dynamic/GeneratorFactory.h @@ -61,7 +61,7 @@ public: // only used when loading from dbcmd static dyncontrol_ptr createControl( const QString& generatorType, const QString& controlType = QString() ); - static void registerFactory( const QString& type, GeneratorFactoryInterface* interface ); + static void registerFactory( const QString& type, GeneratorFactoryInterface* iface ); static QStringList types(); static QStringList typeSelectors( const QString& type ); diff --git a/src/tomahawk/main.cpp b/src/tomahawk/main.cpp index 67a37b987..065c91227 100644 --- a/src/tomahawk/main.cpp +++ b/src/tomahawk/main.cpp @@ -45,6 +45,7 @@ #ifdef Q_OS_WIN +#include // code from patch attached to QTBUG-19064 by Honglei Zhang LRESULT QT_WIN_CALLBACK qt_LowLevelKeyboardHookProc( int nCode, WPARAM wParam, LPARAM lParam ); HHOOK hKeyboardHook; From fc388271b43690a05d46355488fa160e303d42b8 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Tue, 16 Jul 2013 20:44:00 +0200 Subject: [PATCH 2/4] fixed missing include --- src/tomahawk/TomahawkWindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 8a4f8f7bc..3101d996a 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -46,6 +46,7 @@ #include "utils/TomahawkUtilsGui.h" #include "utils/ProxyStyle.h" #include "utils/WidgetDragFilter.h" +#include "utils/NetworkAccessManager.h" #include "widgets/AccountsToolButton.h" #include "widgets/AnimatedSplitter.h" #include "widgets/NewPlaylistWidget.h" From 408d2d11adc46bcf5a6242267648bee4376353fe Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Tue, 16 Jul 2013 20:46:17 +0200 Subject: [PATCH 3/4] silence some warnings --- src/tomahawk/TomahawkWindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 3101d996a..36c0193a7 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -689,6 +689,7 @@ TomahawkWindow::keyPressEvent( QKeyEvent* e ) bool TomahawkWindow::winEvent( MSG* msg, long* result ) { + Q_UNUSED(RESULT); #define TB_PRESSED Q_FUNC_INFO << "Taskbar Button Pressed:" switch ( msg->message ) @@ -735,6 +736,7 @@ TomahawkWindow::winEvent( MSG* msg, long* result ) void TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState ) { + Q_UNUSED(oldState); #ifdef HAVE_THUMBBUTTON if ( m_taskbarList == 0 ) return; From 73b7336269ab564fc224720829da2c9e2fa52f42 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Tue, 16 Jul 2013 20:50:21 +0200 Subject: [PATCH 4/4] fixed typo --- src/tomahawk/TomahawkWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 36c0193a7..c259dd00a 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -689,7 +689,7 @@ TomahawkWindow::keyPressEvent( QKeyEvent* e ) bool TomahawkWindow::winEvent( MSG* msg, long* result ) { - Q_UNUSED(RESULT); + Q_UNUSED(result); #define TB_PRESSED Q_FUNC_INFO << "Taskbar Button Pressed:" switch ( msg->message )