replace "incrementCounter" by "updateCounter"

7 files changed, 38 insertions, 37 deletions

diff --git a/src/base/QXmppLogger.cpp b/src/base/QXmppLogger.cpp
index 34ff2f2f..4b3ec625 100644
--- a/src/base/QXmppLogger.cpp
+++ b/src/base/QXmppLogger.cpp
@@ -62,12 +62,12 @@ static QString formatted(QXmppLogger::MessageType type, const QString& text)
 
 static void relaySignals(QXmppLoggable *from, QXmppLoggable *to)
 {
-    QObject::connect(from, SIGNAL(incrementCounter(QString)),
-                     to, SIGNAL(incrementCounter(QString)));
     QObject::connect(from, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
                      to, SIGNAL(logMessage(QXmppLogger::MessageType,QString)));
     QObject::connect(from, SIGNAL(setGauge(QString,double)),
                      to, SIGNAL(setGauge(QString,double)));
+    QObject::connect(from, SIGNAL(updateCounter(QString,qint64)),
+                     to, SIGNAL(updateCounter(QString,qint64)));
 }
 
 /// Constructs a new QXmppLoggable.
@@ -93,12 +93,12 @@ void QXmppLoggable::childEvent(QChildEvent *event)
     if (event->added()) {
         relaySignals(child, this);
     } else if (event->removed()) {
-        disconnect(child, SIGNAL(incrementCounter(QString)),
-                this, SIGNAL(incrementCounter(QString)));
         disconnect(child, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
                 this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)));
         disconnect(child, SIGNAL(setGauge(QString,double)),
                 this, SIGNAL(setGauge(QString,double)));
+        disconnect(child, SIGNAL(updateCounter(QString,qint64)),
+                this, SIGNAL(updateCounter(QString,qint64)));
     }
 }
 /// \endcond
@@ -192,15 +192,6 @@ void QXmppLogger::setMessageTypes(QXmppLogger::MessageTypes types)
     d->messageTypes = types;
 }
 
-/// Increments the given \a counter.
-///
-/// NOTE: the base implementation does nothing.
-
-void QXmppLogger::incrementCounter(const QString &counter)
-{
-    Q_UNUSED(counter);
-}
-
 /// Add a logging message.
 ///
 /// \param type
@@ -242,6 +233,16 @@ void QXmppLogger::setGauge(const QString &gauge, double value)
     Q_UNUSED(value);
 }
 
+/// Updates the given \a counter by \a amount.
+///
+/// NOTE: the base implementation does nothing.
+
+void QXmppLogger::updateCounter(const QString &counter, qint64 amount)
+{
+    Q_UNUSED(counter);
+    Q_UNUSED(amount);
+}
+
 /// Returns the path to which logging messages should be written.
 ///
 /// \sa loggingType()
diff --git a/src/base/QXmppLogger.h b/src/base/QXmppLogger.h
index b6181b96..9ccef8f5 100644
--- a/src/base/QXmppLogger.h
+++ b/src/base/QXmppLogger.h
@@ -89,8 +89,8 @@ public:
     void setMessageTypes(QXmppLogger::MessageTypes types);
 
 public slots:
-    virtual void incrementCounter(const QString &counter);
     virtual void setGauge(const QString &gauge, double value);
+    virtual void updateCounter(const QString &counter, qint64 amount);
 
     void log(QXmppLogger::MessageType type, const QString& text);
     void reopen();
@@ -166,14 +166,14 @@ protected:
     }
 
 signals:
-    /// Increment the given \a counter.
-    void incrementCounter(const QString &counter);
-
     /// Sets the given \a gauge to \a value.
     void setGauge(const QString &gauge, double value);
 
     /// This signal is emitted to send logging messages.
     void logMessage(QXmppLogger::MessageType type, const QString &msg);
+
+    /// Updates the given \a counter by \a amount.
+    void updateCounter(const QString &counter, qint64 amount = 1);
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QXmppLogger::MessageTypes)
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 98819c3d..59ee65ee 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -575,22 +575,22 @@ void QXmppClient::setLogger(QXmppLogger *logger)
 {
     if (logger != d->logger) {
         if (d->logger) {
-            disconnect(this, SIGNAL(incrementCounter(QString)),
-                       d->logger, SLOT(incrementCounter(QString)));
             disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
                        d->logger, SLOT(log(QXmppLogger::MessageType,QString)));
             disconnect(this, SIGNAL(setGauge(QString,double)),
                        d->logger, SLOT(setGauge(QString,double)));
+            disconnect(this, SIGNAL(updateCounter(QString,qint64)),
+                       d->logger, SLOT(updateCounter(QString,qint64)));
         }
 
         d->logger = logger;
         if (d->logger) {
-            connect(this, SIGNAL(incrementCounter(QString)),
-                    d->logger, SLOT(incrementCounter(QString)));
             connect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
                     d->logger, SLOT(log(QXmppLogger::MessageType,QString)));
             connect(this, SIGNAL(setGauge(QString,double)),
                     d->logger, SLOT(setGauge(QString,double)));
+            connect(this, SIGNAL(updateCounter(QString,qint64)),
+                    d->logger, SLOT(updateCounter(QString,qint64)));
         }
 
         emit loggerChanged(d->logger);
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index 0fbc310a..eace5167 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -122,7 +122,7 @@ QXmppIncomingClient::QXmppIncomingClient(QSslSocket *socket, const QString &doma
     }
 
     info(QString("Incoming client connection from %1").arg(d->origin()));
-    incrementCounter("incoming-client.create");
+    updateCounter("incoming-client.create");
 
     // create inactivity timer
     d->idleTimer = new QTimer(this);
@@ -137,7 +137,7 @@ QXmppIncomingClient::QXmppIncomingClient(QSslSocket *socket, const QString &doma
 
 QXmppIncomingClient::~QXmppIncomingClient()
 {
-    incrementCounter("incoming-client.destroy");
+    updateCounter("incoming-client.destroy");
     delete d;
 }
 
@@ -308,7 +308,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 // authentication succeeded
                 d->jid = QString("%1@%2").arg(d->saslServer->username(), d->domain);
                 info(QString("Authentication succeeded for '%1' from %2").arg(d->jid, d->origin()));
-                incrementCounter("incoming-client.auth.success");
+                updateCounter("incoming-client.auth.success");
                 sendPacket(QXmppSaslSuccess());
                 handleStart();
             } else {
@@ -402,7 +402,7 @@ void QXmppIncomingClient::onDigestReply()
 
     if (reply->error() == QXmppPasswordReply::TemporaryError) {
         warning(QString("Temporary authentication failure for '%1' from %2").arg(d->saslServer->username(), d->origin()));
-        incrementCounter("incoming-client.auth.temporary-auth-failure");
+        updateCounter("incoming-client.auth.temporary-auth-failure");
         sendPacket(QXmppSaslFailure("temporary-auth-failure"));
         disconnectFromHost();
         return;
@@ -414,7 +414,7 @@ void QXmppIncomingClient::onDigestReply()
     QXmppSaslServer::Response result = d->saslServer->respond(reply->property("__sasl_raw").toByteArray(), challenge);
     if (result != QXmppSaslServer::Challenge) {
         warning(QString("Authentication failed for '%1' from %2").arg(d->saslServer->username(), d->origin()));
-        incrementCounter("incoming-client.auth.not-authorized");
+        updateCounter("incoming-client.auth.not-authorized");
         sendPacket(QXmppSaslFailure("not-authorized"));
         disconnectFromHost();
         return;
@@ -436,19 +436,19 @@ void QXmppIncomingClient::onPasswordReply()
     case QXmppPasswordReply::NoError:
         d->jid = jid;
         info(QString("Authentication succeeded for '%1' from %2").arg(d->jid, d->origin()));
-        incrementCounter("incoming-client.auth.success");
+        updateCounter("incoming-client.auth.success");
         sendPacket(QXmppSaslSuccess());
         handleStart();
         break;
     case QXmppPasswordReply::AuthorizationError:
         warning(QString("Authentication failed for '%1' from %2").arg(jid, d->origin()));
-        incrementCounter("incoming-client.auth.not-authorized");
+        updateCounter("incoming-client.auth.not-authorized");
         sendPacket(QXmppSaslFailure("not-authorized"));
         disconnectFromHost();
         break;
     case QXmppPasswordReply::TemporaryError:
         warning(QString("Temporary authentication failure for '%1' from %2").arg(jid, d->origin()));
-        incrementCounter("incoming-client.auth.temporary-auth-failure");
+        updateCounter("incoming-client.auth.temporary-auth-failure");
         sendPacket(QXmppSaslFailure("temporary-auth-failure"));
         disconnectFromHost();
         break;
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index cf16cae6..0bb85a85 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -86,14 +86,14 @@ QXmppIncomingServer::QXmppIncomingServer(QSslSocket *socket, const QString &doma
     }
 
     info(QString("Incoming server connection from %1").arg(d->origin()));
-    incrementCounter("incoming-server.create");
+    updateCounter("incoming-server.create");
 }
 
 /// Destroys the current stream.
 
 QXmppIncomingServer::~QXmppIncomingServer()
 {
-    incrementCounter("incoming-server.destroy");
+    updateCounter("incoming-server.destroy");
     delete d;
 }
 
diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 35f0eec4..af71957a 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -95,7 +95,7 @@ QXmppOutgoingServer::QXmppOutgoingServer(const QString &domain, QObject *parent)
                     this, SLOT(slotSslErrors(QList<QSslError>)));
     Q_ASSERT(check);
 
-    incrementCounter("outgoing-server.create");
+    updateCounter("outgoing-server.create");
 }
 
 /// Destroys the stream.
@@ -103,7 +103,7 @@ QXmppOutgoingServer::QXmppOutgoingServer(const QString &domain, QObject *parent)
 
 QXmppOutgoingServer::~QXmppOutgoingServer()
 {
-    incrementCounter("outgoing-server.destroy");
+    updateCounter("outgoing-server.destroy");
     delete d;
 }
 
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 8c9b6fb0..57f55119 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -394,22 +394,22 @@ void QXmppServer::setLogger(QXmppLogger *logger)
 {
     if (logger != d->logger) {
         if (d->logger) {
-            disconnect(this, SIGNAL(incrementCounter(QString)),
-                       d->logger, SLOT(incrementCounter(QString)));
             disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
                        d->logger, SLOT(log(QXmppLogger::MessageType,QString)));
             disconnect(this, SIGNAL(setGauge(QString,double)),
                        d->logger, SLOT(setGauge(QString,double)));
+            disconnect(this, SIGNAL(updateCounter(QString,qint64)),
+                       d->logger, SLOT(updateCounter(QString,qint64)));
         }
 
         d->logger = logger;
         if (d->logger) {
-            connect(this, SIGNAL(incrementCounter(QString)),
-                    d->logger, SLOT(incrementCounter(QString)));
             connect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
                     d->logger, SLOT(log(QXmppLogger::MessageType,QString)));
             connect(this, SIGNAL(setGauge(QString,double)),
                     d->logger, SLOT(setGauge(QString,double)));
+            connect(this, SIGNAL(updateCounter(QString,qint64)),
+                    d->logger, SLOT(updateCounter(QString,qint64)));
         }
 
         emit loggerChanged(d->logger);