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, 17 insertions, 17 deletions

diff --git a/krdc/kservicelocator.cpp b/krdc/kservicelocator.cpp
index 3b38ed9a..a14a4dc7 100644
--- a/krdc/kservicelocator.cpp
+++ b/krdc/kservicelocator.cpp
@@ -34,7 +34,7 @@
 #endif
 
 const TQString KServiceLocator::DEFAULT_AUTHORITY = "";
-const TQString KServiceLocator::ALL_AUTHORITIES = TQString::null;
+const TQString KServiceLocator::ALL_AUTHORITIES = TQString();
 
 class AsyncThread;
 
@@ -140,7 +140,7 @@ const int LastServiceTypeSignalEventType = 45001;
 const int LastServiceSignalEventType = 45002;
 const int LastAttributesSignalEventType = 45003;
 const int MaxLastSignalEventType = 45003;
-class LastSignalEvent : public QCustomEvent
+class LastSignalEvent : public TQCustomEvent
 {
 private:
 	bool m_success;
@@ -153,7 +153,7 @@ public:
 };
 
 const int FoundServiceTypesEventType = 45012;
-class FoundServiceTypesEvent : public QCustomEvent
+class FoundServiceTypesEvent : public TQCustomEvent
 {
 private:
 	TQString m_srvtypes;
@@ -166,7 +166,7 @@ public:
 };
 
 const int FoundServiceEventType = 45013;
-class FoundServiceEvent : public QCustomEvent
+class FoundServiceEvent : public TQCustomEvent
 {
 private:
 	TQString m_srvUrl;
@@ -182,7 +182,7 @@ public:
 };
 
 const int FoundAttributesEventType = 45014;
-class FoundAttributesEvent : public QCustomEvent
+class FoundAttributesEvent : public TQCustomEvent
 {
 private:
 	TQString m_attributes;
@@ -195,7 +195,7 @@ public:
 };
 
 const int FoundScopesEventType = 45015;
-class FoundScopesEvent : public QCustomEvent
+class FoundScopesEvent : public TQCustomEvent
 {
 private:
 	TQString m_scopes;
@@ -297,19 +297,19 @@ class AsyncThread : public TQThread {
 protected:
 	SLPHandle m_handle;
 	KServiceLocatorPrivate *m_parent;
-	AsyncThread(SLPHandle handle, KServiceLocatorPrivate *parent) :
+	AsyncThread(SLPHandle handle, KServiceLocatorPrivate *tqparent) :
 		m_handle(handle), 
-		m_parent(parent) {		
+		m_parent(tqparent) {		
 	}
 };
 class FindSrvTypesThread : public AsyncThread {
 	TQString m_namingAuthority, m_scopeList;
 public:
 	FindSrvTypesThread(SLPHandle handle, 
-			   KServiceLocatorPrivate *parent,
+			   KServiceLocatorPrivate *tqparent,
 			   const char *namingAuthority,
 			   const char *scopeList) :
-		AsyncThread(handle, parent),
+		AsyncThread(handle, tqparent),
 		m_namingAuthority(namingAuthority),
 		m_scopeList(scopeList){
 	}
@@ -330,11 +330,11 @@ class FindSrvsThread : public AsyncThread {
 	TQString m_srvUrl, m_scopeList, m_filter;
 public:
 	FindSrvsThread(SLPHandle handle, 
-		       KServiceLocatorPrivate *parent,
+		       KServiceLocatorPrivate *tqparent,
 		       const char *srvUrl,
 		       const char *scopeList,
 		       const char *filter) :
-		AsyncThread(handle, parent),
+		AsyncThread(handle, tqparent),
 		m_srvUrl(srvUrl),
 		m_scopeList(scopeList),
 		m_filter(filter) {
@@ -358,11 +358,11 @@ class FindAttrsThread : public AsyncThread {
 	TQString m_srvUrl, m_scopeList, m_attrIds;
 public:
 	FindAttrsThread(SLPHandle handle, 
-		       KServiceLocatorPrivate *parent,
+		       KServiceLocatorPrivate *tqparent,
 		       const char *srvUrl,
 		       const char *scopeList,
 		       const char *attrIds) :
-		AsyncThread(handle, parent),
+		AsyncThread(handle, tqparent),
 		m_srvUrl(srvUrl),
 		m_scopeList(scopeList),
 		m_attrIds(attrIds) {
@@ -384,8 +384,8 @@ public:
 class FindScopesThread : public AsyncThread {
 public:
 	FindScopesThread(SLPHandle handle, 
-			 KServiceLocatorPrivate *parent) :
-		AsyncThread(handle, parent){
+			 KServiceLocatorPrivate *tqparent) :
+		AsyncThread(handle, tqparent){
 	}
       	virtual void run() {
 		SLPError e;
@@ -638,7 +638,7 @@ TQString KServiceLocator::decodeAttributeValue(const TQString &value) {
 	if (value.isNull())
 		return value;
 	if (SLPUnescape(value.latin1(), &n, SLP_TRUE) != SLP_OK)
-		return TQString::null;
+		return TQString();
 	TQString r(n);
 	SLPFree(n);
 	return r;