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

diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index ce7b6ea3..cbfe03d7 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -51,17 +51,17 @@
 
 void parseargs(char* buf, char** args);
 
-AccountWidget::AccountWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+AccountWidget::AccountWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   int min = 0;
-  TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10);
+  TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 10, 10);
 
   // add a hbox
   TQHBoxLayout *l11 = new TQHBoxLayout;
   l1->addLayout(l11);
 
-  accountlist_l = new TQListBox(parent);
+  accountlist_l = new TQListBox(tqparent);
   accountlist_l->setMinimumSize(160, 128);
   connect(accountlist_l, TQT_SIGNAL(highlighted(int)),
 	  this, TQT_SLOT(slotListBoxSelect(int)));
@@ -71,23 +71,23 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
 
   TQVBoxLayout *l111 = new TQVBoxLayout;
   l11->addLayout(l111, 1);
-  edit_b = new TQPushButton(i18n("&Edit..."), parent);
+  edit_b = new TQPushButton(i18n("&Edit..."), tqparent);
   connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount()));
   TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
 
-  min = edit_b->sizeHint().width();
-  min = QMAX(70,min);
+  min = edit_b->tqsizeHint().width();
+  min = TQMAX(70,min);
   edit_b->setMinimumWidth(min);
 
   l111->addWidget(edit_b);
 
-  new_b = new TQPushButton(i18n("&New..."), parent);
+  new_b = new TQPushButton(i18n("&New..."), tqparent);
   connect(new_b, TQT_SIGNAL(clicked()), TQT_SLOT(newaccount()));
   l111->addWidget(new_b);
   TQWhatsThis::add(new_b, i18n("Create a new dialup connection\n"
   			      "to the Internet"));
 
-  copy_b = new TQPushButton(i18n("Co&py"), parent);
+  copy_b = new TQPushButton(i18n("Co&py"), tqparent);
   connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copyaccount()));
   l111->addWidget(copy_b);
   TQWhatsThis::add(copy_b,
@@ -96,7 +96,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
 		       "to a new account that you can modify to fit your\n"
 		       "needs"));
 
-  delete_b = new TQPushButton(i18n("De&lete"), parent);
+  delete_b = new TQPushButton(i18n("De&lete"), tqparent);
   connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deleteaccount()));
   l111->addWidget(delete_b);
   TQWhatsThis::add(delete_b,
@@ -110,13 +110,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
   TQVBoxLayout *l121 = new TQVBoxLayout;
   l12->addLayout(l121);
   l121->addStretch(1);
-  costlabel = new TQLabel(i18n("Phone costs:"), parent);
+  costlabel = new TQLabel(i18n("Phone costs:"), tqparent);
   costlabel->setEnabled(FALSE);
   l121->addWidget(costlabel);
 
-  costedit = new TQLineEdit(parent);
-  costedit->setFocusPolicy(TQWidget::NoFocus);
-  costedit->setFixedHeight(costedit->sizeHint().height());
+  costedit = new TQLineEdit(tqparent);
+  costedit->setFocusPolicy(TQ_NoFocus);
+  costedit->setFixedHeight(costedit->tqsizeHint().height());
   costedit->setEnabled(FALSE);
   l121->addWidget(costedit);
   l121->addStretch(1);
@@ -129,13 +129,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
   TQWhatsThis::add(costlabel, tmp);
   TQWhatsThis::add(costedit, tmp);
 
-  vollabel = new TQLabel(i18n("Volume:"), parent);
+  vollabel = new TQLabel(i18n("Volume:"), tqparent);
   vollabel->setEnabled(FALSE);
   l121->addWidget(vollabel);
 
-  voledit = new TQLineEdit(parent,"voledit");
-  voledit->setFocusPolicy(TQWidget::NoFocus);
-  voledit->setFixedHeight(voledit->sizeHint().height());
+  voledit = new TQLineEdit(tqparent,"voledit");
+  voledit->setFocusPolicy(TQ_NoFocus);
+  voledit->setFixedHeight(voledit->tqsizeHint().height());
   voledit->setEnabled(FALSE);
   l121->addWidget(voledit);
   tmp = i18n("<p>This shows the number of bytes transferred\n"
@@ -153,13 +153,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
   l12->addLayout(l122);
 
   l122->addStretch(1);
-  reset = new TQPushButton(i18n("&Reset..."), parent);
+  reset = new TQPushButton(i18n("&Reset..."), tqparent);
   reset->setEnabled(FALSE);
   connect(reset, TQT_SIGNAL(clicked()),
 	  this, TQT_SLOT(resetClicked()));
   l122->addWidget(reset);
 
-  log = new TQPushButton(i18n("&View Logs"), parent);
+  log = new TQPushButton(i18n("&View Logs"), tqparent);
   connect(log, TQT_SIGNAL(clicked()),
 	  this, TQT_SLOT(viewLogClicked()));
   l122->addWidget(log);
@@ -293,7 +293,7 @@ void AccountWidget::newaccount() {
 
   if(result == TQDialog::Accepted) {
     accountlist_l->insertItem(gpppdata.accname());
-    accountlist_l->setSelected(accountlist_l->findItem(gpppdata.accname()),
+    accountlist_l->setSelected(accountlist_l->tqfindItem(gpppdata.accname()),
 			       true);
     emit resetaccounts();
     gpppdata.save();
@@ -324,7 +324,7 @@ void AccountWidget::copyaccount() {
 void AccountWidget::deleteaccount() {
 
   TQString s = i18n("Are you sure you want to delete\nthe account \"%1\"?")
-    .arg(accountlist_l->text(accountlist_l->currentItem()));
+    .tqarg(accountlist_l->text(accountlist_l->currentItem()));
 
   if(KMessageBox::warningYesNo(this, s, i18n("Confirm"), KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::cancel()) != KMessageBox::Yes)
     return;
@@ -341,7 +341,7 @@ void AccountWidget::deleteaccount() {
 
 
 int AccountWidget::doTab(){
-  tabWindow = new KDialogBase( KDialogBase::Tabbed, TQString::null,
+  tabWindow = new KDialogBase( KDialogBase::Tabbed, TQString(),
                                KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
                                0, 0, true);
   KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon());
@@ -403,7 +403,7 @@ int AccountWidget::doTab(){
 TQString AccountWidget::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()) {
@@ -426,14 +426,14 @@ TQString AccountWidget::prettyPrintVolume(unsigned int n) {
 // Queries the user what to reset: costs, volume or both
 //
 /////////////////////////////////////////////////////////////////////////////
-QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
+QueryReset::QueryReset(TQWidget *tqparent) : TQDialog(tqparent, 0, true) {
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
   setCaption(i18n("Reset Accounting"));
 
   TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10);
   TQVGroupBox *f = new TQVGroupBox(i18n("What to Reset"), this);
 
-  TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10);
+  TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 10, 10);
   costs = new TQCheckBox(i18n("Reset the accumulated p&hone costs"), f);
   costs->setChecked(true);
   l1->addWidget(costs);
@@ -450,7 +450,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
 
   l1->activate();
 
-  // this activates the f-layout and sets minimumSize()
+  // this activates the f-tqlayout and sets tqminimumSize()
   f->show();
 
   tl->addWidget(f);
@@ -466,11 +466,11 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
   connect(cancel, TQT_SIGNAL(clicked()),
 	  this, TQT_SLOT(reject()));
 
-  bbox->layout();
+  bbox->tqlayout();
   tl->addWidget(bbox);
 
   // TODO: activate if KGroupBox is fixed
-  //  setFixedSize(sizeHint());
+  //  setFixedSize(tqsizeHint());
 }