From 36e4074ba1536a63a121293b20663a38cad836b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 Aug 2010 19:26:34 +0000 Subject: TQt conversion fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1158449 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kppp/accounts.cpp | 10 +++++----- kppp/accounts.h | 6 +++--- kppp/acctselect.cpp | 4 ++-- kppp/acctselect.h | 10 +++++----- kppp/conwindow.cpp | 2 +- kppp/edit.cpp | 6 +++--- kppp/general.cpp | 2 +- kppp/general.h | 2 +- kppp/kpppwidget.cpp | 4 ++-- kppp/logview/main.cpp | 2 +- kppp/logview/monthly.h | 2 +- kppp/miniterm.h | 8 ++++---- kppp/modemcmds.cpp | 10 +++++----- kppp/modemcmds.h | 8 ++++---- kppp/modemdb.cpp | 4 ++-- kppp/modemdb.h | 2 +- kppp/modeminfo.cpp | 4 ++-- kppp/modems.cpp | 4 ++-- kppp/modems.h | 6 +++--- kppp/pppdargs.h | 8 ++++---- kppp/ppplog.h | 2 +- kppp/pppstatdlg.cpp | 6 +++--- kppp/pppstatdlg.h | 12 ++++++------ kppp/pppstats.cpp | 2 +- kppp/pppstats.h | 2 +- kppp/providerdb.cpp | 6 +++--- kppp/providerdb.h | 4 ++-- kppp/scriptedit.h | 4 ++-- 28 files changed, 71 insertions(+), 71 deletions(-) (limited to 'kppp') diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index d374e6c6..ce7b6ea3 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -58,7 +58,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); // add a hbox - TQHBoxLayout *l11 = new QHBoxLayout; + TQHBoxLayout *l11 = new TQHBoxLayout; l1->addLayout(l11); accountlist_l = new TQListBox(parent); @@ -69,7 +69,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) this, TQT_SLOT(editaccount())); l11->addWidget(accountlist_l, 10); - TQVBoxLayout *l111 = new QVBoxLayout; + TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); edit_b = new TQPushButton(i18n("&Edit..."), parent); connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount())); @@ -103,11 +103,11 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) i18n("

Deletes the selected account\n\n" "Use with care!")); - TQHBoxLayout *l12 = new QHBoxLayout; + TQHBoxLayout *l12 = new TQHBoxLayout; l1->addStretch(1); l1->addLayout(l12); - TQVBoxLayout *l121 = new QVBoxLayout; + TQVBoxLayout *l121 = new TQVBoxLayout; l12->addLayout(l121); l121->addStretch(1); costlabel = new TQLabel(i18n("Phone costs:"), parent); @@ -148,7 +148,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) TQWhatsThis::add(vollabel,tmp); TQWhatsThis::add(voledit, tmp); - TQVBoxLayout *l122 = new QVBoxLayout; + TQVBoxLayout *l122 = new TQVBoxLayout; l12->addStretch(1); l12->addLayout(l122); diff --git a/kppp/accounts.h b/kppp/accounts.h index 155c1658..4ed96d47 100644 --- a/kppp/accounts.h +++ b/kppp/accounts.h @@ -33,9 +33,9 @@ #include "acctselect.h" class KDialogBase; -class QCheckBox; -class QLineEdit; -class QTabDialog; +class TQCheckBox; +class TQLineEdit; +class TQTabDialog; class DialWidget; class ScriptWidget; class IPWidget; diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index 56a28cb4..eceeff76 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -78,7 +78,7 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con l1->addWidget(up, 1); // label to display the currently selected ruleset - TQHBoxLayout *l11 = new QHBoxLayout; + TQHBoxLayout *l11 = new TQHBoxLayout; l1->addSpacing(10); l1->addLayout(l11); TQLabel *lsel = new TQLabel(i18n("Selected:"), parent); @@ -92,7 +92,7 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con // volume accounting l1->addStretch(1); - TQHBoxLayout *l12 = new QHBoxLayout; + TQHBoxLayout *l12 = new TQHBoxLayout; l1->addLayout(l12); TQLabel *usevol_l = new TQLabel(i18n("Volume accounting:"), parent); use_vol = new TQComboBox(parent); diff --git a/kppp/acctselect.h b/kppp/acctselect.h index 7a4b319a..150e821b 100644 --- a/kppp/acctselect.h +++ b/kppp/acctselect.h @@ -39,11 +39,11 @@ #include #include -class QCheckBox; -class QComboBox; -class QLabel; -class QListView; -class QListViewItem; +class TQCheckBox; +class TQComboBox; +class TQLabel; +class TQListView; +class TQListViewItem; class AccountingSelector : public TQWidget { Q_OBJECT diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index e485d862..3b14e916 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -125,7 +125,7 @@ void ConWindow::accounting(bool on) { // add layout now tl1 = new TQVBoxLayout(this, 10, 10); tl1->addSpacing(5); - TQHBoxLayout *tl = new QHBoxLayout; + TQHBoxLayout *tl = new TQHBoxLayout; tl1->addLayout(tl); tl->addSpacing(20); TQGridLayout *l1; diff --git a/kppp/edit.cpp b/kppp/edit.cpp index cc26a889..8986520b 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -75,7 +75,7 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name ) number_label->setBuddy(numbers); numbers->setMinimumSize(120, 70); lpn->addWidget(numbers); - TQVBoxLayout *lpn1 = new QVBoxLayout; + TQVBoxLayout *lpn1 = new TQVBoxLayout; lpn->addLayout(lpn1); add = new TQPushButton(i18n("&Add..."), parent); del = new TQPushButton(i18n("&Remove"), parent); @@ -630,7 +630,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) dns_label = new TQLabel(i18n("DNS &IP address:"), parent); tl->addWidget(dns_label, 3, 0); - TQHBoxLayout *l2 = new QHBoxLayout; + TQHBoxLayout *l2 = new TQHBoxLayout; tl->addLayout(l2, 3, 1); dnsipaddr = new IPLineEdit(parent); dns_label->setBuddy(dnsipaddr); @@ -651,7 +651,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) TQWhatsThis::add(dns_label, tmp); TQWhatsThis::add(dnsipaddr, tmp); - TQHBoxLayout *l1 = new QHBoxLayout; + TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1, 4, 1); add = new TQPushButton(i18n("&Add"), parent); connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns())); diff --git a/kppp/general.cpp b/kppp/general.cpp index f6a88bfd..929f6321 100644 --- a/kppp/general.cpp +++ b/kppp/general.cpp @@ -482,7 +482,7 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) l1->addSpacing(10); - TQHBoxLayout *hbl = new QHBoxLayout; + TQHBoxLayout *hbl = new TQHBoxLayout; hbl->setSpacing(KDialog::spacingHint()); TQLabel *volumeLabel = new TQLabel(i18n("Modem &volume:"), parent); diff --git a/kppp/general.h b/kppp/general.h index 29d77738..bc1b005a 100644 --- a/kppp/general.h +++ b/kppp/general.h @@ -33,7 +33,7 @@ #include #include -class QSlider; +class TQSlider; class KIntNumInput; class ModemCommands; diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 2006489e..cac304c5 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -160,7 +160,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) TQWhatsThis::add(PW_Label,tmp); TQWhatsThis::add(PW_Edit,tmp); - TQHBoxLayout *l3 = new QHBoxLayout; + TQHBoxLayout *l3 = new TQHBoxLayout; tl->addSpacing(5); tl->addLayout(l3); tl->addSpacing(5); @@ -183,7 +183,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) fline = new KSeparator( KSeparator::HLine, this); tl->addWidget(fline); - TQHBoxLayout *l2 = new QHBoxLayout; + TQHBoxLayout *l2 = new TQHBoxLayout; tl->addLayout(l2); int minw = 0; diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index a533da38..f034c462 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -68,7 +68,7 @@ TopWidget::TopWidget() : KMainWindow(0, "") { if(!kpppmode) { // create menu mb = new KMenuBar(this); - TQPopupMenu *fm = new QPopupMenu; + TQPopupMenu *fm = new TQPopupMenu; fm->insertItem(SmallIcon("exit"),KStdGuiItem::quit().text(), F_EXIT); mb->insertItem(i18n("&File"), fm); diff --git a/kppp/logview/monthly.h b/kppp/logview/monthly.h index bfe5407e..e7c90b26 100644 --- a/kppp/logview/monthly.h +++ b/kppp/logview/monthly.h @@ -33,7 +33,7 @@ #include class KListView; -class QComboBox; +class TQComboBox; class LogListItem; class MonthlyWidget : public TQWidget { diff --git a/kppp/miniterm.h b/kppp/miniterm.h index c1d93bcf..f856effd 100644 --- a/kppp/miniterm.h +++ b/kppp/miniterm.h @@ -36,12 +36,12 @@ class KHelpMenu; -class QTimer; -class QMenuBar; +class TQTimer; +class TQMenuBar; class KToolBar; class KHelpMenu; -class QPushButton; -class QLabel; +class TQPushButton; +class TQLabel; class MyTerm : public TQMultiLineEdit { Q_OBJECT diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index 04767ede..29780e15 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -65,7 +65,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) l1->addMultiCellWidget(box, row++, GRIDROWS, 0, 3); // put slider and label into a separate H-Box - TQHBoxLayout *l2 = new QHBoxLayout; + TQHBoxLayout *l2 = new TQHBoxLayout; l1->addLayout(l2, row, 2); lpreinitslider = new TQLabel("MMMM", dummyWidget); FORMATSLIDERLABEL(lpreinitslider); @@ -90,7 +90,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) l1->addWidget(initstr[i], row++, 2); } - TQHBoxLayout *l3 = new QHBoxLayout; + TQHBoxLayout *l3 = new TQHBoxLayout; l1->addLayout(l3, row, 2); linitslider = new TQLabel("MMMM", dummyWidget); FORMATSLIDERLABEL(linitslider); @@ -106,7 +106,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) l1->addWidget(label3, row++, 1); /* Set ATS11 (Dial tone duration) between 0-255 (Default ~ 70) */ - TQHBoxLayout *l4 = new QHBoxLayout; + TQHBoxLayout *l4 = new TQHBoxLayout; l1->addLayout(l4, row, 2); ldurationslider = new TQLabel("MMMM", dummyWidget); FORMATSLIDERLABEL(ldurationslider); @@ -221,7 +221,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) l1->addWidget(label15, row, 1); l1->addWidget(escaperesp, row++, 2); - TQHBoxLayout *l5 = new QHBoxLayout; + TQHBoxLayout *l5 = new TQHBoxLayout; l1->addLayout(l5, row, 2); lslider = new TQLabel("MMMM", dummyWidget); FORMATSLIDERLABEL(lslider); @@ -239,7 +239,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(i18n("Volume off/low/high:"), dummyWidget); l1->addWidget(l, row, 1); - TQHBoxLayout *l6 = new QHBoxLayout; + TQHBoxLayout *l6 = new TQHBoxLayout; l1->addLayout(l6, row++, 2); volume_off = new TQLineEdit(dummyWidget); volume_off->setFixedHeight(volume_off->sizeHint().height()); diff --git a/kppp/modemcmds.h b/kppp/modemcmds.h index 7779471b..1ae13ad3 100644 --- a/kppp/modemcmds.h +++ b/kppp/modemcmds.h @@ -38,10 +38,10 @@ #include #include -class QLineEdit; -class QLabel; -class QPushButton; -class QGroupBox; +class TQLineEdit; +class TQLabel; +class TQPushButton; +class TQGroupBox; class ModemCommands : public KDialogBase { diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index d762f5fa..11b25b9c 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -145,7 +145,7 @@ const TQStringList *ModemDatabase::vendors() { TQStringList *ModemDatabase::models(TQString vendor) { - TQStringList *sl = new QStringList; + TQStringList *sl = new TQStringList; TQString s = i18n(""); if(vendor == s) vendor = i18n(""); @@ -203,7 +203,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { void ModemDatabase::load() { modemDB = new KConfig("DB/modemDB.rc", 0); - lvendors = new QStringList; + lvendors = new TQStringList; modems.setAutoDelete(true); TQStringList list = modemDB->groupList(); diff --git a/kppp/modemdb.h b/kppp/modemdb.h index 35ddbcff..afd4d601 100644 --- a/kppp/modemdb.h +++ b/kppp/modemdb.h @@ -40,7 +40,7 @@ #include #include class KConfig; -class QListBox; +class TQListBox; typedef TQDict CharDict; diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index 9e6668d8..6136b68a 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -69,7 +69,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) cancel->setFocus(); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton())); - TQHBoxLayout *l1 = new QHBoxLayout; + TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1); l1->addStretch(1); l1->addWidget(cancel); @@ -269,7 +269,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name) } //tl->addSpacing(1); - TQHBoxLayout *l2 = new QHBoxLayout; + TQHBoxLayout *l2 = new TQHBoxLayout; TQPushButton *ok = new KPushButton(KStdGuiItem::close(), this); ok->setDefault(TRUE); ok->setFocus(); diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 379b3c96..cd7e3373 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -57,7 +57,7 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); // add a hbox - TQHBoxLayout *l11 = new QHBoxLayout; + TQHBoxLayout *l11 = new TQHBoxLayout; l1->addLayout(l11); modemlist_l = new TQListBox(parent); @@ -68,7 +68,7 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) this, TQT_SLOT(editmodem())); l11->addWidget(modemlist_l, 10); - TQVBoxLayout *l111 = new QVBoxLayout; + TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); edit_b = new TQPushButton(i18n("&Edit..."), parent); connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editmodem())); diff --git a/kppp/modems.h b/kppp/modems.h index b197980e..64a5fdc7 100644 --- a/kppp/modems.h +++ b/kppp/modems.h @@ -34,9 +34,9 @@ #include "acctselect.h" class KDialogBase; -class QCheckBox; -class QLineEdit; -class QTabDialog; +class TQCheckBox; +class TQLineEdit; +class TQTabDialog; class DialWidget; class ScriptWidget; class IPWidget; diff --git a/kppp/pppdargs.h b/kppp/pppdargs.h index 9e60764e..e93f0086 100644 --- a/kppp/pppdargs.h +++ b/kppp/pppdargs.h @@ -30,10 +30,10 @@ #include -class QListBox; -class QLabel; -class QPushButton; -class QLineEdit; +class TQListBox; +class TQLabel; +class TQPushButton; +class TQLineEdit; class KPushButton; diff --git a/kppp/ppplog.h b/kppp/ppplog.h index bb752caf..2e3168a8 100644 --- a/kppp/ppplog.h +++ b/kppp/ppplog.h @@ -30,7 +30,7 @@ #ifndef __PPPL__H__ #define __PPPL__H__ -class QStringList; +class TQStringList; int PPPL_MakeLog(TQStringList &list); void PPPL_AnalyseLog(TQStringList &list, TQStringList &result); diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index b991da27..9c5ecda9 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -65,11 +65,11 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, l1->setColStretch(1, 1); // inner part of the grid - TQVBoxLayout *l11 = new QVBoxLayout; + TQVBoxLayout *l11 = new TQVBoxLayout; l1->addLayout(l11, 1, 1); // modem pixmap and IP labels - TQHBoxLayout *l111 = new QHBoxLayout; + TQHBoxLayout *l111 = new TQHBoxLayout; l11->addLayout(l111); big_modem_both_pixmap = UserIcon("modemboth"); @@ -155,7 +155,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, l112->setColStretch(3, 1); tl->addSpacing(5); - TQHBoxLayout *l12 = new QHBoxLayout; + TQHBoxLayout *l12 = new TQHBoxLayout; tl->addLayout(l12); l12->addStretch(1); diff --git a/kppp/pppstatdlg.h b/kppp/pppstatdlg.h index 800438ee..07b15e42 100644 --- a/kppp/pppstatdlg.h +++ b/kppp/pppstatdlg.h @@ -30,12 +30,12 @@ #include #include -class QLabel; -class QFrame; -class QGroupBox; -class QLineEdit; -class QTimer; -class QPushButton; +class TQLabel; +class TQFrame; +class TQGroupBox; +class TQLineEdit; +class TQTimer; +class TQPushButton; const int MAX_GRAPH_WIDTH = 600; const int GRAPH_UPDATE_TIME = 1000; diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp index c9f153d8..ecc083fc 100644 --- a/kppp/pppstats.cpp +++ b/kppp/pppstats.cpp @@ -96,7 +96,7 @@ PPPStats::PPPStats() { clear(); - timer = new QTimer; + timer = new TQTimer; connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerClick())); } diff --git a/kppp/pppstats.h b/kppp/pppstats.h index 7e19f8e9..97611ca8 100644 --- a/kppp/pppstats.h +++ b/kppp/pppstats.h @@ -30,7 +30,7 @@ #include "kpppconfig.h" #include -class QTimer; +class TQTimer; class PPPStats : public TQObject { Q_OBJECT diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index 867ffd8c..adcb8336 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -193,7 +193,7 @@ PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); tl->addWidget(l); - TQHBoxLayout *l1 = new QHBoxLayout; + TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1); l1->addStretch(1); @@ -204,7 +204,7 @@ PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { l1->addWidget(lb, 2); l1->addStretch(1); - list = new QStringList; + list = new TQStringList; // fill the listbox // set up filter @@ -269,7 +269,7 @@ PDB_Provider::PDB_Provider(TQWidget *parent) : TQWidget(parent) { "selection."), this); tl->addWidget(l); - TQHBoxLayout *l1 = new QHBoxLayout; + TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1); l1->addStretch(1); diff --git a/kppp/providerdb.h b/kppp/providerdb.h index cfeb785f..1c0cd7a9 100644 --- a/kppp/providerdb.h +++ b/kppp/providerdb.h @@ -38,8 +38,8 @@ #include #include -class QLineEdit; -class QListBox; +class TQLineEdit; +class TQListBox; class KSimpleConfig; class PDB_Intro : public TQWidget { diff --git a/kppp/scriptedit.h b/kppp/scriptedit.h index 7c914268..fd40100e 100644 --- a/kppp/scriptedit.h +++ b/kppp/scriptedit.h @@ -30,8 +30,8 @@ #include -class QComboBox; -class QLineEdit; +class TQComboBox; +class TQLineEdit; class ScriptEdit : public TQWidget { Q_OBJECT -- cgit v1.2.1