Modified TQT_DBusObjectPath to inherit from TQString instead of

TQCString.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 32 insertions, 23 deletions

diff --git a/src/tqdbusobjectpath.cpp b/src/tqdbusobjectpath.cpp
index 0f42860..bdd9634 100644
--- a/src/tqdbusobjectpath.cpp
+++ b/src/tqdbusobjectpath.cpp
@@ -1,4 +1,4 @@
-/* qdbusobjectpath.cpp DBUS object path data type
+/* tqdbusobjectpath.cpp DBUS object path data type
  *
  * Copyright (C) 2007 Kevin Krammer <kevin.krammer@gmx.at>
  *
@@ -23,24 +23,25 @@
 
 #include "tqdbusobjectpath.h"
 
-TQT_DBusObjectPath::TQT_DBusObjectPath() : TQCString()
+TQT_DBusObjectPath::TQT_DBusObjectPath() : TQString()
 {
 }
 
-TQT_DBusObjectPath::TQT_DBusObjectPath(const TQT_DBusObjectPath& other) : TQCString(static_cast<const TQCString&>(other))
+TQT_DBusObjectPath::TQT_DBusObjectPath(const TQT_DBusObjectPath &other) : TQString(static_cast<const TQString&>(other))
 {
 }
 
-TQT_DBusObjectPath::TQT_DBusObjectPath(const TQCString& other) : TQCString(static_cast<const TQCString&>(other))
+TQT_DBusObjectPath::TQT_DBusObjectPath(const TQString &other) : TQString(static_cast<const TQString&>(other))
 {
 }
 
-TQT_DBusObjectPath::TQT_DBusObjectPath(const TQT_DBusObjectPath& parentNode,
-                                 const TQCString& nodeName)
-    : TQCString(static_cast<const TQCString&>(parentNode))
+TQT_DBusObjectPath::TQT_DBusObjectPath(const TQT_DBusObjectPath &parentNode, const TQString &nodeName)
+    : TQString(static_cast<const TQString&>(parentNode))
 {
-    if (parentNode.length() != 1) append("/");
-
+    if (parentNode.length() != 1)
+    {
+      append("/");
+    }
     append(nodeName);
 }
 
@@ -51,29 +52,37 @@ bool TQT_DBusObjectPath::isValid() const
 
 TQT_DBusObjectPath TQT_DBusObjectPath::parentNode() const
 {
-    if (length() == 1) return TQT_DBusObjectPath();
+    if (length() == 1)
+    {
+      return TQT_DBusObjectPath();
+    }
 
     int index = findRev('/');
-
-    if (index == -1) return TQT_DBusObjectPath();
-
-    if (index == 0) return left(1);
+    if (index == -1)
+    {
+      return TQT_DBusObjectPath();
+    }
+    else if (index == 0)
+    {
+      return left(1);
+    }
 
     return left(index);
 }
 
-int TQT_DBusObjectPath::validate(const TQCString& path)
+int TQT_DBusObjectPath::validate(const TQString &path)
 {
-    if (path.isEmpty()) return 0;
-
-    if (path[0] != '/') return 0;
-
-    // TODO add additional checks
-
-    uint len = path.length();
+    if (path.isEmpty() || path[0] != '/')
+    {
+      return 0;
+    }
 
     // only root node allowed to end in slash
-    if (path[len - 1] == '/' && len > 1) return (len - 1);
+    uint len = path.length();
+    if (path[len - 1] == '/' && len > 1)
+    {
+      return (len - 1);
+    }
 
     return -1;
 }