summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--atlantikdesigner/designer/boardinfo.cpp16
-rw-r--r--atlantikdesigner/designer/boardinfo.h2
-rw-r--r--atlantikdesigner/designer/designer.cpp28
-rw-r--r--atlantikdesigner/designer/designer.h2
-rw-r--r--atlantikdesigner/designer/editor.cpp78
-rw-r--r--atlantikdesigner/designer/editor.h8
-rw-r--r--atlantikdesigner/designer/group.cpp32
-rw-r--r--atlantikdesigner/designer/group.h2
-rw-r--r--kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp22
-rw-r--r--kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp12
-rw-r--r--kate/cppsymbolviewer/plugin_katesymbolviewer.cpp2
-rw-r--r--kate/filelistloader/katefll_initplugin.cpp2
-rw-r--r--kate/filelistloader/katefll_plugin.cpp4
-rw-r--r--kate/filetemplates/plugin/filetemplates.cpp16
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.cpp6
-rw-r--r--kate/kjswrapper/bindings.cpp6
-rw-r--r--kate/kjswrapper/plugin_katekjswrapper.cpp6
-rw-r--r--kate/kpybrowser/kpybrowser.cpp6
-rw-r--r--kate/kpybrowser/pybrowse_part.cpp2
-rw-r--r--kate/make/plugin_katemake.cpp32
-rw-r--r--kate/snippets/CWidgetSnippetsBase.ui6
-rw-r--r--kate/snippets/plugin_katesnippets.cpp2
-rw-r--r--kate/snippets/plugin_katesnippets.h2
-rw-r--r--kate/tabbarextension/plugin_katetabbarextension.cpp2
-rw-r--r--kate/tabbarextension/plugin_katetabbarextension.h2
-rw-r--r--kate/xmlcheck/plugin_katexmlcheck.cpp6
-rw-r--r--kate/xmltools/html4-loose.dtd.xml74
-rw-r--r--kate/xmltools/html4-strict.dtd.xml48
-rw-r--r--kate/xmltools/kde-docbook.dtd.xml114
-rw-r--r--kate/xmltools/plugin_katexmltools.cpp14
-rw-r--r--kate/xmltools/pseudo_dtd.cpp8
-rw-r--r--kate/xmltools/testcases.xml2
-rw-r--r--kate/xmltools/xhtml1-frameset.dtd.xml8
-rw-r--r--kate/xmltools/xhtml1-strict.dtd.xml8
-rw-r--r--kate/xmltools/xhtml1-transitional.dtd.xml8
-rw-r--r--kfile-plugins/html/kfile_html.cpp2
-rw-r--r--kfile-plugins/lnk/kfile_lnk.cpp4
-rw-r--r--kfile-plugins/lnk/read_lnk.cpp4
-rw-r--r--kfile-plugins/mhtml/kfile_mhtml.cpp4
-rw-r--r--kicker-applets/kbinaryclock/kbinaryclock.cpp38
-rw-r--r--kicker-applets/kbinaryclock/kbinaryclock.kcfg2
-rw-r--r--kicker-applets/kbinaryclock/settings.ui26
-rw-r--r--kicker-applets/kolourpicker/kolourpicker.cpp18
-rw-r--r--kicker-applets/kolourpicker/simplebutton.cpp16
-rw-r--r--kicker-applets/kolourpicker/simplebutton.h6
-rw-r--r--kicker-applets/ktimemon/confdlg.cc4
-rw-r--r--kicker-applets/ktimemon/sample.cc36
-rw-r--r--kicker-applets/ktimemon/timemon.cc20
-rw-r--r--kicker-applets/math/mathapplet.cpp10
-rw-r--r--kicker-applets/math/parser.cpp20
-rw-r--r--kicker-applets/mediacontrol/amarokInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/amarokInterface.h2
-rw-r--r--kicker-applets/mediacontrol/jukInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/jukInterface.h2
-rw-r--r--kicker-applets/mediacontrol/kscdInterface.cpp12
-rw-r--r--kicker-applets/mediacontrol/kscdInterface.h2
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.cpp22
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.h4
-rw-r--r--kicker-applets/mediacontrol/mediacontrolconfig.cpp2
-rw-r--r--kicker-applets/mediacontrol/mediacontrolconfigwidget.ui24
-rw-r--r--kicker-applets/mediacontrol/mpdInterface.cpp44
-rw-r--r--kicker-applets/mediacontrol/mpdInterface.h2
-rw-r--r--kicker-applets/mediacontrol/noatunInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/noatunInterface.h2
-rw-r--r--kicker-applets/mediacontrol/playerInterface.h4
-rw-r--r--kicker-applets/mediacontrol/simplebutton.cpp16
-rw-r--r--kicker-applets/mediacontrol/simplebutton.h6
-rw-r--r--kicker-applets/mediacontrol/xmmsInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/xmmsInterface.h2
-rw-r--r--konq-plugins/adblock/adblock.cpp2
-rw-r--r--konq-plugins/akregator/konqfeedicon.cpp4
-rw-r--r--konq-plugins/arkplugin/arkplugin.cpp8
-rw-r--r--konq-plugins/domtreeviewer/attributeeditdialog.ui6
-rw-r--r--konq-plugins/domtreeviewer/domlistviewitem.cpp4
-rw-r--r--konq-plugins/domtreeviewer/domlistviewitem.h2
-rw-r--r--konq-plugins/domtreeviewer/domtreecommands.cpp6
-rw-r--r--konq-plugins/domtreeviewer/domtreecommands.h4
-rw-r--r--konq-plugins/domtreeviewer/domtreeview.cpp18
-rw-r--r--konq-plugins/domtreeviewer/domtreeview.h2
-rw-r--r--konq-plugins/domtreeviewer/domtreeviewbase.ui14
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.cpp4
-rw-r--r--konq-plugins/domtreeviewer/elementeditdialog.ui8
-rw-r--r--konq-plugins/domtreeviewer/messagedialog.ui4
-rw-r--r--konq-plugins/domtreeviewer/texteditdialog.ui4
-rw-r--r--konq-plugins/fsview/fsview.cpp20
-rw-r--r--konq-plugins/fsview/fsview_part.cpp6
-rw-r--r--konq-plugins/fsview/inode.cpp34
-rw-r--r--konq-plugins/fsview/inode.h2
-rw-r--r--konq-plugins/fsview/treemap.cpp176
-rw-r--r--konq-plugins/fsview/treemap.h28
-rwxr-xr-xkonq-plugins/imagerotation/exif.py4
-rw-r--r--konq-plugins/kimgalleryplugin/imgallerydialog.cpp6
-rw-r--r--konq-plugins/kimgalleryplugin/imgalleryplugin.cpp38
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuick.cpp2
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui4
-rw-r--r--konq-plugins/kuick/kdirmenu.cpp8
-rw-r--r--konq-plugins/kuick/kdirmenu.h2
-rw-r--r--konq-plugins/microformat/konqmficon.cpp4
-rw-r--r--konq-plugins/minitools/minitoolsplugin.cpp4
-rw-r--r--konq-plugins/rellinks/plugin_rellinks.cpp4
-rw-r--r--konq-plugins/rsync/rsyncplugin.cpp2
-rw-r--r--konq-plugins/searchbar/searchbar.cpp14
-rw-r--r--konq-plugins/sidebar/delicious/mainWidget.cpp4
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui20
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui20
-rw-r--r--konq-plugins/sidebar/metabar/src/configdialog.cpp54
-rw-r--r--konq-plugins/sidebar/metabar/src/defaultplugin.cpp8
-rw-r--r--konq-plugins/sidebar/metabar/src/httpplugin.cpp2
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarfunctions.cpp16
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.cpp32
-rw-r--r--konq-plugins/sidebar/metabar/src/protocolplugin.cpp6
-rw-r--r--konq-plugins/sidebar/newsticker/norsswidget.cpp4
-rw-r--r--konq-plugins/sidebar/newsticker/nspanel.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp10
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.h2
-rw-r--r--konq-plugins/uachanger/uachangerplugin.cpp12
-rw-r--r--konq-plugins/validators/plugin_validators.cpp2
-rw-r--r--konq-plugins/validators/validatorsdialog.cpp2
-rw-r--r--konq-plugins/webarchiver/archivedialog.cpp8
-rw-r--r--konq-plugins/webarchiver/archiveviewbase.ui2
-rw-r--r--konq-plugins/webarchiver/plugin_webarchiver.cpp4
-rw-r--r--ksig/ksig.cpp12
-rw-r--r--ksig/ksig.h2
-rw-r--r--ksig/siglistviewitem.cpp16
-rw-r--r--ksig/standardtextbase.ui4
-rw-r--r--noatun-plugins/alarm/kminutespinbox.cpp2
-rw-r--r--noatun-plugins/alarm/wakeup.cpp16
-rw-r--r--noatun-plugins/alsaplayer/AlsaPlayer.ui10
-rw-r--r--noatun-plugins/alsaplayer/configmodule.cpp8
-rw-r--r--noatun-plugins/alsaplayer/userinterface.cpp8
-rw-r--r--noatun-plugins/blurscope/scopedisplayer.cpp4
-rw-r--r--noatun-plugins/blurscope/sdlscope.h2
-rw-r--r--noatun-plugins/charlatan/configmodule.cpp8
-rw-r--r--noatun-plugins/charlatan/userinterface.cpp4
-rw-r--r--noatun-plugins/dub/dub/dub.cpp4
-rw-r--r--noatun-plugins/dub/dub/dubconfigmodule.cpp2
-rw-r--r--noatun-plugins/dub/dub/dubprefs.ui2
-rw-r--r--noatun-plugins/dub/dub/fileselectorwidget.cpp8
-rw-r--r--noatun-plugins/dub/dub/fileselectorwidget.h2
-rw-r--r--noatun-plugins/ffrs/ffrs.cpp20
-rw-r--r--noatun-plugins/lyrics/cmodule.cpp24
-rw-r--r--noatun-plugins/lyrics/lyrics.cpp12
-rw-r--r--noatun-plugins/nexscope/gui.cpp2
-rw-r--r--noatun-plugins/nexscope/nex.cpp2
-rw-r--r--noatun-plugins/nexscope/nex.h6
-rw-r--r--noatun-plugins/nexscope/renderers.cpp2
-rw-r--r--noatun-plugins/oblique/cmodule.cpp10
-rw-r--r--noatun-plugins/oblique/query.cpp4
-rw-r--r--noatun-plugins/oblique/tree.cpp24
-rw-r--r--noatun-plugins/oblique/tree.h2
-rw-r--r--noatun-plugins/oblique/view.cpp4
-rw-r--r--noatun-plugins/pitchablespeed/speedtuner.ui4
-rw-r--r--noatun-plugins/synaescope/cmodule.cpp10
-rw-r--r--noatun-plugins/tippercanoe/synaescope.cpp2
-rw-r--r--noatun-plugins/wavecapture/wavecapture.h4
-rw-r--r--renamedlgplugins/audio/audio_plugin.cpp8
-rw-r--r--renamedlgplugins/audio/audiopreview.cpp16
-rw-r--r--renamedlgplugins/images/image_plugin.cpp2
-rw-r--r--renamedlgplugins/images/imagevisualizer.cpp6
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 <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstringlist.h>
#include <tqframe.h>
#include <tqptrlist.h>
@@ -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<TQWidget> 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 <tqcolor.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqevent.h>
#include <tqfile.h>
#include <tqguardedptr.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpoint.h>
#include <tqpopupmenu.h>
#include <tqptrlist.h>
#include <tqstring.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
#include <tqtimer.h>
#include <tqwidget.h>
@@ -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<EstateEdit> editor;
- TQGuardedPtr<TQVBoxLayout> tqlayout;
+ TQGuardedPtr<TQVBoxLayout> layout;
TQGuardedPtr<AtlantikBoard> board;
TQGuardedPtr<GroupEditor> groupEditor;
TQGuardedPtr<BoardInfoDlg> 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 <tqframe.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
#include <tqstringlist.h>
@@ -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<CardStack> *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<CardStack>::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<CardStack> *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 <tqframe.h>
#include <tqvgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqspinbox.h>
#include <tqstring.h>
#include <tqstringlist.h>
@@ -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( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
- 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( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
- 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( "<qt>Unable to open file <b>%1</b>.</qt>" );
- 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<FlagInfo>::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 <kgenericfactory.h>
#include <kfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePluginSymbolViewer>( "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"<<endl;
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index a499ef2..5d59d5e 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -190,7 +190,7 @@ void PluginKateFileListLoader::slotSaveList()
{
/* if (m_oldInitURL!=application()->initPluginManager()->initScript())
{
- switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
+ switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").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("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
+ switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").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 <tqdatetime.h>
#include <tqdict.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqpopupmenu.h>
#include <tqpushbutton.h>
@@ -381,7 +381,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
if ( ! file.open( IO_ReadOnly ) )
{
KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(),
- i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").tqarg(filename),
+ i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").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(
"<p>The file <br><strong>'%1'</strong><br> 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(
"<qt>Error opening the file<br><strong>%1</strong><br>for reading. "
- "The document will not be created</qt>").tqarg(u.prettyURL()),
+ "The document will not be created</qt>").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 <tqdir.h>
#include <tqfile.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
#include <tqstringlist.h>
@@ -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"<<endl;
return KJS::Null();
}
- 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();
@@ -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 <kjs/object.h>
#include <kgenericfactory.h>
#include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kstandarddirs.h>
#include <kate/mainwindow.h>
#include <kate/toolviewmanager.h>
@@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name,
w->show();
//w->show();*/
kdDebug()<<"m_scriptname="<<m_scriptname<<endl;
- m_part->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"<<endl;
view->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 <tqinputdialog.h>
#include <tqregexp.h>
#include <tqstring.h>
-#include <tqtextstream.h>
-#include <tqpalette.h>
+#include <textstream.h>
+#include <palette.h>
#include <tqvbox.h>
#include <tqlabel.h>
@@ -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("<qt>");
+ TQString msg = TQString::fromLatin1("<qt>");
if (isError())
{
- msg.append(TQString::tqfromLatin1("<font color=\"red\">"));
+ msg.append(TQString::fromLatin1("<font color=\"red\">"));
}
msg.append(message());
if (isError())
{
- msg.append(TQString::tqfromLatin1("</font>"));
+ msg.append(TQString::fromLatin1("</font>"));
}
- msg.append(TQString::tqfromLatin1("<qt>"));
+ msg.append(TQString::fromLatin1("<qt>"));
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 <i>%1</i> 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("<b>Error:</b> Failed to run %1.").tqarg(make.isEmpty() ?
+ KMessageBox::error(0, i18n("<b>Error:</b> 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 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<vbox>
<property name="name">
@@ -104,7 +104,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>20</height>
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("<mark/>"), sSelection );
- sText.replace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) );
+ sText.replace( TQRegExp("<date/>"), TQDate::currentDate().toString(Qt::LocalDate) );
sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) );
kv->insertText ( sText );
}
diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h
index 25c49a0..05551b6 100644
--- a/kate/snippets/plugin_katesnippets.h
+++ b/kate/snippets/plugin_katesnippets.h
@@ -22,7 +22,7 @@
#include <kconfig.h>
#include <tqptrlist.h>
#include <tqtoolbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <kiconloader.h>
#include "csnippet.h"
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 2fd9378..5d1ba79 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -38,7 +38,7 @@
#include <kfiledialog.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqgroupbox.h>
#include <tqcheckbox.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 8fcf398..3c92236 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -248,7 +248,7 @@ class KateTabBarExtension : public TQWidget
private:
KateTabBarButton* pCurrentTab; ///< pointer to the current tab
- TQBoxLayout* top; ///< tqlayout that contains all tabs
+ TQBoxLayout* top; ///< layout that contains all tabs
Kate::MainWindow* m_win; ///< pointer to the main window
Kate::DocumentManager* m_docManager; ///< pointer to the document manager
// TQPtrList <KateTabBarButton> m_tabs; ///< list containing all tabs
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index b1a0ea3..6b0474b 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -38,7 +38,7 @@
#include <tqinputdialog.h>
#include <tqregexp.h>
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kaction.h>
#include <kcursor.h>
@@ -120,7 +120,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
setResizeMode(TQListView::LastColumn);
connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *)));
-/* TODO?: tqinvalidate the listview when document has changed
+/* TODO?: invalidate the listview when document has changed
Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView();
if( ! kv ) {
kdDebug() << "Warning: no Kate::View" << endl;
@@ -280,7 +280,7 @@ bool PluginKateXMLCheckView::slotValidate()
if( m_tmp_file->status() != 0 ) {
kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl;
KMessageBox::error(0, i18n("<b>Error:</b> Could not create "
- "temporary file '%1'.").tqarg(m_tmp_file->name()));
+ "temporary file '%1'.").arg(m_tmp_file->name()));
delete m_tmp_file;
m_tmp_file=0L;
return false;
diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml
index 03505ae..f7b48d0 100644
--- a/kate/xmltools/html4-loose.dtd.xml
+++ b/kate/xmltools/html4-loose.dtd.xml
@@ -689,11 +689,11 @@
type="param"
>
<text-expanded>align (left|center|right|justify|char) #IMPLIED
- char CDATA #IMPLIED -- tqalignment char, e.g. char=':' --
- charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded>
+ char CDATA #IMPLIED -- alignment char, e.g. char=':' --
+ charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded>
<text>align (left|center|right|justify|char) #IMPLIED
- char %Character; #IMPLIED -- tqalignment char, e.g. char=':' --
- charoff %Length; #IMPLIED -- offset for tqalignment char --</text>
+ char %Character; #IMPLIED -- alignment char, e.g. char=':' --
+ charoff %Length; #IMPLIED -- offset for alignment char --</text>
</entity>
<entity name="pre.exclusion"
@@ -3621,8 +3621,8 @@
%attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- default number of columns in group --
width %MultiLength; #IMPLIED -- default width for enclosed COLs --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -4909,8 +4909,8 @@
<attlist name="TBODY">
<attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -5086,7 +5086,7 @@
name CDATA #IMPLIED -- allows applets to find each other --
width %Length; #REQUIRED -- initial width --
height %Length; #REQUIRED -- initial height --
- align %IAlign; #IMPLIED -- vertical or horizontal tqalignment --
+ align %IAlign; #IMPLIED -- vertical or horizontal alignment --
hspace %Pixels; #IMPLIED -- horizontal gutter --
vspace %Pixels; #IMPLIED -- vertical gutter --
</attdecl>
@@ -5170,8 +5170,8 @@
<attlist name="TFOOT">
<attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -5683,8 +5683,8 @@
%attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- COL attributes affect N columns --
width %MultiLength; #IMPLIED -- column width specification --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -6457,7 +6457,7 @@
width %Length; #IMPLIED -- override width --
usemap %URI; #IMPLIED -- use client-side image map --
ismap (ismap) #IMPLIED -- use server-side image map --
- align %IAlign; #IMPLIED -- vertical or horizontal tqalignment --
+ align %IAlign; #IMPLIED -- vertical or horizontal alignment --
border %Pixels; #IMPLIED -- link border width --
hspace %Pixels; #IMPLIED -- horizontal gutter --
vspace %Pixels; #IMPLIED -- vertical gutter --
@@ -6648,7 +6648,7 @@
rel %LinkTypes; #IMPLIED -- forward link types --
rev %LinkTypes; #IMPLIED -- reverse link types --
accesskey %Character; #IMPLIED -- accessibility key character --
- tqshape %Shape; rect -- for use with client-side image maps --
+ shape %Shape; rect -- for use with client-side image maps --
coords %Coords; #IMPLIED -- for use with client-side image maps --
tabindex NUMBER #IMPLIED -- position in tabbing order --
onfocus %Script; #IMPLIED -- the element got the focus --
@@ -6742,7 +6742,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
@@ -6956,7 +6956,7 @@
<attlist name="H1">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
</attdecl>
<attribute name="title"
type="#IMPLIED"
@@ -7085,7 +7085,7 @@
<attlist name="H2">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
</attdecl>
<attribute name="title"
type="#IMPLIED"
@@ -7214,7 +7214,7 @@
<attlist name="H3">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
</attdecl>
<attribute name="title"
type="#IMPLIED"
@@ -7439,7 +7439,7 @@
<attlist name="H4">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
</attdecl>
<attribute name="title"
type="#IMPLIED"
@@ -7716,7 +7716,7 @@
<attlist name="H5">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
</attdecl>
<attribute name="title"
type="#IMPLIED"
@@ -8002,7 +8002,7 @@
<attlist name="H6">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
</attdecl>
<attribute name="title"
type="#IMPLIED"
@@ -8645,7 +8645,7 @@
<attlist name="P">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
</attdecl>
<attribute name="title"
type="#IMPLIED"
@@ -9871,7 +9871,7 @@
<attlist name="DIV">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- %align; -- align, text tqalignment --
+ %align; -- align, text alignment --
%reserved; -- reserved for possible future use --
</attdecl>
<attribute name="title"
@@ -10579,7 +10579,7 @@
usemap %URI; #IMPLIED -- use client-side image map --
name CDATA #IMPLIED -- submit as part of form --
tabindex NUMBER #IMPLIED -- position in tabbing order --
- align %IAlign; #IMPLIED -- vertical or horizontal tqalignment --
+ align %IAlign; #IMPLIED -- vertical or horizontal alignment --
border %Pixels; #IMPLIED -- link border width --
hspace %Pixels; #IMPLIED -- horizontal gutter --
vspace %Pixels; #IMPLIED -- vertical gutter --
@@ -10824,8 +10824,8 @@
<attlist name="THEAD">
<attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -11505,7 +11505,7 @@
marginwidth %Pixels; #IMPLIED -- margin widths in pixels --
marginheight %Pixels; #IMPLIED -- margin height in pixels --
scrolling (yes|no|auto) auto -- scrollbar or none --
- align %IAlign; #IMPLIED -- vertical or horizontal tqalignment --
+ align %IAlign; #IMPLIED -- vertical or horizontal alignment --
height %Length; #IMPLIED -- frame height --
width %Length; #IMPLIED -- frame width --
</attdecl>
@@ -11742,7 +11742,7 @@
<attlist name="AREA">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- tqshape %Shape; rect -- controls interpretation of coords --
+ shape %Shape; rect -- controls interpretation of coords --
coords %Coords; #IMPLIED -- comma-separated list of lengths --
href %URI; #IMPLIED -- URI for linked resource --
target %FrameTarget; #IMPLIED -- render in this frame --
@@ -11817,7 +11817,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
@@ -12054,8 +12054,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
nowrap (nowrap) #IMPLIED -- suppress word wrap --
bgcolor %Color; #IMPLIED -- cell background color --
width %Length; #IMPLIED -- width for cell --
@@ -12476,8 +12476,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
nowrap (nowrap) #IMPLIED -- suppress word wrap --
bgcolor %Color; #IMPLIED -- cell background color --
width %Length; #IMPLIED -- width for cell --
@@ -13024,8 +13024,8 @@
<attlist name="TR">
<attdecl> -- table row --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
bgcolor %Color; #IMPLIED -- background color for row --
</attdecl>
<attribute name="onmouseout"
@@ -13339,7 +13339,7 @@
onselect %Script; #IMPLIED -- some text was selected --
onchange %Script; #IMPLIED -- the element value was changed --
accept %ContentTypes; #IMPLIED -- list of MIME types for file upload --
- align %IAlign; #IMPLIED -- vertical or horizontal tqalignment --
+ align %IAlign; #IMPLIED -- vertical or horizontal alignment --
%reserved; -- reserved for possible future use --
</attdecl>
<attribute name="accesskey"
diff --git a/kate/xmltools/html4-strict.dtd.xml b/kate/xmltools/html4-strict.dtd.xml
index 063051f..bbcf853 100644
--- a/kate/xmltools/html4-strict.dtd.xml
+++ b/kate/xmltools/html4-strict.dtd.xml
@@ -594,11 +594,11 @@
type="param"
>
<text-expanded>align (left|center|right|justify|char) #IMPLIED
- char CDATA #IMPLIED -- tqalignment char, e.g. char=':' --
- charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded>
+ char CDATA #IMPLIED -- alignment char, e.g. char=':' --
+ charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded>
<text>align (left|center|right|justify|char) #IMPLIED
- char %Character; #IMPLIED -- tqalignment char, e.g. char=':' --
- charoff %Length; #IMPLIED -- offset for tqalignment char --</text>
+ char %Character; #IMPLIED -- alignment char, e.g. char=':' --
+ charoff %Length; #IMPLIED -- offset for alignment char --</text>
</entity>
<entity name="pre.exclusion"
@@ -3127,8 +3127,8 @@
%attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- default number of columns in group --
width %MultiLength; #IMPLIED -- default width for enclosed COLs --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -4148,8 +4148,8 @@
<attlist name="TBODY">
<attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -4253,8 +4253,8 @@
<attlist name="TFOOT">
<attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -4734,8 +4734,8 @@
%attrs; -- %coreattrs, %i18n, %events --
span NUMBER 1 -- COL attributes affect N columns --
width %MultiLength; #IMPLIED -- column width specification --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -5636,7 +5636,7 @@
rel %LinkTypes; #IMPLIED -- forward link types --
rev %LinkTypes; #IMPLIED -- reverse link types --
accesskey %Character; #IMPLIED -- accessibility key character --
- tqshape %Shape; rect -- for use with client-side image maps --
+ shape %Shape; rect -- for use with client-side image maps --
coords %Coords; #IMPLIED -- for use with client-side image maps --
tabindex NUMBER #IMPLIED -- position in tabbing order --
onfocus %Script; #IMPLIED -- the element got the focus --
@@ -5726,7 +5726,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
@@ -8923,8 +8923,8 @@
<attlist name="THEAD">
<attdecl> -- table section --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -9624,7 +9624,7 @@
<attlist name="AREA">
<attdecl>
%attrs; -- %coreattrs, %i18n, %events --
- tqshape %Shape; rect -- controls interpretation of coords --
+ shape %Shape; rect -- controls interpretation of coords --
coords %Coords; #IMPLIED -- comma-separated list of lengths --
href %URI; #IMPLIED -- URI for linked resource --
nohref (nohref) #IMPLIED -- this region has no action --
@@ -9694,7 +9694,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
@@ -9919,8 +9919,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -10250,8 +10250,8 @@
scope %Scope; #IMPLIED -- scope covered by header cells --
rowspan NUMBER 1 -- number of rows spanned by cell --
colspan NUMBER 1 -- number of cols spanned by cell --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
@@ -10751,8 +10751,8 @@
<attlist name="TR">
<attdecl> -- table row --
%attrs; -- %coreattrs, %i18n, %events --
- %cellhalign; -- horizontal tqalignment in cells --
- %cellvalign; -- vertical tqalignment in cells --
+ %cellhalign; -- horizontal alignment in cells --
+ %cellvalign; -- vertical alignment in cells --
</attdecl>
<attribute name="onmouseout"
type="#IMPLIED"
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 4d10a26..11282d5 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -4451,7 +4451,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -4881,7 +4881,7 @@
<attribute name="align" type="#IMPLIED" enumeration="yes" value="left right center" default=""/>
<attribute name="role" type="#IMPLIED" value="CDATA" default=""/>
</attlist>
-<element name="literaltqlayout">
+<element name="literallayout">
<content-model-expanded>
<or-group occurrence="*">
@@ -4989,7 +4989,7 @@
</or-group>
</content-model-expanded>
</element>
-<attlist name="literaltqlayout">
+<attlist name="literallayout">
<attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/>
<attribute name="width" type="#IMPLIED" value="CDATA" default=""/>
<attribute name="format" type="" enumeration="notation" value="linespecific" default="linespecific"/>
@@ -5048,7 +5048,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -5267,7 +5267,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -5488,7 +5488,7 @@
<sequence-group>
<or-group occurrence="+">
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -5549,7 +5549,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -5668,7 +5668,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -7472,7 +7472,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -7665,7 +7665,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -7779,7 +7779,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -8025,7 +8025,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -8228,7 +8228,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -8754,7 +8754,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -8900,7 +8900,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -9601,7 +9601,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -9673,7 +9673,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -9754,7 +9754,7 @@
<element-name name="titleabbrev" occurrence="?"/>
</sequence-group>
<or-group occurrence="+">
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -10513,7 +10513,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -10641,7 +10641,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -10703,7 +10703,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -10768,7 +10768,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -11281,7 +11281,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -11602,7 +11602,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -12033,7 +12033,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -12701,7 +12701,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -12847,7 +12847,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -13607,7 +13607,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -13758,7 +13758,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -13863,7 +13863,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -14187,7 +14187,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -14679,7 +14679,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -14795,7 +14795,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -14911,7 +14911,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -15027,7 +15027,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -15143,7 +15143,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -15237,7 +15237,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -16199,7 +16199,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -16287,7 +16287,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -16372,7 +16372,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -17314,7 +17314,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -17401,7 +17401,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -17478,7 +17478,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -17764,7 +17764,7 @@
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
@@ -17811,7 +17811,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -18170,7 +18170,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -18403,7 +18403,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -18671,7 +18671,7 @@
<element-name name="simplelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
@@ -18776,7 +18776,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -19127,7 +19127,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -19517,7 +19517,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -19620,7 +19620,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -19897,7 +19897,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -20298,7 +20298,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -20626,7 +20626,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -21006,7 +21006,7 @@
<element-name name="segmentedlist"/>
<element-name name="simplelist"/>
<element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
@@ -21077,7 +21077,7 @@
<element-name name="note"/>
<element-name name="tip"/>
<element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
<element-name name="programlisting"/>
<element-name name="programlistingco"/>
<element-name name="screen"/>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index ce53476..d322282 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -63,7 +63,7 @@ TODO:
but then at <xsl:template match="/"><html> it will only show you HTML elements!
=>So better "Assign meta DTD" and "Add meta DTD", the latter will expand the current meta DTD
-Option to insert empty element in <empty/> form
--Show expanded entities with TQChar::TQChar( int rc ) + tqunicode font
+-Show expanded entities with TQChar::TQChar( int rc ) + unicode font
-Don't ignore entities defined in the document's prologue
-Only offer 'valid' elements, i.e. don't take the elements as a set but check
if the DTD is matched ( order, number of occurences, ... )
@@ -81,7 +81,7 @@ TODO:
#include <tqdatetime.h>
#include <tqdom.h>
#include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqprogressdialog.h>
#include <tqpushbutton.h>
@@ -466,9 +466,9 @@ void PluginKateXMLTools::getDTD()
url.setFileName( defaultDir + filename );
KMessageBox::information(0, i18n("The current file has been identified "
"as a document of type \"%1\". The meta DTD for this document type "
- "will now be loaded.").tqarg( doctype ),
+ "will now be loaded.").arg( doctype ),
i18n( "Loading XML Meta DTD" ),
- TQString::tqfromLatin1( "DTDAssigned") );
+ TQString::fromLatin1( "DTDAssigned") );
}
if( url.isEmpty() )
@@ -503,7 +503,7 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job )
{
// catch failed loading loading via http:
KMessageBox::error(0, i18n("The file '%1' could not be opened. "
- "The server returned an error.").tqarg( m_urlString ),
+ "The server returned an error.").arg( m_urlString ),
i18n( "XML Plugin Error") );
}
else
@@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
--col;
}
- ushort ch = str.tqat( col).tqunicode();
+ ushort ch = str.at( col).unicode();
switch( parseState )
{
@@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
TQString tag = str.mid( col + 1 );
for( uint pos = 0, len = tag.length(); pos < len; ++pos ) {
- ch = tag.tqat( pos).tqunicode();
+ ch = tag.at( pos).unicode();
if( ch == ' ' || ch == '\t' || ch == '>' ) {
tag.truncate( pos );
break;
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index 99de846..af66188 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -46,7 +46,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
if ( ! doc.setContent( metaDtd) )
{
KMessageBox::error(0, i18n("The file '%1' could not be parsed. "
- "Please check that the file is well-formed XML.").tqarg( metaDtdUrl ),
+ "Please check that the file is well-formed XML.").arg( metaDtdUrl ),
i18n( "XML Plugin Error") );
return;
}
@@ -57,7 +57,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
"Please check that the file is of this type:\n"
"-//Norman Walsh//DTD DTDParse V2.0//EN\n"
"You can produce such files with dtdparse. "
- "See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ),
+ "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ),
i18n("XML Plugin Error") );
return;
}
@@ -410,7 +410,7 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress )
{
TQString exp = expandedElem.text();
// TODO: support more than one &#...; in the expanded text
- /* TODO include do this when the tqunicode font problem is solved:
+ /* TODO include do this when the unicode font problem is solved:
if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
// hexadecimal numbers, e.g. "&#x236;"
uint end = exp.find( ";" );
@@ -445,7 +445,7 @@ TQStringList PseudoDTD::entities( TQString start )
if( (*it).startsWith(start) )
{
TQString str = it.key();
- /* TODO: show entities as tqunicode character
+ /* TODO: show entities as unicode character
if( !it.data().isEmpty() ) {
//str += " -- " + it.data();
TQRegExp re( "&#(\\d+);" );
diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml
index e66fc60..aa1e7dd 100644
--- a/kate/xmltools/testcases.xml
+++ b/kate/xmltools/testcases.xml
@@ -40,7 +40,7 @@ the current cursor position, replacing the old value:
<td align=""> center, char, justify, left, right
<td valign=""> baseline, bottom, middle, top
<td valign="foobar"> -- "foobar" should be replaced
- <area tqshape=""> circle, default, poly, rect
+ <area shape=""> circle, default, poly, rect
<area foobar=""> (no predefined values)
6. Type "&". A list with named entities should appear. Select one and
diff --git a/kate/xmltools/xhtml1-frameset.dtd.xml b/kate/xmltools/xhtml1-frameset.dtd.xml
index 73bf4bc..6530334 100644
--- a/kate/xmltools/xhtml1-frameset.dtd.xml
+++ b/kate/xmltools/xhtml1-frameset.dtd.xml
@@ -7533,7 +7533,7 @@
<attdecl>
%attrs;
%focus;
- tqshape %Shape; "rect"
+ shape %Shape; "rect"
coords %Coords; #IMPLIED
href %URI; #IMPLIED
nohref (nohref) #IMPLIED
@@ -7608,7 +7608,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
@@ -12001,7 +12001,7 @@
hreflang %LanguageCode; #IMPLIED
rel %LinkTypes; #IMPLIED
rev %LinkTypes; #IMPLIED
- tqshape %Shape; "rect"
+ shape %Shape; "rect"
coords %Coords; #IMPLIED
target %FrameTarget; #IMPLIED
</attdecl>
@@ -12097,7 +12097,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
diff --git a/kate/xmltools/xhtml1-strict.dtd.xml b/kate/xmltools/xhtml1-strict.dtd.xml
index 850de19..907cd86 100644
--- a/kate/xmltools/xhtml1-strict.dtd.xml
+++ b/kate/xmltools/xhtml1-strict.dtd.xml
@@ -6190,7 +6190,7 @@
<attdecl>
%attrs;
%focus;
- tqshape %Shape; "rect"
+ shape %Shape; "rect"
coords %Coords; #IMPLIED
href %URI; #IMPLIED
nohref (nohref) #IMPLIED
@@ -6260,7 +6260,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
@@ -9838,7 +9838,7 @@
hreflang %LanguageCode; #IMPLIED
rel %LinkTypes; #IMPLIED
rev %LinkTypes; #IMPLIED
- tqshape %Shape; "rect"
+ shape %Shape; "rect"
coords %Coords; #IMPLIED
</attdecl>
<attribute name="rev"
@@ -9929,7 +9929,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
diff --git a/kate/xmltools/xhtml1-transitional.dtd.xml b/kate/xmltools/xhtml1-transitional.dtd.xml
index 5f04e87..9506803 100644
--- a/kate/xmltools/xhtml1-transitional.dtd.xml
+++ b/kate/xmltools/xhtml1-transitional.dtd.xml
@@ -7600,7 +7600,7 @@
<attdecl>
%attrs;
%focus;
- tqshape %Shape; "rect"
+ shape %Shape; "rect"
coords %Coords; #IMPLIED
href %URI; #IMPLIED
nohref (nohref) #IMPLIED
@@ -7675,7 +7675,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
@@ -11940,7 +11940,7 @@
hreflang %LanguageCode; #IMPLIED
rel %LinkTypes; #IMPLIED
rev %LinkTypes; #IMPLIED
- tqshape %Shape; "rect"
+ shape %Shape; "rect"
coords %Coords; #IMPLIED
target %FrameTarget; #IMPLIED
</attdecl>
@@ -12036,7 +12036,7 @@
type="#IMPLIED"
value="CDATA"
default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
type=""
enumeration="yes"
value="rect circle poly default"
diff --git a/kfile-plugins/html/kfile_html.cpp b/kfile-plugins/html/kfile_html.cpp
index 7ed2859..9e4abbd 100644
--- a/kfile-plugins/html/kfile_html.cpp
+++ b/kfile-plugins/html/kfile_html.cpp
@@ -28,7 +28,7 @@
#include <tqcstring.h>
#include <tqfile.h>
#include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
typedef KGenericFactory<KHtmlPlugin> HtmlFactory;
diff --git a/kfile-plugins/lnk/kfile_lnk.cpp b/kfile-plugins/lnk/kfile_lnk.cpp
index 804181a..eb9e106 100644
--- a/kfile-plugins/lnk/kfile_lnk.cpp
+++ b/kfile-plugins/lnk/kfile_lnk.cpp
@@ -75,8 +75,8 @@ bool lnkPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
if ( ! lnkInfo.isNetworkPath )
{
- appendItem(group, "Where", i18n("on Windows disk: %1").tqarg(lnkInfo.volumeName)); // volume label
- appendItem(group, "PointsTo", TQString("%1%2").tqarg(lnkInfo.driveName).tqarg(lnkInfo.path));
+ appendItem(group, "Where", i18n("on Windows disk: %1").arg(lnkInfo.volumeName)); // volume label
+ appendItem(group, "PointsTo", TQString("%1%2").arg(lnkInfo.driveName).arg(lnkInfo.path));
}
else
{
diff --git a/kfile-plugins/lnk/read_lnk.cpp b/kfile-plugins/lnk/read_lnk.cpp
index 645486e..c3825e0 100644
--- a/kfile-plugins/lnk/read_lnk.cpp
+++ b/kfile-plugins/lnk/read_lnk.cpp
@@ -182,8 +182,8 @@ bool readLNK(const KURL &url, LNKInfo &info)
else // network path
{
info.path = TQString("%1\\%2")
- .tqarg(start + loc.netVolume + 0x14) // network share name
- .tqarg(start + loc.pathname);
+ .arg(start + loc.netVolume + 0x14) // network share name
+ .arg(start + loc.pathname);
}
delete [] data;
diff --git a/kfile-plugins/mhtml/kfile_mhtml.cpp b/kfile-plugins/mhtml/kfile_mhtml.cpp
index 0a07ea9..3d23993 100644
--- a/kfile-plugins/mhtml/kfile_mhtml.cpp
+++ b/kfile-plugins/mhtml/kfile_mhtml.cpp
@@ -27,8 +27,8 @@
#include <tqstring.h>
#include <tqcstring.h>
#include <tqfile.h>
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
+#include <textstream.h>
+#include <textcodec.h>
typedef KGenericFactory<mhtmlPlugin> mhtmlFactory;
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index ebf7d59..698fa1c 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -36,7 +36,7 @@
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <kled.h>
extern "C"
@@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting
* Update the preview
*/
void SettingsImp::updatePreview(){
- int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
+ int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
int look = KLed::Raised;
look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look;
look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look;
@@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){
kLed5->setBackgroundColor(backgroundColor);
kLed6->setBackgroundColor(backgroundColor);
- kLed1->setShape((KLed::Shape)tqshape);
- kLed2->setShape((KLed::Shape)tqshape);
- kLed3->setShape((KLed::Shape)tqshape);
- kLed4->setShape((KLed::Shape)tqshape);
- kLed5->setShape((KLed::Shape)tqshape);
- kLed6->setShape((KLed::Shape)tqshape);
+ kLed1->setShape((KLed::Shape)shape);
+ kLed2->setShape((KLed::Shape)shape);
+ kLed3->setShape((KLed::Shape)shape);
+ kLed4->setShape((KLed::Shape)shape);
+ kLed5->setShape((KLed::Shape)shape);
+ kLed6->setShape((KLed::Shape)shape);
kLed1->setColor(color);
kLed2->setColor(color);
@@ -173,14 +173,14 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) {
* Load the settings for the clock.
*/
void KBinaryClock::loadSettings(){
- int tqshape = prefs->shape();
+ int shape = prefs->shape();
int look = prefs->look();
TQColor color = prefs->color();
int darkFactor = prefs->darkFactor();
TQColor backgroundColor = prefs->background();
bool modifyBackground = false;
- if(backgroundColor != KApplication::tqpalette().active().background()){
+ if(backgroundColor != KApplication::palette().active().background()){
setPaletteBackgroundColor(backgroundColor);
modifyBackground = true;
}
@@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){
}
for(int i=0; i < 4; i++){
for(int j=0; j < ledWidth;j++){
- ledMatrix[j][i]->setShape((KLed::Shape)tqshape);
+ ledMatrix[j][i]->setShape((KLed::Shape)shape);
ledMatrix[j][i]->setColor(color);
ledMatrix[j][i]->setLook((KLed::Look)look);
ledMatrix[j][i]->setDarkFactor(darkFactor);
@@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() {
menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
KLocale *loc = KGlobal::locale();
- TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
KPopupMenu *copyMenu = new KPopupMenu( menu );
copyMenu->insertItem(loc->formatDateTime(dt), 201);
@@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() {
proc << locate("exe", "tdesu");
proc << "--nonewdcop";
proc << TQString("%1 clock --lang %2")
- .tqarg(locate("exe", "kcmshell"))
- .tqarg(KGlobal::locale()->language());
+ .arg(locate("exe", "kcmshell"))
+ .arg(KGlobal::locale()->language());
proc.start(KProcess::DontCare);
break;
case 104:
@@ -348,7 +348,7 @@ void KBinaryClock::openContextMenu() {
void KBinaryClock::slotCopyMenuActivated( int id ) {
TQPopupMenu *m = (TQPopupMenu *) sender();
TQString s = m->text(id);
- TQApplication::tqclipboard()->setText(s);
+ TQApplication::clipboard()->setText(s);
}
void KBinaryClock::toggleCalendar()
@@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar()
if (_calendar || _disableCalendar){
return;
}
- _calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date());
+ _calendar = new DatePicker(this, TQDateTime::currentDateTime().date());
connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() ));
// some extra spacing is included if aligned on a desktop edge
TQPoint c = mapToGlobal(TQPoint(0,0));
- int w = _calendar->tqsizeHint().width() + 28;
+ int w = _calendar->sizeHint().width() + 28;
// Added 28 px. to size poperly as said in API
- int h = _calendar->tqsizeHint().height();
+ int h = _calendar->sizeHint().height();
switch (position()) {
case KPanelApplet::pLeft: c.setX(c.x()+width()+2); break;
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
{
- tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false));
+ tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
}
#include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
index 84f35c3..b5a5fb3 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.kcfg
+++ b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
@@ -35,7 +35,7 @@
</entry>
<entry name="Background" type="Color">
<label>Background color</label>
- <default code="true">KApplication::tqpalette().active().background()</default>
+ <default code="true">KApplication::palette().active().background()</default>
</entry>
<entry name="Show_Seconds" type="Bool">
<label>Whether to show seconds</label>
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 321f913..59c5f6f 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -110,7 +110,7 @@
<property name="text">
<string>Dark</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -252,7 +252,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="4" rowspan="3" colspan="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -287,7 +287,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -332,7 +332,7 @@
<property name="name">
<cstring>kLed1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -346,7 +346,7 @@
<property name="name">
<cstring>kLed2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -357,7 +357,7 @@
<property name="name">
<cstring>kLed4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -368,7 +368,7 @@
<property name="name">
<cstring>kLed3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -382,7 +382,7 @@
<property name="name">
<cstring>kLed6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -396,7 +396,7 @@
<property name="name">
<cstring>kLed5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -434,7 +434,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>84</height>
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 <tqfile.h>
-#include <tqtextstream.h>
-#include <tqlayout.h>
+#include <textstream.h>
+#include <layout.h>
#include <tqimage.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqregexp.h>
#include <tqbitmap.h>
#include <tqpainter.h>
@@ -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 <tqgroupbox.h>
#include <tqlineedit.h>
#include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqvgroupbox.h>
#include <tqcheckbox.h>
@@ -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 <kaboutdata.h>
#include <kaboutapplication.h>
-#include <tqpalette.h>
+#include <palette.h>
// used everywhere :)
#include <tqstring.h>
@@ -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 <tqcheckbox.h>
#include <tqlistbox.h>
#include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <kapplication.h>
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 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -199,13 +199,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -227,13 +227,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -255,13 +255,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -283,13 +283,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -311,13 +311,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -339,7 +339,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
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 <tqobjectlist.h>
#include <tqpixmap.h>
#include <tqstringlist.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqtimer.h>
#include <tqtooltip.h>
@@ -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 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -89,7 +89,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
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 <tqfont.h>
#include <tqfile.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqtimer.h>
#include <tqwidgetstack.h>
@@ -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 @@
<height>508</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>600</width>
<height>380</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -135,7 +135,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -173,7 +173,7 @@
<property name="name">
<cstring>groupBox1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>400</height>
@@ -188,7 +188,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -400,7 +400,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -424,7 +424,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
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 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -104,7 +104,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -145,7 +145,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
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 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>300</width>
<height>20</height>
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 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
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<TQString, MetricEntry>::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 <tqclipboard.h>
+#include <clipboard.h>
#include <tqtimer.h>
#include <tqwhatsthis.h>
@@ -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;f<fCount;f++) {
- config->writeEntry(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;f<num;f++) {
- str = TQString(prefix+"FieldVisible%1").tqarg(f);
+ str = TQString(prefix+"FieldVisible%1").arg(f);
if (config->hasKey(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<TreeMapItem> 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 <textNo> = -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<TQRect>* _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 <tqlabel.h>
#include <tqvbox.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
@@ -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 <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <tqfont.h>
#include <tqdatetime.h>
#include <tqpixmap.h>
#include <tqimage.h>
#include <tqprogressdialog.h>
-#include <tqtextcodec.h>
-#include <tqstylesheet.h>
+#include <textcodec.h>
+#include <stylesheet.h>
#include <kaction.h>
#include <kglobal.h>
@@ -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 << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl;
- stream << i18n("<i>Number of images</i>: %1").tqarg(numOfImages) << "<br/>" << endl;
- stream << i18n("<i>Created on</i>: %1").tqarg(today) << "</p>" << endl;
+ stream << i18n("<i>Number of images</i>: %1").arg(numOfImages) << "<br/>" << endl;
+ stream << i18n("<i>Created on</i>: %1").arg(today) << "</p>" << endl;
stream << "<hr/>" << endl;
@@ -205,10 +205,10 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
const TQString imgPath("thumbs/" + imgName + extension(imageFormat));
stream << "<img src=\"" << imgPath << "\" width=\"" << m_imgWidth << "\" ";
stream << "height=\"" << m_imgHeight << "\" alt=\"" << imgPath << "\"/>";
- 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 << "</a>" << 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<KParts::Part *>(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 <tqlayout.h>
+#include <layout.h>
#include <tqfile.h>
#include <kglobal.h>
#include <klocale.h>
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 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
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<KDirMenu> tqchildren;
+ TQPtrList<KDirMenu> 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 <kurllabel.h>
#include <tqcursor.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqtimer.h>
#include <tqtooltip.h>
@@ -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 <tqpainter.h>
#include <tqpixmap.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqregexp.h>
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<KLineEdit*>(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<BookmarkListItem *>( 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 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -88,7 +88,7 @@
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -105,7 +105,7 @@
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
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 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -88,7 +88,7 @@
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -105,7 +105,7 @@
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
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 <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtabwidget.h>
#include <tqlabel.h>
#include <tqlineedit.h>
@@ -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("<ul style=\"height: %1px\"><a class=\"preview\"").tqarg(pix.height() + 15);
+ innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15);
if(media){
innerHTML += " href=\"preview:///\"";
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index aa09cd3..bbfb9e2 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -107,7 +107,7 @@ bool HTTPPlugin::handleRequest(const KURL &url)
KURL url("http://www.google.com/search");
url.addQueryItem("q", keyword);
- DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url.url());
}
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index f7bc152..1aaf9e8 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -81,7 +81,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){
- DOM::NodeList tqchildren = node.childNodes();
+ DOM::NodeList children = node.childNodes();
DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString expanded = node.getAttribute("expanded");
@@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
}
}
else{
- style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
+ style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
}
}
}
@@ -117,7 +117,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
if(!node.isNull()){
- DOM::NodeList tqchildren = node.childNodes();
+ DOM::NodeList children = node.childNodes();
DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString expanded = node.getAttribute("expanded");
@@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
}
}
else{
- style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
+ style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
}
}
}
@@ -176,7 +176,7 @@ void MetabarFunctions::animate()
}
int change = currentHeight < height ? changeValue : -changeValue;
- style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY);
+ style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY);
doc.updateRendering();
}
}
@@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
int MetabarFunctions::getHeight(DOM::HTMLElement &element)
{
int height = 0;
- DOM::NodeList tqchildren = element.childNodes();
- for(uint i = 0; i < tqchildren.length(); i++){
- DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i));
+ DOM::NodeList children = element.childNodes();
+ for(uint i = 0; i < children.length(); i++){
+ DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i));
DOM::CSSStyleDeclaration style = node.style();
DOM::DOMString css_height = style.getPropertyValue("height");
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 0439c98..a8c2b69 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -27,10 +27,10 @@
#include "httpplugin.h"
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqvaluelist.h>
#include <tqurl.h>
#include <tqbuffer.h>
@@ -94,7 +94,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
html->setCaretVisible(false);
html->setDNDEnabled(false);
html->setJavaEnabled(false);
- html->view()->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
html->view()->hide();
connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &)));
@@ -114,11 +114,11 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
plugins.insert("http", httpPlugin);
plugins.insert("https", httpPlugin);
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
- tqlayout->addWidget(html->view());
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ layout->addWidget(html->view());
popup = new KPopupMenu(0);
- KAction *configAction = new KAction(i18n("Configure %1...").tqarg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+ KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
configAction->plug(popup);
KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
@@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check)
TQString MetabarWidget::getCurrentURL()
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("currentURL()");
if (reply.isValid()) {
@@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL()
void MetabarWidget::openURL(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url);
}
void MetabarWidget::openTab(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("newTab", url);
}
void MetabarWidget::callAction(const TQString &action)
{
- DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->name()).append("/action/").append(action)).utf8());
+ DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8());
if(ref.call("enabled()")){
ref.call("activate()");
}
@@ -289,7 +289,7 @@ void MetabarWidget::loadCompleted()
if(node.hasAttribute("image")){
TQString icon = node.getAttribute("image").string();
TQString url = getIconPath(icon);
- TQString style = TQString("background-image: url(%1);").tqarg(url);
+ TQString style = TQString("background-image: url(%1);").arg(url);
node.setAttribute("style", style);
}
@@ -308,7 +308,7 @@ void MetabarWidget::loadCompleted()
}
config->setGroup("General");
- TQString file = locate("data", TQString("metabar/themes/%1/default.css").tqarg(config->readEntry("Theme", "default")));
+ TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default")));
if(file.isNull()){
file = locate("data", TQString("metabar/themes/default/default.css"));
}
@@ -393,7 +393,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
skip = true; //needed to prevent some weired reload
DOM::DOMString innerHTML;
- innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").tqarg(image.width(), image.height());
+ innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height());
innerHTML += "<object class=\"preview\" type=\"";
innerHTML += item->mimetype();
innerHTML += "\" data=\"";
@@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
}
if(element.id().string().startsWith("hidden")){
- TQString style = TQString("background-image: url(%1);").tqarg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
+ TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
element.setInnerText( showMore ? i18n("More") : i18n("Less") );
element.setAttribute("style", style);
}
@@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
buffer.open(IO_WriteOnly);
icon.save(&buffer, "PNG");
- return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+ return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
}
void MetabarWidget::slotShowSharingDialog()
@@ -584,7 +584,7 @@ void MetabarWidget::setTheme()
loadComplete = false;
config->setGroup("General");
- TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").tqarg(config->readEntry("Theme", "default")));
+ TQString file = locate("data", TQString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default")));
html->openURL(KURL(file));
}
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 333aab5..8daf5ba 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
TQBuffer buffer(data);
buffer.open(IO_WriteOnly);
pix.save(&buffer, "PNG");
- TQString icondata = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+ TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
icon.setSrc(icondata);
}
@@ -81,7 +81,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
name.setInnerText(m_items.getFirst()->name());
}
else{
- name.setInnerText(i18n("%1 Elements").tqarg(m_items.count()));
+ name.setInnerText(i18n("%1 Elements").arg(m_items.count()));
}
}
@@ -105,7 +105,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
}
}
- type.setInnerText(i18n("%1 Folders, %2 Files").tqarg(dirs).tqarg(files));
+ type.setInnerText(i18n("%1 Folders, %2 Files").arg(dirs).arg(files));
}
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 99e8fb4..d74e39f 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -22,7 +22,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqsizepolicy.h>
#include <dcopref.h>
#include <kiconloader.h>
@@ -45,7 +45,7 @@ namespace KSB_News {
topLayout->addStretch();
KPushButton *btn = new KPushButton(i18n("&Configure"), this);
- btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+ btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked()));
topLayout->addWidget(btn, 0, TQt::AlignHCenter);
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index 56a7c52..a5c1261 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -54,7 +54,7 @@ namespace KSB_News {
int textWidth = fm.width(text);
int widgetSpace = visibleWidth();
if ((textWidth > widgetSpace) || (contentsX() > 0))
- tip(tqitemRect(item), text);
+ tip(itemRect(item), text);
}
}
}
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 6bc6d1a..924dcf0 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -26,7 +26,7 @@
*/
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqscrollview.h>
#include <tqptrdict.h>
#include <tqsizepolicy.h>
@@ -53,7 +53,7 @@ namespace KSB_News {
NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name,
TQPixmap appIcon) : TQWidget(parent, name) {
currentPage = 0;
- tqlayout = new TQVBoxLayout(this);
+ layout = new TQVBoxLayout(this);
pagesheader.setAutoDelete(TRUE);
pages.setAutoDelete(TRUE);
@@ -115,7 +115,7 @@ namespace KSB_News {
button->setText(KStringHandler::rPixelSqueeze(nsp->title(),
button->fontMetrics(),
button->width() - 4 ));
- button->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+ button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
TQSizePolicy::Preferred));
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked()));
TQToolTip::add(button, nsp->title());
@@ -132,8 +132,8 @@ namespace KSB_News {
pagesheader.insert(nsp, button);
pages.insert(nsp, sv);
- tqlayout->addWidget(button);
- tqlayout->addWidget(sv);
+ layout->addWidget(button);
+ layout->addWidget(sv);
button->show();
if (pages.count() == 1) {
currentPage = sv;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 08f0f22..e6ab6a7 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -74,7 +74,7 @@ namespace KSB_News {
private:
TQPtrDict<TQWidget> pages;
TQPtrDict<TQWidget> pagesheader;
- TQVBoxLayout *tqlayout;
+ TQVBoxLayout *layout;
TQWidget *currentPage;
KPopupMenu *popup, *helpmenu;
KAboutData *m_aboutdata;
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index d376d73..a9efc26 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda
#define UA_PTOS(x) (*it)->property(x).toString()
-#define TQFL1(x) TQString::tqfromLatin1(x)
+#define TQFL1(x) TQString::fromLatin1(x)
UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
@@ -135,21 +135,21 @@ void UAChangerPlugin::parseDescFiles()
continue; // Ignore dups!
m_lstIdentity << tmp;
- tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-SYSNAME")).tqarg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
+ tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
if ( tmp.stripWhiteSpace().isEmpty() )
{
if(tag == "NN" || tag == "IE" || tag == "MOZ")
- tmp = i18n("Version %1").tqarg(UA_PTOS("X-KDE-UA-VERSION"));
+ tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION"));
else
- tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION"));
+ tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION"));
}
else
{
if(tag == "NN" || tag == "IE" || tag == "MOZ")
- tmp = i18n("Version %1 on %2").tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
+ tmp = i18n("Version %1 on %2").arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
else
- tmp = i18n("%1 %2 on %3").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
+ tmp = i18n("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
}
m_lstAlias << tmp;
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index fe61ae3..f669308 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -184,7 +184,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
i18n("<qt>The selected URL cannot be verified because it contains "
"a password. Sending this URL to <b>%1</b> would put the security "
"of <b>%2</b> at risk.</qt>")
- .tqarg(validatorUrl.host()).tqarg(partUrl.host()));
+ .arg(validatorUrl.host()).arg(partUrl.host()));
return;
}
// Set entered URL as a parameter
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index 864de55..069426b 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqvbox.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <kconfig.h>
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index b72ca42..d172dc1 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -35,7 +35,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kactivelabel.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqiodevice.h>
#include <klistview.h>
#include <kio/job.h>
@@ -88,7 +88,7 @@ void ArchiveDialog::archive()
} else {
const TQString title = i18n( "Unable to Open Web-Archive" );
- const TQString text = i18n( "Unable to open \n %1 \n for writing." ).tqarg(m_tarBall->fileName());
+ const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
KMessageBox::sorry( 0L, text, title );
}
}
@@ -207,7 +207,7 @@ static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName)
}
catch (...)
{
- // No tqchildren, stop recursion here
+ // No children, stop recursion here
child = DOM::Node();
}
@@ -346,7 +346,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
}
catch (...)
{
- // No tqchildren, stop recursion here
+ // No children, stop recursion here
child = DOM::Node();
}
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index 571b39d..743c591 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 85d43ee..c76f56c 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -94,7 +94,7 @@ void PluginWebArchiver::slotSaveToArchive()
if (!(url.isValid())) {
const TQString title = i18n( "Invalid URL" );
- const TQString text = i18n( "The URL\n%1\nis not valid." ).tqarg(url.prettyURL());
+ const TQString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL());
KMessageBox::sorry(part->widget(), text, title );
return;
}
@@ -102,7 +102,7 @@ void PluginWebArchiver::slotSaveToArchive()
const TQFile file(url.path());
if (file.exists()) {
const TQString title = i18n( "File Exists" );
- const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).tqarg(url.prettyURL());
+ const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL());
if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) {
return;
}
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 88fe29f..1cc7ca1 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -91,14 +91,14 @@ void KSig::setupLayout()
sigEdit->setEnabled(false);
sigEdit->setCheckSpellingEnabled(true);
- statusBar()->insertItem(i18n(" Line: %1 ").tqarg(0), LineNumber, 0, true);
- statusBar()->insertItem(i18n(" Col: %1 ").tqarg(0), ColumnNumber, 0, true);
+ statusBar()->insertItem(i18n(" Line: %1 ").arg(0), LineNumber, 0, true);
+ statusBar()->insertItem(i18n(" Col: %1 ").arg(0), ColumnNumber, 0, true);
statusBar()->show();
updateListLock = false;
connect(sigEdit, TQT_SIGNAL(textChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateList()));
connect(sigList, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateEdit()));
- connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), TQT_TQOBJECT(this), TQT_SLOT(updatetqStatus(int,int)));
+ connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), TQT_TQOBJECT(this), TQT_SLOT(updateStatus(int,int)));
}
void KSig::setupSearchLine()
@@ -259,10 +259,10 @@ void KSig::updateEdit()
updateListLock = false;
}
-void KSig::updatetqStatus(int line, int column)
+void KSig::updateStatus(int line, int column)
{
- statusBar()->changeItem(i18n(" Line: %1 ").tqarg(line + 1), LineNumber);
- statusBar()->changeItem(i18n(" Col: %1 ").tqarg(column + 1), ColumnNumber);
+ statusBar()->changeItem(i18n(" Line: %1 ").arg(line + 1), LineNumber);
+ statusBar()->changeItem(i18n(" Col: %1 ").arg(column + 1), ColumnNumber);
}
void KSig::quit()
diff --git a/ksig/ksig.h b/ksig/ksig.h
index 3ed892d..ef0f68c 100644
--- a/ksig/ksig.h
+++ b/ksig/ksig.h
@@ -60,7 +60,7 @@ private slots:
void updateList();
void updateEdit();
- void updatetqStatus(int line, int column);
+ void updateStatus(int line, int column);
private:
TQString header;
diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp
index 7f6d12f..0442c2e 100644
--- a/ksig/siglistviewitem.cpp
+++ b/ksig/siglistviewitem.cpp
@@ -56,14 +56,14 @@ void SigListViewItem::refreshText()
void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s)
{
- TQDomNodeList tqchildren = n.childNodes();
+ TQDomNodeList children = n.childNodes();
- for(uint i = 0; i < tqchildren.count(); i++) {
- if(tqchildren.item(i).isText())
- s.append(tqchildren.item(i).toText().data());
+ for(uint i = 0; i < children.count(); i++) {
+ if(children.item(i).isText())
+ s.append(children.item(i).toText().data());
else {
- nodeToText(tqchildren.item(i), s);
- if(tqchildren.item(i).isElement() && tqchildren.item(i).toElement().tagName() == "p") {
+ nodeToText(children.item(i), s);
+ if(children.item(i).isElement() && children.item(i).toElement().tagName() == "p") {
s.append("\n");
}
}
@@ -90,12 +90,12 @@ SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQD
void SigListViewItem::render()
{
if(dirty) {
- TQDomNodeList tqchildren = element.childNodes();
+ TQDomNodeList children = element.childNodes();
while(!element.firstChild().isNull())
element.removeChild(element.firstChild());
- // create new tqchildren
+ // create new children
TQStringList lines = TQStringList::split("\n", elementText, true);
for(TQStringList::Iterator it = lines.begin(); it != lines.end(); it++) {
diff --git a/ksig/standardtextbase.ui b/ksig/standardtextbase.ui
index 136e3ca..b758544 100644
--- a/ksig/standardtextbase.ui
+++ b/ksig/standardtextbase.ui
@@ -34,7 +34,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout</cstring>
+ <cstring>layout</cstring>
</property>
<hbox>
<property name="name">
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp
index 862eb0c..72b6d9d 100644
--- a/noatun-plugins/alarm/kminutespinbox.cpp
+++ b/noatun-plugins/alarm/kminutespinbox.cpp
@@ -33,7 +33,7 @@ KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name)
TQString KMinuteSpinBox::mapValueToText(int v)
{
if(v < 10)
- return TQString("0%1").tqarg(v);
+ return TQString("0%1").arg(v);
else
return TQString::number(v);
}
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 6f5ff6c..f0602c3 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -25,7 +25,7 @@
#include <tqspinbox.h>
#include <tqtimer.h>
#include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqhbox.h>
#include <tqbuttongroup.h>
@@ -104,7 +104,7 @@ void Wakeup::slotCheckTime()
TQDate d;
t=TQTime::currentTime();
- d=TQDate::tqcurrentDate();
+ d=TQDate::currentDate();
if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return;
@@ -168,8 +168,8 @@ void Wakeup::slotVolumeChange()
WakeupPrefs::WakeupPrefs( TQObject *parent ) :
CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- TQGridLayout *grid = new TQGridLayout (tqlayout,8,4);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQGridLayout *grid = new TQGridLayout (layout,8,4);
monday=new TQCheckBox(i18n("Monday"),this);
tuesday=new TQCheckBox(i18n("Tuesday"),this);
@@ -209,7 +209,7 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
applyall = new TQPushButton (this,"applyall");
applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) );
- applyall->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+ applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
TQSizePolicy::Fixed,
applyall->sizePolicy().hasHeightForWidth()) );
grid->addWidget (applyall,1,3,TQt::AlignLeft);
@@ -248,9 +248,9 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame);
volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue");
- tqlayout->addWidget(modeGroup);
- tqlayout->addWidget(volFrame);
- tqlayout->addStretch();
+ layout->addWidget(modeGroup);
+ layout->addWidget(volFrame);
+ layout->addStretch();
TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint());
volLayout->addWidget(volEndLabel);
diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui
index 73c4249..3280242 100644
--- a/noatun-plugins/alsaplayer/AlsaPlayer.ui
+++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui
@@ -574,7 +574,7 @@
<property name="text">
<string>Speed:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@@ -1924,7 +1924,7 @@
<property name="text">
<string>Volume:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@@ -2205,7 +2205,7 @@
<property name="name">
<cstring>seeker</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>16</height>
@@ -2254,7 +2254,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -2394,7 +2394,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 0c98af7..664b1cb 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -25,7 +25,7 @@
#include <kconfig.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "configmodule.h"
@@ -41,11 +41,11 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
{
scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
- TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout * layout = new TQVBoxLayout(this);
- tqlayout->addWidget(scroll_);
+ layout->addWidget(scroll_);
- tqlayout->addStretch(100);
+ layout->addStretch(100);
reopen();
}
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index cc53b06..55a63fe 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -30,7 +30,7 @@
#include <tqtoolbutton.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqframe.h>
@@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer()
loadConfig();
- resize(tqsizeHint().width(), tqminimumSizeHint().height());
+ resize(sizeHint().width(), minimumSizeHint().height());
show();
}
@@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged()
void AlsaPlayer::slotVolumeChanged(int i)
{
TQString text("%1%");
- volumeLabel->setText(text.tqarg(i));
+ volumeLabel->setText(text.arg(i));
volumeSlider->setValue(i);
}
@@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed)
speed_ = newSpeed;
pauseButton->setEnabled(0 != speed_);
- speedLabel->setText(TQString("%1%").tqarg(speed_));
+ speedLabel->setText(TQString("%1%").arg(speed_));
Arts::PlayObject playobject(napp->player()->engine()->playObject());
Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject);
diff --git a/noatun-plugins/blurscope/scopedisplayer.cpp b/noatun-plugins/blurscope/scopedisplayer.cpp
index 6b10732..42b375a 100644
--- a/noatun-plugins/blurscope/scopedisplayer.cpp
+++ b/noatun-plugins/blurscope/scopedisplayer.cpp
@@ -130,7 +130,7 @@ SDLView::SDLView(int in) : mFd(in), outputBmp(0), fullscreen(false)
d++;
x++;
}
- tqrepaint();
+ repaint();
}
}
@@ -233,7 +233,7 @@ void SDLView::checkInput()
#define output2 ((unsigned char*)outputBmp.data)
-void SDLView::tqrepaint()
+void SDLView::repaint()
{
SDL_LockSurface(surface);
TEST();
diff --git a/noatun-plugins/blurscope/sdlscope.h b/noatun-plugins/blurscope/sdlscope.h
index 73e6d6d..45c734c 100644
--- a/noatun-plugins/blurscope/sdlscope.h
+++ b/noatun-plugins/blurscope/sdlscope.h
@@ -94,7 +94,7 @@ protected:
void checkInput();
void setupPalette(double dummy=0.0);
- void tqrepaint();
+ void repaint();
private:
int mFd;
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 0af4ddb..2514ff6 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -25,7 +25,7 @@
#include <kconfig.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "configmodule.h"
#include "configmodule.moc"
@@ -41,11 +41,11 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
{
scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
- TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout * layout = new TQVBoxLayout(this);
- tqlayout->addWidget(scroll_);
+ layout->addWidget(scroll_);
- tqlayout->addStretch(100);
+ layout->addStretch(100);
reopen();
}
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 8e67516..2efc197 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -30,7 +30,7 @@
#include <tqaccel.h>
#include <tqtoolbutton.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqframe.h>
#include <kurldrag.h>
@@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged()
void Charlatan::slotVolumeChanged(int i)
{
- TQString message(i18n("Volume: %1").tqarg(i));
+ TQString message(i18n("Volume: %1").arg(i));
showingVolumeTimer_->start(2000, true);
titleLabel_->setText(message);
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 046ba17..5322ae6 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -245,7 +245,7 @@ KFileItem* Dub::Linear_OneDir::first()
if (first)
set_file(&first_file, first);
else {
- if (first_file) { // tqinvalidate first
+ if (first_file) { // invalidate first
delete first_file;
first_file = 0;
}
@@ -451,7 +451,7 @@ void Dub::Recursive_Seq::prev_preorder()
}
else {
TQString subdir = *top->current_subdir;
- kdDebug(90010) << "we have tqchildren, pushing now " << subdir << endl;
+ kdDebug(90010) << "we have children, pushing now " << subdir << endl;
push_dir(subdir, false); // push directory w/ backward iterators
}
}
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 581bbf2..94b2c56 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -20,7 +20,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include "dubconfigmodule.h"
diff --git a/noatun-plugins/dub/dub/dubprefs.ui b/noatun-plugins/dub/dub/dubprefs.ui
index 437dfa9..aa2725d 100644
--- a/noatun-plugins/dub/dub/dubprefs.ui
+++ b/noatun-plugins/dub/dub/dubprefs.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index c6d7d18..71bd497 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -14,7 +14,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqhbox.h>
#include <tqlabel.h>
@@ -40,7 +40,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
: TQWidget(parent, "file selector widget")
{
- // widgets and tqlayout
+ // widgets and layout
TQVBoxLayout* lo = new TQVBoxLayout(this);
@@ -66,7 +66,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
hlow->setMaximumHeight(up->height());
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
- cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
KURLCompletion* cmpl = new KURLCompletion();
cmbPath->setCompletionObject( cmpl );
lo->addWidget(cmbPath);
@@ -80,7 +80,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
filterIcon = new TQLabel(filterBox);
filterIcon->setPixmap( BarIcon("filter") );
filter = new KHistoryCombo(filterBox, "filter");
- filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
lo->addWidget(filterBox);
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index d140285..0832039 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -12,7 +12,7 @@
#ifndef _FILESELECTORWIDGET_H_
#define _FILESELECTORWIDGET_H_
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqhbox.h>
#include <tqlabel.h>
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 5bdad61..9119aa5 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -180,56 +180,56 @@ void FFRS::changed()
#include <knuminput.h>
#include <kcolorbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqhbox.h>
#include <tqlabel.h>
FFRSPrefs::FFRSPrefs( TQObject *parent )
: CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
TQHBox *box = new TQHBox(this);
- tqlayout->addWidget(box);
+ layout->addWidget(box);
new TQLabel(i18n("Width:"), box);
mWidth = new KIntNumInput(width(), box);
mWidth->setMinValue(0);
box = new TQHBox(this);
- tqlayout->addWidget(box);
+ layout->addWidget(box);
new TQLabel(i18n("Height:"), box);
mHeight = new KIntNumInput(height(), box);
mHeight->setMinValue(0);
box = new TQHBox(this);
- tqlayout->addWidget(box);
+ layout->addWidget(box);
new TQLabel(i18n("Visible block size:"), box);
mFgblock = new KIntNumInput(fgblock(), box);
mFgblock->setMinValue(0);
box = new TQHBox(this);
- tqlayout->addWidget(box);
+ layout->addWidget(box);
new TQLabel(i18n("Transparent block size:"), box);
mBgblock = new KIntNumInput(bgblock(), box);
mBgblock->setMinValue(0);
box = new TQHBox(this);
- tqlayout->addWidget(box);
+ layout->addWidget(box);
new TQLabel(i18n("Update interval:"), box);
mRate = new KIntNumInput(rate(), box);
mRate->setMinValue(0);
box = new TQHBox(this);
- tqlayout->addWidget(box);
+ layout->addWidget(box);
new TQLabel(i18n("Foreground color:"), box);
mFgcolor = new KColorButton(fgcolor(), box);
box = new TQHBox(this);
- tqlayout->addWidget(box);
+ layout->addWidget(box);
new TQLabel(i18n("Background color:"), box);
mBgcolor = new KColorButton(bgcolor(), box);
- tqlayout->addStretch();
+ layout->addStretch();
}
void FFRSPrefs::save()
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 6f2183f..e84bec3 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -1,6 +1,6 @@
#include "cmodule.h"
#include "lyrics.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstringlist.h>
#include <tqlabel.h>
#include <kmessagebox.h>
@@ -47,23 +47,23 @@ const char *const DEFAULT_TQUERY =
LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) {
/* Thanks to the kde-usability guys for the help designing this dialog!
* help to simon edwards of KGuardGod, for a big help designing it */
- TQVBoxLayout *vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- TQHBoxLayout *htqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
- vtqlayout->setStretchFactor( htqlayout, 1 );
+ TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+ vlayout->setStretchFactor( hlayout, 1 );
// Search box
- TQVBoxLayout *boxtqlayout = new TQVBoxLayout( htqlayout, KDialog::spacingHint() );
- boxtqlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
+ TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
+ boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
providersBox = new KListBox( this, "providersBox" );
- boxtqlayout->addWidget(providersBox);
+ boxlayout->addWidget(providersBox);
boxButtons = new KButtonBox( this,Qt::Vertical );
boxButtons->addButton( i18n( "New Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) );
boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) );
boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) );
boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) );
- boxButtons->tqlayout();
- boxtqlayout->addWidget( boxButtons );
+ boxButtons->layout();
+ boxlayout->addWidget( boxButtons );
// Edit box
TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this );
@@ -76,8 +76,8 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
/* ATTENTION to translators:
* The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/
TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel");
- textLabel->tqsetAlignment(TQt::WordBreak);
- htqlayout->addWidget( propBox, 1 );
+ textLabel->setAlignment(TQt::WordBreak);
+ hlayout->addWidget( propBox, 1 );
/* Signal/slots */
nameEdit->setEnabled( false );
@@ -88,7 +88,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
- vtqlayout->addStretch();
+ vlayout->addStretch();
reopen();
save();
}
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index cbf6b63..30d7703 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -59,7 +59,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
- /* tqStatus bar */
+ /* Status bar */
statusBar()->insertItem(i18n("Ready"), 0, 1);
statusBar()->setItemAlignment(0, TQt::AlignLeft);
@@ -122,7 +122,7 @@ void Lyrics::loadedURL()
if ( !napp->player()->current() )
return;
statusBar()->changeItem(i18n("Loaded"), 0);
- setCaption(i18n("Lyrics: %1").tqarg(napp->player()->current().property("title")));
+ setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title")));
if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) {
kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl;
napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url());
@@ -196,7 +196,7 @@ void Lyrics::viewLyrics(int index)
pos = props_regexp.search(url);
}
TQString title(napp->player()->current().property("title"));
- setCaption(i18n("Loading Lyrics for %1").tqarg(title));
+ setCaption(i18n("Loading Lyrics for %1").arg(title));
// Check if we have a music playing
if (napp->player()->current()) {
htmlpart->begin();
@@ -207,7 +207,7 @@ void Lyrics::viewLyrics(int index)
"<TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></TD><TD>%1</TD></TR>"
"<TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></TD><TD>%2</TD></TR>"
"<TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></TD><TD>%3</TD></TR>"
- "</TABLE>").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( napp->player()->current().property( "album" ) ) );
+ "</TABLE>").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) );
KURL _url;
/* Check if we should use the store url or the query one */
if (napp->player()->current().property("Lyrics::URL").isEmpty()) {
@@ -218,7 +218,7 @@ void Lyrics::viewLyrics(int index)
attach_act->setChecked(false);
site_act->setEnabled(true);
actionCollection()->action("search_label")->setEnabled(true);
- htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
+ htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) );
} else {
_url = napp->player()->current().property("Lyrics::URL");
_url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
@@ -226,7 +226,7 @@ void Lyrics::viewLyrics(int index)
attach_act->setChecked(true);
site_act->setEnabled(false);
actionCollection()->action("search_label")->setEnabled(false);
- htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
+ htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).arg( _url.prettyURL() ).arg( _url.url() ) );
}
htmlpart->write( "</BODY></HTML>" );
htmlpart->end();
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 624eb48..db0fcb3 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -1,6 +1,6 @@
#include <klocale.h>
#include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdragobject.h>
#include <kfiledialog.h>
#include <kstdaction.h>
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index 76870ff..3144782 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -8,7 +8,7 @@
#include <kcmdlineargs.h>
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqmultilineedit.h>
diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h
index 3a447f1..3d16762 100644
--- a/noatun-plugins/nexscope/nex.h
+++ b/noatun-plugins/nexscope/nex.h
@@ -20,8 +20,8 @@ typedef uint8_t Byte;
#define COLOR(r,g,b) ((r<<16) | (g<<8) | (b))
#define COLORSTR(pixel) \
- TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \
- .tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16))
+ TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \
+ .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16))
#define STRCOLOR(pixel) \
Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \
@@ -79,7 +79,7 @@ Q_OBJECT
public:
Spacer(TQWidget *parent) : TQWidget(parent)
{
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
TQSizePolicy::MinimumExpanding));
}
};
diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp
index 538fa43..ff3d1c4 100644
--- a/noatun-plugins/nexscope/renderers.cpp
+++ b/noatun-plugins/nexscope/renderers.cpp
@@ -3,7 +3,7 @@
#include <time.h>
#include <math.h>
#include <iostream>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
structQt::HorizontalPair : public Renderer
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index a43f0a2..f4ac917 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -22,7 +22,7 @@
#include <tqfileinfo.h>
#include <tqtooltip.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <tqwhatsthis.h>
#include <tqtabwidget.h>
@@ -36,9 +36,9 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
mRegexpEditor=0;
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7);
- tqlayout->setAutoAdd(true);
- tqlayout->setSpacing(7);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7);
+ layout->setAutoAdd(true);
+ layout->setSpacing(7);
}
@@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox);
- TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's parent"));
+ TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent"));
connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox);
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index d53437e..34ebe72 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -487,7 +487,7 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent)
group->setOption(QueryGroup::Playable, true);
else if (e.tagName().lower() == "playable")
group->setOption(QueryGroup::Playable, true);
- else if (e.tagName().lower() == "tqchildrenvisible")
+ else if (e.tagName().lower() == "childrenvisible")
group->setOption(QueryGroup::ChildrenVisible, true);
else if (e.tagName().lower() == "autoopen")
group->setOption(QueryGroup::AutoOpen, true);
@@ -534,7 +534,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
if (group->option(QueryGroup::Playable))
childe.appendChild(doc.createElement("playable"));
if (group->option(QueryGroup::ChildrenVisible))
- childe.appendChild(doc.createElement("tqchildrenvisible"));
+ childe.appendChild(doc.createElement("childrenvisible"));
if (group->option(QueryGroup::AutoOpen))
childe.appendChild(doc.createElement("autoopen"));
}
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 7f3415c..0087b99 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -180,7 +180,7 @@ TreeItem::~TreeItem()
tree()->mPlayableItemCount--;
}
- // I have to remove my tqchildren, because they need their parent
+ // I have to remove my children, because they need their parent
// in tact for the below code
while (TreeItem *c = firstChild())
delete c;
@@ -750,36 +750,36 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree
TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf)
{
- // search childOf's immediate tqchildren
- TreeItem *tqchildren;
+ // search childOf's immediate children
+ TreeItem *children;
if (childOf)
- tqchildren = childOf->firstChild();
+ children = childOf->firstChild();
else
- tqchildren = firstChild();
+ children = firstChild();
TQString presentation = group->presentation(file);
- while (tqchildren)
+ while (children)
{
// merging would be done here
bool matches=false;
if (group->fuzzyness(QueryGroup::Case))
{
- matches = (tqchildren->text(0).lower() == presentation.lower());
+ matches = (children->text(0).lower() == presentation.lower());
}
else
{
- matches = (tqchildren->text(0) == presentation);
+ matches = (children->text(0) == presentation);
}
- matches = matches && !tqchildren->group()->option(QueryGroup::Playable);
+ matches = matches && !children->group()->option(QueryGroup::Playable);
if (matches)
{
- tqchildren->setFile(File());
- return tqchildren;
+ children->setFile(File());
+ return children;
}
- tqchildren = tqchildren->nextSibling();
+ children = children->nextSibling();
}
TreeItem *item;
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index c8e545e..4e5ca83 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -182,7 +182,7 @@ private:
TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf);
/**
- * remove the siblings and tqchildren of the treeitem
+ * remove the siblings and children of the treeitem
**/
void remove(TreeItem *, const File &file);
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 5f32b4d..073873c 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -74,7 +74,7 @@ View::View(Oblique *oblique)
{
TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget");
l->setBackgroundMode( TQt::PaletteButton );
- l->tqsetAlignment(
+ l->setAlignment(
(TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
TQt::AlignVCenter | TQt::ShowPrefix
);
@@ -138,7 +138,7 @@ View::~View()
int slice = tree->slice()->id();
TQString query = tree->fileOfQuery();
- TQString t = TQString("%1:%2").tqarg(slice).tqarg(query);
+ TQString t = TQString("%1:%2").arg(slice).arg(query);
tabids.append(t);
}
diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui
index c200860..68cdbe9 100644
--- a/noatun-plugins/pitchablespeed/speedtuner.ui
+++ b/noatun-plugins/pitchablespeed/speedtuner.ui
@@ -68,7 +68,7 @@
<property name="frame">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignHCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index e6c2930..78f41e6 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -23,7 +23,7 @@
#include <kglobalsettings.h>
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
@@ -37,7 +37,7 @@ SynaePrefs::SynaePrefs(TQObject *parent)
xRes = new TQSpinBox(320, 1024, 16, this);
yRes = new TQSpinBox(240, 768, 12, this);
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
@@ -47,9 +47,9 @@ SynaePrefs::SynaePrefs(TQObject *parent)
yResLayout->addWidget(new TQLabel(i18n("Display height:"), this));
yResLayout->addWidget(yRes);
- tqlayout->addLayout(xResLayout);
- tqlayout->addLayout(yResLayout);
- tqlayout->addStretch();
+ layout->addLayout(xResLayout);
+ layout->addLayout(yResLayout);
+ layout->addStretch();
changed=false;
connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges()));
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index b33b71d..9a0fb1b 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -81,7 +81,7 @@ void SynaeScope::scopeEvent(float *left, float *right, int size)
void SynaeScope::read(KProcess *, char *buf, int)
{
- TQString num = TQString::tqfromLatin1(buf);
+ TQString num = TQString::fromLatin1(buf);
num = num.left(num.find(TQRegExp("\\s")));
id = num.toInt();
embed->embed(id);
diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h
index 78cbc5f..b1d459d 100644
--- a/noatun-plugins/wavecapture/wavecapture.h
+++ b/noatun-plugins/wavecapture/wavecapture.h
@@ -56,8 +56,8 @@ private:
int pluginMenuItem;
bool _enabled;
- enum tqStatus { PAUSED, STOPPED, PLAYING };
- tqStatus _status;
+ enum Status { PAUSED, STOPPED, PLAYING };
+ Status _status;
Arts::Effect_WAVECAPTURE _capture;
int _count;
diff --git a/renamedlgplugins/audio/audio_plugin.cpp b/renamedlgplugins/audio/audio_plugin.cpp
index 5aeeb49..f71eb7b 100644
--- a/renamedlgplugins/audio/audio_plugin.cpp
+++ b/renamedlgplugins/audio/audio_plugin.cpp
@@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <tqstringlist.h>
#include <kio/global.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <sys/types.h>
@@ -73,11 +73,11 @@ bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, co
TQString sentence1;
TQString dest = KURL::fromPathOrURL(_dest).pathOrURL();
if (mtimeDest < mtimeSrc)
- sentence1 = i18n("An older file named '%1' already exists.\n").tqarg(dest);
+ sentence1 = i18n("An older file named '%1' already exists.\n").arg(dest);
else if (mtimeDest == mtimeSrc)
- sentence1 = i18n("A similar file named '%1' already exists.\n").tqarg(dest);
+ sentence1 = i18n("A similar file named '%1' already exists.\n").arg(dest);
else
- sentence1 = i18n("A newer file named '%1' already exists.\n").tqarg(dest);
+ sentence1 = i18n("A newer file named '%1' already exists.\n").arg(dest);
label_head->setText(sentence1);
label_src->setText(i18n("Source File"));
label_dst->setText(i18n("Existing File"));
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index e0af544..4f2936a 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -89,27 +89,27 @@ void AudioPreview::initView( const TQString& mimeType )
KSqueezedTextLabel *sl;
sl = new KSqueezedTextLabel(this);
- sl->setText(i18n("Artist: %1\n").tqarg(info.item("Artist").value().toString()));
+ sl->setText(i18n("Artist: %1\n").arg(info.item("Artist").value().toString()));
sl = new KSqueezedTextLabel(this);
- sl->setText(i18n("Title: %1\n").tqarg(info.item("Title").value().toString()));
+ sl->setText(i18n("Title: %1\n").arg(info.item("Title").value().toString()));
sl = new KSqueezedTextLabel(this);
- sl->setText(i18n("Comment: %1\n").tqarg(info.item("Comment").value().toString()));
+ sl->setText(i18n("Comment: %1\n").arg(info.item("Comment").value().toString()));
- desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").tqarg( info.item("Bitrate").value().toString() ).tqarg( info.item("Bitrate").suffix() ));
+ desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").arg( info.item("Bitrate").value().toString() ).arg( info.item("Bitrate").suffix() ));
}
- desc.append(i18n("Sample rate: %1 %2\n").tqarg( info.item("Sample Rate").value().toString() ).tqarg( info.item("Sample Rate").suffix() ));
+ desc.append(i18n("Sample rate: %1 %2\n").arg( info.item("Sample Rate").value().toString() ).arg( info.item("Sample Rate").suffix() ));
desc.append(i18n("Length: "));
/* Calculate length in mm:ss format */
int length = info.item("Length").value().toInt();
if (length/60 < 10)
desc.append("0");
- desc.append(TQString("%1:").tqarg(length/60, 0, 10));
+ desc.append(TQString("%1:").arg(length/60, 0, 10));
if (length%60 < 10)
desc.append("0");
- desc.append(TQString("%1\n").tqarg(length%60, 0, 10));
+ desc.append(TQString("%1\n").arg(length%60, 0, 10));
}
description = new TQLabel(this);
@@ -125,7 +125,7 @@ void AudioPreview::initView( const TQString& mimeType )
void AudioPreview::downloadFile( const TQString& url )
{
- if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , tqtopLevelWidget()) )
+ if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , topLevelWidget()) )
{
m_isTempFile = true;
initView( KMimeType::findByPath( m_localFile )->name() );
diff --git a/renamedlgplugins/images/image_plugin.cpp b/renamedlgplugins/images/image_plugin.cpp
index 65023f7..abab724 100644
--- a/renamedlgplugins/images/image_plugin.cpp
+++ b/renamedlgplugins/images/image_plugin.cpp
@@ -29,7 +29,7 @@
#include <tqwidget.h>
#include <tqstringlist.h>
#include <kio/global.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <sys/types.h>
diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp
index e347dc4..009eb8b 100644
--- a/renamedlgplugins/images/imagevisualizer.cpp
+++ b/renamedlgplugins/images/imagevisualizer.cpp
@@ -64,8 +64,8 @@ void ImageVisualizer::loadImage( const TQString& path )
pic->adjustSize();
TQString desc;
- desc.append(i18n("The color depth of an image", "Depth: %1\n").tqarg( img.depth() ));
- desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").tqarg(img.width()).tqarg(img.height() ));
+ desc.append(i18n("The color depth of an image", "Depth: %1\n").arg( img.depth() ));
+ desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").arg(img.width()).arg(img.height() ));
description->setText(desc );
description->adjustSize();
}
@@ -73,7 +73,7 @@ void ImageVisualizer::loadImage( const TQString& path )
void ImageVisualizer::downloadImage(const TQString& url)
{
TQString tmpFile;
- if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , tqtopLevelWidget()) )
+ if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , topLevelWidget()) )
{
loadImage( tmpFile );
KIO::NetAccess::removeTempFile( tmpFile );