Convert remainder of kdelibs to use currently defined tqt object name defs

This might fix the kio ssl problem


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

4 files changed, 7 insertions, 7 deletions

diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index bb5731eec..c7b8d97f0 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -203,7 +203,7 @@ protected:
     KScanDialogFactory( TQObject *parent=0, const char *name=0 );
 
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                                   const char* classname = "TQObject",
+                                   const char* classname = TQOBJECT_OBJECT_NAME_STRING,
                                    const TQStringList &args = TQStringList() );
 
 
@@ -339,7 +339,7 @@ protected:
     KOCRDialogFactory( TQObject *parent=0, const char *name=0 );
 
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                                   const char* className = "TQObject",
+                                   const char* className = TQOBJECT_OBJECT_NAME_STRING,
                                    const TQStringList &args = TQStringList() );
 
 
diff --git a/kio/kssl/ksslcertificatecache.cc b/kio/kssl/ksslcertificatecache.cc
index 226e21c71..2eecd66d6 100644
--- a/kio/kssl/ksslcertificatecache.cc
+++ b/kio/kssl/ksslcertificatecache.cc
@@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) {
                             "cacheGetHostList(KSSLCertificate)",
                             data, rettype, retval);
 
-     if (rc && rettype == "TQStringList") {
+     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
         TQDataStream retStream(retval, IO_ReadOnly);
         TQStringList drc;
         retStream >> drc;
@@ -347,7 +347,7 @@ TQStringList KSSLCertificateCache::getKDEKeyByEmail(const TQString &email) {
                             "getKDEKeyByEmail(TQString)",
                             data, rettype, retval);
 
-     if (rc && rettype == "TQStringList") {
+     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
         TQDataStream retStream(retval, IO_ReadOnly);
         TQStringList drc;
         retStream >> drc;
diff --git a/kio/kssl/ksslsigners.cc b/kio/kssl/ksslsigners.cc
index 2392f4a36..028ddf555 100644
--- a/kio/kssl/ksslsigners.cc
+++ b/kio/kssl/ksslsigners.cc
@@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() {
                          "caList()",
                          data, rettype, retval);
 
-     if (rc && rettype == "TQStringList") {
+     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
         TQDataStream retStream(retval, IO_ReadOnly);
         retStream >> drc;
      }
@@ -218,7 +218,7 @@ TQString KSSLSigners::getCert(TQString subject) {
                          "caGetCert(TQString)",
                          data, rettype, retval);
 
-     if (rc && rettype == "TQString") {
+     if (rc && rettype == TQSTRING_OBJECT_NAME_STRING) {
         TQDataStream retStream(retval, IO_ReadOnly);
         retStream >> drc;
      }
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index f843dc045..48ff7ae84 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -130,7 +130,7 @@ namespace KPAC
         for ( RequestQueue::ConstIterator it = m_requestQueue.begin();
               it != m_requestQueue.end(); ++it )
         {
-            TQCString type = "TQString";
+            TQCString type = TQSTRING_OBJECT_NAME_STRING;
             TQByteArray data;
             TQDataStream ds( data, IO_WriteOnly );
             if ( success ) ds << handleRequest( ( *it ).url );