New upstream version 2.9

[minitube] / src / sidebarwidget.cpp

diff --git a/src/sidebarwidget.cpp b/src/sidebarwidget.cpp
index 676cf4fcbb15c1778c4f81a5efd08a919817538c..27283d7e17cd60a6db6145a1c7841b4a6a0f0c7b 100644 (file)
--- a/src/sidebarwidget.cpp
+++ b/src/sidebarwidget.cpp
@@ -22,14 +22,11 @@ $END_LICENSE */
 #include "refinesearchbutton.h"
 #include "refinesearchwidget.h"
 #include "sidebarheader.h"
+#include "mainwindow.h"
 #ifdef APP_EXTRA
 #include "extra.h"
 #endif
 
-namespace The {
-QHash<QString, QAction*>* globalActions();
-}
-
 SidebarWidget::SidebarWidget(QWidget *parent) :
     QWidget(parent), playlistWidth(0) {
     playlist = 0;
@@ -89,7 +86,7 @@ void SidebarWidget::setPlaylist(QListView *playlist) {
 
 void SidebarWidget::showPlaylist() {
     stackedWidget->setCurrentWidget(playlist);
-    The::globalActions()->value("refine-search")->setChecked(false);
+    MainWindow::instance()->getAction("refineSearch")->setChecked(false);
 }
 
 void SidebarWidget::showRefineSearchWidget() {
@@ -103,7 +100,7 @@ void SidebarWidget::showRefineSearchWidget() {
     Extra::fadeInWidget(playlist, refineSearchWidget);
 #endif
     refineSearchButton->hide();
-    The::globalActions()->value("refine-search")->setChecked(true);
+    MainWindow::instance()->getAction("refineSearch")->setChecked(true);
 }
 
 void SidebarWidget::hideRefineSearchWidget() {
@@ -114,7 +111,7 @@ void SidebarWidget::hideRefineSearchWidget() {
 #ifdef APP_EXTRA
     Extra::fadeInWidget(refineSearchWidget, playlist);
 #endif
-    The::globalActions()->value("refine-search")->setChecked(false);
+    MainWindow::instance()->getAction("refineSearch")->setChecked(false);
 }
 
 void SidebarWidget::toggleRefineSearch(bool show) {
@@ -167,7 +164,7 @@ void SidebarWidget::showSuggestions(const QStringList &suggestions) {
     QString message = tr("Did you mean: %1");
 
     QString suggestionLinks;
-    foreach (const QString &suggestion, suggestions) {
+    for (const QString &suggestion : suggestions) {
         suggestionLinks += "<a href='" + suggestion + "'>" + suggestion + "</a> ";
     }
     message = message.arg(suggestionLinks);