Rename a number of old tq methods that are no longer tq specific

11 files changed, 64 insertions, 64 deletions

diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index db2b45b6c..9af382483 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -32,7 +32,7 @@
 #include "des.h"
 #include "kntlm.h"
 
-TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode )
+TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
 {
   //watch for buffer overflows
   TQ_UINT32 offset;
@@ -45,10 +45,10 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq
   TQString str;
   const char *c = buf.data() + offset;
   
-  if ( tqunicode ) {
+  if ( unicode ) {
     str = UnicodeLE2TQString( (TQChar*) c, len >> 1 );
   } else {
-    str = TQString::tqfromLatin1( c, len );
+    str = TQString::fromLatin1( c, len );
   }
   return str;
 }
@@ -67,11 +67,11 @@ TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
   return ret;
 }
 
-void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode )
+void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode )
 {
   TQByteArray tmp;
 
-  if ( tqunicode ) {
+  if ( unicode ) {
     tmp = QString2UnicodeLE( str );
     addBuf( buf, secbuf, tmp );
   } else {
@@ -126,15 +126,15 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
   Challenge *ch = (Challenge *) challenge.data();
   TQByteArray response;
   uint chsize = challenge.size();
-  bool tqunicode = false;
+  bool unicode = false;
   TQString dom;
 
   //challenge structure too small
   if ( chsize < 32 ) return false;
 
-  tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
+  unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
   if ( domain.isEmpty() )
-    dom = getString( challenge, ch->targetName, tqunicode );
+    dom = getString( challenge, ch->targetName, unicode );
   else
     dom = domain;
     
@@ -164,10 +164,10 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
     addBuf( rbuf, ((Auth*) rbuf.data())->lmResponse, response );
 //  }
   if ( !dom.isEmpty() )
-    addString( rbuf, ((Auth*) rbuf.data())->domain, dom, tqunicode );
-  addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode );
+    addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode );
+  addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode );
   if ( !workstation.isEmpty() )
-    addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode );
+    addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode );
 
   auth = rbuf;
 
@@ -241,10 +241,10 @@ TQByteArray KNTLM::getNTLMResponse( const TQString &password, const unsigned cha
 TQByteArray KNTLM::ntlmHash( const TQString &password )
 {
   KMD4::Digest digest;
-  TQByteArray ret, tqunicode;
-  tqunicode = QString2UnicodeLE( password );
+  TQByteArray ret, unicode;
+  unicode = QString2UnicodeLE( password );
 
-  KMD4 md4( tqunicode );
+  KMD4 md4( unicode );
   md4.rawDigest( digest );
   ret.duplicate( (const char*) digest, sizeof( digest ) );
   return ret;
@@ -299,7 +299,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
   
   Blob *bl = (Blob *) blob.data();
   bl->signature = KFromToBigEndian( (TQ_UINT32) 0x01010000 );
-  TQ_UINT64 now = TQDateTime::tqcurrentDateTime().toTime_t();
+  TQ_UINT64 now = TQDateTime::currentDateTime().toTime_t();
   now += (TQ_UINT64)3600*(TQ_UINT64)24*(TQ_UINT64)134774;
   now *= (TQ_UINT64)10000000;
   bl->timestamp = KFromToLittleEndian( now );
@@ -372,18 +372,18 @@ void KNTLM::convertKey( unsigned char *key_56, void* ks )
 
 TQByteArray KNTLM::QString2UnicodeLE( const TQString &target )
 {
-  TQByteArray tqunicode( target.length() * 2 );
+  TQByteArray unicode( target.length() * 2 );
   for ( uint i = 0; i < target.length(); i++ ) {
-    ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() );
+    ((TQ_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() );
   }
-  return tqunicode;
+  return unicode;
 }
 
 TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len )
 {
   TQString ret;
   for ( uint i = 0; i < len; i++ ) {
-    ret += KFromToLittleEndian( data[ i ].tqunicode() );
+    ret += KFromToLittleEndian( data[ i ].unicode() );
   }
   return ret;
 }
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 2be0a00af..462624fcd 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -212,7 +212,7 @@ public:
   /**
    * Extracts a string field from an NTLM structure.
    */
-  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode );
+  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode );
   /**
    * Extracts a byte array from an NTLM structure.
    */
@@ -226,7 +226,7 @@ private:
   static TQString UnicodeLE2TQString( const TQChar* data, uint len );
 
   static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data );
-  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false );
+  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false );
   static void convertKey( unsigned char *key_56, void* ks );
 };
 
diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp
index 6f419f5f5..f301cc697 100644
--- a/kio/misc/kpac/downloader.cpp
+++ b/kio/misc/kpac/downloader.cpp
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kcharsets.h>
 #include <kglobal.h>
diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp
index 243f5f9c2..55faef8a1 100644
--- a/kio/misc/kpac/script.cpp
+++ b/kio/misc/kpac/script.cpp
@@ -49,7 +49,7 @@ TQString UString::qstring() const
 UString::UString( const TQString &s )
 {
     UChar* data = new UChar[ s.length() ];
-    std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) );
+    std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) );
     rep = Rep::create( data, s.length() );
 }
 
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 46475e9aa..ae446da65 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kapplication.h>
 #include <kemailsettings.h>
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
     if (recipient.isEmpty())
         recipient = "submit@bugs.kde.org";
     else {
-        if (recipient.tqat(0) == '\'') {
+        if (recipient.at(0) == '\'') {
             recipient = recipient.mid(1).left(recipient.length() - 2);
         }
     }
@@ -84,7 +84,7 @@ int main(int argc, char **argv) {
     if (subject.isEmpty())
         subject = "(no subject)";
     else {
-        if (subject.tqat(0) == '\'')
+        if (subject.at(0) == '\'')
             subject = subject.mid(1).left(subject.length() - 2);
     }
     TQTextIStream input(stdin);
@@ -101,11 +101,11 @@ int main(int argc, char **argv) {
     if (!fromaddr.isEmpty()) {
         TQString name = emailConfig.getSetting(KEMailSettings::RealName);
         if (!name.isEmpty())
-            fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
+            fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
     } else {
         struct passwd *p;
         p = getpwuid(getuid());
-        fromaddr = TQString::tqfromLatin1(p->pw_name);
+        fromaddr = TQString::fromLatin1(p->pw_name);
         fromaddr += "@";
         char buffer[256];
 	buffer[0] = '\0';
@@ -117,7 +117,7 @@ int main(int argc, char **argv) {
 
     TQString  server = emailConfig.getSetting(KEMailSettings::OutServer);
     if (server.isEmpty())
-        server=TQString::tqfromLatin1("bugs.kde.org");
+        server=TQString::fromLatin1("bugs.kde.org");
 
     SMTP *sm = new SMTP;
     BugMailer bm(sm);
@@ -129,7 +129,7 @@ int main(int argc, char **argv) {
     sm->setSenderAddress(fromaddr);
     sm->setRecipientAddress(recipient);
     sm->setMessageSubject(subject);
-    sm->setMessageHeader(TQString::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient.data()));
+    sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient.data()));
     sm->setMessageBody(text);
     sm->sendMessage();
 
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index a9f69792d..36a417b88 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -134,7 +134,7 @@ void SMTP::sendMessage(void)
         kdDebug() << "state was == FINISHED\n" << endl;
         finished = false;
         state = IN;
-        writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+        writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
         write(sock->socket(), writeString.ascii(), writeString.length());
     }
     if(connected){
@@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line)
     switch(stat){
     case GREET:     //220
         state = IN;
-        writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+        writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
         kdDebug() << "out: " << writeString << endl;
 	write(sock->socket(), writeString.ascii(), writeString.length());
         break;
@@ -273,19 +273,19 @@ void SMTP::processLine(TQString *line)
         switch(state){
         case IN:
             state = READY;
-            writeString = TQString::tqfromLatin1("mail from: %1\r\n").arg(senderAddress);
+            writeString = TQString::fromLatin1("mail from: %1\r\n").arg(senderAddress);
             kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
         case READY:
             state = SENTFROM;
-            writeString = TQString::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
+            writeString = TQString::fromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
              kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
         case SENTFROM:
             state = SENTTO;
-            writeString = TQString::tqfromLatin1("data\r\n");
+            writeString = TQString::fromLatin1("data\r\n");
              kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
@@ -305,11 +305,11 @@ void SMTP::processLine(TQString *line)
         break;
     case READYDATA: //354
         state = DATA;
-        writeString = TQString::tqfromLatin1("Subject: %1\r\n").arg(messageSubject);
+        writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject);
         writeString += messageHeader;
         writeString += "\r\n";
         writeString += messageBody;
-        writeString += TQString::tqfromLatin1(".\r\n");
+        writeString += TQString::fromLatin1(".\r\n");
         kdDebug() << "out: " << writeString;
         write(sock->socket(), writeString.ascii(), writeString.length());
         break;
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index 45d523d2e..760e654d7 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -72,7 +72,7 @@ static void updatePoliciesConfig(KConfig *cfg) {
 		cfg->setGroup(*i);
 
 		// remove it if it has expired
-		if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::tqcurrentDateTime()) {
+		if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) {
 			cfg->deleteGroup(*i);
 			continue;
 		}
@@ -164,7 +164,7 @@ KSSLCNode *node;
 
 	for (node = certList.first(); node; node = certList.next()) {
 		if (node->permanent ||
-			node->expires > TQDateTime::tqcurrentDateTime()) {
+			node->expires > TQDateTime::currentDateTime()) {
 			// First convert to a binary format and then write the
 			// kconfig entry write the (CN, policy, cert) to
 			// KSimpleConfig
@@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList();
 		// remove it if it has expired
 		if (!cfg->readBoolEntry("Permanent") &&
 			cfg->readDateTimeEntry("Expires") <
-				TQDateTime::tqcurrentDateTime()) {
+				TQDateTime::currentDateTime()) {
 			cfg->deleteGroup(*i);
 			continue;
 		}
@@ -278,7 +278,7 @@ KSSLCNode *node;
 			node->permanent = permanent;
 
 			if (!permanent) {
-				node->expires = TQDateTime::tqcurrentDateTime();
+				node->expires = TQDateTime::currentDateTime();
 				// FIXME: make this configurable
 				node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(3600));
 			}
@@ -297,7 +297,7 @@ KSSLCNode *node;
 	certList.prepend(n); 
 
 	if (!permanent) {
-		n->expires = TQDateTime::tqcurrentDateTime();
+		n->expires = TQDateTime::currentDateTime();
 		n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(3600));
 	}
 
@@ -312,7 +312,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -338,7 +338,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {  
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -362,7 +362,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -386,7 +386,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::tqcurrentDateTime()) {
+				node->expires < TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -410,7 +410,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-					TQDateTime::tqcurrentDateTime()) {
+					TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -535,7 +535,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       TQDateTime::tqcurrentDateTime()) {
+				       TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -563,7 +563,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       	TQDateTime::tqcurrentDateTime()) {
+				       	TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -593,7 +593,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       	TQDateTime::tqcurrentDateTime()) {
+				       	TQDateTime::currentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -867,7 +867,7 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) {
 		if (elem.findRef(cert) == -1) {
 			unsigned int n = 0;
 			for(; n < elem.size(); n++) {
-				if (!elem.tqat(n)) {
+				if (!elem.at(n)) {
 					elem.insert(n, cert);
 					break;
 				}
@@ -912,7 +912,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
 
 	TQPtrVector<KSSLCertificate> &elem = *it;
 	for (unsigned int n = 0; n < elem.size(); n++) {
-		KSSLCertificate *cert = elem.tqat(n);
+		KSSLCertificate *cert = elem.at(n);
 		if (cert) {
 			rc.append(cert->getKDEKey());
 		}
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index 3815277c5..0cbc891c4 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -42,10 +42,10 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqvbox.h>
 
 #include <assert.h>
diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui
index 6f94e5643..9d9c83def 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui
+++ b/kio/misc/kwalletd/kwalletwizard.ui
@@ -58,7 +58,7 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignCenter</set>
                 </property>
             </widget>
@@ -83,7 +83,7 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -233,7 +233,7 @@
                                 <property name="text">
                                     <string>Enter a new password:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -250,7 +250,7 @@
                                 <property name="text">
                                     <string>Verify password:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -376,7 +376,7 @@
                 <property name="text">
                     <string></string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter|AlignRight</set>
                 </property>
             </widget>
@@ -403,7 +403,7 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 87f95fb29..f49060696 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -46,7 +46,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <tqheader.h>
 
@@ -418,7 +418,7 @@ void ProgressItem::slotToggleDefaultProgress() {
 
 // Called when a rename or skip dialog pops up
 // We want to prevent someone from killing the job in the uiserver then
-void ProgressItem::tqsetVisible( bool visible ) {
+void ProgressItem::setVisible( bool visible ) {
   if ( m_visible != visible )
   {
     m_visible = visible;
@@ -792,7 +792,7 @@ ProgressItem* UIServer::findItem( int id )
 
 void UIServer::setItemVisible( ProgressItem * item, bool visible )
 {
-  item->tqsetVisible( visible );
+  item->setVisible( visible );
   // Check if we were the last one to be visible
   // or the first one -> hide/show the list in that case
   // (Note that the user could have hidden the listview by hand yet, no time)
diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h
index 74c1a681e..85e255a43 100644
--- a/kio/misc/uiserver.h
+++ b/kio/misc/uiserver.h
@@ -118,7 +118,7 @@ public:
     bool keepOpen() const;
   void finished();
 
-  void tqsetVisible( bool visible );
+  void setVisible( bool visible );
   void setDefaultProgressVisible( bool visible );
   bool isVisible() const { return m_visible; }