From kde-commits Wed Nov 04 19:46:42 2015 From: Vyacheslav Matyushin Date: Wed, 04 Nov 2015 19:46:42 +0000 To: kde-commits Subject: [ksystemlog] src/modes/journald: Journald mode: transition to new connect syntax. Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=144666641306396 Git commit 66174edce3964d1bff34341f9a5d387ea8deebfe by Vyacheslav Matyushin. Committed on 04/11/2015 at 19:46. Pushed by vmatyushin into branch 'master'. Journald mode: transition to new connect syntax. M +4 -1 src/modes/journald/journaldConfiguration.cpp M +16 -10 src/modes/journald/journaldConfigurationWidget.cpp M +4 -3 src/modes/journald/journaldLocalAnalyzer.cpp M +2 -1 src/modes/journald/journaldLogMode.cpp M +5 -6 src/modes/journald/journaldNetworkAnalyzer.cpp http://commits.kde.org/ksystemlog/66174edce3964d1bff34341f9a5d387ea8deebfe diff --git a/src/modes/journald/journaldConfiguration.cpp b/src/modes/journ= ald/journaldConfiguration.cpp index 6d13892..07e8dbb 100644 --- a/src/modes/journald/journaldConfiguration.cpp +++ b/src/modes/journald/journaldConfiguration.cpp @@ -79,6 +79,9 @@ void JournaldConfiguration::setRemoteJournals(const QList= &remot { m_remoteJournals.clear(); for (const JournalAddress &addressInfo : remoteJournals) { - m_remoteJournals.append(QString("%1|%2|%3").arg(addressInfo.addres= s).arg(addressInfo.port).arg(addressInfo.https ? 1 : 0)); + m_remoteJournals.append(QString("%1|%2|%3") + .arg(addressInfo.address) + .arg(addressInfo.port) + .arg(addressInfo.https ? 1 : 0)); } } diff --git a/src/modes/journald/journaldConfigurationWidget.cpp b/src/modes= /journald/journaldConfigurationWidget.cpp index f8fa91b..053cfe2 100644 --- a/src/modes/journald/journaldConfigurationWidget.cpp +++ b/src/modes/journald/journaldConfigurationWidget.cpp @@ -36,16 +36,22 @@ JournaldConfigurationWidget::JournaldConfigurationWidge= t() setupUi(this); = remoteJournalsListWidget->horizontalHeader()->setSectionResizeMode(QHe= aderView::Stretch); - connect(remoteJournalsListWidget, SIGNAL(itemSelectionChanged()), SLOT= (updateButtons())); - - connect(lastBootOnly, SIGNAL(stateChanged(int)), SIGNAL(configurationC= hanged())); - connect(currentUserEntries, SIGNAL(stateChanged(int)), SIGNAL(configur= ationChanged())); - connect(systemEntries, SIGNAL(stateChanged(int)), SIGNAL(configuration= Changed())); - - connect(addAddressButton, SIGNAL(clicked(bool)), SLOT(addRemoteJournal= ())); - connect(modifyAddressButton, SIGNAL(clicked(bool)), SLOT(modifyRemoteJ= ournal())); - connect(removeAddressButton, SIGNAL(clicked(bool)), SLOT(removeRemoteJ= ournal())); - connect(remoteJournalsListWidget, SIGNAL(cellDoubleClicked(int, int)),= SLOT(tableItemClicked(int))); + connect(remoteJournalsListWidget, &QTableWidget::itemSelectionChanged,= this, + &JournaldConfigurationWidget::updateButtons); + + connect(lastBootOnly, &QCheckBox::stateChanged, this, &JournaldConfigu= rationWidget::configurationChanged); + connect(currentUserEntries, &QCheckBox::stateChanged, this, + &JournaldConfigurationWidget::configurationChanged); + connect(systemEntries, &QCheckBox::stateChanged, this, + &JournaldConfigurationWidget::configurationChanged); + + connect(addAddressButton, &QPushButton::clicked, this, &JournaldConfig= urationWidget::addRemoteJournal); + connect(modifyAddressButton, &QPushButton::clicked, this, + &JournaldConfigurationWidget::modifyRemoteJournal); + connect(removeAddressButton, &QPushButton::clicked, this, + &JournaldConfigurationWidget::removeRemoteJournal); + connect(remoteJournalsListWidget, &QTableWidget::cellDoubleClicked, th= is, + &JournaldConfigurationWidget::tableItemClicked); } = void JournaldConfigurationWidget::saveConfig() diff --git a/src/modes/journald/journaldLocalAnalyzer.cpp b/src/modes/journ= ald/journaldLocalAnalyzer.cpp index 428a26f..f26d597 100644 --- a/src/modes/journald/journaldLocalAnalyzer.cpp +++ b/src/modes/journald/journaldLocalAnalyzer.cpp @@ -48,7 +48,8 @@ JournaldLocalAnalyzer::JournaldLocalAnalyzer(LogMode *log= Mode, QString filter) int fd =3D sd_journal_get_fd(m_journal); m_journalNotifier =3D new QSocketNotifier(fd, QSocketNotifier::Read); m_journalNotifier->setEnabled(false); - connect(m_journalNotifier, SIGNAL(activated(int)), this, SLOT(journalD= escriptorUpdated(int))); + connect(m_journalNotifier, &QSocketNotifier::activated, this, + &JournaldLocalAnalyzer::journalDescriptorUpdated); = if (configuration->displayCurrentBootOnly()) { QFile file(QLatin1String("/proc/sys/kernel/random/boot_id")); @@ -87,7 +88,7 @@ void JournaldLocalAnalyzer::watchLogFiles(bool enabled) m_workerMutex.lock(); m_journalWatchers.append(watcher); m_workerMutex.unlock(); - connect(watcher, SIGNAL(finished()), this, SLOT(readJournalInitial= Finished())); + connect(watcher, &JournalWatcher::finished, this, &JournaldLocalAn= alyzer::readJournalInitialFinished); watcher->setFuture(QtConcurrent::run(this, &JournaldLocalAnalyzer:= :readJournal, m_filters)); } else { for (JournalWatcher *watcher : m_journalWatchers) { @@ -198,7 +199,7 @@ void JournaldLocalAnalyzer::journalDescriptorUpdated(in= t fd) m_workerMutex.lock(); m_journalWatchers.append(watcher); m_workerMutex.unlock(); - connect(watcher, SIGNAL(finished()), this, SLOT(readJournalUpdateFinis= hed())); + connect(watcher, &JournalWatcher::finished, this, &JournaldLocalAnalyz= er::readJournalUpdateFinished); watcher->setFuture(QtConcurrent::run(this, &JournaldLocalAnalyzer::rea= dJournal, m_filters)); } = diff --git a/src/modes/journald/journaldLogMode.cpp b/src/modes/journald/jo= urnaldLogMode.cpp index 0bbb931..dfbdead 100644 --- a/src/modes/journald/journaldLogMode.cpp +++ b/src/modes/journald/journaldLogMode.cpp @@ -38,7 +38,8 @@ JournaldLogMode::JournaldLogMode() d->logModeConfiguration =3D QSharedPointer(new = JournaldConfiguration()); = d->logModeConfigurationWidget =3D new JournaldConfigurationWidget(); - connect(d->logModeConfigurationWidget, SIGNAL(configSaved()), SIGNAL(m= enuChanged())); + connect(qobject_cast(d->logModeConfigur= ationWidget), + &JournaldConfigurationWidget::configSaved, this, &JournaldLogM= ode::menuChanged); = d->itemBuilder =3D new JournaldItemBuilder(); = diff --git a/src/modes/journald/journaldNetworkAnalyzer.cpp b/src/modes/jou= rnald/journaldNetworkAnalyzer.cpp index 30ea490..7b0f177 100644 --- a/src/modes/journald/journaldNetworkAnalyzer.cpp +++ b/src/modes/journald/journaldNetworkAnalyzer.cpp @@ -34,8 +34,7 @@ JournaldNetworkAnalyzer::JournaldNetworkAnalyzer(LogMode = *logMode, const Journal { m_address =3D options.address; = - connect(&m_networkManager, SIGNAL(sslErrors(QNetworkReply *, QList)), - SLOT(sslErrors(QNetworkReply *, QList))); + connect(&m_networkManager, &QNetworkAccessManager::sslErrors, this, &J= ournaldNetworkAnalyzer::sslErrors); = JournaldConfiguration *configuration =3D logMode->logModeConfiguration= (); = @@ -280,10 +279,10 @@ void JournaldNetworkAnalyzer::sendRequest(RequestType= requestType) request.setUrl(url); logDebug() << "Journal network analyzer requested" << url; m_reply =3D m_networkManager.get(request); - connect(m_reply, SIGNAL(finished()), SLOT(httpFinished())); - connect(m_reply, SIGNAL(readyRead()), SLOT(httpReadyRead())); - connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)), - SLOT(httpError(QNetworkReply::NetworkError))); + connect(m_reply, &QNetworkReply::finished, this, &JournaldNetworkAnaly= zer::httpFinished); + connect(m_reply, &QNetworkReply::readyRead, this, &JournaldNetworkAnal= yzer::httpReadyRead); + connect(m_reply, static_cast(&QNetworkReply::error), + this, &JournaldNetworkAnalyzer::httpError); } = void JournaldNetworkAnalyzer::updateStatus(QString status)