From 9f1ec0ce935d6031ecd3b8e0dee523fa6928cfcb Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Thu, 17 Nov 2011 13:26:50 -0500
Subject: [PATCH] More cleanup, more actioncollectionifying, and fix a few
 signals

---
 src/libtomahawk/actioncollection.cpp          |  5 ++++
 src/libtomahawk/audio/audioengine.cpp         |  8 +++++-
 src/libtomahawk/audio/audioengine.h           |  2 ++
 src/libtomahawk/contextmenu.h                 |  4 +--
 .../dynamic/widgets/CollapsibleControls.cpp   | 15 +++++------
 .../dynamic/widgets/CollapsibleControls.h     |  2 +-
 src/libtomahawk/widgets/imagebutton.cpp       | 13 +++++-----
 src/libtomahawk/widgets/imagebutton.h         |  6 ++---
 src/sourcetree/sourcedelegate.cpp             |  6 ++---
 src/sourcetree/sourcedelegate.h               |  4 +--
 src/sourcetree/sourcetreeview.cpp             |  3 +--
 src/tomahawkapp.cpp                           | 26 ++++++++++---------
 src/tomahawkapp.h                             | 10 +++----
 src/tomahawktrayicon.cpp                      | 24 +++++++----------
 src/tomahawktrayicon.h                        | 12 +++------
 15 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/libtomahawk/actioncollection.cpp b/src/libtomahawk/actioncollection.cpp
index b2d9bbba4..2d252eacc 100644
--- a/src/libtomahawk/actioncollection.cpp
+++ b/src/libtomahawk/actioncollection.cpp
@@ -54,6 +54,11 @@ ActionCollection::initActions()
     m_actionCollection[ "loadPlaylist"] = new QAction( tr( "&Load Playlist" ), this );
     m_actionCollection[ "renamePlaylist"] = new QAction( tr( "&Rename Playlist" ), this );
     m_actionCollection[ "copyPlaylist"] = new QAction( tr( "&Copy Playlist Link" ), this );
+    m_actionCollection[ "playPause"] = new QAction( tr( "&Play" ), this );
+    m_actionCollection[ "stop"] = new QAction( tr( "&Stop" ), this );
+    m_actionCollection[ "previousTrack"] = new QAction( tr( "&Previous Track" ), this );
+    m_actionCollection[ "nextTrack"] = new QAction( tr( "&Next Track" ), this );
+    m_actionCollection[ "quit"] = new QAction( tr( "&Quit" ), this );
 }
 
 
diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index 25da732b2..097a89c40 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -79,7 +79,12 @@ AudioEngine::AudioEngine()
 
 #ifndef TOMAHAWK_HEADLESS
     tDebug() << Q_FUNC_INFO << "Connecting privacy toggle";
-    connect( ActionCollection::instance()->getAction( "togglePrivacy" ), SIGNAL( triggered( bool ) ), this, SLOT( togglePrivateListeningMode() ) );
+    ActionCollection *ac = ActionCollection::instance();
+    connect( ac->getAction( "togglePrivacy" ), SIGNAL( triggered() ), SLOT( togglePrivateListeningMode() ), Qt::UniqueConnection );
+    connect( ac->getAction( "playPause" ),     SIGNAL( triggered() ), SLOT( playPause() ),                  Qt::UniqueConnection );
+    connect( ac->getAction( "stop" ),          SIGNAL( triggered() ), SLOT( stop() ),                       Qt::UniqueConnection );
+    connect( ac->getAction( "previousTrack" ), SIGNAL( triggered() ), SLOT( previous() ),                   Qt::UniqueConnection );
+    connect( ac->getAction( "nextTrack" ),     SIGNAL( triggered() ), SLOT( next() ),                       Qt::UniqueConnection );
 #endif
     
     onVolumeChanged( m_audioOutput->volume() );
@@ -416,6 +421,7 @@ AudioEngine::togglePrivateListeningMode()
     privacyToggle->setText( tr( QString( isPublic ? "&Listen Privately" : "&Listen Publicly" ).toAscii().constData() ) );
     privacyToggle->setIconVisibleInMenu( isPublic );
 #endif
+    emit privacyModeChanged();
 }
 
 
diff --git a/src/libtomahawk/audio/audioengine.h b/src/libtomahawk/audio/audioengine.h
index 0638270d3..be8beb43e 100644
--- a/src/libtomahawk/audio/audioengine.h
+++ b/src/libtomahawk/audio/audioengine.h
@@ -125,6 +125,8 @@ signals:
 
     void error( AudioErrorCode errorCode );
 
+    void privacyModeChanged();
+    
 private slots:
     bool loadTrack( const Tomahawk::result_ptr& result );
     void loadPreviousTrack();
diff --git a/src/libtomahawk/contextmenu.h b/src/libtomahawk/contextmenu.h
index a610de4d5..56f0406d7 100644
--- a/src/libtomahawk/contextmenu.h
+++ b/src/libtomahawk/contextmenu.h
@@ -19,8 +19,8 @@
 #ifndef CONTEXTMENU_H
 #define CONTEXTMENU_H
 
-#include <QSignalMapper>
-#include <QMenu>
+#include <QtCore/QSignalMapper>
+#include <QtGui/QMenu>
 
 #include "typedefs.h"
 #include "dllmacro.h"
diff --git a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp
index 042a46f3b..b0a3f9d2c 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp
@@ -25,14 +25,13 @@
 #include "utils/tomahawkutils.h"
 #include "widgets/elidedlabel.h"
 
-#include <QLabel>
-#include <QStackedLayout>
-#include <QToolButton>
-#include <QAction>
-#include <QEasingCurve>
-#include <QTimeLine>
-#include <QPaintEvent>
-#include <QPainter>
+#include <QtGui/QLabel>
+#include <QtGui/QStackedLayout>
+#include <QtGui/QToolButton>
+#include <QtCore/QEasingCurve>
+#include <QtCore/QTimeLine>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
 
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h
index e2c640121..860557817 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h
+++ b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h
@@ -21,7 +21,7 @@
 
 #include "typedefs.h"
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QPaintEvent;
 class QHBoxLayout;
diff --git a/src/libtomahawk/widgets/imagebutton.cpp b/src/libtomahawk/widgets/imagebutton.cpp
index d921db24a..eb1cee693 100644
--- a/src/libtomahawk/widgets/imagebutton.cpp
+++ b/src/libtomahawk/widgets/imagebutton.cpp
@@ -18,13 +18,12 @@
 
 #include "imagebutton.h"
 
-#include <QPainter>
-#include <QPaintEvent>
-#include <QLayout>
-#include <QAction>
-#include <QPixmap>
-#include <QIcon>
-#include <QString>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QLayout>
+#include <QtGui/QPixmap>
+#include <QtGui/QIcon>
+#include <QtCore/QString>
 
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/widgets/imagebutton.h b/src/libtomahawk/widgets/imagebutton.h
index d3b060ab4..8b519fb99 100644
--- a/src/libtomahawk/widgets/imagebutton.h
+++ b/src/libtomahawk/widgets/imagebutton.h
@@ -19,9 +19,9 @@
 #ifndef IMAGE_BUTTON_H
 #define IMAGE_BUTTON_H
 
-#include <QAbstractButton>
-#include <QIcon>
-#include <QMap>
+#include <QtGui/QAbstractButton>
+#include <QtGui/QIcon>
+#include <QtCore/QMap>
 
 #include "dllmacro.h"
 
diff --git a/src/sourcetree/sourcedelegate.cpp b/src/sourcetree/sourcedelegate.cpp
index 5f059aebd..5e77cf209 100644
--- a/src/sourcetree/sourcedelegate.cpp
+++ b/src/sourcetree/sourcedelegate.cpp
@@ -31,9 +31,9 @@
 #include "source.h"
 #include "tomahawksettings.h"
 
-#include <QApplication>
-#include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QMouseEvent>
 #include <audio/audioengine.h>
 #include <actioncollection.h>
 
diff --git a/src/sourcetree/sourcedelegate.h b/src/sourcetree/sourcedelegate.h
index 3d2251c59..38389be55 100644
--- a/src/sourcetree/sourcedelegate.h
+++ b/src/sourcetree/sourcedelegate.h
@@ -24,8 +24,8 @@
 #include "sourcetreeview.h"
 #include "items/sourcetreeitem.h"
 
-#include <QStyledItemDelegate>
-#include <QPropertyAnimation>
+#include <QtGui/QStyledItemDelegate>
+#include <QtCore/QPropertyAnimation>
 
 class AnimationHelper;
 
diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp
index 6a3f06b11..3831939ef 100644
--- a/src/sourcetree/sourcetreeview.cpp
+++ b/src/sourcetree/sourcetreeview.cpp
@@ -115,8 +115,7 @@ SourceTreeView::SourceTreeView( QWidget* parent )
     connect( this, SIGNAL( unlatchRequest( Tomahawk::source_ptr ) ), m_latchManager, SLOT( unlatchRequest( Tomahawk::source_ptr ) ) );
     connect( this, SIGNAL( catchUpRequest() ), m_latchManager, SLOT( catchUpRequest() ) );
 
-    QAction *privacyToggle = ActionCollection::instance()->getAction( "togglePrivacy" );
-    connect( privacyToggle, SIGNAL( triggered( bool ) ), SLOT( repaint() ) );
+    connect( AudioEngine::instance(), SIGNAL( privacyModeChanged() ), SLOT( repaint() ) );
 }
 
 
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 55bef73fd..47f854fc7 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -21,16 +21,15 @@
 
 #include <iostream>
 
-#include <QPluginLoader>
-#include <QDir>
-#include <QMetaType>
-#include <QTime>
-#include <QNetworkReply>
-#include <QFile>
-#include <QFileInfo>
-#include <QNetworkProxy>
+#include <QtCore/QPluginLoader>
+#include <QtCore/QDir>
+#include <QtCore/QMetaType>
+#include <QtCore/QTime>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtNetwork/QNetworkProxy>
 
-#include "actioncollection.h"
 #include "artist.h"
 #include "album.h"
 #include "collection.h"
@@ -70,9 +69,9 @@
     #include "AtticaManager.h"
     #include "tomahawkwindow.h"
     #include "settingsdialog.h"
-    #include <QMessageBox>
+    #include "actioncollection.h"
+    #include <QtGui/QMessageBox>
     #include "widgets/HeaderLabel.h"
-
 #endif
 
 // should go to a plugin actually
@@ -159,8 +158,11 @@ TomahawkApp::init()
     new TomahawkSettings( this );
     TomahawkSettings* s = TomahawkSettings::instance();
 
+#ifndef ENABLE_HEADLESS
     new ActionCollection( this );
-
+    connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection );
+#endif
+    
     tDebug( LOGINFO ) << "Setting NAM.";
     // Cause the creation of the nam, but don't need to address it directly, so prevent warning
     Q_UNUSED( TomahawkUtils::nam() );
diff --git a/src/tomahawkapp.h b/src/tomahawkapp.h
index 65ee0f682..8f4fb9958 100644
--- a/src/tomahawkapp.h
+++ b/src/tomahawkapp.h
@@ -24,11 +24,11 @@
 #include "headlesscheck.h"
 #include "config.h"
 
-#include <QRegExp>
-#include <QFile>
-#include <QSettings>
-#include <QDir>
-#include <QPersistentModelIndex>
+#include <QtCore/QRegExp>
+#include <QtCore/QFile>
+#include <QtCore/QSettings>
+#include <QtCore/QDir>
+#include <QtCore/QPersistentModelIndex>
 
 #include "QxtHttpServerConnector"
 #include "QxtHttpSessionManager"
diff --git a/src/tomahawktrayicon.cpp b/src/tomahawktrayicon.cpp
index 38495a481..6a58a4e6f 100644
--- a/src/tomahawktrayicon.cpp
+++ b/src/tomahawktrayicon.cpp
@@ -18,7 +18,7 @@
 
 #include "tomahawktrayicon.h"
 
-#include <QWheelEvent>
+#include <QtGui/QWheelEvent>
 
 #include "artist.h"
 
@@ -43,12 +43,12 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     m_contextMenu = new QMenu();
     setContextMenu( m_contextMenu );
 
-    m_playPauseAction = m_contextMenu->addAction( tr( "Play" ) );
-    //m_pauseAction = m_contextMenu->addAction( tr( "Pause" ) );
-    m_stopAction = m_contextMenu->addAction( tr( "Stop" ) );
+    ActionCollection *ac = ActionCollection::instance();
+    m_contextMenu->addAction( ac->getAction( "playPause" ) );
+    m_contextMenu->addAction( ac->getAction( "stop" ) );
     m_contextMenu->addSeparator();
-    m_prevAction = m_contextMenu->addAction( tr( "Previous Track" ) );
-    m_nextAction = m_contextMenu->addAction( tr( "Next Track" ) );
+    m_contextMenu->addAction( ac->getAction( "previousTrack" ) );
+    m_contextMenu->addAction( ac->getAction( "nextTrack" ) );
     m_contextMenu->addSeparator();
     m_contextMenu->addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
 
@@ -61,7 +61,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
 #endif
 
     m_contextMenu->addSeparator();
-    m_quitAction = m_contextMenu->addAction( tr( "Quit" ) );
+    m_contextMenu->addAction( ac->getAction( "quit" ) );
 
     connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( setResult( Tomahawk::result_ptr ) ) );
     connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( enablePause() ) );
@@ -69,12 +69,6 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     connect( AudioEngine::instance(), SIGNAL( stopped() ), this, SLOT( enablePlay() ) );
     connect( AudioEngine::instance(), SIGNAL( paused() ),  this, SLOT( enablePlay() ) );
 
-    connect( m_playPauseAction, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( playPause() ) );
-    connect( m_stopAction,      SIGNAL( triggered() ), AudioEngine::instance(), SLOT( stop() ) );
-    connect( m_prevAction,      SIGNAL( triggered() ), AudioEngine::instance(), SLOT( previous() ) );
-    connect( m_nextAction,      SIGNAL( triggered() ), AudioEngine::instance(), SLOT( next() ) );
-    connect( m_quitAction,      SIGNAL( triggered() ), (QObject*)APP,           SLOT( quit() ) );
-
     connect( &m_animationTimer, SIGNAL( timeout() ), SLOT( onAnimationTimer() ) );
     connect( this, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ), SLOT( onActivated( QSystemTrayIcon::ActivationReason ) ) );
 
@@ -203,14 +197,14 @@ TomahawkTrayIcon::onActivated( QSystemTrayIcon::ActivationReason reason )
 void
 TomahawkTrayIcon::enablePlay()
 {
-    m_playPauseAction->setText( tr( "Play" ) );
+    ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Play" ) );
 }
 
 
 void
 TomahawkTrayIcon::enablePause()
 {
-    m_playPauseAction->setText( tr( "Pause" ) );
+    ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Pause" ) );
 }
 
 
diff --git a/src/tomahawktrayicon.h b/src/tomahawktrayicon.h
index 3e0280d16..3e5de54e1 100644
--- a/src/tomahawktrayicon.h
+++ b/src/tomahawktrayicon.h
@@ -19,9 +19,9 @@
 #ifndef TOMAHAWK_TRAYICON_H
 #define TOMAHAWK_TRAYICON_H
 
-#include <QSystemTrayIcon>
-#include <QTimer>
-#include <QMenu>
+#include <QtGui/QSystemTrayIcon>
+#include <QtCore/QTimer>
+#include <QtGui/QMenu>
 
 #include "result.h"
 
@@ -57,12 +57,6 @@ private:
     int m_currentAnimationFrame;
 
     QMenu* m_contextMenu;
-    QAction* m_playPauseAction;
-    //QAction* m_pauseAction;
-    QAction* m_stopAction;
-    QAction* m_prevAction;
-    QAction* m_nextAction;
-    QAction* m_quitAction;
 
     QAction* m_showWindowAction;
 };