New upstream version 2.9

[minitube] / src / refinesearchwidget.cpp

diff --git a/src/refinesearchwidget.cpp b/src/refinesearchwidget.cpp
index d82a227c12e80b0f9d876e2a995bc7dadd315ea9..6723b5a282bb5457e2670d6b3f889b1fe0d92e82 100644 (file)
--- a/src/refinesearchwidget.cpp
+++ b/src/refinesearchwidget.cpp
@@ -24,14 +24,13 @@ $END_LICENSE */
 #include "extra.h"
 #endif
 #include "iconutils.h"
-
-namespace The {
-QHash<QString, QAction*>* globalActions();
-}
+#include "mainwindow.h"
 
 RefineSearchWidget::RefineSearchWidget(QWidget *parent) :
     QWidget(parent) {
     dirty = false;
+    // Fixes background painting in fullscreen
+    setAutoFillBackground(true);
 }
 
 void RefineSearchWidget::setup() {
@@ -50,13 +49,13 @@ void RefineSearchWidget::setup() {
     setupLabel(tr("Sort by"), layout, paramName);
     QToolBar *sortBar = setupBar(paramName);
     QActionGroup* sortGroup = new QActionGroup(this);
-    QStringList sortOptions = QStringList()
+    const QStringList sortOptions = QStringList()
             << tr("Relevance")
             << tr("Date")
             << tr("View Count")
             << tr("Rating");
     int i = 0;
-    foreach (const QString &actionName, sortOptions) {
+    for (const QString &actionName : sortOptions) {
         QAction *action = new QAction(actionName, sortBar);
         action->setCheckable(true);
         action->setProperty("paramValue", i);
@@ -70,13 +69,13 @@ void RefineSearchWidget::setup() {
     setupLabel(tr("Date"), layout, paramName);
     QToolBar *timeBar = setupBar(paramName);
     QActionGroup* timeGroup = new QActionGroup(this);
-    QStringList timeSpans = QStringList()
+    const QStringList timeSpans = QStringList()
             << tr("Anytime")
             << tr("Today")
             << tr("7 Days")
             << tr("30 Days");
     i = 0;
-    foreach (const QString &actionName, timeSpans) {
+    for (const QString &actionName : timeSpans) {
         QAction *action = new QAction(actionName, timeBar);
         action->setCheckable(true);
         action->setProperty("paramValue", i);
@@ -90,7 +89,7 @@ void RefineSearchWidget::setup() {
     setupLabel(tr("Duration"), layout, paramName);
     QToolBar *lengthBar = setupBar(paramName);
     QActionGroup* lengthGroup = new QActionGroup(this);
-    QStringList lengthOptions = QStringList()
+    const QStringList lengthOptions = QStringList()
             << tr("All")
             << tr("Short")
             << tr("Medium")
@@ -101,7 +100,7 @@ void RefineSearchWidget::setup() {
             << tr("Between 4 and 20 minutes")
             << tr("Longer than 20 minutes");
     i = 0;
-    foreach (const QString &actionName, lengthOptions) {
+    for (const QString &actionName : lengthOptions) {
         QAction *action = new QAction(actionName, timeBar);
         action->setStatusTip(tips.at(i));
         action->setCheckable(true);
@@ -116,14 +115,14 @@ void RefineSearchWidget::setup() {
     setupLabel(tr("Quality"), layout, paramName);
     QToolBar *qualityBar = setupBar(paramName);
     QActionGroup* qualityGroup = new QActionGroup(this);
-    QStringList qualityOptions = QStringList()
+    const QStringList qualityOptions = QStringList()
             << tr("All")
             << tr("High Definition");
     tips = QStringList()
             << ""
             << tr("720p or higher");
     i = 0;
-    foreach (const QString &actionName, qualityOptions) {
+    for (const QString &actionName : qualityOptions) {
         QAction *action = new QAction(actionName, timeBar);
         action->setStatusTip(tips.at(i));
         action->setCheckable(true);
@@ -207,7 +206,7 @@ void RefineSearchWidget::actionTriggered(QAction *action) {
 void RefineSearchWidget::setSearchParams(SearchParams *params) {
     setup();
 
-    The::globalActions()->value("refine-search")->setEnabled(params);
+    MainWindow::instance()->getAction("refineSearch")->setEnabled(params);
     setEnabled(params);
 
     if (!params) return;