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

List:       kde-commits
Subject:    kdenonbeta/libqt-addon/libqt-addon
From:       Thiago Macieira <thiagom () mail ! com>
Date:       2003-05-26 14:47:07
[Download RAW message or body]

CVS commit by thiago: 

added QSocketAddress::toString() const


  M +25 -3     qsocketaddress.cpp   1.9
  M +11 -5     qsocketaddress.h   1.6


--- kdenonbeta/libqt-addon/libqt-addon/qsocketaddress.h  #1.5:1.6
@@ -520,4 +520,10 @@ public:
 
   /**
+   * Returns this socket address as a string suitable for
+   * printing. Family, node and service are part of this address.
+   */
+  QString toString() const;
+
+  /**
    * Returns an object reference that can be used to manipulate this socket
    * as an Internet socket address. Both objects share the same data.

--- kdenonbeta/libqt-addon/libqt-addon/qsocketaddress.cpp  #1.8:1.9
@@ -37,4 +37,5 @@
 #include <qfile.h>
 #include <qsocketaddress.h>
+#include <qobject.h>
 
 ADDON_USE;
@@ -310,8 +311,8 @@ public:
   }
 
-  bool invalid() const
+  inline bool invalid() const
   { return reallen == 0; }
 
-  void invalidate()
+  inline void invalidate()
   { reallen = 0; }
 
@@ -634,4 +635,25 @@ QString QSocketAddress::serviceName() co
 
   return QString::null;
+}
+
+QString QSocketAddress::toString() const
+{
+  if (d->invalid())
+    return QString::null;
+
+  QString fmt;
+
+  if (d->addr.generic->sa_family == AF_INET)
+    fmt = "%1:%2";
+#ifdef AF_INET6
+  else if (d->addr.generic->sa_family == AF_INET6)
+    fmt = "[%1]:%2";
+#endif
+  else if (d->addr.generic->sa_family == AF_UNIX)
+    return QString::fromLatin1("unix:%1").arg(serviceName());
+  else
+    return QObject::tr("Unknown family %1").arg(d->addr.generic->sa_family);
+
+  return fmt.arg(nodeName()).arg(serviceName());
 }
 


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