X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreinfodlg.cpp;h=d7b1c3c162aa50b205ffcb355c8e136c5c23bdd3;hp=b1759776bc6b69dd62fece41287caa015924caaa;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=fa56ee7fc1b94ea27da6b27c919d6df1c0e0490d;ds=sidebyside diff --git a/src/qtui/coreinfodlg.cpp b/src/qtui/coreinfodlg.cpp index b1759776..d7b1c3c1 100644 --- a/src/qtui/coreinfodlg.cpp +++ b/src/qtui/coreinfodlg.cpp @@ -31,8 +31,8 @@ CoreInfoDlg::CoreInfoDlg(QWidget *parent) : QDialog(parent) { ui.setupUi(this); // Listen for resynchronization events (pre-0.13 cores only) - connect(Client::instance(), SIGNAL(coreInfoResynchronized()), - this, SLOT(coreInfoResynchronized())); + connect(Client::instance(), &Client::coreInfoResynchronized, + this, &CoreInfoDlg::coreInfoResynchronized); // Update legacy core info for Quassel cores earlier than 0.13. This does nothing on modern // cores. @@ -60,7 +60,7 @@ void CoreInfoDlg::refreshLegacyCoreInfo() { // On legacy cores, CoreInfo data does not send signals. Periodically poll for information. // 15 seconds seems like a reasonable trade-off as this only happens while the dialog is open. - QTimer::singleShot(15 * 1000, this, SLOT(refreshLegacyCoreInfo())); + QTimer::singleShot(15 * 1000, this, &CoreInfoDlg::refreshLegacyCoreInfo); } @@ -69,8 +69,8 @@ void CoreInfoDlg::coreInfoResynchronized() { CoreInfo *coreInfo = Client::coreInfo(); // Listen for changes to core information - connect(coreInfo, SIGNAL(coreDataChanged(const QVariantMap &)), - this, SLOT(coreInfoChanged(const QVariantMap &))); + connect(coreInfo, &CoreInfo::coreDataChanged, + this, &CoreInfoDlg::coreInfoChanged); // Update with any known core information set before connecting the signal. This is needed for // both modern (0.13+) and legacy cores. @@ -100,7 +100,8 @@ void CoreInfoDlg::coreInfoChanged(const QVariantMap &coreInfo) { } else { ui.labelCoreVersionDate->setText( - tryFormatUnixEpoch(coreInfo["quasselBuildDate"].toString())); + tryFormatUnixEpoch(coreInfo["quasselBuildDate"].toString(), + Qt::DateFormat::DefaultLocaleShortDate)); } ui.labelClientCount->setNum(coreInfo["sessionConnectedClients"].toInt()); } @@ -128,7 +129,7 @@ void CoreInfoDlg::coreInfoChanged(const QVariantMap &coreInfo) { // The layout stretch item should never be removed, so count should always be >= 1. ui.coreSessionContainer->insertWidget(ui.coreSessionContainer->count() - 1, coreSessionWidget, 0, Qt::AlignTop); - connect(coreSessionWidget, SIGNAL(disconnectClicked(int)), this, SLOT(disconnectClicked(int))); + connect(coreSessionWidget, &CoreSessionWidget::disconnectClicked, this, &CoreInfoDlg::disconnectClicked); } } @@ -174,7 +175,8 @@ void CoreInfoDlg::updateUptime() { .arg(uphours, 2, 10, QChar('0')) .arg(upmins, 2, 10, QChar('0')) .arg(uptime, 2, 10, QChar('0')) - .arg(startTime.toLocalTime().toString(Qt::TextDate)); + .arg(startTime.toLocalTime() + .toString(Qt::DefaultLocaleShortDate)); ui.labelUptime->setText(uptimeText); } }