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

diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index 6136b68a..9aa79b8a 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -35,8 +35,8 @@
 #include "modem.h"
 #include <klocale.h>
 
-ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
-  : TQDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder)
+ModemTransfer::ModemTransfer(TQWidget *tqparent, const char *name)
+  : TQDialog(tqparent, name,TRUE, WStyle_Customize|WStyle_NormalBorder)
 {
   setCaption(i18n("ATI Query"));
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
@@ -48,7 +48,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
 
   statusBar = new TQLabel(this,"sBar");
   statusBar->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
-  statusBar->setAlignment(AlignCenter);
+  statusBar->tqsetAlignment(AlignCenter);
 
   // This is a rather complicated case. Since we do not know which
   // message is the widest in the national language, we'd to
@@ -56,12 +56,12 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
   // the longest english message, translate it and give it additional
   // 20 percent space. Hope this is enough.
   statusBar->setText(i18n("Unable to create modem lock file."));
-  statusBar->setFixedWidth((statusBar->sizeHint().width() * 12) / 10);
-  statusBar->setFixedHeight(statusBar->sizeHint().height() + 4);
+  statusBar->setFixedWidth((statusBar->tqsizeHint().width() * 12) / 10);
+  statusBar->setFixedHeight(statusBar->tqsizeHint().height() + 4);
 
   // set original text
   statusBar->setText(i18n("Looking for modem..."));
-  progressBar->setFixedHeight(statusBar->minimumSize().height());
+  progressBar->setFixedHeight(statusBar->tqminimumSize().height());
   tl->addWidget(progressBar);
   tl->addWidget(statusBar);
 
@@ -74,7 +74,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
   l1->addStretch(1);
   l1->addWidget(cancel);
 
-  setFixedSize(sizeHint());
+  setFixedSize(tqsizeHint());
 
   step = 0;
 
@@ -151,7 +151,7 @@ void ModemTransfer::init() {
       // clear modem buffer
       Modem::modem->flush();
 
-      Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char)));
+      Modem::modem->notify(TQT_TQOBJECT(this), TQT_SLOT(readChar(unsigned char)));
       return;
     }
   }
@@ -207,7 +207,7 @@ void ModemTransfer::readtty() {
   if (step == 0)
     return;
 
-  readbuffer.replace(TQRegExp("[\n\r]")," ");         // remove stray \n and \r
+  readbuffer.tqreplace(TQRegExp("[\n\r]")," ");         // remove stray \n and \r
   readbuffer = readbuffer.stripWhiteSpace(); // strip of leading or trailing white
                                                  // space
 
@@ -240,8 +240,8 @@ void ModemTransfer::closeEvent( TQCloseEvent *e ) {
 }
 
 
-ModemInfo::ModemInfo(TQWidget *parent, const char* name)
-  : TQDialog(parent, name, TRUE, WStyle_Customize|WStyle_NormalBorder)
+ModemInfo::ModemInfo(TQWidget *tqparent, const char* name)
+  : TQDialog(tqparent, name, TRUE, WStyle_Customize|WStyle_NormalBorder)
 {
   TQString label_text;
 
@@ -280,7 +280,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name)
   connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
   l2->addWidget(ok);
 
-  setMinimumSize(sizeHint());
+  setMinimumSize(tqsizeHint());
 }