From ca82971624269719d487c6f7980d7237f9420036 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:45:00 -0600 Subject: [PATCH] Rename a number of old tq methods that are no longer tq specific --- atlantikdesigner/designer/boardinfo.cpp | 16 +- atlantikdesigner/designer/boardinfo.h | 2 +- atlantikdesigner/designer/designer.cpp | 28 +-- atlantikdesigner/designer/designer.h | 2 +- atlantikdesigner/designer/editor.cpp | 78 ++++---- atlantikdesigner/designer/editor.h | 8 +- atlantikdesigner/designer/group.cpp | 32 ++-- atlantikdesigner/designer/group.h | 2 +- .../xxports/gmx/gmx_xxport.cpp | 22 +-- .../xxports/kworldclock/geo_xxport.cpp | 12 +- .../plugin_katesymbolviewer.cpp | 2 +- kate/filelistloader/katefll_initplugin.cpp | 2 +- kate/filelistloader/katefll_plugin.cpp | 4 +- kate/filetemplates/plugin/filetemplates.cpp | 16 +- .../plugin_kateinsertcommand.cpp | 6 +- kate/kjswrapper/bindings.cpp | 6 +- kate/kjswrapper/plugin_katekjswrapper.cpp | 6 +- kate/kpybrowser/kpybrowser.cpp | 6 +- kate/kpybrowser/pybrowse_part.cpp | 2 +- kate/make/plugin_katemake.cpp | 32 ++-- kate/snippets/CWidgetSnippetsBase.ui | 6 +- kate/snippets/plugin_katesnippets.cpp | 2 +- kate/snippets/plugin_katesnippets.h | 2 +- .../plugin_katetabbarextension.cpp | 2 +- .../plugin_katetabbarextension.h | 2 +- kate/xmlcheck/plugin_katexmlcheck.cpp | 6 +- kate/xmltools/html4-loose.dtd.xml | 74 ++++---- kate/xmltools/html4-strict.dtd.xml | 48 ++--- kate/xmltools/kde-docbook.dtd.xml | 114 ++++++------ kate/xmltools/plugin_katexmltools.cpp | 14 +- kate/xmltools/pseudo_dtd.cpp | 8 +- kate/xmltools/testcases.xml | 2 +- kate/xmltools/xhtml1-frameset.dtd.xml | 8 +- kate/xmltools/xhtml1-strict.dtd.xml | 8 +- kate/xmltools/xhtml1-transitional.dtd.xml | 8 +- kfile-plugins/html/kfile_html.cpp | 2 +- kfile-plugins/lnk/kfile_lnk.cpp | 4 +- kfile-plugins/lnk/read_lnk.cpp | 4 +- kfile-plugins/mhtml/kfile_mhtml.cpp | 4 +- kicker-applets/kbinaryclock/kbinaryclock.cpp | 38 ++-- kicker-applets/kbinaryclock/kbinaryclock.kcfg | 2 +- kicker-applets/kbinaryclock/settings.ui | 26 +-- kicker-applets/kolourpicker/kolourpicker.cpp | 18 +- kicker-applets/kolourpicker/simplebutton.cpp | 16 +- kicker-applets/kolourpicker/simplebutton.h | 6 +- kicker-applets/ktimemon/confdlg.cc | 4 +- kicker-applets/ktimemon/sample.cc | 36 ++-- kicker-applets/ktimemon/timemon.cc | 20 +- kicker-applets/math/mathapplet.cpp | 10 +- kicker-applets/math/parser.cpp | 20 +- .../mediacontrol/amarokInterface.cpp | 4 +- kicker-applets/mediacontrol/amarokInterface.h | 2 +- kicker-applets/mediacontrol/jukInterface.cpp | 4 +- kicker-applets/mediacontrol/jukInterface.h | 2 +- kicker-applets/mediacontrol/kscdInterface.cpp | 12 +- kicker-applets/mediacontrol/kscdInterface.h | 2 +- kicker-applets/mediacontrol/mediacontrol.cpp | 22 +-- kicker-applets/mediacontrol/mediacontrol.h | 4 +- .../mediacontrol/mediacontrolconfig.cpp | 2 +- .../mediacontrol/mediacontrolconfigwidget.ui | 24 +-- kicker-applets/mediacontrol/mpdInterface.cpp | 44 ++--- kicker-applets/mediacontrol/mpdInterface.h | 2 +- .../mediacontrol/noatunInterface.cpp | 4 +- kicker-applets/mediacontrol/noatunInterface.h | 2 +- kicker-applets/mediacontrol/playerInterface.h | 4 +- kicker-applets/mediacontrol/simplebutton.cpp | 16 +- kicker-applets/mediacontrol/simplebutton.h | 6 +- kicker-applets/mediacontrol/xmmsInterface.cpp | 4 +- kicker-applets/mediacontrol/xmmsInterface.h | 2 +- konq-plugins/adblock/adblock.cpp | 2 +- konq-plugins/akregator/konqfeedicon.cpp | 4 +- konq-plugins/arkplugin/arkplugin.cpp | 8 +- .../domtreeviewer/attributeeditdialog.ui | 6 +- .../domtreeviewer/domlistviewitem.cpp | 4 +- konq-plugins/domtreeviewer/domlistviewitem.h | 2 +- .../domtreeviewer/domtreecommands.cpp | 6 +- konq-plugins/domtreeviewer/domtreecommands.h | 4 +- konq-plugins/domtreeviewer/domtreeview.cpp | 18 +- konq-plugins/domtreeviewer/domtreeview.h | 2 +- konq-plugins/domtreeviewer/domtreeviewbase.ui | 14 +- konq-plugins/domtreeviewer/domtreewindow.cpp | 4 +- .../domtreeviewer/elementeditdialog.ui | 8 +- konq-plugins/domtreeviewer/messagedialog.ui | 4 +- konq-plugins/domtreeviewer/texteditdialog.ui | 4 +- konq-plugins/fsview/fsview.cpp | 20 +- konq-plugins/fsview/fsview_part.cpp | 6 +- konq-plugins/fsview/inode.cpp | 34 ++-- konq-plugins/fsview/inode.h | 2 +- konq-plugins/fsview/treemap.cpp | 176 +++++++++--------- konq-plugins/fsview/treemap.h | 28 +-- konq-plugins/imagerotation/exif.py | 4 +- .../kimgalleryplugin/imgallerydialog.cpp | 6 +- .../kimgalleryplugin/imgalleryplugin.cpp | 38 ++-- konq-plugins/kuick/kcmkuick/kcmkuick.cpp | 2 +- konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui | 4 +- konq-plugins/kuick/kdirmenu.cpp | 8 +- konq-plugins/kuick/kdirmenu.h | 2 +- konq-plugins/microformat/konqmficon.cpp | 4 +- konq-plugins/minitools/minitoolsplugin.cpp | 4 +- konq-plugins/rellinks/plugin_rellinks.cpp | 4 +- konq-plugins/rsync/rsyncplugin.cpp | 2 +- konq-plugins/searchbar/searchbar.cpp | 14 +- konq-plugins/sidebar/delicious/mainWidget.cpp | 4 +- .../sidebar/mediaplayer/mediawidget_skel.ui | 20 +- .../mediaplayer/mediawidget_skel_designer.ui | 20 +- .../sidebar/metabar/src/configdialog.cpp | 54 +++--- .../sidebar/metabar/src/defaultplugin.cpp | 8 +- .../sidebar/metabar/src/httpplugin.cpp | 2 +- .../sidebar/metabar/src/metabarfunctions.cpp | 16 +- .../sidebar/metabar/src/metabarwidget.cpp | 32 ++-- .../sidebar/metabar/src/protocolplugin.cpp | 6 +- .../sidebar/newsticker/norsswidget.cpp | 4 +- konq-plugins/sidebar/newsticker/nspanel.cpp | 2 +- .../sidebar/newsticker/nsstacktabwidget.cpp | 10 +- .../sidebar/newsticker/nsstacktabwidget.h | 2 +- konq-plugins/uachanger/uachangerplugin.cpp | 12 +- konq-plugins/validators/plugin_validators.cpp | 2 +- konq-plugins/validators/validatorsdialog.cpp | 2 +- konq-plugins/webarchiver/archivedialog.cpp | 8 +- konq-plugins/webarchiver/archiveviewbase.ui | 2 +- .../webarchiver/plugin_webarchiver.cpp | 4 +- ksig/ksig.cpp | 12 +- ksig/ksig.h | 2 +- ksig/siglistviewitem.cpp | 16 +- ksig/standardtextbase.ui | 4 +- noatun-plugins/alarm/kminutespinbox.cpp | 2 +- noatun-plugins/alarm/wakeup.cpp | 16 +- noatun-plugins/alsaplayer/AlsaPlayer.ui | 10 +- noatun-plugins/alsaplayer/configmodule.cpp | 8 +- noatun-plugins/alsaplayer/userinterface.cpp | 8 +- noatun-plugins/blurscope/scopedisplayer.cpp | 4 +- noatun-plugins/blurscope/sdlscope.h | 2 +- noatun-plugins/charlatan/configmodule.cpp | 8 +- noatun-plugins/charlatan/userinterface.cpp | 4 +- noatun-plugins/dub/dub/dub.cpp | 4 +- noatun-plugins/dub/dub/dubconfigmodule.cpp | 2 +- noatun-plugins/dub/dub/dubprefs.ui | 2 +- noatun-plugins/dub/dub/fileselectorwidget.cpp | 8 +- noatun-plugins/dub/dub/fileselectorwidget.h | 2 +- noatun-plugins/ffrs/ffrs.cpp | 20 +- noatun-plugins/lyrics/cmodule.cpp | 24 +-- noatun-plugins/lyrics/lyrics.cpp | 12 +- noatun-plugins/nexscope/gui.cpp | 2 +- noatun-plugins/nexscope/nex.cpp | 2 +- noatun-plugins/nexscope/nex.h | 6 +- noatun-plugins/nexscope/renderers.cpp | 2 +- noatun-plugins/oblique/cmodule.cpp | 10 +- noatun-plugins/oblique/query.cpp | 4 +- noatun-plugins/oblique/tree.cpp | 24 +-- noatun-plugins/oblique/tree.h | 2 +- noatun-plugins/oblique/view.cpp | 4 +- noatun-plugins/pitchablespeed/speedtuner.ui | 4 +- noatun-plugins/synaescope/cmodule.cpp | 10 +- noatun-plugins/tippercanoe/synaescope.cpp | 2 +- noatun-plugins/wavecapture/wavecapture.h | 4 +- renamedlgplugins/audio/audio_plugin.cpp | 8 +- renamedlgplugins/audio/audiopreview.cpp | 16 +- renamedlgplugins/images/image_plugin.cpp | 2 +- renamedlgplugins/images/imagevisualizer.cpp | 6 +- 159 files changed, 948 insertions(+), 948 deletions(-) diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index 77b00a8..f7d2e48 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include @@ -115,21 +115,21 @@ LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, c list.setAutoDelete(true); this->editable = editable; - tqlayout = new TQVBoxLayout(this, KDialogBase::spacingHint()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + layout = new TQVBoxLayout(this, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); if (editable) { KPushButton *more = new KPushButton(i18n("&Add Name"), this); - htqlayout->addWidget(more); + hlayout->addWidget(more); connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); - htqlayout->addStretch(); + hlayout->addStretch(); KPushButton *less= new KPushButton(i18n("&Delete Name"), this); - htqlayout->addWidget(less); + hlayout->addWidget(less); connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); } - tqlayout->addStretch(); + layout->addStretch(); for (TQStringList::Iterator it = defaults.begin(); it != defaults.end(); ++it) { @@ -148,7 +148,7 @@ void LotsaEdits::more() edit = new KLineEdit(this); else edit = new TQLabel(this); - tqlayout->addWidget(edit); + layout->addWidget(edit); list.append(edit); edit->show(); } diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h index 25d6e71..8ada643 100644 --- a/atlantikdesigner/designer/boardinfo.h +++ b/atlantikdesigner/designer/boardinfo.h @@ -45,7 +45,7 @@ class LotsaEdits : public TQWidget private: bool editable; TQPtrList list; - TQVBoxLayout *tqlayout; + TQVBoxLayout *layout; }; class BoardInfoDlg : public KDialogBase diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 3f39fb6..1bc9fdc 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -1,15 +1,15 @@ #include -#include +#include #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include @@ -46,7 +46,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) copiedEstate = 0; editor = 0; board = 0; - tqlayout = 0; + layout = 0; (void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); (void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); @@ -76,10 +76,10 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) KConfig *config = kapp->config(); config->setGroup("General"); - TQColor defaultColor = tqcolorGroup().background(); + TQColor defaultColor = colorGroup().background(); defaultBg = config->readColorEntry("alternateBackground", &defaultColor); config->setGroup("WM"); - defaultColor = tqcolorGroup().dark(); + defaultColor = colorGroup().dark(); defaultFg = config->readColorEntry("activeBackground", &defaultColor); // these must match up to the ones in editor.cpp! @@ -130,17 +130,17 @@ void AtlanticDesigner::initBoard() delete editor; delete board; - delete tqlayout; + delete layout; board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board"); setCentralWidget(board); - tqlayout = new TQVBoxLayout(board->centerWidget()); + layout = new TQVBoxLayout(board->centerWidget()); editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor"); connect(editor, TQT_SIGNAL(goChecked(int)), TQT_TQOBJECT(this), TQT_SLOT(goChanged(int))); connect(editor, TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground())); connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath())); - tqlayout->addWidget(editor); + layout->addWidget(editor); editor->setReady(false); @@ -526,7 +526,7 @@ void AtlanticDesigner::openFile(const TQString &filename) if (i < 8) { - KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").tqarg(i)); + KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").arg(i)); if (this->filename.isNull()) close(); return; @@ -553,7 +553,7 @@ void AtlanticDesigner::updateJumpMenu() { TQStringList estates; for (int i = 1; i <= max; i++) - estates.append(i18n("Jump to Estate %1").tqarg(TQString::number(i))); + estates.append(i18n("Jump to Estate %1").arg(TQString::number(i))); estateAct->setItems(estates); } @@ -679,7 +679,7 @@ void AtlanticDesigner::save() writtenGroups.append((*it).name()); - t << endl << TQString("[%1]").tqarg((*it).name()) << endl; + t << endl << TQString("[%1]").arg((*it).name()) << endl; if ((*it).globalPrice() > 0) t << "price=" << (*it).globalPrice() << endl; @@ -748,7 +748,7 @@ void AtlanticDesigner::save() for (estate = estates.first(); estate; estate = estates.next()) { - t << endl << TQString("[%1]").tqarg(estate->name()) << endl; + t << endl << TQString("[%1]").arg(estate->name()) << endl; switch (estate->type()) { diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index 553a921..3d807a8 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -75,7 +75,7 @@ class AtlanticDesigner : public KMainWindow ConfigEstate *newEstate(int); TQGuardedPtr editor; - TQGuardedPtr tqlayout; + TQGuardedPtr layout; TQGuardedPtr board; TQGuardedPtr groupEditor; TQGuardedPtr boardInfoDlg; diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 81e2135..cb51572 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include @@ -172,19 +172,19 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate())); - tqlayout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); + layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); nameEdit = new TQLineEdit(this, "Name Edit"); - tqlayout->addWidget(nameEdit, 0, 0); + layout->addWidget(nameEdit, 0, 0); connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged())); confDlg = 0; - tqlayout->setRowStretch(2, 2); + layout->setRowStretch(2, 2); - tqlayout->addWidget(new KSeparator(this), 3, 0); + layout->addWidget(new KSeparator(this), 3, 0); TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint()); - tqlayout->addLayout(typeLayout, 4, 0); + layout->addLayout(typeLayout, 4, 0); TQLabel *typeLabel = new TQLabel(i18n("Type:"), this); typeLayout->addWidget(typeLabel); @@ -196,10 +196,10 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ goCheck = new TQCheckBox(i18n("This estate is 'Go'"), this); connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(somethingChanged())); connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(goToggled(bool))); - tqlayout->addWidget(goCheck, 5, 0); + layout->addWidget(goCheck, 5, 0); TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint()); - tqlayout->addLayout(passMoneyLayout, 6, 0); + layout->addLayout(passMoneyLayout, 6, 0); TQLabel *passMoneyLabel = new TQLabel(i18n("Pass money:"), this); passMoneyLayout->addWidget(passMoneyLabel); passMoney = new TQSpinBox(0, 3000, 10, this); @@ -327,7 +327,7 @@ void EstateEdit::configure() connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground())); - tqlayout->addWidget(confDlg, 1, 0); + layout->addWidget(confDlg, 1, 0); confDlg->show(); oldType = typeCombo->currentItem(); @@ -409,11 +409,11 @@ void TaxDlg::update() GenericDlg::GenericDlg(TQWidget *parent, char *name) : EstateDlg(parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialog::spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Background:"), this)); + TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint()); + layout->addWidget(new TQLabel(i18n("Background:"), this)); col = new KColorButton(this); - tqlayout->addWidget(col); + layout->addWidget(col); } void GenericDlg::save() @@ -437,26 +437,26 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList *newCards, TQW view = 0; - vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); KPushButton *addB = new KPushButton(i18n("&New Stack"), this); connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack())); - tqlayout->addWidget(addB); - tqlayout->addStretch(); + layout->addWidget(addB); + layout->addStretch(); - tqlayout->addWidget(new TQLabel(i18n("Cards from"), this)); + layout->addWidget(new TQLabel(i18n("Cards from"), this)); TQStringList cardNames; for (TQValueList::Iterator it = stacks->begin(); it != stacks->end(); ++it) cardNames.append((*it).name()); cards = new TQComboBox(this); cards->insertStringList(cardNames); - tqlayout->addWidget(cards); + layout->addWidget(cards); connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &))); - vtqlayout->addWidget(new KSeparator(this)); + vlayout->addWidget(new KSeparator(this)); } void CardsDlg::addStack() @@ -493,7 +493,7 @@ void CardsDlg::updateView(const TQString &curName) delete view; view = new CardView(estates, curStack, this); - vtqlayout->addWidget(view); + vlayout->addWidget(view); view->show(); } @@ -530,7 +530,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa value = 0; - htqlayout = new TQHBoxLayout(this, KDialog::spacingHint()); + hlayout = new TQHBoxLayout(this, KDialog::spacingHint()); typeCombo = new KComboBox(this); TQStringList _types(i18n("Pay")); _types.append(i18n("Pay Each Player")); @@ -546,10 +546,10 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa _types.append(i18n("Pay for Each House")); _types.append(i18n("Pay for Each Hotel")); typeCombo->insertStringList(_types); - htqlayout->addWidget(typeCombo); + hlayout->addWidget(typeCombo); connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int))); - htqlayout->addStretch(); + hlayout->addStretch(); } void ChooseWidget::valueChanged(int i) @@ -588,7 +588,7 @@ void ChooseWidget::typeChanged(int i) value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this); - htqlayout->addWidget(value); + hlayout->addWidget(value); connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); value->show(); @@ -605,7 +605,7 @@ void ChooseWidget::typeChanged(int i) estate->insertStringList(estateStrings); connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int))); - htqlayout->addWidget(estate); + hlayout->addWidget(estate); estate->show(); } @@ -649,36 +649,36 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char choosies.setAutoDelete(true); - tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); addButton = new KPushButton(i18n("&Add Card..."), this); connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - htqlayout->addWidget(addButton); - htqlayout->addStretch(); + hlayout->addWidget(addButton); + hlayout->addStretch(); renameButton = new KPushButton(i18n("&Rename..."), this); connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename())); - htqlayout->addWidget(renameButton); - htqlayout->addStretch(); + hlayout->addWidget(renameButton); + hlayout->addStretch(); delButton = new KPushButton(i18n("&Delete"), this); connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); - htqlayout->addWidget(delButton); + hlayout->addWidget(delButton); List = new KListBox(this); - tqlayout->addWidget(List); + layout->addWidget(List); connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int))); // it gets very big (and won't shrink) otherwise List->setMaximumHeight(90); - htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); moreButton = new KPushButton(i18n("&More Properties"), this); connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); - htqlayout->addWidget(moreButton); - htqlayout->addStretch(); + hlayout->addWidget(moreButton); + hlayout->addStretch(); lessButton = new KPushButton(i18n("&Fewer Properties"), this); connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); - htqlayout->addWidget(lessButton); + hlayout->addWidget(lessButton); for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it) List->insertItem((*it).name); @@ -698,7 +698,7 @@ void CardView::more() newChooseWidget->valueChanged(0); choosies.append(newChooseWidget); - tqlayout->addWidget(newChooseWidget); + layout->addWidget(newChooseWidget); newChooseWidget->show(); @@ -780,7 +780,7 @@ void CardView::selected(int i) ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this); choosies.append(newChooseWidget); - tqlayout->addWidget(newChooseWidget); + layout->addWidget(newChooseWidget); newChooseWidget->show(); diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index 051df1f..34c6fa1 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -147,7 +147,7 @@ class EstateEdit : public TQWidget TQCheckBox *goCheck; TQSpinBox *passMoney; TQWidget *centerWidget; - TQGridLayout *tqlayout; + TQGridLayout *layout; EstateList *estates; TQValueList *cards; @@ -184,7 +184,7 @@ class ChooseWidget : public TQWidget bool number; bool prevNumber; bool init; - TQHBoxLayout *htqlayout; + TQHBoxLayout *hlayout; EstateList *estates; @@ -218,7 +218,7 @@ class CardView : public TQWidget EstateList *estates; - TQVBoxLayout *tqlayout; + TQVBoxLayout *layout; Card *card; @@ -281,7 +281,7 @@ class CardsDlg : public EstateDlg TQComboBox *cards; CardView *view; - TQVBoxLayout *vtqlayout; + TQVBoxLayout *vlayout; }; class StreetDlg : public EstateDlg diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index b3da81f..3ba8a86 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -26,10 +26,10 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) list = newList; TQFrame *page = plainPage(); - TQHBoxLayout *htqlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); groups = new KListBox(page); - htqlayout->addWidget(groups); + hlayout->addWidget(groups); connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *))); TQStringList newgroups; for (ConfigEstateGroupList::Iterator it = list->begin(); it != list->end(); ++it) @@ -37,22 +37,22 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) groups->insertStringList(newgroups); connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, spacingHint()); - tqcolorGroupBox = new TQVGroupBox(i18n("&Colors"), page); - vtqlayout->addWidget(tqcolorGroupBox); + TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint()); + colorGroupBox = new TQVGroupBox(i18n("&Colors"), page); + vlayout->addWidget(colorGroupBox); - (void) new TQLabel(i18n("Foreground:"), tqcolorGroupBox); - fgButton = new KColorButton(tqcolorGroupBox, "Foreground Button"); + (void) new TQLabel(i18n("Foreground:"), colorGroupBox); + fgButton = new KColorButton(colorGroupBox, "Foreground Button"); connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(fgChanged(const TQColor &))); connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed())); - (void) new TQLabel(i18n("Background:"), tqcolorGroupBox); - bgButton = new KColorButton(tqcolorGroupBox, "Background Button"); + (void) new TQLabel(i18n("Background:"), colorGroupBox); + bgButton = new KColorButton(colorGroupBox, "Background Button"); connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(bgChanged(const TQColor &))); connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed())); pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page); - vtqlayout->addWidget(pricesGroupBox); + vlayout->addWidget(pricesGroupBox); pricesWidget = new TQWidget(pricesGroupBox); TQGridLayout *pricesLayout = new TQGridLayout(pricesWidget, 2, 2, 0, spacingHint()); @@ -69,7 +69,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) connect(globalPrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(globalPriceChanged(int))); dynamicGroupBox = new TQVGroupBox(i18n("&Dynamic Rent"), page); - vtqlayout->addWidget(dynamicGroupBox); + vlayout->addWidget(dynamicGroupBox); mathWidget = new TQWidget(dynamicGroupBox); TQGridLayout *mathLayout = new TQGridLayout(mathWidget, 2, 2, 0, spacingHint()); @@ -89,13 +89,13 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) connect(rentVarCombo, TQT_SIGNAL(activated(const TQString &)), rentMathEdit, TQT_SLOT(insert(const TQString &))); mathLayout->addWidget(rentMathEdit, 1, 1); - TQHBoxLayout *buttontqlayout = new TQHBoxLayout(vtqlayout, spacingHint()); + TQHBoxLayout *buttonlayout = new TQHBoxLayout(vlayout, spacingHint()); KPushButton *addB = new KPushButton(i18n("&Add..."), page); - buttontqlayout->addWidget(addB); + buttonlayout->addWidget(addB); connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); removeB = new KPushButton(i18n("&Remove"), page); - buttontqlayout->addWidget(removeB); + buttonlayout->addWidget(removeB); connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); selectionChanged(); @@ -233,7 +233,7 @@ void GroupEditor::slotOk() void GroupEditor::selectionChanged() { bool issel = groups->currentItem() >= 0; - tqcolorGroupBox->setEnabled(issel); + colorGroupBox->setEnabled(issel); pricesGroupBox->setEnabled(issel); dynamicGroupBox->setEnabled(issel); removeB->setEnabled(issel); diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index 606189b..87086f0 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -86,7 +86,7 @@ class GroupEditor : public KDialogBase TQWidget *mathWidget; TQSpinBox *housePrice; TQSpinBox *globalPrice; - TQVGroupBox *tqcolorGroupBox; + TQVGroupBox *colorGroupBox; TQVGroupBox *pricesGroupBox; TQVGroupBox *dynamicGroupBox; KPushButton *removeB; diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index c5909c4..7a80f89 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -80,7 +80,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "Unable to open %1 for reading." ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } @@ -91,7 +91,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const line = gmxStream.readLine(); line2 = gmxStream.readLine(); if (!line.startsWith("AB_ADDRESSES:") || !line2.startsWith("Address_id")) { - KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").tqarg(fileName) ); + KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").arg(fileName) ); return addrList; } @@ -122,7 +122,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const if (checkDateTime(strList[5],dt)) addr->setBirthday(dt); addr->setNote(strList[6]); if (checkDateTime(strList[7],dt)) addr->setRevision(dt); - // addr->settqStatus(strList[8]); tqStatus + // addr->setStatus(strList[8]); Status // addr->xxx(strList[9]); Address_link_id // addr->setCategory(strList[10]); Categories addrMap[strList[0]] = addr; @@ -137,7 +137,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const return addrList; } // Address_id,Record_id,Street,Country,Zipcode,City,Phone,Fax,Mobile,Mobile_type,Email, - // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,tqStatus + // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,Status line = gmxStream.readLine(); line = gmxStream.readLine(); @@ -181,7 +181,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const "KADDRESSBOOK", "X-Department", strList[17]); // Department if (checkDateTime(strList[18],dt)) addr->setRevision(dt); // Change_date // strList[19]=Preferred (see above) - // strList[20]=tqStatus (should always be "1") + // strList[20]=Status (should always be "1") addr->insertAddress(adr); } else { kdWarning() << "unresolved line: " << line << endl; @@ -214,8 +214,8 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "Unable to open file %1.%2." ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -229,7 +229,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "Unable to open file %1." ); - KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); + KMessageBox::error( parentWidget(), txt.arg( filename ) ); return false; } @@ -243,7 +243,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& static const TQString dateString( const TQDateTime &dt ) { if (!dt.isValid()) - return TQString::tqfromLatin1("1000-01-01 00:00:00"); + return TQString::fromLatin1("1000-01-01 00:00:00"); TQString d(dt.toString(Qt::ISODate)); d[10] = ' '; // remove the "T" in the middle of the string return d; @@ -281,7 +281,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) << dateString(addr->birthday()) << DELIM // Birthday << addr->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments << dateString(addr->revision()) << DELIM // Change_date - << "1##0\n"; // tqStatus, Address_link_id, Categories + << "1##0\n"; // Status, Address_link_id, Categories } t << "####\n"; @@ -333,7 +333,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):TQString()) << DELIM // Department << dateString(addr->revision()) << DELIM // Change_date << 5 << DELIM // Preferred - << 1 << endl; // tqStatus (should always be "1") + << 1 << endl; // Status (should always be "1") } ++no; diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp index 51a37ac..3d07955 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp @@ -58,9 +58,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& if ( flags != 0 ) { for ( int i = 0; i < flags; ++i ) { FlagInfo info; - info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).tqarg( i ) ); - info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).tqarg( i ) ); - info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).tqarg( i ) ); + info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).arg( i ) ); + info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).arg( i ) ); + info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).arg( i ) ); availableFlags.append( info ); } @@ -102,9 +102,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& int startVal = 0; TQValueList::Iterator it; for ( it = flagList.begin(); it != flagList.end(); ++it, ++startVal ) { - config.writeEntry( TQString( "Flag_%1_Color" ).tqarg( startVal ), (*it).color ); - config.writeEntry( TQString( "Flag_%1_Latitude" ).tqarg( startVal ), (*it).latitude ); - config.writeEntry( TQString( "Flag_%1_Longitude" ).tqarg( startVal ), (*it).longitude ); + config.writeEntry( TQString( "Flag_%1_Color" ).arg( startVal ), (*it).color ); + config.writeEntry( TQString( "Flag_%1_Latitude" ).arg( startVal ), (*it).latitude ); + config.writeEntry( TQString( "Flag_%1_Longitude" ).arg( startVal ), (*it).longitude ); } config.writeEntry( "Flags", startVal ); diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index fc3bd57..1ff5408 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory( "katesymbolviewer" ) ) diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 882ff70..b98c308 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -83,7 +83,7 @@ int InitPluginKateFileListLoader::initKate() updateInit(); disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); -/* int id = pl->tqmetaObject()->findSlot( TQT_SLOT(updateInit()) ); +/* int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) ); if ( id != -1 ) { kdDebug()<<"Action slot was found, it will be called now"<initPluginManager()->initScript()) { - switch (KMessageBox::questionYesNoCancel(0,i18n("Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) { case KMessageBox::Yes: save(); break; case KMessageBox::No: slotSaveListAs(); break; @@ -203,7 +203,7 @@ void PluginKateFileListLoader::slotSaveList() { /*if (m_saveURL!=application()->initPluginManager()->initScript()) { - switch (KMessageBox::questionYesNoCancel(0,i18n("Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) + switch (KMessageBox::questionYesNoCancel(0,i18n("Kate has been reinitialized by another plugin other than the File List Loader. Do you still want to save the list to %1?").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) { case KMessageBox::Yes: save(); break; case KMessageBox::No: slotSaveListAs(); break; diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 6f51e9b..5d1b4be 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -381,7 +381,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ! file.open( IO_ReadOnly ) ) { KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(), - i18n("Error opening the file
%1
for reading. The document will not be created.").tqarg(filename), + i18n("Error opening the file
%1
for reading. The document will not be created.").arg(filename), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); return; @@ -479,7 +479,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) count++; if ( docname.contains( "%1" ) ) - docname = docname.tqarg( count ); + docname = docname.arg( count ); doc->setDocName( docname ); @@ -795,12 +795,12 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft "edit the data in the KDE email information."), page ) ); cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the " - "'%{fullname}' macro").tqarg( sFullname ), page ); + "'%{fullname}' macro").arg( sFullname ), page ); cbRRealname->setEnabled( ! sFullname.isEmpty() ); lo->addWidget( cbRRealname ); cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the " - "'%email' macro").tqarg( sEmail ), page); + "'%email' macro").arg( sEmail ), page); cbREmail->setEnabled( ! sEmail.isEmpty() ); lo->addWidget( cbREmail ); @@ -922,7 +922,7 @@ void KateTemplateWizard::accept() if ( KMessageBox::warningContinueCancel( this, i18n( "

The file
'%1'
already exists; if you " "do not want to overwrite it, change the template file name to " - "something else.").tqarg( templateUrl.prettyURL() ), + "something else.").arg( templateUrl.prettyURL() ), i18n("File Exists"), i18n("Overwrite") ) == KMessageBox::Cancel ) return; @@ -976,7 +976,7 @@ void KateTemplateWizard::accept() { KMessageBox::sorry( this, i18n( "Error opening the file
%1
for reading. " - "The document will not be created").tqarg(u.prettyURL()), + "The document will not be created").arg(u.prettyURL()), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); @@ -1055,7 +1055,7 @@ void KateTemplateWizard::accept() { KMessageBox::sorry( this, i18n( "Unable to save the template to '%1'.\n\nThe template will be opened, " - "so you can save it from the editor.").tqarg( templateUrl.prettyURL() ), + "so you can save it from the editor.").arg( templateUrl.prettyURL() ), i18n("Save Failed") ); kft->application()->activeMainWindow()->viewManager()->openURL( KURL() ); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index 813b36a..9687b5e 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -208,7 +208,7 @@ void PluginKateInsertCommand::slotShowWaitDlg() { if ( sh->isRunning() ) { wdlg = new WaitDlg( (TQWidget*)kv, i18n( - "Executing command:\n%1\n\nPress 'Cancel' to abort.").tqarg(cmd) ); + "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd) ); connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) ); } if ( sh->isRunning() ) // we may have finished while creating the dialog. @@ -352,7 +352,7 @@ WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title) setMainWidget( page ); TQHBoxLayout *lo = new TQHBoxLayout( page, 0, spacingHint() ); - KAnimWidget *aw = new KAnimWidget( TQString::tqfromLatin1("kde"), 48, page ); + KAnimWidget *aw = new KAnimWidget( TQString::fromLatin1("kde"), 48, page ); lo->addWidget(aw); TQLabel *l = new TQLabel( text, page ); lo->addWidget( l ); diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index 9f49bcb..34bd1b0 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -178,7 +178,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const kdDebug()<<"calling illegal method of DocumentManager"<setException( err ); return KJS::Undefined(); @@ -310,7 +310,7 @@ KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self, } - TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -458,7 +458,7 @@ KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self, default: return KJS::Undefined(); } - TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index d0cd8e5..e0d7056 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, w->show(); //w->show();*/ kdDebug()<<"m_scriptname="<runFile(locate("appdata",TQString("plugins/%1/%2.js").tqarg(m_scriptname).tqarg(m_scriptname))); + m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname))); //"/home/jowenn/development/kde/cvs/tdeaddons/kate/kjswrapper/samples/test1.js"); } @@ -343,7 +343,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win) if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<setInstance (new KInstance("kate")); - view->setXMLFile(TQString("plugins/%1/%2.rc").tqarg(m_scriptname).tqarg(m_scriptname)); + view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname)); win->guiFactory()->addClient (view); } diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 3ee96e5..183e1e7 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -286,7 +286,7 @@ KPyBrowser::parseText (TQString & pytext) line = &(*iter); if (class_rx.search(*line) >= 0) { - //KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(line_no)); + //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no)); //strip out the beginning class and ending colon class_sig = line->stripWhiteSpace ().mid (6); class_sig = class_sig.left (class_sig.length () - 1); @@ -318,7 +318,7 @@ KPyBrowser::parseText (TQString & pytext) } if ((function_rx.search(*line) >= 0)) { - //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no)); + //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no)); function_sig = line->stripWhiteSpace ().mid (4); function_sig = function_sig.left (function_sig.find (":")); paren_i = function_sig.find ("("); @@ -359,7 +359,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) str = ""; return; } - r = tqitemRect (item); + r = itemRect (item); //r.setY(r.y() + 10); PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(item); diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 4cd379c..4b8490c 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) if (apiline == -1) { KMessageBox::information(0, - i18n("Could not find method/class %1.").tqarg(name), i18n("Selection")); + i18n("Could not find method/class %1.").arg(name), i18n("Selection")); } else { diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index bda41f5..1cb4064 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -82,7 +82,7 @@ void PluginKateMake::addView(Kate::MainWindow *win) Kate::ToolViewManager *viewmanager = win->toolViewManager(); TQWidget *w = viewmanager->createToolView("kate_plugin_make", Kate::ToolViewManager::Bottom, - SmallIcon(TQString::tqfromLatin1("misc")), + SmallIcon(TQString::fromLatin1("misc")), i18n("Make Output")); PluginKateMakeView *view = new PluginKateMakeView (w,win, "katemakeview"); @@ -132,7 +132,7 @@ public: (lineno > 0 ? TQString::number(lineno) : TQString()), message) { - m_isError = !message.contains(TQString::tqfromLatin1("warning")); + m_isError = !message.contains(TQString::fromLatin1("warning")); m_lineno = lineno; m_serial = s_serial++; } @@ -192,22 +192,22 @@ protected: TQString ErrorMessage::caption() const { - return TQString::tqfromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line()); + return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line()); } TQString ErrorMessage::fancyMessage() const { - TQString msg = TQString::tqfromLatin1(""); + TQString msg = TQString::fromLatin1(""); if (isError()) { - msg.append(TQString::tqfromLatin1("")); + msg.append(TQString::fromLatin1("")); } msg.append(message()); if (isError()) { - msg.append(TQString::tqfromLatin1("")); + msg.append(TQString::fromLatin1("")); } - msg.append(TQString::tqfromLatin1("")); + msg.append(TQString::fromLatin1("")); return msg; } @@ -350,7 +350,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, actionCollection(), "make_settings" ); setInstance(new KInstance("kate")); - setXMLFile(TQString::tqfromLatin1("plugins/katemake/ui.rc")); + setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc")); setFocusPolicy(TQ_NoFocus); @@ -379,7 +379,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, // if (source_prefix.isEmpty()) { filenameDetector = new TQRegExp( - TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } // else { @@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item) << globalPos.x() << "," << globalPos.y() << endl; #if 0 KPassivePopup::message( - TQString::tqfromLatin1("%1:%2").tqarg(filename).tqarg(lineno), + TQString::fromLatin1("%1:%2").arg(filename).arg(lineno), msg, this); #else @@ -644,12 +644,12 @@ bool PluginKateMakeView::slotValidate() KMessageBox::sorry(0, i18n("The file %1 is not a local file. " "Non-local files cannot be compiled.") - .tqarg(url.path())); + .arg(url.path())); return false; } document_dir = TQFileInfo(url.path()).dirPath(true) + - TQString::tqfromLatin1("/"); + TQString::fromLatin1("/"); if (document_dir.startsWith(source_prefix)) { @@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate() make = KStandardDirs::findExe("make"); *m_proc << make; if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) { - KMessageBox::error(0, i18n("Error: Failed to run %1.").tqarg(make.isEmpty() ? + KMessageBox::error(0, i18n("Error: Failed to run %1.").arg(make.isEmpty() ? "make" : make)); return false; } @@ -717,7 +717,7 @@ void PluginKateMakeView::slotConfigure() if (!filenameDetector) { filenameDetector = new TQRegExp( - TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } } //else diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui index 37c2aab..18a99c5 100644 --- a/kate/snippets/CWidgetSnippetsBase.ui +++ b/kate/snippets/CWidgetSnippetsBase.ui @@ -93,7 +93,7 @@ - tqlayout24 + layout24 @@ -104,7 +104,7 @@ - tqlayout11 + layout11 @@ -156,7 +156,7 @@ Expanding - + 200 20 diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 649b45d..8212f47 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -171,7 +171,7 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) { } sText.replace( TQRegExp(""), sSelection ); - sText.replace( TQRegExp(""), TQDate::tqcurrentDate().toString(Qt::LocalDate) ); + sText.replace( TQRegExp(""), TQDate::currentDate().toString(Qt::LocalDate) ); sText.replace( TQRegExp(" @@ -169,7 +169,7 @@ Expanding - + 16 20 @@ -252,7 +252,7 @@ - tqlayout3 + layout3 @@ -287,7 +287,7 @@ Expanding - + 20 20 @@ -332,7 +332,7 @@ kLed1 - + 32 32 @@ -346,7 +346,7 @@ kLed2 - + 32 32 @@ -357,7 +357,7 @@ kLed4 - + 32 32 @@ -368,7 +368,7 @@ kLed3 - + 32 32 @@ -382,7 +382,7 @@ kLed6 - + 32 32 @@ -396,7 +396,7 @@ kLed5 - + 32 32 @@ -415,7 +415,7 @@ Expanding - + 21 20 @@ -434,7 +434,7 @@ Expanding - + 20 84 diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index fbce8cf..5f36ea8 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -20,10 +20,10 @@ $Id$ */ #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -140,7 +140,7 @@ void KolourPicker::slotHistory() TQPopupMenu *sub = copyPopup(*it, false); subMenus.append(sub); popup.insertItem(colorPixmap(*it), - TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()), + TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()), sub); } popup.insertSeparator(); @@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) // set both clipboard and selection void KolourPicker::setClipboard(const TQString& text) { - TQClipboard *clip = TQApplication::tqclipboard(); + TQClipboard *clip = TQApplication::clipboard(); bool oldMode = clip->selectionModeEnabled(); clip->setSelectionMode(true); clip->setText(text); @@ -247,14 +247,14 @@ void KolourPicker::arrangeButtons() h = height(); if (h > 40) { - // vertical tqlayout + // vertical layout p = (h - 40)/3; m_colourButton->setGeometry(2, p, 20, 20); m_historyButton->setGeometry(2, 2*p+20, 20, 20); } else { - // horizontal tqlayout + // horizontal layout p = (h - 20)/2; m_colourButton->setGeometry(2, p, 20, 20); m_historyButton->setGeometry(24, p, 20, 20); @@ -265,14 +265,14 @@ void KolourPicker::arrangeButtons() w = width(); if (w > 40) { - // horizontal tqlayout + // horizontal layout p = (w - 40)/3; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(2*p+20, 2, 20, 20); } else { - // vertical tqlayout + // vertical layout p = (w - 20)/2; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(p, 24, 20, 20); diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index f232377..4760982 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::tqsizeHint() const +TQSize SimpleButton::sizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqsizeHint(); + return TQButton::sizeHint(); else return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -TQSize SimpleButton::tqminimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqminimumSizeHint(); + return TQButton::minimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con _inside = false; } -TQSize SimpleArrowButton::tqsizeHint() const +TQSize SimpleArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index 0cf11e5..9c66f85 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc index c694f5c..832faf3 100644 --- a/kicker-applets/ktimemon/confdlg.cc +++ b/kicker-applets/ktimemon/confdlg.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -170,7 +170,7 @@ KConfDialog::KConfDialog(KTimeMon *t) bl->addWidget(b); bl->addStretch(); - TQVBoxLayout *vbox = new TQVBoxLayout( b->tqlayout() ); + TQVBoxLayout *vbox = new TQVBoxLayout( b->layout() ); gl = new TQGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 ); diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc index 54d1edf..99ea20b 100644 --- a/kicker-applets/ktimemon/sample.cc +++ b/kicker-applets/ktimemon/sample.cc @@ -102,7 +102,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : KMessageBox::error(timemon, i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n" "This file is required to determine current memory usage.\n" - "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); + "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno))); exit(1); } @@ -112,7 +112,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : KMessageBox::error(timemon, i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n" "This file is required to determine current system info. " - "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); + "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno))); exit(1); } @@ -125,7 +125,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : "The diagnostics are:\n%1.\n" "Are you really running Solaris? " "Please contact the maintainer at mueller@kde.org " - "who will try to figure out what went wrong.").tqarg(strerror(errno))); + "who will try to figure out what went wrong.").arg(strerror(errno))); exit(1); } #endif @@ -210,7 +210,7 @@ void KSample::readSample() if ((l = read(memFD, buffer, sizeof(buffer) - 1)) < 0) { fatal(i18n("Unable to read the memory usage file '%1'.\n" - "The diagnostics are: %2").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); + "The diagnostics are: %2").arg(MEMINFO_NAME).arg(strerror(errno))); } buffer[l] = '\0'; l = 0; @@ -223,7 +223,7 @@ void KSample::readSample() "different file format than expected.\n" "Maybe your version of the proc filesystem is " "incompatible with supported versions. " - "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").tqarg(MEMINFO_NAME)); + "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").arg(MEMINFO_NAME)); l++; } @@ -237,7 +237,7 @@ void KSample::readSample() lseek(statFD, 0, 0); if ((l = read(statFD, buffer, sizeof(buffer)-1)) < 0) fatal(i18n("Unable to read the system usage file '%1'.\n" - "The diagnostics are: %2").tqarg(STAT_NAME).tqarg(strerror(errno))); + "The diagnostics are: %2").arg(STAT_NAME).arg(strerror(errno))); buffer[l] = '\0'; @@ -271,7 +271,7 @@ void KSample::readSample() struct tbl_sysinfo sysinfo; if (table(TBL_SYSINFO, 0, &sysinfo, 1, sizeof(sysinfo)) != 1) - fatal(msg.tqarg("TBL_SYSINFO")); + fatal(msg.arg("TBL_SYSINFO")); sample.user = sysinfo.si_user; sample.nice = sysinfo.si_nice; @@ -281,7 +281,7 @@ void KSample::readSample() struct tbl_vmstats vmstats; if (table(TBL_VMSTATS, 0, &vmstats, 1, sizeof(vmstats)) != 1) - fatal(msg.tqarg("TBL_VMSTATS")); + fatal(msg.arg("TBL_VMSTATS")); sample.mtotal = vmstats.free_count + vmstats.active_count + vmstats.inactive_count + vmstats.wire_count; @@ -291,7 +291,7 @@ void KSample::readSample() struct tbl_swapinfo swapinfo; if (table(TBL_SWAPINFO, -1, &swapinfo, 1, sizeof(swapinfo)) != 1) - fatal(msg.tqarg("TBL_SWAPINFO")); + fatal(msg.arg("TBL_SWAPINFO")); sample.stotal = swapinfo.size; sample.sfree = swapinfo.free; @@ -324,7 +324,7 @@ void KSample::readSample() kstat_read(kc, ksp, &cstat) == -1) // and read into buffer fatal(i18n("Unable to read the CPU statistics entry " "from the 'kstat' library. The diagnostics are '%1'.\n" - "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); + "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); // fields are: idle user kernel iowait (no nice info?) sample.user += cstat.cpu_sysinfo.cpu[1] / sample.cpus; @@ -338,7 +338,7 @@ void KSample::readSample() fatal(i18n("The number of CPUs appears to have changed at " "very short notice, or the 'kstat' library returns " "inconsistent results (%1 vs. %2 CPUs).\n" - "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(sample.cpus).tqarg(cpus)); + "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(sample.cpus).arg(cpus)); // availrmem = pages of core for user-proc ( == physmem - kernelmem) // freemem = no of free pages @@ -350,7 +350,7 @@ void KSample::readSample() fatal(i18n("Unable to read the memory statistics entry " "from the 'kstat' library. The diagnostics are '%1'\n" "You might want to contact the maintainer at " - "http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); + "http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); int i; unsigned long physmem = 0, freemem = 0, availrmem = 0; @@ -367,7 +367,7 @@ void KSample::readSample() fatal(i18n("There seems to be a problem with KTimeMon's handling " "of the 'kstat' library: 0 bytes of physical memory determined!\n" "Free memory is %1, available memory is %2.\n" - "Please contact the maintainer at mueller@kde.org who will try to sort this out.").tqarg(freemem).tqarg(availrmem)); + "Please contact the maintainer at mueller@kde.org who will try to sort this out.").arg(freemem).arg(availrmem)); sample.mtotal = physmem; sample.free = freemem; @@ -378,7 +378,7 @@ void KSample::readSample() if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1) fatal(i18n("Unable to determine the number of " "swap spaces. The diagnostics are '%1'.\n" - "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); if (swapentries != 0) { // 2* to get some space for padding?? @@ -389,8 +389,8 @@ void KSample::readSample() "trying to determine the swap usage.\n" "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n" "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.") - .tqarg(2 * sizeof(int) + swapentries * sizeof(struct swapent)) - .tqarg(sizeof(int)).tqarg(swapentries).tqarg(sizeof(struct swapent))); + .arg(2 * sizeof(int) + swapentries * sizeof(struct swapent)) + .arg(sizeof(int)).arg(swapentries).arg(sizeof(struct swapent))); char path[1024]; stbl->swt_n = swapentries; @@ -399,7 +399,7 @@ void KSample::readSample() if ((swapentries = swapctl(SC_LIST, stbl)) == -1) fatal(i18n("Unable to determine the swap usage.\n" "The diagnostics are '%1'.\n" - "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); if (!warned && swapentries != stbl->swt_n) { @@ -407,7 +407,7 @@ void KSample::readSample() nonfatal(i18n("Information was requested for " "%1 swap spaces, but only %2 swap entries were returned.\n" "KTimeMon will attempt to continue.\n" - "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(stbl->swt_n).tqarg(swapentries)); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(stbl->swt_n).arg(swapentries)); } for (i = 0; i < swapentries; i++) { diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 2c78031..991a2e9 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -111,7 +111,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) b = r / 3; // bar width r -= b; - if (bgColour != tqcolorGroup().background()) + if (bgColour != colorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -125,7 +125,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) b = r / 2; r -= b; - if (bgColour != tqcolorGroup().background()) + if (bgColour != colorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -138,7 +138,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) x += b; b = r; - if (bgColour != tqcolorGroup().background()) + if (bgColour != colorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -171,11 +171,11 @@ void KTimeMon::maybeTip(const TQPoint& p) if ( idle < 0 ) idle = 0; TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") - .tqarg(idle) - .tqarg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) - .tqarg(100-s.used) - .tqarg(KGlobal::locale()->formatNumber(s.stotal, 0)) - .tqarg(100-s.sused); + .arg(idle) + .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) + .arg(100-s.used) + .arg(KGlobal::locale()->formatNumber(s.stotal, 0)) + .arg(100-s.sused); tip(rect(), str); } @@ -192,7 +192,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, niceColour("yellow"), iowaitColour("darkgreen"), usedColour("blue1"), buffersColour("yellow"), cachedColour("darkgreen"), mkernelColour("red1"), - swapColour("cyan3"), bgColour(tqcolorGroup().background()) + swapColour("cyan3"), bgColour(colorGroup().background()) { mouseAction[0] = NOTHING; mouseAction[1] = NOTHING; @@ -337,7 +337,7 @@ void KTimeMon::writeConfiguration() conf->sync(); } -// Make the KSample object update its internal sample and tqrepaint the +// Make the KSample object update its internal sample and repaint the // object. void KTimeMon::timeout() { diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 772afeb..37e0bd6 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -157,14 +157,14 @@ void MathApplet::resizeEvent(TQResizeEvent*) _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->tqsizeHint().height() + _label->height()) + if(height() >= _input->sizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->tqsizeHint().height() - 2; - int labelHeight = _label->tqsizeHint().height(); + int inputVOffset = height() - _input->sizeHint().height() - 2; + int labelHeight = _label->sizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->tqsizeHint().height()); + width(), _input->sizeHint().height()); _label->show(); } else @@ -174,7 +174,7 @@ void MathApplet::resizeEvent(TQResizeEvent*) // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->tqsizeHint().height(); + int newHeight = _input->sizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp index e1dee3e..8a58064 100644 --- a/kicker-applets/math/parser.cpp +++ b/kicker-applets/math/parser.cpp @@ -656,41 +656,41 @@ int Parser::getfix(TQString name) int Parser::errmsg() { switch(err) { case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Syntax error").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Missing parenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Function name unknown").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Void function variable").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Too many functions").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Token-memory overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Stack overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Name of function not free").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "recursive function not allowed").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).tqarg(TQString::number(errpos)), + case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 11: KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator")); diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index b77b5d2..e2265a7 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -146,7 +146,7 @@ void AmarokInterface::updateSlider ( ) time = 0; } emit newSliderPosition(len,time); - emit playingStatusChanged(playingtqStatus()); + emit playingStatusChanged(playingStatus()); } // Drag-n-Drop stuff ================================================================= @@ -289,7 +289,7 @@ bool AmarokInterface::findRunningAmarok() } -int AmarokInterface::playingtqStatus() +int AmarokInterface::playingStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h index f863208..5e8c689 100644 --- a/kicker-applets/mediacontrol/amarokInterface.h +++ b/kicker-applets/mediacontrol/amarokInterface.h @@ -48,7 +48,7 @@ class AmarokInterface : public PlayerInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingtqStatus(); + virtual int playingStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index b055424..27ce45e 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -148,7 +148,7 @@ void JuKInterface::updateSlider () time = 0; } emit ( newSliderPosition(len,time) ); - emit playingStatusChanged(playingtqStatus()); + emit playingStatusChanged(playingStatus()); } // Drag-n-Drop stuff ================================================================= @@ -291,7 +291,7 @@ bool JuKInterface::findRunningJuK() return false; } -int JuKInterface::playingtqStatus() +int JuKInterface::playingStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h index fa74fba..51bd6de 100644 --- a/kicker-applets/mediacontrol/jukInterface.h +++ b/kicker-applets/mediacontrol/jukInterface.h @@ -49,7 +49,7 @@ class JuKInterface : public PlayerInterface void dragEnterEvent(TQDragEnterEvent* event); void dropEvent(TQDropEvent* event); const TQString getTrackTitle() const; - int playingtqStatus(); + int playingStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index 67eb931..6621c53 100644 --- a/kicker-applets/mediacontrol/kscdInterface.cpp +++ b/kicker-applets/mediacontrol/kscdInterface.cpp @@ -126,7 +126,7 @@ void KsCDInterface::updateSlider() time = 0; } emit newSliderPosition(len,time); - emit playingStatusChanged(playingtqStatus()); + emit playingStatusChanged(playingStatus()); } // Drag-n-Drop stuff ================================================================= @@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const } else { - result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title); + result = i18n("artist - trackname", "%1 - %2").arg(artist, title); } } } @@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const } else { - result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title); + result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title); } } else // artist is non-empty { if(title.isEmpty()) { - result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album); + result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album); } else { - result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title); + result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title); } } } @@ -305,7 +305,7 @@ bool KsCDInterface::findRunningKsCD() return false; } -int KsCDInterface::playingtqStatus() +int KsCDInterface::playingStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h index 2d37e42..2448080 100644 --- a/kicker-applets/mediacontrol/kscdInterface.h +++ b/kicker-applets/mediacontrol/kscdInterface.h @@ -48,7 +48,7 @@ class KsCDInterface : public PlayerInterface void dragEnterEvent(TQDragEnterEvent* event); void dropEvent(TQDropEvent* event); const TQString getTrackTitle() const; - int playingtqStatus(); + int playingStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index a2bf77b..95cf81c 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -226,10 +226,10 @@ void MediaControl::disableAll() void MediaControl::slotPlayingStatusChanged(int status) { - if (mLasttqStatus == status) + if (mLastStatus == status) return; - mLasttqStatus = status; + mLastStatus = status; TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); switch (status) @@ -255,7 +255,7 @@ void MediaControl::slotIconChanged() if(!_configFrontend->useCustomTheme()) { prev_button->setIconSet(SmallIconSet("player_start")); - if (_player->playingtqStatus() == PlayerInterface::Playing) + if (_player->playingStatus() == PlayerInterface::Playing) playpause_button->setIconSet(SmallIconSet("player_pause")); else playpause_button->setIconSet(SmallIconSet("player_play")); @@ -350,7 +350,7 @@ void MediaControl::reparseConfig() mLastLen = -1; mLastTime = -1; - mLasttqStatus = -1; + mLastStatus = -1; TQString playerString = _configFrontend->player(); @@ -413,7 +413,7 @@ void MediaControl::reparseConfig() if (TQFile(skindir+"play.png").exists()) { prev_button->setIconSet(SmallIconSet(locate("data",skindir+"prev.png"))); - if (_player->playingtqStatus() == PlayerInterface::Playing) + if (_player->playingStatus() == PlayerInterface::Playing) playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png"))); else playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"pause.png"))); @@ -424,7 +424,7 @@ void MediaControl::reparseConfig() { KNotifyClient::event(winId(), KNotifyClient::warning, i18n("There was trouble loading theme %1. Please choose" \ - " a different theme.").tqarg(skindir)); + " a different theme.").arg(skindir)); // default to kde-icons, they have to be installed :) slotIconChanged(); @@ -461,10 +461,10 @@ void MediaControl::reparseConfig() int MediaControl::widthForHeight(int height) const { // kdDebug(90200) << "kicker height: " << height << endl; -// kdDebug(90200) << "slider needs: " << time_slider->tqminimumSizeHint().height() << endl; +// kdDebug(90200) << "slider needs: " << time_slider->minimumSizeHint().height() << endl; // slider height + button height - if ( height >= (time_slider->tqminimumSizeHint().height()+MC_BUTTONSIZE) ) + if ( height >= (time_slider->minimumSizeHint().height()+MC_BUTTONSIZE) ) { // slider UNDER buttons // (5 * button width + spaces between them); return (4*MC_BUTTONSIZE+10); @@ -483,7 +483,7 @@ int MediaControl::heightForWidth(int width) const // kdDebug(90200) << "kicker width: " << width << endl; // slider height + button height - if ( width >= (time_slider->tqminimumSizeHint().width()+MC_BUTTONSIZE) ) + if ( width >= (time_slider->minimumSizeHint().width()+MC_BUTTONSIZE) ) { // slider ASIDE icons // (5 * button width + spaces between them); return (4*MC_BUTTONSIZE+10); @@ -535,7 +535,7 @@ void MediaControl::resizeEvent( TQResizeEvent* ) if ( orientation() ==Qt::Vertical ) { // ====== VERTICAL ================================================= time_slider->setOrientation(Qt::Vertical); - int slider_width = time_slider->tqminimumSizeHint().width(); + int slider_width = time_slider->minimumSizeHint().width(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_width > w ) slider_width = w; @@ -567,7 +567,7 @@ void MediaControl::resizeEvent( TQResizeEvent* ) else // ====== HORIZONTAL =============================================== { time_slider->setOrientation(Qt::Horizontal); - int slider_height = time_slider->tqminimumSizeHint().height(); + int slider_height = time_slider->minimumSizeHint().height(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_height > h ) slider_height = h; diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h index 161db39..ab1cec5 100644 --- a/kicker-applets/mediacontrol/mediacontrol.h +++ b/kicker-applets/mediacontrol/mediacontrol.h @@ -29,7 +29,7 @@ #include #include -#include +#include // used everywhere :) #include @@ -95,7 +95,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface TrayButton *stop_button; // Stop the music TrayButton *next_button; // GoTo Next Playlist-Item MCSlider *time_slider; - int mLastLen, mLastTime, mLasttqStatus; + int mLastLen, mLastTime, mLastStatus; KPopupMenu *rmbMenu; virtual void mousePressEvent(TQMouseEvent* e); diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 6df8886..e87f6b9 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui index 36a3e0e..df36762 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui +++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui @@ -156,7 +156,7 @@ Expanding - + 20 0 @@ -199,13 +199,13 @@ 0 - + 18 18 - + 18 18 @@ -227,13 +227,13 @@ 0 - + 18 18 - + 18 18 @@ -255,13 +255,13 @@ 0 - + 18 18 - + 18 18 @@ -283,13 +283,13 @@ 0 - + 18 18 - + 18 18 @@ -311,13 +311,13 @@ 0 - + 18 18 - + 18 18 @@ -339,7 +339,7 @@ Expanding - + 20 0 diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp index ea350d2..98ba0cb 100644 --- a/kicker-applets/mediacontrol/mpdInterface.cpp +++ b/kicker-applets/mediacontrol/mpdInterface.cpp @@ -118,7 +118,7 @@ void MpdInterface::connected() { //kdDebug(90200) << "Connected ok\n"; emit playerStarted(); - emit playingStatusChanged(playingtqStatus()); + emit playingStatusChanged(playingStatus()); } else { @@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e) switch (e) { case TQSocket::ErrConnectionRefused: - message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port); + message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port); break; case TQSocket::ErrHostNotFound: - message=i18n("Host '%1' not found.").tqarg(hostname); + message=i18n("Host '%1' not found.").arg(hostname); break; case TQSocket::ErrSocketRead: message=i18n("Error reading socket."); @@ -265,7 +265,7 @@ void MpdInterface::updateSlider() } else if (time_re.search(res)>=0) { - TQStringList timeinfo=time_re.tqcapturedTexts(); + TQStringList timeinfo=time_re.capturedTexts(); timeinfo.pop_front(); int elapsed_seconds=timeinfo.first().toInt(); timeinfo.pop_front(); @@ -298,7 +298,7 @@ void MpdInterface::jumpToTime(int sec) { if (songid_re.search(res)>=0) { - TQStringList songidinfo=songid_re.tqcapturedTexts(); + TQStringList songidinfo=songid_re.capturedTexts(); songidinfo.pop_front(); songid=songidinfo.first().toInt(); } @@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec) if (songid>-1) { - if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1())) + if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1())) { fetchOk(); // unlocks } @@ -316,7 +316,7 @@ void MpdInterface::jumpToTime(int sec) void MpdInterface::playpause() { reconnect(); - if (playingtqStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n")) + if (playingStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n")) { fetchOk(); } @@ -355,7 +355,7 @@ void MpdInterface::changeVolume(int delta) { if (volume_re.search(res)>=0) { - TQStringList info=volume_re.tqcapturedTexts(); + TQStringList info=volume_re.capturedTexts(); info.pop_front(); volume=info.first().toInt(); } @@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta) volume+=delta; if (volume<0) volume=0; if (volume>100) volume=100; - if (dispatch(TQString("setvol %1\n").tqarg(volume).latin1())) + if (dispatch(TQString("setvol %1\n").arg(volume).latin1())) { fetchOk(); } @@ -411,7 +411,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) TQRegExp id_re("Id: (.+)"); if (file.isEmpty() && file_re.search(res)>=0) { - TQStringList info=file_re.tqcapturedTexts(); + TQStringList info=file_re.capturedTexts(); info.pop_front(); // if the dropped file ends with the same name, record it if (list.front().path().endsWith(info.first())) @@ -422,7 +422,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) else if (!file.isEmpty() && id_re.search(res)>=0) { // when we have the file, pick up the id (file scomes first) - TQStringList info=id_re.tqcapturedTexts(); + TQStringList info=id_re.capturedTexts(); info.pop_front(); songid=info.first().toInt(); fetchOk(); // skip to the end @@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) // found song, so lets play it if (songid>-1) { - if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1())) + if (dispatch((TQString("playid %1\n").arg(songid)).latin1())) { if (fetchOk()) list.pop_front(); return; @@ -483,7 +483,7 @@ const TQString MpdInterface::getTrackTitle() const TQRegExp songid_re("songid: (\\d+)"); if (songid_re.search(res)>=0) { - TQStringList songidinfo=songid_re.tqcapturedTexts(); + TQStringList songidinfo=songid_re.capturedTexts(); songidinfo.pop_front(); songid=songidinfo.first().toInt(); } @@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const if (!(songid>-1)) return result; - if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1())) + if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1())) return result; TQString artist; @@ -508,31 +508,31 @@ const TQString MpdInterface::getTrackTitle() const TQRegExp file_re("file: (.+)"); if (artist_re.search(res)>=0) { - TQStringList info=artist_re.tqcapturedTexts(); + TQStringList info=artist_re.capturedTexts(); info.pop_front(); artist=info.first(); } else if (album_re.search(res)>=0) { - TQStringList info=album_re.tqcapturedTexts(); + TQStringList info=album_re.capturedTexts(); info.pop_front(); album=info.first(); } else if (title_re.search(res)>=0) { - TQStringList info=title_re.tqcapturedTexts(); + TQStringList info=title_re.capturedTexts(); info.pop_front(); title=info.first(); } else if (track_re.search(res)>=0) { - TQStringList info=track_re.tqcapturedTexts(); + TQStringList info=track_re.capturedTexts(); info.pop_front(); track=info.first(); } else if (file_re.search(res)>=0) { - TQStringList info=file_re.tqcapturedTexts(); + TQStringList info=file_re.capturedTexts(); info.pop_front(); file=info.first(); } @@ -559,15 +559,15 @@ const TQString MpdInterface::getTrackTitle() const else return album; } - return i18n("No tags: %1").tqarg(file); + return i18n("No tags: %1").arg(file); } -int MpdInterface::playingtqStatus() +int MpdInterface::playingStatus() { //kdDebug(90200) << "looking up playing status\n"; if (!dispatch("status\n")) return Stopped; - PlayingtqStatus status=Stopped; + PlayingStatus status=Stopped; TQString res; while(fetchLine(res)) { diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h index b7512b9..4ba2034 100644 --- a/kicker-applets/mediacontrol/mpdInterface.h +++ b/kicker-applets/mediacontrol/mpdInterface.h @@ -51,7 +51,7 @@ class MpdInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingtqStatus(); + virtual int playingStatus(); void changeVolume(int delta); diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index 4ba4333..397dc10 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -145,10 +145,10 @@ void NoatunInterface::updateSlider() time = 0; } emit newSliderPosition(len/1000,time/1000); - emit playingStatusChanged(playingtqStatus()); + emit playingStatusChanged(playingStatus()); } -int NoatunInterface::playingtqStatus() +int NoatunInterface::playingStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h index 64f9ab9..0349458 100644 --- a/kicker-applets/mediacontrol/noatunInterface.h +++ b/kicker-applets/mediacontrol/noatunInterface.h @@ -49,7 +49,7 @@ class NoatunInterface : public PlayerInterface const TQString getTrackTitle() const; void appRegistered(const TQCString &appId); void appRemoved(const TQCString &appId); - int playingtqStatus(); + int playingStatus(); void myInit(void); diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h index 916d387..1225290 100644 --- a/kicker-applets/mediacontrol/playerInterface.h +++ b/kicker-applets/mediacontrol/playerInterface.h @@ -29,7 +29,7 @@ class PlayerInterface : public TQObject PlayerInterface(); virtual ~PlayerInterface(); - enum PlayingtqStatus { Stopped=0, Playing, Paused }; + enum PlayingStatus { Stopped=0, Playing, Paused }; public slots: virtual void updateSlider()=0; // gets called on timer-timeout @@ -45,7 +45,7 @@ class PlayerInterface : public TQObject virtual void dragEnterEvent(TQDragEnterEvent* event)=0; virtual void dropEvent(TQDropEvent* event)=0; virtual const TQString getTrackTitle() const=0; - virtual int playingtqStatus()=0; + virtual int playingStatus()=0; void startPlayer(const TQString &desktopname); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index f232377..4760982 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::tqsizeHint() const +TQSize SimpleButton::sizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqsizeHint(); + return TQButton::sizeHint(); else return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -TQSize SimpleButton::tqminimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqminimumSizeHint(); + return TQButton::minimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con _inside = false; } -TQSize SimpleArrowButton::tqsizeHint() const +TQSize SimpleArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h index 0cf11e5..9c66f85 100644 --- a/kicker-applets/mediacontrol/simplebutton.h +++ b/kicker-applets/mediacontrol/simplebutton.h @@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp index 05fc2b0..7d8e236 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.cpp +++ b/kicker-applets/mediacontrol/xmmsInterface.cpp @@ -79,7 +79,7 @@ void XmmsInterface::updateSlider ( void ) } emit newSliderPosition(len,time); - emit playingStatusChanged(playingtqStatus()); + emit playingStatusChanged(playingStatus()); } @@ -163,7 +163,7 @@ void XmmsInterface::volumeDown() xmms_remote_set_main_volume(XMMS_SESSION, cur-1); } -int XmmsInterface::playingtqStatus() +int XmmsInterface::playingStatus() { if (xmms_remote_is_paused(XMMS_SESSION)) return Paused; diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h index 59bea23..d67f8df 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.h +++ b/kicker-applets/mediacontrol/xmmsInterface.h @@ -49,7 +49,7 @@ class XmmsInterface : public PlayerInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingtqStatus(); + virtual int playingStatus(); private: TQTimer *xmms_timer; diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 57cf2cc..c18c061 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -95,7 +95,7 @@ void AdBlock::initLabel() KIconLoader *loader = instance()->iconLoader(); m_label->setFixedHeight(loader->currentSize(KIcon::Small)); - m_label->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_label->setUseCursor(false); m_label->setPixmap(loader->loadIcon("filter", KIcon::Small)); diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 57bddf3..3c2716f 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include @@ -156,7 +156,7 @@ void KonqFeedIcon::addFeedIcon() // from khtmlpart's ualabel m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_feedIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_feedIcon->setUseCursor(false); //FIXME hackish m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png"))); diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 48b4fd8..714ed52 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -98,7 +98,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis { item = itemList.first(); m_name = itemList.first()->name(); - action = new KAction( i18n( "Compress as %1" ).tqarg( m_name + m_ext ), 0, this, + action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } else @@ -143,7 +143,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis { TQString targetName = itemList.first()->name(); stripExtension( targetName ); - action = new KAction( i18n( "Extract to %1" ).tqarg( targetName ), 0, this, + action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } else @@ -473,7 +473,7 @@ void ArkMenu::slotCompressAs( int pos ) int i=1; while ( KIO::NetAccess::exists(target, true, 0 ) ) { - target = m_dir + i18n("Archive %1").tqarg(i) + m_extensionList[ pos ]; + target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ]; i++; } } @@ -517,7 +517,7 @@ void ArkMenu::slotCompressAsDefault() int i=1; while ( KIO::NetAccess::exists(name, true, 0 ) ) { - name = m_dir + i18n("Archive %1").tqarg(i) + m_ext; + name = m_dir + i18n("Archive %1").arg(i) + m_ext; i++; } } diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui index c0abc0e..9ecf581 100644 --- a/konq-plugins/domtreeviewer/attributeeditdialog.ui +++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui @@ -21,7 +21,7 @@ - tqlayout7 + layout7 @@ -89,7 +89,7 @@ - tqlayout8 + layout8 @@ -119,7 +119,7 @@ Expanding - + 121 20 diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index 8951451..7ab20b4 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -59,14 +59,14 @@ void DOMListViewItem::init() clos = false; } -void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) +void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { TQColorGroup _cg( cg ); TQColor c = _cg.text(); p->setFont(m_font); _cg.setColor( TQColorGroup::Text, m_color ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); _cg.setColor( TQColorGroup::Text, c ); } diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h index 3ba7378..f6f74f6 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.h +++ b/konq-plugins/domtreeviewer/domlistviewitem.h @@ -33,7 +33,7 @@ class DOMListViewItem : public TQListViewItem virtual ~DOMListViewItem(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); void setColor( const TQColor &color) { m_color = color; } diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index a072409..0bbb918 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -53,7 +53,7 @@ static const char * const dom_error_msgs[] = { TQString domtreeviewer::domErrorMessage(int dom_err) { if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0]) - return i18n("Unknown Exception %1").tqarg(dom_err); + return i18n("Unknown Exception %1").arg(dom_err); else return i18n(dom_error_msgs[dom_err]); } @@ -401,8 +401,8 @@ void ChangeCDataCommand::apply() if (!shouldReapply()) { oldValue = cdata.data(); has_newlines = - TQConstString(value.tqunicode(), value.length()).string().contains('\n') - || TQConstString(oldValue.tqunicode(), oldValue.length()).string().contains('\n'); + TQConstString(value.unicode(), value.length()).string().contains('\n') + || TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n'); } cdata.setData(value); addChangedNode(cdata); diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h index 6361fd7..eed0822 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.h +++ b/konq-plugins/domtreeviewer/domtreecommands.h @@ -305,7 +305,7 @@ class InsertNodeCommand : public ManipulateNodeCommand public: /** * Prepare insertion command, inserting \c node into \c parent, just - * before \c after. If \c after is 0, append it to the list of tqchildren. + * before \c after. If \c after is 0, append it to the list of children. */ InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~InsertNodeCommand(); @@ -331,7 +331,7 @@ class RemoveNodeCommand : public ManipulateNodeCommand public: /** * Prepare insertion command, inserting \c node into \c parent, just - * before \c after. If \c after is 0, append it to the list of tqchildren. + * before \c after. If \c after is 0, append it to the list of children. */ RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~RemoveNodeCommand(); diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 615f056..4089c22 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -36,9 +36,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include @@ -124,7 +124,7 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part) // nothing here yet } - parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") ); + parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") ); TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed())); } @@ -343,7 +343,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeN * think it's worth it. */ - TQColor namedColor(tqpalette().active().text()); + TQColor namedColor(palette().active().text()); TQString tagName = nodeName.upper(); if ( tagName == "HTML" ) { namedColor = "#0000ff"; @@ -530,7 +530,7 @@ void DOMTreeView::slotSaveClicked() if (file.exists()) { const TQString title = i18n( "File Exists" ); - const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).tqarg(url.url()); + const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url()); if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) { return; } @@ -545,12 +545,12 @@ void DOMTreeView::slotSaveClicked() delete m_textStream; } else { const TQString title = i18n( "Unable to Open File" ); - const TQString text = i18n( "Unable to open \n %1 \n for writing" ).tqarg(url.path()); + const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path()); KMessageBox::sorry( this, text, title ); } } else { const TQString title = i18n( "Invalid URL" ); - const TQString text = i18n( "This URL \n %1 \n is not valid." ).tqarg(url.url()); + const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url()); KMessageBox::sorry( this, text, title ); } } @@ -973,7 +973,7 @@ public: protected: virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { bool updates_enabled = listView()->isUpdatesEnabled(); listView()->setUpdatesEnabled(false); @@ -993,7 +993,7 @@ protected: TQColorGroup _cg( cg ); _cg.setColor( TQColorGroup::Text, c ); - super::paintCell( p, _cg, column, width, tqalignment ); + super::paintCell( p, _cg, column, width, alignment ); if (text_changed) setText(column, oldText); listView()->setUpdatesEnabled(updates_enabled); diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index 6ff1634..43c389c 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -169,7 +169,7 @@ class DOMTreeView : public DOMTreeViewBase // == DOM Node Info panel ====================================== public: - // Keep in sync with the widget stack tqchildren + // Keep in sync with the widget stack children enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel }; public slots: diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui index 0d3a204..4b79c2d 100644 --- a/konq-plugins/domtreeviewer/domtreeviewbase.ui +++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui @@ -12,7 +12,7 @@ 508 - + 600 380 @@ -108,7 +108,7 @@ Fixed - + 10 20 @@ -135,7 +135,7 @@ - tqlayout7 + layout7 @@ -173,7 +173,7 @@ groupBox1 - + 300 400 @@ -188,7 +188,7 @@ - tqlayout4 + layout4 @@ -400,7 +400,7 @@ - tqlayout3 + layout3 @@ -424,7 +424,7 @@ Expanding - + 81 20 diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index 11b6a1d..a13e288 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -72,7 +72,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) // message window dialog msgdlg = new MessageDialog(0, "MessageDialog"); - msgdlg->messagePane->setPaletteBackgroundColor(tqpalette().active().base()); + msgdlg->messagePane->setPaletteBackgroundColor(palette().active().base()); // msgdlg->show(); // then, setup our actions @@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event) void DOMTreeWindow::addMessage(int msg_id, const TQString &msg) { - TQDateTime t(TQDateTime::tqcurrentDateTime()); + TQDateTime t(TQDateTime::currentDateTime()); TQString fullmsg = t.toString(); fullmsg += ":"; diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui index d703eeb..cd2829b 100644 --- a/konq-plugins/domtreeviewer/elementeditdialog.ui +++ b/konq-plugins/domtreeviewer/elementeditdialog.ui @@ -21,7 +21,7 @@ - tqlayout7 + layout7 @@ -47,7 +47,7 @@ - tqlayout3 + layout3 @@ -104,7 +104,7 @@ - tqlayout6 + layout6 @@ -145,7 +145,7 @@ Expanding - + 60 20 diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui index c6d20bc..830b1cd 100644 --- a/konq-plugins/domtreeviewer/messagedialog.ui +++ b/konq-plugins/domtreeviewer/messagedialog.ui @@ -41,7 +41,7 @@ - tqlayout2 + layout2 @@ -68,7 +68,7 @@ Expanding - + 300 20 diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui index b68a31e..767f505 100644 --- a/konq-plugins/domtreeviewer/texteditdialog.ui +++ b/konq-plugins/domtreeviewer/texteditdialog.ui @@ -60,7 +60,7 @@ - tqlayout6 + layout6 @@ -101,7 +101,7 @@ Expanding - + 60 20 diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 830bb3d..931c43f 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -94,12 +94,12 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name) double s; TQString str; for (i=1;i<=ccount;i++) { - str = TQString("Dir%1").tqarg(i); + str = TQString("Dir%1").arg(i); if (!cconfig.hasKey(str)) continue; str = cconfig.readPathEntry(str); - s = cconfig.readDoubleNumEntry(TQString("Size%1").tqarg(i), 0.0); - f = cconfig.readNumEntry(TQString("Files%1").tqarg(i), 0); - d = cconfig.readNumEntry(TQString("Dirs%1").tqarg(i), 0); + s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0); + f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0); + d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0); if (s==0.0 || f==0 || d==0) continue; setDirMetric(str, s, f, d); } @@ -147,7 +147,7 @@ void FSView::setPath(TQString p) b->setPeer(d); - setCaption(TQString("%1 - FSView").tqarg(_path)); + setCaption(TQString("%1 - FSView").arg(_path)); requestUpdate(b); } @@ -286,7 +286,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p) popup.insertItem(i18n("Refresh"), 5); popup.setItemEnabled(5, !_sm.scanRunning()); - if (i) popup.insertItem(i18n("Refresh '%1'").tqarg(i->text(0)), 4); + if (i) popup.insertItem(i18n("Refresh '%1'").arg(i->text(0)), 4); popup.insertSeparator(); addDepthStopItems(dpopup, 1001, i); popup.insertItem(i18n("Stop at Depth"), dpopup, 1000); @@ -331,10 +331,10 @@ void FSView::saveMetric(KConfigGroup* g) TQMap::iterator it; int c = 1; for (it=_dirMetric.begin();it!=_dirMetric.end();++it) { - g->writePathEntry(TQString("Dir%1").tqarg(c), it.key()); - g->writeEntry(TQString("Size%1").tqarg(c), (*it).size); - g->writeEntry(TQString("Files%1").tqarg(c), (*it).fileCount); - g->writeEntry(TQString("Dirs%1").tqarg(c), (*it).dirCount); + g->writePathEntry(TQString("Dir%1").arg(c), it.key()); + g->writeEntry(TQString("Size%1").arg(c), (*it).size); + g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount); + g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount); c++; } g->writeEntry("Count", c-1); diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 547335b..493a0e1 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -20,7 +20,7 @@ * The KPart embedding the FSView widget */ -#include +#include #include #include @@ -74,7 +74,7 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir) emitPercent(percent, 100); slotInfoMessage(this, i18n("Read 1 folder, in %1", "Read %n folders, in %1", - dirs ).tqarg(cDir)); + dirs ).arg(cDir)); } else slotInfoMessage(this, i18n("1 folder", "%n folders", dirs)); @@ -344,7 +344,7 @@ void FSViewBrowserExtension::trash() void FSViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move ); - TQApplication::tqclipboard()->setData( urlData ); + TQApplication::clipboard()->setData( urlData ); } void FSViewBrowserExtension::editMimeType() diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index d4875c2..6f5073c 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -168,7 +168,7 @@ void Inode::destroyed(ScanDir* d) { if (_dirPeer == d) _dirPeer = 0; - // remove tqchildren + // remove children clear(); } @@ -179,15 +179,15 @@ void Inode::destroyed(ScanFile* f) -TreeMapItemList* Inode::tqchildren() +TreeMapItemList* Inode::children() { if (!_dirPeer) return 0; - if (!_tqchildren) { + if (!_children) { if (!_dirPeer->scanStarted()) return 0; - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + _children = new TreeMapItemList; + _children->setAutoDelete(true); setSorting(-1); @@ -215,7 +215,7 @@ TreeMapItemList* Inode::tqchildren() _resortNeeded = false; } - return _tqchildren; + return _children; } @@ -284,7 +284,7 @@ TQColor Inode::backColor() const if (id>0) n = TQString::number(id); if (n.isEmpty()) - return widget()->tqcolorGroup().button(); + return widget()->colorGroup().button(); const char* str = n.ascii(); int h = 0, s = 100; @@ -325,21 +325,21 @@ TQString Inode::text(int i) const double s = size(); if (s < 1000) - text = TQString("%1 B").tqarg((int)(s+.5)); + text = TQString("%1 B").arg((int)(s+.5)); else if (s < 10 * 1024) - text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) - text = TQString("%1 kB").tqarg((int)(s/1024+.5)); + text = TQString("%1 kB").arg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) - text = TQString("%1 MB").tqarg((int)(s/1024/1024+.5)); + text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); else - text = TQString("%1 GB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); if (_sizeEstimation>0) text += "+"; return text; @@ -354,10 +354,10 @@ TQString Inode::text(int i) const if (f>0) { while (f>1000) { - text = TQString("%1 %2").tqarg(TQString::number(f).right(3)).tqarg(text); + text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text); f /= 1000; } - text = TQString("%1 %2").tqarg(TQString::number(f)).tqarg(text); + text = TQString("%1 %2").arg(TQString::number(f)).arg(text); if (_fileCountEstimation>0) text += "+"; } return text; diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h index d21a689..eb1e3dd 100644 --- a/konq-plugins/fsview/inode.h +++ b/konq-plugins/fsview/inode.h @@ -53,7 +53,7 @@ public: void setPeer(ScanDir*); - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); double value() const; double size() const; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index fc83601..cab9809 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -756,7 +756,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) _parent = parent; _sum = 0; - _tqchildren = 0; + _children = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -789,7 +789,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, setText(0, text1); _sum = 0; - _tqchildren = 0; + _children = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -801,7 +801,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, TreeMapItem::~TreeMapItem() { - if (_tqchildren) delete _tqchildren; + if (_children) delete _children; if (_freeRects) delete _freeRects; // finally, notify widget about deletion @@ -842,18 +842,18 @@ void TreeMapItem::redraw() void TreeMapItem::clear() { - if (_tqchildren) { + if (_children) { // delete selected items below this item from selection if (_widget) _widget->clearSelection(this); - delete _tqchildren; - _tqchildren = 0; + delete _children; + _children = 0; } } -// invalidates current tqchildren and forces redraw -// this is only usefull when tqchildren are created on demand in items() +// invalidates current children and forces redraw +// this is only usefull when children are created on demand in items() void TreeMapItem::refresh() { clear(); @@ -887,9 +887,9 @@ int TreeMapItem::depth() const bool TreeMapItem::initialized() { - if (!_tqchildren) { - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + if (!_children) { + _children = new TreeMapItemList; + _children->setAutoDelete(true); return false; } return true; @@ -899,16 +899,16 @@ void TreeMapItem::addItem(TreeMapItem* i) { if (!i) return; - if (!_tqchildren) { - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + if (!_children) { + _children = new TreeMapItemList; + _children->setAutoDelete(true); } i->setParent(this); if (sorting(0) == -1) - _tqchildren->append(i); // preserve insertion order + _children->append(i); // preserve insertion order else - _tqchildren->inSort(i); + _children->inSort(i); } @@ -974,17 +974,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending) _sortAscending = ascending; _sortTextNo = textNo; - if (_tqchildren && _sortTextNo != -1) _tqchildren->sort(); + if (_children && _sortTextNo != -1) _children->sort(); } void TreeMapItem::resort(bool recursive) { - if (!_tqchildren) return; + if (!_children) return; - if (_sortTextNo != -1) _tqchildren->sort(); + if (_sortTextNo != -1) _children->sort(); if (recursive) - for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next()) + for (TreeMapItem* i=_children->first(); i; i=_children->next()) i->resort(recursive); } @@ -1002,13 +1002,13 @@ int TreeMapItem::rtti() const return 0; } -TreeMapItemList* TreeMapItem::tqchildren() +TreeMapItemList* TreeMapItem::children() { - if (!_tqchildren) { - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + if (!_children) { + _children = new TreeMapItemList; + _children->setAutoDelete(true); } - return _tqchildren; + return _children; } void TreeMapItem::clearItemRect() @@ -1252,7 +1252,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d) TQString TreeMapWidget::defaultFieldType(int f) const { - return i18n("Text %1").tqarg(f+1); + return i18n("Text %1").arg(f+1); } TQString TreeMapWidget::defaultFieldStop(int) const @@ -1482,7 +1482,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { - TreeMapItemList* list = p->tqchildren(); + TreeMapItemList* list = p->children(); if (!list) i = 0; else { @@ -1491,11 +1491,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << " Checking " << i->path(0).join("/") << " (" - << i->tqitemRect().x() << "/" << i->tqitemRect().y() - << "-" << i->tqitemRect().width() - << "x" << i->tqitemRect().height() << ")" << endl; + << i->itemRect().x() << "/" << i->itemRect().y() + << "-" << i->itemRect().width() + << "x" << i->itemRect().height() << ")" << endl; - if (i->tqitemRect().contains(x, y)) { + if (i->itemRect().contains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1513,7 +1513,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "): Got " << p->path(0).join("/") << " (Size " - << p->tqitemRect().width() << "x" << p->tqitemRect().height() + << p->itemRect().width() << "x" << p->itemRect().height() << ", Val " << p->value() << ")" << endl; } @@ -1542,16 +1542,16 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const { if (i) { /* Must have a visible area */ - while(i && ((i->tqitemRect().width() <1) || - (i->tqitemRect().height() <1))) { + while(i && ((i->itemRect().width() <1) || + (i->itemRect().height() <1))) { TreeMapItem* p = i->parent(); if (!p) break; - int idx = p->tqchildren()->findRef(i); + int idx = p->children()->findRef(i); idx--; if (idx<0) i = p; else - i = p->tqchildren()->at(idx); + i = p->children()->at(idx); } } return i; @@ -1745,7 +1745,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, i2 = i2->parent(); if (!i2) return changed; - TreeMapItemList* list = commonParent->tqchildren(); + TreeMapItemList* list = commonParent->children(); if (!list) return changed; TreeMapItem* i = list->first(); @@ -1768,11 +1768,11 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { - TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect(); + TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } @@ -1936,14 +1936,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) int nextVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->tqitemRect().isEmpty()) return -1; + if (!p || p->itemRect().isEmpty()) return -1; - int idx = p->tqchildren()->findRef(i); + int idx = p->children()->findRef(i); if (idx<0) return -1; - while (idx < (int)p->tqchildren()->count()-1) { + while (idx < (int)p->children()->count()-1) { idx++; - TQRect r = p->tqchildren()->at(idx)->tqitemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1954,14 +1954,14 @@ int nextVisible(TreeMapItem* i) int prevVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->tqitemRect().isEmpty()) return -1; + if (!p || p->itemRect().isEmpty()) return -1; - int idx = p->tqchildren()->findRef(i); + int idx = p->children()->findRef(i); if (idx<0) return -1; while (idx > 0) { idx--; - TQRect r = p->tqchildren()->at(idx)->tqitemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -2042,24 +2042,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) int newIdx = goBack ? nextVisible(_current) : prevVisible(_current); if (p && newIdx>=0) { p->setIndex(newIdx); - setCurrent(p->tqchildren()->at(newIdx), true); + setCurrent(p->children()->at(newIdx), true); } } else if (e->key() == Key_Right) { int newIdx = goBack ? prevVisible(_current) : nextVisible(_current); if (p && newIdx>=0) { p->setIndex(newIdx); - setCurrent(p->tqchildren()->at(newIdx), true); + setCurrent(p->children()->at(newIdx), true); } } else if (e->key() == Key_Down) { - if (_current->tqchildren() && _current->tqchildren()->count()>0) { + if (_current->children() && _current->children()->count()>0) { int newIdx = _current->index(); if (newIdx<0) - newIdx = goBack ? (_current->tqchildren()->count()-1) : 0; - if (newIdx>=(int)_current->tqchildren()->count()) - newIdx = _current->tqchildren()->count()-1; - newItem = visibleItem(_current->tqchildren()->at(newIdx)); + newIdx = goBack ? (_current->children()->count()-1) : 0; + if (newIdx>=(int)_current->children()->count()) + newIdx = _current->children()->count()-1; + newItem = visibleItem(_current->children()->at(newIdx)); setCurrent(newItem, true); } } @@ -2136,7 +2136,7 @@ void TreeMapWidget::drawTreeMap() } else { // only subitem - if (!_needsRefresh->tqitemRect().isValid()) return; + if (!_needsRefresh->itemRect().isValid()) return; } // reset cached font object; it could have been changed @@ -2154,7 +2154,7 @@ void TreeMapWidget::drawTreeMap() TQPainter p(this); tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, TQRect(0, 0, TQWidget::width(), TQWidget::height()), - tqcolorGroup() ); + colorGroup() ); } } @@ -2198,7 +2198,7 @@ void TreeMapWidget::drawItem(TQPainter* p, bool isCurrent = _current && item->isChildOf(_current); - RectDrawing d(item->tqitemRect()); + RectDrawing d(item->itemRect()); item->setSelected(isSelected); item->setCurrent(isCurrent); item->setShaded(_shading); @@ -2232,25 +2232,25 @@ void TreeMapWidget::drawItems(TQPainter* p, { if (DEBUG_DRAWING) kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", " - << item->tqitemRect().x() << "/" << item->tqitemRect().y() - << "-" << item->tqitemRect().width() << "x" - << item->tqitemRect().height() << "), Val " << item->value() + << item->itemRect().x() << "/" << item->itemRect().y() + << "-" << item->itemRect().width() << "x" + << item->itemRect().height() << "), Val " << item->value() << ", Sum " << item->sum() << endl; drawItem(p, item); item->clearFreeRects(); - TQRect origRect = item->tqitemRect(); + TQRect origRect = item->itemRect(); int bw = item->borderWidth(); TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); - TreeMapItemList* list = item->tqchildren(); + TreeMapItemList* list = item->children(); TreeMapItem* i; bool stopDrawing = false; - // only subdivide if there are tqchildren + // only subdivide if there are children if (!list || list->count()==0) stopDrawing = true; @@ -2283,12 +2283,12 @@ void TreeMapWidget::drawItems(TQPainter* p, if (stopDrawing) { if (list) { - // tqinvalidate rects + // invalidate rects for (i=list->first();i;i=list->next()) i->clearItemRect(); } // tooltip apears on whole item rect - item->addFreeRect(item->tqitemRect()); + item->addFreeRect(item->itemRect()); // if we have space for text... if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return; @@ -2399,7 +2399,7 @@ void TreeMapWidget::drawItems(TQPainter* p, r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height()); } - // set selfRect (not occupied by tqchildren) for tooltip + // set selfRect (not occupied by children) for tooltip item->addFreeRect(sr); if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR " @@ -2537,7 +2537,7 @@ void TreeMapWidget::drawItems(TQPainter* p, kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl; } -// fills area with a pattern if to small to draw tqchildren +// fills area with a pattern if to small to draw children void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) { p->setBrush(TQt::Dense4Pattern); @@ -2546,7 +2546,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) i->addFreeRect(r); } -// fills area with a pattern if to small to draw tqchildren +// fills area with a pattern if to small to draw children void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack) { @@ -2845,10 +2845,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) popup->insertItem(i18n("Border"), bpopup, id+1); bpopup->insertItem(i18n("Correct Borders Only"), id+2); bpopup->insertSeparator(); - bpopup->insertItem(i18n("Width %1").tqarg(0), id+3); - bpopup->insertItem(i18n("Width %1").tqarg(1), id+4); - bpopup->insertItem(i18n("Width %1").tqarg(2), id+5); - bpopup->insertItem(i18n("Width %1").tqarg(3), id+6); + bpopup->insertItem(i18n("Width %1").arg(0), id+3); + bpopup->insertItem(i18n("Width %1").arg(1), id+4); + bpopup->insertItem(i18n("Width %1").arg(2), id+5); + bpopup->insertItem(i18n("Width %1").arg(3), id+6); bpopup->setItemChecked(id+2, skipIncorrectBorder()); bpopup->setItemChecked(id+3, borderWidth()==0); bpopup->setItemChecked(id+4, borderWidth()==1); @@ -2955,7 +2955,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, connect(popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fieldStopActivated(int))); - popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id); + popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); _menuItem = i; bool foundFieldStop = false; @@ -3014,7 +3014,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, int area = i->width() * i->height(); popup->insertSeparator(); popup->insertItem(i18n("Area of '%1' (%2)") - .tqarg(i->text(0)).tqarg(area), id+1); + .arg(i->text(0)).arg(area), id+1); if (area == minimalArea()) { popup->setItemChecked(id+1, true); foundArea = true; @@ -3040,9 +3040,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, } popup->insertItem(i18n("Double Area Limit (to %1)") - .tqarg(minimalArea()*2), id+5); + .arg(minimalArea()*2), id+5); popup->insertItem(i18n("Halve Area Limit (to %1)") - .tqarg(minimalArea()/2), id+6); + .arg(minimalArea()/2), id+6); } } @@ -3079,7 +3079,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, int d = i->depth(); popup->insertSeparator(); popup->insertItem(i18n("Depth of '%1' (%2)") - .tqarg(i->text(0)).tqarg(d), id+1); + .arg(i->text(0)).arg(d), id+1); if (d == maxDrawingDepth()) { popup->setItemChecked(id+1, true); foundDepth = true; @@ -3089,7 +3089,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, popup->insertSeparator(); int depth = 2, count; for (count=0;count<3;count++) { - popup->insertItem(i18n("Depth %1").tqarg(depth), id+4+count); + popup->insertItem(i18n("Depth %1").arg(depth), id+4+count); if (depth == maxDrawingDepth()) { popup->setItemChecked(id+4+count, true); foundDepth = true; @@ -3100,14 +3100,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, if (maxDrawingDepth()>1) { popup->insertSeparator(); if (!foundDepth) { - popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10); + popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10); popup->setItemChecked(id+10, true); } popup->insertItem(i18n("Decrement (to %1)") - .tqarg(maxDrawingDepth()-1), id+2); + .arg(maxDrawingDepth()-1), id+2); popup->insertItem(i18n("Increment (to %1)") - .tqarg(maxDrawingDepth()+1), id+3); + .arg(maxDrawingDepth()+1), id+3); } } @@ -3130,13 +3130,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix) int f, fCount = _attr.size(); config->writeEntry(prefix+"FieldCount", fCount); for (f=0;fwriteEntry(TQString(prefix+"FieldVisible%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f), _attr[f].visible); - config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldForced%1").arg(f), _attr[f].forced); - config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldStop%1").arg(f), _attr[f].stop); - config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f), + config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f), fieldPositionString(f)); } } @@ -3180,18 +3180,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix) int f; for (f=0;fhasKey(str)) setFieldVisible(f, config->readBoolEntry(str)); - str = TQString(prefix+"FieldForced%1").tqarg(f); + str = TQString(prefix+"FieldForced%1").arg(f); if (config->hasKey(str)) setFieldForced(f, config->readBoolEntry(str)); - str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f)); + str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f)); setFieldStop(f, str); - str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f)); + str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f)); if (!str.isEmpty()) setFieldPosition(f, str); } } diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 0aa5a9d..9bacedc 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -215,7 +215,7 @@ typedef TQPtrListIterator TreeMapItemListIterator; * * If you want more flexibility, reimplement TreeMapItem and * override the corresponding methods. For dynamic creation of child - * items on demand, reimplement tqchildren(). + * items on demand, reimplement children(). */ class TreeMapItem: public StoredDrawParams { @@ -250,7 +250,7 @@ public: // force a redraw of this item void redraw(); - // delete all tqchildren + // delete all children void clear(); // force new child generation & refresh @@ -290,7 +290,7 @@ public: */ void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const TQRect& tqitemRect() const { return _rect; } + const TQRect& itemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } @@ -343,7 +343,7 @@ public: * For value() sorting, use = -2 * * For fast sorting, set this to -1 before child insertions and call - * again after inserting all tqchildren. + * again after inserting all children. */ void setSorting(int textNo, bool ascending = true); @@ -351,18 +351,18 @@ public: * Resort according to the already set sorting. * * This has to be done if the sorting base changes (e.g. text or values - * change). If this is only true for the tqchildren of this item, you can + * change). If this is only true for the children of this item, you can * set the recursive parameter to false. */ void resort(bool recursive = true); virtual SplitMode splitMode() const; virtual int rtti() const; - // not const as this can create tqchildren on demand - virtual TreeMapItemList* tqchildren(); + // not const as this can create children on demand + virtual TreeMapItemList* children(); protected: - TreeMapItemList* _tqchildren; + TreeMapItemList* _children; double _sum, _value; private: @@ -372,7 +372,7 @@ private: int _sortTextNo; bool _sortAscending; - // temporary tqlayout + // temporary layout TQRect _rect; TQPtrList* _freeRects; int _depth; @@ -436,7 +436,7 @@ public: /** * Selects or unselects an item. * In multiselection mode, the constrain that a selected item - * has no selected tqchildren or parents stays true. + * has no selected children or parents stays true. */ void setSelected(TreeMapItem*, bool selected = true); @@ -452,7 +452,7 @@ public: void setMarked(int markNo = 1, bool redraw = true); /** - * Clear selection of all selected items which are tqchildren of + * Clear selection of all selected items which are children of * parent. When parent == 0, clears whole selection * Returns true if selection changed. */ @@ -464,7 +464,7 @@ public: * Range means for a hierarchical widget: * - select/unselect i1 and i2 according selected * - search common parent of i1 and i2, and select/unselect the - * range of direct tqchildren between but excluding the child + * range of direct children between but excluding the child * leading to i1 and the child leading to i2. */ void setRangeSelection(TreeMapItem* i1, @@ -517,7 +517,7 @@ public: void setVisibleWidth(int width, bool reuseSpace = false); /** - * If a tqchildren value() is almost the parents sum(), + * If a children value() is almost the parents sum(), * it can happen that the border to be drawn for visibilty of * nesting relations takes to much space, and the * parent/child size relation can not be mapped to a correct @@ -629,7 +629,7 @@ public: virtual TQString tipString(TreeMapItem* i) const; /** - * Redraws an item with all tqchildren. + * Redraws an item with all children. * This takes changed values(), sums(), colors() and text() into account. */ void redraw(TreeMapItem*); diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py index ea65c6e..60fce74 100755 --- a/konq-plugins/imagerotation/exif.py +++ b/konq-plugins/imagerotation/exif.py @@ -240,7 +240,7 @@ GPS_TAGS={ 0x0006: ('GPSAltitude', ), 0x0007: ('GPSTimeStamp', ), 0x0008: ('GPSSatellites', ), - 0x0009: ('GPStqStatus', ), + 0x0009: ('GPSStatus', ), 0x000A: ('GPSMeasureMode', ), 0x000B: ('GPSDOP', ), 0x000C: ('GPSSpeedRef', ), @@ -811,7 +811,7 @@ class EXIF_header: repr(self.tags[ifd_name+' '+tag_name])) # extract uncompressed TIFF thumbnail (like pulling teeth) - # we take advantage of the pre-existing tqlayout in the thumbnail IFD as + # we take advantage of the pre-existing layout in the thumbnail IFD as # much as possible def extract_TIFF_thumbnail(self, thumb_ifd): entries=self.s2n(thumb_ifd, 2) diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 671b90e..d3bbba6 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA. #include #include #include -#include +#include #include #include #include @@ -60,7 +60,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name void KIGPDialog::slotDefault() { - m_title->setText(i18n("Image Gallery for %1").tqarg(m_path)); + m_title->setText(i18n("Image Gallery for %1").arg(m_path)); m_imagesPerRow->setValue(4); m_imageName->setChecked(true); m_imageSize->setChecked(false); @@ -96,7 +96,7 @@ void KIGPDialog::setupLookPage(const TQString& path) { label = new TQLabel( i18n("&Page title:"), page); vlay->addWidget(label); - m_title = new TQLineEdit(i18n("Image Gallery for %1").tqarg(path), page); + m_title = new TQLineEdit(i18n("Image Gallery for %1").arg(path), page); vlay->addWidget( m_title ); label->setBuddy(m_title); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 981eeb8..cd5337f 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -19,15 +19,15 @@ Boston, MA 02110-1301, USA. */ #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include @@ -105,7 +105,7 @@ bool KImGalleryPlugin::createDirectory(TQDir thumb_dir, TQString imgGalleryDir, if (!thumb_dir.exists()) { thumb_dir.setPath( imgGalleryDir); if (!(thumb_dir.mkdir(dirName, false))) { - KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").tqarg(thumb_dir.path())); + KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").arg(thumb_dir.path())); return false; } else { thumb_dir.setPath( imgGalleryDir + "/" + dirName + "/" ); @@ -163,11 +163,11 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi { int numOfImages = imageDir.count(); const TQString imgGalleryDir = url.directory(); - const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); + const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); stream << "\n

" << TQStyleSheet::escape(m_configDlg->getTitle()) << "

" << endl; - stream << i18n("Number of images: %1").tqarg(numOfImages) << "
" << endl; - stream << i18n("Created on: %1").tqarg(today) << "

" << endl; + stream << i18n("Number of images: %1").arg(numOfImages) << "
" << endl; + stream << i18n("Created on: %1").arg(today) << "

" << endl; stream << "
" << endl; @@ -205,10 +205,10 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi const TQString imgPath("thumbs/" + imgName + extension(imageFormat)); stream << "\"""; - m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").tqarg(imgName) ); + m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").arg(imgName) ); } else { kdDebug(90170) << "Creating thumbnail for " << imgName << " failed" << endl; - m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").tqarg(imgName) ); + m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").arg(imgName) ); } stream << "" << endl; @@ -266,7 +266,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName if (!subDir.exists()) { subDir.setPath( url.directory() ); if (!(subDir.mkdir(currentDir, false))) { - KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").tqarg(subDir.path())); + KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").arg(subDir.path())); continue; } else { subDir.setPath( url.directory() + "/" + currentDir ); @@ -293,12 +293,12 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName kdDebug(90170) << "imgGalleryDir: " << imgGalleryDir << endl; // Create the "thumbs" subdirectory if necessary - TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false) return false; // Create the "images" subdirectory if necessary - TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); if (m_copyFiles) { if (createDirectory(images_dir, imgGalleryDir, "images") == false) return false; @@ -320,7 +320,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName return !m_cancelled; } else { - KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").tqarg(url.path(+1))); + KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").arg(url.path(+1))); return false; } } @@ -344,8 +344,8 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const TQString& s } const TQString imgGalleryDir = url.directory(); - TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); - TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/")); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); TQDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP", TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable); TQFile file( url.path() ); @@ -415,7 +415,7 @@ void KImGalleryPlugin::loadCommentFile() kdDebug(90170) << "File closed." << endl; delete m_textStream; } else { - KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").tqarg(m_configDlg->getCommentFile())); + KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").arg(m_configDlg->getCommentFile())); m_useCommentFile = false; } } @@ -424,18 +424,18 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou const TQString& imgGalleryDir, const TQString& imageFormat) { TQImage img; - const TQString pixPath = sourceDirName + TQString::tqfromLatin1("/") + imgName; + const TQString pixPath = sourceDirName + TQString::fromLatin1("/") + imgName; if (m_copyFiles) { KURL srcURL = KURL::fromPathOrURL(pixPath); //kdDebug(90170) << "srcURL: " << srcURL << endl; - KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName); + KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName); //kdDebug(90170) << "destURL: " << destURL << endl; KIO::NetAccess::copy(srcURL, destURL, static_cast(parent())->widget()); } const TQString imgNameFormat = imgName + extension(imageFormat); - const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/"); + const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/"); int extent = m_configDlg->getThumbnailSize(); // this code is stolen from tdebase/kioslave/thumbnail/imagecreator.cpp diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index 27459ee..45c43c0 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -14,7 +14,7 @@ #include "kcmkuick.h" -#include +#include #include #include #include diff --git a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui index 1869438..5d2a239 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui +++ b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui @@ -100,7 +100,7 @@ Expanding - + 20 20 @@ -171,7 +171,7 @@ Expanding - + 20 20 diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index b9fa89d..030ac98 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -42,11 +42,11 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, src( _src ), action( 0 ) { - tqchildren.setAutoDelete( true ); + children.setAutoDelete( true ); initIconMap( ); connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); - tqchildren.clear(); // just in case + children.clear(); // just in case TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) @@ -55,7 +55,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, KDirMenu::~KDirMenu( ) { delete action; clear( ); - tqchildren.clear( ); + children.clear( ); } void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { static const TQIconSet folder = SmallIconSet("folder"); @@ -80,7 +80,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { } else insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); - tqchildren.append( submenu ); + children.append( submenu ); connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), this, TQT_SLOT(slotFileSelected(const TQString &))); } diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index 979fdf6..f4bd6bf 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -48,7 +48,7 @@ private: TQString name; KURL src; KAction *action; - TQPtrList tqchildren; + TQPtrList children; void initIconMap( ); public slots: void slotAboutToShow( ); diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 341cc2e..cb1b3ce 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include @@ -275,7 +275,7 @@ void KonqMFIcon::addMFIcon() { m_mfIcon = new KURLLabel(m_statusBarEx->statusBar()); m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_mfIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mfIcon->setUseCursor(false); //FIXME hackish m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png"))); diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 60eb724..6616e0e 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -133,8 +133,8 @@ void MinitoolsPlugin::endFolderCallback() { } TQString MinitoolsPlugin::minitoolsFilename(bool local) { - return local ? locateLocal("data", TQString::tqfromLatin1("konqueror/minitools.xml")) - : locateLocal("data", TQString::tqfromLatin1("konqueror/minitools-global.xml")); + return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml")) + : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml")); } void MinitoolsPlugin::slotEditBookmarks() { diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 9483f53..4f62c05 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -394,7 +394,7 @@ void RelLinksPlugin::guessRelations() TQString href=rx.cap(1)+ nval_str + rx.cap(3); KURL ref( m_part->url(), href ); - TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); DOM::Element e= m_part->document().createElement("link"); e.setAttribute("href",href); element_map["next"][0] = e; @@ -408,7 +408,7 @@ void RelLinksPlugin::guessRelations() nval_str.prepend(zeros.left(lenval-nval_str.length())); TQString href=rx.cap(1)+ nval_str + rx.cap(3); KURL ref( m_part->url(), href ); - TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); e= m_part->document().createElement("link"); e.setAttribute("href",href); element_map["prev"][0] = e; diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index 0d5305f..5f74987 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index a820d87..4da4d30 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -273,7 +273,7 @@ void SearchBarPlugin::startSearch(const TQString &_search) TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); if (service) { const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + search ); @@ -281,7 +281,7 @@ void SearchBarPlugin::startSearch(const TQString &_search) if(!service || !KURIFilter::self()->filterURI(data, list)) { - data.setData( TQString::tqfromLatin1( "google" ) + delimiter() + search ); + data.setData( TQString::fromLatin1( "google" ) + delimiter() + search ); KURIFilter::self()->filterURI( data, list ); } @@ -329,7 +329,7 @@ void SearchBarPlugin::setIcon() TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); if (service) { const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + "some keyword" ); @@ -353,7 +353,7 @@ void SearchBarPlugin::setIcon() m_searchIcon = SmallIcon("google"); providername = "Google"; } - hinttext = i18n("%1 Search").tqarg(providername);; + hinttext = i18n("%1 Search").arg(providername);; } static_cast(m_searchCombo->lineEdit())->setClickMessage(hinttext); @@ -364,7 +364,7 @@ void SearchBarPlugin::setIcon() p.drawPixmap(0, 2, m_searchIcon); TQStyle::SFlags arrowFlags = TQStyle::Style_Default; m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, - arrowmap.height()-6, 6, 5), m_searchCombo->tqcolorGroup(), arrowFlags, TQStyleOption() ); + arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() ); p.end(); m_searchIcon = arrowmap; @@ -389,7 +389,7 @@ void SearchBarPlugin::showSelectionMenu() for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it ) { i++; - service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(*it)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it)); if(!service) { continue; @@ -590,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText) void SearchBarCombo::mousePressEvent(TQMouseEvent *e) { - int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if(e->x() > x0 + 2 && e->x() < lineEdit()->x()) { diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 3f3b03a..612be03 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -302,7 +302,7 @@ void MainWidget::slotRenameTag() if ( tag ) { TQString oldName = tag->name(); - TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).tqarg( oldName ) ); + TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) ); if ( !newName.isEmpty() ) { KURL url( "http://del.icio.us/api/tags/rename" ); @@ -334,7 +334,7 @@ void MainWidget::slotDeleteBookmark() BookmarkListItem * bookmark = static_cast( lvBookmarks->currentItem() ); if ( bookmark ) { - int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).tqarg( bookmark->desc() ), + int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).arg( bookmark->desc() ), i18n( "Delete Bookmark" ), KStdGuiItem::del() ); if ( result == KMessageBox::Continue ) diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui index 4f07e62..14dc7b4 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui +++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -71,7 +71,7 @@ 0 - + 20 20 @@ -88,7 +88,7 @@ Pause - + 20 20 @@ -105,7 +105,7 @@ Stop - + 20 20 @@ -128,7 +128,7 @@ Expanding - + 20 20 @@ -190,7 +190,7 @@ Expanding - + 20 20 @@ -215,7 +215,7 @@ Expanding - + 20 20 @@ -266,7 +266,7 @@ Expanding - + 20 20 @@ -291,7 +291,7 @@ Expanding - + 20 20 @@ -310,7 +310,7 @@ Expanding - + 20 20 diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui index 9027637..4acfca0 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui +++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -71,7 +71,7 @@ 0 - + 20 20 @@ -88,7 +88,7 @@ Pause - + 20 20 @@ -105,7 +105,7 @@ Stop - + 20 20 @@ -128,7 +128,7 @@ Expanding - + 20 20 @@ -190,7 +190,7 @@ Expanding - + 20 20 @@ -215,7 +215,7 @@ Expanding - + 20 20 @@ -266,7 +266,7 @@ Expanding - + 20 20 @@ -291,7 +291,7 @@ Expanding - + 20 20 @@ -310,7 +310,7 @@ Expanding - + 20 20 diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 2585c7b..7d0f9bb 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) { - topWidgetName = parent->tqtopLevelWidget()->name(); + topWidgetName = parent->topLevelWidget()->name(); config = new KConfig("metabarrc"); iconConfig = new KConfig(locate("data", "metabar/iconsrc")); @@ -78,7 +78,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQWidget *general = new TQWidget; TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general); - entries_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group); max_entries = new KIntSpinBox(entries_group); @@ -98,7 +98,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); - appearance_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); animate = new TQCheckBox(i18n("Animate resize"), appearance_group); animate->setChecked(config->readBoolEntry("AnimateResize", false)); @@ -110,13 +110,13 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent showframe->setChecked(config->readBoolEntry("ShowFrame", true)); TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general); - theme_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); themes = new KComboBox(theme_group); - themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); - install_theme->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme())); loadThemes(); @@ -144,7 +144,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); link_list = new KListView(links); - link_list->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSorting(-1); link_list->setItemsMovable(TRUE); link_list->addColumn(i18n("Name")); @@ -161,7 +161,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent tab->addTab(actionPage, i18n("Actions")); tab->addTab(links, i18n("Links")); - //tqlayout + //layout TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5); general_layout->addWidget(entries_group, 0, 0); general_layout->addWidget(appearance_group, 0, 1); @@ -320,7 +320,7 @@ void ConfigDialog::createLink() TQLineEdit *url = new TQLineEdit("file:/", main); KIconButton *icon = new KIconButton(main); - icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon("folder"); @@ -330,19 +330,19 @@ void ConfigDialog::createLink() bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5); - tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0); - tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); - tqlayout->addWidget(name, 0, 2); - tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); - tqlayout->addWidget(url, 1, 2); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); + layout->addMultiCellWidget(icon, 0, 1, 0, 0); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(name, 0, 2); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(url, 1, 2); TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); - main_layout->addLayout(tqlayout); + main_layout->addLayout(layout); main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); - main->resize(300, main->tqsizeHint().height()); + main->resize(300, main->sizeHint().height()); if(main->exec() == TQDialog::Accepted){ TQString name_str = name->text(); @@ -403,7 +403,7 @@ void ConfigDialog::editLink(TQListViewItem *item) TQLineEdit *url = new TQLineEdit(linkList[item]->url, main); KIconButton *icon = new KIconButton(main); - icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon(linkList[item]->icon); @@ -413,19 +413,19 @@ void ConfigDialog::editLink(TQListViewItem *item) bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5); - tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0); - tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); - tqlayout->addWidget(name, 0, 2); - tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); - tqlayout->addWidget(url, 1, 2); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); + layout->addMultiCellWidget(icon, 0, 1, 0, 0); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(name, 0, 2); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(url, 1, 2); TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); - main_layout->addLayout(tqlayout); + main_layout->addLayout(layout); main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); - main->resize(300, main->tqsizeHint().height()); + main->resize(300, main->sizeHint().height()); if(main->exec() == TQDialog::Accepted){ TQString name_str = name->text(); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 3f2f7c9..b199b58 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -104,7 +104,7 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node) } } else{ - DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); if(!action.isNull()){ if(action.call("enabled()")){ @@ -156,7 +156,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KDesktopFile desktop(url.path(), TRUE); if(desktop.hasApplicationType ()){ - MetabarWidget::addEntry(innerHTML, i18n("Run %1").tqarg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon()); + MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon()); m_functions->show("open"); } @@ -364,12 +364,12 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix) buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); + TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data()); bool media = item->mimetype().startsWith("video/"); DOM::DOMString innerHTML; - innerHTML += TQString("