remove redundant QDBusUtil methods arguments

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 5fdacbf..8973233 100644 (file)
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -64,7 +64,7 @@ static QDBusError checkIfValid(const QString &service, const QString &path,
         return error;
     if (!QDBusUtil::checkObjectPath(path, isDynamic ? QDBusUtil::EmptyNotAllowed : QDBusUtil::EmptyAllowed, &error))
         return error;
-    if (!QDBusUtil::checkInterfaceName(interface, QDBusUtil::EmptyAllowed, &error))
+    if (!QDBusUtil::checkInterfaceName(interface, &error))
         return error;
 
     // no error

diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index d73141c..9ac1bb4 100644 (file)
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -107,9 +107,9 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message, QDB
                 return 0;
             if (!QDBusUtil::checkObjectPath(d_ptr->path, QDBusUtil::EmptyNotAllowed, error))
                 return 0;
-            if (!QDBusUtil::checkInterfaceName(d_ptr->interface, QDBusUtil::EmptyAllowed, error))
+            if (!QDBusUtil::checkInterfaceName(d_ptr->interface, error))
                 return 0;
-            if (!QDBusUtil::checkMemberName(d_ptr->name, QDBusUtil::EmptyNotAllowed, error))
+            if (!QDBusUtil::checkMemberName(d_ptr->name, error))
                 return 0;
         }
 
@@ -127,7 +127,7 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message, QDB
     case DBUS_MESSAGE_TYPE_ERROR:
         // error name can't be empty
         if (!d_ptr->parametersValidated
-            && !QDBusUtil::checkErrorName(d_ptr->name, QDBusUtil::EmptyNotAllowed, error))
+            && !QDBusUtil::checkErrorName(d_ptr->name, error))
             return 0;
 
         msg = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR);
@@ -142,9 +142,9 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message, QDB
         if (!d_ptr->parametersValidated) {
             if (!QDBusUtil::checkObjectPath(d_ptr->path, QDBusUtil::EmptyNotAllowed, error))
                 return 0;
-            if (!QDBusUtil::checkInterfaceName(d_ptr->interface, QDBusUtil::EmptyAllowed, error))
+            if (!QDBusUtil::checkInterfaceName(d_ptr->interface, error))
                 return 0;
-            if (!QDBusUtil::checkMemberName(d_ptr->name, QDBusUtil::EmptyNotAllowed, error))
+            if (!QDBusUtil::checkMemberName(d_ptr->name, error))
                 return 0;
         }
 

diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h
index 56a024d..cf2acf5 100644 (file)
--- a/src/dbus/qdbusutil_p.h
+++ b/src/dbus/qdbusutil_p.h
@@ -86,12 +86,10 @@ namespace QDBusUtil
         EmptyNotAllowed
     };
 
-    inline bool checkInterfaceName(const QString &name, AllowEmptyFlag empty, QDBusError *error)
+    inline bool checkInterfaceName(const QString &name, QDBusError *error)
     {
         if (name.isEmpty()) {
-            if (empty == EmptyAllowed) return true;
-            *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Interface name cannot be empty"));
-            return false;
+            return true;
         }
         if (isValidInterfaceName(name)) return true;
         *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid interface class: %1").arg(name));
@@ -122,10 +120,9 @@ namespace QDBusUtil
         return false;
     }
 
-    inline bool checkMemberName(const QString &name, AllowEmptyFlag empty, QDBusError *error)
+    inline bool checkMemberName(const QString &name, QDBusError *error)
     {
         if (name.isEmpty()) {
-            if (empty == EmptyAllowed) return true;
             *error = QDBusError(QDBusError::InvalidMember, QLatin1String("method name cannot be empty"));
             return false;
         }
@@ -135,10 +132,9 @@ namespace QDBusUtil
         return false;
     }
 
-    inline bool checkErrorName(const QString &name, AllowEmptyFlag empty, QDBusError *error)
+    inline bool checkErrorName(const QString &name, QDBusError *error)
     {
         if (name.isEmpty()) {
-            if (empty == EmptyAllowed) return true;
             *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Error name cannot be empty"));
             return false;
         }