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

diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index 29780e15..77c76134 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -40,13 +40,13 @@
 #include <tqlabel.h>
 
 
-#define ADJUSTEDIT(e) e->setText("XXXXXXXXqy"); e->setMinimumSize(e->sizeHint()); e->setFixedHeight(e->sizeHint().height()); e->setText(""); e->setMaxLength(MODEMSTR_SIZE);
+#define ADJUSTEDIT(e) e->setText("XXXXXXXXqy"); e->setMinimumSize(e->tqsizeHint()); e->setFixedHeight(e->tqsizeHint().height()); e->setText(""); e->setMaxLength(MODEMSTR_SIZE);
 
 // a little trick to make the label look like a disabled lineedit
-#define FORMATSLIDERLABEL(l) l->setFixedWidth(l->sizeHint().width()); l->setFixedHeight(TQLineEdit(dummyWidget).sizeHint().height()); l->setAlignment(AlignCenter); l->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); l->setLineWidth(2);
+#define FORMATSLIDERLABEL(l) l->setFixedWidth(l->tqsizeHint().width()); l->setFixedHeight(TQLineEdit(dummyWidget).tqsizeHint().height()); l->tqsetAlignment(AlignCenter); l->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); l->setLineWidth(2);
 
-ModemCommands::ModemCommands(TQWidget *parent, const char *name)
-  : KDialogBase(parent, name, true, i18n("Edit Modem Commands"), Ok|Cancel)
+ModemCommands::ModemCommands(TQWidget *tqparent, const char *name)
+  : KDialogBase(tqparent, name, true, i18n("Edit Modem Commands"), Ok|Cancel)
 {
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
   TQWidget *dummyWidget = new TQWidget(this);
@@ -55,7 +55,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   const int GRIDROWS = 22;
   int row = 0;
 
-  // toplevel layout
+  // toplevel tqlayout
   TQVBoxLayout *tl = new TQVBoxLayout(dummyWidget, 10, 4);
 
   // add grid + frame
@@ -71,8 +71,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   FORMATSLIDERLABEL(lpreinitslider);
 
   preinitslider = new TQSlider(0, 300, 1, 0,
-                                       TQSlider::Horizontal, dummyWidget);
-  preinitslider->setFixedHeight(preinitslider->sizeHint().height());
+                                       Qt::Horizontal, dummyWidget);
+  preinitslider->setFixedHeight(preinitslider->tqsizeHint().height());
   connect(preinitslider, TQT_SIGNAL(valueChanged(int)),
 	  lpreinitslider, TQT_SLOT(setNum(int)));
   l2->addWidget(lpreinitslider, 0);
@@ -83,7 +83,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
 
   for(int i = 0; i < PPPData::NumInitStrings; i++) {
       initstr[i] = new TQLineEdit(dummyWidget);
-      TQLabel *initLabel = new TQLabel(i18n("Initialization string %1:").arg(i + 1),
+      TQLabel *initLabel = new TQLabel(i18n("Initialization string %1:").tqarg(i + 1),
 				    dummyWidget);
       ADJUSTEDIT(initstr[i]);
       l1->addWidget(initLabel, row, 1);
@@ -95,8 +95,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   linitslider = new TQLabel("MMMM", dummyWidget);
   FORMATSLIDERLABEL(linitslider);
   initslider = new TQSlider(1, 300, 1, 0,
-				TQSlider::Horizontal, dummyWidget);
-  initslider->setFixedHeight(initslider->sizeHint().height());
+				Qt::Horizontal, dummyWidget);
+  initslider->setFixedHeight(initslider->tqsizeHint().height());
   connect(initslider, TQT_SIGNAL(valueChanged(int)),
 	  linitslider, TQT_SLOT(setNum(int)));
   l3->addWidget(linitslider, 0);
@@ -111,8 +111,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   ldurationslider = new TQLabel("MMMM", dummyWidget);
   FORMATSLIDERLABEL(ldurationslider);
   durationslider = new TQSlider(1, 255, 1, 0,
-				TQSlider::Horizontal, dummyWidget);
-  durationslider->setFixedHeight(durationslider->sizeHint().height());
+				Qt::Horizontal, dummyWidget);
+  durationslider->setFixedHeight(durationslider->tqsizeHint().height());
   connect(durationslider, TQT_SIGNAL(valueChanged(int)),
 	  ldurationslider, TQT_SLOT(setNum(int)));
   l4->addWidget(ldurationslider, 0);
@@ -227,8 +227,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   FORMATSLIDERLABEL(lslider);
 
   slider = new TQSlider(0, 255, 1, 0,
-				TQSlider::Horizontal, dummyWidget);
-  slider->setFixedHeight(slider->sizeHint().height());
+				Qt::Horizontal, dummyWidget);
+  slider->setFixedHeight(slider->tqsizeHint().height());
   connect(slider, TQT_SIGNAL(valueChanged(int)),
 	  lslider, TQT_SLOT(setNum(int)));
   l5->addWidget(lslider, 0);
@@ -242,14 +242,14 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   TQHBoxLayout *l6 = new TQHBoxLayout;
   l1->addLayout(l6, row++, 2);
   volume_off = new TQLineEdit(dummyWidget);
-  volume_off->setFixedHeight(volume_off->sizeHint().height());
-  volume_off->setMinimumWidth((int)(volume_off->sizeHint().width() / 2));
+  volume_off->setFixedHeight(volume_off->tqsizeHint().height());
+  volume_off->setMinimumWidth((int)(volume_off->tqsizeHint().width() / 2));
   volume_medium = new TQLineEdit(dummyWidget);
-  volume_medium->setFixedHeight(volume_medium->sizeHint().height());
-  volume_medium->setMinimumWidth((int)(volume_medium->sizeHint().width() / 2));
+  volume_medium->setFixedHeight(volume_medium->tqsizeHint().height());
+  volume_medium->setMinimumWidth((int)(volume_medium->tqsizeHint().width() / 2));
   volume_high = new TQLineEdit(dummyWidget);
-  volume_high->setFixedHeight(volume_high->sizeHint().height());
-  volume_high->setMinimumWidth((int)(volume_high->sizeHint().width() / 2));
+  volume_high->setFixedHeight(volume_high->tqsizeHint().height());
+  volume_high->setMinimumWidth((int)(volume_high->tqsizeHint().width() / 2));
   l6->addWidget(volume_off);
   l6->addWidget(volume_medium);
   l6->addWidget(volume_high);