Browse Source

Merge pull request #8881 from thalieht/qt5signalslot

Use qt5 syntax for a few remaining SLOT()
adaptive-webui-19844
sledgehammer999 6 years ago committed by GitHub
parent
commit
0d35527035
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/app/application.cpp
  2. 2
      src/app/main.cpp
  3. 4
      src/base/net/reverseresolution.cpp
  4. 4
      src/gui/mainwindow.cpp

2
src/app/application.cpp

@ -660,7 +660,7 @@ void Application::shutdownCleanup(QSessionManager &manager)
// According to the qt docs we shouldn't call quit() inside a slot. // According to the qt docs we shouldn't call quit() inside a slot.
// aboutToQuit() is never emitted if the user hits "Cancel" in // aboutToQuit() is never emitted if the user hits "Cancel" in
// the above dialog. // the above dialog.
QTimer::singleShot(0, qApp, SLOT(quit())); QTimer::singleShot(0, qApp, &QCoreApplication::quit);
} }
#endif #endif

2
src/app/main.cpp

@ -329,7 +329,7 @@ void showSplashScreen()
painter.drawText(224 - painter.fontMetrics().width(version), 270, version); painter.drawText(224 - painter.fontMetrics().width(version), 270, version);
QSplashScreen *splash = new QSplashScreen(splash_img); QSplashScreen *splash = new QSplashScreen(splash_img);
splash->show(); splash->show();
QTimer::singleShot(1500, splash, SLOT(deleteLater())); QTimer::singleShot(1500, splash, &QObject::deleteLater);
qApp->processEvents(); qApp->processEvents();
} }

4
src/base/net/reverseresolution.cpp

@ -65,7 +65,11 @@ void ReverseResolution::resolve(const QString &ip)
} }
else { else {
// Actually resolve the ip // Actually resolve the ip
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
m_lookups.insert(QHostInfo::lookupHost(ip, this, &ReverseResolution::hostResolved), ip);
#else
m_lookups.insert(QHostInfo::lookupHost(ip, this, SLOT(hostResolved(QHostInfo))), ip); m_lookups.insert(QHostInfo::lookupHost(ip, this, SLOT(hostResolved(QHostInfo))), ip);
#endif
} }
} }

4
src/gui/mainwindow.cpp

@ -375,7 +375,7 @@ MainWindow::MainWindow(QWidget *parent)
on_actionWarningMessages_triggered(m_ui->actionWarningMessages->isChecked()); on_actionWarningMessages_triggered(m_ui->actionWarningMessages->isChecked());
on_actionCriticalMessages_triggered(m_ui->actionCriticalMessages->isChecked()); on_actionCriticalMessages_triggered(m_ui->actionCriticalMessages->isChecked());
if (m_ui->actionSearchWidget->isChecked()) if (m_ui->actionSearchWidget->isChecked())
QTimer::singleShot(0, this, SLOT(on_actionSearchWidget_triggered())); QTimer::singleShot(0, this, &MainWindow::on_actionSearchWidget_triggered);
// Auto shutdown actions // Auto shutdown actions
QActionGroup *autoShutdownGroup = new QActionGroup(this); QActionGroup *autoShutdownGroup = new QActionGroup(this);
@ -1213,7 +1213,7 @@ bool MainWindow::event(QEvent *e)
if (!hasModalWindow) { if (!hasModalWindow) {
qDebug("Minimize to Tray enabled, hiding!"); qDebug("Minimize to Tray enabled, hiding!");
e->ignore(); e->ignore();
QTimer::singleShot(0, this, SLOT(hide())); QTimer::singleShot(0, this, &QWidget::hide);
return true; return true;
} }
} }

Loading…
Cancel
Save