Standard code beautification in JobActivityStatusBar

GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp

@@ -20,16 +20,14 @@
 #include <QStatusBar>
 #include <QToolButton>
 
-JobActivityStatusBar::JobActivityStatusBar(MainWindow *mainWindow)
-    : QWidget(mainWindow)
-    , m_toggleJobListButton(0)
-    , m_activityCombo(0)
-    , m_dockMenuButton(0)
+JobActivityStatusBar::JobActivityStatusBar(MainWindow* mainWindow)
+    : QWidget(mainWindow), m_toggleJobListButton(nullptr)
+    , m_activityCombo(nullptr), m_dockMenuButton(nullptr)
     , m_mainWindow(mainWindow)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-    QHBoxLayout *layout = new QHBoxLayout;
+    auto layout = new QHBoxLayout;
     layout->setSpacing(0);
     layout->setMargin(0);
 
@@ -38,18 +36,20 @@ JobActivityStatusBar::JobActivityStatusBar(MainWindow *mainWindow)
     m_toggleJobListButton->setIcon(QIcon(":/images/statusbar_joblist.svg"));
     m_toggleJobListButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     m_toggleJobListButton->setToolTip("Toggle job list view");
-    connect(m_toggleJobListButton, SIGNAL(clicked()), this, SIGNAL(toggleJobSelectorRequest()));
+    connect(m_toggleJobListButton, &QToolButton::clicked,
+            this, &JobActivityStatusBar::toggleJobSelectorRequest);
 
     m_activityCombo = new QComboBox();
     m_activityCombo->setToolTip("Main Activity Selector");
     m_activityCombo->addItems(JobViewActivities::activityList());
-    connect(m_activityCombo, SIGNAL(currentIndexChanged(int)),
-            this, SIGNAL(changeActivityRequest(int)));
+    connect(m_activityCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &JobActivityStatusBar::changeActivityRequest);
 
     m_dockMenuButton = new QToolButton;
     m_dockMenuButton->setIcon(QIcon(":/images/statusbar_dockmenu.svg"));
     m_dockMenuButton->setToolTip("Docks layout menu");
-    connect(m_dockMenuButton, SIGNAL(clicked()), this, SIGNAL(dockMenuRequest()));
+    connect(m_dockMenuButton, &QToolButton::clicked,
+            this, &JobActivityStatusBar::dockMenuRequest);
 
     layout->addWidget(m_toggleJobListButton);
     layout->addStretch();
@@ -62,13 +62,13 @@ JobActivityStatusBar::JobActivityStatusBar(MainWindow *mainWindow)
 
 void JobActivityStatusBar::onActivityChanged(int activity)
 {
-    disconnect(m_activityCombo, SIGNAL(currentIndexChanged(int)),
-            this, SIGNAL(changeActivityRequest(int)));
+    disconnect(m_activityCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &JobActivityStatusBar::changeActivityRequest);
 
     m_activityCombo->setCurrentIndex(activity);
 
-    connect(m_activityCombo, SIGNAL(currentIndexChanged(int)),
-            this, SIGNAL(changeActivityRequest(int)));
+    connect(m_activityCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &JobActivityStatusBar::changeActivityRequest);
 }
 
 //! Init appearance of MainWindow's statusBar.

GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h

@@ -29,7 +29,7 @@ class BA_CORE_API_ JobActivityStatusBar : public QWidget
 {
     Q_OBJECT
 public:
-    JobActivityStatusBar(MainWindow *mainWindow = 0);
+    JobActivityStatusBar(MainWindow* mainWindow);
 
 signals:
     void toggleJobSelectorRequest();
@@ -42,10 +42,10 @@ public slots:
 private:
     void initAppearance();
 
-    QToolButton *m_toggleJobListButton;
-    QComboBox *m_activityCombo;
-    QToolButton *m_dockMenuButton;
-    MainWindow *m_mainWindow;
+    QToolButton* m_toggleJobListButton;
+    QComboBox* m_activityCombo;
+    QToolButton* m_dockMenuButton;
+    MainWindow* m_mainWindow;
 };
 
 #endif // JOBACTIVITYSTATUSBAR_H