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

diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index c9ab585d..9a6e61ab 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -26,7 +26,7 @@
 #define PASS 2
 #define SSL  3
 
-PageAutoConnect::PageAutoConnect( TQWidget *parent, const char *name ) : PageAutoConnectBase( parent, name)
+PageAutoConnect::PageAutoConnect( TQWidget *tqparent, const char *name ) : PageAutoConnectBase( tqparent, name)
 {
     KLVAutoConnect->setSorting( 0 );
     //KLVAutoConnect->header()->hide();
@@ -59,7 +59,7 @@ void PageAutoConnect::saveConfig()
 	if(it->text(SSL).length() > 0)
             server += " (SSL)";
 	if(it->text(PASS).length() > 0)
-	    server += TQString(" (pass: %1)").arg(it->text(PASS));
+	    server += TQString(" (pass: %1)").tqarg(it->text(PASS));
 
         servers << server;
 
@@ -73,7 +73,7 @@ void PageAutoConnect::saveConfig()
 	    channel = ch->text(NAME);
 
 	    if(ch->text(PK).length() > 0)
-		channel += TQString(" (key: %1)").arg(ch->text(PK));
+		channel += TQString(" (key: %1)").tqarg(ch->text(PK));
 
 	    channels << channel;
 
@@ -101,8 +101,8 @@ void PageAutoConnect::readConfig()
         TQStringList channels = conf->readListEntry(*ser);
 	TQString server = *ser;
 	TQString port = "6667";
-	TQString ssl = TQString::null;
-	TQString pass = TQString::null;
+	TQString ssl = TQString();
+	TQString pass = TQString();
 
 	TQRegExp rx("(.+) \\(SSL\\)(.*)");
 	if(rx.search(server) >= 0){
@@ -127,7 +127,7 @@ void PageAutoConnect::readConfig()
         TQStringList::ConstIterator chan = channels.begin();
 	for(; chan != channels.end(); chan++){
             TQString channel = *chan;
-            TQString key = TQString::null;
+            TQString key = TQString();
             TQRegExp crx("(.+) \\(key: (\\S+)\\)");
             if(crx.search(channel) >= 0){
 		channel = crx.cap(1);
@@ -157,7 +157,7 @@ void PageAutoConnect::add_pressed()
     s = KLVAutoConnect->selectedItem();
     if(!s){ /* new item */
 	TQString server = ServerLE->text();
-	TQString ssl = TQString::null;
+	TQString ssl = TQString();
 	TQString port;
 
 	port.setNum(PortKI->value());
@@ -170,25 +170,25 @@ void PageAutoConnect::add_pressed()
         KLVAutoConnect->setCurrentItem(s);
     }
     else { /* update the existing one */
-	TQListViewItem *parent;
+	TQListViewItem *tqparent;
 	TQListViewItem *child;
 
-	if(s->parent()){
-	    parent = s->parent();
+	if(s->tqparent()){
+	    tqparent = s->tqparent();
             child = s;
 	}
 	else {
-	    parent = s;
+	    tqparent = s;
             child = 0x0;
 	}
 
-	parent->setText(NAME, ServerLE->text());
-	parent->setText(PK, TQString("%1").arg(PortKI->value()));
-	parent->setText(PASS, PassLE->text());
+	tqparent->setText(NAME, ServerLE->text());
+	tqparent->setText(PK, TQString("%1").tqarg(PortKI->value()));
+	tqparent->setText(PASS, PassLE->text());
 	if(sslCB->isChecked())
-	    parent->setText(SSL, i18n("SSL"));
+	    tqparent->setText(SSL, i18n("SSL"));
 	else
-	    parent->setText(SSL, TQString::null);
+	    tqparent->setText(SSL, TQString());
 
 	if(child){
 	    child->setText(NAME, ChannelLE->text());
@@ -197,7 +197,7 @@ void PageAutoConnect::add_pressed()
 	else {
 	    if(ChannelLE->text().length() > 0){
                 fnd = 0;
-		TQListViewItem *c = parent->firstChild();
+		TQListViewItem *c = tqparent->firstChild();
 		for( ; c != 0 && fnd == 0; c = c->nextSibling()){
 		    if(c->text(NAME) == ChannelLE->text()){
 			c->setText(PK, KeyLE->text());
@@ -205,7 +205,7 @@ void PageAutoConnect::add_pressed()
 		    }
 		}
 		if(fnd == 0){
-		    new TQListViewItem(parent, ChannelLE->text(), KeyLE->text());
+		    new TQListViewItem(tqparent, ChannelLE->text(), KeyLE->text());
 		}
 	    }
 	}
@@ -260,16 +260,16 @@ void PageAutoConnect::delete_pressed()
 void PageAutoConnect::kvl_clicked(TQListViewItem *it)
 {
     if(it != 0){
-	if(it->parent() != 0){
+	if(it->tqparent() != 0){
 	    ChannelLE->setText(it->text(NAME));
 	    KeyLE->setText(it->text(PK));
 	    AddPB->setText(i18n("&Update"));
 	    /*
-	     * Move it to the parent to setup parent/server
+	     * Move it to the tqparent to setup tqparent/server
 	     * values.  This save writing this code
 	     * in two places.
 	     */
-	    it = it->parent();
+	    it = it->tqparent();
 	}
 	else {
 	    AddPB->setText(i18n("&Update/Add"));
@@ -277,7 +277,7 @@ void PageAutoConnect::kvl_clicked(TQListViewItem *it)
 	    KeyLE->clear();
 	}
 
-	if(it->parent() == 0){
+	if(it->tqparent() == 0){
 	    ServerLE->setText(it->text(NAME));
 	    PortKI->setValue(it->text(PK).toInt());
             PassLE->setText(it->text(PASS));