TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 11 deletions

diff --git a/krdc/kservicelocator.h b/krdc/kservicelocator.h
index c9439279..05e75f6e 100644
--- a/krdc/kservicelocator.h
+++ b/krdc/kservicelocator.h
@@ -41,6 +41,7 @@ class KServiceLocatorPrivate;
  */
 class KServiceLocator : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
  private:
         friend class KServiceLocatorPrivate;
         KServiceLocatorPrivate *d;
@@ -48,12 +49,12 @@ class KServiceLocator : public TQObject {
  public:
 	/**
 	 * Creates a new KServiceLocator.
-	 * @param lang the language to search in, or TQString::null for the 
+	 * @param lang the language to search in, or TQString() for the 
 	 *             default language
 	 * @param async true to create the service locator in asynchronous
 	 *                   mode, false otherwise
 	 */
-        KServiceLocator(const TQString &lang = TQString::null, 
+        KServiceLocator(const TQString &lang = TQString(), 
 			bool async = true);
 
 	virtual ~KServiceLocator();
@@ -78,15 +79,15 @@ class KServiceLocator : public TQObject {
 	 * This function requires the presence of the SLP library, otherwise it
 	 * will return the original value.
 	 * @param value the attribute value to decode
-	 * @return the decoded value. If @p value was TQString::null or decoding
-	 *         failed, TQString::null will be returned
+	 * @return the decoded value. If @p value was TQString() or decoding
+	 *         failed, TQString() will be returned
 	 */
 	static TQString decodeAttributeValue(const TQString &value);
 
 	/**
 	 * Parses a comma-separated string of lists, as returned by many signals.
 	 * @param list the comma-separated list
-	 * @return the items as a QStringList
+	 * @return the items as a TQStringList
 	 */
 	static TQStringList parseCommaList(const TQString &list);
 
@@ -150,8 +151,8 @@ class KServiceLocator : public TQObject {
 	 *                  scopes
 	 * @return true if the operation was successful
 	 */
-	bool findServiceTypes(const TQString &namingAuthority = TQString::null,
-			      const TQString &scopelist = TQString::null);
+	bool findServiceTypes(const TQString &namingAuthority = TQString(),
+			      const TQString &scopelist = TQString());
 
 	/**
 	 * Finds all services in the given scope with the given service type.
@@ -178,8 +179,8 @@ class KServiceLocator : public TQObject {
 	 * @return true if the operation was successful
 	 */
 	bool findServices(const TQString &srvtype, 
-			  const TQString &filter = TQString::null, 
-			  const TQString &scopelist = TQString::null);
+			  const TQString &filter = TQString(), 
+			  const TQString &scopelist = TQString());
 
 	/**
 	 * Finds the attributes of the service with the given URL.
@@ -193,12 +194,12 @@ class KServiceLocator : public TQObject {
 	 * 
 	 * @param serviceURL the URL of the service to search
 	 * @param attributeIds a comma-separated list of attributes to 
-	 *                     retrieve, or TQString::null to retrieve all
+	 *                     retrieve, or TQString() to retrieve all
 	 *                     attributes
 	 * @return true if the operation was successful
 	 */
 	bool findAttributes(const TQString &serviceUrl,
-			    const TQString &attributeIds = TQString::null);
+			    const TQString &attributeIds = TQString());
 
 	/**
 	 * Finds all scopes that can be searched. Always finds at least