diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 2bc1d72869b62af05ae4feafd878203b526da8c5 (patch) | |
tree | 2676903bb600bd9646644856e354940471ad84e2 /kppp | |
parent | 937b2991d8e78166eea904c80ad04d34607017a4 (diff) | |
download | tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kppp')
54 files changed, 276 insertions, 276 deletions
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index 6ee8ee45..2d7ab5d7 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -67,8 +67,8 @@ static TQString timet2qstring(time_t t) { // accounting is accomplished withing it's derived classes // ///////////////////////////////////////////////////////////////////////////// -AccountingBase::AccountingBase(TQObject *tqparent) : - TQObject(tqparent), +AccountingBase::AccountingBase(TQObject *parent) : + TQObject(parent), _total(0), _session(0) { @@ -212,8 +212,8 @@ TQString AccountingBase::getAccountingFile(const TQString &accountname) { // Accounting class for ruleset files // ///////////////////////////////////////////////////////////////////////////// -Accounting::Accounting(TQObject *tqparent, PPPStats *st) : - AccountingBase(tqparent), +Accounting::Accounting(TQObject *parent, PPPStats *st) : + AccountingBase(parent), acct_timer_id(0), update_timer_id(0), stats(st) @@ -358,8 +358,8 @@ double Accounting::session() const { -ExecutableAccounting::ExecutableAccounting(PPPStats *st, TQObject *tqparent) : - AccountingBase(tqparent), +ExecutableAccounting::ExecutableAccounting(PPPStats *st, TQObject *parent) : + AccountingBase(parent), proc(0), stats(st) { diff --git a/kppp/accounting.h b/kppp/accounting.h index 962d5d6a..020ca3e2 100644 --- a/kppp/accounting.h +++ b/kppp/accounting.h @@ -41,7 +41,7 @@ class AccountingBase : public TQObject { Q_OBJECT TQ_OBJECT public: - AccountingBase(TQObject *tqparent); + AccountingBase(TQObject *parent); virtual ~AccountingBase(); virtual double total() const; @@ -84,7 +84,7 @@ class Accounting : public AccountingBase { Q_OBJECT TQ_OBJECT public: - Accounting(TQObject *tqparent, PPPStats *st); + Accounting(TQObject *parent, PPPStats *st); virtual double total() const; virtual double session() const; @@ -122,7 +122,7 @@ class ExecutableAccounting : public AccountingBase { Q_OBJECT TQ_OBJECT public: - ExecutableAccounting(PPPStats *st, TQObject *tqparent = 0); + ExecutableAccounting(PPPStats *st, TQObject *parent = 0); virtual bool loadRuleSet(const TQString & ); virtual bool running() const; diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index eadace7e..fe1424e2 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -51,17 +51,17 @@ void parseargs(char* buf, char** args); -AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +AccountWidget::AccountWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { int min = 0; - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 10, 10); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); // add a hbox TQHBoxLayout *l11 = new TQHBoxLayout; l1->addLayout(l11); - accountlist_l = new TQListBox(tqparent); + accountlist_l = new TQListBox(parent); accountlist_l->setMinimumSize(160, 128); connect(accountlist_l, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotListBoxSelect(int))); @@ -71,7 +71,7 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); - edit_b = new TQPushButton(i18n("&Edit..."), tqparent); + edit_b = new TQPushButton(i18n("&Edit..."), parent); connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); @@ -81,13 +81,13 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) l111->addWidget(edit_b); - new_b = new TQPushButton(i18n("&New..."), tqparent); + new_b = new TQPushButton(i18n("&New..."), parent); 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"), tqparent); + copy_b = new TQPushButton(i18n("Co&py"), parent); connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copyaccount())); l111->addWidget(copy_b); TQWhatsThis::add(copy_b, @@ -96,7 +96,7 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) "to a new account that you can modify to fit your\n" "needs")); - delete_b = new TQPushButton(i18n("De&lete"), tqparent); + delete_b = new TQPushButton(i18n("De&lete"), parent); connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deleteaccount())); l111->addWidget(delete_b); TQWhatsThis::add(delete_b, @@ -110,11 +110,11 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) TQVBoxLayout *l121 = new TQVBoxLayout; l12->addLayout(l121); l121->addStretch(1); - costlabel = new TQLabel(i18n("Phone costs:"), tqparent); + costlabel = new TQLabel(i18n("Phone costs:"), parent); costlabel->setEnabled(FALSE); l121->addWidget(costlabel); - costedit = new TQLineEdit(tqparent); + costedit = new TQLineEdit(parent); costedit->setFocusPolicy(TQ_NoFocus); costedit->setFixedHeight(costedit->tqsizeHint().height()); costedit->setEnabled(FALSE); @@ -129,11 +129,11 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) TQWhatsThis::add(costlabel, tmp); TQWhatsThis::add(costedit, tmp); - vollabel = new TQLabel(i18n("Volume:"), tqparent); + vollabel = new TQLabel(i18n("Volume:"), parent); vollabel->setEnabled(FALSE); l121->addWidget(vollabel); - voledit = new TQLineEdit(tqparent,"voledit"); + voledit = new TQLineEdit(parent,"voledit"); voledit->setFocusPolicy(TQ_NoFocus); voledit->setFixedHeight(voledit->tqsizeHint().height()); voledit->setEnabled(FALSE); @@ -153,13 +153,13 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) l12->addLayout(l122); l122->addStretch(1); - reset = new TQPushButton(i18n("&Reset..."), tqparent); + reset = new TQPushButton(i18n("&Reset..."), parent); reset->setEnabled(FALSE); connect(reset, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetClicked())); l122->addWidget(reset); - log = new TQPushButton(i18n("&View Logs"), tqparent); + log = new TQPushButton(i18n("&View Logs"), parent); connect(log, TQT_SIGNAL(clicked()), this, TQT_SLOT(viewLogClicked())); l122->addWidget(log); @@ -426,14 +426,14 @@ TQString AccountWidget::prettyPrintVolume(unsigned int n) { // Queries the user what to reset: costs, volume or both // ///////////////////////////////////////////////////////////////////////////// -QueryReset::QueryReset(TQWidget *tqparent) : TQDialog(tqparent, 0, true) { +QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 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(tqparent, 10, 10); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); costs = new TQCheckBox(i18n("Reset the accumulated p&hone costs"), f); costs->setChecked(true); l1->addWidget(costs); diff --git a/kppp/accounts.h b/kppp/accounts.h index 61ba901d..6f8c1a28 100644 --- a/kppp/accounts.h +++ b/kppp/accounts.h @@ -46,7 +46,7 @@ class AccountWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - AccountWidget( TQWidget *tqparent=0, const char *name=0 ); + AccountWidget( TQWidget *parent=0, const char *name=0 ); ~AccountWidget() {} private slots: @@ -96,7 +96,7 @@ class QueryReset : public TQDialog { Q_OBJECT TQ_OBJECT public: - QueryReset(TQWidget *tqparent); + QueryReset(TQWidget *parent); enum {COSTS=1, VOLUME=2}; diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index fd456202..2a1ec1f8 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -52,25 +52,25 @@ #include "pppdata.h" -AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, const char *name) - : TQWidget(tqparent, name), +AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, const char *name) + : TQWidget(parent, name), isnewaccount(_isnewaccount) { - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); - enable_accounting = new TQCheckBox(i18n("&Enable accounting"), tqparent); + enable_accounting = new TQCheckBox(i18n("&Enable accounting"), parent); l1->addWidget(enable_accounting, 1); connect(enable_accounting, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableItems(bool))); // insert the tree widget - tl = new TQListView(tqparent, "treewidget"); + tl = new TQListView(parent, "treewidget"); connect(tl, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); tl->setMinimumSize(220, 200); l1->addWidget(tl, 1); - KURLLabel *up = new KURLLabel(tqparent); + KURLLabel *up = new KURLLabel(parent); 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,8 +81,8 @@ AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, c TQHBoxLayout *l11 = new TQHBoxLayout; l1->addSpacing(10); l1->addLayout(l11); - TQLabel *lsel = new TQLabel(i18n("Selected:"), tqparent); - selected = new TQLabel(tqparent); + TQLabel *lsel = new TQLabel(i18n("Selected:"), parent); + selected = new TQLabel(parent); selected->setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel); selected->setLineWidth(1); selected->setFixedHeight(selected->tqsizeHint().height() + 16); @@ -94,8 +94,8 @@ AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, c l1->addStretch(1); TQHBoxLayout *l12 = new TQHBoxLayout; l1->addLayout(l12); - TQLabel *usevol_l = new TQLabel(i18n("Volume accounting:"), tqparent); - use_vol = new TQComboBox(tqparent); + TQLabel *usevol_l = new TQLabel(i18n("Volume accounting:"), parent); + use_vol = new TQComboBox(parent); use_vol->insertItem(i18n("No Accounting"), 0); use_vol->insertItem(i18n("Bytes In"), 1); use_vol->insertItem(i18n("Bytes Out"), 2); @@ -266,7 +266,7 @@ void AccountingSelector::setupTreeWidget() { // appropriate item if(!isnewaccount && edit_item) { tl->setSelected(edit_item, true); - tl->setOpen(edit_item->tqparent(), true); + tl->setOpen(edit_item->parent(), 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->tqparent(); + i = i->parent(); } selected->setText(s.mid(1)); diff --git a/kppp/acctselect.h b/kppp/acctselect.h index 5f93b44e..a4c396cd 100644 --- a/kppp/acctselect.h +++ b/kppp/acctselect.h @@ -49,7 +49,7 @@ class AccountingSelector : public TQWidget { Q_OBJECT TQ_OBJECT public: - AccountingSelector(TQWidget *tqparent = 0, bool _isnewaccount = false, const char *name = 0); + AccountingSelector(TQWidget *parent = 0, bool _isnewaccount = false, const char *name = 0); ~AccountingSelector() {} bool save(); diff --git a/kppp/connect.cpp b/kppp/connect.cpp index b02da8db..ea755a3e 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -78,8 +78,8 @@ TQString old_hostname; bool modified_hostname; -ConnectWidget::ConnectWidget(TQWidget *tqparent, const char *name, PPPStats *st) - : TQWidget(tqparent, name), +ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st) + : TQWidget(parent, name), // initialize some important variables myreadbuffer(""), main_timer_ID(0), @@ -1271,8 +1271,8 @@ bool ConnectWidget::execppp() { command += gpppdata.gateway(); } - if(gpppdata.subnettqmask() != "0.0.0.0") - command += " nettqmask " + gpppdata.subnettqmask(); + if(gpppdata.subnetmask() != "0.0.0.0") + command += " netmask " + gpppdata.subnetmask(); // the english/i18n mix below is ugly but we want to keep working // after someone changed the code to use i18n'ed config values diff --git a/kppp/connect.h b/kppp/connect.h index 8f46ce8b..bb43619b 100644 --- a/kppp/connect.h +++ b/kppp/connect.h @@ -47,7 +47,7 @@ class ConnectWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ConnectWidget(TQWidget *tqparent, const char *name, PPPStats *st); + ConnectWidget(TQWidget *parent, const char *name, PPPStats *st); ~ConnectWidget(); public: diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index 3a20bbee..14154e69 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -31,9 +31,9 @@ extern PPPData gpppdata; -ConWindow::ConWindow(TQWidget *tqparent, const char *name,TQWidget *mainwidget, +ConWindow::ConWindow(TQWidget *parent, const char *name,TQWidget *mainwidget, PPPStats *st) - : TQWidget(tqparent, name, 0), + : TQWidget(parent, name, 0), minutes(0), seconds(0), hours(0), diff --git a/kppp/conwindow.h b/kppp/conwindow.h index e7fed7f5..a1d13f09 100644 --- a/kppp/conwindow.h +++ b/kppp/conwindow.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - ConWindow(TQWidget *tqparent, const char *name,TQWidget *main, PPPStats *st); + ConWindow(TQWidget *parent, const char *name,TQWidget *main, PPPStats *st); ~ConWindow(); protected: diff --git a/kppp/debug.cpp b/kppp/debug.cpp index 914ce940..9b220c20 100644 --- a/kppp/debug.cpp +++ b/kppp/debug.cpp @@ -29,8 +29,8 @@ extern KPPPWidget *p_kppp; -myMultiEdit::myMultiEdit(TQWidget *tqparent, const char *name) - : TQMultiLineEdit(tqparent, name) +myMultiEdit::myMultiEdit(TQWidget *parent, const char *name) + : TQMultiLineEdit(parent, name) { setReadOnly(true); } @@ -45,8 +45,8 @@ void myMultiEdit::newLine() { } -DebugWidget::DebugWidget(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, FALSE) +DebugWidget::DebugWidget(TQWidget *parent, const char *name) + : TQDialog(parent, name, FALSE) { setCaption(i18n("Login Script Debug Window")); diff --git a/kppp/debug.h b/kppp/debug.h index bc939dde..b5d02aeb 100644 --- a/kppp/debug.h +++ b/kppp/debug.h @@ -34,7 +34,7 @@ class myMultiEdit : public TQMultiLineEdit { public: - myMultiEdit(TQWidget *tqparent=0, const char *name=0); + myMultiEdit(TQWidget *parent=0, const char *name=0); void newLine(); void insertChar(unsigned char c); @@ -45,7 +45,7 @@ class DebugWidget : public TQDialog { Q_OBJECT TQ_OBJECT public: - DebugWidget(TQWidget *tqparent=0, const char *name=0); + DebugWidget(TQWidget *parent=0, const char *name=0); void clear(); diff --git a/kppp/docking.cpp b/kppp/docking.cpp index efe81924..eb544668 100644 --- a/kppp/docking.cpp +++ b/kppp/docking.cpp @@ -38,8 +38,8 @@ extern KPPPWidget *p_kppp; // static member DockWidget *DockWidget::dock_widget = 0; -DockWidget::DockWidget(TQWidget *tqparent, const char *name, PPPStats *st) - : KSystemTray(tqparent, name), stats(st) { +DockWidget::DockWidget(TQWidget *parent, const char *name, PPPStats *st) + : KSystemTray(parent, name), stats(st) { // load pixmaps dock_none_pixmap = UserIcon("dock_none"); diff --git a/kppp/docking.h b/kppp/docking.h index bb1e8139..5d3b398b 100644 --- a/kppp/docking.h +++ b/kppp/docking.h @@ -37,7 +37,7 @@ class DockWidget : public KSystemTray { Q_OBJECT TQ_OBJECT public: - DockWidget(TQWidget * tqparent, const char *name, PPPStats *st); + DockWidget(TQWidget * parent, const char *name, PPPStats *st); ~DockWidget(); protected: diff --git a/kppp/edit.cpp b/kppp/edit.cpp index fb1156be..ef2eaa10 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -44,17 +44,17 @@ #include "iplined.h" #include "auth.h" -DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { const int GRIDROWS = 8; - TQGridLayout *tl = new TQGridLayout(tqparent, GRIDROWS, 2, 0, KDialog::spacingHint()); + TQGridLayout *tl = new TQGridLayout(parent, GRIDROWS, 2, 0, KDialog::spacingHint()); - connect_label = new TQLabel(i18n("Connection &name:"), tqparent); + connect_label = new TQLabel(i18n("Connection &name:"), parent); tl->addWidget(connect_label, 0, 0); - connectname_l = new TQLineEdit(tqparent); + connectname_l = new TQLineEdit(parent); connectname_l->setMaxLength(ACCNAME_SIZE); connect_label->setBuddy(connectname_l); @@ -65,24 +65,24 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(connectname_l,tmp); - number_label = new TQLabel(i18n("P&hone number:"), tqparent); + number_label = new TQLabel(i18n("P&hone number:"), parent); number_label->tqsetAlignment(AlignTop|AlignLeft); tl->addWidget(number_label, 1, 0); TQHBoxLayout *lpn = new TQHBoxLayout(5); tl->addLayout(lpn, 1, 1); - numbers = new TQListBox(tqparent); + numbers = new TQListBox(parent); number_label->setBuddy(numbers); numbers->setMinimumSize(120, 70); lpn->addWidget(numbers); TQVBoxLayout *lpn1 = new TQVBoxLayout; lpn->addLayout(lpn1); - add = new TQPushButton(i18n("&Add..."), tqparent); - del = new TQPushButton(i18n("&Remove"), tqparent); + add = new TQPushButton(i18n("&Add..."), parent); + del = new TQPushButton(i18n("&Remove"), parent); - up = new TQPushButton(tqparent); + up = new TQPushButton(parent); up->setIconSet(BarIconSet("up")); - down = new TQPushButton(tqparent); + down = new TQPushButton(parent); down->setIconSet(BarIconSet("down")); lpn1->addWidget(add); lpn1->addWidget(del); @@ -112,10 +112,10 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(number_label,tmp); TQWhatsThis::add(numbers,tmp); - auth_l = new TQLabel(i18n("A&uthentication:"), tqparent); + auth_l = new TQLabel(i18n("A&uthentication:"), parent); tl->addWidget(auth_l, 3, 0); - auth = new TQComboBox(tqparent); + auth = new TQComboBox(parent); auth_l->setBuddy(auth); auth->insertItem(i18n("Script-based")); auth->insertItem(i18n("PAP")); @@ -136,7 +136,7 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(auth_l,tmp); TQWhatsThis::add(auth,tmp); - store_password = new TQCheckBox(i18n("Store &password"), tqparent); + store_password = new TQCheckBox(i18n("Store &password"), parent); store_password->setChecked(true); tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight); TQWhatsThis::add(store_password, @@ -149,10 +149,10 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name "readable only to you. Make sure nobody\n" "gains access to this file!")); - cbtype_l = new TQLabel(i18n("&Callback type:"), tqparent); + cbtype_l = new TQLabel(i18n("&Callback type:"), parent); tl->addWidget(cbtype_l, 5, 0); - cbtype = new TQComboBox(tqparent); + cbtype = new TQComboBox(parent); cbtype_l->setBuddy(cbtype); cbtype->insertItem(i18n("None")); cbtype->insertItem(i18n("Administrator-defined")); @@ -165,10 +165,10 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(cbtype_l,tmp); TQWhatsThis::add(cbtype,tmp); - cbphone_l = new TQLabel(i18n("Call&back number:"), tqparent); + cbphone_l = new TQLabel(i18n("Call&back number:"), parent); tl->addWidget(cbphone_l, 6, 0); - cbphone = new TQLineEdit(tqparent); + cbphone = new TQLineEdit(parent); cbphone_l->setBuddy(cbphone); cbphone->setMaxLength(140); tl->addWidget(cbphone, 6, 1); @@ -177,7 +177,7 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(cbphone_l,tmp); TQWhatsThis::add(cbphone,tmp); - pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), tqparent); + pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), parent); connect(pppdargs, TQT_SIGNAL(clicked()), TQT_SLOT(pppdargsbutton())); tl->addMultiCellWidget(pppdargs, 7, 7, 0, 1, AlignCenter); @@ -312,10 +312,10 @@ void DialWidget::pppdargsbutton() { ///////////////////////////////////////////////////////////////////////////// // ExecWidget ///////////////////////////////////////////////////////////////////////////// -ExecWidget::ExecWidget(TQWidget *tqparent, bool isnewaccount, const char *name) : - TQWidget(tqparent, name) +ExecWidget::ExecWidget(TQWidget *parent, bool isnewaccount, const char *name) : + TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); TQLabel *l = new TQLabel(\ i18n("Here you can select commands to run at certain stages of the\n" @@ -323,7 +323,7 @@ i18n("Here you can select commands to run at certain stages of the\n" "you cannot run any commands here requiring root permissions\n" "(unless, of course, you are root).\n\n" "Be sure to supply the whole path to the program otherwise\n" - "kppp might be unable to find it."), tqparent); + "kppp might be unable to find it."), parent); l->setMinimumHeight(l->tqsizeHint().height()); tl->addWidget(l); tl->addStretch(1); @@ -333,10 +333,10 @@ i18n("Here you can select commands to run at certain stages of the\n" l1->setColStretch(0, 0); l1->setColStretch(1, 1); - before_connect_l = new TQLabel(i18n("&Before connect:"), tqparent); + before_connect_l = new TQLabel(i18n("&Before connect:"), parent); before_connect_l->tqsetAlignment(AlignVCenter); l1->addWidget(before_connect_l, 0, 0); - before_connect = new TQLineEdit(tqparent); + before_connect = new TQLineEdit(parent); before_connect_l->setBuddy(before_connect); before_connect->setMaxLength(COMMAND_SIZE); l1->addWidget(before_connect, 0, 1); @@ -349,10 +349,10 @@ i18n("Here you can select commands to run at certain stages of the\n" TQWhatsThis::add(before_connect_l,tmp); TQWhatsThis::add(before_connect,tmp); - command_label = new TQLabel(i18n("&Upon connect:"), tqparent); + command_label = new TQLabel(i18n("&Upon connect:"), parent); command_label->tqsetAlignment(AlignVCenter); l1->addWidget(command_label, 1, 0); - command = new TQLineEdit(tqparent); + command = new TQLineEdit(parent); command_label->setBuddy(command); command->setMaxLength(COMMAND_SIZE); l1->addWidget(command, 1, 1); @@ -366,10 +366,10 @@ i18n("Here you can select commands to run at certain stages of the\n" TQWhatsThis::add(command,tmp); predisconnect_label = new TQLabel(i18n("Before &disconnect:"), - tqparent); + parent); predisconnect_label->tqsetAlignment(AlignVCenter); l1->addWidget(predisconnect_label, 2, 0); - predisconnect = new TQLineEdit(tqparent); + predisconnect = new TQLineEdit(parent); predisconnect_label->setBuddy(predisconnect); predisconnect->setMaxLength(COMMAND_SIZE); l1->addWidget(predisconnect, 2, 1); @@ -381,11 +381,11 @@ i18n("Here you can select commands to run at certain stages of the\n" TQWhatsThis::add(predisconnect,tmp); discommand_label = new TQLabel(i18n("U&pon disconnect:"), - tqparent); + parent); discommand_label->tqsetAlignment(AlignVCenter); l1->addWidget(discommand_label, 3, 0); - discommand = new TQLineEdit(tqparent); + discommand = new TQLineEdit(parent); discommand_label->setBuddy(discommand); discommand->setMaxLength(COMMAND_SIZE); l1->addWidget(discommand, 3, 1); @@ -427,16 +427,16 @@ bool ExecWidget::save() { // IPWidget // ///////////////////////////////////////////////////////////////////////////// -IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - TQVBoxLayout *topLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *topLayout = new TQVBoxLayout(parent); topLayout->setSpacing(KDialog::spacingHint()); - box = new TQVGroupBox(i18n("C&onfiguration"), tqparent); + box = new TQVGroupBox(i18n("C&onfiguration"), parent); box->setInsideSpacing(KDialog::spacingHint()); - rb = new TQButtonGroup(tqparent); + rb = new TQButtonGroup(parent); rb->hide(); connect(rb, TQT_SIGNAL(clicked(int)), TQT_SLOT(hitIPSelect(int))); @@ -478,10 +478,10 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQWhatsThis::add(ipaddress_label,tmp); TQWhatsThis::add(ipaddress_l,tmp); - sub_label = new TQLabel(i18n("&Subnet tqmask:"), ipWidget); + sub_label = new TQLabel(i18n("&Subnet mask:"), ipWidget); tmp = i18n("<p>If your computer has a static Internet address,\n" - "you must supply a network tqmask here. In almost\n" - "all cases this nettqmask will be <b>255.255.255.0</b>,\n" + "you must supply a network mask here. In almost\n" + "all cases this netmask will be <b>255.255.255.0</b>,\n" "but your mileage may vary.\n" "\n" "If unsure, contact your Internet Service Provider"); @@ -494,7 +494,7 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQWhatsThis::add(sub_label,tmp); TQWhatsThis::add(subnetmask_l,tmp); - autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), tqparent); + autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), parent); autoname->setChecked(gpppdata.autoname()); connect(autoname,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(autoname_t(bool))); @@ -516,14 +516,14 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) //load info from gpppdata if(!isnewaccount) { if(gpppdata.ipaddr() == "0.0.0.0" && - gpppdata.subnettqmask() == "0.0.0.0") { + gpppdata.subnetmask() == "0.0.0.0") { dynamicadd_rb->setChecked(true); hitIPSelect(0); autoname->setChecked(gpppdata.autoname()); } else { ipaddress_l->setText(gpppdata.ipaddr()); - subnetmask_l->setText(gpppdata.subnettqmask()); + subnetmask_l->setText(gpppdata.subnetmask()); staticadd_rb->setChecked(true); autoname->setChecked(false); } @@ -557,10 +557,10 @@ void IPWidget::autoname_t(bool on) { void IPWidget::save() { if(dynamicadd_rb->isChecked()) { gpppdata.setIpaddr("0.0.0.0"); - gpppdata.setSubnettqmask("0.0.0.0"); + gpppdata.setSubnetmask("0.0.0.0"); } else { gpppdata.setIpaddr(ipaddress_l->text()); - gpppdata.setSubnettqmask(subnetmask_l->text()); + gpppdata.setSubnetmask(subnetmask_l->text()); } gpppdata.setAutoname(autoname->isChecked()); } @@ -583,16 +583,16 @@ void IPWidget::hitIPSelect( int i ) { -DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - // box = new TQGroupBox(tqparent); - TQGridLayout *tl = new TQGridLayout(tqparent, 7, 2, 0, KDialog::spacingHint()); + // box = new TQGroupBox(parent); + TQGridLayout *tl = new TQGridLayout(parent, 7, 2, 0, KDialog::spacingHint()); - dnsdomain_label = new TQLabel(i18n("Domain &name:"), tqparent); + dnsdomain_label = new TQLabel(i18n("Domain &name:"), parent); tl->addWidget(dnsdomain_label, 0, 0); - dnsdomain = new TQLineEdit(tqparent); + dnsdomain = new TQLineEdit(parent); dnsdomain_label->setBuddy(dnsdomain); dnsdomain->setMaxLength(DOMAIN_SIZE); tl->addWidget(dnsdomain, 0, 1); @@ -608,7 +608,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQWhatsThis::add(dnsdomain_label,tmp); TQWhatsThis::add(dnsdomain,tmp); - conf_label = new TQLabel(i18n("C&onfiguration:"), tqparent); + conf_label = new TQLabel(i18n("C&onfiguration:"), parent); tl->addWidget(conf_label, 1, 0); bg = new TQButtonGroup("Group", this); @@ -616,23 +616,23 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(DNS_Mode_Selected(int))); bg->hide(); - autodns = new TQRadioButton(i18n("Automatic"), tqparent); + autodns = new TQRadioButton(i18n("Automatic"), parent); bg->insert(autodns, 0); tl->addWidget(autodns, 1, 1); // no automatic DNS detection for pppd < 2.3.7 if(!gpppdata.pppdVersionMin(2, 3, 7)) autodns->setEnabled(false); - mandns = new TQRadioButton(i18n("Manual"), tqparent); + mandns = new TQRadioButton(i18n("Manual"), parent); bg->insert(mandns, 1); tl->addWidget(mandns, 2, 1); - dns_label = new TQLabel(i18n("DNS &IP address:"), tqparent); + dns_label = new TQLabel(i18n("DNS &IP address:"), parent); tl->addWidget(dns_label, 3, 0); TQHBoxLayout *l2 = new TQHBoxLayout; tl->addLayout(l2, 3, 1); - dnsipaddr = new IPLineEdit(tqparent); + dnsipaddr = new IPLineEdit(parent); dns_label->setBuddy(dnsipaddr); connect(dnsipaddr, TQT_SIGNAL(returnPressed()), TQT_SLOT(adddns())); @@ -653,7 +653,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1, 4, 1); - add = new TQPushButton(i18n("&Add"), tqparent); + add = new TQPushButton(i18n("&Add"), parent); connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns())); int width = add->tqsizeHint().width(); width = TQMAX(width,60); @@ -665,7 +665,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) "specified in the field above. The entry\n" "will then be added to the list below")); - remove = new TQPushButton(i18n("&Remove"), tqparent); + remove = new TQPushButton(i18n("&Remove"), parent); connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removedns())); width = remove->tqsizeHint().width(); width = TQMAX(width,60); @@ -675,11 +675,11 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) i18n("Click this button to remove the selected DNS\n" "server entry from the list below")); - servers_label = new TQLabel(i18n("DNS address &list:"), tqparent); + servers_label = new TQLabel(i18n("DNS address &list:"), parent); servers_label->tqsetAlignment(AlignTop|AlignLeft); tl->addWidget(servers_label, 5, 0); - dnsservers = new TQListBox(tqparent); + dnsservers = new TQListBox(parent); servers_label->setBuddy(dnsservers); dnsservers->setMinimumSize(150, 80); connect(dnsservers, TQT_SIGNAL(highlighted(int)), @@ -694,7 +694,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) exdnsdisabled_toggle = new TQCheckBox(i18n( \ "&Disable existing DNS servers during connection"), - tqparent); + parent); exdnsdisabled_toggle->setChecked(gpppdata.exDNSDisabled()); tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter); TQWhatsThis::add(exdnsdisabled_toggle, @@ -782,16 +782,16 @@ void DNSWidget::removedns() { // // GatewayWidget // -GatewayWidget::GatewayWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +GatewayWidget::GatewayWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - TQVBoxLayout *topLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *topLayout = new TQVBoxLayout(parent); topLayout->setSpacing(KDialog::spacingHint()); - box = new TQVGroupBox(i18n("C&onfiguration"), tqparent); + box = new TQVGroupBox(i18n("C&onfiguration"), parent); box->setInsideSpacing(KDialog::spacingHint()); - rb = new TQButtonGroup(tqparent); + rb = new TQButtonGroup(parent); rb->hide(); connect(rb, TQT_SIGNAL(clicked(int)), TQT_SLOT(hitGatewaySelect(int))); @@ -822,7 +822,7 @@ GatewayWidget::GatewayWidget( TQWidget *tqparent, bool isnewaccount, const char gate_label->setBuddy(gatewayaddr); defaultroute = new TQCheckBox(i18n("&Assign the default route to this gateway"), - tqparent); + parent); TQWhatsThis::add(defaultroute, i18n("If this option is enabled, all packets not\n" "going to the local net are routed through\n" @@ -874,16 +874,16 @@ void GatewayWidget::hitGatewaySelect( int i ) { -ScriptWidget::ScriptWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); - se = new ScriptEdit(tqparent); + TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); + se = new ScriptEdit(parent); connect(se, TQT_SIGNAL(returnPressed()), TQT_SLOT(addButton())); tl->addWidget(se); // insert equal-sized buttons - KButtonBox *bbox = new KButtonBox(tqparent); + KButtonBox *bbox = new KButtonBox(parent); add = bbox->addButton(i18n("&Add")); connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(addButton())); bbox->addStretch(1); @@ -897,17 +897,17 @@ ScriptWidget::ScriptWidget( TQWidget *tqparent, bool isnewaccount, const char *n TQHBoxLayout *l12 = new TQHBoxLayout(0); tl->addLayout(l12); - stl = new TQListBox(tqparent); + stl = new TQListBox(parent); stl->setVScrollBarMode( TQScrollView::AlwaysOff ); connect(stl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(stlhighlighted(int))); stl->setMinimumSize(TQSize(70, 140)); - sl = new TQListBox(tqparent); + sl = new TQListBox(parent); sl->setVScrollBarMode( TQScrollView::AlwaysOff ); connect(sl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slhighlighted(int))); sl->setMinimumSize(TQSize(150, 140)); - slb = new TQScrollBar(tqparent); + slb = new TQScrollBar(parent); slb->setFixedWidth(slb->tqsizeHint().width()); connect(slb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrolling(int))); @@ -1201,7 +1201,7 @@ void ScriptWidget::removeButton() { // Used to specify a new phone number // ///////////////////////////////////////////////////////////////////////////// -PhoneNumberDialog::PhoneNumberDialog(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Add Phone Number"), Ok|Cancel) { +PhoneNumberDialog::PhoneNumberDialog(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Add Phone Number"), Ok|Cancel) { KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); TQHBox *hbox = new TQHBox(this); diff --git a/kppp/edit.h b/kppp/edit.h index 3bf7fdb1..9697442e 100644 --- a/kppp/edit.h +++ b/kppp/edit.h @@ -51,7 +51,7 @@ class DialWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - DialWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + DialWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~DialWidget() {} public slots: @@ -94,7 +94,7 @@ class ExecWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ExecWidget(TQWidget *tqparent=0, bool isnewaccount=true, const char *name=0); + ExecWidget(TQWidget *parent=0, bool isnewaccount=true, const char *name=0); public slots: bool save(); @@ -118,7 +118,7 @@ class IPWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - IPWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + IPWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~IPWidget() {} public slots: @@ -149,7 +149,7 @@ class DNSWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - DNSWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + DNSWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~DNSWidget() {} public slots: @@ -182,7 +182,7 @@ class GatewayWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - GatewayWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + GatewayWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~GatewayWidget() {} public slots: @@ -207,7 +207,7 @@ class ScriptWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ScriptWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + ScriptWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~ScriptWidget() {} public slots: @@ -248,7 +248,7 @@ class PhoneNumberDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - PhoneNumberDialog(TQWidget *tqparent = 0); + PhoneNumberDialog(TQWidget *parent = 0); TQString phoneNumber(); diff --git a/kppp/general.cpp b/kppp/general.cpp index 49981474..5ed9c459 100644 --- a/kppp/general.cpp +++ b/kppp/general.cpp @@ -46,23 +46,23 @@ // Widget containing misc. configuration options // ///////////////////////////////////////////////////////////////////////////// -GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) + : TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); TQHBoxLayout *hbox = new TQHBoxLayout(tl); TQLabel *label; - label = new TQLabel(i18n("pppd version:"), tqparent); + label = new TQLabel(i18n("pppd version:"), parent); hbox->addWidget(label); TQString version = gpppdata.pppdVersion(); if(version == "0.0.0") version = "unknown"; - label = new TQLabel(version, tqparent); + label = new TQLabel(version, parent); label->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); hbox->addWidget(label); - KIntNumInput *pppdTimeout = new KIntNumInput(gpppdata.pppdTimeout(), tqparent); + KIntNumInput *pppdTimeout = new KIntNumInput(gpppdata.pppdTimeout(), parent); pppdTimeout->setLabel(i18n("pppd &timeout:")); pppdTimeout->setRange(1, TIMEOUT_SIZE, 5, true); pppdTimeout->setSuffix(i18n(" sec")); @@ -79,7 +79,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) tl->addSpacing(10); TQCheckBox *chkBox; - chkBox = new TQCheckBox(i18n("Doc&k into panel on connect"), tqparent); + chkBox = new TQCheckBox(i18n("Doc&k into panel on connect"), parent); TQWhatsThis::add(chkBox, i18n("<p>After a connection is established, the\n" "window is minimized and a small icon\n" @@ -94,7 +94,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) this, TQT_SLOT(docking_toggled(bool))); tl->addWidget(chkBox); - chkBox = new TQCheckBox(i18n("A&utomatic redial on disconnect"), tqparent); + chkBox = new TQCheckBox(i18n("A&utomatic redial on disconnect"), parent); chkBox->setChecked(gpppdata.automatic_redial()); connect(chkBox,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(redial_toggled(bool))); @@ -106,7 +106,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "\n" "See <a href=\"#redial\">here</a> for more on this topic.")); - chkBox = new TQCheckBox(i18n("Automatic redial on NO &CARRIER"), tqparent); + chkBox = new TQCheckBox(i18n("Automatic redial on NO &CARRIER"), parent); chkBox->setChecked(gpppdata.get_redial_on_nocarrier()); connect(chkBox,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(nocarrier_toggled(bool))); @@ -117,7 +117,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "instead of waiting for user to click <CANCEL>\n" "button.")); - chkBox = new TQCheckBox(i18n("&Show clock on caption"), tqparent); + chkBox = new TQCheckBox(i18n("&Show clock on caption"), parent); chkBox->setChecked(gpppdata.get_show_clock_on_caption()); connect(chkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(caption_toggled(bool))); @@ -128,7 +128,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "was established. Very useful, so you \n" "should turn this on")); - chkBox = new TQCheckBox(i18n("Disco&nnect on X server shutdown"), tqparent); + chkBox = new TQCheckBox(i18n("Disco&nnect on X server shutdown"), parent); chkBox->setChecked(gpppdata.get_xserver_exit_disconnect()); connect(chkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(xserver_toggled(bool))); @@ -141,7 +141,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "\n" "See <a href=\"#disxserver\">here</a> for more on this.")); - chkBox = new TQCheckBox(i18n("&Quit on disconnect"), tqparent); + chkBox = new TQCheckBox(i18n("&Quit on disconnect"), parent); chkBox->setChecked(gpppdata.quit_on_disconnect()); connect(chkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(quit_toggled(bool))); @@ -150,7 +150,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) i18n("When this option is turned on, <i>kppp</i>\n" "will be closed when you disconnect")); - chkBox = new TQCheckBox(i18n("Minimi&ze window on connect"), tqparent); + chkBox = new TQCheckBox(i18n("Minimi&ze window on connect"), parent); chkBox->setChecked(gpppdata.get_iconify_on_connect()); connect(chkBox,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(iconify_toggled(bool))); @@ -203,15 +203,15 @@ void GeneralWidget::pppdtimeoutchanged(int n) { } -ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) - : TQWidget(tqparent, name) +ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) + : TQWidget(parent, name) { - TQGridLayout *tl = new TQGridLayout(tqparent, 9, 2, 0, KDialog::spacingHint()); + TQGridLayout *tl = new TQGridLayout(parent, 9, 2, 0, KDialog::spacingHint()); - connect_label = new TQLabel(i18n("Modem &name:"), tqparent); + connect_label = new TQLabel(i18n("Modem &name:"), parent); tl->addWidget(connect_label, 0, 0); - connectname_l = new TQLineEdit(tqparent); + connectname_l = new TQLineEdit(parent); connectname_l->setMaxLength(ACCNAME_SIZE); connect_label->setBuddy(connectname_l); @@ -221,10 +221,10 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(connect_label,tmp); TQWhatsThis::add(connectname_l,tmp); - label1 = new TQLabel(i18n("Modem de&vice:"), tqparent); + label1 = new TQLabel(i18n("Modem de&vice:"), parent); tl->addWidget(label1, 1, 0); - modemdevice = new TQComboBox(false, tqparent); + modemdevice = new TQComboBox(false, parent); label1->setBuddy(modemdevice); // ### deviceExist mechanism not functional right now bool deviceExist = false; @@ -252,10 +252,10 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(modemdevice,tmp); - label2 = new TQLabel(i18n("&Flow control:"), tqparent); + label2 = new TQLabel(i18n("&Flow control:"), parent); tl->addWidget(label2, 2, 0); - flowcontrol = new TQComboBox(false, tqparent); + flowcontrol = new TQComboBox(false, parent); label2->setBuddy(flowcontrol); flowcontrol->insertItem(i18n("Hardware [CRTSCTS]")); // sync with pppdata.cpp flowcontrol->insertItem(i18n("Software [XON/XOFF]")); @@ -278,10 +278,10 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(label2,tmp); TQWhatsThis::add(flowcontrol,tmp); - labelenter = new TQLabel(i18n("&Line termination:"), tqparent); + labelenter = new TQLabel(i18n("&Line termination:"), parent); tl->addWidget(labelenter, 3, 0); - enter = new TQComboBox(false, tqparent); + enter = new TQComboBox(false, parent); labelenter->setBuddy(enter); enter->insertItem("CR"); enter->insertItem("LF"); @@ -299,9 +299,9 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(labelenter,tmp); TQWhatsThis::add(enter, tmp); - baud_label = new TQLabel(i18n("Co&nnection speed:"), tqparent); + baud_label = new TQLabel(i18n("Co&nnection speed:"), parent); tl->addWidget(baud_label, 4, 0); - baud_c = new TQComboBox(tqparent); + baud_c = new TQComboBox(parent); baud_label->setBuddy(baud_c); static const char *baudrates[] = { @@ -358,7 +358,7 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) tl->addRowSpacing(4, 10); //Modem Lock File - modemlockfile = new TQCheckBox(i18n("&Use lock file"), tqparent); + modemlockfile = new TQCheckBox(i18n("&Use lock file"), parent); modemlockfile->setChecked(gpppdata.modemLockFile()); /* connect(modemlockfile, TQT_SIGNAL(toggled(bool)), @@ -378,7 +378,7 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) // Modem Timeout Line Edit Box - modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), tqparent); + modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), parent); modemtimeout->setLabel(i18n("Modem &timeout:")); modemtimeout->setRange(1, 120, 1); modemtimeout->setSuffix(i18n(" sec")); @@ -445,13 +445,13 @@ bool ModemWidget::save() } -ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); - waitfordt = new TQCheckBox(i18n("&Wait for dial tone before dialing"), tqparent); + waitfordt = new TQCheckBox(i18n("&Wait for dial tone before dialing"), parent); waitfordt->setChecked(gpppdata.waitForDialTone()); // connect(waitfordt, TQT_SIGNAL(toggled(bool)), TQT_SLOT(waitfordtchanged(bool))); l1->addWidget(waitfordt); @@ -464,7 +464,7 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) "\n" "<b>Default:</b>: On")); - busywait = new KIntNumInput(gpppdata.busyWait(), tqparent); + busywait = new KIntNumInput(gpppdata.busyWait(), parent); busywait->setLabel(i18n("B&usy wait:")); busywait->setRange(0, 300, 5, true); busywait->setSuffix(i18n(" sec")); @@ -485,9 +485,9 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) TQHBoxLayout *hbl = new TQHBoxLayout; hbl->setSpacing(KDialog::spacingHint()); - TQLabel *volumeLabel = new TQLabel(i18n("Modem &volume:"), tqparent); + TQLabel *volumeLabel = new TQLabel(i18n("Modem &volume:"), parent); hbl->addWidget(volumeLabel); - volume = new TQSlider(0, 2, 1, gpppdata.volume(), Qt::Horizontal, tqparent); + volume = new TQSlider(0, 2, 1, gpppdata.volume(), Qt::Horizontal, parent); volumeLabel->setBuddy(volume); volume->setTickmarks(TQSlider::Below); hbl->addWidget(volume); @@ -510,7 +510,7 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) l1->addSpacing(20); #if 0 - chkbox1 = new TQCheckBox(i18n("Modem asserts CD line"), tqparent); + chkbox1 = new TQCheckBox(i18n("Modem asserts CD line"), parent); chkbox1->setChecked(gpppdata.UseCDLine()); connect(chkbox1,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(use_cdline_toggled(bool))); @@ -525,12 +525,12 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) "<b>Default</b>: Off")); #endif - modemcmds = new TQPushButton(i18n("Mod&em Commands..."), tqparent); + modemcmds = new TQPushButton(i18n("Mod&em Commands..."), parent); TQWhatsThis::add(modemcmds, i18n("Allows you to change the AT command for\n" "your modem.")); - modeminfo_button = new TQPushButton(i18n("&Query Modem..."), tqparent); + modeminfo_button = new TQPushButton(i18n("&Query Modem..."), parent); TQWhatsThis::add(modeminfo_button, i18n("Most modems support the ATI command set to\n" "find out vendor and revision of your modem.\n" @@ -539,7 +539,7 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) "this information. It can be useful to help\n" "you set up the modem")); - terminal_button = new TQPushButton(i18n("&Terminal..."), tqparent); + terminal_button = new TQPushButton(i18n("&Terminal..."), parent); TQWhatsThis::add(terminal_button, i18n("Opens the built-in terminal program. You\n" "can use this if you want to play around\n" @@ -607,20 +607,20 @@ bool ModemWidget2::save() // Setup widget for the graph // ///////////////////////////////////////////////////////////////////////////// -GraphSetup::GraphSetup(TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name) +GraphSetup::GraphSetup(TQWidget *parent, const char *name) : + TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent); + TQVBoxLayout *tl = new TQVBoxLayout(parent); bool enable; TQColor bg, text, in, out; gpppdata.graphingOptions(enable, bg, text, in, out); - enable_check = new TQCheckBox(i18n("&Enable throughput graph"), tqparent); + enable_check = new TQCheckBox(i18n("&Enable throughput graph"), parent); tl->addWidget(enable_check); grpColor = new TQGroupBox(2, Qt::Horizontal, - i18n("Graph Colors"), tqparent); + i18n("Graph Colors"), parent); tl->addWidget(grpColor); TQLabel *label; diff --git a/kppp/general.h b/kppp/general.h index 543d6588..de9c711e 100644 --- a/kppp/general.h +++ b/kppp/general.h @@ -41,7 +41,7 @@ class GeneralWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - GeneralWidget( TQWidget *tqparent=0, const char *name=0 ); + GeneralWidget( TQWidget *parent=0, const char *name=0 ); private slots: void pppdtimeoutchanged(int); @@ -60,7 +60,7 @@ class ModemWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ModemWidget(TQWidget *tqparent=0, bool isnewmodem=true, const char *name=0); + ModemWidget(TQWidget *parent=0, bool isnewmodem=true, const char *name=0); bool save(); TQLineEdit *connectName() { return connectname_l;} private slots: @@ -90,7 +90,7 @@ class ModemWidget2 : public TQWidget { Q_OBJECT TQ_OBJECT public: - ModemWidget2(TQWidget *tqparent=0, const char *name=0); + ModemWidget2(TQWidget *parent=0, const char *name=0); bool save(); private slots: @@ -117,7 +117,7 @@ class GraphSetup : public TQWidget { Q_OBJECT TQ_OBJECT public: - GraphSetup(TQWidget *tqparent = 0, const char *name = 0); + GraphSetup(TQWidget *parent = 0, const char *name = 0); private slots: void enableToggled(bool); diff --git a/kppp/iplined.cpp b/kppp/iplined.cpp index 38603633..989c790c 100644 --- a/kppp/iplined.cpp +++ b/kppp/iplined.cpp @@ -26,8 +26,8 @@ #include "iplined.h" -IPLineEdit::IPLineEdit( TQWidget *tqparent, const char *name ) - : KRestrictedLine(tqparent, name, "0123456789.") +IPLineEdit::IPLineEdit( TQWidget *parent, const char *name ) + : KRestrictedLine(parent, name, "0123456789.") { setMaxLength(3 * 4 + 1 * 3); } diff --git a/kppp/iplined.h b/kppp/iplined.h index 3ba6202f..64a6dcbb 100644 --- a/kppp/iplined.h +++ b/kppp/iplined.h @@ -31,7 +31,7 @@ class IPLineEdit : public KRestrictedLine { public: - IPLineEdit( TQWidget *tqparent=0, const char *name=0 ); + IPLineEdit( TQWidget *parent=0, const char *name=0 ); ~IPLineEdit() {} virtual TQSize tqsizeHint() const; diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 4a335d45..8b73d393 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -74,8 +74,8 @@ extern KPPPWidget *p_kppp; -KPPPWidget::KPPPWidget( TQWidget *tqparent, const char *name ) - : DCOPObject( "KpppIface" ), TQWidget(tqparent, name) +KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) + : DCOPObject( "KpppIface" ), TQWidget(parent, name) , acct(0) , m_bCmdlAccount (false) , m_bCmdlModem (false) diff --git a/kppp/kpppwidget.h b/kppp/kpppwidget.h index 08c9e956..596464a3 100644 --- a/kppp/kpppwidget.h +++ b/kppp/kpppwidget.h @@ -64,7 +64,7 @@ class KPPPWidget : public TQWidget, virtual public KpppIface { TQ_OBJECT public: - KPPPWidget( TQWidget *tqparent=0, const char *name=0 ); + KPPPWidget( TQWidget *parent=0, const char *name=0 ); ~KPPPWidget(); void setPW_Edit(const TQString &); diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp index 65232a93..4be1dea0 100644 --- a/kppp/loginterm.cpp +++ b/kppp/loginterm.cpp @@ -35,8 +35,8 @@ extern KPPPWidget *p_kppp; -LoginMultiLineEdit::LoginMultiLineEdit(TQWidget *tqparent, const char *name) - : TQMultiLineEdit(tqparent, name) +LoginMultiLineEdit::LoginMultiLineEdit(TQWidget *parent, const char *name) + : TQMultiLineEdit(parent, name) { } @@ -93,8 +93,8 @@ void LoginMultiLineEdit::readChar(unsigned char c) { } -LoginTerm::LoginTerm (TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, FALSE) +LoginTerm::LoginTerm (TQWidget *parent, const char *name) + : TQDialog(parent, name, FALSE) { setCaption(i18n("Login Terminal Window")); setMinimumSize(300, 200); diff --git a/kppp/loginterm.h b/kppp/loginterm.h index 0940381c..ca2142fb 100644 --- a/kppp/loginterm.h +++ b/kppp/loginterm.h @@ -13,7 +13,7 @@ class LoginMultiLineEdit : public TQMultiLineEdit { public: - LoginMultiLineEdit(TQWidget *tqparent, const char *name); + LoginMultiLineEdit(TQWidget *parent, const char *name); ~LoginMultiLineEdit(); void keyPressEvent(TQKeyEvent *k); @@ -30,7 +30,7 @@ class LoginTerm : public TQDialog { Q_OBJECT TQ_OBJECT public: - LoginTerm(TQWidget *tqparent, const char *name); + LoginTerm(TQWidget *parent, const char *name); bool pressedContinue(); diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp index e741405d..b646acdc 100644 --- a/kppp/logview/export.cpp +++ b/kppp/logview/export.cpp @@ -47,8 +47,8 @@ ExportFormats [] = { /***** ExportWizard *****/ -ExportWizard::ExportWizard(TQWidget *tqparent, const TQString &_date) - : KWizard(tqparent, "", true) { +ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date) + : KWizard(parent, "", true) { date = _date; filterID = 0; diff --git a/kppp/logview/export.h b/kppp/logview/export.h index d99748aa..fb1f0291 100644 --- a/kppp/logview/export.h +++ b/kppp/logview/export.h @@ -42,7 +42,7 @@ class ExportWizard : public KWizard { Q_OBJECT TQ_OBJECT public: - ExportWizard(TQWidget *tqparent, const TQString &_date); + ExportWizard(TQWidget *parent, const TQString &_date); Export *createExportFilter(); int filterID; diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 80adc7bf..831976cc 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -107,12 +107,12 @@ static void costsMonth(double costs, double &result) { class LogListItem : public TQListViewItem { public: LogListItem(LogInfo *l, - TQListView * tqparent, + TQListView * parent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5, TQString s6, TQString s7, TQString s8) - : TQListViewItem(tqparent, s1, s2, s3, s4, s5, s6, s7, s8), + : TQListViewItem(parent, s1, s2, s3, s4, s5, s6, s7, s8), li(l) { } @@ -167,8 +167,8 @@ TQString LogListItem::key(int c, bool ascending) const return k; } -MonthlyWidget::MonthlyWidget(TQWidget *tqparent) : - TQWidget(tqparent) +MonthlyWidget::MonthlyWidget(TQWidget *parent) : + TQWidget(parent) { tl = 0; diff --git a/kppp/logview/monthly.h b/kppp/logview/monthly.h index 516310a4..2889a5af 100644 --- a/kppp/logview/monthly.h +++ b/kppp/logview/monthly.h @@ -40,7 +40,7 @@ class MonthlyWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - MonthlyWidget(TQWidget *tqparent = 0); + MonthlyWidget(TQWidget *parent = 0); private slots: void prevMonth(); diff --git a/kppp/main.cpp b/kppp/main.cpp index 9890e9e1..b6bb6c57 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -135,7 +135,7 @@ extern "C" { int main( int argc, char **argv ) { // make sure that open/fopen and so on NEVER return 1 or 2 (stdout and stderr) - // Expl: if stdout/stderr were closed on program start (by tqparent), open() + // Expl: if stdout/stderr were closed on program start (by parent), open() // would return a FD of 1, 2 (or even 0 if stdin was closed too) if(fcntl(0, F_GETFL) == -1) (void)open("/dev/null", O_RDONLY); @@ -172,7 +172,7 @@ int main( int argc, char **argv ) { exit(1); } - // tqparent process + // parent process close(sockets[1]); // drop setuid status diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 2c917e3f..1ed655c7 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -47,8 +47,8 @@ extern PPPData gpppdata; -MiniTerm::MiniTerm(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, true) +MiniTerm::MiniTerm(TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Kppp Mini-Terminal")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); @@ -225,8 +225,8 @@ void MiniTerm::help() { } -MyTerm::MyTerm(TQWidget *tqparent, const char* name) - : TQMultiLineEdit(tqparent, name) +MyTerm::MyTerm(TQWidget *parent, const char* name) + : TQMultiLineEdit(parent, name) { setFont(KGlobalSettings::fixedFont()); } diff --git a/kppp/miniterm.h b/kppp/miniterm.h index f1a6ab66..d329818d 100644 --- a/kppp/miniterm.h +++ b/kppp/miniterm.h @@ -47,7 +47,7 @@ class MyTerm : public TQMultiLineEdit { Q_OBJECT TQ_OBJECT public: - MyTerm(TQWidget *tqparent=0, const char *name=0); + MyTerm(TQWidget *parent=0, const char *name=0); void keyPressEvent (TQKeyEvent*); void insertChar(unsigned char c); @@ -64,7 +64,7 @@ class MiniTerm : public TQDialog { TQ_OBJECT public: - MiniTerm(TQWidget *tqparent=0, const char *name=0); + MiniTerm(TQWidget *parent=0, const char *name=0); ~MiniTerm(); void closeEvent( TQCloseEvent *e ); diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index 77c76134..dae8bd0f 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -45,8 +45,8 @@ // a little trick to make the label look like a disabled lineedit #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 *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n("Edit Modem Commands"), Ok|Cancel) +ModemCommands::ModemCommands(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("Edit Modem Commands"), Ok|Cancel) { KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); TQWidget *dummyWidget = new TQWidget(this); diff --git a/kppp/modemcmds.h b/kppp/modemcmds.h index 2a7486f9..f028167a 100644 --- a/kppp/modemcmds.h +++ b/kppp/modemcmds.h @@ -50,7 +50,7 @@ Q_OBJECT public: - ModemCommands(TQWidget *tqparent=0, const char *name=0); + ModemCommands(TQWidget *parent=0, const char *name=0); ~ModemCommands() {} private slots: diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index 4da23213..35eff389 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -42,7 +42,7 @@ #include <kconfig.h> #include <kstdguiitem.h> -ModemSelector::ModemSelector(TQWidget *tqparent) : TQDialog(tqparent, 0, true) { +ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) { // set up widgets and such setCaption(i18n("Select Modem Type")); TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); @@ -173,7 +173,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { map = modemDB->entryMap(key); it = map.begin(); - // remove tqparent attribute + // remove parent attribute dict.setAutoDelete(true); dict.remove("Parent"); @@ -190,7 +190,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { dict.replace("Name", new TQString(key)); } - // check tqparent attribute + // check parent attribute if(dict["Parent"] != 0) loadModem(*dict["Parent"], dict); else diff --git a/kppp/modemdb.h b/kppp/modemdb.h index f0c6c406..f8bd84e3 100644 --- a/kppp/modemdb.h +++ b/kppp/modemdb.h @@ -69,7 +69,7 @@ class ModemSelector : public TQDialog { Q_OBJECT TQ_OBJECT public: - ModemSelector(TQWidget *tqparent = 0); + ModemSelector(TQWidget *parent = 0); ~ModemSelector(); private slots: diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index 737d468a..8c9f00cd 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -35,8 +35,8 @@ #include "modem.h" #include <klocale.h> -ModemTransfer::ModemTransfer(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) +ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) + : TQDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) { setCaption(i18n("ATI Query")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); @@ -240,8 +240,8 @@ void ModemTransfer::closeEvent( TQCloseEvent *e ) { } -ModemInfo::ModemInfo(TQWidget *tqparent, const char* name) - : TQDialog(tqparent, name, TRUE, WStyle_Customize|WStyle_NormalBorder) +ModemInfo::ModemInfo(TQWidget *parent, const char* name) + : TQDialog(parent, name, TRUE, WStyle_Customize|WStyle_NormalBorder) { TQString label_text; diff --git a/kppp/modeminfo.h b/kppp/modeminfo.h index aeeb86e0..6bf3956e 100644 --- a/kppp/modeminfo.h +++ b/kppp/modeminfo.h @@ -43,7 +43,7 @@ class ModemTransfer : public TQDialog { Q_OBJECT TQ_OBJECT public: - ModemTransfer(TQWidget *tqparent=0, const char *name=0); + ModemTransfer(TQWidget *parent=0, const char *name=0); public slots: void init(); @@ -77,7 +77,7 @@ class ModemInfo : public TQDialog { Q_OBJECT TQ_OBJECT public: - ModemInfo(TQWidget *tqparent=0, const char *name=0); + ModemInfo(TQWidget *parent=0, const char *name=0); public: void setAtiString(int num, TQString s); diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 84b0979e..9cbe6d9a 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -50,17 +50,17 @@ void parseargs(char* buf, char** args); -ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { int min = 0; - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 10, 10); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); // add a hbox TQHBoxLayout *l11 = new TQHBoxLayout; l1->addLayout(l11); - modemlist_l = new TQListBox(tqparent); + modemlist_l = new TQListBox(parent); modemlist_l->setMinimumSize(160, 128); connect(modemlist_l, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotListBoxSelect(int))); @@ -70,7 +70,7 @@ ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); - edit_b = new TQPushButton(i18n("&Edit..."), tqparent); + edit_b = new TQPushButton(i18n("&Edit..."), parent); connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editmodem())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); @@ -80,13 +80,13 @@ ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) l111->addWidget(edit_b); - new_b = new TQPushButton(i18n("&New..."), tqparent); + new_b = new TQPushButton(i18n("&New..."), parent); 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"), tqparent); + copy_b = new TQPushButton(i18n("Co&py"), parent); connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copymodem())); l111->addWidget(copy_b); TQWhatsThis::add(copy_b, @@ -95,7 +95,7 @@ ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) "to a new account that you can modify to fit your\n" "needs")); - delete_b = new TQPushButton(i18n("De&lete"), tqparent); + delete_b = new TQPushButton(i18n("De&lete"), parent); connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deletemodem())); l111->addWidget(delete_b); TQWhatsThis::add(delete_b, diff --git a/kppp/modems.h b/kppp/modems.h index 069139af..0e3fa775 100644 --- a/kppp/modems.h +++ b/kppp/modems.h @@ -47,7 +47,7 @@ class ModemsWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ModemsWidget( TQWidget *tqparent=0, const char *name=0 ); + ModemsWidget( TQWidget *parent=0, const char *name=0 ); ~ModemsWidget() {} private slots: diff --git a/kppp/newwidget.cpp b/kppp/newwidget.cpp index 66ed8649..49676ddd 100644 --- a/kppp/newwidget.cpp +++ b/kppp/newwidget.cpp @@ -6,8 +6,8 @@ #include "newwidget.h" -TQLineEdit *newLineEdit(int visiblewidth, TQWidget *tqparent) { - TQLineEdit *l = new TQLineEdit(tqparent); +TQLineEdit *newLineEdit(int visiblewidth, TQWidget *parent) { + TQLineEdit *l = new TQLineEdit(parent); if(visiblewidth == 0) l->setMinimumWidth(l->tqsizeHint().width()); else diff --git a/kppp/newwidget.h b/kppp/newwidget.h index 49d79e69..07129c74 100644 --- a/kppp/newwidget.h +++ b/kppp/newwidget.h @@ -14,6 +14,6 @@ #define L_FIXEDH 2 #define L_FIXED (L_FIXEDW | L_FIXEDH) -TQLineEdit *newLineEdit(int visiblewidth, TQWidget *tqparent); +TQLineEdit *newLineEdit(int visiblewidth, TQWidget *parent); #endif diff --git a/kppp/opener.cpp b/kppp/opener.cpp index 7f61f775..88d27c87 100644 --- a/kppp/opener.cpp +++ b/kppp/opener.cpp @@ -30,7 +30,7 @@ * the setuid root part of kppp. So please be careful ! * o restrain from using X, TQt or KDE library calls * o check for possible buffer overflows - * o handle requests from the tqparent process with care. They might be forged. + * o handle requests from the parent process with care. They might be forged. * o be paranoid and think twice about everything you change. */ @@ -519,7 +519,7 @@ bool Opener::execpppd(const char *arguments) { switch(pppdPid = fork()) { case -1: - fprintf(stderr,"In tqparent: fork() failed\n"); + fprintf(stderr,"In parent: fork() failed\n"); return false; break; @@ -561,7 +561,7 @@ bool Opener::execpppd(const char *arguments) { break; default: - Debug2("In tqparent: pppd pid %d\n",pppdPid); + Debug2("In parent: pppd pid %d\n",pppdPid); close(ttyfd); ttyfd = -1; return true; diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp index b057e9b5..3b4abc3a 100644 --- a/kppp/pppdargs.cpp +++ b/kppp/pppdargs.cpp @@ -40,8 +40,8 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -PPPdArguments::PPPdArguments(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, TRUE) +PPPdArguments::PPPdArguments(TQWidget *parent, const char *name) + : TQDialog(parent, name, TRUE) { setCaption(i18n("Customize pppd Arguments")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); diff --git a/kppp/pppdargs.h b/kppp/pppdargs.h index 300e3f99..6c0e1fee 100644 --- a/kppp/pppdargs.h +++ b/kppp/pppdargs.h @@ -41,7 +41,7 @@ class PPPdArguments : public TQDialog { Q_OBJECT TQ_OBJECT public: - PPPdArguments(TQWidget *tqparent=0, const char *name=0); + PPPdArguments(TQWidget *parent=0, const char *name=0); ~PPPdArguments() {} private slots: diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index 62dfeaa9..ceb8298b 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -1199,12 +1199,12 @@ void PPPData::setIpaddr(const TQString &n) { } -const TQString PPPData::subnettqmask() { +const TQString PPPData::subnetmask() { return readConfig(caccountgroup, SUBNETMASK_KEY); } -void PPPData::setSubnettqmask(const TQString &n) { +void PPPData::setSubnetmask(const TQString &n) { writeConfig(caccountgroup, SUBNETMASK_KEY, n); } diff --git a/kppp/pppdata.h b/kppp/pppdata.h index 8956f6c8..904ef581 100644 --- a/kppp/pppdata.h +++ b/kppp/pppdata.h @@ -413,8 +413,8 @@ public: const TQString ipaddr(); void setIpaddr(const TQString &); - const TQString subnettqmask(); - void setSubnettqmask(const TQString &); + const TQString subnetmask(); + void setSubnetmask(const TQString &); bool AcctEnabled(); void setAcctEnabled(bool set); diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index 15582324..39c1490d 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -44,9 +44,9 @@ extern PPPData gpppdata; -PPPStatsDlg::PPPStatsDlg(TQWidget *tqparent, const char *name, TQWidget *, +PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, PPPStats *st) - : TQWidget(tqparent, name, 0), + : TQWidget(parent, name, 0), stats(st) { int i; diff --git a/kppp/pppstatdlg.h b/kppp/pppstatdlg.h index cfb3a464..95218d26 100644 --- a/kppp/pppstatdlg.h +++ b/kppp/pppstatdlg.h @@ -49,7 +49,7 @@ class PPPStatsDlg : public TQWidget { public: - PPPStatsDlg(TQWidget *tqparent, const char *name,TQWidget *main, + PPPStatsDlg(TQWidget *parent, const char *name,TQWidget *main, PPPStats *st); ~PPPStatsDlg(); diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index f27c5528..97d13612 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -48,8 +48,8 @@ TQWizard* ProviderDB::wiz = 0L; -ProviderDB::ProviderDB(TQWidget *tqparent) : - KWizard(tqparent, "", true), +ProviderDB::ProviderDB(TQWidget *parent) : + KWizard(parent, "", true), cfg(0) { setCaption(i18n("Create New Account")); @@ -164,7 +164,7 @@ void ProviderDB::accept() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Intro::PDB_Intro(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Intro::PDB_Intro(TQWidget *parent) : TQWidget(parent) { TQLabel *l = new TQLabel(i18n("You will be asked a few questions on information\n" "which is needed to establish an Internet connection\n" "with your Internet Service Provider (ISP).\n\n" @@ -182,7 +182,7 @@ PDB_Intro::PDB_Intro(TQWidget *tqparent) : TQWidget(tqparent) { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Country::PDB_Country(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { TQLabel *l = new TQLabel(i18n("Select the location where you plan to use this\n" "account from the list below. If your country or\n" "location is not listed, you have to create the\n" @@ -251,7 +251,7 @@ PDB_Country::~PDB_Country() } void PDB_Country::selectionChanged(int idx) { - // TQWizard *wizard = (TQWizard *)tqparent(); Why doesn't this work ? + // TQWizard *wizard = (TQWizard *)parent(); Why doesn't this work ? ProviderDB::wiz->setNextEnabled(this, (idx != -1)); } @@ -259,7 +259,7 @@ void PDB_Country::selectionChanged(int idx) { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Provider::PDB_Provider(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Provider::PDB_Provider(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("Select your Internet Service Provider (ISP) from\n" "the list below. If the ISP is not in this list,\n" @@ -334,7 +334,7 @@ TQString PDB_Provider::getDir() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_UserInfo::PDB_UserInfo(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_UserInfo::PDB_UserInfo(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("To log on to your ISP, kppp needs the username\n" "and the password you got from your ISP. Type\n" @@ -388,7 +388,7 @@ void PDB_UserInfo::activate() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_DialPrefix::PDB_DialPrefix(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_DialPrefix::PDB_DialPrefix(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("If you need a special dial prefix (e.g. if you\n" "are using a telephone switch) you can specify\n" @@ -424,7 +424,7 @@ void PDB_DialPrefix::activate() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Finished::PDB_Finished(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Finished::PDB_Finished(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("Finished!\n\n" "A new account has been created. Click \"Finish\" to\n" diff --git a/kppp/providerdb.h b/kppp/providerdb.h index 0705cac3..296780d1 100644 --- a/kppp/providerdb.h +++ b/kppp/providerdb.h @@ -46,7 +46,7 @@ class PDB_Intro : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Intro(TQWidget *tqparent); + PDB_Intro(TQWidget *parent); }; @@ -54,7 +54,7 @@ class PDB_Country : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Country(TQWidget *tqparent); + PDB_Country(TQWidget *parent); ~PDB_Country(); TQListBox *lb; TQStringList *list; @@ -68,7 +68,7 @@ class PDB_Provider : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Provider(TQWidget *tqparent); + PDB_Provider(TQWidget *parent); void setDir(const TQString &d); TQString getDir(); @@ -87,7 +87,7 @@ class PDB_UserInfo : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_UserInfo(TQWidget *tqparent); + PDB_UserInfo(TQWidget *parent); TQString username(); TQString password(); void activate(); @@ -105,7 +105,7 @@ class PDB_DialPrefix : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_DialPrefix(TQWidget *tqparent); + PDB_DialPrefix(TQWidget *parent); TQString prefix(); void activate(); @@ -118,7 +118,7 @@ class PDB_Finished : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Finished(TQWidget *tqparent); + PDB_Finished(TQWidget *parent); }; @@ -126,7 +126,7 @@ class ProviderDB : public KWizard { Q_OBJECT TQ_OBJECT public: - ProviderDB(TQWidget *tqparent); + ProviderDB(TQWidget *parent); ~ProviderDB(); static TQWizard *wiz; diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp index e6cbea58..c3025762 100644 --- a/kppp/pwentry.cpp +++ b/kppp/pwentry.cpp @@ -30,10 +30,10 @@ #include <kglobalsettings.h> #include "pwentry.h" -PWEntry::PWEntry( TQWidget *tqparent, const char *name ) +PWEntry::PWEntry( TQWidget *parent, const char *name ) : TQWidget(NULL, name) { - if(tqparent){ + if(parent){ TQPoint point = mapToGlobal (TQPoint (0,0)); TQRect pos = tqgeometry(); @@ -43,7 +43,7 @@ PWEntry::PWEntry( TQWidget *tqparent, const char *name ) 300, 90); } else { - TQRect desk = KGlobalSettings::desktopGeometry(tqparent); + TQRect desk = KGlobalSettings::desktopGeometry(parent); setGeometry( desk.center().x() - 150, desk.center().y() - 50, 300, 90 ); } diff --git a/kppp/pwentry.h b/kppp/pwentry.h index 258c079e..aa7779cd 100644 --- a/kppp/pwentry.h +++ b/kppp/pwentry.h @@ -39,7 +39,7 @@ class PWEntry : public TQWidget { public: - PWEntry( TQWidget *tqparent=0, const char *name=0 ); + PWEntry( TQWidget *parent=0, const char *name=0 ); bool Consumed(); void setConsumed(); TQString text(); diff --git a/kppp/scriptedit.cpp b/kppp/scriptedit.cpp index afc3818d..afa88821 100644 --- a/kppp/scriptedit.cpp +++ b/kppp/scriptedit.cpp @@ -30,8 +30,8 @@ #include <tqcombobox.h> #include <tqlineedit.h> -ScriptEdit::ScriptEdit( TQWidget *tqparent, const char *name ) - : TQWidget(tqparent, name) +ScriptEdit::ScriptEdit( TQWidget *parent, const char *name ) + : TQWidget(parent, name) { TQHBoxLayout *tl = new TQHBoxLayout(this, 0, 10); diff --git a/kppp/scriptedit.h b/kppp/scriptedit.h index f94e717e..81cefd5b 100644 --- a/kppp/scriptedit.h +++ b/kppp/scriptedit.h @@ -37,7 +37,7 @@ class ScriptEdit : public TQWidget { Q_OBJECT TQ_OBJECT public: - ScriptEdit( TQWidget *tqparent=0, const char *name=0 ); + ScriptEdit( TQWidget *parent=0, const char *name=0 ); ~ScriptEdit() {} TQString text()const; |