From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: 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 --- kppp/modems.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kppp/modems.cpp') diff --git a/kppp/modems.cpp b/kppp/modems.cpp index cd7e3373..6fb3a650 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -50,17 +50,17 @@ void parseargs(char* buf, char** args); -ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +ModemsWidget::ModemsWidget( 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); - modemlist_l = new TQListBox(parent); + modemlist_l = new TQListBox(tqparent); modemlist_l->setMinimumSize(160, 128); connect(modemlist_l, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotListBoxSelect(int))); @@ -70,23 +70,23 @@ ModemsWidget::ModemsWidget( 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(editmodem())); 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(newmodem())); 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(copymodem())); l111->addWidget(copy_b); TQWhatsThis::add(copy_b, @@ -95,7 +95,7 @@ ModemsWidget::ModemsWidget( 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(deletemodem())); l111->addWidget(delete_b); TQWhatsThis::add(delete_b, @@ -159,7 +159,7 @@ void ModemsWidget::newmodem() { if(result == TQDialog::Accepted) { modemlist_l->insertItem(gpppdata.modname()); - modemlist_l->setSelected(modemlist_l->findItem(gpppdata.modname()), + modemlist_l->setSelected(modemlist_l->tqfindItem(gpppdata.modname()), true); emit resetmodems(); gpppdata.save(); @@ -190,7 +190,7 @@ void ModemsWidget::copymodem() { void ModemsWidget::deletemodem() { TQString s = i18n("Are you sure you want to delete\nthe modem \"%1\"?") - .arg(modemlist_l->text(modemlist_l->currentItem())); + .tqarg(modemlist_l->text(modemlist_l->currentItem())); if(KMessageBox::warningContinueCancel(this, s, i18n("Confirm"), KStdGuiItem::del()) != KMessageBox::Continue) return; @@ -207,7 +207,7 @@ void ModemsWidget::deletemodem() { int ModemsWidget::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()); @@ -257,7 +257,7 @@ void ModemsWidget::modemNameChanged(const TQString & text) TQString ModemsWidget::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()) { -- cgit v1.2.3