mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-09-01 18:04:05 +02:00
Code Issues Releases Wiki Activity

Merge pull request #203 from TheOneRing/windows_fixes

Browse Source 
make tomahawk compile on windows again
This commit is contained in:
Dominik Schmidt
2013-07-18 15:40:15 -07:00
parent 98864dbd32 73b7336269
commit af78a0cecc
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/playlist/dynamic/GeneratorFactory.h
View File

@@ -61,7 +61,7 @@ public:
// only used when loading from dbcmd // only used when loading from dbcmd
static dyncontrol_ptr createControl( const QString& generatorType, const QString& controlType = QString() ); 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 types();
static QStringList typeSelectors( const QString& type ); static QStringList typeSelectors( const QString& type );

3
src/tomahawk/TomahawkWindow.cpp
View File

@@ -46,6 +46,7 @@
#include "utils/TomahawkUtilsGui.h" #include "utils/TomahawkUtilsGui.h"
#include "utils/ProxyStyle.h" #include "utils/ProxyStyle.h"
#include "utils/WidgetDragFilter.h" #include "utils/WidgetDragFilter.h"
#include "utils/NetworkAccessManager.h"
#include "widgets/AccountsToolButton.h" #include "widgets/AccountsToolButton.h"
#include "widgets/AnimatedSplitter.h" #include "widgets/AnimatedSplitter.h"
#include "widgets/NewPlaylistWidget.h" #include "widgets/NewPlaylistWidget.h"
@@ -688,6 +689,7 @@ TomahawkWindow::keyPressEvent( QKeyEvent* e )
bool bool
TomahawkWindow::winEvent( MSG* msg, long* result ) TomahawkWindow::winEvent( MSG* msg, long* result )
{ {
Q_UNUSED(result);
#define TB_PRESSED Q_FUNC_INFO << "Taskbar Button Pressed:" #define TB_PRESSED Q_FUNC_INFO << "Taskbar Button Pressed:"
switch ( msg->message ) switch ( msg->message )
@@ -734,6 +736,7 @@ TomahawkWindow::winEvent( MSG* msg, long* result )
void void
TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState ) TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState )
{ {
Q_UNUSED(oldState);
#ifdef HAVE_THUMBBUTTON #ifdef HAVE_THUMBBUTTON
if ( m_taskbarList == 0 ) if ( m_taskbarList == 0 )
return; return;

1
src/tomahawk/main.cpp
View File

@@ -45,6 +45,7 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h>
// code from patch attached to QTBUG-19064 by Honglei Zhang // code from patch attached to QTBUG-19064 by Honglei Zhang
LRESULT QT_WIN_CALLBACK qt_LowLevelKeyboardHookProc( int nCode, WPARAM wParam, LPARAM lParam ); LRESULT QT_WIN_CALLBACK qt_LowLevelKeyboardHookProc( int nCode, WPARAM wParam, LPARAM lParam );
HHOOK hKeyboardHook; HHOOK hKeyboardHook;