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

diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp
index eceeff76..4cad3aeb 100644
--- a/kppp/acctselect.cpp
+++ b/kppp/acctselect.cpp
@@ -52,25 +52,25 @@
 #include "pppdata.h"
 
 
-AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, const char *name)
-  :  TQWidget(parent, name),
+AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, const char *name)
+  :  TQWidget(tqparent, name),
     isnewaccount(_isnewaccount)
 {
-  TQVBoxLayout *l1 = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
+  TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint());
 
-  enable_accounting = new TQCheckBox(i18n("&Enable accounting"), parent);
+  enable_accounting = new TQCheckBox(i18n("&Enable accounting"), tqparent);
   l1->addWidget(enable_accounting, 1);
   connect(enable_accounting, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableItems(bool)));
 
   // insert the tree widget
-  tl = new TQListView(parent, "treewidget");
+  tl = new TQListView(tqparent, "treewidget");
 
   connect(tl, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
           TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
   tl->setMinimumSize(220, 200);
   l1->addWidget(tl, 1);
 
-  KURLLabel *up = new KURLLabel(parent);
+  KURLLabel *up = new KURLLabel(tqparent);
   up->setText(i18n("Check for rule updates"));
   up->setURL("http://developer.kde.org/~kppp/rules.html");
   connect(up, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString&)));
@@ -81,11 +81,11 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con
   TQHBoxLayout *l11 = new TQHBoxLayout;
   l1->addSpacing(10);
   l1->addLayout(l11);
-  TQLabel *lsel = new TQLabel(i18n("Selected:"), parent);
-  selected = new TQLabel(parent);
+  TQLabel *lsel = new TQLabel(i18n("Selected:"), tqparent);
+  selected = new TQLabel(tqparent);
   selected->setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel);
   selected->setLineWidth(1);
-  selected->setFixedHeight(selected->sizeHint().height() + 16);
+  selected->setFixedHeight(selected->tqsizeHint().height() + 16);
   l11->addWidget(lsel, 0);
   l11->addSpacing(10);
   l11->addWidget(selected, 1);
@@ -94,8 +94,8 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con
   l1->addStretch(1);
   TQHBoxLayout *l12 = new TQHBoxLayout;
   l1->addLayout(l12);
-  TQLabel *usevol_l = new TQLabel(i18n("Volume accounting:"), parent);
-  use_vol = new TQComboBox(parent);
+  TQLabel *usevol_l = new TQLabel(i18n("Volume accounting:"), tqparent);
+  use_vol = new TQComboBox(tqparent);
   use_vol->insertItem(i18n("No Accounting"), 0);
   use_vol->insertItem(i18n("Bytes In"), 1);
   use_vol->insertItem(i18n("Bytes Out"), 2);
@@ -134,7 +134,7 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con
 
 TQString AccountingSelector::fileNameToName(TQString s) {
 
-  s.replace('_', " ");
+  s.tqreplace('_', " ");
   return KURL::decode_string(s);
 
 }
@@ -142,7 +142,7 @@ TQString AccountingSelector::fileNameToName(TQString s) {
 
 TQString AccountingSelector::nameToFileName(TQString s) {
 
-  s.replace(' ', "_");
+  s.tqreplace(' ', "_");
   return s;
 
 }
@@ -174,8 +174,8 @@ void AccountingSelector::insertDir(TQDir d, TQListViewItem *root) {
   d.setSorting(TQDir::Name);
 
   // read the list of files
-  const QFileInfoList *list = d.entryInfoList();
-  QFileInfoListIterator it( *list );
+  const TQFileInfoList *list = d.entryInfoList();
+  TQFileInfoListIterator it( *list );
   TQFileInfo *fi;
 
   // traverse the list and insert into the widget
@@ -210,8 +210,8 @@ void AccountingSelector::insertDir(TQDir d, TQListViewItem *root) {
   // set up a filter for the directories
   d.setFilter(TQDir::Dirs);
   d.setNameFilter("*");
-  const QFileInfoList *dlist = d.entryInfoList();
-  QFileInfoListIterator dit(*dlist);
+  const TQFileInfoList *dlist = d.entryInfoList();
+  TQFileInfoListIterator dit(*dlist);
 
   while((fi = dit.current())) {
     // skip "." and ".." directories
@@ -266,7 +266,7 @@ void AccountingSelector::setupTreeWidget() {
   // appropriate item
   if(!isnewaccount && edit_item) {
     tl->setSelected(edit_item, true);
-    tl->setOpen(edit_item->parent(), true);
+    tl->setOpen(edit_item->tqparent(), true);
     tl->ensureItemVisible(edit_item);
   }
 
@@ -285,7 +285,7 @@ void AccountingSelector::enableItems(bool enabled) {
     TQString s;
     while(i) {
       s = "/" + i->text(0) + s;
-      i = i->parent();
+      i = i->tqparent();
     }
     selected->setText(s.mid(1));