mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Fix compiling when sparkle is enabled.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-05-19 03:30:12 +02:00
parent 5a64fc1361
commit 4c4af2658b
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tomahawkwindow.cpp
View File

@@ -60,6 +60,7 @@
#include "tomahawktrayicon.h" #include "tomahawktrayicon.h"
#include "playlist/dynamic/GeneratorInterface.h" #include "playlist/dynamic/GeneratorInterface.h"
#include "scanmanager.h" #include "scanmanager.h"
#include "tomahawkapp.h"
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
#include <qtsparkle/Updater> #include <qtsparkle/Updater>
@@ -158,7 +159,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
#if defined( Q_OS_DARWIN ) && defined( HAVE_SPARKLE ) #if defined( Q_OS_DARWIN ) && defined( HAVE_SPARKLE )
QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates...") ); QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates...") );
checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole ); checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole );
connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); connect( checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) );
#elif defined( WIN32 ) #elif defined( WIN32 )
QUrl updaterUrl; QUrl updaterUrl;
@@ -311,6 +312,7 @@ TomahawkWindow::changeEvent( QEvent* e )
} }
} }
void void
TomahawkWindow::closeEvent( QCloseEvent* e ) TomahawkWindow::closeEvent( QCloseEvent* e )
{ {
@@ -326,6 +328,7 @@ TomahawkWindow::closeEvent( QCloseEvent* e )
e->accept(); e->accept();
} }
void void
TomahawkWindow::showEvent( QShowEvent* e ) TomahawkWindow::showEvent( QShowEvent* e )
{ {
@@ -337,6 +340,7 @@ TomahawkWindow::showEvent( QShowEvent* e )
#endif #endif
} }
void void
TomahawkWindow::hideEvent( QHideEvent* e ) TomahawkWindow::hideEvent( QHideEvent* e )
{ {
@@ -348,6 +352,7 @@ TomahawkWindow::hideEvent( QHideEvent* e )
#endif #endif
} }
void void
TomahawkWindow::showSettingsDialog() TomahawkWindow::showSettingsDialog()
{ {
@@ -356,6 +361,7 @@ TomahawkWindow::showSettingsDialog()
win.exec(); win.exec();
} }
void TomahawkWindow::showDiagnosticsDialog() void TomahawkWindow::showDiagnosticsDialog()
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
@@ -517,6 +523,7 @@ TomahawkWindow::onSipDisconnected()
ui->actionToggleConnect->setText( tr( "Go &online" ) ); ui->actionToggleConnect->setText( tr( "Go &online" ) );
} }
void void
TomahawkWindow::onSipPluginAdded( SipPlugin* p ) TomahawkWindow::onSipPluginAdded( SipPlugin* p )
{ {
@@ -524,6 +531,7 @@ TomahawkWindow::onSipPluginAdded( SipPlugin* p )
connect( p, SIGNAL( removeMenu( QMenu* ) ), this, SLOT( pluginMenuRemoved( QMenu* ) ) ); connect( p, SIGNAL( removeMenu( QMenu* ) ), this, SLOT( pluginMenuRemoved( QMenu* ) ) );
} }
void void
TomahawkWindow::onSipPluginRemoved( SipPlugin* p ) TomahawkWindow::onSipPluginRemoved( SipPlugin* p )
{ {
@@ -567,6 +575,7 @@ TomahawkWindow::showAboutTomahawk()
.arg( qApp->applicationVersion() ) ); .arg( qApp->applicationVersion() ) );
} }
void void
TomahawkWindow::checkForUpdates() TomahawkWindow::checkForUpdates()
{ {
@@ -575,6 +584,7 @@ TomahawkWindow::checkForUpdates()
#endif #endif
} }
void void
TomahawkWindow::minimize() TomahawkWindow::minimize()
{ {
@@ -586,6 +596,7 @@ TomahawkWindow::minimize()
} }
} }
void void
TomahawkWindow::maximize() TomahawkWindow::maximize()
{ {