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/kppp/conwindow.cpp b/kppp/conwindow.cpp
index 3b14e916..3a20bbee 100644
--- a/kppp/conwindow.cpp
+++ b/kppp/conwindow.cpp
@@ -31,9 +31,9 @@
 
 extern PPPData gpppdata;
 
-ConWindow::ConWindow(TQWidget *parent, const char *name,TQWidget *mainwidget,
+ConWindow::ConWindow(TQWidget *tqparent, const char *name,TQWidget *mainwidget,
 		     PPPStats *st)
-  : TQWidget(parent, name, 0),
+  : TQWidget(tqparent, name, 0),
     minutes(0),
     seconds(0),
     hours(0),
@@ -96,7 +96,7 @@ bool ConWindow::event(TQEvent *e) {
 TQString ConWindow::prettyPrintVolume(unsigned int n) {
   int idx = 0;
   const TQString quant[] = {i18n("Byte"), i18n("KB"),
-		   i18n("MB"), i18n("GB"), TQString::null};
+		   i18n("MB"), i18n("GB"), TQString()};
 
   float n1 = n;
   while(n >= 1024 && !quant[idx].isNull()) {
@@ -118,11 +118,11 @@ void ConWindow::accounting(bool on) {
   accountingEnabled = on;
   volumeAccountingEnabled = gpppdata.VolAcctEnabled();
 
-  // delete old layout
+  // delete old tqlayout
   if(tl1 != 0)
     delete tl1;
 
-  // add layout now
+  // add tqlayout now
   tl1 = new TQVBoxLayout(this, 10, 10);
   tl1->addSpacing(5);
   TQHBoxLayout *tl = new TQHBoxLayout;
@@ -142,11 +142,11 @@ void ConWindow::accounting(bool on) {
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
-  info2->setAlignment(AlignRight|AlignVCenter);
-  timelabel2->setAlignment(AlignRight|AlignVCenter);
-  session_bill->setAlignment(AlignRight|AlignVCenter);
-  total_bill->setAlignment(AlignRight|AlignVCenter);
-  volinfo->setAlignment(AlignRight|AlignVCenter);
+  info2->tqsetAlignment(AlignRight|AlignVCenter);
+  timelabel2->tqsetAlignment(AlignRight|AlignVCenter);
+  session_bill->tqsetAlignment(AlignRight|AlignVCenter);
+  total_bill->tqsetAlignment(AlignRight|AlignVCenter);
+  volinfo->tqsetAlignment(AlignRight|AlignVCenter);
   // make sure that there's enough space for the bills
   TQString s1 = session_bill->text();
   TQString s2 = total_bill->text();
@@ -155,9 +155,9 @@ void ConWindow::accounting(bool on) {
   session_bill->setText("888888.88 XXX");
   total_bill->setText("888888.88 XXX");
   volinfo->setText("8888.8 MB");
-  session_bill->setFixedSize(session_bill->sizeHint());
-  total_bill->setFixedSize(total_bill->sizeHint());
-  volinfo->setFixedSize(volinfo->sizeHint());
+  session_bill->setFixedSize(session_bill->tqsizeHint());
+  total_bill->setFixedSize(total_bill->tqsizeHint());
+  volinfo->setFixedSize(volinfo->tqsizeHint());
   session_bill->setText(s1);
   total_bill->setText(s2);
   volinfo->setText(s3);
@@ -214,7 +214,7 @@ void ConWindow::accounting(bool on) {
 
   tl1->addSpacing(5);
 
-  setFixedSize(sizeHint());
+  setFixedSize(tqsizeHint());
 /*
   do not overwrite position read from config
   // If this gets re-enabled, fix it for Xinerama before committing to CVS.
@@ -264,12 +264,12 @@ void ConWindow::timeclick() {
   TQString tooltip = i18n("Connection: %1\n"
 			 "Connected at: %2\n"
 			 "Time connected: %3")
-		    .arg(gpppdata.accname()).arg(info2->text())
-		    .arg(time_string2);
+		    .tqarg(gpppdata.accname()).tqarg(info2->text())
+		    .tqarg(time_string2);
 
   if(accountingEnabled)
       tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2")
-		 .arg(session_bill->text()).arg(total_bill->text());
+		 .tqarg(session_bill->text()).tqarg(total_bill->text());
   // volume accounting
   if(volumeAccountingEnabled) {