[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ksystemlog] src/modes/journald: Journald mode: transition to new connect syntax.
From:       Vyacheslav Matyushin <v.matyushin () gmail ! com>
Date:       2015-11-04 19:46:42
Message-ID: E1Zu414-00022Q-5W () scm ! kde ! org
[Download RAW message or body]

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/journald/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<JournalAddress> &remot  {
     m_remoteJournals.clear();
     for (const JournalAddress &addressInfo : remoteJournals) {
-        m_remoteJournals.append(QString("%1|%2|%3").arg(addressInfo.address).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::JournaldConfigurationWidget()
     setupUi(this);
 
     remoteJournalsListWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
                
-    connect(remoteJournalsListWidget, SIGNAL(itemSelectionChanged()), \
                SLOT(updateButtons()));
-
-    connect(lastBootOnly, SIGNAL(stateChanged(int)), \
                SIGNAL(configurationChanged()));
-    connect(currentUserEntries, SIGNAL(stateChanged(int)), \
                SIGNAL(configurationChanged()));
-    connect(systemEntries, SIGNAL(stateChanged(int)), \
                SIGNAL(configurationChanged()));
-
-    connect(addAddressButton, SIGNAL(clicked(bool)), SLOT(addRemoteJournal()));
-    connect(modifyAddressButton, SIGNAL(clicked(bool)), \
                SLOT(modifyRemoteJournal()));
-    connect(removeAddressButton, SIGNAL(clicked(bool)), \
                SLOT(removeRemoteJournal()));
-    connect(remoteJournalsListWidget, SIGNAL(cellDoubleClicked(int, int)), \
SLOT(tableItemClicked(int))); +    connect(remoteJournalsListWidget, \
&QTableWidget::itemSelectionChanged, this, +            \
&JournaldConfigurationWidget::updateButtons); +
+    connect(lastBootOnly, &QCheckBox::stateChanged, this, \
&JournaldConfigurationWidget::configurationChanged); +    connect(currentUserEntries, \
&QCheckBox::stateChanged, this, +            \
&JournaldConfigurationWidget::configurationChanged); +    connect(systemEntries, \
&QCheckBox::stateChanged, this, +            \
&JournaldConfigurationWidget::configurationChanged); +
+    connect(addAddressButton, &QPushButton::clicked, this, \
&JournaldConfigurationWidget::addRemoteJournal); +    connect(modifyAddressButton, \
&QPushButton::clicked, this, +            \
&JournaldConfigurationWidget::modifyRemoteJournal); +    connect(removeAddressButton, \
&QPushButton::clicked, this, +            \
&JournaldConfigurationWidget::removeRemoteJournal); +    \
connect(remoteJournalsListWidget, &QTableWidget::cellDoubleClicked, this, +           \
&JournaldConfigurationWidget::tableItemClicked);  }
 
 void JournaldConfigurationWidget::saveConfig()
diff --git a/src/modes/journald/journaldLocalAnalyzer.cpp \
b/src/modes/journald/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 *logMode, \
QString filter)  int fd = sd_journal_get_fd(m_journal);
     m_journalNotifier = new QSocketNotifier(fd, QSocketNotifier::Read);
     m_journalNotifier->setEnabled(false);
-    connect(m_journalNotifier, SIGNAL(activated(int)), this, \
SLOT(journalDescriptorUpdated(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(readJournalInitialFinished())); +        connect(watcher, \
                &JournalWatcher::finished, this, \
                &JournaldLocalAnalyzer::readJournalInitialFinished);
         watcher->setFuture(QtConcurrent::run(this, \
&JournaldLocalAnalyzer::readJournal, m_filters));  } else {
         for (JournalWatcher *watcher : m_journalWatchers) {
@@ -198,7 +199,7 @@ void JournaldLocalAnalyzer::journalDescriptorUpdated(int fd)
     m_workerMutex.lock();
     m_journalWatchers.append(watcher);
     m_workerMutex.unlock();
-    connect(watcher, SIGNAL(finished()), this, SLOT(readJournalUpdateFinished()));
+    connect(watcher, &JournalWatcher::finished, this, \
                &JournaldLocalAnalyzer::readJournalUpdateFinished);
     watcher->setFuture(QtConcurrent::run(this, &JournaldLocalAnalyzer::readJournal, \
m_filters));  }
 
diff --git a/src/modes/journald/journaldLogMode.cpp \
b/src/modes/journald/journaldLogMode.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 = QSharedPointer<JournaldConfiguration>(new \
JournaldConfiguration());  
     d->logModeConfigurationWidget = new JournaldConfigurationWidget();
-    connect(d->logModeConfigurationWidget, SIGNAL(configSaved()), \
SIGNAL(menuChanged())); +    connect(qobject_cast<JournaldConfigurationWidget \
*>(d->logModeConfigurationWidget), +            \
&JournaldConfigurationWidget::configSaved, this, &JournaldLogMode::menuChanged);  
     d->itemBuilder = new JournaldItemBuilder();
 
diff --git a/src/modes/journald/journaldNetworkAnalyzer.cpp \
b/src/modes/journald/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 = options.address;
 
-    connect(&m_networkManager, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
-            SLOT(sslErrors(QNetworkReply *, QList<QSslError>)));
+    connect(&m_networkManager, &QNetworkAccessManager::sslErrors, this, \
&JournaldNetworkAnalyzer::sslErrors);  
     JournaldConfiguration *configuration = \
logMode->logModeConfiguration<JournaldConfiguration *>();  
@@ -280,10 +279,10 @@ void JournaldNetworkAnalyzer::sendRequest(RequestType \
requestType)  request.setUrl(url);
     logDebug() << "Journal network analyzer requested" << url;
     m_reply = 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, \
&JournaldNetworkAnalyzer::httpFinished); +    connect(m_reply, \
&QNetworkReply::readyRead, this, &JournaldNetworkAnalyzer::httpReadyRead); +    \
connect(m_reply, static_cast<void \
(QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), +            \
this, &JournaldNetworkAnalyzer::httpError);  }
 
 void JournaldNetworkAnalyzer::updateStatus(QString status)


[prev in list] [next in list] [prev in thread] [next in thread]