From e8a1cdc01d38125bea12d5494db977ae6429919a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 1 Mar 2012 13:29:58 -0600
Subject: Rename additional global TQt functions

---
 kioslave/man/kio_man.cpp               | 12 ++++++------
 kioslave/man/man2html.cpp              | 12 ++++++------
 kioslave/sftp/process.cpp              |  2 +-
 kioslave/smtp/interactivesmtpserver.cc |  4 ++--
 kioslave/smtp/smtp.cc                  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kioslave')

diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 61f3ef45f..4f796c6f9 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -1124,7 +1124,7 @@ int compare_man_index(const void *s1, const void *s2)
     // this is a bit tricky
     if ( m1->manpage_len > m2->manpage_len)
     {
-	i = qstrnicmp( m1->manpage_begin,
+	i = tqstrnicmp( m1->manpage_begin,
 		      m2->manpage_begin,
 		      m2->manpage_len);
 	if (!i)
@@ -1134,7 +1134,7 @@ int compare_man_index(const void *s1, const void *s2)
 
     if ( m1->manpage_len < m2->manpage_len)
     {
-	i = qstrnicmp( m1->manpage_begin,
+	i = tqstrnicmp( m1->manpage_begin,
 		      m2->manpage_begin,
 		      m1->manpage_len);
 	if (!i)
@@ -1142,7 +1142,7 @@ int compare_man_index(const void *s1, const void *s2)
 	return i;
     }
 
-    return qstrnicmp( m1->manpage_begin,
+    return tqstrnicmp( m1->manpage_begin,
 		     m2->manpage_begin,
 		     m1->manpage_len);
 }
@@ -1167,7 +1167,7 @@ private:
 	    // with the shorter length
 	    if (m1->manpage_len > m2->manpage_len)
 	    {
-		i = qstrnicmp(m1->manpage_begin,
+		i = tqstrnicmp(m1->manpage_begin,
 			     m2->manpage_begin,
 			     m2->manpage_len);
 		if (!i)
@@ -1178,7 +1178,7 @@ private:
 	    if (m1->manpage_len > m2->manpage_len)
 	    {
 
-		i = qstrnicmp(m1->manpage_begin,
+		i = tqstrnicmp(m1->manpage_begin,
 			     m2->manpage_begin,
 			     m1->manpage_len);
 		if (!i)
@@ -1186,7 +1186,7 @@ private:
 		return i;
 	    }
 
-	    return qstrnicmp(m1->manpage_begin,
+	    return tqstrnicmp(m1->manpage_begin,
 			    m2->manpage_begin,
 			    m1->manpage_len);
 	}
diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp
index 2a8a1a19c..ec46b2d3d 100644
--- a/kioslave/man/man2html.cpp
+++ b/kioslave/man/man2html.cpp
@@ -203,7 +203,7 @@ static char *stralloc(int len)
 static char *strlimitcpy(char *to, char *from, int n, int limit)
 {                               /* Assumes space for limit plus a null */
   const int len = n > limit ? limit : n;
-  qstrncpy(to, from, len + 1);
+  tqstrncpy(to, from, len + 1);
   to[len] = '\0';
   return to;
 }
@@ -956,7 +956,7 @@ static void out_html(const char *c)
   if (!c) return;
 
   // Added, probably due to the const?
-  char *c2 = qstrdup(c);
+  char *c2 = tqstrdup(c);
   char *c3 = c2;
 
   static int obp=0;
@@ -1848,7 +1848,7 @@ public:
     }
     void setContents(const char *_contents) {
         delete [] contents;
-        contents = qstrdup(_contents);
+        contents = tqstrdup(_contents);
     }
     const char *getContents() const { return contents; }
 
@@ -2788,7 +2788,7 @@ static void request_while( char*& c, int j, bool mdoc )
     while ( result )
     {
         // Unlike for a normal macro, we have the condition at start, so we do not need to prepend extra bytes
-        char* liveloop = qstrdup( macro.data() );
+        char* liveloop = tqstrdup( macro.data() );
         kdDebug(7107) << "Scanning .while condition" << endl;
         kdDebug(7101) << "Loop macro " << liveloop << endl;
         char* end_expression = scan_expression( liveloop, &result );
@@ -3165,7 +3165,7 @@ static char *scan_request(char *c)
                     scan_troff_mandoc(wordlist[i],1,&h);
                 else
                     scan_troff(wordlist[i],1,&h);
-                wordlist[i] = qstrdup(h);
+                wordlist[i] = tqstrdup(h);
                 delete [] h;
             }
             for ( i=words; i<max_wordlist; i++ ) wordlist[i]=NULL;
@@ -3175,7 +3175,7 @@ static char *scan_request(char *c)
                 const unsigned int length = (*it).m_output.length();
                 char* work = new char [length+2];
                 work[0] = '\n'; // The macro must start after an end of line to allow a request on first line
-                qstrncpy(work+1,(*it).m_output.data(),length+1);
+                tqstrncpy(work+1,(*it).m_output.data(),length+1);
                 const TQValueList<char*> oldArgumentList( s_argumentList );
                 s_argumentList.clear();
                 for ( i = 0 ; i < max_wordlist; i++ )
diff --git a/kioslave/sftp/process.cpp b/kioslave/sftp/process.cpp
index 5fcf734c9..885fe7636 100644
--- a/kioslave/sftp/process.cpp
+++ b/kioslave/sftp/process.cpp
@@ -396,7 +396,7 @@ int MyPtyProcess::waitForChild()
 	    TQCString line = readLine(false);
 	    while (!line.isNull()) 
 	    {
-		if (!m_Exit.isEmpty() && !qstrnicmp(line, m_Exit, m_Exit.length()))
+		if (!m_Exit.isEmpty() && !tqstrnicmp(line, m_Exit, m_Exit.length()))
 		    kill(m_Pid, SIGTERM);
 		if (m_bTerminal) 
 		{
diff --git a/kioslave/smtp/interactivesmtpserver.cc b/kioslave/smtp/interactivesmtpserver.cc
index 50cd6f036..54c0b58be 100644
--- a/kioslave/smtp/interactivesmtpserver.cc
+++ b/kioslave/smtp/interactivesmtpserver.cc
@@ -82,8 +82,8 @@ int main( int argc, char * argv[] ) {
 
   InteractiveSMTPServer server;
 
-  qDebug( "Server should now listen on localhost:2525" );
-  qDebug( "Hit CTRL-C to quit." );
+  tqDebug( "Server should now listen on localhost:2525" );
+  tqDebug( "Hit CTRL-C to quit." );
   return app.exec();
 };
 
diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc
index e493f5132..b9eb94d62 100644
--- a/kioslave/smtp/smtp.cc
+++ b/kioslave/smtp/smtp.cc
@@ -109,7 +109,7 @@ int kdemain(int argc, char **argv)
     exit(-1);
   }
 #endif
-  SMTPProtocol slave( argv[2], argv[3], qstricmp( argv[1], "smtps" ) == 0 );
+  SMTPProtocol slave( argv[2], argv[3], tqstricmp( argv[1], "smtps" ) == 0 );
   slave.dispatchLoop();
 #ifdef HAVE_LIBSASL2
   sasl_done();
-- 
cgit v1.2.1