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

diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index 9c5ecda9..15582324 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -44,9 +44,9 @@
 
 extern PPPData gpppdata;
 
-PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
+PPPStatsDlg::PPPStatsDlg(TQWidget *tqparent, const char *name, TQWidget *,
 			 PPPStats *st)
-  : TQWidget(parent, name, 0),
+  : TQWidget(tqparent, name, 0),
     stats(st)
 {
   int i;
@@ -80,7 +80,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
   pixmap_l = new TQLabel(this);
   pixmap_l->setMinimumSize(big_modem_both_pixmap.size());
   l111->addWidget(pixmap_l, 1);
-  pixmap_l->setAlignment(AlignVCenter|AlignLeft);
+  pixmap_l->tqsetAlignment(AlignVCenter|AlignLeft);
 
   TQGridLayout *l1112 = new TQGridLayout(3, 2);
   l111->addLayout(l1112);
@@ -89,13 +89,13 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
   ip_address_label1->setText(i18n("Local Addr:"));
 
   ip_address_label2 = new IPLineEdit(this);
-  ip_address_label2->setFocusPolicy(TQWidget::NoFocus);
+  ip_address_label2->setFocusPolicy(TQ_NoFocus);
 
   ip_address_label3 = new TQLabel(this);
   ip_address_label3->setText(i18n("Remote Addr:"));
 
   ip_address_label4 = new IPLineEdit(this);
-  ip_address_label4->setFocusPolicy(TQWidget::NoFocus);
+  ip_address_label4->setFocusPolicy(TQ_NoFocus);
 
   l1112->addWidget(ip_address_label1, 0, 0);
   l1112->addWidget(ip_address_label2, 0, 1);
@@ -137,14 +137,14 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
   for(i = 0; i < 5; i++) {
     labela2[i]->setText("888888888");	// TODO: resize automatically
     labelb2[i]->setText("888888888");
-    labela2[i]->setAlignment(Qt::AlignRight);
-    labelb2[i]->setAlignment(Qt::AlignRight);
-    labela2[i]->setFixedSize(labela2[i]->sizeHint());
-    labelb2[i]->setFixedSize(labelb2[i]->sizeHint());
+    labela2[i]->tqsetAlignment(TQt::AlignRight);
+    labelb2[i]->tqsetAlignment(TQt::AlignRight);
+    labela2[i]->setFixedSize(labela2[i]->tqsizeHint());
+    labelb2[i]->setFixedSize(labelb2[i]->tqsizeHint());
     labela2[i]->setText("");
     labelb2[i]->setText("");
 
-    // add to layout
+    // add to tqlayout
     l112->addWidget(labela1[i], i, 0);
     l112->addWidget(labela2[i], i, 1);
     l112->addWidget(labelb1[i], i, 2);
@@ -175,8 +175,8 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
   cancelbutton = new KPushButton(KStdGuiItem::close(),this, "cancelbutton");
   cancelbutton->setFocus();
   connect(cancelbutton, TQT_SIGNAL(clicked()), this,TQT_SLOT(cancel()));
-  cancelbutton->setFixedHeight(cancelbutton->sizeHint().height());
-  cancelbutton->setMinimumWidth(QMAX(cancelbutton->sizeHint().width(), 70));
+  cancelbutton->setFixedHeight(cancelbutton->tqsizeHint().height());
+  cancelbutton->setMinimumWidth(TQMAX(cancelbutton->tqsizeHint().width(), 70));
   l12->addWidget(cancelbutton);
 
   if(gpppdata.graphingEnabled()) {
@@ -184,7 +184,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
     connect(graphTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph()));
   }
 
-  setFixedSize(sizeHint());
+  setFixedSize(tqsizeHint());
 
   connect(stats, TQT_SIGNAL(statsChanged(int)), TQT_SLOT(paintIcon(int)));
 
@@ -290,8 +290,8 @@ void PPPStatsDlg::paintGraph() {
 
   TQRect r;
   TQString s = i18n("%1 (max. %2) kb/sec")
-		.arg(KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1))
-		.arg(KGlobal::locale()->formatNumber((float)max / 1024.0, 1));
+		.tqarg(KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1))
+		.tqarg(KGlobal::locale()->formatNumber((float)max / 1024.0, 1));
   p.drawText(0, 0, pm.width(), 2*8, AlignRight|AlignVCenter, s, -1, &r);
   p.drawLine(0, 8, r.left() - 8, 8);