diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-18 17:00:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-18 17:00:31 +0000 |
| commit | 395a904bff7b4d6ead445c342f7ac0c5fbf29121 (patch) | |
| tree | 9829cadb79d2cc7c29a940627fadb28b11e54150 | |
| parent | 399f47c376fdf4d19192732a701ea9578d11619d (diff) | |
| download | tdeaddons-395a904b.tar.gz tdeaddons-395a904b.zip | |
TQt4 port kdeaddons
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
403 files changed, 3214 insertions, 2994 deletions
diff --git a/atlantikdesigner/designer/Makefile.am b/atlantikdesigner/designer/Makefile.am index ca9fadc..de53920 100644 --- a/atlantikdesigner/designer/Makefile.am +++ b/atlantikdesigner/designer/Makefile.am @@ -1,5 +1,5 @@ bin_PROGRAMS = atlantikdesigner -INCLUDES = -I$(kde_includes)/atlantic $(all_includes) +INCLUDES = -I$(kde_includes)/atlantic $(all_includes) -I$(kde_includes)/kde AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) LDADD = -latlantikui -lkdegames $(LIB_KIO) diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index 56b561a..b7399b0 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -15,8 +15,8 @@ #include "boardinfo.h" -BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, TQWidget *parent, const char *_name, bool modal) - : KDialogBase(KDialogBase::Tabbed, i18n("Gameboard Information"), (editable? Ok|Apply|Cancel : Close), (editable? Ok : Close), parent, _name, modal) +BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, TQWidget *tqparent, const char *_name, bool modal) + : KDialogBase(KDialogBase::Tabbed, i18n("Gameboard Information"), (editable? Ok|Apply|Cancel : Close), (editable? Ok : Close), tqparent, _name, modal) { if (!info) return; @@ -110,26 +110,26 @@ void BoardInfoDlg::slotOk() /////////////////////////////////// -LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, const char *name) : TQWidget(parent, name) +LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) { list.setAutoDelete(true); this->editable = editable; - layout = new TQVBoxLayout(this, KDialogBase::spacingHint()); - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + tqlayout = new TQVBoxLayout(this, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); if (editable) { KPushButton *more = new KPushButton(i18n("&Add Name"), this); - hlayout->addWidget(more); + htqlayout->addWidget(more); connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); - hlayout->addStretch(); + htqlayout->addStretch(); KPushButton *less= new KPushButton(i18n("&Delete Name"), this); - hlayout->addWidget(less); + htqlayout->addWidget(less); connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); } - layout->addStretch(); + tqlayout->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); - layout->addWidget(edit); + tqlayout->addWidget(edit); list.append(edit); edit->show(); } diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h index a1f822e..9faff57 100644 --- a/atlantikdesigner/designer/boardinfo.h +++ b/atlantikdesigner/designer/boardinfo.h @@ -17,7 +17,7 @@ class TQVBoxLayout; struct BoardInfo { - BoardInfo() { bgColor = Qt::lightGray; } + BoardInfo() { bgColor = TQt::lightGray; } TQString name; TQStringList authors; TQStringList credits; @@ -27,12 +27,13 @@ struct BoardInfo TQColor bgColor; }; -class LotsaEdits : public QWidget +class LotsaEdits : public TQWidget { Q_OBJECT + TQ_OBJECT public: - LotsaEdits(bool, QStringList=TQStringList(), TQWidget *parent=0, const char *name=0); + LotsaEdits(bool, TQStringList=TQStringList(), TQWidget *tqparent=0, const char *name=0); public slots: TQStringList save(); @@ -44,15 +45,16 @@ class LotsaEdits : public QWidget private: bool editable; TQPtrList<TQWidget> list; - TQVBoxLayout *layout; + TQVBoxLayout *tqlayout; }; class BoardInfoDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - BoardInfoDlg(bool editable, BoardInfo *, TQWidget *parent=0, const char *_name=0, bool = true); + BoardInfoDlg(bool editable, BoardInfo *, TQWidget *tqparent=0, const char *_name=0, bool = true); protected slots: void slotOk(); diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 87b548d..7ce7b89 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -35,8 +35,8 @@ #include "editor.h" #include "designer.h" -AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) - : KMainWindow(parent, name) +AtlanticDesigner::AtlanticDesigner(TQWidget *tqparent, const char *name) + : KMainWindow(tqparent, name) { firstBoard = true; estates.setAutoDelete(true); @@ -46,27 +46,27 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) copiedEstate = 0; editor = 0; board = 0; - layout = 0; - - (void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - (void) KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - (void) KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection()); - (void) KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - (void) KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); - (void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, TQT_SLOT(info()), actionCollection(), "boardinfo"); - (void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, this, TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); - - (void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, this, TQT_SLOT(larger()), actionCollection(), "larger"); - (void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, this, TQT_SLOT(smaller()), actionCollection(), "smaller"); - (void) KStdAction::copy(this, TQT_SLOT(copy()), actionCollection()); - (void) KStdAction::paste(this, TQT_SLOT(paste()), actionCollection()); - (void) new KAction(i18n("&Up"), Key_Up, this, TQT_SLOT(up()), actionCollection(), "up"); - (void) new KAction(i18n("&Down"), Key_Down, this, TQT_SLOT(down()), actionCollection(), "down"); - (void) new KAction(i18n("&Left"), Key_Left, this, TQT_SLOT(left()), actionCollection(), "left"); - (void) new KAction(i18n("&Right"), Key_Right, this, TQT_SLOT(right()), actionCollection(), "right"); + tqlayout = 0; + + (void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + (void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); + (void) KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); + (void) KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); + (void) KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); + (void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo"); + (void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); + + (void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger"); + (void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller"); + (void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); + (void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); + (void) new KAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up"); + (void) new KAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down"); + (void) new KAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left"); + (void) new KAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right"); recentAct = KStdAction::openRecent(0, 0, actionCollection()); - connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), this, TQT_SLOT(openRecent(const KURL &))); + connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &))); recentAct->loadEntries(KGlobal::config(), "Designer recent files"); estateAct = new KListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); @@ -76,10 +76,10 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) KConfig *config = kapp->config(); config->setGroup("General"); - TQColor defaultColor = colorGroup().background(); + TQColor defaultColor = tqcolorGroup().background(); defaultBg = config->readColorEntry("alternateBackground", &defaultColor); config->setGroup("WM"); - defaultColor = colorGroup().dark(); + defaultColor = tqcolorGroup().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 layout; + delete tqlayout; board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board"); setCentralWidget(board); - layout = new TQVBoxLayout(board->centerWidget()); + tqlayout = new TQVBoxLayout(board->centerWidget()); editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor"); - connect(editor, TQT_SIGNAL(goChecked(int)), this, TQT_SLOT(goChanged(int))); - connect(editor, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(updateBackground())); + 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())); - layout->addWidget(editor); + tqlayout->addWidget(editor); editor->setReady(false); @@ -166,7 +166,7 @@ void AtlanticDesigner::openNew() { if (warnClose()) return; - filename = TQString::null; + filename = TQString(); max = 40; @@ -184,7 +184,7 @@ void AtlanticDesigner::openNew() groupsChanged(); updateBackground(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); doCaption(false); } @@ -198,8 +198,8 @@ ConfigEstate *AtlanticDesigner::newEstate(int i) estate->setChanged(false); estates.insert(i, estate); - connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); - connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); + connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(changeEstate(Estate *))); + connect(estate, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified())); board->addEstateView(estate); @@ -303,7 +303,7 @@ void AtlanticDesigner::openFile(const TQString &filename) } // this for outside-of-[]-settings - int eqSign = s.find("="); + int eqSign = s.tqfind("="); if (eqSign >= 0) { TQString key = s.left(eqSign); @@ -344,8 +344,8 @@ void AtlanticDesigner::openFile(const TQString &filename) continue; } - name = s.left(s.find("]")); - name = name.right(name.length() - name.find("[") - 1); + name = s.left(s.tqfind("]")); + name = name.right(name.length() - name.tqfind("[") - 1); if (name.isEmpty()) name = i18n("No Name"); @@ -380,7 +380,7 @@ void AtlanticDesigner::openFile(const TQString &filename) if (s.left(1) == "[" || s.left(1) == "<") break; - int eqSign = s.find("="); + int eqSign = s.tqfind("="); if (eqSign < 0) continue; @@ -486,8 +486,8 @@ void AtlanticDesigner::openFile(const TQString &filename) estate->setPassMoney(passMoney); estates.append(estate); - connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); - connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); + connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(changeEstate(Estate *))); + connect(estate, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified())); i++; } else if (parseMode == Parse_Cards) @@ -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.").arg(i)); + KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").tqarg(i)); if (this->filename.isNull()) close(); return; @@ -545,7 +545,7 @@ void AtlanticDesigner::openFile(const TQString &filename) updateBackground(); updateJumpMenu(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); doCaption(false); } @@ -553,7 +553,7 @@ void AtlanticDesigner::updateJumpMenu() { TQStringList estates; for (int i = 1; i <= max; i++) - estates.append(i18n("Jump to Estate %1").arg(TQString::number(i))); + estates.append(i18n("Jump to Estate %1").tqarg(TQString::number(i))); estateAct->setItems(estates); } @@ -574,7 +574,7 @@ void AtlanticDesigner::setPlayerAtBeginning() void AtlanticDesigner::saveAs() { TQString oldfilename = filename; - filename = TQString::null; + filename = TQString(); save(); @@ -658,7 +658,7 @@ void AtlanticDesigner::save() for (ConfigEstateGroupList::Iterator it = groups.begin(); it != groups.end(); ++it) { - if (writtenGroups.contains((*it).name()) > 0) + if (writtenGroups.tqcontains((*it).name()) > 0) continue; if ((*it).name() == "Default") @@ -679,7 +679,7 @@ void AtlanticDesigner::save() writtenGroups.append((*it).name()); - t << endl << TQString("[%1]").arg((*it).name()) << endl; + t << endl << TQString("[%1]").tqarg((*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]").arg(estate->name()) << endl; + t << endl << TQString("[%1]").tqarg(estate->name()) << endl; switch (estate->type()) { @@ -895,7 +895,7 @@ void AtlanticDesigner::larger() groupsChanged(); updateBackground(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -934,7 +934,7 @@ void AtlanticDesigner::smaller() updateJumpMenu(); groupsChanged(); updateBackground(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -957,8 +957,8 @@ void AtlanticDesigner::editGroups() groupEditor = new GroupEditor(&groups, this); groupEditor->show(); - connect(groupEditor, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); - connect(groupEditor, TQT_SIGNAL(update()), this, TQT_SLOT(groupsChanged())); + connect(groupEditor, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified())); + connect(groupEditor, TQT_SIGNAL(update()), TQT_TQOBJECT(this), TQT_SLOT(groupsChanged())); connect(groupEditor, TQT_SIGNAL(update()), editor, TQT_SLOT(groupsChanged())); } else @@ -1019,8 +1019,8 @@ void AtlanticDesigner::info() boardInfoDlg = new BoardInfoDlg(true, &boardInfo, this, "Board Information", false); boardInfoDlg->show(); - connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateBackground())); - connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(modified())); + connect(boardInfoDlg, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground())); + connect(boardInfoDlg, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(modified())); } else boardInfoDlg->raise(); diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index 69e7790..f8c9674 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -25,9 +25,10 @@ class AtlantikBoard; class AtlanticDesigner : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - AtlanticDesigner(TQWidget *parent = 0, const char *name = 0); + AtlanticDesigner(TQWidget *tqparent = 0, const char *name = 0); ~AtlanticDesigner(); protected: @@ -74,7 +75,7 @@ class AtlanticDesigner : public KMainWindow ConfigEstate *newEstate(int); TQGuardedPtr<EstateEdit> editor; - TQGuardedPtr<TQVBoxLayout> layout; + TQGuardedPtr<TQVBoxLayout> tqlayout; TQGuardedPtr<AtlantikBoard> board; TQGuardedPtr<GroupEditor> groupEditor; TQGuardedPtr<BoardInfoDlg> boardInfoDlg; diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index fd978d2..407e03d 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -144,8 +144,8 @@ void ConfigEstate::setPassMoney(const int passMoney) TQStringList types; -EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *parent, const char *name) - : TQWidget(parent, name) +EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { groups = newGroups; @@ -172,19 +172,19 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate())); - layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); nameEdit = new TQLineEdit(this, "Name Edit"); - layout->addWidget(nameEdit, 0, 0); + tqlayout->addWidget(nameEdit, 0, 0); connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged())); confDlg = 0; - layout->setRowStretch(2, 2); + tqlayout->setRowStretch(2, 2); - layout->addWidget(new KSeparator(this), 3, 0); + tqlayout->addWidget(new KSeparator(this), 3, 0); TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint()); - layout->addLayout(typeLayout, 4, 0); + tqlayout->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))); - layout->addWidget(goCheck, 5, 0); + tqlayout->addWidget(goCheck, 5, 0); TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint()); - layout->addLayout(passMoneyLayout, 6, 0); + tqlayout->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())); - layout->addWidget(confDlg, 1, 0); + tqlayout->addWidget(confDlg, 1, 0); confDlg->show(); oldType = typeCombo->currentItem(); @@ -378,8 +378,8 @@ bool EstateEdit::rightArrow()const ///////////////////////////////// -TaxDlg::TaxDlg(TQWidget *parent, char *name) - : EstateDlg(parent, name) +TaxDlg::TaxDlg(TQWidget *tqparent, char *name) + : EstateDlg(tqparent, name) { TQGridLayout *taxBox = new TQGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); taxBox->addWidget(new TQLabel(i18n("Fixed tax:"), this), 0, 0); @@ -406,14 +406,14 @@ void TaxDlg::update() ///////////////////////////////// -GenericDlg::GenericDlg(TQWidget *parent, char *name) - : EstateDlg(parent, name) +GenericDlg::GenericDlg(TQWidget *tqparent, char *name) + : EstateDlg(tqparent, name) { - TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint()); - layout->addWidget(new TQLabel(i18n("Background:"), this)); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialog::spacingHint()); + tqlayout->addWidget(new TQLabel(i18n("Background:"), this)); col = new KColorButton(this); - layout->addWidget(col); + tqlayout->addWidget(col); } void GenericDlg::save() @@ -429,40 +429,40 @@ void GenericDlg::update() ///////////////////////////////// -CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *parent, char *name) - : EstateDlg(parent, name) +CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *tqparent, char *name) + : EstateDlg(tqparent, name) { estates = newEstates; stacks = newCards; view = 0; - vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); + TQHBoxLayout *tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); KPushButton *addB = new KPushButton(i18n("&New Stack"), this); connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack())); - layout->addWidget(addB); - layout->addStretch(); + tqlayout->addWidget(addB); + tqlayout->addStretch(); - layout->addWidget(new TQLabel(i18n("Cards from"), this)); + tqlayout->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); - layout->addWidget(cards); + tqlayout->addWidget(cards); connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &))); - vlayout->addWidget(new KSeparator(this)); + vtqlayout->addWidget(new KSeparator(this)); } void CardsDlg::addStack() { bool ok; - TQString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), TQString::null, &ok, this); + TQString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), TQString(), &ok, this); if (ok) { for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) @@ -493,7 +493,7 @@ void CardsDlg::updateView(const TQString &curName) delete view; view = new CardView(estates, curStack, this); - vlayout->addWidget(view); + vtqlayout->addWidget(view); view->show(); } @@ -515,8 +515,8 @@ void CardsDlg::update() ///////////////////////////////// -ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *parent, char *name) - : TQWidget (parent, name) +ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *tqparent, char *name) + : TQWidget (tqparent, name) { this->id = id; this->card = card; @@ -530,7 +530,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa value = 0; - hlayout = new TQHBoxLayout(this, KDialog::spacingHint()); + htqlayout = 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); - hlayout->addWidget(typeCombo); + htqlayout->addWidget(typeCombo); connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int))); - hlayout->addStretch(); + htqlayout->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); - hlayout->addWidget(value); + htqlayout->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))); - hlayout->addWidget(estate); + htqlayout->addWidget(estate); estate->show(); } @@ -640,7 +640,7 @@ Skipped: ///////////////////////////////// -CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char *name) : TQWidget(parent, name) +CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *tqparent, char *name) : TQWidget(tqparent, name) { card = 0; @@ -649,36 +649,36 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char choosies.setAutoDelete(true); - layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); + tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); addButton = new KPushButton(i18n("&Add Card..."), this); connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - hlayout->addWidget(addButton); - hlayout->addStretch(); + htqlayout->addWidget(addButton); + htqlayout->addStretch(); renameButton = new KPushButton(i18n("&Rename..."), this); connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename())); - hlayout->addWidget(renameButton); - hlayout->addStretch(); + htqlayout->addWidget(renameButton); + htqlayout->addStretch(); delButton = new KPushButton(i18n("&Delete"), this); connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); - hlayout->addWidget(delButton); + htqlayout->addWidget(delButton); List = new KListBox(this); - layout->addWidget(List); + tqlayout->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); - hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); + htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); moreButton = new KPushButton(i18n("&More Properties"), this); connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); - hlayout->addWidget(moreButton); - hlayout->addStretch(); + htqlayout->addWidget(moreButton); + htqlayout->addStretch(); lessButton = new KPushButton(i18n("&Fewer Properties"), this); connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); - hlayout->addWidget(lessButton); + htqlayout->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); - layout->addWidget(newChooseWidget); + tqlayout->addWidget(newChooseWidget); newChooseWidget->show(); @@ -720,7 +720,7 @@ void CardView::less() void CardView::add() { bool ok = false; - TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), TQString::null, &ok, this); + TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), TQString(), &ok, this); if (ok) List->insertItem(name, 0); @@ -780,11 +780,11 @@ void CardView::selected(int i) ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this); choosies.append(newChooseWidget); - layout->addWidget(newChooseWidget); + tqlayout->addWidget(newChooseWidget); newChooseWidget->show(); - newChooseWidget->typeChanged(types.findIndex(*it)); + newChooseWidget->typeChanged(types.tqfindIndex(*it)); newChooseWidget->valueChanged(*vit); newChooseWidget->estateChanged(*vit); @@ -812,8 +812,8 @@ void CardView::updateButtonsEnabled() ///////////////////////////////// -StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *name) - : EstateDlg(parent, name) +StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *tqparent, char *name) + : EstateDlg(tqparent, name) { groups = newGroups; diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index ebc768d..4abc9ce 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -84,12 +84,13 @@ class CardStack : public TQValueList<Card> TQString m_name; }; -class EstateDlg : public QWidget +class EstateDlg : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EstateDlg(TQWidget *parent = 0, char *name = 0) : TQWidget(parent, name) { estate = 0; } + EstateDlg(TQWidget *tqparent = 0, char *name = 0) : TQWidget(tqparent, name) { estate = 0; } signals: void updateBackground(); @@ -106,12 +107,13 @@ class EstateDlg : public QWidget ConfigEstate *estate; }; -class EstateEdit : public QWidget +class EstateEdit : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, const char *name = 0); + EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *tqparent = 0, const char *name = 0); ConfigEstate *theEstate() { return estate; } bool upArrow()const; bool downArrow()const; @@ -145,7 +147,7 @@ class EstateEdit : public QWidget TQCheckBox *goCheck; TQSpinBox *passMoney; TQWidget *centerWidget; - TQGridLayout *layout; + TQGridLayout *tqlayout; EstateList *estates; TQValueList<CardStack> *cards; @@ -161,12 +163,13 @@ class EstateEdit : public QWidget bool locked; }; -class ChooseWidget : public QWidget +class ChooseWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ChooseWidget(EstateList *, int id, Card *, TQWidget *parent = 0, char *name = 0); + ChooseWidget(EstateList *, int id, Card *, TQWidget *tqparent = 0, char *name = 0); public slots: void typeChanged(int); @@ -181,19 +184,20 @@ class ChooseWidget : public QWidget bool number; bool prevNumber; bool init; - TQHBoxLayout *hlayout; + TQHBoxLayout *htqlayout; EstateList *estates; int id; }; -class CardView : public QWidget +class CardView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CardView(EstateList *, CardStack *, TQWidget *parent = 0, char *name = 0); + CardView(EstateList *, CardStack *, TQWidget *tqparent = 0, char *name = 0); private slots: void selected(int); @@ -214,7 +218,7 @@ class CardView : public QWidget EstateList *estates; - TQVBoxLayout *layout; + TQVBoxLayout *tqlayout; Card *card; @@ -225,9 +229,10 @@ class CardView : public QWidget class TaxDlg : public EstateDlg { Q_OBJECT + TQ_OBJECT public: - TaxDlg(TQWidget *parent = 0, char *name = 0); + TaxDlg(TQWidget *tqparent = 0, char *name = 0); protected: virtual void save(); @@ -241,9 +246,10 @@ class TaxDlg : public EstateDlg class GenericDlg : public EstateDlg { Q_OBJECT + TQ_OBJECT public: - GenericDlg(TQWidget *parent = 0, char *name = 0); + GenericDlg(TQWidget *tqparent = 0, char *name = 0); protected: virtual void save(); @@ -256,9 +262,10 @@ class GenericDlg : public EstateDlg class CardsDlg : public EstateDlg { Q_OBJECT + TQ_OBJECT public: - CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, char *name = 0); + CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *tqparent = 0, char *name = 0); protected: virtual void save(); @@ -274,15 +281,16 @@ class CardsDlg : public EstateDlg TQComboBox *cards; CardView *view; - TQVBoxLayout *vlayout; + TQVBoxLayout *vtqlayout; }; class StreetDlg : public EstateDlg { Q_OBJECT + TQ_OBJECT public: - StreetDlg(ConfigEstateGroupList *, TQWidget *parent = 0, char *name = 0); + StreetDlg(ConfigEstateGroupList *, TQWidget *tqparent = 0, char *name = 0); protected: virtual void save(); diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index 8f4d513..cd804e6 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -19,17 +19,17 @@ #include "group.h" -GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) - : KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, parent, "Group Editor", false, true), mylist(*newList) +GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *tqparent) + : KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, tqparent, "Group Editor", false, true), mylist(*newList) { setWFlags(WDestructiveClose); list = newList; TQFrame *page = plainPage(); - TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); groups = new KListBox(page); - hlayout->addWidget(groups); + htqlayout->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 *vlayout = new TQVBoxLayout(hlayout, spacingHint()); - colorGroupBox = new TQVGroupBox(i18n("&Colors"), page); - vlayout->addWidget(colorGroupBox); + TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, spacingHint()); + tqcolorGroupBox = new TQVGroupBox(i18n("&Colors"), page); + vtqlayout->addWidget(tqcolorGroupBox); - (void) new TQLabel(i18n("Foreground:"), colorGroupBox); - fgButton = new KColorButton(colorGroupBox, "Foreground Button"); + (void) new TQLabel(i18n("Foreground:"), tqcolorGroupBox); + fgButton = new KColorButton(tqcolorGroupBox, "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:"), colorGroupBox); - bgButton = new KColorButton(colorGroupBox, "Background Button"); + (void) new TQLabel(i18n("Background:"), tqcolorGroupBox); + bgButton = new KColorButton(tqcolorGroupBox, "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); - vlayout->addWidget(pricesGroupBox); + vtqlayout->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); - vlayout->addWidget(dynamicGroupBox); + vtqlayout->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 *buttonlayout = new TQHBoxLayout(vlayout, spacingHint()); + TQHBoxLayout *buttontqlayout = new TQHBoxLayout(vtqlayout, spacingHint()); KPushButton *addB = new KPushButton(i18n("&Add..."), page); - buttonlayout->addWidget(addB); + buttontqlayout->addWidget(addB); connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); removeB = new KPushButton(i18n("&Remove"), page); - buttonlayout->addWidget(removeB); + buttontqlayout->addWidget(removeB); connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); selectionChanged(); @@ -104,7 +104,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) void GroupEditor::add() { bool ok; - TQString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), TQString::null, &ok, this); + TQString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), TQString(), &ok, this); if (ok) { for (ConfigEstateGroupList::Iterator it = mylist.begin(); it != mylist.end(); ++it) @@ -233,7 +233,7 @@ void GroupEditor::slotOk() void GroupEditor::selectionChanged() { bool issel = groups->currentItem() >= 0; - colorGroupBox->setEnabled(issel); + tqcolorGroupBox->setEnabled(issel); pricesGroupBox->setEnabled(issel); dynamicGroupBox->setEnabled(issel); removeB->setEnabled(issel); diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index f76b2bc..97b0446 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -53,9 +53,10 @@ typedef TQValueList<ConfigEstateGroup> ConfigEstateGroupList; class GroupEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupEditor(ConfigEstateGroupList *, TQWidget *parent=0); + GroupEditor(ConfigEstateGroupList *, TQWidget *tqparent=0); signals: void changed(); @@ -85,7 +86,7 @@ class GroupEditor : public KDialogBase TQWidget *mathWidget; TQSpinBox *housePrice; TQSpinBox *globalPrice; - TQVGroupBox *colorGroupBox; + TQVGroupBox *tqcolorGroupBox; TQVGroupBox *pricesGroupBox; TQVGroupBox *dynamicGroupBox; KPushButton *removeB; diff --git a/kaddressbook-plugins/xxports/gmx/Makefile.am b/kaddressbook-plugins/xxports/gmx/Makefile.am index facdd37..977ed42 100644 --- a/kaddressbook-plugins/xxports/gmx/Makefile.am +++ b/kaddressbook-plugins/xxports/gmx/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) +INCLUDES = $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = libkaddrbk_gmx_xxport.la diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index 4a492f0..a726458 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. Description: @@ -48,8 +48,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libkaddrbk_gmx_xxport, GMXXXPort, "libka #define GMX_FILESELECTION_STRING "*.gmxa|" + i18n( "GMX addressbook file (*.gmxa)" ) -GMXXXPort::GMXXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +GMXXXPort::GMXXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import GMX Address Book..." ) ); createExportAction( i18n( "Export GMX Address Book..." ) ); @@ -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.arg( fileName ) ); + KMessageBox::error( tqparentWidget(), msg.tqarg( 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.").arg(fileName) ); + KMessageBox::error( tqparentWidget(), i18n("%1 is not a GMX address book file.").tqarg(fileName) ); return addrList; } @@ -99,7 +99,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const typedef TQMap<TQString, KABC::Addressee *> AddressMap; AddressMap addrMap; - // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,Change_date,Status,Address_link_id,Categories" + // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,Change_date,tqStatus,Address_link_id,Categories" line = gmxStream.readLine(); while (!line.startsWith("####") && !gmxStream.atEnd()) { while (1) { @@ -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->setStatus(strList[8]); Status + // addr->settqStatus(strList[8]); tqStatus // 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,Status + // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,tqStatus 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]=Status (should always be "1") + // strList[20]=tqStatus (should always be "1") addr->insertAddress(adr); } else { kdWarning() << "unresolved line: " << line << endl; @@ -214,22 +214,22 @@ 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.arg( url.url() ) - .arg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() ) + .tqarg( strerror( tmpFile.status() ) ) ); return false; } doExport( tmpFile.file(), list ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); } else { TQString filename = url.path(); TQFile file( filename ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.arg( filename ) ); + KMessageBox::error( tqparentWidget(), txt.tqarg( 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::fromLatin1("1000-01-01 00:00:00"); + return TQString::tqfromLatin1("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; @@ -264,7 +264,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) t << "AB_ADDRESSES:\n"; t << "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments," - "Change_date,Status,Address_link_id,Categories\n"; + "Change_date,tqStatus,Address_link_id,Categories\n"; int no = 0; const TQChar DELIM('#'); @@ -279,16 +279,16 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) << addr->familyName() << DELIM // Lastname << addr->title() << DELIM // Title << dateString(addr->birthday()) << DELIM // Birthday - << addr->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments + << addr->note() /*.tqreplace('\n',"\r\n")*/ << DELIM // Comments << dateString(addr->revision()) << DELIM // Change_date - << "1##0\n"; // Status, Address_link_id, Categories + << "1##0\n"; // tqStatus, Address_link_id, Categories } t << "####\n"; t << "AB_ADDRESS_RECORDS:\n"; t << "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,Status\n"; + "Company,Department,Change_date,Preferred,tqStatus\n"; no = 1; while ( (addr = addrMap[no]) != NULL ) { @@ -324,16 +324,16 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) << cell.number() << DELIM // Mobile << ((cell.type()&KABC::PhoneNumber::Pref)?-1:0) << DELIM // Mobile_type << email << DELIM // Email - << ((record_id==0)?addr->url().url():TQString::null) << DELIM // Homepage - << ((record_id==0)?addr->role():TQString::null) << DELIM // Position + << ((record_id==0)?addr->url().url():TQString()) << DELIM // Homepage + << ((record_id==0)?addr->role():TQString()) << DELIM // Position << DELIM // Comments << record_id << DELIM // Record_type_id (0,1,2) - see above << DELIM // Record_type (name of this additional record entry) - << ((record_id==0)?addr->organization():TQString::null) << DELIM // Company - << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):TQString::null) << DELIM // Department + << ((record_id==0)?addr->organization():TQString()) << DELIM // Company + << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):TQString()) << DELIM // Department << dateString(addr->revision()) << DELIM // Change_date << 5 << DELIM // Preferred - << 1 << endl; // Status (should always be "1") + << 1 << endl; // tqStatus (should always be "1") } ++no; diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h index 607455c..dd4661b 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef GMX_XXPORT_H @@ -30,9 +30,10 @@ class GMXXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - GMXXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GMXXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "gmx"; } diff --git a/kaddressbook-plugins/xxports/kworldclock/Makefile.am b/kaddressbook-plugins/xxports/kworldclock/Makefile.am index ee28aa6..ab7ef9d 100644 --- a/kaddressbook-plugins/xxports/kworldclock/Makefile.am +++ b/kaddressbook-plugins/xxports/kworldclock/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) +INCLUDES = $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = libkaddrbk_geo_xxport.la diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp index 72256b8..ba75565 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kconfig.h> @@ -40,8 +40,8 @@ class FlagInfo K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libkaddrbk_geo_xxport, GeoXXPort, "libkaddrbk_geo_xxport" ) -GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createExportAction( i18n( "Export Geo Data..." ) ); } @@ -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" ).arg( i ) ); - info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).arg( i ) ); - info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).arg( i ) ); + 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 ) ); 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" ).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( 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( "Flags", startVal ); diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h index cdac56a..d31ce49 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef GEO_XXPORT_H @@ -29,9 +29,10 @@ class GeoXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GeoXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "geo"; } diff --git a/kate/cppsymbolviewer/cpp_parser.cpp b/kate/cppsymbolviewer/cpp_parser.cpp index b666983..c99d455 100644 --- a/kate/cppsymbolviewer/cpp_parser.cpp +++ b/kate/cppsymbolviewer/cpp_parser.cpp @@ -3,7 +3,7 @@ ------------------- begin : Apr 2 2003 author : 2003 Massimo Callegari - email : massimocallegari@yahoo.it + email : massitqmocallegari@yahoo.it ***************************************************************************/ /*************************************************************************** * * @@ -67,21 +67,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) cl = cl.stripWhiteSpace(); func_close = 0; if(cl.at(0) == '/' && cl.at(1) == '/') continue; - if(cl.find("/*") == 0 && (cl.find("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( - if(cl.find("/*") >= 0 && graph == 0) comment = 1; - if(cl.find("*/") >= 0 && graph == 0) comment = 0; - if(cl.find("#") >= 0 && graph == 0 ) macro = 1; + if(cl.tqfind("/*") == 0 && (cl.tqfind("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( + if(cl.tqfind("/*") >= 0 && graph == 0) comment = 1; + if(cl.tqfind("*/") >= 0 && graph == 0) comment = 0; + if(cl.tqfind("#") >= 0 && graph == 0 ) macro = 1; if (comment != 1) { /* *********************** MACRO PARSING *****************************/ if(macro == 1) { - //macro_pos = cl.find("#"); + //macro_pos = cl.tqfind("#"); for (j = 0; j < cl.length(); j++) { if(cl.at(j)=='/' && cl.at(j+1)=='/') { macro = 4; break; } - if( (uint)cl.find("define") == j && - !((uint)cl.find("defined") == j)) + if( (uint)cl.tqfind("define") == j && + !((uint)cl.tqfind("defined") == j)) { macro = 2; j += 6; // skip the word "define" @@ -99,7 +99,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) if(j == cl.length() && macro == 1) macro = 0; if(macro == 4) { - //stripped.replace(0x9, " "); + //stripped.tqreplace(0x9, " "); stripped = stripped.stripWhiteSpace(); if (macro_on == true) { @@ -129,7 +129,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) /* ******************************************************************** */ - if ((cl.find("class") >= 0 && graph == 0 && block == 0)) + if ((cl.tqfind("class") >= 0 && graph == 0 && block == 0)) { mclass = 1; for (j = 0; j < cl.length(); j++) @@ -158,19 +158,19 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } if (mclass == 3) { - if (cl.find('{') >= 0) + if (cl.tqfind('{') >= 0) { - cl = cl.right(cl.find('{')); + cl = cl.right(cl.tqfind('{')); mclass = 4; } } - if(cl.find("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) + if(cl.tqfind("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) { structure = false; block = 1; } - if((cl.find("typedef") >= 0 || cl.find("struct") >= 0) && + if((cl.tqfind("typedef") >= 0 || cl.tqfind("struct") >= 0) && graph == 0 && block == 0) { structure = true; block = 2; stripped = ""; } - //if(cl.find(";") >= 0 && graph == 0) + //if(cl.tqfind(";") >= 0 && graph == 0) // block = 0; if(block > 0 && mclass != 1 ) @@ -216,21 +216,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) break; } - if(cl.at(j)=='{' && structure == false && cl.find(";") < 0 || - cl.at(j)=='{' && structure == false && cl.find('}') > (int)j) + if(cl.at(j)=='{' && structure == false && cl.tqfind(";") < 0 || + cl.at(j)=='{' && structure == false && cl.tqfind('}') > (int)j) { - stripped.replace(0x9, " "); + stripped.tqreplace(0x9, " "); if(func_on == true) { if (types_on == false) { - while (stripped.find('(') >= 0) - stripped = stripped.left(stripped.find('(')); - while (stripped.find("::") >= 0) - stripped = stripped.mid(stripped.find("::") + 2); + while (stripped.tqfind('(') >= 0) + stripped = stripped.left(stripped.tqfind('(')); + while (stripped.tqfind("::") >= 0) + stripped = stripped.mid(stripped.tqfind("::") + 2); stripped = stripped.stripWhiteSpace(); - while (stripped.find(0x20) >= 0) - stripped = stripped.mid(stripped.find(0x20, 0) + 1); + while (stripped.tqfind(0x20) >= 0) + stripped = stripped.mid(stripped.tqfind(0x20, 0) + 1); } //kdDebug(13000)<<"Function -- Inserted: "<<stripped<<" at row: "<<tmpPos<<" mclass: "<<(uint)mclass<<endl; if (treeMode) @@ -290,9 +290,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if(cl.at(j) == ';') { - //stripped.replace(0x9, " "); + //stripped.tqreplace(0x9, " "); stripped.remove('{'); - stripped.replace('}', " "); + stripped.tqreplace('}', " "); if(struct_on == true) { if (treeMode) @@ -319,9 +319,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } // BLOCK > 0 if (mclass == 4 && block == 0 && func_close == 0) { - if (cl.find('}') >= 0) + if (cl.tqfind('}') >= 0) { - cl = cl.right(cl.find('}')); + cl = cl.right(cl.tqfind('}')); mclass = 0; } } diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 9165878..5bf0906 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -3,7 +3,7 @@ * ------------------- * begin : Apr 2 2003 * author : 2003 Massimo Callegari - * email : massimocallegari@yahoo.it + * email : massitqmocallegari@yahoo.it * * Changes: * Nov 09 2004 v.1.3 - For changelog please refer to KDE CVS @@ -133,7 +133,7 @@ void KatePluginSymbolViewerView::slotInsertSymbol() //connect(symbols, TQT_SIGNAL(resizeEvent(TQResizeEvent *)), this, TQT_SLOT(slotViewChanged(TQResizeEvent *))); m_Active = true; - //symbols->addColumn(i18n("Symbols"), symbols->parentWidget()->width()); + //symbols->addColumn(i18n("Symbols"), symbols->tqparentWidget()->width()); symbols->addColumn(i18n("Symbols")); symbols->addColumn(i18n("Position")); symbols->setColumnWidthMode(1, TQListView::Manual); @@ -192,7 +192,7 @@ void KatePluginSymbolViewerView::slotDocChanged() void KatePluginSymbolViewerView::slotViewChanged(TQResizeEvent *) { kdDebug(13000)<<"View changed !!!!"<<endl; - symbols->setColumnWidth(0, symbols->parentWidget()->width()); + symbols->setColumnWidth(0, symbols->tqparentWidget()->width()); } void KatePluginSymbolViewerView::slotShowContextMenu(TQListViewItem *, const TQPoint &p, int) @@ -241,8 +241,8 @@ void KatePluginSymbolViewerView::goToSymbol(TQListViewItem *it) kv->gotoLineNumber(it->text(1).toInt(NULL, 10)); } -KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ), +KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ), pConfig("katecppsymbolviewerpluginrc") { pConfig.setGroup("global"); @@ -307,8 +307,8 @@ void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p ) // BEGIN KatePluginSymbolViewerConfigPage KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage( - TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) - : Kate::PluginConfigPage( parentWidget ) + TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index e8ac0e0..d247852 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -3,7 +3,7 @@ ------------------- begin : Apr 2 2003 author : 2003 Massimo Callegari - email : massimocallegari@yahoo.it + email : massitqmocallegari@yahoo.it ***************************************************************************/ /*************************************************************************** @@ -46,6 +46,7 @@ class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: KatePluginSymbolViewerView (Kate::MainWindow *w); @@ -88,11 +89,12 @@ class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class KatePluginSymbolViewer; public: - KatePluginSymbolViewerConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); + KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~KatePluginSymbolViewerConfigPage (); /** @@ -123,9 +125,10 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - KatePluginSymbolViewer( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSymbolViewer( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSymbolViewer(); void addView (Kate::MainWindow *win); diff --git a/kate/cppsymbolviewer/tcl_parser.cpp b/kate/cppsymbolviewer/tcl_parser.cpp index c2eae61..fca2a5d 100644 --- a/kate/cppsymbolviewer/tcl_parser.cpp +++ b/kate/cppsymbolviewer/tcl_parser.cpp @@ -3,7 +3,7 @@ ------------------- begin : Apr 2 2003 author : 2003 Massimo Callegari - email : massimocallegari@yahoo.it + email : massitqmocallegari@yahoo.it ***************************************************************************/ /*************************************************************************** * * @@ -80,8 +80,8 @@ void KatePluginSymbolViewerView::parseTclSymbols(void) { stripped = currline.right(currline.length() - 3); stripped = stripped.simplifyWhiteSpace(); - int fnd = stripped.find(' '); - //fnd = stripped.find(";"); + int fnd = stripped.tqfind(' '); + //fnd = stripped.tqfind(";"); if(fnd > 0) stripped = stripped.left(fnd); if (treeMode) diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 8fb8061..5d70f46 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -30,8 +30,8 @@ K_EXPORT_COMPONENT_FACTORY( katefll_initplugin, KGenericFactory<InitPluginKateFileListLoader>( "katefll_loader" ) ) -InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList datalist) - :InitPlugin((Kate::Application*)parent,name) +InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * tqparent, const char *name, const TQStringList datalist) + :InitPlugin((Kate::Application*)tqparent,name) { } @@ -83,11 +83,11 @@ int InitPluginKateFileListLoader::initKate() updateInit(); disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); -/* int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) ); +/* int id = pl->tqmetaObject()->findSlot( TQT_SLOT(updateInit()) ); if ( id != -1 ) { kdDebug()<<"Action slot was found, it will be called now"<<endl; - QUObject o[ 1 ]; + TQUObject o[ 1 ]; mod->module->qt_invoke( id, o ); } */ } diff --git a/kate/filelistloader/katefll_initplugin.h b/kate/filelistloader/katefll_initplugin.h index 55ac1a9..19a15d3 100644 --- a/kate/filelistloader/katefll_initplugin.h +++ b/kate/filelistloader/katefll_initplugin.h @@ -31,6 +31,7 @@ class InitPluginKateFileListLoader : public Kate::InitPlugin { Q_OBJECT + TQ_OBJECT public: InitPluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList()); diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index b10464f..0c50e6b 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -42,8 +42,8 @@ class PluginView : public KXMLGUIClient KRecentFilesAction *recentFiles; }; -PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) - : Plugin((Kate::Application*)parent,name), PluginViewInterface(), +PluginKateFileListLoader::PluginKateFileListLoader (TQObject * tqparent, const char *name, const TQStringList) + : Plugin((Kate::Application*)tqparent,name), PluginViewInterface(), m_config( new KConfig("katefilelistpluginrc") ) { m_config->setGroup("General"); @@ -133,7 +133,7 @@ void PluginKateFileListLoader::removeURLFromList(const KURL& url) void PluginKateFileListLoader::slotOpenList() { - KURL url = KFileDialog::getOpenURL(TQString::null, + KURL url = KFileDialog::getOpenURL(TQString(), "*.katefl|Kate File List (*.katefl)"); if (url.isValid()) // cancel pressed? slotOpenList(url); @@ -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>").arg(m_saveURL.prettyURL()),TQString::null,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>").tqarg(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>").arg(m_saveURL.prettyURL()),TQString::null,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>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard())) { case KMessageBox::Yes: save(); break; case KMessageBox::No: slotSaveListAs(); break; @@ -230,7 +230,7 @@ void PluginKateFileListLoader::save() void PluginKateFileListLoader::slotSaveListAs() { - KURL url=KFileDialog::getSaveURL(TQString::null,"*.katefl|Kate File List (*.katefl)"); + KURL url=KFileDialog::getSaveURL(TQString(),"*.katefl|Kate File List (*.katefl)"); if (url.isValid()) { m_oldInitURL="";//application()->initPluginManager()->initScript(); diff --git a/kate/filelistloader/katefll_plugin.h b/kate/filelistloader/katefll_plugin.h index e40f996..6a4553a 100644 --- a/kate/filelistloader/katefll_plugin.h +++ b/kate/filelistloader/katefll_plugin.h @@ -33,6 +33,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: PluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList()); diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 90b64c9..5d6649a 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -98,9 +98,9 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KateFileTemplates( parent, name ); + return new KateFileTemplates( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; @@ -125,8 +125,8 @@ class TemplateInfo //END TemplateInfo //BEGIN KateFileTemplates -KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ), +KateFileTemplates::KateFileTemplates( TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ), m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) ) { // create actions, so that they are shared. @@ -192,7 +192,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d) TQString fname = (*it).section( '/', -1 ); // skip if hidden - if ( hidden.contains( fname ) ) + if ( hidden.tqcontains( fname ) ) continue; // Read the first line of the file, to get the group/name @@ -284,7 +284,7 @@ TQStringList KateFileTemplates::groups() for ( uint i = 0; i < m_templates.count(); i++ ) { s = m_templates.at( i )->group; - if ( ! l.contains( s ) ) + if ( ! l.tqcontains( s ) ) l.append( s ); } @@ -303,7 +303,7 @@ void KateFileTemplates::refreshMenu( PluginView *v ) m_acRecentTemplates->plug( m ); m->insertSeparator(); - TQDict<TQPopupMenu> submenus; // ### QMAP + TQDict<TQPopupMenu> submenus; // ### TQMAP for ( uint i = 0; i < m_templates.count(); i++ ) { if ( ! submenus[ m_templates.at( i )->group ] ) @@ -332,7 +332,7 @@ void KateFileTemplates::refreshMenu( PluginView *v ) w.prepend( "<p>" ); if ( ! w.isEmpty() ) - submenus[m_templates.at( i )->group]->findItem( i )->setWhatsThis( w ); + submenus[m_templates.at( i )->group]->tqfindItem( i )->setWhatsThis( w ); } } @@ -348,7 +348,7 @@ void KateFileTemplates::slotAny() // get a URL and pass that to slotOpenTemplate TQString fn = KFileDialog::getOpenFileName( "katefiletemplate", - TQString::null, + TQString(), application()->activeMainWindow()->viewManager()->activeView(), i18n("Open as Template") ); if ( ! fn.isEmpty() ) @@ -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>").arg(filename), + i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").tqarg(filename), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); return; @@ -412,7 +412,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( reName.search( tmp ) > -1 ) { docname = reName.cap( 1 ); - docname = docname.replace( "%N", "%1" ); + docname = docname.tqreplace( "%N", "%1" ); doneheader |= 1; } } @@ -458,7 +458,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ! isTemplate ) { - int d = filename.findRev('.'); + int d = filename.tqfindRev('.'); docname = i18n("Untitled %1"); if ( d > 0 ) docname += filename.mid( d ); } else if ( docname.isEmpty() ) @@ -467,8 +467,8 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) // check for other documents matching this naming scheme, // and do a count before chosing a name for this one TQString p = docname; - p.replace( "%1", "\\d+" ); - p.replace( ".", "\\." ); + p.tqreplace( "%1", "\\d+" ); + p.tqreplace( ".", "\\." ); p.prepend( "^" ); p.append( "$" ); TQRegExp reName( p ); @@ -478,8 +478,8 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ( reName.search ( application()->documentManager()->document( i )->docName() ) > -1 ) ) count++; - if ( docname.contains( "%1" ) ) - docname = docname.arg( count ); + if ( docname.tqcontains( "%1" ) ) + docname = docname.tqarg( count ); doc->setDocName( docname ); @@ -504,7 +504,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) } -TQWidget *KateFileTemplates::parentWindow() +TQWidget *KateFileTemplates::tqparentWindow() { return dynamic_cast<TQWidget*>(application()->activeMainWindow()); } @@ -523,7 +523,7 @@ TQWidget *KateFileTemplates::parentWindow() // and edit the file as she wants to... void KateFileTemplates::slotCreateTemplate() { - KateTemplateWizard w( parentWindow(), this ); + KateTemplateWizard w( tqparentWindow(), this ); w.exec(); updateTemplateDirs(); @@ -536,7 +536,7 @@ void KateFileTemplates::slotCreateTemplate() // * Set the URL to a writable one if required void KateFileTemplates::slotEditTemplate() { - KDialogBase dlg( parentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close); + KDialogBase dlg( tqparentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close); dlg.setMainWidget( new KateTemplateManager( this, &dlg ) ); dlg.exec(); } @@ -544,8 +544,8 @@ void KateFileTemplates::slotEditTemplate() //BEGIN KateTemplateInfoWidget // This widget can be used to change the data of a TemplateInfo object -KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *info, KateFileTemplates *kft ) - : TQWidget( parent ), +KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *tqparent, TemplateInfo *info, KateFileTemplates *kft ) + : TQWidget( tqparent ), info( info ), kft( kft ) { @@ -578,7 +578,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo * l->setBuddy( leDocumentName ); TQWhatsThis::add( leDocumentName, i18n("<p>This string will be used to set a name " "for the new document, to display in the title bar and file list.</p>" - "<p>If the string contains '%N', that will be replaced with a number " + "<p>If the string tqcontains '%N', that will be replaced with a number " "increasing with each similarly named file.</p><p> For example, if the " "Document Name is 'New shellscript (%N).sh', the first document will be " "named 'New shellscript (1).sh', the second 'New shellscipt (2).sh', and " @@ -659,8 +659,8 @@ void KateTemplateInfoWidget::slotHlSet( int id ) //BEGIN KateTemplateWizard // A simple wizard to help create a new template :-) -KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft ) - : KWizard( parent ), +KateTemplateWizard::KateTemplateWizard( TQWidget *tqparent, KateFileTemplates *kft ) + : KWizard( tqparent ), kft( kft ) { // Hide the help button for now @@ -687,7 +687,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft rb = new TQRadioButton( i18n("Use an existing file:"), page ); bgOrigin->insert( rb, 2 ); glo->addMultiCellWidget( rb, 3, 3, 1, 2 ); - int marg = rb->style().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width(); + int marg = rb->tqstyle().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width(); glo->addItem( new TQSpacerItem( marg, 1, TQSizePolicy::Fixed ), 4, 1 ); urOrigin = new KURLRequester( page ); glo->addWidget( urOrigin, 4, 2 ); @@ -733,7 +733,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft map[ "fullname" ] = ""; map[ "email" ] = ""; - KTextEditor::TemplateInterface::expandMacros( map, parent ); + KTextEditor::TemplateInterface::expandMacros( map, tqparent ); TQString sFullname = map["fullname"]; TQString sEmail = map["email"]; TQString _s = sFullname; @@ -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").arg( sFullname ), page ); + "'%{fullname}' macro").tqarg( sFullname ), page ); cbRRealname->setEnabled( ! sFullname.isEmpty() ); lo->addWidget( cbRRealname ); cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the " - "'%email' macro").arg( sEmail ), page); + "'%email' macro").tqarg( sEmail ), page); cbREmail->setEnabled( ! sEmail.isEmpty() ); lo->addWidget( cbREmail ); @@ -908,7 +908,7 @@ void KateTemplateWizard::accept() else suggestion = kti->leTemplate->text(); - suggestion.replace(" ", ""); + suggestion.tqreplace(" ", ""); if ( ! suggestion.endsWith(".katetemplate") ) suggestion.append(".katetemplate"); @@ -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.").arg( templateUrl.prettyURL() ), + "something else.").tqarg( 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>").arg(u.prettyURL()), + "The document will not be created</qt>").tqarg(u.prettyURL()), i18n("Template Plugin"), 0 ); KIO::NetAccess::removeTempFile( tmpfile ); @@ -1005,16 +1005,16 @@ void KateTemplateWizard::accept() { // 3) if the file is not already a template, escape any "%" and "^" in it, // and try do do some replacement of the authors username, name and email. - tmp.replace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" ); - tmp.replace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); - //tmp.replace( "^", "\\^" ); + tmp.tqreplace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" ); + tmp.tqreplace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); + //tmp.tqreplace( "^", "\\^" ); if ( cbRRealname->isChecked() && ! sFullname.isEmpty() ) - tmp.replace( sFullname, "%{realname}" ); + tmp.tqreplace( sFullname, "%{realname}" ); if ( cbREmail->isChecked() && ! sEmail.isEmpty() ) - tmp.replace( sEmail, "%{email}" ); + tmp.tqreplace( sEmail, "%{email}" ); } str += tmp; @@ -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.").arg( templateUrl.prettyURL() ), + "so you can save it from the editor.").tqarg( templateUrl.prettyURL() ), i18n("Save Failed") ); kft->application()->activeMainWindow()->viewManager()->openURL( KURL() ); @@ -1072,8 +1072,8 @@ void KateTemplateWizard::accept() class KateTemplateItem : public KListViewItem { public: - KateTemplateItem( KListViewItem *parent, TemplateInfo *templateinfo ) - : KListViewItem( parent, templateinfo->tmplate ), templateinfo( templateinfo ) + KateTemplateItem( KListViewItem *tqparent, TemplateInfo *templateinfo ) + : KListViewItem( tqparent, templateinfo->tmplate ), templateinfo( templateinfo ) { } TemplateInfo *templateinfo; @@ -1083,7 +1083,7 @@ class KateTemplateItem : public KListViewItem //BEGIN KFTNewStuff class KFTNewStuff : public KNewStuff { public: - KFTNewStuff( const TQString &type, TQWidget *parent=0 ) : KNewStuff( type, parent ), m_win( parent ) {} + KFTNewStuff( const TQString &type, TQWidget *tqparent=0 ) : KNewStuff( type, tqparent ), m_win( tqparent ) {} ~KFTNewStuff() {} bool install( const TQString &/*filename*/ ) { return true; } bool createUploadFile( const TQString &/*filename*/ ) { return false; } @@ -1099,8 +1099,8 @@ class KFTNewStuff : public KNewStuff { //END KTNewStuff //BEGIN KateTemplateManager -KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) , kft( kft ) { TQGridLayout *lo = new TQGridLayout( this, 2, 6 ); @@ -1146,7 +1146,7 @@ void KateTemplateManager::reload() { lvTemplates->clear(); - TQDict<KListViewItem> groupitems; // FIXME QMAP + TQDict<KListViewItem> groupitems; // FIXME TQMAP for ( uint i = 0; i < kft->templates().count(); i++ ) { if ( ! groupitems[ kft->templates().at( i )->group ] ) @@ -1216,7 +1216,7 @@ void KateTemplateManager::slotRemoveTemplate() // for this template, so the template is installable again. // ### This assumes that the knewstuff name is similar to the template name. kdDebug()<<"trying to remove knewstuff key '"<<item->templateinfo->tmplate<<"'"<<endl; - config->setGroup("KNewStuffStatus"); + config->setGroup("KNewStufftqStatus"); config->deleteEntry( item->templateinfo->tmplate ); @@ -1233,7 +1233,7 @@ void KateTemplateManager::slotUpload() if ( item ) { KFTNewStuff *ns = new KFTNewStuff( "katefiletemplates/template", this ); - ns->upload( item->templateinfo->filename, TQString::null ); + ns->upload( item->templateinfo->filename, TQString() ); } } @@ -1249,6 +1249,6 @@ void KateTemplateManager::slotDownload() //END KateTemplateManager -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; #include "filetemplates.moc" diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index 11734d5..6bcffce 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -39,12 +39,13 @@ class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -73,9 +74,10 @@ class KatePluginFactory : public KLibFactory class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KateFileTemplates( TQObject* parent = 0, const char* name = 0 ); + KateFileTemplates( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KateFileTemplates(); void addView (Kate::MainWindow *win); @@ -100,14 +102,14 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface /** * @return a a pointer to the active main window */ - TQWidget * parentWindow(); + TQWidget * tqparentWindow(); public slots: /** * Update the template collection by rereading the template * directories. Also updates the menu. */ - void updateTemplateDirs(const TQString &s=TQString::null); + void updateTemplateDirs(const TQString &s=TQString()); private slots: /** @@ -154,11 +156,12 @@ class TemplateInfo; /** * This widget provide a GUI for editing template properties. */ -class KateTemplateInfoWidget : public QWidget +class KateTemplateInfoWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KateTemplateInfoWidget( TQWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); + KateTemplateInfoWidget( TQWidget *tqparent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); ~KateTemplateInfoWidget() {} TemplateInfo *info; @@ -191,8 +194,9 @@ class KateTemplateWizard : public KWizard { friend class KateFileTemplates; Q_OBJECT + TQ_OBJECT public: - KateTemplateWizard( TQWidget* parent, KateFileTemplates *ktf ); + KateTemplateWizard( TQWidget* tqparent, KateFileTemplates *ktf ); ~KateTemplateWizard() {} public slots: @@ -227,11 +231,12 @@ class KateTemplateWizard : public KWizard class TQCheckBox *cbOpenTemplate; }; -class KateTemplateManager : public QWidget +class KateTemplateManager : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KateTemplateManager( KateFileTemplates *kft=0, TQWidget *parent=0, const char *name=0 ); + KateTemplateManager( KateFileTemplates *kft=0, TQWidget *tqparent=0, const char *name=0 ); ~KateTemplateManager() {} public slots: @@ -255,4 +260,4 @@ class KateTemplateManager : public QWidget }; #endif // _PLUGIN_KATE_FILETEMPLATES_H_ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kate/filetemplates/plugin/katetemplate.xml b/kate/filetemplates/plugin/katetemplate.xml index 0748481..78647d4 100644 --- a/kate/filetemplates/plugin/katetemplate.xml +++ b/kate/filetemplates/plugin/katetemplate.xml @@ -84,4 +84,4 @@ <keywords casesensitive="0"/> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> diff --git a/kate/filetemplates/templates/language.xml.katetemplate b/kate/filetemplates/templates/language.xml.katetemplate index 420ba84..65d677a 100644 --- a/kate/filetemplates/templates/language.xml.katetemplate +++ b/kate/filetemplates/templates/language.xml.katetemplate @@ -57,4 +57,4 @@ katetemplate: Description=This template will create the basics of a kate highlig --> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; indent-mode xml; --> +<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; indent-mode xml; --> diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 3031f51..216071e 100644 --- a/kate/helloworld/plugin_katehelloworld.cpp +++ b/kate/helloworld/plugin_katehelloworld.cpp @@ -16,8 +16,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -KatePluginHelloWorld::KatePluginHelloWorld( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +KatePluginHelloWorld::KatePluginHelloWorld( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { } diff --git a/kate/helloworld/plugin_katehelloworld.h b/kate/helloworld/plugin_katehelloworld.h index 7760169..7c71b01 100644 --- a/kate/helloworld/plugin_katehelloworld.h +++ b/kate/helloworld/plugin_katehelloworld.h @@ -12,9 +12,10 @@ class KatePluginHelloWorld : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePluginHelloWorld( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginHelloWorld( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginHelloWorld(); void addView (Kate::MainWindow *win); diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index f66ef8e..a71c91c 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -36,8 +36,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateHtmlTools::PluginKateHtmlTools( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateHtmlTools::PluginKateHtmlTools( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } @@ -103,7 +103,7 @@ TQString PluginKateHtmlTools::KatePrompt // TODO: Make this a "memory edit" field with a combo box // containing prior entries - KLineEditDlg dlg(strPrompt, TQString::null, that); + KLineEditDlg dlg(strPrompt, TQString(), that); dlg.setCaption(strTitle); if (dlg.exec()) @@ -142,7 +142,7 @@ void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, TQString text) // // when we try to reselect. TODO: fix those bugs, and we can // un-break this if... - if (preDeleteLine == line && -1 == marked.find ('\n')) + if (preDeleteLine == line && -1 == marked.tqfind ('\n')) if (preDeleteLine == line && preDeleteCol == col) { view.setCursorPosition (line, col + pre.length () + marked.length () - 1); diff --git a/kate/htmltools/plugin_katehtmltools.h b/kate/htmltools/plugin_katehtmltools.h index 695211c..f517b99 100644 --- a/kate/htmltools/plugin_katehtmltools.h +++ b/kate/htmltools/plugin_katehtmltools.h @@ -31,9 +31,10 @@ class PluginKateHtmlTools : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateHtmlTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateHtmlTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateHtmlTools(); void addView (Kate::MainWindow *win); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index fb42c3f..cc88a5b 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -57,8 +57,8 @@ class PluginView : public KXMLGUIClient //END //BEGIN PluginKateInsertCommand -PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ), +PluginKateInsertCommand::PluginKateInsertCommand( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ), kv ( 0 ), sh ( 0 ) { @@ -169,11 +169,11 @@ void PluginKateInsertCommand::slotInsertCommand() *sh << "cd" << d->wd() << "&&"; config->writePathEntry("Last WD", d->wd()); } - *sh << TQFile::encodeName(d->command()); + *sh << TQFile::encodeName(d->command()).data(); sh->start( KProcess::NotifyOnExit, KProcess::All ); // add command to history - if ( cmdhist.contains( d->command() ) ) { + if ( cmdhist.tqcontains( d->command() ) ) { cmdhist.remove( d->command() ); } cmdhist.prepend( d->command() ); @@ -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.").arg(cmd) ); + "Executing command:\n%1\n\nPress 'Cancel' to abort.").tqarg(cmd) ); connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) ); } if ( sh->isRunning() ) // we may have finished while creating the dialog. @@ -277,13 +277,13 @@ void PluginKateInsertCommand::applyConfig( InsertCommandConfigPage *p ) //BEGIN CmdPrompt // This is a simple dialog to retrieve a command and decide if // stdErr should be included in the text inserted. -CmdPrompt::CmdPrompt(TQWidget* parent, +CmdPrompt::CmdPrompt(TQWidget* tqparent, const char* name, const TQStringList& cmdhist, const TQString& dir, const TQString& /*docdir*/, int settings) - : KDialogBase (parent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) + : KDialogBase (tqparent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) { TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -345,14 +345,14 @@ void CmdPrompt::slotTextChanged(const TQString &text) //BEGIN WaitDlg implementation // This is a dialog that is displayed while a command is running, // with a cancel button to allow the user to kill the command -WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title) - : KDialogBase( parent, "wait dialog", true, title, Cancel, Cancel, true ) +WaitDlg::WaitDlg(TQWidget* tqparent, const TQString& text, const TQString& title) + : KDialogBase( tqparent, "wait dialog", true, title, Cancel, Cancel, true ) { TQWidget *page = new TQWidget( this ); setMainWidget( page ); TQHBoxLayout *lo = new TQHBoxLayout( page, 0, spacingHint() ); - KAnimWidget *aw = new KAnimWidget( TQString::fromLatin1("kde"), 48, page ); + KAnimWidget *aw = new KAnimWidget( TQString::tqfromLatin1("kde"), 48, page ); lo->addWidget(aw); TQLabel *l = new TQLabel( text, page ); lo->addWidget( l ); @@ -366,9 +366,9 @@ WaitDlg::~WaitDlg() //BEGIN InsertCommandConfigPage // This is the config page for this plugin. -InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*parent*/, - TQWidget *parentWidget) - : Kate::PluginConfigPage( parentWidget ) +InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*tqparent*/, + TQWidget *tqparentWidget) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* lo = new TQVBoxLayout( this ); lo->setSpacing(KDialogBase::spacingHint()); @@ -414,4 +414,4 @@ void InsertCommandConfigPage::apply() emit configPageApplyRequest( this ); } //END InsertCommandConfigPage -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 03a1415..ff3a584 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -55,9 +55,10 @@ class PluginKateInsertCommand : public Kate::Plugin, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - PluginKateInsertCommand( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateInsertCommand( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateInsertCommand(); void addView (Kate::MainWindow *win); @@ -103,12 +104,13 @@ class PluginKateInsertCommand : public Kate::Plugin, class CmdPrompt : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CmdPrompt(TQWidget* parent=0, + CmdPrompt(TQWidget* tqparent=0, const char* name=0, const TQStringList& cmdhist=TQStringList(), - const TQString& dir=TQString::null, - const TQString& docdir=TQString::null, + const TQString& dir=TQString(), + const TQString& docdir=TQString(), int settings=0); ~CmdPrompt(); TQString command()const { return cmb_cmd->currentText(); } @@ -130,8 +132,8 @@ private slots: class WaitDlg : public KDialogBase { public: - WaitDlg(TQWidget* parent, - const TQString& text=TQString::null, + WaitDlg(TQWidget* tqparent, + const TQString& text=TQString(), const TQString& title=i18n("Please Wait")); ~WaitDlg(); }; @@ -140,10 +142,11 @@ class WaitDlg : public KDialogBase class InsertCommandConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class PluginKateInsertCommand; public: - InsertCommandConfigPage(TQObject* parent = 0L, TQWidget *parentWidget = 0L); + InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~InsertCommandConfigPage() {} /** Reimplemented from Kate::PluginConfigPage @@ -167,4 +170,4 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage }; #endif // _PLUGIN_KATE_INSERT_COMMAND_H_ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index 1bb56eb..aeddbbc 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -17,7 +17,7 @@ using namespace Kate::JS; -Bindings::Bindings(TQObject *parent): KJSEmbed::Bindings::JSBindingPlugin(parent,"KateAppBindings",TQStringList()) { +Bindings::Bindings(TQObject *tqparent): KJSEmbed::Bindings::JSBindingPlugin(tqparent,"KateAppBindings",TQStringList()) { } Bindings::~Bindings() { @@ -74,11 +74,11 @@ void DocumentManager::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy object.put(exec, "closeAllDocument", KJS::Object(new DocumentManager( exec, CloseAllDocuments, proxy,dict ))); } -DocumentManager::DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { +DocumentManager::DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { m_dict=dict; m_dict->incRef(); m_id=id; - m_proxy=parent; + m_proxy=tqparent; } DocumentManager::~DocumentManager() { @@ -143,7 +143,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const if (args.size()==1) { KURL url = TQString( args[0].toString(exec).qstring() ); if (exec->hadException()) break; - (void)dm->openURL(url,TQString::null,&docID); + (void)dm->openURL(url,TQString(),&docID); return KJS::Number(docID); } else if (args.size()==2) { KURL url = TQString( args[0].toString(exec).qstring() ); @@ -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").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -231,7 +231,7 @@ KJS::Value Kate::JS::Management::call( KJS::ExecState *exec, KJS::Object &self, } void Kate::JS::Application::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &object){ - PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->tqparent()); KJS::Object ToolView(new Application( exec, ToolView, proxy ,wrap)); ToolView.put(exec,KJS::Identifier("Left"),KJS::Number(KDockWidget::DockLeft) ,KJS::ReadOnly | KJS::DontDelete); ToolView.put(exec,KJS::Identifier("Top"),KJS::Number(KDockWidget::DockTop) ,KJS::ReadOnly | KJS::DontDelete); @@ -262,10 +262,10 @@ void Kate::JS::Application::addBindings(KJS::ExecState *exec, KJSEmbed::JSObject } -Kate::JS::Application::Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::Application::Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::Application::Application"<<endl; m_id=id; - m_proxy=parent; + m_proxy=tqparent; m_plugin=plugin; } @@ -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").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -390,7 +390,7 @@ void Kate::JS::RefCountedObjectDict::decRef() { } KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQObject *obj, KJSEmbed::JSObjectProxy *proxy) { - ObjectEntry *oe=find(obj); + ObjectEntry *oe=tqfind(obj); if (oe==0) { oe=new ObjectEntry; oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy); @@ -417,7 +417,7 @@ void Kate::JS::MainWindow::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectP if (!mw) return; kdDebug()<<"Kate::JS::MainWindow::addBindings - 3"<<endl; - PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->tqparent()); if (!wrap) return; kdDebug()<<"Kate::JS::MainWindow::addBindings - 4"<<endl; @@ -427,10 +427,10 @@ void Kate::JS::MainWindow::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectP -Kate::JS::MainWindow::MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::MainWindow::MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::MainWindow::MainWindow"<<endl; m_id=id; - m_proxy=parent; + m_proxy=tqparent; m_plugin=plugin; } @@ -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").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); diff --git a/kate/kjswrapper/bindings.h b/kate/kjswrapper/bindings.h index f33418f..4fc8449 100644 --- a/kate/kjswrapper/bindings.h +++ b/kate/kjswrapper/bindings.h @@ -19,6 +19,7 @@ namespace Kate { class RefCountedObjectDict: public TQObject, public TQPtrDict<ObjectEntry> { Q_OBJECT + TQ_OBJECT public: RefCountedObjectDict(int size); void incRef(); @@ -33,7 +34,7 @@ namespace Kate { class Bindings: public KJSEmbed::Bindings::JSBindingPlugin { public: - Bindings(TQObject *parent); + Bindings(TQObject *tqparent); virtual ~Bindings(); KJS::Object createBinding(KJSEmbed::KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; void addBindings(KJS::ExecState *exec, KJS::Object &target) const; @@ -56,7 +57,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ); + DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, RefCountedObjectDict *dict ); virtual ~DocumentManager(); private: RefCountedObjectDict *m_dict; @@ -97,7 +98,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); + Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, PluginKateKJSWrapper *plugin ); ~Application(); private: int m_id; @@ -135,7 +136,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); + MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, PluginKateKJSWrapper *plugin ); ~MainWindow(); private: int m_id; diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index 8fc4ae5..4ebac34 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -53,8 +53,8 @@ void PluginKateKJSWrapperView::removeFromWindow() { win->guiFactory()->removeClient (this); } -PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, const TQStringList& list) - : Kate::Plugin ( (Kate::Application *)parent, name ) { +PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* tqparent, const char* name, const TQStringList& list) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { m_views.setAutoDelete(true); m_scriptname=list[0]; m_kateAppBindings=new Kate::JS::Bindings(this); @@ -65,15 +65,15 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, KJSEmbed::JSFactory *factory=m_part->factory(); /* factories for kate app classes */ - factory->addQObjectPlugin("Kate::Application",m_kateAppBindings); - factory->addQObjectPlugin("Kate::DocumentManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::MainWindow",m_kateAppBindings); - factory->addQObjectPlugin("Kate::PluginManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::InitPluginManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::ProjectManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::Project",m_kateAppBindings); - factory->addQObjectPlugin("Kate::ViewManager",m_kateAppBindings); - factory->addQObjectPlugin("Kate::View",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::Application",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::DocumentManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::MainWindow",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::PluginManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::InitPluginManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::ProjectManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::Project",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::ViewManager",m_kateAppBindings); + factory->addTQObjectPlugin("Kate::View",m_kateAppBindings); /* toplevel objects*/ KJS::Object appobj=m_part->addObject(Kate::application(),"KATE"); js->globalObject().put( js->globalExec(), "addConfigPage", KJS::Object(new Kate::JS::Management(js->globalExec(),Kate::JS::Management::AddConfigPage,this ))); @@ -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").arg(m_scriptname).arg(m_scriptname))); + m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").tqarg(m_scriptname).tqarg(m_scriptname))); //"/home/jowenn/development/kde/cvs/kdeaddons/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").arg(m_scriptname).arg(m_scriptname)); + view->setXMLFile(TQString("plugins/%1/%2.rc").tqarg(m_scriptname).tqarg(m_scriptname)); win->guiFactory()->addClient (view); } @@ -370,18 +370,18 @@ void PluginKateKJSWrapper::applyConfig( KateKJSWrapperConfigPage *p ) #endif } -KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent, - TQWidget *parentWidget) - : Kate::PluginConfigPage( parentWidget ),m_plugin(parent) +KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent, + TQWidget *tqparentWidget) + : Kate::PluginConfigPage( tqparentWidget ),m_plugin(tqparent) { TQVBoxLayout *l=new TQVBoxLayout(this); l->setAutoAdd(true); l->activate(); - KJS::Interpreter *js = parent->m_part->interpreter(); + KJS::Interpreter *js = tqparent->m_part->interpreter(); KJS::ExecState *exec = js->globalExec(); exec->clearException(); KJS::List param; - param.append(parent->m_part->factory()->createProxy(exec,this,0)); + param.append(tqparent->m_part->factory()->createProxy(exec,this,0)); m_pageObject=pageConstructor.construct(exec,param); } diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h index 9256b4c..ee6a311 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.h +++ b/kate/kjswrapper/plugin_katekjswrapper.h @@ -73,9 +73,10 @@ class PluginKateKJSWrapper : public Kate::Plugin, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - PluginKateKJSWrapper( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateKJSWrapper( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateKJSWrapper(); void addView (Kate::MainWindow *win); @@ -117,10 +118,11 @@ class PluginKateKJSWrapper : public Kate::Plugin, class KateKJSWrapperConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class PluginKateKJSWrapper; public: - KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent = 0L, TQWidget *parentWidget = 0L); + KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~KateKJSWrapperConfigPage() {}; /** Reimplemented from Kate::PluginConfigPage @@ -166,6 +168,7 @@ namespace Kate { namespace JS { class ToolView: public TQVBox { Q_OBJECT + TQ_OBJECT public: ToolView(KJS::Object constr, KJS::ExecState *exec, KJSEmbed::JSFactory *factory, KJS::List parameters, const char * name); virtual ~ToolView(); diff --git a/kate/kjswrapper/samples/katekjstest1.js b/kate/kjswrapper/samples/katekjstest1.js index 7e4e041..a8b061b 100644 --- a/kate/kjswrapper/samples/katekjstest1.js +++ b/kate/kjswrapper/samples/katekjstest1.js @@ -1,7 +1,7 @@ /**************************************************************** First configuration page ****************************************************************/ -function Page1 (parentWidget) { +function Page1 (tqparentWidget) { this.defaults=function() { alert("Defaults has been called"); } @@ -11,7 +11,7 @@ function Page1 (parentWidget) { this.reset=function() { alert("Reset defaults has been called"); } - box=new QVBox(parentWidget); + box=new QVBox(tqparentWidget); this.button1=new QPushButton(box); this.button1.text="P1 Button 1"; this.button1.show(); @@ -27,8 +27,8 @@ Page1.fullName="Test1/Page1"; Second configuration page ****************************************************************/ -function Page2 (parentWidget) { - box=new QVBox(parentWidget); +function Page2 (tqparentWidget) { + box=new QVBox(tqparentWidget); this.button1=new QPushButton(box); this.button1.text="P2 Button 1"; this.button1.show(); @@ -44,8 +44,8 @@ Page2.fullName="Test1/Page2"; Third configuration page ****************************************************************/ -function Page3 (parentWidget) { - box=new QVBox(parentWidget); +function Page3 (tqparentWidget) { + box=new QVBox(tqparentWidget); this.button1=new QPushButton(box); this.button1.text="P3 Button 1"; this.button1.show(); @@ -62,11 +62,11 @@ Page3.fullName="Test1/Page3"; First toolview ****************************************************************/ -function MyToolView1 (mainwindow,parentwidget) { - parentwidget.caption="This is my first JS Toolview"; - parentwidget.icon=StdIcons.BarIcon("yes"); +function MyToolView1 (mainwindow,tqparentwidget) { + tqparentwidget.caption="This is my first JS Toolview"; + tqparentwidget.icon=StdIcons.BarIcon("yes"); - this.lv = new KListView( parentwidget ); + this.lv = new KListView( tqparentwidget ); this.lv.addColumn('Pix'); this.lv.addColumn('One'); @@ -99,11 +99,11 @@ MyToolView1.name="myfirstjstoolview" Second toolview ****************************************************************/ -function MyToolView2 (mainwindow,parentwidget) { - parentwidget.caption="This is my second JS Toolview"; - parentwidget.icon=StdIcons.BarIcon("no"); +function MyToolView2 (mainwindow,tqparentwidget) { + tqparentwidget.caption="This is my second JS Toolview"; + tqparentwidget.icon=StdIcons.BarIcon("no"); - this.lb=new QListBox(parentwidget); + this.lb=new QListBox(tqparentwidget); this.mainwindow=mainwindow; this.cleanup=function() { alert("Cleanup MyToolView2"); @@ -121,11 +121,11 @@ MyToolView2.name="mysecondjstoolview" function newWindowCallBack(mainwindow) { alert("New Window has been created"); /* - anotherToolView = function (mainwindow,parentwidget) { - parentwidget.caption="This is my third JS Toolview"; - parentwidget.icon=StdIcons.BarIcon("kate"); + anotherToolView = function (mainwindow,tqparentwidget) { + tqparentwidget.caption="This is my third JS Toolview"; + tqparentwidget.icon=StdIcons.BarIcon("kate"); - this.lb=new QListBox(parentwidget); + this.lb=new QListBox(tqparentwidget); this.mainwindow=mainwindow; this.cleanup=function() { alert("Cleanup MyToolView3"); diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 183e1e7..5d2c268 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -181,8 +181,8 @@ getOpenNodes (TQValueList < TQString > *open_nodes, PyBrowseNode * node) } -KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): -KListView (parent, name) +KPyBrowser::KPyBrowser (TQWidget * tqparent, const char *name): +KListView (tqparent, name) { addColumn(i18n("Name")); @@ -286,11 +286,11 @@ KPyBrowser::parseText (TQString & pytext) line = &(*iter); if (class_rx.search(*line) >= 0) { - //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(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); - paren_i = class_sig.find ("("); + paren_i = class_sig.tqfind ("("); class_name = class_sig.left (paren_i); last_class_node = @@ -305,8 +305,8 @@ KPyBrowser::parseText (TQString & pytext) { //strip off the leading def and the ending colon method_sig = line->stripWhiteSpace ().mid (4); - method_sig = method_sig.left (method_sig.find (":")); - paren_i = method_sig.find ("("); + method_sig = method_sig.left (method_sig.tqfind (":")); + paren_i = method_sig.tqfind ("("); method_name = method_sig.left (paren_i); last_method_node = new PyBrowseNode (last_class_node, method_name, method_sig, @@ -318,10 +318,10 @@ KPyBrowser::parseText (TQString & pytext) } if ((function_rx.search(*line) >= 0)) { - //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no)); function_sig = line->stripWhiteSpace ().mid (4); - function_sig = function_sig.left (function_sig.find (":")); - paren_i = function_sig.find ("("); + function_sig = function_sig.left (function_sig.tqfind (":")); + paren_i = function_sig.tqfind ("("); function_name = function_sig.left (paren_i); last_function_node = new PyBrowseNode (function_root, function_name, function_sig, @@ -359,7 +359,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) str = ""; return; } - r = itemRect (item); + r = tqitemRect (item); //r.setY(r.y() + 10); PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(item); @@ -380,7 +380,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) ///////////////////////////////////////////////////////////////////// // KateFileList::KFLToolTip implementation -KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * parent):TQToolTip (parent) +KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * tqparent):TQToolTip (tqparent) { } @@ -390,7 +390,7 @@ KPyBrowser::KPBToolTip::maybeTip (const TQPoint & p) TQString str; TQRect r; - ((KPyBrowser *) parentWidget ())->tip (p, r, str); + ((KPyBrowser *) tqparentWidget ())->tip (p, r, str); if (!str.isEmpty () && r.isValid ()) tip (r, str); diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index 5f73c31..ea0c43f 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -35,9 +35,10 @@ class KPyBrowser : public KListView { Q_OBJECT + TQ_OBJECT public: /** construtor */ - KPyBrowser(TQWidget* parent=0, const char *name=0); + KPyBrowser(TQWidget* tqparent=0, const char *name=0); /** destructor */ ~KPyBrowser(); void parseText(TQString &pytext); @@ -56,10 +57,10 @@ class KPyBrowser : public KListView signals: void selected(TQString, int); private: - class KPBToolTip : public QToolTip + class KPBToolTip : public TQToolTip { public: - KPBToolTip(TQWidget *parent); + KPBToolTip(TQWidget *tqparent); protected: void maybeTip( const TQPoint & ); }; diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 4b8490c..bd9f791 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -82,7 +82,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) done = 1; if (forward_line < numlines) { - if (doc->textLine(forward_line).find(name) > -1) + if (doc->textLine(forward_line).tqfind(name) > -1) { apiline = forward_line; break; @@ -92,7 +92,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) } if (backward_line > -1) { - if (doc->textLine(backward_line).find(name) > -1) + if (doc->textLine(backward_line).tqfind(name) > -1) { apiline = backward_line; break; @@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) if (apiline == -1) { KMessageBox::information(0, - i18n("Could not find method/class %1.").arg(name), i18n("Selection")); + i18n("Could not find method/class %1.").tqarg(name), i18n("Selection")); } else { @@ -130,8 +130,8 @@ void PluginViewPyBrowse::slotShowPyBrowser() //TO DO implement this later so that you can turn the browser off and on } -KatePluginPyBrowse::KatePluginPyBrowse( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +KatePluginPyBrowse::KatePluginPyBrowse( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h index 3769661..f649170 100644 --- a/kate/kpybrowser/pybrowse_part.h +++ b/kate/kpybrowser/pybrowse_part.h @@ -36,6 +36,7 @@ class PluginViewPyBrowse : public TQObject, KXMLGUIClient { Q_OBJECT + TQ_OBJECT friend class KatePluginPyBrowse; @@ -57,9 +58,10 @@ class PluginViewPyBrowse : public TQObject, KXMLGUIClient class KatePluginPyBrowse : public Kate::Plugin, public Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePluginPyBrowse( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginPyBrowse( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); ~KatePluginPyBrowse(); void addView(Kate::MainWindow *win); diff --git a/kate/kpybrowser/pybrowsenode.cpp b/kate/kpybrowser/pybrowsenode.cpp index 81c59e5..9310478 100644 --- a/kate/kpybrowser/pybrowsenode.cpp +++ b/kate/kpybrowser/pybrowsenode.cpp @@ -99,16 +99,16 @@ static const char *py_function_xpm[] = { }; -PyBrowseNode::PyBrowseNode (TQListViewItem * parent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListViewItem * tqparent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (parent, signature) +TQListViewItem (tqparent, signature) { init (name, signature, nodeType); } -PyBrowseNode::PyBrowseNode (TQListView * parent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListView * tqparent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (parent, signature) +TQListViewItem (tqparent, signature) { init (name, signature, nodeType); } @@ -140,7 +140,7 @@ PyBrowseNode::setName (const TQString &a_name) setText (0, name); } -QString +TQString PyBrowseNode::getName ()const { return name; @@ -153,7 +153,7 @@ PyBrowseNode::setSig (const TQString &a_signature) } -QString +TQString PyBrowseNode::getSig ()const { return signature; @@ -190,13 +190,13 @@ PyBrowseNode::setClass (const TQString &a_method_class) node_class = a_method_class; } -QString +TQString PyBrowseNode::getClass ()const { return node_class; } -QString +TQString PyBrowseNode::getQualifiedName ()const { if (node_type == PYCLASS) diff --git a/kate/kpybrowser/pybrowsenode.h b/kate/kpybrowser/pybrowsenode.h index 373547c..8b18fc1 100644 --- a/kate/kpybrowser/pybrowsenode.h +++ b/kate/kpybrowser/pybrowsenode.h @@ -37,8 +37,8 @@ class PyBrowseNode : public TQListViewItem { public: TQPixmap *pyClassPixmap; - PyBrowseNode(TQListView *parent, const TQString &a_name, const TQString &a_signature, int type); - PyBrowseNode(TQListViewItem *parent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListView *tqparent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListViewItem *tqparent, const TQString &a_name, const TQString &a_signature, int type); ~PyBrowseNode(); void init(const TQString &a_name, const TQString &a_signature, int nodeType); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index e78bda9..6cfa9e8 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -62,8 +62,8 @@ K_EXPORT_COMPONENT_FACTORY( katemakeplugin, KGenericFactory<PluginKateMake>( "ka // #define FUNCTIONSETUP kdDebug() << k_funcinfo << endl; #define FUNCTIONSETUP -PluginKateMake::PluginKateMake( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateMake::PluginKateMake( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { FUNCTIONSETUP; } @@ -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::fromLatin1("misc")), + SmallIcon(TQString::tqfromLatin1("misc")), i18n("Make Output")); PluginKateMakeView *view = new PluginKateMakeView (w,win, "katemakeview"); @@ -120,24 +120,24 @@ void PluginKateMake::removeView(Kate::MainWindow *win) #define COL_MSG (2) -class ErrorMessage : public QListViewItem +class ErrorMessage : public TQListViewItem { public: - ErrorMessage(TQListView *parent, + ErrorMessage(TQListView *tqparent, const TQString &filename, int lineno, const TQString &message) : - TQListViewItem(parent, + TQListViewItem(tqparent, filename, - (lineno > 0 ? TQString::number(lineno) : TQString::null), + (lineno > 0 ? TQString::number(lineno) : TQString()), message) { - m_isError = !message.contains(TQString::fromLatin1("warning")); + m_isError = !message.tqcontains(TQString::tqfromLatin1("warning")); m_lineno = lineno; m_serial = s_serial++; } - ErrorMessage(TQListView *parent,const TQString &message) : - TQListViewItem(parent,TQString::null,TQString::null,TQString::null) + ErrorMessage(TQListView *tqparent,const TQString &message) : + TQListViewItem(tqparent,TQString(),TQString(),TQString()) { TQString m(message); m.remove('\n'); @@ -149,8 +149,8 @@ public: m_serial = s_serial++; setSelectable(false); } - ErrorMessage(TQListView *parent, bool start) : - TQListViewItem(parent,TQString::null) + ErrorMessage(TQListView *tqparent, bool start) : + TQListViewItem(tqparent,TQString()) { m_isError=false; m_lineno=-1; @@ -192,22 +192,22 @@ protected: TQString ErrorMessage::caption() const { - return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line()); + return TQString::tqfromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line()); } TQString ErrorMessage::fancyMessage() const { - TQString msg = TQString::fromLatin1("<qt>"); + TQString msg = TQString::tqfromLatin1("<qt>"); if (isError()) { - msg.append(TQString::fromLatin1("<font color=\"red\">")); + msg.append(TQString::tqfromLatin1("<font color=\"red\">")); } msg.append(message()); if (isError()) { - msg.append(TQString::fromLatin1("</font>")); + msg.append(TQString::tqfromLatin1("</font>")); } - msg.append(TQString::fromLatin1("<qt>")); + msg.append(TQString::tqfromLatin1("<qt>")); return msg; } @@ -261,7 +261,7 @@ TQString ErrorMessage::fancyMessage() const class LinePopup : public KPassivePopup { protected: - LinePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + LinePopup( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); virtual ~LinePopup(); public: @@ -292,12 +292,12 @@ LinePopup::~LinePopup() one=0L; } -/* static */ LinePopup *LinePopup::message(TQWidget *parent, +/* static */ LinePopup *LinePopup::message(TQWidget *tqparent, const TQPoint &p, ErrorMessage *e) { if (one) delete one; - LinePopup *pop = new LinePopup( parent ); + LinePopup *pop = new LinePopup( tqparent ); pop->setAutoDelete( true ); @@ -321,10 +321,10 @@ LinePopup::~LinePopup() } } -PluginKateMakeView::PluginKateMakeView(TQWidget *parent, +PluginKateMakeView::PluginKateMakeView(TQWidget *tqparent, Kate::MainWindow *mainwin, const char* name) : - TQListView(parent,name), + TQListView(tqparent,name), KXMLGUIClient(), win(mainwin), filenameDetector(0L), @@ -334,26 +334,26 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, m_proc=0; (void) new KAction ( i18n("Next Error"), KShortcut(ALT+CTRL+Key_Right), - this, TQT_SLOT( slotNext() ), + TQT_TQOBJECT(this), TQT_SLOT( slotNext() ), actionCollection(), "make_right" ); (void) new KAction ( i18n("Previous Error"), KShortcut(ALT+CTRL+Key_Left), - this, TQT_SLOT( slotPrev() ), + TQT_TQOBJECT(this), TQT_SLOT( slotPrev() ), actionCollection(), "make_left" ); (void) new KAction ( i18n("Make"), KShortcut(ALT+Key_R), - this, TQT_SLOT( slotValidate() ), + TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), actionCollection(), "make_check" ); (void) new KAction ( i18n("Configure..."), KShortcut(), - this, TQT_SLOT( slotConfigure() ), + TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), actionCollection(), "make_settings" ); setInstance(new KInstance("kate")); - setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc")); + setXMLFile(TQString::tqfromLatin1("plugins/katemake/ui.rc")); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); setSorting(COL_LINE); addColumn(i18n("File"), -1); @@ -368,18 +368,18 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcExited(KProcess*))); connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int))); + TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int))); KConfig c("katemakepluginrc"); c.setGroup("Prefixes"); - source_prefix = c.readEntry("Source",TQString::null); - build_prefix = c.readEntry("Build",TQString::null); + source_prefix = c.readEntry("Source",TQString()); + build_prefix = c.readEntry("Build",TQString()); // if (source_prefix.isEmpty()) { filenameDetector = new TQRegExp( - TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } // else { @@ -403,21 +403,21 @@ void PluginKateMakeView::processLine(const TQString &l) kdDebug() << "Got line " << l ; - if (!filenameDetector && l.find(source_prefix)!=0) + if (!filenameDetector && l.tqfind(source_prefix)!=0) { /* ErrorMessage *e = */ (void) new ErrorMessage(this,l); return; } - if (filenameDetector && l.find(*filenameDetector)<0) + if (filenameDetector && l.tqfind(*filenameDetector)<0) { ErrorMessage *e = new ErrorMessage(this,l); kdDebug() << "Got message(1) #" << e->serial() << endl; return; } - int ofs1 = l.find(':'); - int ofs2 = l.find(':',ofs1+1); + int ofs1 = l.tqfind(':'); + int ofs2 = l.tqfind(':',ofs1+1); // TQString m = l.mid(ofs2+1); m.remove('\n'); @@ -452,7 +452,7 @@ void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int le output_line += l; int nl_p = -1; - while ((nl_p = output_line.find('\n')) > 1) + while ((nl_p = output_line.tqfind('\n')) > 1) { processLine(output_line.left(nl_p+1)); output_line.remove(0,nl_p+1); @@ -504,8 +504,8 @@ void PluginKateMakeView::slotProcExited(KProcess *p) this); clear(); #if 0 - TQListViewItem *i = new TQListViewItem(this,TQString::null, - TQString::null, + TQListViewItem *i = new TQListViewItem(this,TQString(), + TQString(), i18n("No Errors.")); i->setSelectable(false); #else @@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item) << globalPos.x() << "," << globalPos.y() << endl; #if 0 KPassivePopup::message( - TQString::fromLatin1("%1:%2").arg(filename).arg(lineno), + TQString::tqfromLatin1("%1:%2").tqarg(filename).tqarg(lineno), msg, this); #else @@ -632,7 +632,7 @@ bool PluginKateMakeView::slotValidate() doc->save(); KURL url(doc->url()); - output_line = TQString::null; + output_line = TQString(); ErrorMessage::resetSerial(); found_error=false; @@ -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.") - .arg(url.path())); + .tqarg(url.path())); return false; } document_dir = TQFileInfo(url.path()).dirPath(true) + - TQString::fromLatin1("/"); + TQString::tqfromLatin1("/"); 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.").arg(make.isEmpty() ? + KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").tqarg(make.isEmpty() ? "make" : make)); return false; } @@ -674,7 +674,7 @@ bool PluginKateMakeView::slotValidate() class Settings : public KDialogBase { public: - Settings( TQWidget *parent, + Settings( TQWidget *tqparent, const TQString &src, const TQString &bld); KLineEdit *edit_src,*edit_bld; @@ -717,7 +717,7 @@ void PluginKateMakeView::slotConfigure() if (!filenameDetector) { filenameDetector = new TQRegExp( - TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } } //else diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h index 21014be..f39ba88 100644 --- a/kate/make/plugin_katemake.h +++ b/kate/make/plugin_katemake.h @@ -27,8 +27,8 @@ ** MA 02110-1301, USA. */ -// #define QT_NO_CAST_ASCII (1) -// #define QT_NO_ASCII_CAST (1) +// #define TQT_NO_CAST_ASCII (1) +// #define TQT_NO_ASCII_CAST (1) class TQRegExp; @@ -51,9 +51,10 @@ class TQRegExp; class PluginKateMakeView : public TQListView, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - PluginKateMakeView(TQWidget *parent, + PluginKateMakeView(TQWidget *tqparent, Kate::MainWindow *mainwin, const char* name); virtual ~PluginKateMakeView(); @@ -92,9 +93,10 @@ protected: class PluginKateMake : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateMake( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateMake( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateMake(); void addView (Kate::MainWindow *win); diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index 9184f6a..e3d22a1 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -41,8 +41,8 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( katemodelineplugin, KGenericFactory<ModelinePlugin>( "katemodeline" ) ) -ModelinePlugin::ModelinePlugin( TQObject* parent, const char* name, const TQStringList &args ) - : Kate::Plugin ( (Kate::Application *) parent, name ) +ModelinePlugin::ModelinePlugin( TQObject* tqparent, const char* name, const TQStringList &args ) + : Kate::Plugin ( (Kate::Application *) tqparent, name ) { } @@ -97,25 +97,25 @@ void ModelinePlugin::applyModeline() options = vim2.cap(1); } else if( doc->searchText( 0, 0, vim1, &foundAtLine, &foundAtCol, &matchLen ) ) { options = vim1.cap(1); - options.replace( TQRegExp( ":" ), " " ); + options.tqreplace( TQRegExp( ":" ), " " ); } uint configFlags = doc->configFlags(); kdDebug() << "Found modeline: " << options << endl; - if( options.find( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) { + if( options.tqfind( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) { kdDebug() << "Clearing replace tabs" << endl; configFlags &= ~Kate::Document::cfReplaceTabs; - } else if( options.find( TQRegExp( "\\bet\\b" ) ) >= 0 ) { + } else if( options.tqfind( TQRegExp( "\\bet\\b" ) ) >= 0 ) { kdDebug() << "Setting replace tabs" << endl; configFlags |= Kate::Document::cfReplaceTabs; } TQRegExp ts( "ts=(\\d+)" ); - if( options.find( ts ) >= 0 ) { + if( options.tqfind( ts ) >= 0 ) { uint tabWidth = ts.cap(1).toUInt(); kdDebug() << "Setting tab width " << tabWidth << endl; view->setTabWidth( tabWidth ); } TQRegExp tw( "tw=(\\d+)" ); - if( options.find( tw ) >= 0 ) { + if( options.tqfind( tw ) >= 0 ) { uint textWidth = tw.cap(1).toUInt(); kdDebug() << "Setting text width " << textWidth << endl; doc->setWordWrap( true ); diff --git a/kate/modeline/ModelinePlugin.h b/kate/modeline/ModelinePlugin.h index 2f8e2d6..c9ff37f 100644 --- a/kate/modeline/ModelinePlugin.h +++ b/kate/modeline/ModelinePlugin.h @@ -23,9 +23,10 @@ class ModelinePlugin : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - ModelinePlugin( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + ModelinePlugin( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~ModelinePlugin(); void addView (Kate::MainWindow *win); diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index 61cd592..15dbb77 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -36,8 +36,8 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( kateopenheaderplugin, KGenericFactory<PluginKateOpenHeader>( "kateopenheader" ) ) -PluginKateOpenHeader::PluginKateOpenHeader( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateOpenHeader::PluginKateOpenHeader( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } @@ -91,9 +91,9 @@ void PluginKateOpenHeader::slotOpenHeader () TQStringList headers( TQStringList() << "h" << "H" << "hh" << "hpp" ); TQStringList sources( TQStringList() << "c" << "cpp" << "cc" << "cp" << "cxx" ); - if( sources.find( extension ) != sources.end() ) { + if( sources.tqfind( extension ) != sources.end() ) { tryOpen( url, headers ); - } else if ( headers.find( extension ) != headers.end() ) { + } else if ( headers.tqfind( extension ) != headers.end() ) { tryOpen( url, sources ); } } diff --git a/kate/openheader/plugin_kateopenheader.h b/kate/openheader/plugin_kateopenheader.h index b198a9f..0556735 100644 --- a/kate/openheader/plugin_kateopenheader.h +++ b/kate/openheader/plugin_kateopenheader.h @@ -31,9 +31,10 @@ class PluginKateOpenHeader : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateOpenHeader( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateOpenHeader( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateOpenHeader(); void addView (Kate::MainWindow *win); diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui index 7f370f9..b694158 100644 --- a/kate/snippets/CWidgetSnippetsBase.ui +++ b/kate/snippets/CWidgetSnippetsBase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CWidgetSnippetsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CWidgetSnippetsBase</cstring> </property> @@ -29,14 +29,14 @@ <property name="margin"> <number>0</number> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter13</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Snippet</string> @@ -91,9 +91,9 @@ <string>A list of Snippets, what else</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> @@ -102,9 +102,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnNew</cstring> </property> @@ -124,7 +124,7 @@ <iconset>image1</iconset> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnSave</cstring> </property> @@ -135,7 +135,7 @@ <iconset>image2</iconset> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>btnDelete</cstring> </property> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> @@ -165,7 +165,7 @@ </spacer> </hbox> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>teSnippetText</cstring> </property> @@ -201,14 +201,14 @@ <includes> <include location="local" impldecl="in implementation">CWidgetSnippetsBase.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>lalala()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>init()</slot> -</slots> +</Q_SLOTS> <functions> - <function returnType="QListViewItem *">insertItem( const QString& name, bool bRename )</function> + <function returnType="TQListViewItem *">insertItem( const TQString& name, bool bRename )</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kate/snippets/CWidgetSnippetsBase.ui.h b/kate/snippets/CWidgetSnippetsBase.ui.h index 539442a..4fdd814 100644 --- a/kate/snippets/CWidgetSnippetsBase.ui.h +++ b/kate/snippets/CWidgetSnippetsBase.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kate/snippets/csnippet.cpp b/kate/snippets/csnippet.cpp index 2aebb5d..c873949 100644 --- a/kate/snippets/csnippet.cpp +++ b/kate/snippets/csnippet.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "csnippet.h" -CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent, const char *name) - : TQObject(parent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} +CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *tqparent, const char *name) + : TQObject(tqparent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} CSnippet::~CSnippet() {} diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h index 3c75db4..ae9bef6 100644 --- a/kate/snippets/csnippet.h +++ b/kate/snippets/csnippet.h @@ -21,8 +21,9 @@ class CSnippet : public TQObject { Q_OBJECT + TQ_OBJECT public: - CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent = 0, const char *name = 0); + CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *tqparent = 0, const char *name = 0); ~CSnippet(); TQString getKey() { return _sKey; } TQString getValue() { return _sValue; } diff --git a/kate/snippets/cwidgetsnippets.cpp b/kate/snippets/cwidgetsnippets.cpp index e58c15f..819bcaf 100644 --- a/kate/snippets/cwidgetsnippets.cpp +++ b/kate/snippets/cwidgetsnippets.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "cwidgetsnippets.h" -CWidgetSnippets::CWidgetSnippets( TQWidget* parent, const char* name, WFlags fl) - : CWidgetSnippetsBase(parent, name, fl) +CWidgetSnippets::CWidgetSnippets( TQWidget* tqparent, const char* name, WFlags fl) + : CWidgetSnippetsBase(tqparent, name, fl) { } diff --git a/kate/snippets/cwidgetsnippets.h b/kate/snippets/cwidgetsnippets.h index 831f335..f3962e1 100644 --- a/kate/snippets/cwidgetsnippets.h +++ b/kate/snippets/cwidgetsnippets.h @@ -17,7 +17,7 @@ */ class CWidgetSnippets : public CWidgetSnippetsBase { public: - CWidgetSnippets( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CWidgetSnippets( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~CWidgetSnippets(); diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index fd594e1..8e0d6cb 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Stephan Mres <Erdling@gmx.net> + * Copyright (C) 2004 Stephan M�res <Erdling@gmx.net> */ #include "plugin_katesnippets.h" @@ -95,12 +95,12 @@ KatePluginSnippetsView::~ KatePluginSnippetsView() { /** * ctor KatePluginSnippets - * @param parent + * @param tqparent * @param name * @return */ -KatePluginSnippets::KatePluginSnippets( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ) {} +KatePluginSnippets::KatePluginSnippets( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) {} /** * dtor KatePluginSnippets @@ -170,9 +170,9 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) { kv->keyDelete(); } - sText.replace( TQRegExp("<mark/>"), sSelection ); - sText.replace( TQRegExp("<date/>"), TQDate::currentDate().toString(Qt::LocalDate) ); - sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); + sText.tqreplace( TQRegExp("<mark/>"), sSelection ); + sText.tqreplace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) ); + sText.tqreplace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); kv->insertText ( sText ); } kv->setFocus(); @@ -254,7 +254,7 @@ void KatePluginSnippetsView::readConfig() { lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); } // <defaults> @@ -262,12 +262,12 @@ void KatePluginSnippetsView::readConfig() { sKey = "DEBUG variable"; sValue = "## < DEBUG >\nout \"<pre>\\$<mark/> : \\\"$<mark/>\\\"\\n</pre>\"\n## </DEBUG >\n"; lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); sKey = "proc-header"; sValue = "## [created : <date/>, <time/>]\n## Description:\n## ============\n## The function \"<mark/>\" ...\n##\n##\n##\n##\n## Input:\n## ======\n##\n##\n##\nproc <mark/> {args} {\n\n ## add your code here\n\n return \"\"\n}\n"; lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); } // </defaults> diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h index aac5049..0aca230 100644 --- a/kate/snippets/plugin_katesnippets.h +++ b/kate/snippets/plugin_katesnippets.h @@ -31,6 +31,7 @@ class KatePluginSnippetsView : public CWidgetSnippets, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT friend class KatePluginSnippets; @@ -62,9 +63,10 @@ public: class KatePluginSnippets : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePluginSnippets( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSnippets( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSnippets(); void addView (Kate::MainWindow *win); diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index cfc4619..e789c20 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -73,17 +73,17 @@ KatePluginFactory::~KatePluginFactory() } TQObject* KatePluginFactory::createObject( - TQObject* parent, const char* name, const char*, const TQStringList & ) + TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KatePluginTabBarExtension( parent, name ); + return new KatePluginTabBarExtension( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; // BEGIN KatePluginTabBarExtension KatePluginTabBarExtension::KatePluginTabBarExtension( - TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ), + TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ), pConfig(new KConfig("katetabbarextensionpluginrc")) { pConfig->setGroup("global"); @@ -122,8 +122,8 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) KToolBar* toolbar = dynamic_cast<KToolBar*> (win->guiFactory()->container("tabbarExtensionToolBar", view)); if (toolbar) { - connect(toolbar, TQT_SIGNAL( orientationChanged(Orientation) ), - view->tabbar, TQT_SLOT( slotMoved(Orientation) )); + connect(toolbar, TQT_SIGNAL( orientationChanged(Qt::Orientation) ), + view->tabbar, TQT_SLOT( slotMoved(Qt::Orientation) )); } } @@ -175,8 +175,8 @@ void KatePluginTabBarExtension::applyConfig( KateTabBarExtensionConfigPage* p ) // BEGIN KateTabBarButton KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, - Kate::Document *pDoc, TQWidget * parent, const char * name) - : TQPushButton(parent, name), + Kate::Document *pDoc, TQWidget * tqparent, const char * name) + : TQPushButton(tqparent, name), modified(false), myDocID(pDoc->documentNumber()), doc(pDoc), @@ -184,7 +184,7 @@ KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, { setFlat(true); setToggleButton(true); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); setText(pDoc->docName()); @@ -264,8 +264,8 @@ void KateTabBarButton::setOn(bool on) // BEGIN KateTabBarExtension KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget* parent, const char* name, WFlags f ) - : TQWidget(parent, name, f), + TQWidget* tqparent, const char* name, WFlags f ) + : TQWidget(tqparent, name, f), pCurrentTab(0), m_win(win), m_docManager(pDocManager), m_sort(false) { if (bHorizOrientation) { @@ -295,7 +295,7 @@ KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, KateTabBarExtension::~KateTabBarExtension() {} -void KateTabBarExtension::slotMoved(Orientation o) +void KateTabBarExtension::slotMoved(Qt::Orientation o) { // the tabbar moved (top, right, bottom, left or fluently) switch (o) { @@ -475,8 +475,8 @@ void KateTabBarExtension::slotViewChanged () // BEGIN KateTabBarExtensionConfigPage KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage( - TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) - : Kate::PluginConfigPage( parentWidget ) + TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index ca668ba..1655e18 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -61,13 +61,14 @@ class MyPtrList : public TQPtrList <KateTabBarButton> class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, - const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, + const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -77,20 +78,21 @@ class KatePluginFactory : public KLibFactory * This class implements a single tab. Every tab represents a document and shows * the current flag (modified: true or false). */ -class KateTabBarButton: public QPushButton +class KateTabBarButton: public TQPushButton { Q_OBJECT + TQ_OBJECT public: /** * constructor * @param pViewManager pointer to kate's the view manager * @param pDoc pointer to the document, that the tab button represents - * @param parent parent widget + * @param tqparent tqparent widget * @param name name of the tab button */ KateTabBarButton(Kate::ViewManager* pViewManager, Kate::Document *pDoc, - TQWidget* parent = 0, const char * name = 0); + TQWidget* tqparent = 0, const char * name = 0); /** * standard destructor (emtpy) @@ -150,9 +152,10 @@ class KateTabBarButton: public QPushButton /** * This class handels all tabs and implements a full-featured "tabbar". */ -class KateTabBarExtension : public QWidget +class KateTabBarExtension : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** @@ -161,13 +164,13 @@ class KateTabBarExtension : public QWidget * @param win pinter to the main window * @param bHorizOrientation true, if orientation is Qt::Horizontal * @param bSort true, if orientation is Qt::Horizontal - * @param parent parent widget + * @param tqparent tqparent widget * @param name name of widget * @param f widget flags */ KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); /** standard destructor */ ~KateTabBarExtension(); @@ -241,11 +244,11 @@ class KateTabBarExtension : public QWidget * called whenever the toolbar's orientation changes * @param o new orientation [Qt::Horizontal or Qt::Vertical] */ - void slotMoved(Orientation o); + void slotMoved(Qt::Orientation o); private: KateTabBarButton* pCurrentTab; ///< pointer to the current tab - TQBoxLayout* top; ///< layout that contains all tabs + TQBoxLayout* top; ///< tqlayout 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 @@ -260,11 +263,12 @@ class KateTabBarExtension : public QWidget class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class KatePluginTabBarExtension; public: - KateTabBarExtensionConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); + KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~KateTabBarExtensionConfigPage (); /** @@ -294,9 +298,10 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - KatePluginTabBarExtension( TQObject* parent = 0, const char* name = 0 ); + KatePluginTabBarExtension( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KatePluginTabBarExtension(); void addView (Kate::MainWindow *win); diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 2d8e446..c003beb 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -44,8 +44,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateTextFilter::PluginKateTextFilter( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ), +PluginKateTextFilter::PluginKateTextFilter( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ), Kate::Command(), m_pFilterShellProcess (NULL) { @@ -95,7 +95,7 @@ splitString (TQString q, char c, TQStringList &list) // PCP int pos; TQString item; - while ( (pos = q.find(c)) >= 0) + while ( (pos = q.tqfind(c)) >= 0) { item = q.left(pos); list.append(item); @@ -130,7 +130,7 @@ slipInNewText (Kate::View & view, TQString pre, TQString marked, TQString post, // TODO: fix OnceAndOnlyOnce between this module and plugin_katehtmltools.cpp - if (reselect && preDeleteLine == line && -1 == marked.find ('\n')) + if (reselect && preDeleteLine == line && -1 == marked.tqfind ('\n')) if (preDeleteLine == line && preDeleteCol == col) { view.setCursorPosition (line, col + pre.length () + marked.length () - 1); @@ -161,7 +161,7 @@ KatePrompt // TODO: Make this a "memory edit" field with a combo box // containing prior entries - KLineEditDlg dlg(strPrompt, TQString::null, that); + KLineEditDlg dlg(strPrompt, TQString(), that); dlg.setCaption(strTitle); KCompletion *comple=dlg.lineEdit()->completionObject(); comple->setItems(*completionList); @@ -333,4 +333,4 @@ bool PluginKateTextFilter::exec( Kate::View *v, const TQString &cmd, TQString &m return true; } //END -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index 2d5678d..a3aed2c 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -33,9 +33,10 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterface, public Kate::Command { Q_OBJECT + TQ_OBJECT public: - PluginKateTextFilter( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateTextFilter( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateTextFilter(); void addView (Kate::MainWindow *win); @@ -62,4 +63,4 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa }; #endif // _PLUGIN_KANT_TEXTFILTER_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 253c9d0..2f94759 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( katexmlcheckplugin, KGenericFactory<PluginKateXMLCheck>( "katexmlcheck" ) ) -PluginKateXMLCheck::PluginKateXMLCheck( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateXMLCheck::PluginKateXMLCheck( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } @@ -94,12 +94,12 @@ void PluginKateXMLCheck::removeView(Kate::MainWindow *win) //--------------------------------- -PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name) - :TQListView(parent,name),KXMLGUIClient(),win(mainwin) +PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name) + :TQListView(tqparent,name),KXMLGUIClient(),win(mainwin) { m_tmp_file=0; m_proc=0; - (void) new KAction ( i18n("Validate XML"), 0, this, + (void) new KAction ( i18n("Validate XML"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" ); // TODO?: //(void) new KAction ( i18n("Indent XML"), 0, this, @@ -109,7 +109,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow setXMLFile("plugins/katexmlcheck/ui.rc"); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); addColumn(i18n("#"), -1); addColumn(i18n("Line"), -1); setColumnAlignment(1, AlignRight); @@ -120,7 +120,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow setResizeMode(TQListView::LastColumn); connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); -/* TODO?: invalidate the listview when document has changed +/* TODO?: tqinvalidate the listview when document has changed Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView(); if( ! kv ) { kdDebug() << "Warning: no Kate::View" << endl; @@ -189,10 +189,10 @@ void PluginKateXMLCheckView::slotProcExited(KProcess*) for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { TQString line = *it; line_count++; - int semicolon_1 = line.find(':'); - int semicolon_2 = line.find(':', semicolon_1+1); - int semicolon_3 = line.find(':', semicolon_2+2); - int caret_pos = line.find('^'); + int semicolon_1 = line.tqfind(':'); + int semicolon_2 = line.tqfind(':', semicolon_1+1); + int semicolon_3 = line.tqfind(':', semicolon_2+2); + int caret_pos = line.tqfind('^'); if( semicolon_1 != -1 && semicolon_2 != -1 && semicolon_3 != -1 ) { linenumber = line.mid(semicolon_1+1, semicolon_2-semicolon_1-1).stripWhiteSpace(); linenumber = linenumber.rightJustify(6, ' '); // for sorting numbers @@ -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'.").arg(m_tmp_file->name())); + "temporary file '%1'.").tqarg(m_tmp_file->name())); delete m_tmp_file; m_tmp_file=0L; return false; @@ -317,7 +317,7 @@ bool PluginKateXMLCheckView::slotValidate() // and needs to be ignored then): TQRegExp re("<!--.*-->"); re.setMinimal(true); - text_start.replace(re, ""); + text_start.tqreplace(re, ""); TQRegExp re_doctype("<!DOCTYPE\\s+(.*)\\s+(?:PUBLIC\\s+[\"'].*[\"']\\s+[\"'](.*)[\"']|SYSTEM\\s+[\"'](.*)[\"'])", false); re_doctype.setMinimal(true); @@ -336,7 +336,7 @@ bool PluginKateXMLCheckView::slotValidate() m_validating = true; *m_proc << "--valid"; } - } else if( text_start.find("<!DOCTYPE") != -1 ) { + } else if( text_start.tqfind("<!DOCTYPE") != -1 ) { // DTD is inside the XML file m_validating = true; *m_proc << "--valid"; diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h index b078f59..89c6c59 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.h +++ b/kate/xmlcheck/plugin_katexmlcheck.h @@ -44,9 +44,10 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name); + PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name); virtual ~PluginKateXMLCheckView(); Kate::MainWindow *win; @@ -72,9 +73,10 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient class PluginKateXMLCheck : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateXMLCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLCheck( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLCheck(); void addView (Kate::MainWindow *win); diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml index f7b48d0..03505ae 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 -- alignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded> + char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded> <text>align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- alignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for alignment char --</text> + char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for tqalignment 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -4909,8 +4909,8 @@ <attlist name="TBODY"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- 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 -- - shape %Shape; rect -- for use with client-side image maps -- + tqshape %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="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -6956,7 +6956,7 @@ <attlist name="H1"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7085,7 +7085,7 @@ <attlist name="H2"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7214,7 +7214,7 @@ <attlist name="H3"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7439,7 +7439,7 @@ <attlist name="H4"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -7716,7 +7716,7 @@ <attlist name="H5"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -8002,7 +8002,7 @@ <attlist name="H6"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -8645,7 +8645,7 @@ <attlist name="P"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- </attdecl> <attribute name="title" type="#IMPLIED" @@ -9871,7 +9871,7 @@ <attlist name="DIV"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text alignment -- + %align; -- align, text tqalignment -- %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 alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- height %Length; #IMPLIED -- frame height -- width %Length; #IMPLIED -- frame width -- </attdecl> @@ -11742,7 +11742,7 @@ <attlist name="AREA"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - shape %Shape; rect -- controls interpretation of coords -- + tqshape %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="shape" +<attribute name="tqshape" 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment -- + align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- %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 bbcf853..063051f 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 -- alignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for alignment char --</text-expanded> + char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for tqalignment char --</text-expanded> <text>align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- alignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for alignment char --</text> + char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for tqalignment 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -4148,8 +4148,8 @@ <attlist name="TBODY"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -4253,8 +4253,8 @@ <attlist name="TFOOT"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 -- - shape %Shape; rect -- for use with client-side image maps -- + tqshape %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="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -8923,8 +8923,8 @@ <attlist name="THEAD"> <attdecl> -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -9624,7 +9624,7 @@ <attlist name="AREA"> <attdecl> %attrs; -- %coreattrs, %i18n, %events -- - shape %Shape; rect -- controls interpretation of coords -- + tqshape %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="shape" +<attribute name="tqshape" 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment in cells -- </attdecl> <attribute name="onmouseout" type="#IMPLIED" @@ -10751,8 +10751,8 @@ <attlist name="TR"> <attdecl> -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal alignment in cells -- - %cellvalign; -- vertical alignment in cells -- + %cellhalign; -- horizontal tqalignment in cells -- + %cellvalign; -- vertical tqalignment 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 bf01b59..65130e9 100644 --- a/kate/xmltools/kde-docbook.dtd.xml +++ b/kate/xmltools/kde-docbook.dtd.xml @@ -845,7 +845,7 @@ <entity name="ulcorn" type="gen"> <text-expanded>&#x231C;</text-expanded> </entity> -<entity name="kfind" type="gen"> +<entity name="ktqfind" type="gen"> <text-expanded> <application>KFind</application> </text-expanded> @@ -4451,7 +4451,7 @@ <element-name name="segmentedlist"/> <element-name name="simplelist"/> <element-name name="variablelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"> +<element name="literaltqlayout"> <content-model-expanded> <or-group occurrence="*"> @@ -4989,7 +4989,7 @@ </or-group> </content-model-expanded> </element> -<attlist name="literallayout"> +<attlist name="literaltqlayout"> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -5488,7 +5488,7 @@ <sequence-group> <or-group occurrence="+"> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -8326,7 +8326,7 @@ <attribute name="xreflabel" type="#IMPLIED" value="CDATA" default=""/> <attribute name="status" type="#IMPLIED" value="CDATA" default=""/> <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="parentbook" type="#IMPLIED" value="IDREF" default=""/> +<attribute name="tqparentbook" type="#IMPLIED" value="IDREF" default=""/> <attribute name="class" type="#IMPLIED" enumeration="yes" value="journalarticle productsheet whitepaper techreport specification faq" default=""/> <attribute name="id" type="#IMPLIED" value="ID" default=""/> <attribute name="role" type="#IMPLIED" value="CDATA" default=""/> @@ -8754,7 +8754,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -17764,7 +17764,7 @@ <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> @@ -17811,7 +17811,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> <element-name name="programlistingco"/> <element-name name="screen"/> @@ -18671,7 +18671,7 @@ <element-name name="simplelist"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <element-name name="programlisting"/> @@ -18776,7 +18776,7 @@ <element-name name="note"/> <element-name name="tip"/> <element-name name="warning"/> -<element-name name="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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="literallayout"/> +<element-name name="literaltqlayout"/> <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 182aeaf..fe5c9f4 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -52,7 +52,7 @@ FIXME: TODO: -check for mem leaks --add "Go to opening/parent tag"? +-add "Go to opening/tqparent tag"? -check doctype to get top-level element -can undo behaviour be improved?, e.g. the plugins internal deletions of text don't have to be an extra step @@ -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 ) + unicode font +-Show expanded entities with TQChar::TQChar( int rc ) + tqunicode 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, ... ) @@ -113,8 +113,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { //kdDebug() << "PluginKateXMLTools constructor called" << endl; @@ -132,7 +132,7 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, cons m_dtds.setAutoDelete( true ); - m_documentManager = ((Kate::Application*)parent)->documentManager(); + m_documentManager = ((Kate::Application*)tqparent)->documentManager(); // connect( m_documentManager, TQT_SIGNAL(documentCreated()), // this, TQT_SLOT(slotDocumentCreated()) ); @@ -239,7 +239,7 @@ void PluginKateXMLTools::backspacePressed() void PluginKateXMLTools::emptyKeyEvent() { - keyEvent( 0, 0, TQString::null ); + keyEvent( 0, 0, TQString() ); } void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) @@ -282,12 +282,12 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) else if( leftCh == "<" ) { kdDebug() << "*outside tag -> get elements" << endl; - TQString parentElement = getParentElement( *kv, true ); - kdDebug() << "parent: " << parentElement << endl; - allowed = m_docDtds[docNumber]->allowedElements(parentElement ); + TQString tqparentElement = getParentElement( *kv, true ); + kdDebug() << "tqparent: " << tqparentElement << endl; + allowed = m_docDtds[docNumber]->allowedElements(tqparentElement ); m_mode = elements; } - // TODO: optionally close parent tag if not left=="/>" + // TODO: optionally close tqparent tag if not left=="/>" else if( leftCh == " " || (isQuote(leftCh) && secondLeftCh == "=") ) { // TODO: check secondLeftChar, too?! then you don't need to trigger @@ -330,7 +330,7 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) if( allowed.count() >= 1 && allowed[0] != "__EMPTY" ) { - allowed = sortQStringList( allowed ); + allowed = sortTQStringList( allowed ); connectSlots( kv ); kv->showCompletionBox( stringListToCompletionEntryList( allowed ), 0, false ); m_popupOpenCol = col; @@ -440,8 +440,8 @@ void PluginKateXMLTools::getDTD() else if ( doctype == "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" ) filename = "kde-docbook.dtd.xml"; } - else if( documentStart.find("<xsl:stylesheet" ) != -1 && - documentStart.find( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) + else if( documentStart.tqfind("<xsl:stylesheet" ) != -1 && + documentStart.tqfind( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) { /* XSLT doesn't have a doctype/DTD. We look for an xsl:stylesheet tag instead. Example: @@ -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.").arg( doctype ), + "will now be loaded.").tqarg( doctype ), i18n( "Loading XML Meta DTD" ), - TQString::fromLatin1( "DTDAssigned") ); + TQString::tqfromLatin1( "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.").arg( m_urlString ), + "The server returned an error.").tqarg( m_urlString ), i18n( "XML Plugin Error") ); } else @@ -528,7 +528,7 @@ void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data ) void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ) { - m_docDtds.replace( doc->documentNumber(), dtd ); + m_docDtds.tqreplace( doc->documentNumber(), dtd ); connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), this, TQT_SLOT(keyEvent(int,int,const TQString&)) ); @@ -555,11 +555,11 @@ void PluginKateXMLTools::slotInsertElement() } PseudoDTD *dtd = m_docDtds[kv->document()->documentNumber()]; - TQString parentElement = getParentElement( *kv, false ); + TQString tqparentElement = getParentElement( *kv, false ); TQStringList allowed; if( dtd ) - allowed = dtd->allowedElements(parentElement ); + allowed = dtd->allowedElements(tqparentElement ); InsertElement *dialog = new InsertElement( ( TQWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" ); @@ -579,7 +579,7 @@ void PluginKateXMLTools::slotInsertElement() if ( dtd && dtd->allowedAttributes(list[0]).count() ) adjust++; // the ">" - if ( dtd && dtd->allowedElements(list[0]).contains("__EMPTY") ) + if ( dtd && dtd->allowedElements(list[0]).tqcontains("__EMPTY") ) { pre = "<" + text + "/>"; if ( adjust ) @@ -603,7 +603,7 @@ void PluginKateXMLTools::slotInsertElement() } /** - * Insert a closing tag for the nearest not-closed parent element. + * Insert a closing tag for the nearest not-closed tqparent element. */ void PluginKateXMLTools::slotCloseElement() { @@ -616,11 +616,11 @@ void PluginKateXMLTools::slotCloseElement() kdDebug() << "Warning: no Kate::View" << endl; return; } - TQString parentElement = getParentElement( *kv, false ); + TQString tqparentElement = getParentElement( *kv, false ); - //kdDebug() << "parentElement: '" << parentElement << "'" << endl; - TQString closeTag = "</" + parentElement + ">"; - if( ! parentElement.isEmpty() ) + //kdDebug() << "tqparentElement: '" << tqparentElement << "'" << endl; + TQString closeTag = "</" + tqparentElement + ">"; + if( ! tqparentElement.isEmpty() ) kv->insertText( closeTag ); } @@ -708,7 +708,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, T // anders: if the tag is marked EMPTY, insert in form <tagname/> TQString str; int docNumber = kv->document()->documentNumber(); - bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).contains( "__EMPTY" ); + bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).tqcontains( "__EMPTY" ); if ( isEmptyTag ) str = "/>"; else @@ -895,10 +895,10 @@ TQString PluginKateXMLTools::insideAttribute( Kate::View &kv ) } /** - * Find the parent element for the current cursor position. That is, + * Find the tqparent element for the current cursor position. That is, * go left and find the first opening element that's not closed yet, * ignoring empty elements. - * Examples: If cursor is at "X", the correct parent element is "p": + * Examples: If cursor is at "X", the correct tqparent element is "p": * <p> <a x="xyz"> foo <i> test </i> bar </a> X * <p> <a x="xyz"> foo bar </a> X * <p> foo <img/> bar X @@ -930,14 +930,14 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle { do { - if( !line-- ) return TQString::null; // reached start of document + if( !line-- ) return TQString(); // reached start of document str = kv.getDoc()->textLine(line ); col = str.length(); } while( !col ); --col; } - ushort ch = str.at( col).unicode(); + ushort ch = str.tqat( col).tqunicode(); switch( parseState ) { @@ -950,7 +950,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle { case '<': // hmm... we were actually inside an element - return TQString::null; + return TQString(); case '>': // we just hit an element boundary @@ -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.at( pos).unicode(); + ch = tag.tqat( pos).tqunicode(); if( ch == ' ' || ch == '\t' || ch == '>' ) { tag.truncate( pos ); break; @@ -1069,14 +1069,14 @@ bool PluginKateXMLTools::isQuote( TQString ch ) // Tools: /** Sort a TQStringList case-insensitively. Static. TODO: make it more simple. */ -TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { - // Sort list case-insensitive. This looks complicated but using a QMap - // is even suggested by the Qt documentation. +TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) { + // Sort list case-insensitive. This looks complicated but using a TQMap + // is even suggested by the TQt documentation. TQMap<TQString,TQString> mapList; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { TQString str = *it; - if( mapList.contains(str.lower()) ) + if( mapList.tqcontains(str.lower()) ) { // do not override a previous value, e.g. "Auml" and "auml" are two different // entities, but they should be sorted next to each other. @@ -1091,7 +1091,7 @@ TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { list.clear(); TQMap<TQString,TQString>::Iterator it; - // Qt doc: "the items are alphabetically sorted [by key] when iterating over the map": + // TQt doc: "the items are alphabetically sorted [by key] when iterating over the map": for( it = mapList.begin(); it != mapList.end(); ++it ) list.append( it.data() ); @@ -1099,8 +1099,8 @@ TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { } //BEGIN InsertElement dialog -InsertElement::InsertElement( TQWidget *parent, const char *name ) - :KDialogBase( parent, name, true, i18n("Insert XML Element" ), +InsertElement::InsertElement( TQWidget *tqparent, const char *name ) + :KDialogBase( tqparent, name, true, i18n("Insert XML Element" ), KDialogBase::Ok|KDialogBase::Cancel) { } @@ -1135,7 +1135,7 @@ TQString InsertElement::showDialog( TQStringList &completions ) if( exec() ) return combo->currentText(); - return TQString::null; + return TQString(); } //END InsertElement dialog -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 843ab15..e3a6c51 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -49,10 +49,11 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); @@ -80,7 +81,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface protected: - static TQStringList sortQStringList( TQStringList list ); + static TQStringList sortTQStringList( TQStringList list ); //bool eventFilter( TQObject *object, TQEvent *event ); TQString insideTag( Kate::View &kv ); @@ -136,9 +137,10 @@ class InsertElement : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - InsertElement( TQWidget *parent, const char *name ); + InsertElement( TQWidget *tqparent, const char *name ); ~InsertElement(); TQString showDialog( TQStringList &completions ); private slots: @@ -147,4 +149,4 @@ class InsertElement : public KDialogBase }; #endif // _PLUGIN_KANT_XMLTOOLS_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 05ac58a..b6cc9b0 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.").arg( metaDtdUrl ), + "Please check that the file is well-formed XML.").tqarg( 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.").arg( metaDtdUrl ), + "See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ), i18n("XML Plugin Error") ); return; } @@ -73,7 +73,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) progress.setMinimumDuration( 400 ); progress.setProgress(0); - // Get information from meta DTD and put it in Qt data structures for fast access: + // Get information from meta DTD and put it in TQt data structures for fast access: if( ! parseEntities( &doc, &progress ) ) return; @@ -116,7 +116,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) progress->setProgress( progress->progress()+1 ); // FIXME!: - //qApp->processEvents(); + //tqApp->processEvents(); subelementList.clear(); TQDomNode node = list.item( i ); @@ -169,7 +169,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) TQDomElement subElem = subNode.toElement(); if( !subElem.isNull() ) { - TQMap<TQString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) ); + TQMap<TQString,bool>::Iterator it = subelementList.tqfind( subElem.attribute( "name" ) ); if( it != subelementList.end() ) subelementList.remove(it); } @@ -192,11 +192,11 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) } /** - * Check which elements are allowed inside a parent element. This returns + * Check which elements are allowed inside a tqparent element. This returns * a list of allowed elements, but it doesn't care about order or if only a certain * number of occurences is allowed. */ -TQStringList PseudoDTD::allowedElements( TQString parentElement ) +TQStringList PseudoDTD::allowedElements( TQString tqparentElement ) { if( m_sgmlSupport ) { @@ -204,12 +204,12 @@ TQStringList PseudoDTD::allowedElements( TQString parentElement ) TQMap<TQString,TQStringList>::Iterator it; for( it = m_elementsList.begin(); it != m_elementsList.end(); ++it ) { - if( it.key().lower() == parentElement.lower() ) + if( it.key().lower() == tqparentElement.lower() ) return it.data(); } } - else if( m_elementsList.contains(parentElement) ) - return m_elementsList[parentElement]; + else if( m_elementsList.tqcontains(tqparentElement) ) + return m_elementsList[tqparentElement]; return TQStringList(); } @@ -232,7 +232,7 @@ bool PseudoDTD::parseAttributes( TQDomDocument *doc, TQProgressDialog *progress progress->setProgress( progress->progress()+1 ); // FIXME!! - //qApp->processEvents(); + //tqApp->processEvents(); ElementAttributes attrs; TQDomNode node = list.item(i); @@ -248,7 +248,7 @@ bool PseudoDTD::parseAttributes( TQDomDocument *doc, TQProgressDialog *progress if( ! attributeElem.isNull() ) { - if ( attributeElem.attribute("type") == "#REQUIRED" ) + if ( attributeElem.attribute("type") == "#RETQUIRED" ) attrs.requiredAttributes.append( attributeElem.attribute("name") ); else attrs.optionalAttributes.append( attributeElem.attribute("name") ); @@ -275,7 +275,7 @@ TQStringList PseudoDTD::allowedAttributes( TQString element ) } } } - else if( m_attributesList.contains(element) ) + else if( m_attributesList.tqcontains(element) ) return m_attributesList[element].optionalAttributes + m_attributesList[element].requiredAttributes; return TQStringList(); @@ -292,7 +292,7 @@ TQStringList PseudoDTD::requiredAttributes( const TQString &element ) const return it.data().requiredAttributes; } } - else if( m_attributesList.contains(element) ) + else if( m_attributesList.tqcontains(element) ) return m_attributesList[element].requiredAttributes; return TQStringList(); @@ -316,7 +316,7 @@ bool PseudoDTD::parseAttributeValues( TQDomDocument *doc, TQProgressDialog *prog progress->setProgress( progress->progress()+1 ); // FIXME! - //qApp->processEvents(); + //tqApp->processEvents(); attributevaluesTmp.clear(); TQDomNode node = list.item(i); @@ -369,10 +369,10 @@ TQStringList PseudoDTD::attributeValues( TQString element, TQString attribute ) } } } - else if( m_attributevaluesList.contains(element) ) + else if( m_attributevaluesList.tqcontains(element) ) { TQMap<TQString,TQStringList> attrVals = m_attributevaluesList[element]; - if( attrVals.contains(attribute) ) + if( attrVals.tqcontains(attribute) ) return attrVals[attribute]; } @@ -397,7 +397,7 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress ) progress->setProgress( progress->progress()+1 ); //FIXME!! - //qApp->processEvents(); + //tqApp->processEvents(); TQDomNode node = list.item(i); TQDomElement elem = node.toElement(); if( !elem.isNull() @@ -410,15 +410,15 @@ 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 unicode font problem is solved: - if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { + /* TODO include do this when the tqunicode font problem is solved: + if( exp.tqcontains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { // hexadecimal numbers, e.g. "ȶ" - uint end = exp.find( ";" ); + uint end = exp.tqfind( ";" ); exp = exp.mid( 3, end-3 ); exp = TQChar(); - } else if( exp.contains(TQRegExp("^&#[0-9]+;$")) ) { + } else if( exp.tqcontains(TQRegExp("^&#[0-9]+;$")) ) { // decimal numbers, e.g. "ì" - uint end = exp.find( ";" ); + uint end = exp.tqfind( ";" ); exp = exp.mid( 2, end-2 ); exp = TQChar( exp.toInt() ); } @@ -445,7 +445,7 @@ TQStringList PseudoDTD::entities( TQString start ) if( (*it).startsWith(start) ) { TQString str = it.key(); - /* TODO: show entities as unicode character + /* TODO: show entities as tqunicode character if( !it.data().isEmpty() ) { //str += " -- " + it.data(); TQRegExp re( "&#(\\d+);" ); @@ -463,4 +463,4 @@ TQStringList PseudoDTD::entities( TQString start ) return entities; } -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h index 5da444c..f798bea 100644 --- a/kate/xmltools/pseudo_dtd.h +++ b/kate/xmltools/pseudo_dtd.h @@ -46,11 +46,11 @@ class PseudoDTD void analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ); - TQStringList allowedElements( TQString parentElement ); - TQStringList allowedAttributes( TQString parentElement ); + TQStringList allowedElements( TQString tqparentElement ); + TQStringList allowedAttributes( TQString tqparentElement ); TQStringList attributeValues( TQString element, TQString attribute ); TQStringList entities( TQString start ); - TQStringList requiredAttributes( const TQString &parentElement ) const; + TQStringList requiredAttributes( const TQString &tqparentElement ) const; protected: @@ -73,4 +73,4 @@ class PseudoDTD }; #endif // _PLUGIN_KANT_XMLTOOLS_DTD_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index aa1e7dd..9828751 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 shape=""> circle, default, poly, rect + <area tqshape=""> circle, default, poly, rect <area foobar=""> (no predefined values) 6. Type "&". A list with named entities should appear. Select one and @@ -62,7 +62,7 @@ it should be inserted, including the trailing semicolon. <a href="foo"> blah <em>X -- <a> inside <a> is not allowed, but this limitation is not part of the DTD, so the plugin will incorrectly claim that <a> is allowed at "X". <head><title> foobar</title> X -- <title> is only allowed once, but the plugin - only looks for the parent element (<head> in this case) and ignores the existing <title>. + only looks for the tqparent element (<head> in this case) and ignores the existing <title>. <a href="foo" X > -- an attribute may only appear once, but "href" is listed by the plugin although it's used already. <td align = "X"> -- whitespace around '=' is not recognized although it's legal. diff --git a/kate/xmltools/xhtml1-frameset.dtd.xml b/kate/xmltools/xhtml1-frameset.dtd.xml index 6530334..73bf4bc 100644 --- a/kate/xmltools/xhtml1-frameset.dtd.xml +++ b/kate/xmltools/xhtml1-frameset.dtd.xml @@ -7533,7 +7533,7 @@ <attdecl> %attrs; %focus; - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7608,7 +7608,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -12001,7 +12001,7 @@ hreflang %LanguageCode; #IMPLIED rel %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED target %FrameTarget; #IMPLIED </attdecl> @@ -12097,7 +12097,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" 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 907cd86..850de19 100644 --- a/kate/xmltools/xhtml1-strict.dtd.xml +++ b/kate/xmltools/xhtml1-strict.dtd.xml @@ -6190,7 +6190,7 @@ <attdecl> %attrs; %focus; - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -6260,7 +6260,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -9838,7 +9838,7 @@ hreflang %LanguageCode; #IMPLIED rel %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED </attdecl> <attribute name="rev" @@ -9929,7 +9929,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" 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 9506803..5f04e87 100644 --- a/kate/xmltools/xhtml1-transitional.dtd.xml +++ b/kate/xmltools/xhtml1-transitional.dtd.xml @@ -7600,7 +7600,7 @@ <attdecl> %attrs; %focus; - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7675,7 +7675,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" @@ -11940,7 +11940,7 @@ hreflang %LanguageCode; #IMPLIED rel %LinkTypes; #IMPLIED rev %LinkTypes; #IMPLIED - shape %Shape; "rect" + tqshape %Shape; "rect" coords %Coords; #IMPLIED target %FrameTarget; #IMPLIED </attdecl> @@ -12036,7 +12036,7 @@ type="#IMPLIED" value="CDATA" default=""/> -<attribute name="shape" +<attribute name="tqshape" type="" enumeration="yes" value="rect circle poly default" diff --git a/kfile-plugins/cert/kfile_cert.cpp b/kfile-plugins/cert/kfile_cert.cpp index 8a711ba..4175240 100644 --- a/kfile-plugins/cert/kfile_cert.cpp +++ b/kfile-plugins/cert/kfile_cert.cpp @@ -39,8 +39,8 @@ typedef KGenericFactory<CertPlugin> CertFactory; K_EXPORT_COMPONENT_FACTORY(kfile_cert, CertFactory("kfile-cert")) -CertPlugin::CertPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) +CertPlugin::CertPlugin(TQObject *tqparent, const char *name, const TQStringList &args) + : KFilePlugin(tqparent, name, args) { //add the mimetype here - example: //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" ); @@ -110,10 +110,10 @@ static KSSLCertificate *readCertFromFile(const TQString &path) KOSSL::self()->ERR_clear_error(); const char *begin_line = "-----BEGIN CERTIFICATE-----\n"; const char *end_line = "\n-----END CERTIFICATE-----"; - int begin_pos = file_string.find(begin_line); + int begin_pos = file_string.tqfind(begin_line); if (begin_pos >= 0) { begin_pos += strlen(begin_line); - int end_pos = file_string.find(end_line, begin_pos); + int end_pos = file_string.tqfind(end_line, begin_pos); if (end_pos >= 0) { // read the data between begin and end lines TQCString body = file_string.mid(begin_pos, end_pos - begin_pos); diff --git a/kfile-plugins/cert/kfile_cert.h b/kfile-plugins/cert/kfile_cert.h index 30607eb..2991674 100644 --- a/kfile-plugins/cert/kfile_cert.h +++ b/kfile-plugins/cert/kfile_cert.h @@ -31,10 +31,11 @@ class TQString; class CertPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT private: void appendDNItems(KFileMetaInfoGroup &group, const TQString &DN); public: - CertPlugin(TQObject *parent, const char *name, const TQStringList& args); + CertPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/desktop/kfile_desktop.cpp b/kfile-plugins/desktop/kfile_desktop.cpp index 5c56d9e..5d2c9cc 100644 --- a/kfile-plugins/desktop/kfile_desktop.cpp +++ b/kfile-plugins/desktop/kfile_desktop.cpp @@ -30,9 +30,9 @@ typedef KGenericFactory<KDotDesktopPlugin> DotDesktopFactory; K_EXPORT_COMPONENT_FACTORY(kfile_desktop, DotDesktopFactory("kfile_desktop")) -KDotDesktopPlugin::KDotDesktopPlugin(TQObject *parent, const char *name, +KDotDesktopPlugin::KDotDesktopPlugin(TQObject *tqparent, const char *name, const TQStringList &preferredItems) - : KFilePlugin(parent, name, preferredItems) + : KFilePlugin(tqparent, name, preferredItems) { kdDebug(7034) << ".desktop plugin\n"; diff --git a/kfile-plugins/desktop/kfile_desktop.h b/kfile-plugins/desktop/kfile_desktop.h index 7de277b..f4d6b25 100644 --- a/kfile-plugins/desktop/kfile_desktop.h +++ b/kfile-plugins/desktop/kfile_desktop.h @@ -28,9 +28,10 @@ class TQStringList; class KDotDesktopPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KDotDesktopPlugin( TQObject *parent, const char *name, + KDotDesktopPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo ( KFileMetaInfo& info, uint what ); diff --git a/kfile-plugins/folder/kfile_folder.cpp b/kfile-plugins/folder/kfile_folder.cpp index fe4ea9a..8b08084 100644 --- a/kfile-plugins/folder/kfile_folder.cpp +++ b/kfile-plugins/folder/kfile_folder.cpp @@ -30,10 +30,10 @@ typedef KGenericFactory<KFolderPlugin> KFolderFactory; K_EXPORT_COMPONENT_FACTORY(kfile_folder, KFolderFactory( "kfile_folder" )) -KFolderPlugin::KFolderPlugin(TQObject *parent, const char *name, +KFolderPlugin::KFolderPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "inode/directory" ); diff --git a/kfile-plugins/folder/kfile_folder.h b/kfile-plugins/folder/kfile_folder.h index 37487e4..ff3f241 100644 --- a/kfile-plugins/folder/kfile_folder.h +++ b/kfile-plugins/folder/kfile_folder.h @@ -27,9 +27,10 @@ class TQStringList; class KFolderPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KFolderPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KFolderPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/html/kfile_html.cpp b/kfile-plugins/html/kfile_html.cpp index 5adddfc..d49d184 100644 --- a/kfile-plugins/html/kfile_html.cpp +++ b/kfile-plugins/html/kfile_html.cpp @@ -34,9 +34,9 @@ typedef KGenericFactory<KHtmlPlugin> HtmlFactory; K_EXPORT_COMPONENT_FACTORY( kfile_html, HtmlFactory( "kfile_html" ) ) -KHtmlPlugin::KHtmlPlugin( TQObject *parent, const char *name, +KHtmlPlugin::KHtmlPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) + : KFilePlugin( tqparent, name, args ) { kdDebug(7034) << "html plugin\n"; @@ -69,7 +69,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) // or until <body> if the author forgot it // In this case, it's better to limit the size of the buffer to something // sensible. Think a 0-filled 3GB file with an .html extension. - int maxBufSize = QMIN(f.size(), 32768); + int maxBufSize = TQMIN(f.size(), 32768); TQByteArray data(maxBufSize + 1); f.readBlock(data.data(), maxBufSize); data[maxBufSize]='\0'; @@ -86,7 +86,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) exp.setPattern("\\s*<\\s*!doctype\\s*([^>]*)\\s*>"); if (exp.search(s, last) != -1) { - kdDebug(7034) << "DocType: " << exp.capturedTexts().join("-") << endl; + kdDebug(7034) << "DocType: " << TQString(exp.capturedTexts().join("-")) << endl; appendItem(group, "Doctype", exp.cap(1)); last += exp.matchedLength(); } @@ -151,7 +151,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) // find out if it contains javascript exp.setPattern("<script>"); - appendItem(group, "Javascript", TQVariant( s.find(exp)!=-1, 42)); + appendItem(group, "Javascript", TQVariant( s.tqfind(exp)!=-1, 42)); return true; } diff --git a/kfile-plugins/html/kfile_html.h b/kfile-plugins/html/kfile_html.h index 5034d53..1f23eae 100644 --- a/kfile-plugins/html/kfile_html.h +++ b/kfile-plugins/html/kfile_html.h @@ -29,9 +29,10 @@ class TQStringList; class KHtmlPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KHtmlPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KHtmlPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what ); }; diff --git a/kfile-plugins/lnk/kfile_lnk.cpp b/kfile-plugins/lnk/kfile_lnk.cpp index eb9e106..46e8b9d 100644 --- a/kfile-plugins/lnk/kfile_lnk.cpp +++ b/kfile-plugins/lnk/kfile_lnk.cpp @@ -35,9 +35,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_lnk, lnkFactory( "kfile_lnk" )) //-------------------------------------------------------------------------------- -lnkPlugin::lnkPlugin(TQObject *parent, const char *name, +lnkPlugin::lnkPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-win-lnk" ); @@ -75,8 +75,8 @@ bool lnkPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) if ( ! lnkInfo.isNetworkPath ) { - 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)); + 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)); } else { diff --git a/kfile-plugins/lnk/kfile_lnk.h b/kfile-plugins/lnk/kfile_lnk.h index 3bb7a8f..bc8b832 100644 --- a/kfile-plugins/lnk/kfile_lnk.h +++ b/kfile-plugins/lnk/kfile_lnk.h @@ -35,9 +35,10 @@ class TQStringList; class lnkPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - lnkPlugin( TQObject *parent, const char *name, const TQStringList& args ); + lnkPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/lnk/lnkforward.cpp b/kfile-plugins/lnk/lnkforward.cpp index af4492b..9eb6af0 100644 --- a/kfile-plugins/lnk/lnkforward.cpp +++ b/kfile-plugins/lnk/lnkforward.cpp @@ -72,7 +72,7 @@ int LNKForwarder::run(KCmdLineArgs *args) bool ret = readLNK(args->arg(0), info); if ( ! ret ) return 1; - info.path.replace(TQChar('\\'), TQChar('/')); + info.path.tqreplace(TQChar('\\'), TQChar('/')); TQString path; diff --git a/kfile-plugins/lnk/lnkforward.h b/kfile-plugins/lnk/lnkforward.h index 8810902..9d0a510 100644 --- a/kfile-plugins/lnk/lnkforward.h +++ b/kfile-plugins/lnk/lnkforward.h @@ -31,6 +31,7 @@ class LNKForwarder : public KApplication { Q_OBJECT + TQ_OBJECT public: int run(KCmdLineArgs *args); diff --git a/kfile-plugins/lnk/read_lnk.cpp b/kfile-plugins/lnk/read_lnk.cpp index f65b657..645486e 100644 --- a/kfile-plugins/lnk/read_lnk.cpp +++ b/kfile-plugins/lnk/read_lnk.cpp @@ -33,27 +33,27 @@ struct LNKHeader { char magic[4]; char GUID[16]; - Q_UINT32 flags; - Q_UINT32 attributes; + TQ_UINT32 flags; + TQ_UINT32 attributes; char time1[8]; char time2[8]; char time3[8]; - Q_UINT32 length; - Q_UINT32 iconNum; - Q_UINT32 showWnd; - Q_UINT32 hotKey; + TQ_UINT32 length; + TQ_UINT32 iconNum; + TQ_UINT32 showWnd; + TQ_UINT32 hotKey; char filler[8]; }; struct LNKFileLocation { - Q_UINT32 totalLen; - Q_UINT32 ptr; - Q_UINT32 flags; - Q_UINT32 localVolume; - Q_UINT32 basePath; - Q_UINT32 netVolume; - Q_UINT32 pathname; + TQ_UINT32 totalLen; + TQ_UINT32 ptr; + TQ_UINT32 flags; + TQ_UINT32 localVolume; + TQ_UINT32 basePath; + TQ_UINT32 netVolume; + TQ_UINT32 pathname; }; //-------------------------------------------------------------------------------- @@ -97,7 +97,7 @@ bool readLNK(const KURL &url, LNKInfo &info) if ( header.flags & 0x1 ) // the shell item id list is present { - Q_UINT16 len; + TQ_UINT16 len; // skip that list if ( (fread(&len, sizeof(len), 1, fd) != 1) || (fseek(fd, len, SEEK_CUR) != 0) ) @@ -156,7 +156,7 @@ bool readLNK(const KURL &url, LNKInfo &info) { info.volumeName = (start + loc.localVolume + 0x10); // volume label - info.path = TQString::null; + info.path = TQString(); if ( *(start + loc.basePath) ) { @@ -182,8 +182,8 @@ bool readLNK(const KURL &url, LNKInfo &info) else // network path { info.path = TQString("%1\\%2") - .arg(start + loc.netVolume + 0x14) // network share name - .arg(start + loc.pathname); + .tqarg(start + loc.netVolume + 0x14) // network share name + .tqarg(start + loc.pathname); } delete [] data; @@ -191,7 +191,7 @@ bool readLNK(const KURL &url, LNKInfo &info) if ( header.flags & 0x4 ) // has description string { - Q_UINT16 len; + TQ_UINT16 len; if ( fread(&len, sizeof(len), 1, fd) != 1 ) { diff --git a/kfile-plugins/lnk/read_lnk.h b/kfile-plugins/lnk/read_lnk.h index ff8fe63..96f3226 100644 --- a/kfile-plugins/lnk/read_lnk.h +++ b/kfile-plugins/lnk/read_lnk.h @@ -31,7 +31,7 @@ struct LNKInfo { LNKInfo() : fileSize(0), isNetworkPath(false), isDirectory(false), isFileOrDir(false) {} - Q_UINT32 fileSize; + TQ_UINT32 fileSize; bool isNetworkPath; bool isDirectory; bool isFileOrDir; diff --git a/kfile-plugins/mhtml/kfile_mhtml.cpp b/kfile-plugins/mhtml/kfile_mhtml.cpp index 0a07ea9..96da46e 100644 --- a/kfile-plugins/mhtml/kfile_mhtml.cpp +++ b/kfile-plugins/mhtml/kfile_mhtml.cpp @@ -34,9 +34,9 @@ typedef KGenericFactory<mhtmlPlugin> mhtmlFactory; K_EXPORT_COMPONENT_FACTORY(kfile_mhtml, mhtmlFactory( "kfile_mhtml" )) -mhtmlPlugin::mhtmlPlugin(TQObject *parent, const char *name, +mhtmlPlugin::mhtmlPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-mimearchive" ); KFileMimeTypeInfo::GroupInfo* group = 0L; @@ -120,21 +120,21 @@ bool mhtmlPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) } TQString mhtmlPlugin::decodeRFC2047Phrase(const TQString &msg, bool removeLessGreater){ - int st=msg.find("=?"); + int st=msg.tqfind("=?"); int en=-1; TQString msgCopy=msg; TQString decodedText=msgCopy.left(st); TQString encodedText=msgCopy.mid(st); - st=encodedText.find("=?"); + st=encodedText.tqfind("=?"); while(st!=-1){ - en=encodedText.find("?="); - while(encodedText.mid(en+2,1)!=" " && en+2<(int)encodedText.length()) en=encodedText.find("?=",en+1); + en=encodedText.tqfind("?="); + while(encodedText.mid(en+2,1)!=" " && en+2<(int)encodedText.length()) en=encodedText.tqfind("?=",en+1); if(en==-1) break; decodedText+=encodedText.left(st); TQString tmp=encodedText.mid(st,en-st+2); encodedText=encodedText.mid(en+2); decodedText+=decodeRFC2047String(tmp); - st=encodedText.find("=?",st+1); + st=encodedText.tqfind("=?",st+1); } decodedText += encodedText; // remove unwanted '<' and '>' @@ -147,12 +147,12 @@ TQString mhtmlPlugin::decodeRFC2047Phrase(const TQString &msg, bool removeLessGr TQString dec=decodedText; TQString tmp; - st=decodedText.find("<"); + st=decodedText.tqfind("<"); while(st!=-1){ - st=dec.find("<",st); + st=dec.tqfind("<",st); if(st==0 || (st!=0 && (dec.mid(st-2,2)==", "))){ - en=dec.find(">",st); - if(en==-1 && dec.find(",",st)<en){ + en=dec.tqfind(">",st); + if(en==-1 && dec.tqfind(",",st)<en){ st++; continue; } @@ -172,17 +172,17 @@ TQString mhtmlPlugin::decodeRFC2047String(const TQString &msg){ TQString encodedText; TQString decodedText; int encEnd=0; - if(msg.startsWith("=?") && (encEnd=msg.findRev("?="))!=-1){ + if(msg.startsWith("=?") && (encEnd=msg.tqfindRev("?="))!=-1){ notEncodedText=msg.mid(encEnd+2); encodedText=msg.left(encEnd); encodedText=encodedText.mid(2,encodedText.length()-2); - int questionMark=encodedText.find('?'); + int questionMark=encodedText.tqfind('?'); if(questionMark==-1) return msg; charset=encodedText.left(questionMark).lower(); encoding=encodedText.mid(questionMark+1,1).lower(); if(encoding!="b" && encoding!="q") return msg; encodedText=encodedText.mid(questionMark+3); - if(charset.find(" ")!=-1 && encodedText.find(" ")!=-1) return msg; + if(charset.tqfind(" ")!=-1 && encodedText.tqfind(" ")!=-1) return msg; TQCString tmpIn; TQCString tmpOut; tmpIn = encodedText.local8Bit(); @@ -192,8 +192,8 @@ TQString mhtmlPlugin::decodeRFC2047String(const TQString &msg){ TQTextCodec *codec = TQTextCodec::codecForName(charset.local8Bit()); if(!codec) return msg; decodedText=codec->toUnicode(tmpOut); - decodedText=decodedText.replace("_"," "); - }else decodedText=tmpOut.replace("_"," "); + decodedText=decodedText.tqreplace("_"," "); + }else decodedText=tmpOut.tqreplace("_"," "); return decodedText + notEncodedText; }else return msg; } diff --git a/kfile-plugins/mhtml/kfile_mhtml.h b/kfile-plugins/mhtml/kfile_mhtml.h index 954cd07..217ddf1 100644 --- a/kfile-plugins/mhtml/kfile_mhtml.h +++ b/kfile-plugins/mhtml/kfile_mhtml.h @@ -32,9 +32,10 @@ class TQStringList; class mhtmlPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - mhtmlPlugin( TQObject *parent, const char *name, const TQStringList& args ); + mhtmlPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); private: TQString decodeRFC2047Phrase(const TQString &msg, bool removeLessGreater=TRUE); diff --git a/kfile-plugins/txt/kfile_txt.cpp b/kfile-plugins/txt/kfile_txt.cpp index fbd1c8b..47f0d64 100644 --- a/kfile-plugins/txt/kfile_txt.cpp +++ b/kfile-plugins/txt/kfile_txt.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory<KTxtPlugin> TxtFactory; K_EXPORT_COMPONENT_FACTORY(kfile_txt, TxtFactory("kfile_txt")) -KTxtPlugin::KTxtPlugin(TQObject *parent, const char *name, - const TQStringList &args) : KFilePlugin(parent, name, args) +KTxtPlugin::KTxtPlugin(TQObject *tqparent, const char *name, + const TQStringList &args) : KFilePlugin(tqparent, name, args) { kdDebug(7034) << "Text file meta info plugin\n"; makeMimeTypeInfo( "text/plain" ); diff --git a/kfile-plugins/txt/kfile_txt.h b/kfile-plugins/txt/kfile_txt.h index ab7a206..c765a83 100644 --- a/kfile-plugins/txt/kfile_txt.h +++ b/kfile-plugins/txt/kfile_txt.h @@ -27,9 +27,10 @@ class TQStringList; class KTxtPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KTxtPlugin(TQObject *parent, const char *name, const TQStringList& args); + KTxtPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp index c87e11a..7adef9e 100644 --- a/kicker-applets/kbinaryclock/datepicker.cpp +++ b/kicker-applets/kbinaryclock/datepicker.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kwin.h> -DatePicker::DatePicker(TQWidget *parent, const TQDate& date) - : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | +DatePicker::DatePicker(TQWidget *tqparent, const TQDate& date) + : TQVBox( tqparent, 0, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); @@ -46,6 +46,6 @@ DatePicker::DatePicker(TQWidget *parent, const TQDate& date) void DatePicker::keyReleaseEvent(TQKeyEvent *e) { DATEPICKER_INHERITED::keyReleaseEvent(e); - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) close(); } diff --git a/kicker-applets/kbinaryclock/datepicker.h b/kicker-applets/kbinaryclock/datepicker.h index b21cafe..d83b8a0 100644 --- a/kicker-applets/kbinaryclock/datepicker.h +++ b/kicker-applets/kbinaryclock/datepicker.h @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQDate; class KDatePicker; -#define DATEPICKER_INHERITED QVBox -class DatePicker : public QVBox +#define DATEPICKER_INHERITED TQVBox +class DatePicker : public TQVBox { public: DatePicker(TQWidget*, const TQDate&); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 30682e4..2e46273 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -41,15 +41,15 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { + KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue( "kbinaryclock"); return new KBinaryClock( configFile, KPanelApplet::Normal, - KPanelApplet::Preferences, parent, "kbinaryclock"); + KPanelApplet::Preferences, tqparent, "kbinaryclock"); } } -KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : - KConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) +KConfigDialogImp::KConfigDialogImp( TQWidget *tqparent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : + KConfigDialog(tqparent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) { // As a temporary mesure until the kicker applet's app name is set to the // applets name so KDialogBase gets the right info. @@ -61,14 +61,14 @@ KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigS connect(this, TQT_SIGNAL(widgetModified()), settings, TQT_SLOT(updatePreview())); } -SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){ +SettingsImp::SettingsImp(TQWidget* tqparent, const char* name, WFlags fl): Settings(tqparent, name, fl){ } /** * Update the preview */ void SettingsImp::updatePreview(){ - int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular; + int tqshape = 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)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->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->setColor(color); kLed2->setColor(color); @@ -116,8 +116,8 @@ void SettingsImp::updatePreview(){ /** * Constructor, create LED's */ -KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name), ledWidth(6), +KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name), ledWidth(6), _calendar(NULL), _disableCalendar(false), prefs( new Prefs(sharedConfig())), m_tooltip(this) { @@ -173,14 +173,14 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) { * Load the settings for the clock. */ void KBinaryClock::loadSettings(){ - int shape = prefs->shape(); + int tqshape = prefs->shape(); int look = prefs->look(); TQColor color = prefs->color(); int darkFactor = prefs->darkFactor(); TQColor backgroundColor = prefs->background(); bool modifyBackground = false; - if(backgroundColor != KApplication::palette().active().background()){ + if(backgroundColor != KApplication::tqpalette().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)shape); + ledMatrix[j][i]->setShape((KLed::Shape)tqshape); ledMatrix[j][i]->setColor(color); ledMatrix[j][i]->setLook((KLed::Look)look); ledMatrix[j][i]->setDarkFactor(darkFactor); @@ -264,15 +264,15 @@ void KBinaryClock::updateClock(){ */ void KBinaryClock::mousePressEvent(TQMouseEvent *event) { switch (event->button()) { - case TQMouseEvent::RightButton: + case Qt::RightButton: TQToolTip::remove(this); openContextMenu(); break; - case TQMouseEvent::LeftButton: + case Qt::LeftButton: toggleCalendar(); TQToolTip::remove(this); break; - case TQMouseEvent::MidButton: + case Qt::MidButton: TQToolTip::remove(this); break; default: @@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() { menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); KPopupMenu *copyMenu = new KPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); @@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() { proc << locate("exe", "kdesu"); proc << "--nonewdcop"; proc << TQString("%1 clock --lang %2") - .arg(locate("exe", "kcmshell")) - .arg(KGlobal::locale()->language()); + .tqarg(locate("exe", "kcmshell")) + .tqarg(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::clipboard()->setText(s); + TQApplication::tqclipboard()->setText(s); } void KBinaryClock::toggleCalendar() @@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar() if (_calendar || _disableCalendar){ return; } - _calendar = new DatePicker(this, TQDateTime::currentDateTime().date()); + _calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().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->sizeHint().width() + 28; + int w = _calendar->tqsizeHint().width() + 28; // Added 28 px. to size poperly as said in API - int h = _calendar->sizeHint().height(); + int h = _calendar->tqsizeHint().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->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); + tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false)); } #include "kbinaryclock.moc" diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h index 387288d..cfa8422 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.h +++ b/kicker-applets/kbinaryclock/kbinaryclock.h @@ -38,8 +38,9 @@ class KBinaryClock; class SettingsImp : public Settings { Q_OBJECT + TQ_OBJECT public: - SettingsImp(TQWidget* parent=0, + SettingsImp(TQWidget* tqparent=0, const char* name=0, WFlags fl=0); public slots: @@ -49,7 +50,7 @@ public slots: class KConfigDialogImp : public KConfigDialog { public: - KConfigDialogImp(TQWidget *parent, const char *name, + KConfigDialogImp(TQWidget *tqparent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType = KDialogBase::IconList, KDialogBase::ButtonCode defaultButton = Ok, @@ -57,7 +58,7 @@ public: SettingsImp *settings; }; -class ClockAppletToolTip : public QToolTip +class ClockAppletToolTip : public TQToolTip { public: ClockAppletToolTip( KBinaryClock* clock ); @@ -71,8 +72,9 @@ class ClockAppletToolTip : public QToolTip class KBinaryClock : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: - KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0); + KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *tqparent = 0, const char *name = 0); ~KBinaryClock(); virtual int widthForHeight (int height) const; diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg index b5a5fb3..84f35c3 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::palette().active().background()</default> + <default code="true">KApplication::tqpalette().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 43462af..0b94ee9 100644 --- a/kicker-applets/kbinaryclock/settings.ui +++ b/kicker-applets/kbinaryclock/settings.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Settings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Settings</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -49,7 +49,7 @@ <string>Light</string> </property> </widget> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_DarkFactor</cstring> </property> @@ -96,27 +96,27 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel6</cstring> </property> <property name="text"> <string>Dark</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -127,7 +127,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -135,7 +135,7 @@ <string>Background:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -178,7 +178,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup" row="2" column="2"> + <widget class="TQButtonGroup" row="2" column="2"> <property name="name"> <cstring>kcfg_Shape</cstring> </property> @@ -189,7 +189,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Shape_Rectangular</cstring> </property> @@ -197,7 +197,7 @@ <string>&Rectangular</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Shape_Circular</cstring> </property> @@ -210,7 +210,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="1" column="2"> + <widget class="TQButtonGroup" row="1" column="2"> <property name="name"> <cstring>kcfg_Look</cstring> </property> @@ -221,7 +221,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Look_Flat</cstring> </property> @@ -229,7 +229,7 @@ <string>&Flat</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Look_Raised</cstring> </property> @@ -240,7 +240,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Look_Sunken</cstring> </property> @@ -250,15 +250,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="4" rowspan="3" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="4" rowspan="3" colspan="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>preview</cstring> </property> @@ -287,14 +287,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame1</cstring> </property> @@ -332,7 +332,7 @@ <property name="name"> <cstring>kLed1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -346,7 +346,7 @@ <property name="name"> <cstring>kLed2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -357,7 +357,7 @@ <property name="name"> <cstring>kLed4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -368,7 +368,7 @@ <property name="name"> <cstring>kLed3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -382,7 +382,7 @@ <property name="name"> <cstring>kLed6</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -396,7 +396,7 @@ <property name="name"> <cstring>kLed5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -415,7 +415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -434,7 +434,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>84</height> @@ -443,7 +443,7 @@ </spacer> </vbox> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_Show_Seconds</cstring> </property> @@ -451,7 +451,7 @@ <string>Show seconds</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Hide_Off_Leds</cstring> </property> @@ -475,7 +475,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kled.h</includehint> diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index cadbb2d..b415032 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -48,18 +48,18 @@ $Id$ // Applet initialization function extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, KPanelApplet::About, - parent, "kolourpicker"); + tqparent, "kolourpicker"); } } KolourPicker::KolourPicker(const TQString& configFile, Type type, - int actions, TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name), + int actions, TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name), m_picking(0) { KAboutData *about = new KAboutData("kolourpicker", @@ -140,7 +140,7 @@ void KolourPicker::slotHistory() TQPopupMenu *sub = copyPopup(*it, false); subMenus.append(sub); popup.insertItem(colorPixmap(*it), - TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()), + TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()), sub); } popup.insertSeparator(); @@ -157,7 +157,7 @@ void KolourPicker::slotHistory() conf->sync(); } else if (id != -1) - setClipboard(popup.findItem(id)->text()); + setClipboard(popup.tqfindItem(id)->text()); } void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) @@ -167,14 +167,14 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) m_picking = false; releaseMouse(); releaseKeyboard(); - TQWidget *desktop = TQApplication::desktop(); + TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); TQPixmap pm = TQPixmap::grabWindow(desktop->winId(), e->globalPos().x(), e->globalPos().y(), 1, 1); TQImage img = pm.convertToImage(); TQColor color(img.pixel(0, 0)); // eventually remove a dupe - TQValueListIterator<TQColor> dupe = m_history.find(color); + TQValueListIterator<TQColor> dupe = m_history.tqfind(color); if (dupe != m_history.end()) m_history.remove(dupe); @@ -198,7 +198,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) TQPopupMenu *popup = copyPopup(color, true); int id = popup->exec(e->globalPos()); if (id != -1) - setClipboard( popup->findItem(id)->text() ); + setClipboard( popup->tqfindItem(id)->text() ); delete popup; } else @@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) // set both clipboard and selection void KolourPicker::setClipboard(const TQString& text) { - QClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); bool oldMode = clip->selectionModeEnabled(); clip->setSelectionMode(true); clip->setText(text); @@ -242,19 +242,19 @@ void KolourPicker::arrangeButtons() { int h, w, p; - if (orientation() == Horizontal) + if (orientation() ==Qt::Horizontal) { h = height(); if (h > 40) { - // vertical layout + // vertical tqlayout p = (h - 40)/3; m_colourButton->setGeometry(2, p, 20, 20); m_historyButton->setGeometry(2, 2*p+20, 20, 20); } else { - // horizontal layout + // horizontal tqlayout 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 layout + // horizontal tqlayout p = (w - 40)/3; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(2*p+20, 2, 20, 20); } else { - // vertical layout + // vertical tqlayout p = (w - 20)/2; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(p, 24, 20, 20); @@ -294,7 +294,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const // HTML, lower case hex chars value.sprintf("#%.2x%.2x%.2x", c.red(), c.green(), c.blue()); popup->insertItem(SmallIcon("html"), value); - if (value.find(TQRegExp("[a-f]")) >= 0) + if (value.tqfind(TQRegExp("[a-f]")) >= 0) { // HTML, upper case hex chars value.sprintf("#%.2X%.2X%.2X", c.red(), c.green(), c.blue()); @@ -303,7 +303,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const // lower case hex chars value.sprintf( "%.2x%.2x%.2x", c.red(), c.green(), c.blue() ); popup->insertItem( SmallIcon( "html" ), value ); - if ( value.find( TQRegExp( "[a-f]" ) ) >= 0 ) + if ( value.tqfind( TQRegExp( "[a-f]" ) ) >= 0 ) { // upper case hex chars value.sprintf( "%.2X%.2X%.2X", c.red(), c.green(), c.blue() ); @@ -336,19 +336,19 @@ TQPixmap KolourPicker::colorPixmap(const TQColor &c) const if (d < (36 * AAFACTOR * AAFACTOR)) img.setPixel(x, y, c.pixel()); else if (d < (56.25 * AAFACTOR * AAFACTOR)) - img.setPixel(x, y, qRgba(128, 128, 128, 255)); + img.setPixel(x, y, tqRgba(128, 128, 128, 255)); } - TQBitmap mask(16, 16); - mask.fill(Qt::color0); - TQPainter p(&mask); - p.setPen(Qt::NoPen); - p.setBrush(Qt::color1); + TQBitmap tqmask(16, 16); + tqmask.fill(TQt::color0); + TQPainter p(&tqmask); + p.setPen(TQt::NoPen); + p.setBrush(TQt::color1); p.drawEllipse(0, 0, 15, 15); p.end(); TQPixmap pm = TQPixmap(img.smoothScale(16, 16)); - pm.setMask(mask); + pm.setMask(tqmask); return pm; } diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h index 8340d2d..c223339 100644 --- a/kicker-applets/kolourpicker/kolourpicker.h +++ b/kicker-applets/kolourpicker/kolourpicker.h @@ -34,9 +34,10 @@ class TQPopupMenu; class KolourPicker : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: KolourPicker(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); ~KolourPicker(); virtual int heightForWidth(int) const; virtual int widthForHeight(int) const; diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 478ca2d..8e6c8ec 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -32,8 +32,8 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(TQWidget *parent, const char *name) - : TQButton(parent, name), +SimpleButton::SimpleButton(TQWidget *tqparent, const char *name) + : TQButton(tqparent, name), m_highlight(false), m_orientation(Qt::Horizontal) { @@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::sizeHint() const +TQSize SimpleButton::tqsizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::sizeHint(); + return TQButton::tqsizeHint(); else return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -TQSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::tqminimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::minimumSizeHint(); + return TQButton::tqminimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -192,20 +192,20 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name) - : SimpleButton(parent, name) +SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name) + : SimpleButton(tqparent, name) { setBackgroundOrigin(AncestorOrigin); _arrow = arrow; _inside = false; } -TQSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } -void SimpleArrowButton::setArrowType(Qt::ArrowType a) +void SimpleArrowButton::setArrowType(TQt::ArrowType a) { if (_arrow != a) { @@ -214,7 +214,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a) } } -Qt::ArrowType SimpleArrowButton::arrowType() const +TQt::ArrowType SimpleArrowButton::arrowType() const { return _arrow; } @@ -226,15 +226,15 @@ void SimpleArrowButton::drawButton( TQPainter *p ) TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index 1ea5c7a..9b4e231 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -26,16 +26,17 @@ #include <kdemacros.h> -class KDE_EXPORT SimpleButton : public QButton +class KDE_EXPORT SimpleButton : public TQButton { Q_OBJECT + TQ_OBJECT public: - SimpleButton(TQWidget *parent, const char *name = 0); + SimpleButton(TQWidget *tqparent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -63,23 +64,24 @@ class KDE_EXPORT SimpleButton : public QButton class KDE_EXPORT SimpleArrowButton: public SimpleButton { Q_OBJECT + TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent *e ); virtual void leaveEvent( TQEvent *e ); virtual void drawButton(TQPainter *p); - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; public slots: - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); private: - Qt::ArrowType _arrow; + TQt::ArrowType _arrow; bool _inside; }; diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc index df3fffe..c694f5c 100644 --- a/kicker-applets/ktimemon/confdlg.cc +++ b/kicker-applets/ktimemon/confdlg.cc @@ -170,7 +170,7 @@ KConfDialog::KConfDialog(KTimeMon *t) bl->addWidget(b); bl->addStretch(); - TQVBoxLayout *vbox = new TQVBoxLayout( b->layout() ); + TQVBoxLayout *vbox = new TQVBoxLayout( b->tqlayout() ); gl = new TQGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 ); diff --git a/kicker-applets/ktimemon/confdlg.h b/kicker-applets/ktimemon/confdlg.h index a21c73c..d7451f3 100644 --- a/kicker-applets/ktimemon/confdlg.h +++ b/kicker-applets/ktimemon/confdlg.h @@ -48,6 +48,7 @@ class KConfDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KConfDialog(KTimeMon *timemon); diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc index 99ea20b..54d1edf 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?").arg(MEMINFO_NAME).arg(strerror(errno))); + "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(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?").arg(MEMINFO_NAME).arg(strerror(errno))); + "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(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.").arg(strerror(errno))); + "who will try to figure out what went wrong.").tqarg(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").arg(MEMINFO_NAME).arg(strerror(errno))); + "The diagnostics are: %2").tqarg(MEMINFO_NAME).tqarg(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.").arg(MEMINFO_NAME)); + "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").tqarg(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").arg(STAT_NAME).arg(strerror(errno))); + "The diagnostics are: %2").tqarg(STAT_NAME).tqarg(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.arg("TBL_SYSINFO")); + fatal(msg.tqarg("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.arg("TBL_VMSTATS")); + fatal(msg.tqarg("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.arg("TBL_SWAPINFO")); + fatal(msg.tqarg("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.").arg(strerror(errno))); + "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(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.").arg(sample.cpus).arg(cpus)); + "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(sample.cpus).tqarg(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.").arg(strerror(errno))); + "http://bugs.kde.org/ who will try to sort this out.").tqarg(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.").arg(freemem).arg(availrmem)); + "Please contact the maintainer at mueller@kde.org who will try to sort this out.").tqarg(freemem).tqarg(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.").arg(strerror(errno))); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(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.") - .arg(2 * sizeof(int) + swapentries * sizeof(struct swapent)) - .arg(sizeof(int)).arg(swapentries).arg(sizeof(struct swapent))); + .tqarg(2 * sizeof(int) + swapentries * sizeof(struct swapent)) + .tqarg(sizeof(int)).tqarg(swapentries).tqarg(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.").arg(strerror(errno))); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(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.").arg(stbl->swt_n).arg(swapentries)); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(stbl->swt_n).tqarg(swapentries)); } for (i = 0; i < swapentries; i++) { diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 75164f4..4b791ff 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -35,11 +35,11 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("ktimemon"); KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal, - KPanelApplet::Preferences, parent, "ktimemon"); + KPanelApplet::Preferences, tqparent, "ktimemon"); return mon; } } @@ -111,7 +111,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) b = r / 3; // bar width r -= b; - if (bgColour != colorGroup().background()) + if (bgColour != tqcolorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -125,7 +125,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) b = r / 2; r -= b; - if (bgColour != colorGroup().background()) + if (bgColour != tqcolorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -138,7 +138,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) x += b; b = r; - if (bgColour != colorGroup().background()) + if (bgColour != tqcolorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -164,18 +164,18 @@ void KTimeMon::paintRect(int x, int y, int w, int h, TQColor c, TQPainter *p) void KTimeMon::maybeTip(const TQPoint& p) { if (sample == 0) return; // no associated sample... - if(!rect().contains(p)) return; + if(!TQT_TQRECT_OBJECT(rect()).tqcontains(p)) return; KSample::Sample s = sample->getSample(100); // scale to 100(%) int idle = 100 - s.kernel - s.user - s.nice; if ( idle < 0 ) idle = 0; TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") - .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); + .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); tip(rect(), str); } @@ -185,14 +185,14 @@ void KTimeMon::maybeTip(const TQPoint& p) // Initialise the member variables, read the configuration data base, // set up the widget, and start the timer. KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, - TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name, WRepaintNoErase), TQToolTip(this), + TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name, WRepaintNoErase), TQToolTip(this), configDialog(0), bgProcess(0), kernelColour("red1"), userColour("blue"), niceColour("yellow"), iowaitColour("darkgreen"), usedColour("blue1"), buffersColour("yellow"), cachedColour("darkgreen"), mkernelColour("red1"), - swapColour("cyan3"), bgColour(colorGroup().background()) + swapColour("cyan3"), bgColour(tqcolorGroup().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 repaint the +// Make the KSample object update its internal sample and tqrepaint the // object. void KTimeMon::timeout() { @@ -385,9 +385,9 @@ void KTimeMon::mousePressEvent(TQMouseEvent *event) if (event == 0) return; int index = -1; - if (event->button() == LeftButton) index = 0; - else if (event->button() == MidButton) index = 1; - else if (event->button() == RightButton) index = 2; + if (event->button() == Qt::LeftButton) index = 0; + else if (event->button() == Qt::MidButton) index = 1; + else if (event->button() == Qt::RightButton) index = 2; if (index == -1) return; diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 1f81db1..12fc6ba 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -46,11 +46,12 @@ class KPopupMenu; class KTimeMon : public KPanelApplet, TQToolTip { Q_OBJECT + TQ_OBJECT public: enum MouseAction { NOTHING, SWITCH, MENU, COMMAND }; KTimeMon(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); virtual ~KTimeMon(); void writeConfiguration(); // write back the configuration data diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 9d7ca38..8274bb6 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -49,16 +49,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmathapplet"); - return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet"); + return new MathApplet(configFile, KPanelApplet::Stretch, 0, tqparent, "kmathapplet"); } } MathApplet::MathApplet(const TQString& configFile, Type type, int actions, - TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name), + TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name), m_hasFocus(false) { // setBackgroundMode(X11ParentRelative); @@ -151,20 +151,20 @@ void MathApplet::useRadians() { void MathApplet::resizeEvent(TQResizeEvent*) { - if(orientation() == Horizontal) + if(orientation() ==Qt::Horizontal) { _btn->hide(); _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->sizeHint().height() + _label->height()) + if(height() >= _input->tqsizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->sizeHint().height() - 2; - int labelHeight = _label->sizeHint().height(); + int inputVOffset = height() - _input->tqsizeHint().height() - 2; + int labelHeight = _label->tqsizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->sizeHint().height()); + width(), _input->tqsizeHint().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->sizeHint().height(); + int newHeight = _input->tqsizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -269,13 +269,13 @@ void MathApplet::evaluate(const TQString& command) } } - if (orientation() == Vertical) + if (orientation() ==Qt::Vertical) _hbox->hide(); } void MathApplet::mousePressEvent(TQMouseEvent *e) { - if ( e->button() != RightButton ) + if ( e->button() != Qt::RightButton ) { KPanelApplet::mousePressEvent( e ); return; diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h index f8c91a0..97e4270 100644 --- a/kicker-applets/math/mathapplet.h +++ b/kicker-applets/math/mathapplet.h @@ -38,10 +38,11 @@ class KPopupMenu; class MathApplet : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: MathApplet(const TQString& configFile, Type t = Stretch, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); virtual ~MathApplet(); int widthForHeight(int height) const; diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp index 8a58064..c49cbab 100644 --- a/kicker-applets/math/parser.cpp +++ b/kicker-applets/math/parser.cpp @@ -243,9 +243,9 @@ int Parser::addfkt(TQString str) err=0; errpos=1; str.remove(" " ); - const int p1=str.find('('); - int p2=str.find(','); - const int p3=str.find(")="); + const int p1=str.tqfind('('); + int p2=str.tqfind(','); + const int p3=str.tqfind(")="); //insert '*' when it is needed for(int i=p1+3; i < (int) str.length();i++) @@ -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").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Syntax error").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Missing tqparenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Function name unknown").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Void function variable").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Too many functions").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Token-memory overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Stack overflow").tqarg(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").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Name of function not free").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "recursive function not allowed").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)), + case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).tqarg(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/math/parser.h b/kicker-applets/math/parser.h index 4ee0e7d..319c470 100644 --- a/kicker-applets/math/parser.h +++ b/kicker-applets/math/parser.h @@ -29,7 +29,7 @@ /** @file parser.h * \brief Contains the parser core class Parser. */ -// Qt includes +// TQt includes #include <tqstring.h> #include <tqvaluevector.h> @@ -187,7 +187,7 @@ public: unsigned char *mem; ///< Pointer to the allocated memory for the tokens. unsigned char *mptr; ///< Pointer to the token. - QString fname; ///< Name of the function. + TQString fname; ///< Name of the function. TQString fvar; ///< Dummy variable. TQString fpar; ///< Parameter. TQString fstr; ///< Function expression. diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index f52ae4b..a89e693 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -68,7 +68,7 @@ void AmarokInterface::myInit() void AmarokInterface::appRegistered ( const TQCString &appId ) { - if(appId.contains("amarok",false) ) + if(appId.tqcontains("amarok",false) ) { mAppId = appId; emit playerStarted(); @@ -78,7 +78,7 @@ void AmarokInterface::appRegistered ( const TQCString &appId ) void AmarokInterface::appRemoved ( const TQCString &appId ) { - if ( appId.contains("amarok",false) ) + if ( appId.tqcontains("amarok",false) ) { // is there still another amarok alive? if ( findRunningAmarok() ) @@ -146,7 +146,7 @@ void AmarokInterface::updateSlider ( ) time = 0; } emit newSliderPosition(len,time); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } // Drag-n-Drop stuff ================================================================= @@ -242,7 +242,7 @@ const TQString AmarokInterface::getTrackTitle() const else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> title; return title; @@ -264,7 +264,7 @@ bool AmarokInterface::findRunningAmarok() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).contains("amarok",false)) + if ((*iterator).tqcontains("amarok",false)) { if (kapp->dcopClient()->call((*iterator), "player", "interfaces()", data, replyType, replyData) ) { @@ -274,7 +274,7 @@ bool AmarokInterface::findRunningAmarok() QCStringList list; reply >> list; - if ( list.contains("AmarokPlayerInterface") ) + if ( list.tqcontains("AmarokPlayerInterface") ) { kdDebug(90200) << "mediacontrol: amarok found" << endl; mAppId = *iterator; @@ -289,7 +289,7 @@ bool AmarokInterface::findRunningAmarok() } -int AmarokInterface::playingStatus() +int AmarokInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h index 53f1ac6..f863208 100644 --- a/kicker-applets/mediacontrol/amarokInterface.h +++ b/kicker-applets/mediacontrol/amarokInterface.h @@ -29,6 +29,7 @@ class AmarokInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: AmarokInterface(); ~AmarokInterface(); @@ -47,7 +48,7 @@ class AmarokInterface : public PlayerInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingStatus(); + virtual int playingtqStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/configfrontend.cpp b/kicker-applets/mediacontrol/configfrontend.cpp index 4deab8b..971d4d5 100644 --- a/kicker-applets/mediacontrol/configfrontend.cpp +++ b/kicker-applets/mediacontrol/configfrontend.cpp @@ -23,7 +23,7 @@ ConfigFrontend::ConfigFrontend() : TQObject(0, 0) { - _config = new KConfig(TQString::null, true, false); + _config = new KConfig(TQString(), true, false); _ownConfig = true; } diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h index b625c70..fc5f346 100644 --- a/kicker-applets/mediacontrol/configfrontend.h +++ b/kicker-applets/mediacontrol/configfrontend.h @@ -24,9 +24,10 @@ #include <kconfig.h> #include <klocale.h> -class ConfigFrontend : public QObject +class ConfigFrontend : public TQObject { Q_OBJECT + TQ_OBJECT public: ConfigFrontend(); ConfigFrontend(KConfig *); diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index be99528..533ba20 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -68,7 +68,7 @@ void JuKInterface::myInit() void JuKInterface::appRegistered ( const TQCString &appId ) { - if(appId.contains("juk",false) ) + if(appId.tqcontains("juk",false) ) { mAppId = appId; @@ -93,7 +93,7 @@ void JuKInterface::appRegistered ( const TQCString &appId ) void JuKInterface::appRemoved ( const TQCString &appId ) { - if ( appId.contains("juk",false) ) + if ( appId.tqcontains("juk",false) ) { // is there still another juk alive? if ( findRunningJuK() ) @@ -148,7 +148,7 @@ void JuKInterface::updateSlider () time = 0; } emit ( newSliderPosition(len,time) ); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } // Drag-n-Drop stuff ================================================================= @@ -185,7 +185,7 @@ void JuKInterface::dropEvent(TQDropEvent* event) kdDebug(90200) << "Couldn't send drop to juk" << endl; } - // Apparently we should auto-play? + // Aptqparently we should auto-play? TQByteArray strData; TQDataStream strArg(strData, IO_WriteOnly); strArg << *fileList.begin(); @@ -265,7 +265,7 @@ const TQString JuKInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> title; return title; @@ -282,7 +282,7 @@ bool JuKInterface::findRunningJuK() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).contains("juk",false)) + if ((*iterator).tqcontains("juk",false)) { mAppId = *iterator; return true; @@ -291,7 +291,7 @@ bool JuKInterface::findRunningJuK() return false; } -int JuKInterface::playingStatus() +int JuKInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h index 55874f6..fa74fba 100644 --- a/kicker-applets/mediacontrol/jukInterface.h +++ b/kicker-applets/mediacontrol/jukInterface.h @@ -30,6 +30,7 @@ class TQProcess; class JuKInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: JuKInterface(); ~JuKInterface(); @@ -48,7 +49,7 @@ class JuKInterface : public PlayerInterface void dragEnterEvent(TQDragEnterEvent* event); void dropEvent(TQDropEvent* event); const TQString getTrackTitle() const; - int playingStatus(); + int playingtqStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index fea1048..d14d609 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(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } // Drag-n-Drop stuff ================================================================= @@ -213,7 +213,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> title; } @@ -224,7 +224,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> album; } @@ -235,7 +235,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> artist; } @@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const } else { - result = i18n("artist - trackname", "%1 - %2").arg(artist, title); + result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title); } } } @@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const } else { - result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title); + result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title); } } else // artist is non-empty { if(title.isEmpty()) { - result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album); + result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album); } else { - result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title); + result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title); } } } @@ -305,12 +305,12 @@ bool KsCDInterface::findRunningKsCD() return false; } -int KsCDInterface::playingStatus() +int KsCDInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; - if (kapp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType, + if (kapp->dcopClient()->call(mAppId, "CDPlayer", "gettqStatus()", data, replyType, replyData)) { int status = 0; diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h index 8af0d1d..2d37e42 100644 --- a/kicker-applets/mediacontrol/kscdInterface.h +++ b/kicker-applets/mediacontrol/kscdInterface.h @@ -29,6 +29,7 @@ class KsCDInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: KsCDInterface(); ~KsCDInterface(); @@ -47,7 +48,7 @@ class KsCDInterface : public PlayerInterface void dragEnterEvent(TQDragEnterEvent* event); void dropEvent(TQDropEvent* event); const TQString getTrackTitle() const; - int playingStatus(); + int playingtqStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/mcslider.cpp b/kicker-applets/mediacontrol/mcslider.cpp index cad953d..147dc5a 100644 --- a/kicker-applets/mediacontrol/mcslider.cpp +++ b/kicker-applets/mediacontrol/mcslider.cpp @@ -19,8 +19,8 @@ #include "mcslider.h" -MCSlider::MCSlider( Orientation orientation, TQWidget *parent, const char *name ) - : TQSlider( orientation, parent, name ) +MCSlider::MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) + : TQSlider( orientation, tqparent, name ) { setBackgroundOrigin(WidgetOrigin); setBackground(); @@ -36,17 +36,17 @@ void MCSlider::setBackground() { unsetPalette(); - if (parentWidget()->paletteBackgroundPixmap()) + if (tqparentWidget()->paletteBackgroundPixmap()) { TQPixmap pm(width(), height()); - pm.fill(parentWidget(), pos()); + pm.fill(tqparentWidget(), pos()); setPaletteBackgroundPixmap(pm); } } void MCSlider::wheelEvent(TQWheelEvent *e) { - if (e->orientation() == Horizontal) + if (e->orientation() ==Qt::Horizontal) return; if (e->state() == ShiftButton) diff --git a/kicker-applets/mediacontrol/mcslider.h b/kicker-applets/mediacontrol/mcslider.h index d58aac0..0c4a784 100644 --- a/kicker-applets/mediacontrol/mcslider.h +++ b/kicker-applets/mediacontrol/mcslider.h @@ -20,12 +20,13 @@ #include <tqslider.h> -class MCSlider : public QSlider +class MCSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - MCSlider( Orientation orientation, TQWidget *parent, const char *name = 0 ); + MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name = 0 ); ~MCSlider(); void setBackground(); private: diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 433f52d..9068aeb 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -57,18 +57,18 @@ const int NO_BUTTONS = 4; extern "C" { - KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile) + KDE_EXPORT KPanelApplet *init( TQWidget *tqparent, const TQString &configFile) { KGlobal::locale()->insertCatalogue("mediacontrol"); return new MediaControl(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences | - KPanelApplet::ReportBug, parent, "mediacontrol"); + KPanelApplet::ReportBug, tqparent, "mediacontrol"); } } // ============================================================================= -class MediaControlToolTip : public QToolTip +class MediaControlToolTip : public TQToolTip { public: MediaControlToolTip(TQWidget *widget, PlayerInterface *pl_obj) : @@ -78,7 +78,7 @@ class MediaControlToolTip : public QToolTip virtual void maybeTip(const TQPoint &pt) { TQRect rc( mWidget->rect()); - if (rc.contains(pt)) + if (rc.tqcontains(pt)) { tip ( rc, mPlayer->getTrackTitle() ); } @@ -91,9 +91,9 @@ class MediaControlToolTip : public QToolTip // ============================================================================= MediaControl::MediaControl(const TQString &configFile, Type t, int actions, - TQWidget *parent, const char *name) + TQWidget *tqparent, const char *name) : DCOPObject("MediaControl"), - KPanelApplet(configFile, t, actions, parent, name), + KPanelApplet(configFile, t, actions, tqparent, name), mInstance(new KInstance("mediacontrol")), mAboutData(new KAboutData("mediacontrol", I18N_NOOP("MediaControl"), @@ -124,7 +124,7 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, "tisch.crix@gmx.de", "http://www.crixensgfxcorner.de.vu/"); mAboutData->addCredit("Ulrik Mikaelsson", I18N_NOOP("Fix for Noatun-Support"), "rawler@rsn.bth.se", 0); - mAboutData->addCredit("Anthony J Moulen", I18N_NOOP("Fix for Vertical Slider"), + mAboutData->addCredit("Anthony J Moulen", I18N_NOOP("Fix forQt::Vertical Slider"), "ajmoulen@moulen.org", 0); mAboutData->addCredit("Teemu Rytilahti", I18N_NOOP("Volume Control Implementation"), "teemu.rytilahti@kde-fi.org", 0); @@ -139,7 +139,7 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, playpause_button = new TrayButton (this, "PLAYPAUSE"); stop_button = new TrayButton (this, "STOP"); next_button = new TrayButton (this, "NEXT"); - time_slider = new MCSlider (TQSlider::Horizontal, this, "time_slider" ); + time_slider = new MCSlider (Qt::Horizontal, this, "time_slider" ); time_slider->setRange(0,0); time_slider->setValue(0); time_slider->setTracking( false ); @@ -184,7 +184,7 @@ void MediaControl::dropEvent(TQDropEvent* event) void MediaControl::setSliderPosition(int len ,int time) { time_slider->blockSignals(true); - if(orientation() == Vertical) + if(orientation() ==Qt::Vertical) time = len - time; if (mLastLen != len) @@ -226,10 +226,10 @@ void MediaControl::disableAll() void MediaControl::slotPlayingStatusChanged(int status) { - if (mLastStatus == status) + if (mLasttqStatus == status) return; - mLastStatus = status; + mLasttqStatus = 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->playingStatus() == PlayerInterface::Playing) + if (_player->playingtqStatus() == PlayerInterface::Playing) playpause_button->setIconSet(SmallIconSet("player_pause")); else playpause_button->setIconSet(SmallIconSet("player_play")); @@ -318,7 +318,7 @@ void MediaControl::reportBug() // Fixing the orientation problem in qslider. void MediaControl::adjustTime(int time) { - if(orientation() == Vertical) + if(orientation() ==Qt::Vertical) emit(newJumpToTime(mLastLen - time)); else emit(newJumpToTime(time)); @@ -350,7 +350,7 @@ void MediaControl::reparseConfig() mLastLen = -1; mLastTime = -1; - mLastStatus = -1; + mLasttqStatus = -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->playingStatus() == PlayerInterface::Playing) + if (_player->playingtqStatus() == 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.").arg(skindir)); + " a different theme.").tqarg(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->minimumSizeHint().height() << endl; +// kdDebug(90200) << "slider needs: " << time_slider->tqminimumSizeHint().height() << endl; // slider height + button height - if ( height >= (time_slider->minimumSizeHint().height()+MC_BUTTONSIZE) ) + if ( height >= (time_slider->tqminimumSizeHint().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->minimumSizeHint().width()+MC_BUTTONSIZE) ) + if ( width >= (time_slider->tqminimumSizeHint().width()+MC_BUTTONSIZE) ) { // slider ASIDE icons // (5 * button width + spaces between them); return (4*MC_BUTTONSIZE+10); @@ -498,7 +498,7 @@ int MediaControl::heightForWidth(int width) const void MediaControl::mousePressEvent(TQMouseEvent* e) { - if (e->button() == TQMouseEvent::RightButton) + if (e->button() == Qt::RightButton) rmbMenu->popup(e->globalPos()); } @@ -506,8 +506,8 @@ bool MediaControl::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (me->button() == TQMouseEvent::RightButton) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (me->button() == Qt::RightButton) { rmbMenu->popup(me->globalPos()); return true; @@ -532,10 +532,10 @@ void MediaControl::resizeEvent( TQResizeEvent* ) // kdDebug(90200) << "resizeEvent()" << endl; int w = width(); int h = height(); - if ( orientation() == Vertical ) + if ( orientation() ==Qt::Vertical ) { // ====== VERTICAL ================================================= - time_slider->setOrientation(TQSlider::Vertical); - int slider_width = time_slider->minimumSizeHint().width(); + time_slider->setOrientation(Qt::Vertical); + int slider_width = time_slider->tqminimumSizeHint().width(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_width > w ) slider_width = w; @@ -566,8 +566,8 @@ void MediaControl::resizeEvent( TQResizeEvent* ) } else // ====== HORIZONTAL =============================================== { - time_slider->setOrientation(TQSlider::Horizontal); - int slider_height = time_slider->minimumSizeHint().height(); + time_slider->setOrientation(Qt::Horizontal); + int slider_height = time_slider->tqminimumSizeHint().height(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_height > h ) slider_height = h; @@ -600,8 +600,8 @@ void MediaControl::resizeEvent( TQResizeEvent* ) // Our Button ======================================================================== -TrayButton::TrayButton(TQWidget* parent, const char* name) - : SimpleButton (parent, name) +TrayButton::TrayButton(TQWidget* tqparent, const char* name) + : SimpleButton (tqparent, name) { setBackgroundMode(PaletteBackground); setBackgroundOrigin(AncestorOrigin); diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h index c6ec47b..887ebb4 100644 --- a/kicker-applets/mediacontrol/mediacontrol.h +++ b/kicker-applets/mediacontrol/mediacontrol.h @@ -53,9 +53,10 @@ class MediaControlToolTip; class TrayButton : public SimpleButton { Q_OBJECT + TQ_OBJECT public: - TrayButton(TQWidget* parent, const char* name); + TrayButton(TQWidget* tqparent, const char* name); virtual ~TrayButton() {} void setIconSet(const TQIconSet &iconSet); }; @@ -65,6 +66,7 @@ class TrayButton : public SimpleButton class MediaControl : public KPanelApplet, virtual public MediaControlIface { Q_OBJECT + TQ_OBJECT public: MediaControl(const TQString&, Type, int ,TQWidget * = 0, const char * = 0); @@ -93,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, mLastStatus; + int mLastLen, mLastTime, mLasttqStatus; KPopupMenu *rmbMenu; virtual void mousePressEvent(TQMouseEvent* e); diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 0217a25..5f5d06a 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -42,8 +42,8 @@ #include <knuminput.h> #include <kstandarddirs.h> -MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, const char* name) -: KDialogBase( parent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false ) +MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *tqparent, const char* name) +: KDialogBase( tqparent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false ) { _configFrontend = cfg; if (!_configFrontend) // emergency!!! @@ -87,8 +87,8 @@ void MediaControlConfig::readSkinDir( const TQString &dir ) if (!directory.exists()) return; - const QFileInfoList *list = directory.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = directory.entryInfoList(); + TQFileInfoListIterator it(*list); while ( it.current() ) { @@ -106,7 +106,7 @@ void MediaControlConfig::load() // find the playerstring from config in the playerlist and select it if found TQListBoxItem *item = 0; - item = _child->playerListBox->findItem( _configFrontend->player() ); + item = _child->playerListBox->tqfindItem( _configFrontend->player() ); if ( item ) _child->playerListBox->setCurrentItem ( item ); else @@ -118,7 +118,7 @@ void MediaControlConfig::load() _child->mWheelScrollAmount->setValue( _configFrontend->mouseWheelSpeed() ); // Select the used Theme - item = _child->themeListBox->findItem( _configFrontend->theme() ); + item = _child->themeListBox->tqfindItem( _configFrontend->theme() ); if ( item ) _child->themeListBox->setCurrentItem( item ); else diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h index 4467177..4d5c388 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.h +++ b/kicker-applets/mediacontrol/mediacontrolconfig.h @@ -28,8 +28,9 @@ class KConfig; class MediaControlConfig: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MediaControlConfig(ConfigFrontend *cfg, TQWidget *parent = 0, const char* name = "MediaControlConfig"); + MediaControlConfig(ConfigFrontend *cfg, TQWidget *tqparent = 0, const char* name = "MediaControlConfig"); void readSkinDir(const TQString &dir); void load(); diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui index 9f5c662..8386754 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui +++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui @@ -2,7 +2,7 @@ <class>MediaControlConfigWidget</class> <comment>Preferences-Dialog for MediaControl </comment> <author>Stefan Gehn <metz@gehn.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MediaControlConfigWidget</cstring> </property> @@ -14,9 +14,9 @@ <height>245</height> </rect> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <property name="toolTip" stdset="0"> <string></string> @@ -34,11 +34,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabGeneral</cstring> </property> @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>gbMediaPlayer</cstring> </property> @@ -70,7 +70,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -78,7 +78,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lmousewheelscrollingamount</cstring> </property> @@ -101,7 +101,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>themes</cstring> </property> @@ -112,7 +112,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mUseThemes</cstring> </property> @@ -138,7 +138,7 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -156,23 +156,23 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>previewGroupBox</cstring> </property> <property name="title"> <string>Preview</string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <property name="whatsThis" stdset="0"> <string>Shows you how the selected theme will look</string> @@ -187,7 +187,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QToolButton" row="0" column="0"> + <widget class="TQToolButton" row="0" column="0"> <property name="name"> <cstring>previewPrev</cstring> </property> @@ -199,13 +199,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -215,7 +215,7 @@ <string><</string> </property> </widget> - <widget class="QToolButton" row="0" column="1"> + <widget class="TQToolButton" row="0" column="1"> <property name="name"> <cstring>previewPlay</cstring> </property> @@ -227,13 +227,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -243,7 +243,7 @@ <string>></string> </property> </widget> - <widget class="QToolButton" row="0" column="2"> + <widget class="TQToolButton" row="0" column="2"> <property name="name"> <cstring>previewPause</cstring> </property> @@ -255,13 +255,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -271,7 +271,7 @@ <string>o</string> </property> </widget> - <widget class="QToolButton" row="0" column="3"> + <widget class="TQToolButton" row="0" column="3"> <property name="name"> <cstring>previewStop</cstring> </property> @@ -283,13 +283,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -299,7 +299,7 @@ <string>O</string> </property> </widget> - <widget class="QToolButton" row="0" column="4"> + <widget class="TQToolButton" row="0" column="4"> <property name="name"> <cstring>previewNext</cstring> </property> @@ -311,13 +311,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -339,7 +339,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -362,10 +362,10 @@ <include location="global" impldecl="in declaration">klistview.h</include> <include location="global" impldecl="in declaration">klistbox.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>toggled(bool)</signal> -</signals> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp index 98ba0cb..e9be885 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(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } 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?").arg(hostname).arg(port); + message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port); break; case TQSocket::ErrHostNotFound: - message=i18n("Host '%1' not found.").arg(hostname); + message=i18n("Host '%1' not found.").tqarg(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.capturedTexts(); + TQStringList timeinfo=time_re.tqcapturedTexts(); 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.capturedTexts(); + TQStringList songidinfo=songid_re.tqcapturedTexts(); 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").arg(songid).arg(sec).latin1())) + if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1())) { fetchOk(); // unlocks } @@ -316,7 +316,7 @@ void MpdInterface::jumpToTime(int sec) void MpdInterface::playpause() { reconnect(); - if (playingStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n")) + if (playingtqStatus()==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.capturedTexts(); + TQStringList info=volume_re.tqcapturedTexts(); 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").arg(volume).latin1())) + if (dispatch(TQString("setvol %1\n").tqarg(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.capturedTexts(); + TQStringList info=file_re.tqcapturedTexts(); 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.capturedTexts(); + TQStringList info=id_re.tqcapturedTexts(); 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").arg(songid)).latin1())) + if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1())) { if (fetchOk()) list.pop_front(); return; @@ -452,7 +452,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) while (!path.empty()) { if (dispatch((TQString("add \"") - +path.join("/").replace("\"","\\\"") + +path.join("/").tqreplace("\"","\\\"") +TQString("\"\n")).latin1())) { if (fetchOk()) break; @@ -483,7 +483,7 @@ const TQString MpdInterface::getTrackTitle() const TQRegExp songid_re("songid: (\\d+)"); if (songid_re.search(res)>=0) { - TQStringList songidinfo=songid_re.capturedTexts(); + TQStringList songidinfo=songid_re.tqcapturedTexts(); 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").arg(songid).latin1())) + if (!dispatch(TQString("playlistid %1\n").tqarg(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.capturedTexts(); + TQStringList info=artist_re.tqcapturedTexts(); info.pop_front(); artist=info.first(); } else if (album_re.search(res)>=0) { - TQStringList info=album_re.capturedTexts(); + TQStringList info=album_re.tqcapturedTexts(); info.pop_front(); album=info.first(); } else if (title_re.search(res)>=0) { - TQStringList info=title_re.capturedTexts(); + TQStringList info=title_re.tqcapturedTexts(); info.pop_front(); title=info.first(); } else if (track_re.search(res)>=0) { - TQStringList info=track_re.capturedTexts(); + TQStringList info=track_re.tqcapturedTexts(); info.pop_front(); track=info.first(); } else if (file_re.search(res)>=0) { - TQStringList info=file_re.capturedTexts(); + TQStringList info=file_re.tqcapturedTexts(); info.pop_front(); file=info.first(); } @@ -559,15 +559,15 @@ const TQString MpdInterface::getTrackTitle() const else return album; } - return i18n("No tags: %1").arg(file); + return i18n("No tags: %1").tqarg(file); } -int MpdInterface::playingStatus() +int MpdInterface::playingtqStatus() { //kdDebug(90200) << "looking up playing status\n"; if (!dispatch("status\n")) return Stopped; - PlayingStatus status=Stopped; + PlayingtqStatus status=Stopped; TQString res; while(fetchLine(res)) { diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h index ab95637..b7512b9 100644 --- a/kicker-applets/mediacontrol/mpdInterface.h +++ b/kicker-applets/mediacontrol/mpdInterface.h @@ -32,6 +32,7 @@ class MpdInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: MpdInterface(); ~MpdInterface(); @@ -50,7 +51,7 @@ class MpdInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingStatus(); + virtual int playingtqStatus(); void changeVolume(int delta); diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index c7355dc..4047eb6 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -66,7 +66,7 @@ void NoatunInterface::myInit() void NoatunInterface::appRegistered(const TQCString &appId) { - if (appId.contains("noatun",false)) + if (appId.tqcontains("noatun",false)) { mAppId = appId; emit playerStarted(); @@ -76,7 +76,7 @@ void NoatunInterface::appRegistered(const TQCString &appId) void NoatunInterface::appRemoved(const TQCString &appId) { - if (appId.contains("noatun",false)) + if (appId.tqcontains("noatun",false)) { // is there still another noatun alive? if (findRunningNoatun()) @@ -145,10 +145,10 @@ void NoatunInterface::updateSlider() time = 0; } emit newSliderPosition(len/1000,time/1000); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } -int NoatunInterface::playingStatus() +int NoatunInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; @@ -220,34 +220,34 @@ void NoatunInterface::playpause() { if (!findRunningNoatun()) startPlayer("noatun"); - kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString()); } void NoatunInterface::stop() { - kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString()); } void NoatunInterface::next() { // fastForward() is noatun from kde2 - //kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString::null); - kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString::null); + //kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString()); + kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString()); } void NoatunInterface::prev() { - kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString()); } void NoatunInterface::volumeUp() { - kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString()); } void NoatunInterface::volumeDown() { - kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString()); } const TQString NoatunInterface::getTrackTitle() const @@ -259,7 +259,7 @@ const TQString NoatunInterface::getTrackTitle() const replyData, false, 200)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) reply >> title; } return title; @@ -273,7 +273,7 @@ bool NoatunInterface::findRunningNoatun() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).contains("noatun", false)) + if ((*iterator).tqcontains("noatun", false)) { mAppId = *iterator; return true; diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h index 36fa21c..64f9ab9 100644 --- a/kicker-applets/mediacontrol/noatunInterface.h +++ b/kicker-applets/mediacontrol/noatunInterface.h @@ -28,6 +28,7 @@ class NoatunInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: NoatunInterface(); ~NoatunInterface(); @@ -48,7 +49,7 @@ class NoatunInterface : public PlayerInterface const TQString getTrackTitle() const; void appRegistered(const TQCString &appId); void appRemoved(const TQCString &appId); - int playingStatus(); + int playingtqStatus(); void myInit(void); diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h index 4d7fa7c..916d387 100644 --- a/kicker-applets/mediacontrol/playerInterface.h +++ b/kicker-applets/mediacontrol/playerInterface.h @@ -21,14 +21,15 @@ #include <tqobject.h> #include <tqdragobject.h> -class PlayerInterface : public QObject +class PlayerInterface : public TQObject { Q_OBJECT + TQ_OBJECT public: PlayerInterface(); virtual ~PlayerInterface(); - enum PlayingStatus { Stopped=0, Playing, Paused }; + enum PlayingtqStatus { Stopped=0, Playing, Paused }; public slots: virtual void updateSlider()=0; // gets called on timer-timeout @@ -44,7 +45,7 @@ class PlayerInterface : public QObject virtual void dragEnterEvent(TQDragEnterEvent* event)=0; virtual void dropEvent(TQDropEvent* event)=0; virtual const TQString getTrackTitle() const=0; - virtual int playingStatus()=0; + virtual int playingtqStatus()=0; void startPlayer(const TQString &desktopname); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 478ca2d..8e6c8ec 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -32,8 +32,8 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(TQWidget *parent, const char *name) - : TQButton(parent, name), +SimpleButton::SimpleButton(TQWidget *tqparent, const char *name) + : TQButton(tqparent, name), m_highlight(false), m_orientation(Qt::Horizontal) { @@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::sizeHint() const +TQSize SimpleButton::tqsizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::sizeHint(); + return TQButton::tqsizeHint(); else return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -TQSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::tqminimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::minimumSizeHint(); + return TQButton::tqminimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -192,20 +192,20 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name) - : SimpleButton(parent, name) +SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name) + : SimpleButton(tqparent, name) { setBackgroundOrigin(AncestorOrigin); _arrow = arrow; _inside = false; } -TQSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } -void SimpleArrowButton::setArrowType(Qt::ArrowType a) +void SimpleArrowButton::setArrowType(TQt::ArrowType a) { if (_arrow != a) { @@ -214,7 +214,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a) } } -Qt::ArrowType SimpleArrowButton::arrowType() const +TQt::ArrowType SimpleArrowButton::arrowType() const { return _arrow; } @@ -226,15 +226,15 @@ void SimpleArrowButton::drawButton( TQPainter *p ) TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h index 1ea5c7a..9b4e231 100644 --- a/kicker-applets/mediacontrol/simplebutton.h +++ b/kicker-applets/mediacontrol/simplebutton.h @@ -26,16 +26,17 @@ #include <kdemacros.h> -class KDE_EXPORT SimpleButton : public QButton +class KDE_EXPORT SimpleButton : public TQButton { Q_OBJECT + TQ_OBJECT public: - SimpleButton(TQWidget *parent, const char *name = 0); + SimpleButton(TQWidget *tqparent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -63,23 +64,24 @@ class KDE_EXPORT SimpleButton : public QButton class KDE_EXPORT SimpleArrowButton: public SimpleButton { Q_OBJECT + TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent *e ); virtual void leaveEvent( TQEvent *e ); virtual void drawButton(TQPainter *p); - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; public slots: - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); private: - Qt::ArrowType _arrow; + TQt::ArrowType _arrow; bool _inside; }; diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp index 7d8e236..05fc2b0 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(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } @@ -163,7 +163,7 @@ void XmmsInterface::volumeDown() xmms_remote_set_main_volume(XMMS_SESSION, cur-1); } -int XmmsInterface::playingStatus() +int XmmsInterface::playingtqStatus() { if (xmms_remote_is_paused(XMMS_SESSION)) return Paused; diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h index 34db157..59bea23 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.h +++ b/kicker-applets/mediacontrol/xmmsInterface.h @@ -30,6 +30,7 @@ class XmmsInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: XmmsInterface(); ~XmmsInterface(); @@ -48,7 +49,7 @@ class XmmsInterface : public PlayerInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingStatus(); + virtual int playingtqStatus(); private: TQTimer *xmms_timer; diff --git a/knewsticker-scripts/stock.pl b/knewsticker-scripts/stock.pl index 9e07adf..6c8fe05 100755 --- a/knewsticker-scripts/stock.pl +++ b/knewsticker-scripts/stock.pl @@ -60,7 +60,7 @@ # Please set your stock symbols and the ticker you wish to retrieve them from # as follows: # Locate the Variable that is named 'my @tickers' -# within the parenthesis put as the FIRST values you ticker, for example yahoo +# within the tqparenthesis put as the FIRST values you ticker, for example yahoo # or yahoo_europe or any of the others mentioned above # any subsequent value seperated by a whitespace is a ticker symbol # such as MSFT or IBM or LNUX @@ -74,7 +74,7 @@ use POSIX qw(strftime); # encouraged, that you only use this when you have 1 stock symbol and not more. my $verbose = 0; -#Make sure you set the first value within the parenthesis to match the ticker +#Make sure you set the first value within the tqparenthesis to match the ticker #you wish to retrieve data from, such as yahoo or yahoo_europe. Each following #entry, seperated by a whitespace, represnts a stock symbol to the script my @tickers = qw(yahoo_europe IBM MSFT LNUX); diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index c18c061..9d0fdb3 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -56,11 +56,11 @@ using namespace DOM; typedef KGenericFactory<AdBlock> AdBlockFactory; K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) ) -AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : - KParts::Plugin(parent, name), +AdBlock::AdBlock(TQObject *tqparent, const char *name, const TQStringList &) : + KParts::Plugin(tqparent, name), m_label(0), m_menu(0) { - m_part = dynamic_cast<KHTMLPart *>(parent); + m_part = dynamic_cast<KHTMLPart *>(tqparent); if(!m_part) { kdDebug() << "couldn't get KHTMLPart" << endl; return; } m_menu = new KPopupMenu(m_part->widget()); @@ -95,7 +95,7 @@ void AdBlock::initLabel() KIconLoader *loader = instance()->iconLoader(); m_label->setFixedHeight(loader->currentSize(KIcon::Small)); - m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_label->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_label->setUseCursor(false); m_label->setPixmap(loader->loadIcon("filter", KIcon::Small)); @@ -176,7 +176,7 @@ void AdBlock::fillWithImages(AdElementList &elements) if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, "image", "IMG", false); - if (!elements.contains( element )) + if (!elements.tqcontains( element )) elements.append( element); } } @@ -203,7 +203,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, tagName.string(), category, false); - if (!elements.contains( element )) + if (!elements.tqcontains( element )) elements.append( element); } } diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index 0a9b15b..87c1e5d 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -18,8 +18,8 @@ 02110-1301, USA. */ -#ifndef KONQ_ADBLOCK_H -#define KONQ_ADBLOCK_H +#ifndef KONTQ_ADBLOCK_H +#define KONTQ_ADBLOCK_H #include <tqguardedptr.h> #include <tqvaluelist.h> @@ -46,9 +46,10 @@ typedef TQValueList<AdElement> AdElementList; class AdBlock : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - AdBlock(TQObject *parent, const char *name, const TQStringList &); + AdBlock(TQObject *tqparent, const char *name, const TQStringList &); ~AdBlock(); private: diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index 1aff0f6..d4e0140 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -32,8 +32,8 @@ #include <tqfont.h> #include <tqpainter.h> -AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : - KDialogBase( parent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) +AdBlockDlg::AdBlockDlg(TQWidget *tqparent, AdElementList &elements) : + KDialogBase( tqparent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); m_label1 = new TQLabel( i18n("All blockable items in this page:"), page, "label1" ); diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h index 0890d09..b0e397f 100644 --- a/konq-plugins/adblock/adblockdialogue.h +++ b/konq-plugins/adblock/adblockdialogue.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KONQ_ADBLOCKDLG_H -#define KONQ_ADBLOCKDLG_H +#ifndef KONTQ_ADBLOCKDLG_H +#define KONTQ_ADBLOCKDLG_H #include <kdialogbase.h> #include <tqlistview.h> @@ -30,6 +30,7 @@ class KPopupMenu; class AdBlockDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT private: TQLineEdit *m_filter; @@ -39,7 +40,7 @@ private: KPopupMenu *m_menu; public: - AdBlockDlg(TQWidget *parent, AdElementList &elements); + AdBlockDlg(TQWidget *tqparent, AdElementList &elements); ~AdBlockDlg(); private slots: @@ -55,7 +56,7 @@ signals: // ---------------------------------------------------------------------------- -class ListViewItem : public QListViewItem +class ListViewItem : public TQListViewItem { private: bool m_blocked; diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 2f59adc..4402cd4 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -65,8 +65,8 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const KHTMLView* view = 0L; - if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("KHTMLView")) - view = static_cast<KHTMLView*>(popupmenu->parent()); + if (popupmenu && popupmenu->tqparent() && popupmenu->tqparent()->inherits("KHTMLView")) + view = static_cast<KHTMLView*>(TQT_TQWIDGET(popupmenu->tqparent())); if (view) m_part = view->part(); @@ -85,7 +85,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const { kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); - addAction( action ); + tqaddAction( action ); addSeparator(); m_feedURL = it->url().url(); break; @@ -103,16 +103,16 @@ AkregatorMenu::~AkregatorMenu() bool AkregatorMenu::isFeedUrl(const TQString &url) { - if (url.contains(".htm", false) != 0) return false; - if (url.contains("rss", false) != 0) return true; - if (url.contains("rdf", false) != 0) return true; - if (url.contains("xml", false) != 0) return true; + if (url.tqcontains(".htm", false) != 0) return false; + if (url.tqcontains("rss", false) != 0) return true; + if (url.tqcontains("rdf", false) != 0) return true; + if (url.tqcontains("xml", false) != 0) return true; return false; } bool AkregatorMenu::isFeedUrl(const KFileItem * item) { - if ( m_feedMimeTypes.contains( item->mimetype() ) ) + if ( m_feedMimeTypes.tqcontains( item->mimetype() ) ) return true; else { diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h index 9fb6787..4c03dee 100644 --- a/konq-plugins/akregator/akregatorplugin.h +++ b/konq-plugins/akregator/akregatorplugin.h @@ -36,6 +36,7 @@ namespace Akregator class AkregatorMenu : public KonqPopupMenuPlugin, PluginBase { Q_OBJECT + TQ_OBJECT public: AkregatorMenu( KonqPopupMenu *, const char *name, const TQStringList &list ); virtual ~AkregatorMenu(); diff --git a/konq-plugins/akregator/feeddetector.cpp b/konq-plugins/akregator/feeddetector.cpp index 57a333c..595f871 100644 --- a/konq-plugins/akregator/feeddetector.cpp +++ b/konq-plugins/akregator/feeddetector.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqregexp.h> diff --git a/konq-plugins/akregator/feeddetector.h b/konq-plugins/akregator/feeddetector.h index 346663d..ccec4d7 100644 --- a/konq-plugins/akregator/feeddetector.h +++ b/konq-plugins/akregator/feeddetector.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORFEEDDETECTOR_H diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index ce6f89e..a1b993e 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "konqfeedicon.h" @@ -55,12 +55,12 @@ typedef KGenericFactory<KonqFeedIcon> KonqFeedIconFactory; K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIconFactory("akregatorkonqfeedicon")) -KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) - : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) +KonqFeedIcon::KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("akregator_konqplugin"); - m_part = dynamic_cast<KHTMLPart*>(parent); + m_part = dynamic_cast<KHTMLPart*>(tqparent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); @@ -110,7 +110,7 @@ bool KonqFeedIcon::feedFound() for (unsigned int j = 0; j < node.attributes().length(); j++) { doc += node.attributes().item(j).nodeName().string() + "=\""; - doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); + doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).tqreplace("\"", """); doc += "\" "; } doc += "/>"; @@ -156,7 +156,7 @@ void KonqFeedIcon::addFeedIcon() // from khtmlpart's ualabel m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_feedIcon->tqsetSizePolicy(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/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index 0ac19f0..1dcadcd 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ -#ifndef KONQFEEDICON_H -#define KONQFEEDICON_H +#ifndef KONTQFEEDICON_H +#define KONTQFEEDICON_H #include <tqguardedptr.h> #include <kparts/plugin.h> @@ -46,8 +46,9 @@ namespace Akregator { class KonqFeedIcon : public KParts::Plugin, PluginBase { Q_OBJECT + TQ_OBJECT public: - KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &); + KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &); ~KonqFeedIcon(); diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp index f837426..c0ade83 100644 --- a/konq-plugins/akregator/pluginbase.cpp +++ b/konq-plugins/akregator/pluginbase.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kurl.h> diff --git a/konq-plugins/akregator/pluginbase.h b/konq-plugins/akregator/pluginbase.h index 1c1d4e6..64e1853 100644 --- a/konq-plugins/akregator/pluginbase.h +++ b/konq-plugins/akregator/pluginbase.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PLUGINBASE_H diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index f1687fc..c1d18a1 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -73,7 +73,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis while ( ( item = it.current() ) != 0 ) { ++it; - if ( m_extractMimeTypes.contains( item->mimetype() ) ) + if ( m_extractMimeTypes.tqcontains( item->mimetype() ) ) { hasArchives = true; } @@ -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" ).arg( m_name + m_ext ), 0, this, + action = new KAction( i18n( "Compress as %1" ).tqarg( m_name + m_ext ), 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } else @@ -126,7 +126,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis action = new KAction( i18n( "Add to Archive..." ), 0, this, TQT_SLOT( slotAdd() ), actionCollection() ); actionMenu->insert( action ); - addAction( actionMenu ); + tqaddAction( actionMenu ); } if ( !hasOther && hasArchives ) @@ -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" ).arg( targetName ), 0, this, + action = new KAction( i18n( "Extract to %1" ).tqarg( targetName ), 0, this, TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } else @@ -155,12 +155,12 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis action = new KAction( i18n( "Extract To..." ), 0 , this, TQT_SLOT( slotExtractTo() ), actionCollection() ); actionMenu->insert( action ); - addAction( actionMenu ); + tqaddAction( actionMenu ); } else { action = new KAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); - addAction( action ); + tqaddAction( action ); } } addSeparator(); @@ -442,7 +442,7 @@ void ArkMenu::stripExtension( TQString & name ) ext = (*it).remove( '*' ); if ( name.endsWith( ext ) ) { - name = name.left( name.findRev( ext ) ) + '/'; + name = name.left( name.tqfindRev( ext ) ) + '/'; break; } } @@ -456,13 +456,13 @@ void ArkMenu::slotCompressAs( int pos ) TQStringList filelist( m_urlStringList ); //if KMimeType returns .ZIP, .7Z or .RAR. convert them to lowercase - if ( m_extensionList[ pos ].contains ( ".ZIP" ) ) + if ( m_extensionList[ pos ].tqcontains ( ".ZIP" ) ) m_extensionList[ pos ] = ".zip"; - if ( m_extensionList[ pos ].contains ( ".RAR" ) ) + if ( m_extensionList[ pos ].tqcontains ( ".RAR" ) ) m_extensionList[ pos ] = ".rar"; - if ( m_extensionList[ pos ].contains ( ".7Z" ) ) + if ( m_extensionList[ pos ].tqcontains ( ".7Z" ) ) m_extensionList[ pos ] = ".7z"; if ( filelist.count() == 1) @@ -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").arg(i) + m_extensionList[ pos ]; + target = m_dir + i18n("Archive %1").tqarg(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").arg(i) + m_ext; + name = m_dir + i18n("Archive %1").tqarg(i) + m_ext; i++; } } diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h index 797d2d9..8cfdb94 100644 --- a/konq-plugins/arkplugin/arkplugin.h +++ b/konq-plugins/arkplugin/arkplugin.h @@ -30,6 +30,7 @@ class TQSignalMapper; class ArkMenu : public KonqPopupMenuPlugin { Q_OBJECT + TQ_OBJECT public: ArkMenu( KonqPopupMenu *, const char *name, const TQStringList & list ); virtual ~ArkMenu(); diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index 64be883..bcb40f2 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -16,8 +16,8 @@ #include <tqtimer.h> #include <kgenericfactory.h> -AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList & /*args*/ ) - : Plugin( parent, name ) +AutoRefresh::AutoRefresh( TQObject* tqparent, const char* name, const TQStringList & /*args*/ ) + : Plugin( tqparent, name ) { timer = new TQTimer( this ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); @@ -85,7 +85,7 @@ void AutoRefresh::slotIntervalChanged() void AutoRefresh::slotRefresh() { - if ( !parent()->inherits("KParts::ReadOnlyPart") ) { + if ( !tqparent()->inherits("KParts::ReadOnlyPart") ) { TQString title = i18n( "Cannot Refresh Source" ); TQString text = i18n( "<qt>This plugin cannot auto-refresh the current part.</qt>" ); @@ -93,7 +93,7 @@ void AutoRefresh::slotRefresh() } else { - KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) parent(); + KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) tqparent(); // Get URL KURL url = part->url(); diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h index c72c335..04bdbdc 100644 --- a/konq-plugins/autorefresh/autorefresh.h +++ b/konq-plugins/autorefresh/autorefresh.h @@ -31,12 +31,13 @@ class TQTimer; class AutoRefresh : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: /** * Construct a new KParts plugin. */ - AutoRefresh( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + AutoRefresh( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index fc7a80e..bf2e7da 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -34,9 +34,9 @@ typedef KGenericFactory<PluginBabelFish> BabelFishFactory; static const KAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) ) -PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, +PluginBabelFish::PluginBabelFish( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( parent, name ) + : Plugin( tqparent, name ) { setInstance(BabelFishFactory::instance()); @@ -178,9 +178,9 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, m_menu->setEnabled( true ); // TODO: we could also support plain text viewers... - if ( parent && parent->inherits( "KHTMLPart" ) ) + if ( tqparent && tqparent->inherits( "KHTMLPart" ) ) { - KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent); + KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(tqparent); connect( part, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(slotStarted(KIO::Job*)) ); } @@ -193,9 +193,9 @@ PluginBabelFish::~PluginBabelFish() void PluginBabelFish::slotStarted( KIO::Job* ) { - if ( parent()->inherits("KHTMLPart") && + if ( tqparent()->inherits("KHTMLPart") && // Babelfish wants http URLs only. No https. - static_cast<KParts::ReadOnlyPart *>(parent())->url().protocol().lower() == "http" ) + static_cast<KParts::ReadOnlyPart *>(tqparent())->url().protocol().lower() == "http" ) { m_menu->setEnabled( true ); } @@ -211,8 +211,8 @@ void PluginBabelFish::translateURL() if ( !sender() ) return; - // The parent is assumed to be a KHTMLPart - if ( !parent()->inherits("KHTMLPart") ) + // The tqparent is assumed to be a KHTMLPart + if ( !tqparent()->inherits("KHTMLPart") ) { TQString title = i18n( "Cannot Translate Source" ); TQString text = i18n( "Only web pages can be translated using " @@ -224,10 +224,10 @@ void PluginBabelFish::translateURL() // Select engine KConfig cfg( "translaterc", true ); - TQString engine = cfg.readEntry( sender()->name(), "babelfish" ); + TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "babelfish" ); // Get URL - KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); if ( !part ) return; @@ -262,33 +262,33 @@ void PluginBabelFish::translateURL() TQString query; if( engine == "freetranslation" ) { query = "sequence=core&Submit=FREE Translation&language="; - if( sender()->name() == TQString( "en_es" ) ) + if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_es" ) ) query += "English/Spanish"; - else if( sender()->name() == TQString( "en_de" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_de" ) ) query += "English/German"; - else if( sender()->name() == TQString( "en_it" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_it" ) ) query += "English/Italian"; - else if( sender()->name() == TQString( "en_nl" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_nl" ) ) query += "English/Dutch"; - else if( sender()->name() == TQString( "en_pt" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_pt" ) ) query += "English/Portuguese"; - else if( sender()->name() == TQString( "en_no" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_no" ) ) query += "English/Norwegian"; - else if( sender()->name() == TQString( "en_zh" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_zh" ) ) query += "English/SimplifiedChinese"; - else if( sender()->name() == TQString( "en_zhTW" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_zhTW" ) ) query += "English/TraditionalChinese"; - else if( sender()->name() == TQString( "es_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "es_en" ) ) query += "Spanish/English"; - else if( sender()->name() == TQString( "fr_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_en" ) ) query += "French/English"; - else if( sender()->name() == TQString( "de_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "de_en" ) ) query += "German/English"; - else if( sender()->name() == TQString( "it_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "it_en" ) ) query += "Italian/English"; - else if( sender()->name() == TQString( "nl_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "nl_en" ) ) query += "Dutch/English"; - else if( sender()->name() == TQString( "pt_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "pt_en" ) ) query += "Portuguese/English"; else // Should be en_fr query += "English/French"; @@ -313,21 +313,21 @@ void PluginBabelFish::translateURL() } else if( engine == "reverso" ) { result = KURL( "http://www.reverso.net/url/frame.asp" ); query = "autotranslate=on&templates=0&x=0&y=0&directions="; - if( sender()->name() == TQString( "de_fr" ) ) + if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "de_fr" ) ) query += "524292"; - else if( sender()->name() == TQString( "fr_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_en" ) ) query += "65544"; - else if( sender()->name() == TQString( "fr_de" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_de" ) ) query += "262152"; - else if( sender()->name() == TQString( "de_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "de_en" ) ) query += "65540"; - else if( sender()->name() == TQString( "en_de" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_de" ) ) query += "262145"; - else if( sender()->name() == TQString( "en_es" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_es" ) ) query += "2097153"; - else if( sender()->name() == TQString( "es_en" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "es_en" ) ) query += "65568"; - else if( sender()->name() == TQString( "fr_es" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "fr_es" ) ) query += "2097160"; else // "en_fr" query += "524289"; @@ -336,20 +336,20 @@ void PluginBabelFish::translateURL() } else if( engine == "tsail" ) { result = KURL( "http://www.t-mail.com/cgi-bin/tsail" ); query = "sail=full&lp="; - if( sender()->name() == TQString( "zhTW_en" ) ) + if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "zhTW_en" ) ) query += "tw-en"; - else if( sender()->name() == TQString( "en_zhTW" ) ) + else if( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "en_zhTW" ) ) query += "en-tw"; else { - query += sender()->name(); + query += TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); query[15] = '-'; } query += totrans; } else if( engine == "voila" ) { result = KURL( "http://trans.voila.fr/voila" ); query = "systran_id=Voila-fr&systran_lp="; - query += sender()->name(); + query += TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); if ( part->hasSelection() ) query += "&systran_charset=utf-8&systran_text="; else @@ -359,7 +359,7 @@ void PluginBabelFish::translateURL() // Using the altavista babelfish engine result = KURL( "http://babelfish.altavista.com/babelfish/tr" ); query = "lp="; - query += sender()->name(); + query += TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); if ( part->hasSelection() ) query += "&text="; else diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h index 1844ce1..98efe04 100644 --- a/konq-plugins/babelfish/plugin_babelfish.h +++ b/konq-plugins/babelfish/plugin_babelfish.h @@ -28,8 +28,9 @@ namespace KIO { class Job; } class PluginBabelFish : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - PluginBabelFish( TQObject* parent, const char* name, + PluginBabelFish( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~PluginBabelFish(); diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index b1e1f6f..5e04b1a 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -37,10 +37,10 @@ typedef KGenericFactory<CrashesPlugin> CrashesPluginFactory; K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplugin" ) ) -CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ) -: KParts::Plugin( parent, name ) +CrashesPlugin::CrashesPlugin( TQObject* tqparent, const char* name, const TQStringList & ) +: KParts::Plugin( tqparent, name ) { - m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; + m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L; m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core", actionCollection(), "crashes" ); @@ -139,12 +139,12 @@ void CrashesPlugin::slotAboutToShow() void CrashesPlugin::newBookmarkCallback( const TQString & text, const TQCString & url, const TQString & ) { - m_crashesList.prepend(qMakePair(text,url)); + m_crashesList.prepend(tqMakePair(text,url)); } void CrashesPlugin::endFolderCallback( ) { - m_crashesList.prepend(qMakePair(TQString("-"),TQCString("-"))); + m_crashesList.prepend(tqMakePair(TQString("-"),TQCString("-"))); } void CrashesPlugin::slotClearCrashes() { diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h index 3c6a402..0af567e 100644 --- a/konq-plugins/crashes/crashesplugin.h +++ b/konq-plugins/crashes/crashesplugin.h @@ -35,9 +35,10 @@ class KActionMenu; class CrashesPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - CrashesPlugin( TQObject* parent, const char* name, + CrashesPlugin( TQObject* tqparent, const char* name, const TQStringList & ); ~CrashesPlugin(); @@ -55,12 +56,12 @@ private: KHTMLPart* m_part; KActionMenu* m_pCrashesMenu; - typedef QPair<TQString,TQCString> Crash; + typedef TQPair<TQString,TQCString> Crash; typedef TQValueList<Crash> CrashesList; CrashesList m_crashesList; - typedef QPair<int, int> CrashRange; + typedef TQPair<int, int> CrashRange; typedef TQValueList<CrashRange> CrashRangesList; CrashRangesList m_crashRangesList; diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index ff2eecd..ea5fe77 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -141,14 +141,14 @@ void SessionManager::loadSettings() -DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, +DirFilterPlugin::DirFilterPlugin (TQObject* tqparent, const char* name, const TQStringList&) - :KParts::Plugin (parent, name), + :KParts::Plugin (tqparent, name), m_pFilterMenu(0), m_searchWidget(0), m_oldFilterString("") { - m_part = ::qt_cast<KonqDirPart*>(parent); + m_part = ::tqqt_cast<KonqDirPart*>(tqparent); if ( !m_part || !m_part->scrollWidget() ) return; @@ -179,12 +179,12 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field.")); - if ( ::qt_cast<KListView*>(m_part->scrollWidget()) ) + if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) { m_searchWidget = new KListViewSearchLine(hbox); static_cast<KListViewSearchLine*>(m_searchWidget)->setListView(static_cast<KListView*>(m_part->scrollWidget())); } - else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) + else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { m_searchWidget = new KIconViewSearchLine(hbox); static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget())); @@ -204,7 +204,7 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, // FIXME: This causes crashes for an unknown reason on certain systems // Probably the iconview onchange event handler should tempoarily stop this timer before doing anything else -// Really the broken Qt3 iconview should just be modified to include a hidden list; it would make things *so* much easier! +// Really the broken TQt3 iconview should just be modified to include a hidden list; it would make things *so* much easier! m_refreshTimer = new TQTimer( this ); m_reactivateRefreshTimer = new TQTimer( this ); connect( m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(activateSearch()) ); @@ -416,11 +416,11 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) m_pFilterMenu->setEnabled (m_part->nameFilter().isEmpty()); return; } - if ( ::qt_cast<KListView*>(m_part->scrollWidget()) ) + if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) { static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); } - else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) + else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); } @@ -438,11 +438,11 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) continue; TQString mimeType = mime->name(); - if (!m_pMimeInfo.contains (mimeType)) + if (!m_pMimeInfo.tqcontains (mimeType)) { MimeInfo& mimeInfo = m_pMimeInfo[mimeType]; TQStringList filters = m_part->mimeFilter (); - mimeInfo.useAsFilter = (!filters.isEmpty () && filters.contains (mimeType)); + mimeInfo.useAsFilter = (!filters.isEmpty () && filters.tqcontains (mimeType)); mimeInfo.mimeComment = mime->comment(); mimeInfo.iconName = mime->icon(KURL(), false); mimeInfo.filenames.insert(name, false); @@ -468,13 +468,13 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item) // NOTE: This bug is NOT present in qlistviewitem // HACK around it here... - if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { + if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name()); } TQString mimeType = item->mimetype().stripWhiteSpace(); - if (m_pMimeInfo.contains (mimeType)) { + if (m_pMimeInfo.tqcontains (mimeType)) { MimeInfo info = m_pMimeInfo [mimeType]; if (info.filenames.size () > 1) @@ -506,10 +506,10 @@ void DirFilterPlugin::activateSearch() m_oldFilterString = m_searchWidget->text(); - if ( ::qt_cast<KListView*>(m_part->scrollWidget()) ) { + if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) { static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); } - else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { + else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); } } diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h index ff3497e..d6e87e6 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.h +++ b/konq-plugins/dirfilter/dirfilterplugin.h @@ -81,10 +81,11 @@ private: class DirFilterPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - DirFilterPlugin (TQObject* parent, const char* name, const TQStringList &); + DirFilterPlugin (TQObject* tqparent, const char* name, const TQStringList &); ~DirFilterPlugin (); protected: diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui index c77f92d..c98bb3d 100644 --- a/konq-plugins/domtreeviewer/attributeeditdialog.ui +++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AttributeEditDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AttributeEditDialog</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -45,7 +45,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -87,15 +87,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okBtn</cstring> </property> @@ -119,14 +119,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelBtn</cstring> </property> @@ -166,7 +166,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index 7ab20b4..4203765 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -23,26 +23,26 @@ #include <kglobalsettings.h> -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent ) - : TQListViewItem( parent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent ) + : TQListViewItem( tqparent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent, TQListViewItem *after) - : TQListViewItem( parent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent, TQListViewItem *after) + : TQListViewItem( tqparent, after ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent ) - : TQListViewItem( parent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent ) + : TQListViewItem( tqparent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent, TQListViewItem *after) - : TQListViewItem( parent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent, TQListViewItem *after) + : TQListViewItem( tqparent, after ), m_node(node) { init(); } @@ -59,14 +59,14 @@ void DOMListViewItem::init() clos = false; } -void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) +void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) { TQColorGroup _cg( cg ); TQColor c = _cg.text(); p->setFont(m_font); _cg.setColor( TQColorGroup::Text, m_color ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); _cg.setColor( TQColorGroup::Text, c ); } diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h index 9a85fbf..14cf5ec 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.h +++ b/konq-plugins/domtreeviewer/domlistviewitem.h @@ -22,18 +22,18 @@ #include <tqcolor.h> #include <tqfont.h> -class DOMListViewItem : public QListViewItem +class DOMListViewItem : public TQListViewItem { public: - DOMListViewItem( const DOM::Node &, TQListView *parent ); - DOMListViewItem( const DOM::Node &, TQListView *parent, TQListViewItem *after ); - DOMListViewItem( const DOM::Node &, TQListViewItem *parent ); - DOMListViewItem( const DOM::Node &, TQListViewItem *parent, TQListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListView *tqparent ); + DOMListViewItem( const DOM::Node &, TQListView *tqparent, TQListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent ); + DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent, TQListViewItem *after ); virtual ~DOMListViewItem(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); void setColor( const TQColor &color) { m_color = color; } diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index 0bbb918..e8f8f05 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").arg(dom_err); + return i18n("Unknown Exception %1").tqarg(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.unicode(), value.length()).string().contains('\n') - || TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n'); + TQConstString(value.tqunicode(), value.length()).string().tqcontains('\n') + || TQConstString(oldValue.tqunicode(), oldValue.length()).string().tqcontains('\n'); } cdata.setData(value); addChangedNode(cdata); @@ -423,8 +423,8 @@ TQString ChangeCDataCommand::name() const // == ManipulateNodeCommand =========================================== -ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) -: _node(node), _parent(parent), _after(after) +ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) +: _node(node), _parent(tqparent), _after(after) { } @@ -457,8 +457,8 @@ void ManipulateNodeCommand::remove() // == InsertNodeCommand =========================================== -InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) -: ManipulateNodeCommand(node, parent, after) +InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) +: ManipulateNodeCommand(node, tqparent, after) { } @@ -485,8 +485,8 @@ TQString InsertNodeCommand::name() const // == RemoveNodeCommand =========================================== -RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) -: ManipulateNodeCommand(node, parent, after) +RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) +: ManipulateNodeCommand(node, tqparent, after) { } @@ -513,8 +513,8 @@ TQString RemoveNodeCommand::name() const // == MoveNodeCommand =========================================== -MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) -: _node(node), new_parent(parent), new_after(after) +MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) +: _node(node), new_parent(tqparent), new_after(after) { old_parent = node.parentNode(); old_after = node.nextSibling(); diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h index f068426..43af96b 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.h +++ b/konq-plugins/domtreeviewer/domtreecommands.h @@ -51,9 +51,10 @@ TQString domErrorMessage(int exception_code); * Internal class for emitting signals. * @internal */ -class ManipulationCommandSignalEmitter : public QObject +class ManipulationCommandSignalEmitter : public TQObject { Q_OBJECT + TQ_OBJECT ManipulationCommandSignalEmitter(); virtual ~ManipulationCommandSignalEmitter(); @@ -73,7 +74,7 @@ signals: */ void error(int err_id, const TQString &msg); -private: // make moc not complain +private: // make tqmoc not complain friend class ManipulationCommand; }; @@ -276,10 +277,10 @@ class ManipulateNodeCommand : public ManipulationCommand { public: /** - * Prepare command, where \c node is to be contained in \c parent, just + * Prepare command, where \c node is to be contained in \c tqparent, just * before \c after. If \c after is 0, it is appended at the end. */ - ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); + ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); virtual ~ManipulateNodeCommand(); protected: @@ -303,10 +304,10 @@ 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 children. + * Prepare insertion command, inserting \c node into \c tqparent, just + * before \c after. If \c after is 0, append it to the list of tqchildren. */ - InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); + InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); virtual ~InsertNodeCommand(); virtual TQString name() const; @@ -329,10 +330,10 @@ 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 children. + * Prepare insertion command, inserting \c node into \c tqparent, just + * before \c after. If \c after is 0, append it to the list of tqchildren. */ - RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); + RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); virtual ~RemoveNodeCommand(); virtual TQString name() const; @@ -352,10 +353,10 @@ class MoveNodeCommand : public ManipulationCommand { public: /** - * Move \c node from current position into \c parent, just before \c after. + * Move \c node from current position into \c tqparent, just before \c after. * Appends if \c after is 0. */ - MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); + MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); virtual ~MoveNodeCommand(); virtual TQString name() const; diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index d26dbfc..812cb5b 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -64,8 +64,8 @@ using namespace domtreeviewer; -DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/) - : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0), +DOMTreeView::DOMTreeView(TQWidget *tqparent, const char* name, bool /*allowSaving*/) + : DOMTreeViewBase(tqparent, name), m_expansionDepth(5), m_maxDepth(0), m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true), m_findDialog(0), focused_child(0) { @@ -101,8 +101,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving* installEventFilter(m_listView); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &))); - ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh())); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(slotRefreshNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), TQT_TQOBJECT(this), TQT_SLOT(refresh())); initDOMNodeInfo(); @@ -124,28 +124,28 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part) // nothing here yet } - parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") ); + tqparentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") ); TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed())); } DOMTreeWindow *DOMTreeView::mainWindow() const { - return static_cast<DOMTreeWindow *>(parentWidget()); + return static_cast<DOMTreeWindow *>(tqparentWidget()); } bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::AccelOverride) { - TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); + TQKeyEvent *ke = TQT_TQKEYEVENT(e); kdDebug(90180) << " acceloverride " << ke->key() << " o " << o->name() << endl; - if (o == m_listView) { // DOM tree + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_listView)) { // DOM tree KKey ks = mainWindow()->deleteNodeAction()->shortcut().seq(0).key(0); if (ke->key() == ks.keyCodeQt()) return true; - } else if (o == nodeAttributes) { + } else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(nodeAttributes)) { KKey ks = mainWindow()->deleteAttributeAction()->shortcut().seq(0).key(0); if (ke->key() == ks.keyCodeQt()) return true; @@ -155,14 +155,14 @@ bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e) } else if (e->type() == TQEvent::FocusIn) { kdDebug(90180) << " focusin o " << o->name() << endl; - if (o != this) { + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) { focused_child = o; } } else if (e->type() == TQEvent::FocusOut) { kdDebug(90180) << " focusout o " << o->name() << endl; - if (o != this) { + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) { focused_child = 0; } @@ -214,7 +214,7 @@ void DOMTreeView::slotShowTree(const DOM::Node &pNode) void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, uint depth) { DOMListViewItem *cur_item; - DOMListViewItem *parent_item = m_itemdict[pNode.handle()]; + DOMListViewItem *tqparent_item = m_itemdict[pNode.handle()]; if (depth > m_maxDepth) { m_maxDepth = depth; @@ -224,7 +224,7 @@ void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, u cur_item = new DOMListViewItem(node, m_listView); m_document = pNode.ownerDocument(); } else { - cur_item = new DOMListViewItem(node, parent_item); + cur_item = new DOMListViewItem(node, tqparent_item); } //kdDebug(90180) << node.nodeName().string() << " [" << depth << "]" << endl; @@ -252,7 +252,7 @@ void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, u cur_item = new DOMListViewItem(node, m_listView, cur_item); m_document = pNode.ownerDocument(); } else { - cur_item = new DOMListViewItem(node, parent_item, cur_item); + cur_item = new DOMListViewItem(node, tqparent_item, cur_item); } //kdDebug(90180) << "</" << node.nodeName().string() << ">" << endl; addElement(element, cur_item, true); @@ -318,13 +318,13 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item m_itemdict.insert(node.handle(), cur_item); } - DOMListViewItem *parent; - if (cur_item->parent()) { - parent = static_cast<DOMListViewItem *>(cur_item->parent()); + DOMListViewItem *tqparent; + if (cur_item->tqparent()) { + tqparent = static_cast<DOMListViewItem *>(cur_item->tqparent()); } else { - parent = cur_item; + tqparent = cur_item; } - cur_item = new DOMListViewItem(node, parent, cur_item); + cur_item = new DOMListViewItem(node, tqparent, cur_item); } // This is one is too much DOMListViewItem *notLastItem = static_cast<DOMListViewItem *>(cur_item->itemAbove()); @@ -343,7 +343,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeN * think it's worth it. */ - TQColor namedColor(palette().active().text()); + TQColor namedColor(tqpalette().active().text()); TQString tagName = nodeName.upper(); if ( tagName == "HTML" ) { namedColor = "#0000ff"; @@ -469,13 +469,13 @@ void DOMTreeView::slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQL for (; it != items.end(); ++it, ++anit) { DOMListViewItem *item = static_cast<DOMListViewItem *>(*it); DOMListViewItem *anitem = static_cast<DOMListViewItem *>(*anit); - DOM::Node parent = static_cast<DOMListViewItem *>(item->parent())->node(); - Q_ASSERT(!parent.isNull()); + DOM::Node tqparent = static_cast<DOMListViewItem *>(item->tqparent())->node(); + Q_ASSERT(!tqparent.isNull()); // kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : TQString()) << "=" << (anitem ? anitem->node().nodeValue().string() : TQString()) << endl; - cmd->addCommand(new MoveNodeCommand(item->node(), parent, - anitem ? anitem->node().nextSibling() : parent.firstChild()) + cmd->addCommand(new MoveNodeCommand(item->node(), tqparent, + anitem ? anitem->node().nextSibling() : tqparent.firstChild()) ); } @@ -503,7 +503,7 @@ void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const TQString& sea bool caseSensitive) { const TQString text(cur_item->text(0)); - if (text.contains(searchText, caseSensitive) > 0) { + if (text.tqcontains(searchText, caseSensitive) > 0) { cur_item->setUnderline(true); cur_item->setItalic(true); m_listView->setCurrentItem(cur_item); @@ -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?" ).arg(url.url()); + const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).tqarg(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" ).arg(url.path()); + const TQString text = i18n( "Unable to open \n %1 \n for writing" ).tqarg(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." ).arg(url.url()); + const TQString text = i18n( "This URL \n %1 \n is not valid." ).tqarg(url.url()); KMessageBox::sorry( this, text, title ); } } @@ -720,8 +720,8 @@ void DOMTreeView::hideMessageLine() void DOMTreeView::moveToParent() { // This is a hypersmart algorithm. - // If infoNode is defined, go to the parent of infoNode, otherwise, go - // to the parent of the tree view's current item. + // If infoNode is defined, go to the tqparent of infoNode, otherwise, go + // to the tqparent of the tree view's current item. // Hope this isn't too smart. DOM::Node cur = infoNode; @@ -773,15 +773,15 @@ void DOMTreeView::deleteNodes() // don't regard node more than once if (item->node() == last) continue; - // check for selected parent + // check for selected tqparent bool has_selected_parent = false; - for (TQListViewItem *p = item->parent(); p; p = p->parent()) { + for (TQListViewItem *p = item->tqparent(); p; p = p->tqparent()) { if (p->isSelected()) { has_selected_parent = true; break; } } if (has_selected_parent) continue; // kdDebug(90180) << " item->node " << item->node().nodeName().string() << ": schedule for removal" << endl; - // remove this node if it isn't already recursively removed by its parent + // remove this node if it isn't already recursively removed by its tqparent cmd->addCommand(new RemoveNodeCommand(item->node(), item->node().parentNode(), item->node().nextSibling())); last = item->node(); } @@ -885,13 +885,13 @@ void DOMTreeView::slotAddElementDlg() DOM::Node curNode = item->node(); try { - DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; + DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode; DOM::Node after = addBefore() ? curNode : 0; // ### take namespace into account DOM::Node newNode = curNode.ownerDocument().createElement(qname); - ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after); + ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after); mainWindow()->executeAndAddCommand(cmd); if (cmd->isValid()) activateNode(newNode); @@ -921,12 +921,12 @@ void DOMTreeView::slotAddTextDlg() DOM::Node curNode = item->node(); try { - DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; + DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode; DOM::Node after = addBefore() ? curNode : 0; DOM::Node newNode = curNode.ownerDocument().createTextNode(text); - ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after); + ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after); mainWindow()->executeAndAddCommand(cmd); if (cmd->isValid()) activateNode(newNode); @@ -943,21 +943,21 @@ static TQString *clickToAdd; /** * List view item for attribute list. */ -class AttributeListItem : public QListViewItem +class AttributeListItem : public TQListViewItem { typedef TQListViewItem super; bool _new; public: - AttributeListItem(TQListView *parent, TQListViewItem *prev) - : super(parent, prev), _new(true) + AttributeListItem(TQListView *tqparent, TQListViewItem *prev) + : super(tqparent, prev), _new(true) { } AttributeListItem(const TQString &attrName, const TQString &attrValue, - TQListView *parent, TQListViewItem *prev) - : super(parent, prev), _new(false) + TQListView *tqparent, TQListViewItem *prev) + : super(tqparent, prev), _new(false) { setText(0, attrName); setText(1, attrValue); @@ -973,7 +973,7 @@ public: protected: virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { 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, alignment ); + super::paintCell( p, _cg, column, width, tqalignment ); if (text_changed) setText(column, oldText); listView()->setUpdatesEnabled(updates_enabled); @@ -1015,7 +1015,7 @@ void DOMTreeView::initDOMNodeInfo() connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent())); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); nodeAttributes->setRenameable(0, true); nodeAttributes->setRenameable(1, true); @@ -1168,7 +1168,7 @@ void DOMTreeView::slotEditAttribute(TQListViewItem *lvi, const TQPoint &, int co slotItemRenamed(lvi, attrName, 0); // Reget, item may have been changed - lvi = nodeAttributes->findItem(attrName, 0); + lvi = nodeAttributes->tqfindItem(attrName, 0); } if (lvi && lvi->text(1) != attrValue) diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index 8589805..499a545 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -47,9 +47,10 @@ class KHTMLPart; class DOMTreeView : public DOMTreeViewBase { Q_OBJECT + TQ_OBJECT public: - DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true); + DOMTreeView(TQWidget *tqparent, const char* name, bool allowSaving = true); ~DOMTreeView(); KHTMLPart *htmlPart() const { return part; } @@ -168,7 +169,7 @@ class DOMTreeView : public DOMTreeViewBase // == DOM Node Info panel ====================================== public: - // Keep in sync with the widget stack children + // Keep in sync with the widget stack tqchildren enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel }; public slots: diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui index 984e435..025c623 100644 --- a/konq-plugins/domtreeviewer/domtreeviewbase.ui +++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DOMTreeViewBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DOMTreeViewBase</cstring> </property> @@ -12,7 +12,7 @@ <height>508</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>600</width> <height>380</height> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>messageLinePane</cstring> </property> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>20</height> @@ -133,9 +133,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -169,11 +169,11 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>400</height> @@ -186,15 +186,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2_3</cstring> </property> @@ -205,7 +205,7 @@ <cstring>nodeValue</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -216,7 +216,7 @@ <cstring>nodeType</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -227,7 +227,7 @@ <cstring>nodeNamespace</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -308,11 +308,11 @@ </widget> </grid> </widget> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>nodeInfoStack</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>ElementInfo</cstring> </property> @@ -370,7 +370,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>CharacterData</cstring> </property> @@ -398,15 +398,15 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>applyContent</cstring> </property> @@ -424,7 +424,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -435,7 +435,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Empty</cstring> </property> @@ -448,7 +448,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -459,7 +459,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pureCheckBox</cstring> </property> @@ -470,7 +470,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_showAttributesCheckBox</cstring> </property> @@ -481,7 +481,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_highlightHTMLCheckBox</cstring> </property> @@ -509,7 +509,7 @@ <tabstop>m_highlightHTMLCheckBox</tabstop> <tabstop>nodeAttributes</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index 0dd6d7f..6790e5a 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(palette().active().base()); + msgdlg->messagePane->setPaletteBackgroundColor(tqpalette().active().base()); // msgdlg->show(); // then, setup our actions @@ -93,7 +93,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) TQT_SLOT(slotHtmlPartChanged(KHTMLPart *))); ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(addMessage(int, const TQString &))); + TQT_TQOBJECT(this), TQT_SLOT(addMessage(int, const TQString &))); infopanel_ctx = createInfoPanelAttrContextMenu(); domtree_ctx = createDOMTreeViewContextMenu(); @@ -119,17 +119,17 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd) void DOMTreeWindow::setupActions() { - KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection())->setEnabled(false); - KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false); - KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false); + KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection())->setEnabled(false); + KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false); + KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false); m_commandHistory = new KCommandHistory(actionCollection()); - KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection()); + KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection()); - KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection()); + KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection()); // toggle manipulation dialog KAction *showMsgDlg = new KAction(i18n("Show Message Log"), @@ -141,14 +141,14 @@ void DOMTreeWindow::setupActions() // actionCollection(), "custom_action"); // actions for the dom tree list view toolbar - KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); + KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); KAction *tree_inc_level = new KAction(i18n("Expand"), - "1rightarrow", CTRL+Key_Greater, view(), + "1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()), TQT_SLOT(increaseExpansionDepth()), actionCollection(), "tree_inc_level"); tree_inc_level->setToolTip(i18n("Increase expansion level")); KAction *tree_dec_level = new KAction(i18n("Collapse"), - "1leftarrow", CTRL+Key_Less, view(), + "1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(view()), TQT_SLOT(decreaseExpansionDepth()), actionCollection(), "tree_dec_level"); tree_dec_level->setToolTip(i18n("Decrease expansion level")); @@ -156,20 +156,20 @@ void DOMTreeWindow::setupActions() // actions for the dom tree list view context menu del_tree = new KAction(i18n("&Delete"), "editdelete", - Key_Delete, view(), TQT_SLOT(deleteNodes()), + Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()), actionCollection(), "tree_delete"); del_tree->setToolTip(i18n("Delete nodes")); /*KAction *new_elem = */new KAction(i18n("New &Element ..."), - "bookmark", KShortcut(), view(), + "bookmark", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddElementDlg()), actionCollection(), "tree_add_element"); /*KAction *new_text = */new KAction(i18n("New &Text Node ..."), - "text", KShortcut(), view(), TQT_SLOT(slotAddTextDlg()), + "text", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()), actionCollection(), "tree_add_text"); // actions for the info panel attribute list context menu del_attr = new KAction(i18n("&Delete"), "editdelete", - Key_Delete, view(), TQT_SLOT(deleteAttributes()), + Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()), actionCollection(), "attr_delete"); del_attr->setToolTip(i18n("Delete attributes")); @@ -230,7 +230,7 @@ void DOMTreeWindow::dragEnterEvent(TQDragEnterEvent *event) void DOMTreeWindow::dropEvent(TQDropEvent *event) { // this is a very simplistic implementation of a drop event. we - // will only accept a dropped URL. the Qt dnd code can do *much* + // will only accept a dropped URL. the TQt dnd code can do *much* // much more, so please read the docs there KURL::List urls; @@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event) void DOMTreeWindow::addMessage(int msg_id, const TQString &msg) { - TQDateTime t(TQDateTime::currentDateTime()); + TQDateTime t(TQDateTime::tqcurrentDateTime()); TQString fullmsg = t.toString(); fullmsg += ":"; @@ -356,7 +356,7 @@ void DOMTreeWindow::slotActivePartChanged(KParts::Part *p) m_commandHistory->clear(); view()->disconnectFromTornDownPart(); - view()->setHtmlPart(::qt_cast<KHTMLPart *>(p)); + view()->setHtmlPart(::tqqt_cast<KHTMLPart *>(p)); } void DOMTreeWindow::slotPartRemoved(KParts::Part *p) diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h index cbd1310..c7e134b 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.h +++ b/konq-plugins/domtreeviewer/domtreewindow.h @@ -61,6 +61,7 @@ class TQPopupMenu; class DOMTreeWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -134,7 +135,7 @@ public slots: protected: /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ virtual void dragEnterEvent(TQDragEnterEvent *event); virtual void dropEvent(TQDropEvent *event); diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui index 8705250..f91f717 100644 --- a/konq-plugins/domtreeviewer/elementeditdialog.ui +++ b/konq-plugins/domtreeviewer/elementeditdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ElementEditDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ElementEditDialog</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -45,15 +45,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -102,15 +102,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insChildBtn</cstring> </property> @@ -124,7 +124,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insBeforeBtn</cstring> </property> @@ -145,14 +145,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelBtn</cstring> </property> @@ -192,7 +192,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui index 3ef4a75..73223a5 100644 --- a/konq-plugins/domtreeviewer/messagedialog.ui +++ b/konq-plugins/domtreeviewer/messagedialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MessageDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MessageDialog</cstring> </property> @@ -39,15 +39,15 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClear</cstring> </property> @@ -68,14 +68,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>300</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClose</cstring> </property> @@ -107,10 +107,10 @@ <includes> <include location="local" impldecl="in implementation">messagedialog.ui.h</include> </includes> -<slots> - <slot specifier="non virtual">addMessage( const QString & msg )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +<Q_SLOTS> + <slot specifier="non virtual">addMessage( const TQString & msg )</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/konq-plugins/domtreeviewer/messagedialog.ui.h b/konq-plugins/domtreeviewer/messagedialog.ui.h index 33a2951..0c660d0 100644 --- a/konq-plugins/domtreeviewer/messagedialog.ui.h +++ b/konq-plugins/domtreeviewer/messagedialog.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index c33f132..2615263 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -15,9 +15,9 @@ typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory; K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) ) -PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, +PluginDomtreeviewer::PluginDomtreeviewer( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( parent, name ), m_dialog( 0 ) + : Plugin( tqparent, name ), m_dialog( 0 ) { (void) new KAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, @@ -38,7 +38,7 @@ void PluginDomtreeviewer::slotShowDOMTree() delete m_dialog; Q_ASSERT((DOMTreeWindow *)m_dialog == (DOMTreeWindow *)0); } - if (KHTMLPart *part = ::qt_cast<KHTMLPart *>(parent())) + if (KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(tqparent())) { m_dialog = new DOMTreeWindow(this); connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h index c6d7320..75ec607 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h @@ -12,8 +12,9 @@ class KURL; class PluginDomtreeviewer : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - PluginDomtreeviewer( TQObject* parent, const char* name, + PluginDomtreeviewer( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~PluginDomtreeviewer(); diff --git a/konq-plugins/domtreeviewer/signalreceiver.cpp b/konq-plugins/domtreeviewer/signalreceiver.cpp index a0c0b1b..fb67abf 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.cpp +++ b/konq-plugins/domtreeviewer/signalreceiver.cpp @@ -20,8 +20,8 @@ #include "signalreceiver.h" -SignalReceiver::SignalReceiver(TQObject *parent, const char *name) -: TQObject(parent, name), rcvd(false) +SignalReceiver::SignalReceiver(TQObject *tqparent, const char *name) +: TQObject(tqparent, name), rcvd(false) { } diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index cf67495..9652310 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -42,12 +42,13 @@ * use different signal receiver instances for different signals. * @autor Leo Savernik */ -class SignalReceiver : public QObject +class SignalReceiver : public TQObject { Q_OBJECT + TQ_OBJECT public: - SignalReceiver(TQObject *parent = 0, const char *name = 0); + SignalReceiver(TQObject *tqparent = 0, const char *name = 0); virtual ~SignalReceiver(); /** returns true if any signal has been received */ diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui index 96980e2..8563032 100644 --- a/konq-plugins/domtreeviewer/texteditdialog.ui +++ b/konq-plugins/domtreeviewer/texteditdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TextEditDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TextEditDialog</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -58,15 +58,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insChildBtn</cstring> </property> @@ -80,7 +80,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insBeforeBtn</cstring> </property> @@ -101,14 +101,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelBtn</cstring> </property> @@ -142,7 +142,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 931c43f..48d97f7 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -43,8 +43,8 @@ TQMap<TQString, MetricEntry> FSView::_dirMetric; -FSView::FSView(Inode* base, TQWidget* parent, const char* name) - : TreeMapWidget(base, parent, name) +FSView::FSView(Inode* base, TQWidget* tqparent, const char* name) + : TreeMapWidget(base, tqparent, name) { setFieldType(0, i18n("Name")); setFieldType(1, i18n("Size")); @@ -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").arg(i); + str = TQString("Dir%1").tqarg(i); if (!cconfig.hasKey(str)) continue; str = cconfig.readPathEntry(str); - 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); + 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); if (s==0.0 || f==0 || d==0) continue; setDirMetric(str, s, f, d); } @@ -133,7 +133,7 @@ void FSView::setPath(TQString p) if (!fi.isDir()) { _path = fi.dirPath(true); } - _pathDepth = _path.contains('/'); + _pathDepth = _path.tqcontains('/'); KURL u; u.setPath(_path); @@ -147,7 +147,7 @@ void FSView::setPath(TQString p) b->setPeer(d); - setCaption(TQString("%1 - FSView").arg(_path)); + setCaption(TQString("%1 - FSView").tqarg(_path)); requestUpdate(b); } @@ -170,7 +170,7 @@ bool FSView::getDirMetric(const TQString& k, { TQMap<TQString, MetricEntry>::iterator it; - it = _dirMetric.find(k); + it = _dirMetric.tqfind(k); if (it == _dirMetric.end()) return false; s = (*it).size; @@ -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'").arg(i->text(0)), 4); + if (i) popup.insertItem(i18n("Refresh '%1'").tqarg(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").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); + 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); c++; } g->writeEntry("Count", c-1); diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h index 2e12986..fe1c689 100644 --- a/konq-plugins/fsview/fsview.h +++ b/konq-plugins/fsview/fsview.h @@ -58,11 +58,12 @@ class MetricEntry class FSView : public TreeMapWidget, public ScanListener { Q_OBJECT + TQ_OBJECT public: enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime }; - FSView(Inode*, TQWidget* parent=0, const char* name=0); + FSView(Inode*, TQWidget* tqparent=0, const char* name=0); ~FSView(); KConfig* config() { return _config; } diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 02df4c6..b9d2f5b 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -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 ).arg(cDir)); + dirs ).tqarg(cDir)); } else slotInfoMessage(this, i18n("1 folder", "%n folders", dirs)); @@ -93,15 +93,15 @@ KAboutData* FSViewPart::createAboutData() return aboutData; } -FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +FSViewPart::FSViewPart(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList& /* args */) - : KParts::ReadOnlyPart(parent, name) + : KParts::ReadOnlyPart(tqparent, name) { // we need an instance setInstance( FSViewPartFactory::instance() ); - _view = new FSView(new Inode(), parentWidget, widgetName); + _view = new FSView(new Inode(), tqparentWidget, widgetName); TQWhatsThis::add(_view, i18n("<p>This is the FSView plugin, a graphical " "browsing mode showing filesystem utilization " "by using a tree map visualization.</p>" @@ -201,7 +201,7 @@ void FSViewPart::showInfo() "currently visible in FSView, from the outside.\n" "For details, see the 'Help/FSView Manual'."); - KMessageBox::information( _view, info, TQString::null, "ShowFSViewInfo"); + KMessageBox::information( _view, info, TQString(), "ShowFSViewInfo"); } void FSViewPart::showHelp() @@ -219,7 +219,7 @@ void FSViewPart::startedSlot() void FSViewPart::completedSlot(int dirs) { if (_job) { - _job->progressSlot(100, dirs, TQString::null); + _job->progressSlot(100, dirs, TQString()); delete _job; _job = 0; } @@ -344,7 +344,7 @@ void FSViewBrowserExtension::trash() void FSViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move ); - TQApplication::clipboard()->setData( urlData ); + TQApplication::tqclipboard()->setData( urlData ); } void FSViewBrowserExtension::editMimeType() @@ -365,9 +365,9 @@ void FSViewBrowserExtension::refresh() while( (i=s.next()) ) commonParent = commonParent->commonParent(i); - /* if commonParent is a file, update parent directory */ + /* if commonParent is a file, update tqparent directory */ if ( !((Inode*)commonParent)->isDir() ) { - commonParent = commonParent->parent(); + commonParent = commonParent->tqparent(); if (!commonParent) return; } diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h index ff0a17e..1adba9e 100644 --- a/konq-plugins/fsview/fsview_part.h +++ b/konq-plugins/fsview/fsview_part.h @@ -37,6 +37,7 @@ class FSViewPart; class FSViewBrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT public: FSViewBrowserExtension(FSViewPart *viewPart, const char *name=0L); @@ -64,6 +65,7 @@ private: class FSJob: public KIO::Job { Q_OBJECT + TQ_OBJECT public: FSJob(FSView*); @@ -81,10 +83,11 @@ private: class FSViewPart : public KParts::ReadOnlyPart { Q_OBJECT - Q_PROPERTY( bool supportsUndo READ supportsUndo ) + TQ_OBJECT + TQ_PROPERTY( bool supportsUndo READ supportsUndo ) public: - FSViewPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &args); + FSViewPart(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList &args); virtual ~FSViewPart(); diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 6f5073c..849877e 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -40,12 +40,12 @@ Inode::Inode() init(""); } -Inode::Inode(ScanDir* d, Inode* parent) - : TreeMapItem(parent) +Inode::Inode(ScanDir* d, Inode* tqparent) + : TreeMapItem(tqparent) { TQString absPath; - if (parent) { - absPath = parent->path(); + if (tqparent) { + absPath = tqparent->path(); if (!absPath.endsWith("/")) absPath += "/"; } absPath += d->name(); @@ -56,12 +56,12 @@ Inode::Inode(ScanDir* d, Inode* parent) init(absPath); } -Inode::Inode(ScanFile* f, Inode* parent) - : TreeMapItem(parent) +Inode::Inode(ScanFile* f, Inode* tqparent) + : TreeMapItem(tqparent) { TQString absPath; - if (parent) - absPath = parent->path() + "/"; + if (tqparent) + absPath = tqparent->path() + "/"; absPath += f->name(); _dirPeer = 0; @@ -168,7 +168,7 @@ void Inode::destroyed(ScanDir* d) { if (_dirPeer == d) _dirPeer = 0; - // remove children + // remove tqchildren clear(); } @@ -179,15 +179,15 @@ void Inode::destroyed(ScanFile* f) -TreeMapItemList* Inode::children() +TreeMapItemList* Inode::tqchildren() { if (!_dirPeer) return 0; - if (!_children) { + if (!_tqchildren) { if (!_dirPeer->scanStarted()) return 0; - _children = new TreeMapItemList; - _children->setAutoDelete(true); + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); setSorting(-1); @@ -215,7 +215,7 @@ TreeMapItemList* Inode::children() _resortNeeded = false; } - return _children; + return _tqchildren; } @@ -284,7 +284,7 @@ TQColor Inode::backColor() const if (id>0) n = TQString::number(id); if (n.isEmpty()) - return widget()->colorGroup().button(); + return widget()->tqcolorGroup().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").arg((int)(s+.5)); + text = TQString("%1 B").tqarg((int)(s+.5)); else if (s < 10 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) - text = TQString("%1 kB").arg((int)(s/1024+.5)); + text = TQString("%1 kB").tqarg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) - text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); + text = TQString("%1 MB").tqarg((int)(s/1024/1024+.5)); else - text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").tqarg(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").arg(TQString::number(f).right(3)).arg(text); + text = TQString("%1 %2").tqarg(TQString::number(f).right(3)).tqarg(text); f /= 1000; } - text = TQString("%1 %2").arg(TQString::number(f)).arg(text); + text = TQString("%1 %2").tqarg(TQString::number(f)).tqarg(text); if (_fileCountEstimation>0) text += "+"; } return text; diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h index eb1e3dd..d21a689 100644 --- a/konq-plugins/fsview/inode.h +++ b/konq-plugins/fsview/inode.h @@ -53,7 +53,7 @@ public: void setPeer(ScanDir*); - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); double value() const; double size() const; diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp index 1d3d06a..c79ff99 100644 --- a/konq-plugins/fsview/scan.cpp +++ b/konq-plugins/fsview/scan.cpp @@ -80,8 +80,8 @@ void ScanManager::startScan(ScanDir* from) if (scanRunning()) stopScan(); from->clear(); - if (from->parent()) - from->parent()->setupChildRescan(); + if (from->tqparent()) + from->tqparent()->setupChildRescan(); _list.append(new ScanItem(from->path(),from)); } diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h index ca4ce4f..6d570f7 100644 --- a/konq-plugins/fsview/scan.h +++ b/konq-plugins/fsview/scan.h @@ -179,7 +179,7 @@ class ScanDir */ void setupChildRescan(); - /* Absolute path. Warning: Slow, loops to top parent. */ + /* Absolute path. Warning: Slow, loops to top tqparent. */ TQString path(); /* get integer data attribute */ @@ -192,7 +192,7 @@ class ScanDir KIO::fileoffset_t size() { update(); return _size; } unsigned int fileCount() { update(); return _fileCount; } unsigned int dirCount() { update(); return _dirCount; } - ScanDir* parent() { return _parent; } + ScanDir* tqparent() { return _parent; } bool scanStarted() { return (_dirsFinished >= 0); } bool scanFinished() { return (_dirsFinished == (int)_dirs.count()); } bool scanRunning() { return scanStarted() && !scanFinished(); } diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index 5a42c75..b3f6cb6 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -51,7 +51,7 @@ StoredDrawParams::StoredDrawParams() _shaded = true; _rotated = false; - _backColor = Qt::white; + _backColor = TQt::white; // field array has size 0 } @@ -72,7 +72,7 @@ StoredDrawParams::StoredDrawParams(TQColor c, TQString StoredDrawParams::text(int f) const { if ((f<0) || (f >= (int)_field.size())) - return TQString::null; + return TQString(); return _field[f].text; } @@ -266,7 +266,7 @@ void RectDrawing::drawBack(TQPainter* p, DrawParams* dp) if (dp->shaded()) { // some shading - bool goDark = qGray(normal.rgb())>128; + bool goDark = tqGray(normal.rgb())>128; int rBase, gBase, bBase; normal.rgb(&rBase, &gBase, &bBase); p->setBrush(TQBrush::NoBrush); @@ -525,7 +525,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) } p->save(); - p->setPen( (qGray(dp->backColor().rgb())>100) ? Qt::black : Qt::white); + p->setPen( (tqGray(dp->backColor().rgb())>100) ? TQt::black : TQt::white); p->setFont(dp->font()); if (rotate) { //p->translate(r.x()+2, r.y()+r.height()); @@ -616,7 +616,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) } } else - remaining = TQString::null; + remaining = TQString(); /* truncate and add ... if needed */ if (w>width) { @@ -655,7 +655,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) p->drawText( x+pixW, y, width - pixW, h, - Qt::AlignLeft, name); + TQt::AlignLeft, name); y = isBottom ? (y-h) : (y+h); lines--; @@ -717,11 +717,11 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) bool ascending; int result; - TreeMapItem* parent = ((TreeMapItem*)item1)->parent(); + TreeMapItem* tqparent = ((TreeMapItem*)item1)->tqparent(); // shouldn't happen - if (!parent) return 0; + if (!tqparent) return 0; - int textNo = parent->sorting(&ascending); + int textNo = tqparent->sorting(&ascending); if (textNo < 0) { double diff = ((TreeMapItem*)item1)->value() - @@ -738,25 +738,25 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) TreeMapItem* TreeMapItemList::commonParent() { - TreeMapItem* parent, *item; - parent = first(); - if (parent) + TreeMapItem* tqparent, *item; + tqparent = first(); + if (tqparent) while( (item = next()) != 0) - parent = parent->commonParent(item); + tqparent = tqparent->commonParent(item); - return parent; + return tqparent; } // TreeMapItem -TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) +TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) { _value = value; - _parent = parent; + _parent = tqparent; _sum = 0; - _children = 0; + _tqchildren = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -764,7 +764,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) _freeRects = 0; if (_parent) { - // take sorting from parent + // take sorting from tqparent _sortTextNo = _parent->sorting(&_sortAscending); _parent->addItem(this); } @@ -775,12 +775,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) } -TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, +TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value, TQString text1, TQString text2, TQString text3, TQString text4) { _value = value; - _parent = parent; + _parent = tqparent; // this resizes the text vector only if needed if (!text4.isEmpty()) setText(3, text4); @@ -789,7 +789,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, setText(0, text1); _sum = 0; - _children = 0; + _tqchildren = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -801,7 +801,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, TreeMapItem::~TreeMapItem() { - if (_children) delete _children; + if (_tqchildren) delete _tqchildren; if (_freeRects) delete _freeRects; // finally, notify widget about deletion @@ -829,7 +829,7 @@ bool TreeMapItem::isChildOf(TreeMapItem* item) TreeMapItem* TreeMapItem::commonParent(TreeMapItem* item) { while (item && !isChildOf(item)) { - item = item->parent(); + item = item->tqparent(); } return item; } @@ -842,18 +842,18 @@ void TreeMapItem::redraw() void TreeMapItem::clear() { - if (_children) { + if (_tqchildren) { // delete selected items below this item from selection if (_widget) _widget->clearSelection(this); - delete _children; - _children = 0; + delete _tqchildren; + _tqchildren = 0; } } -// invalidates current children and forces redraw -// this is only usefull when children are created on demand in items() +// tqinvalidates current tqchildren and forces redraw +// this is only usefull when tqchildren are created on demand in items() void TreeMapItem::refresh() { clear(); @@ -887,9 +887,9 @@ int TreeMapItem::depth() const bool TreeMapItem::initialized() { - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); return false; } return true; @@ -899,16 +899,16 @@ void TreeMapItem::addItem(TreeMapItem* i) { if (!i) return; - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); } i->setParent(this); if (sorting(0) == -1) - _children->append(i); // preserve insertion order + _tqchildren->append(i); // preserve insertion order else - _children->inSort(i); + _tqchildren->inSort(i); } @@ -974,17 +974,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending) _sortAscending = ascending; _sortTextNo = textNo; - if (_children && _sortTextNo != -1) _children->sort(); + if (_tqchildren && _sortTextNo != -1) _tqchildren->sort(); } void TreeMapItem::resort(bool recursive) { - if (!_children) return; + if (!_tqchildren) return; - if (_sortTextNo != -1) _children->sort(); + if (_sortTextNo != -1) _tqchildren->sort(); if (recursive) - for (TreeMapItem* i=_children->first(); i; i=_children->next()) + for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next()) i->resort(recursive); } @@ -1002,13 +1002,13 @@ int TreeMapItem::rtti() const return 0; } -TreeMapItemList* TreeMapItem::children() +TreeMapItemList* TreeMapItem::tqchildren() { - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); } - return _children; + return _tqchildren; } void TreeMapItem::clearItemRect() @@ -1072,7 +1072,7 @@ void TreeMapItem::addFreeRect(const TQRect& r) // Tooltips for TreeMapWidget -class TreeMapTip: public QToolTip +class TreeMapTip: public TQToolTip { public: TreeMapTip( TQWidget* p ):TQToolTip(p) {} @@ -1083,17 +1083,17 @@ protected: void TreeMapTip::maybeTip( const TQPoint& pos ) { - if ( !parentWidget()->inherits( "TreeMapWidget" ) ) + if ( !tqparentWidget()->inherits( "TreeMapWidget" ) ) return; - TreeMapWidget* p = (TreeMapWidget*)parentWidget(); + TreeMapWidget* p = (TreeMapWidget*)tqparentWidget(); TreeMapItem* i; i = p->item(pos.x(), pos.y()); TQPtrList<TQRect>* rList = i ? i->freeRects() : 0; if (rList) { TQRect* r; for(r=rList->first();r;r=rList->next()) - if (r->contains(pos)) + if (r->tqcontains(pos)) tip(*r, p->tipString(i)); } } @@ -1103,8 +1103,8 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) // TreeMapWidget TreeMapWidget::TreeMapWidget(TreeMapItem* base, - TQWidget* parent, const char* name) - : TQWidget(parent, name) + TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name) { _base = base; _base->setWidget(this); @@ -1139,8 +1139,8 @@ TreeMapWidget::TreeMapWidget(TreeMapItem* base, _lastOver = 0; _needsRefresh = _base; - setBackgroundMode(Qt::NoBackground); - setFocusPolicy(TQWidget::StrongFocus); + setBackgroundMode(TQt::NoBackground); + setFocusPolicy(TQ_StrongFocus); _tip = new TreeMapTip(this); } @@ -1252,7 +1252,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d) TQString TreeMapWidget::defaultFieldType(int f) const { - return i18n("Text %1").arg(f+1); + return i18n("Text %1").tqarg(f+1); } TQString TreeMapWidget::defaultFieldStop(int) const @@ -1433,10 +1433,10 @@ void TreeMapWidget::setMinimalArea(int area) void TreeMapWidget::deletingItem(TreeMapItem* i) { // remove any references to the item to be deleted - while(_selection.findRef(i) > -1) + while(_selection.tqfindRef(i) > -1) _selection.remove(); - while(_tmpSelection.findRef(i) > -1) + while(_tmpSelection.tqfindRef(i) > -1) _tmpSelection.remove(); if (_current == i) _current = 0; @@ -1446,9 +1446,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i) // don't redraw a deleted item if (_needsRefresh == i) { - // we can savely redraw the parent, as deleting order is - // from child to parent; i.e. i->parent() is existing. - _needsRefresh = i->parent(); + // we can savely redraw the tqparent, as deleting order is + // from child to tqparent; i.e. i->tqparent() is existing. + _needsRefresh = i->tqparent(); } } @@ -1468,7 +1468,7 @@ TQString TreeMapWidget::tipString(TreeMapItem* i) const tip += itemTip; } - i = i->parent(); + i = i->tqparent(); } return tip; } @@ -1478,11 +1478,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const TreeMapItem* p = _base; TreeMapItem* i; - if (!rect().contains(x, y)) return 0; + if (!TQT_TQRECT_OBJECT(rect()).tqcontains(x, y)) return 0; if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { - TreeMapItemList* list = p->children(); + TreeMapItemList* list = p->tqchildren(); 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->itemRect().x() << "/" << i->itemRect().y() - << "-" << i->itemRect().width() - << "x" << i->itemRect().height() << ")" << endl; + << i->tqitemRect().x() << "/" << i->tqitemRect().y() + << "-" << i->tqitemRect().width() + << "x" << i->tqitemRect().height() << ")" << endl; - if (i->itemRect().contains(x, y)) { + if (i->tqitemRect().tqcontains(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->itemRect().width() << "x" << p->itemRect().height() + << p->tqitemRect().width() << "x" << p->tqitemRect().height() << ", Val " << p->value() << ")" << endl; } @@ -1530,7 +1530,7 @@ TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const if (_maxSelectDepth>=0) { int depth = i->depth(); while(i && depth > _maxSelectDepth) { - i = i->parent(); + i = i->tqparent(); depth--; } } @@ -1542,16 +1542,16 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const { if (i) { /* Must have a visible area */ - while(i && ((i->itemRect().width() <1) || - (i->itemRect().height() <1))) { - TreeMapItem* p = i->parent(); + while(i && ((i->tqitemRect().width() <1) || + (i->tqitemRect().height() <1))) { + TreeMapItem* p = i->tqparent(); if (!p) break; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->tqfindRef(i); idx--; if (idx<0) i = p; else - i = p->children()->at(idx); + i = p->tqchildren()->at(idx); } } return i; @@ -1596,12 +1596,12 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1, TreeMapItem* item; while ( (item = it1.current()) != 0 ) { ++it1; - if (l2.containsRef(item) > 0) continue; + if (l2.tqcontainsRef(item) > 0) continue; l.append(item); } while ( (item = it2.current()) != 0 ) { ++it2; - if (l1.containsRef(item) > 0) continue; + if (l1.tqcontainsRef(item) > 0) continue; l.append(item); } @@ -1644,13 +1644,13 @@ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected) } -bool TreeMapWidget::clearSelection(TreeMapItem* parent) +bool TreeMapWidget::clearSelection(TreeMapItem* tqparent) { TreeMapItemList old = _selection; TreeMapItem* i=_selection.first(); while (i) { - if (i->isChildOf(parent)) { + if (i->isChildOf(tqparent)) { _selection.remove(); i = _selection.current(); } @@ -1668,12 +1668,12 @@ bool TreeMapWidget::clearSelection(TreeMapItem* parent) bool TreeMapWidget::isSelected(TreeMapItem* i) const { - return _selection.containsRef(i)>0; + return _selection.tqcontainsRef(i)>0; } bool TreeMapWidget::isTmpSelected(TreeMapItem* i) { - return _tmpSelection.containsRef(i)>0; + return _tmpSelection.tqcontainsRef(i)>0; } @@ -1738,14 +1738,14 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, TreeMapItem* commonParent = i1; while (commonParent && !i2->isChildOf(commonParent)) { i1 = commonParent; - commonParent = commonParent->parent(); + commonParent = commonParent->tqparent(); } if (!commonParent) return changed; - while (i2 && i2->parent() != commonParent) - i2 = i2->parent(); + while (i2 && i2->tqparent() != commonParent) + i2 = i2->tqparent(); if (!i2) return changed; - TreeMapItemList* list = commonParent->children(); + TreeMapItemList* list = commonParent->tqchildren(); if (!list) return changed; TreeMapItem* i = list->first(); @@ -1768,11 +1768,11 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { - TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); + TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect(); TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } @@ -1826,7 +1826,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) } // item under mouse always selected on right button press - if (e->button() == RightButton) { + if (e->button() == Qt::RightButton) { TreeMapItem* changed2 = setTmpSelected(item, true); if (changed2) changed = changed2->commonParent(changed); } @@ -1836,7 +1836,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) if (changed) redraw(changed); - if (e->button() == RightButton) { + if (e->button() == Qt::RightButton) { // emit selection change if (! (_tmpSelection == _selection)) { @@ -1935,15 +1935,15 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) /* returns -1 if nothing visible found */ int nextVisible(TreeMapItem* i) { - TreeMapItem* p = i->parent(); - if (!p || p->itemRect().isEmpty()) return -1; + TreeMapItem* p = i->tqparent(); + if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->tqfindRef(i); if (idx<0) return -1; - while (idx < (int)p->children()->count()-1) { + while (idx < (int)p->tqchildren()->count()-1) { idx++; - TQRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->tqchildren()->at(idx)->tqitemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1953,15 +1953,15 @@ int nextVisible(TreeMapItem* i) /* returns -1 if nothing visible found */ int prevVisible(TreeMapItem* i) { - TreeMapItem* p = i->parent(); - if (!p || p->itemRect().isEmpty()) return -1; + TreeMapItem* p = i->tqparent(); + if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->tqfindRef(i); if (idx<0) return -1; while (idx > 0) { idx--; - TQRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->tqchildren()->at(idx)->tqitemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -2024,7 +2024,7 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) } TreeMapItem* old = _current, *newItem; - TreeMapItem* p = _current->parent(); + TreeMapItem* p = _current->tqparent(); bool goBack; if (_current->sorting(&goBack) == -1) { @@ -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->children()->at(newIdx), true); + setCurrent(p->tqchildren()->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->children()->at(newIdx), true); + setCurrent(p->tqchildren()->at(newIdx), true); } } else if (e->key() == Key_Down) { - if (_current->children() && _current->children()->count()>0) { + if (_current->tqchildren() && _current->tqchildren()->count()>0) { int newIdx = _current->index(); if (newIdx<0) - newIdx = goBack ? (_current->children()->count()-1) : 0; - if (newIdx>=(int)_current->children()->count()) - newIdx = _current->children()->count()-1; - newItem = visibleItem(_current->children()->at(newIdx)); + newIdx = goBack ? (_current->tqchildren()->count()-1) : 0; + if (newIdx>=(int)_current->tqchildren()->count()) + newIdx = _current->tqchildren()->count()-1; + newItem = visibleItem(_current->tqchildren()->at(newIdx)); setCurrent(newItem, true); } } @@ -2136,7 +2136,7 @@ void TreeMapWidget::drawTreeMap() } else { // only subitem - if (!_needsRefresh->itemRect().isValid()) return; + if (!_needsRefresh->tqitemRect().isValid()) return; } // reset cached font object; it could have been changed @@ -2147,14 +2147,14 @@ void TreeMapWidget::drawTreeMap() _needsRefresh = 0; } - bitBlt( this, 0, 0, &_pixmap, 0, 0, + bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&_pixmap), 0, 0, TQWidget::width(), TQWidget::height(), CopyROP, true); if (hasFocus()) { TQPainter p(this); - style().drawPrimitive( TQStyle::PE_FocusRect, &p, + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, TQRect(0, 0, TQWidget::width(), TQWidget::height()), - colorGroup() ); + tqcolorGroup() ); } } @@ -2184,7 +2184,7 @@ void TreeMapWidget::drawItem(TQPainter* p, TreeMapItem* i; if (_markNo>0) { - for(i = item;i;i=i->parent()) + for(i = item;i;i=i->tqparent()) if (i->isMarked(_markNo)) break; isSelected = (i!=0); @@ -2198,7 +2198,7 @@ void TreeMapWidget::drawItem(TQPainter* p, bool isCurrent = _current && item->isChildOf(_current); - RectDrawing d(item->itemRect()); + RectDrawing d(item->tqitemRect()); 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->itemRect().x() << "/" << item->itemRect().y() - << "-" << item->itemRect().width() << "x" - << item->itemRect().height() << "), Val " << item->value() + << item->tqitemRect().x() << "/" << item->tqitemRect().y() + << "-" << item->tqitemRect().width() << "x" + << item->tqitemRect().height() << "), Val " << item->value() << ", Sum " << item->sum() << endl; drawItem(p, item); item->clearFreeRects(); - TQRect origRect = item->itemRect(); + TQRect origRect = item->tqitemRect(); int bw = item->borderWidth(); TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); - TreeMapItemList* list = item->children(); + TreeMapItemList* list = item->tqchildren(); TreeMapItem* i; bool stopDrawing = false; - // only subdivide if there are children + // only subdivide if there are tqchildren if (!list || list->count()==0) stopDrawing = true; @@ -2283,12 +2283,12 @@ void TreeMapWidget::drawItems(TQPainter* p, if (stopDrawing) { if (list) { - // invalidate rects + // tqinvalidate rects for (i=list->first();i;i=list->next()) i->clearItemRect(); } // tooltip apears on whole item rect - item->addFreeRect(item->itemRect()); + item->addFreeRect(item->tqitemRect()); // 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 children) for tooltip + // set selfRect (not occupied by tqchildren) for tooltip item->addFreeRect(sr); if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR " @@ -2537,16 +2537,16 @@ void TreeMapWidget::drawItems(TQPainter* p, kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl; } -// fills area with a pattern if to small to draw children +// fills area with a pattern if to small to draw tqchildren void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) { - p->setBrush(Qt::Dense4Pattern); - p->setPen(Qt::NoPen); + p->setBrush(TQt::Dense4Pattern); + p->setPen(TQt::NoPen); p->drawRect(r); i->addFreeRect(r); } -// fills area with a pattern if to small to draw children +// fills area with a pattern if to small to draw tqchildren void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack) { @@ -2555,8 +2555,8 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, << "-" << r.width() << "x" << r.height() << ", len " << len << ")" << endl; - p->setBrush(Qt::Dense4Pattern); - p->setPen(Qt::NoPen); + p->setBrush(TQt::Dense4Pattern); + p->setPen(TQt::NoPen); p->drawRect(r); i->addFreeRect(r); @@ -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").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->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->setItemChecked(id+2, skipIncorrectBorder()); bpopup->setItemChecked(id+3, borderWidth()==0); bpopup->setItemChecked(id+4, borderWidth()==1); @@ -2906,7 +2906,7 @@ void TreeMapWidget::selectionActivated(int id) TreeMapItem* i = _menuItem; id -= _selectionID; while (id>0 && i) { - i=i->parent(); + i=i->tqparent(); id--; } if (i) @@ -2928,18 +2928,18 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id++); - i = i->parent(); + i = i->tqparent(); } } void TreeMapWidget::fieldStopActivated(int id) { - if (id == _fieldStopID) setFieldStop(0, TQString::null); + if (id == _fieldStopID) setFieldStop(0, TQString()); else { TreeMapItem* i = _menuItem; id -= _fieldStopID+1; while (id>0 && i) { - i=i->parent(); + i=i->tqparent(); id--; } if (i) @@ -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").arg(fieldType(0)), id); + popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); _menuItem = i; bool foundFieldStop = false; @@ -2971,7 +2971,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, popup->setItemChecked(id, true); foundFieldStop = true; } - i = i->parent(); + i = i->tqparent(); } } @@ -3014,7 +3014,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, int area = i->width() * i->height(); popup->insertSeparator(); popup->insertItem(i18n("Area of '%1' (%2)") - .arg(i->text(0)).arg(area), id+1); + .tqarg(i->text(0)).tqarg(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)") - .arg(minimalArea()*2), id+5); + .tqarg(minimalArea()*2), id+5); popup->insertItem(i18n("Halve Area Limit (to %1)") - .arg(minimalArea()/2), id+6); + .tqarg(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)") - .arg(i->text(0)).arg(d), id+1); + .tqarg(i->text(0)).tqarg(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").arg(depth), id+4+count); + popup->insertItem(i18n("Depth %1").tqarg(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").arg(maxDrawingDepth()), id+10); + popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10); popup->setItemChecked(id+10, true); } popup->insertItem(i18n("Decrement (to %1)") - .arg(maxDrawingDepth()-1), id+2); + .tqarg(maxDrawingDepth()-1), id+2); popup->insertItem(i18n("Increment (to %1)") - .arg(maxDrawingDepth()+1), id+3); + .tqarg(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").arg(f), + config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f), _attr[f].visible); - config->writeEntry(TQString(prefix+"FieldForced%1").arg(f), + config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f), _attr[f].forced); - config->writeEntry(TQString(prefix+"FieldStop%1").arg(f), + config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f), _attr[f].stop); - config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f), + config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(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").arg(f); + str = TQString(prefix+"FieldVisible%1").tqarg(f); if (config->hasKey(str)) setFieldVisible(f, config->readBoolEntry(str)); - str = TQString(prefix+"FieldForced%1").arg(f); + str = TQString(prefix+"FieldForced%1").tqarg(f); if (config->hasKey(str)) setFieldForced(f, config->readBoolEntry(str)); - str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f)); setFieldStop(f, str); - str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f)); if (!str.isEmpty()) setFieldPosition(f, str); } } diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index d4b37a9..ca10251 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -81,7 +81,7 @@ public: virtual int maxLines(int) const { return 0; } virtual int fieldCount() const { return 0; } - virtual TQColor backColor() const { return Qt::white; } + virtual TQColor backColor() const { return TQt::white; } virtual const TQFont& font() const = 0; virtual bool selected() const { return false; } @@ -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 children(). + * items on demand, reimplement tqchildren(). */ class TreeMapItem: public StoredDrawParams { @@ -227,20 +227,20 @@ public: * longest side of rectangle left for drawing * Best: Choose split direction for all subitems of an area * depending on longest side - * HAlternate: Horizontal at top; alternate direction on depth step - * VAlternate: Vertical at top; alternate direction on depth step - * Horizontal: Always horizontal split direction - * Vertical: Always vertical split direction + * HAlternate:Qt::Horizontal at top; alternate direction on depth step + * VAlternate:Qt::Vertical at top; alternate direction on depth step + * Qt::Horizontal: Always horizontal split direction + * Qt::Vertical: Always vertical split direction */ enum SplitMode { Bisection, Columns, Rows, AlwaysBest, Best, HAlternate, VAlternate, Horizontal, Vertical }; - TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 ); - TreeMapItem(TreeMapItem* parent, double value, - TQString text1, TQString text2 = TQString::null, - TQString text3 = TQString::null, TQString text4 = TQString::null); + TreeMapItem(TreeMapItem* tqparent = 0, double value = 1.0 ); + TreeMapItem(TreeMapItem* tqparent, double value, + TQString text1, TQString text2 = TQString(), + TQString text3 = TQString(), TQString text4 = TQString()); virtual ~TreeMapItem(); bool isChildOf(TreeMapItem*); @@ -250,7 +250,7 @@ public: // force a redraw of this item void redraw(); - // delete all children + // delete all tqchildren void clear(); // force new child generation & refresh @@ -261,9 +261,9 @@ public: bool initialized(); /** - * Adds an item to a parent. + * Adds an item to a tqparent. * When no sorting is used, the item is appended (drawn at bottom). - * This is only needed if the parent was not already specified in the + * This is only needed if the tqparent was not already specified in the * construction of the item. */ void addItem(TreeMapItem*); @@ -282,7 +282,7 @@ public: /** * Parent Item */ - TreeMapItem* parent() const { return _parent; } + TreeMapItem* tqparent() const { return _parent; } /** * Temporary rectangle used for drawing this item the last time. @@ -290,7 +290,7 @@ public: */ void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const TQRect& itemRect() const { return _rect; } + const TQRect& tqitemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } @@ -321,7 +321,7 @@ public: virtual double sum() const; virtual double value() const; - // replace "Default" position with setting from TreeMapWidget + // tqreplace "Default" position with setting from TreeMapWidget virtual Position position(int) const; virtual const TQFont& font() const; virtual bool isMarked(int) const; @@ -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 children. + * again after inserting all tqchildren. */ 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 children of this item, you can + * change). If this is only true for the tqchildren 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 children on demand - virtual TreeMapItemList* children(); + // not const as this can create tqchildren on demand + virtual TreeMapItemList* tqchildren(); protected: - TreeMapItemList* _children; + TreeMapItemList* _tqchildren; double _sum, _value; private: @@ -372,7 +372,7 @@ private: int _sortTextNo; bool _sortAscending; - // temporary layout + // temporary tqlayout TQRect _rect; TQPtrList<TQRect>* _freeRects; int _depth; @@ -389,18 +389,19 @@ private: * Class for visualisation of a metric of hierarchically * nested items as 2D areas. */ -class TreeMapWidget: public QWidget +class TreeMapWidget: public TQWidget { Q_OBJECT + TQ_OBJECT public: /** - * Same as in QListBox/QListView + * Same as in TQListBox/TQListView */ enum SelectionMode { Single, Multi, Extended, NoSelection }; - TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0); + TreeMapWidget(TreeMapItem* base, TQWidget* tqparent=0, const char* name=0); ~TreeMapWidget(); /** @@ -427,7 +428,7 @@ public: /** * Returns the item possible for selection. this returns the - * given item itself or a parent thereof, + * given item itself or a tqparent thereof, * depending on setting of maxSelectDepth(). */ TreeMapItem* possibleSelection(TreeMapItem*) const; @@ -435,7 +436,7 @@ public: /** * Selects or unselects an item. * In multiselection mode, the constrain that a selected item - * has no selected children or parents stays true. + * has no selected tqchildren or tqparents stays true. */ void setSelected(TreeMapItem*, bool selected = true); @@ -451,19 +452,19 @@ public: void setMarked(int markNo = 1, bool redraw = true); /** - * Clear selection of all selected items which are children of - * parent. When parent == 0, clears whole selection + * Clear selection of all selected items which are tqchildren of + * tqparent. When tqparent == 0, clears whole selection * Returns true if selection changed. */ - bool clearSelection(TreeMapItem* parent = 0); + bool clearSelection(TreeMapItem* tqparent = 0); /** * Selects or unselects items in a range. * This is needed internally for Shift-Click in Extented mode. * 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 children between but excluding the child + * - search common tqparent of i1 and i2, and select/unselect the + * range of direct tqchildren between but excluding the child * leading to i1 and the child leading to i2. */ void setRangeSelection(TreeMapItem* i1, @@ -516,15 +517,15 @@ public: void setVisibleWidth(int width, bool reuseSpace = false); /** - * If a children value() is almost the parents sum(), + * If a tqchildren value() is almost the tqparents 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 + * tqparent/child size relation can not be mapped to a correct * area size relation. * * Either * (1) Ignore the incorrect drawing, or - * (2) Skip drawing of the parent level alltogether. + * (2) Skip drawing of the tqparent level alltogether. */ void setSkipIncorrectBorder(bool enable = true); bool skipIncorrectBorder() const { return _skipIncorrectBorder; } @@ -598,8 +599,8 @@ public: /** * Save/restore options. */ - void saveOptions(KConfigGroup*, TQString prefix = TQString::null); - void restoreOptions(KConfigGroup*, TQString prefix = TQString::null); + void saveOptions(KConfigGroup*, TQString prefix = TQString()); + void restoreOptions(KConfigGroup*, TQString prefix = TQString()); /** * These functions populate given popup menus. @@ -628,7 +629,7 @@ public: virtual TQString tipString(TreeMapItem* i) const; /** - * Redraws an item with all children. + * Redraws an item with all tqchildren. * 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 309df47..f056b51 100755 --- a/konq-plugins/imagerotation/exif.py +++ b/konq-plugins/imagerotation/exif.py @@ -97,7 +97,7 @@ EXIF_TAGS={ 0x010F: ('Make', ), 0x0110: ('Model', ), 0x0111: ('StripOffsets', ), - 0x0112: ('Orientation', ), + 0x0112: ('Qt::Orientation', ), 0x0115: ('SamplesPerPixel', ), 0x0116: ('RowsPerStrip', ), 0x0117: ('StripByteCounts', ), @@ -240,7 +240,7 @@ GPS_TAGS={ 0x0006: ('GPSAltitude', ), 0x0007: ('GPSTimeStamp', ), 0x0008: ('GPSSatellites', ), - 0x0009: ('GPSStatus', ), + 0x0009: ('GPStqStatus', ), 0x000A: ('GPSMeasureMode', ), 0x000B: ('GPSDOP', ), 0x000C: ('GPSSpeedRef', ), @@ -763,7 +763,7 @@ class EXIF_header: # special case: null-terminated ASCII string if count != 0: self.file.seek(self.offset+offset) - values=self.file.read(count).strip().replace('\x00','') + values=self.file.read(count).strip().tqreplace('\x00','') else: values='' elif tag == 0x927C or tag == 0x9286: # MakerNote or UserComment @@ -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 layout in the thumbnail IFD as + # we take advantage of the pre-existing tqlayout 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/imagerotation/orient.py b/konq-plugins/imagerotation/orient.py index 0671876..8db06ad 100755 --- a/konq-plugins/imagerotation/orient.py +++ b/konq-plugins/imagerotation/orient.py @@ -42,13 +42,13 @@ if not tags: print 'no EXIF information in', filename sys.exit(1) if not tags.has_key('Exif Offset') \ - or not tags.has_key('Image Orientation'): + or not tags.has_key('Image Qt::Orientation'): print 'cannot get orientation info in', filename sys.exit(1) exifp = tags['Exif Offset'] endian = tags['Exif Endian'] -tagp = tags['Image Orientation'].field_offset +tagp = tags['Image Qt::Orientation'].field_offset orientp = exifp + tagp @@ -93,8 +93,8 @@ os.write(fd,chr(newo)) # Thumbnail orientation : thumb_ifdp = 0 -if tags.has_key('Thumbnail Orientation'): - thumb_tagp = tags['Thumbnail Orientation'].field_offset +if tags.has_key('Thumbnail Qt::Orientation'): + thumb_tagp = tags['Thumbnail Qt::Orientation'].field_offset thumb_orientp = exifp + thumb_tagp if endian == 'M': # MM byte order thumb_orientp += 1 diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp index 989ec43..3d52c5b 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp @@ -39,9 +39,9 @@ static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Setting K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin, SettingsPluginFactory( &aboutdata ) ) -SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, +SettingsPlugin::SettingsPlugin( TQObject* tqparent, const char* name, const TQStringList & ) - : KParts::Plugin( parent, name ), mConfig(0) + : KParts::Plugin( tqparent, name ), mConfig(0) { setInstance(SettingsPluginFactory::instance()); @@ -118,13 +118,13 @@ SettingsPlugin::~SettingsPlugin() void SettingsPlugin::showPopup() { - if( !parent() || !parent()->inherits("KHTMLPart")) + if( !tqparent() || !tqparent()->inherits("KHTMLPart")) return; if (!mConfig) mConfig = new KConfig("settingspluginrc", false, false); - KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); + KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() ); KProtocolManager::reparseConfiguration(); bool cookies = cookiesEnabled( part->url().url() ); @@ -159,28 +159,28 @@ void SettingsPlugin::showPopup() void SettingsPlugin::toggleJava() { - if( parent() && parent()->inherits("KHTMLPart")) + if( tqparent() && tqparent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() ); } } void SettingsPlugin::toggleJavascript() { - if( parent() && parent()->inherits("KHTMLPart")) + if( tqparent() && tqparent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() ); } } void SettingsPlugin::toggleCookies() { - if( !parent() || !parent()->inherits("KHTMLPart")) + if( !tqparent() || !tqparent()->inherits("KHTMLPart")) return; - KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); + KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() ); TQString advice; bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); @@ -203,18 +203,18 @@ void SettingsPlugin::toggleCookies() void SettingsPlugin::togglePlugins() { - if( parent() && parent()->inherits("KHTMLPart")) + if( tqparent() && tqparent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() ); } } void SettingsPlugin::toggleImageLoading() { - if( parent() && parent()->inherits("KHTMLPart")) + if( tqparent() && tqparent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() ); } } @@ -229,7 +229,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url ) bool enabled = false; - if ( replyType == "TQString" ) + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { TQString advice; TQDataStream s( reply, IO_ReadOnly ); diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h index 63be54d..77fdc09 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h @@ -28,8 +28,9 @@ class KConfig; class SettingsPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - SettingsPlugin( TQObject* parent, const char* name, + SettingsPlugin( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~SettingsPlugin(); diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 87e2e31..7e07835 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -44,9 +44,9 @@ Boston, MA 02110-1301, USA. #include "imgallerydialog.h" #include "imgallerydialog.moc" -KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name ) +KIGPDialog::KIGPDialog(TQWidget *tqparent, const TQString& path, const char *name ) : KDialogBase( IconList, i18n("Configure"), Default|Ok|Cancel, - Ok, parent, name, true, true ), + Ok, tqparent, name, true, true ), m_dialogOk( false ) { m_path = path; @@ -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").arg(m_path)); + m_title->setText(i18n("Image Gallery for %1").tqarg(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").arg(path), page); + m_title = new TQLineEdit(i18n("Image Gallery for %1").tqarg(path), page); vlay->addWidget( m_title ); label->setBuddy(m_title); @@ -333,8 +333,8 @@ void KIGPDialog::writeConfig() m_config->writeEntry("ImageProperty", printImageProperty()); m_config->writeEntry("FontName", getFontName()); m_config->writeEntry("FontSize", getFontSize()); - m_config->writeEntry("ForegroundColor", getForegroundColor().name() ); - m_config->writeEntry("BackgroundColor", getBackgroundColor().name()); + m_config->writeEntry("ForegroundColor", TQString(getForegroundColor().name()) ); + m_config->writeEntry("BackgroundColor", TQString(getBackgroundColor().name())); m_config->setGroup("Directory"); m_config->writeEntry("RecurseSubDirectories", recurseSubDirectories()); diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h index 1e14daa..f22c06b 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.h +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h @@ -39,9 +39,10 @@ typedef TQMap<TQString,TQString> CommentMap; class KIGPDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KIGPDialog(TQWidget *parent=0, const TQString& path=0, const char *name=0 ); + KIGPDialog(TQWidget *tqparent=0, const TQString& path=0, const char *name=0 ); ~KIGPDialog(); bool isDialogOk() const; diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 4b9a5e0..2b33df4 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -48,8 +48,8 @@ Boston, MA 02110-1301, USA. typedef KGenericFactory<KImGalleryPlugin> KImGalleryPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) ) -KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) - : KParts::Plugin( parent, name ), m_commentMap(0) +KImGalleryPlugin::KImGalleryPlugin( TQObject* tqparent, const char* name, const TQStringList & ) + : KParts::Plugin( tqparent, name ), m_commentMap(0) { new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); @@ -58,12 +58,12 @@ KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQ void KImGalleryPlugin::slotExecute() { m_progressDlg=0L; - if ( !parent() || !parent()->inherits("KonqDirPart")) + if ( !tqparent() || !tqparent()->inherits("KonqDirPart")) { KMessageBox::sorry( 0L, i18n("Could not create the plugin, please report a bug.")); return; } - m_part = static_cast<KonqDirPart *>(parent()); + m_part = static_cast<KonqDirPart *>(tqparent()); if (!m_part->url().isLocalFile()) { //TODO support remote URLs too? KMessageBox::sorry(m_part->widget(), i18n("Creating an image gallery works only on local folders.")); return; @@ -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").arg(thumb_dir.path())); + KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").tqarg(thumb_dir.path())); return false; } else { thumb_dir.setPath( imgGalleryDir + "/" + dirName + "/" ); @@ -155,7 +155,7 @@ TQString KImGalleryPlugin::extension(const TQString& imageFormat) if (imageFormat == "JPEG") return ".jpg"; Q_ASSERT(false); - return TQString::null; + return TQString(); } void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDirName, const TQStringList& subDirList, @@ -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::currentDate())); + const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><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 << i18n("<i>Number of images</i>: %1").tqarg(numOfImages) << "<br/>" << endl; + stream << i18n("<i>Created on</i>: %1").tqarg(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").arg(imgName) ); + m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").tqarg(imgName) ); } else { kdDebug(90170) << "Creating thumbnail for " << imgName << " failed" << endl; - m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").arg(imgName) ); + m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").tqarg(imgName) ); } stream << "</a>" << endl; @@ -249,9 +249,9 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName if(m_cancelled) return false; - if( !parent() || !parent()->inherits("KonqDirPart")) + if( !tqparent() || !tqparent()->inherits("KonqDirPart")) return false; - KonqDirPart * part = static_cast<KonqDirPart *>(parent()); + KonqDirPart * part = static_cast<KonqDirPart *>(tqparent()); TQStringList subDirList; if (m_recurseSubDirectories && (recursionLevel >= 0)) { //recursionLevel == 0 means endless @@ -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").arg(subDir.path())); + KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").tqarg(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::fromLatin1("/thumbs/")); + TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false) return false; // Create the "images" subdirectory if necessary - TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); + TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/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").arg(url.path(+1))); + KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").tqarg(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::fromLatin1("/thumbs/")); - TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); + TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); + TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/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() ); @@ -392,7 +392,7 @@ void KImGalleryPlugin::loadCommentFile() // Lines starting with '#' are comment if (!(curLineStripped.isEmpty()) && !curLineStripped.startsWith("#")) { if (curLineStripped.endsWith(":")) { - picComment = TQString::null; + picComment = TQString(); picName = curLineStripped.left(curLineStripped.length()-1); kdDebug(90170) << "picName: " << picName << endl; } else { @@ -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").arg(m_configDlg->getCommentFile())); + KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").tqarg(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::fromLatin1("/") + imgName; + const TQString pixPath = sourceDirName + TQString::tqfromLatin1("/") + imgName; if (m_copyFiles) { KURL srcURL = KURL::fromPathOrURL(pixPath); //kdDebug(90170) << "srcURL: " << srcURL << endl; - KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName); + KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName); //kdDebug(90170) << "destURL: " << destURL << endl; - KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget()); + KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(tqparent())->widget()); } const TQString imgNameFormat = imgName + extension(imageFormat); - const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/"); + const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/"); int extent = m_configDlg->getThumbnailSize(); // this code is stolen from kdebase/kioslave/thumbnail/imagecreator.cpp diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h index 3168247..0139ae3 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h @@ -35,8 +35,9 @@ typedef TQMap<TQString,TQString> CommentMap; class KImGalleryPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KImGalleryPlugin( TQObject* parent, const char* name, + KImGalleryPlugin( TQObject* tqparent, const char* name, const TQStringList & ); ~KImGalleryPlugin() {} diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index 27459ee..de544bf 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -33,8 +33,8 @@ typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) ) -KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) -:KCModule(parent, name) +KCMKuick::KCMKuick(TQWidget *tqparent, const char *name, const TQStringList &) +:KCModule(tqparent, name) { KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), "0.2",I18N_NOOP("KControl module for Kuick's configuration"), KAboutData::License_GPL, diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h index d4316eb..6ff97eb 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.h +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h @@ -24,9 +24,10 @@ class KCMKuick : public KCModule { Q_OBJECT + TQ_OBJECT public: - KCMKuick (TQWidget *parent, const char *name, const TQStringList &); + KCMKuick (TQWidget *tqparent, const char *name, const TQStringList &); ~KCMKuick(); void load(); void load(const TQString &); diff --git a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui index 5001ad9..2ca7a5c 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui +++ b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KCMKuickDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCMKuickDialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_chkShow</cstring> </property> @@ -30,7 +30,7 @@ <string>&Show "Copy To" and "Move To" entries in context menus</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_grpCopy</cstring> </property> @@ -47,7 +47,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>pbCopyClear</cstring> </property> @@ -55,7 +55,7 @@ <string>&Clear List</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_txtCopyDir</cstring> </property> @@ -63,7 +63,7 @@ <string>folders.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_txtCopyCache</cstring> </property> @@ -79,7 +79,7 @@ <string>Cache the last</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>m_sbCopy</cstring> </property> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -109,7 +109,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_grpMove</cstring> </property> @@ -126,7 +126,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>pbMoveClear</cstring> </property> @@ -134,7 +134,7 @@ <string>Clear &List</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_txtMoveCache</cstring> </property> @@ -142,7 +142,7 @@ <string>Cache the last</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>m_sbMove</cstring> </property> @@ -153,7 +153,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_txtMoveDir</cstring> </property> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -188,10 +188,10 @@ <tabstop>m_sbMove</tabstop> <tabstop>pbMoveClear</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="private">slotClearMoveCache()</slot> <slot access="protected">slotClearCopyCache()</slot> -</slots> -<layoutdefaults spacing="6" margin="0"/> -<layoutfunctions spacing="KDialog::spacingHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="0"/> +<tqlayoutfunctions spacing="KDialog::spacingHint"/> </UI> diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 4dbd212..1174ee3 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -34,28 +34,28 @@ TQMap<TQString, TQPixmap> *KDirMenu::_icons = 0; -KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, +KDirMenu::KDirMenu ( TQWidget *tqparent, const KURL &_src, const TQString &_path, const TQString &_name, bool /*showfile*/ ) - : TQPopupMenu(parent), + : TQPopupMenu(tqparent), path(_path), name(_name), src( _src ), action( 0 ) { - children.setAutoDelete( true ); + tqchildren.setAutoDelete( true ); initIconMap( ); connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); - children.clear(); // just in case + tqchildren.clear(); // just in case TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new KAction(name, 0, this, TQT_SLOT(new_slot( ) ), this); + action = new KAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this)); } KDirMenu::~KDirMenu( ) { delete action; clear( ); - children.clear( ); + tqchildren.clear( ); } void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { static const TQIconSet folder = SmallIconSet("folder"); @@ -76,11 +76,11 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { KIcon::DefaultState, 0, true); if(icon.isNull()) icon = CICON("folder"); - insertItem( icon, escapedPath.replace( "&", "&&" ), submenu ); + insertItem( icon, escapedPath.tqreplace( "&", "&&" ), submenu ); } else - insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); - children.append( submenu ); + insertItem( folder, escapedPath.tqreplace( "&", "&&" ), submenu ); + tqchildren.append( submenu ); connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), this, TQT_SLOT(slotFileSelected(const TQString &))); } @@ -101,11 +101,11 @@ void KDirMenu::slotAboutToShow( ) { setItemEnabled( insertItem( name ), false ); // all dirs writeable and readable - TQDir dir(path, TQString::null, + TQDir dir(path, TQString(), TQDir::Name | TQDir::DirsFirst | TQDir::IgnoreCase, TQDir::Dirs | TQDir::Readable | TQDir::Executable); - const QFileInfoList* dirList = dir.entryInfoList(); + const TQFileInfoList* dirList = dir.entryInfoList(); if ( !dirList || dirList->isEmpty() ) { if ( action ) action->setEnabled( false ); @@ -123,7 +123,7 @@ void KDirMenu::slotAboutToShow( ) { static const TQString& dot = KGlobal::staticQString( "." ); static const TQString& dotdot = KGlobal::staticQString( ".." ); - for ( QFileInfoListIterator it( *dirList ); *it; ++it ) { + for ( TQFileInfoListIterator it( *dirList ); *it; ++it ) { TQString fileName = (*it)->fileName(); if ( fileName == dot || fileName == dotdot ) continue; diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index 5bbe68e..cdc2933 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -30,8 +30,9 @@ class KURL; class KDirMenu : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: - KDirMenu( TQWidget *parent, const KURL &src, const TQString &_path, + KDirMenu( TQWidget *tqparent, const KURL &src, const TQString &_path, const TQString &name, bool showfiles = false ); ~KDirMenu( ); void setPath( const TQString &_path); @@ -47,7 +48,7 @@ private: TQString name; KURL src; KAction *action; - TQPtrList<KDirMenu> children; + TQPtrList<KDirMenu> tqchildren; void initIconMap( ); public slots: void slotAboutToShow( ); diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index 77ef7a4..e711df2 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -34,8 +34,8 @@ #include "kimcontactmenu.h" -KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) - : TQPopupMenu( parent), mProxy( proxy ) +KIMContactMenu::KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy ) + : TQPopupMenu( tqparent), mProxy( proxy ) { #ifdef KIMCONTACTS_USE_KABC m_addressBook = KABC::StdAddressBook::self( false ); diff --git a/konq-plugins/kuick/kimcontactmenu.h b/konq-plugins/kuick/kimcontactmenu.h index 478c55b..2f1c0bb 100644 --- a/konq-plugins/kuick/kimcontactmenu.h +++ b/konq-plugins/kuick/kimcontactmenu.h @@ -31,11 +31,12 @@ namespace KABC { class AddressBook; } -class KIMContactMenu : public QPopupMenu +class KIMContactMenu : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: - KIMContactMenu( TQWidget *parent, KIMProxy *proxy ); + KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy ); ~KIMContactMenu(); protected slots: // populate menus if not already populated diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 2b5d78a..451f127 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -36,9 +36,9 @@ #include "kimcontactmenu.h" #include "kmetamenu.moc" -KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, +KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, const TQString &text, const TQString &key, KIMProxy *imProxy ) -: TQPopupMenu( parent), +: TQPopupMenu( tqparent), m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) { int recent_no; group = key; @@ -51,7 +51,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, u.setPath(TQDir::homeDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { - m_home = new KDirMenu( parent, url, u.path() , text ); + m_home = new KDirMenu( tqparent, url, u.path() , text ); insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); @@ -62,7 +62,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, u.setPath(TQDir::rootDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { - m_root = new KDirMenu( parent, url, u.path() , text ); + m_root = new KDirMenu( tqparent, url, u.path() , text ); insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); @@ -75,7 +75,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, if ( TQFileInfo( confDir ).isWritable() && kapp->authorizeURLAction("list", u, u) ) { - m_etc = new KDirMenu( parent, url, confDir, text ); + m_etc = new KDirMenu( tqparent, url, confDir, text ); insertItem( SmallIcon( "folder_yellow" ) , i18n("&System Configuration"), m_etc); dirList << confDir; @@ -85,7 +85,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, } if ( url.isLocalFile() - && dirList.find( url.path() ) == dirList.end() + && dirList.tqfind( url.path() ) == dirList.end() && TQFileInfo( url.path() ).isWritable() && TQFileInfo( url.path() ).isDir() && kapp->authorizeURLAction("list", url, url) ) @@ -93,7 +93,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, //(#60192) { // Also add current working directory - m_current = new KDirMenu( parent, url, url.path(), text ); + m_current = new KDirMenu( tqparent, url, url.path(), text ); insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); @@ -103,7 +103,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, if ( imProxy ) { - m_contacts = new KIMContactMenu( parent, imProxy ); + m_contacts = new KIMContactMenu( tqparent, imProxy ); int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts ); connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) @@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, } - m_browse = new KAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this ); + m_browse = new KAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, continue; } TQString escapedDir = *it; - KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this); + KAction *action = new KAction(escapedDir.tqreplace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); action->plug(this ); actions.append( action ); ++it; diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index 6b23cb7..a15878b 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -35,9 +35,10 @@ class KURL; class KMetaMenu : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: - KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, + KMetaMenu( TQWidget *tqparent, const KURL &url, const TQString &text, const TQString &key, KIMProxy * imProxy = 0L ); KMetaMenu(); ~KMetaMenu(); diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 772f169..27152e7 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -43,7 +43,7 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString meta_copy_mmu = 0L; meta_move_mmu = 0L; my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); - addAction( my_action ); + tqaddAction( my_action ); addSeparator(); //popupmenu->addMerge(); connect( popup, TQT_SIGNAL(aboutToShow() ), this, TQT_SLOT(slotPrepareMenu( ) ) ); @@ -82,7 +82,7 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... for(int i= popup->count(); i >=1; i--) { int id = popup->idAt( i ); TQString text = popup->text( id ); - if( text.contains("kuick_plugin") ) { + if( text.tqcontains("kuick_plugin") ) { popup->removeItem( id ); if (isKDesktop && !kapp->authorize("editable_desktop_icons")) { diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h index 8369f7f..cd35342 100644 --- a/konq-plugins/kuick/kuick_plugin.h +++ b/konq-plugins/kuick/kuick_plugin.h @@ -28,6 +28,7 @@ class KAction; class KURL; class KTestMenu : public KonqPopupMenuPlugin { Q_OBJECT + TQ_OBJECT public: KTestMenu (KonqPopupMenu *, const char *name, const TQStringList &list); virtual ~KTestMenu( ); diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 9dfa53c..1816b08 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "konqmficon.h" @@ -41,11 +41,11 @@ typedef KGenericFactory<KonqMFIcon> KonqMFIconFactory; K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIconFactory("mfkonqmficon")) -KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) -: KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { +KonqMFIcon::KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &) +: KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("mf_konqplugin"); - m_part = dynamic_cast<KHTMLPart*>(parent); + m_part = dynamic_cast<KHTMLPart*>(tqparent); if (!m_part) { kdDebug() << "couldn't get part" << endl; return; @@ -157,7 +157,7 @@ void KonqMFIcon::extractCard(DOM::Node node) { if (!name.isEmpty()) { value += "END:VCARD\n"; - _cards.append(qMakePair(name, value)); + _cards.append(tqMakePair(name, value)); } } @@ -202,7 +202,7 @@ void KonqMFIcon::extractEvent(DOM::Node node) { if (!name.isEmpty()) { value += "END:VEVENT\nEND:VCALENDAR\n"; - _events.append(qMakePair(name, value)); + _events.append(tqMakePair(name, value)); } } @@ -249,11 +249,11 @@ void KonqMFIcon::contextMenu() { m_menu->insertTitle(i18n("Microformats")); connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int))); int id = 0; - for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { + for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); id++; } - for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) { + for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); id++; } @@ -275,7 +275,7 @@ void KonqMFIcon::addMFIcon() { m_mfIcon = new KURLLabel(m_statusBarEx->statusBar()); m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_mfIcon->tqsetSizePolicy(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/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h index 5a9e02c..8213f8f 100644 --- a/konq-plugins/microformat/konqmficon.h +++ b/konq-plugins/microformat/konqmficon.h @@ -17,12 +17,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ -#ifndef KONQFEEDICON_H -#define KONQFEEDICON_H +#ifndef KONTQFEEDICON_H +#define KONTQFEEDICON_H #include <khtml_part.h> #include <kparts/plugin.h> @@ -41,8 +41,9 @@ namespace KParts { class KonqMFIcon : public KParts::Plugin, PluginBase { Q_OBJECT + TQ_OBJECT public: - KonqMFIcon(TQObject *parent, const char *name, const TQStringList &); + KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &); ~KonqMFIcon(); @@ -56,7 +57,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase { KURLLabel *m_mfIcon; KParts::StatusBarExtension *m_statusBarEx; TQGuardedPtr<KPopupMenu> m_menu; - TQValueList<QPair<TQString, TQString> > _events, _cards; + TQValueList<TQPair<TQString, TQString> > _events, _cards; private slots: void waitPartToLoad(); diff --git a/konq-plugins/microformat/pluginbase.cpp b/konq-plugins/microformat/pluginbase.cpp index 486721a..f722340 100644 --- a/konq-plugins/microformat/pluginbase.cpp +++ b/konq-plugins/microformat/pluginbase.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kprocess.h> diff --git a/konq-plugins/microformat/pluginbase.h b/konq-plugins/microformat/pluginbase.h index 17a504d..a786af5 100644 --- a/konq-plugins/microformat/pluginbase.h +++ b/konq-plugins/microformat/pluginbase.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PLUGINBASE_H diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index a1a5bfc..2346831 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -42,9 +42,9 @@ typedef KGenericFactory<MinitoolsPlugin> MinitoolsPluginFactory; K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitoolsplugin") ) -MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &) - : KParts::Plugin(parent, name) { - m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; +MinitoolsPlugin::MinitoolsPlugin(TQObject* tqparent, const char* name, const TQStringList &) + : KParts::Plugin(tqparent, name) { + m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L; m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); @@ -124,17 +124,17 @@ void MinitoolsPlugin::newBookmarkCallback( const TQString & text, const TQCString & url, const TQString & ) { kdDebug(90150) << "MinitoolsPlugin::newBookmarkCallback" << text << url << endl; - m_minitoolsList.prepend(qMakePair(text,url)); + m_minitoolsList.prepend(tqMakePair(text,url)); } void MinitoolsPlugin::endFolderCallback() { kdDebug(90150) << "MinitoolsPlugin::endFolderCallback" << endl; - m_minitoolsList.prepend(qMakePair(TQString("-"),TQCString("-"))); + m_minitoolsList.prepend(tqMakePair(TQString("-"),TQCString("-"))); } TQString MinitoolsPlugin::minitoolsFilename(bool local) { - return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml")) - : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml")); + return local ? locateLocal("data", TQString::tqfromLatin1("konqueror/minitools.xml")) + : locateLocal("data", TQString::tqfromLatin1("konqueror/minitools-global.xml")); } void MinitoolsPlugin::slotEditBookmarks() { diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index 04d2ae8..8607efe 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -34,9 +34,10 @@ class KActionMenu; class MinitoolsPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - MinitoolsPlugin( TQObject* parent, const char* name, const TQStringList & ); + MinitoolsPlugin( TQObject* tqparent, const char* name, const TQStringList & ); ~MinitoolsPlugin(); protected slots: @@ -57,7 +58,7 @@ private: KHTMLPart* m_part; KActionMenu* m_pMinitoolsMenu; - typedef QPair<TQString,TQCString> Minitool; + typedef TQPair<TQString,TQCString> Minitool; typedef TQValueList<Minitool> MinitoolsList; MinitoolsList m_minitoolsList; diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 14a47a3..e77e1e3 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2002, Anders Lund <anders@alweb.dk> * - * Copyright (C) 2003, 2004, Franck Qulain <shift@free.fr> * + * Copyright (C) 2003, 2004, Franck Qu�lain <shift@free.fr> * * Copyright (C) 2004, Kevin Krammer <kevin.krammer@gmx.at> * * Copyright (C) 2004, 2006, Oliviet Goffart <ogoffart @ kde.org> * * * @@ -23,7 +23,7 @@ -// Qt includes +// TQt includes #include <tqapplication.h> #include <tqtimer.h> @@ -61,8 +61,8 @@ K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") ) #endif /** Constructor of the plugin. */ -RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &) - : KParts::Plugin( parent, name ), +RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin( tqparent, name ), m_part(0), m_viewVisible(false) { @@ -74,7 +74,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") ); kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); - kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") ); + kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate tqparent of the current document.</p>") ); bool isRTL = TQApplication::reverseLayout(); @@ -91,7 +91,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") ); // ------------ special items -------------------------- - kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); + kaction_map["search"] = new KAction( i18n("&Search"), "filetqfind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") ); // ------------ Document structure links --------------- @@ -175,7 +175,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin disableAll(); // When the rendering of the HTML is done, we update the site navigation bar - m_part = dynamic_cast<KHTMLPart *>(parent); + m_part = dynamic_cast<KHTMLPart *>(tqparent); if (!m_part) return; @@ -199,7 +199,7 @@ bool RelLinksPlugin::eventFilter(TQObject *watched, TQEvent* event) { if (watched == 0 || event == 0) return false; - if (watched == m_view) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_view)) { switch (event->type()) { @@ -310,7 +310,7 @@ void RelLinksPlugin::updateToolbar() { // escape ampersand before settings as action title, otherwise the menu entry will interpret it as an // accelerator - title.replace('&', "&&"); + title.tqreplace('&', "&&"); // -- Menus activation -- @@ -364,7 +364,7 @@ void RelLinksPlugin::updateToolbar() { void RelLinksPlugin::guessRelations() { - m_part = dynamic_cast<KHTMLPart *>(parent()); + m_part = dynamic_cast<KHTMLPart *>(tqparent()); if (!m_part || m_part->document().isNull() ) return; @@ -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").arg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").tqarg(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").arg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL()); e= m_part->document().createElement("link"); e.setAttribute("href",href); element_map["prev"][0] = e; @@ -422,7 +422,7 @@ void RelLinksPlugin::guessRelations() /** Menu links */ void RelLinksPlugin::goToLink(const TQString & rel, int id) { // have the KHTML part open it - KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); if (!part) return; @@ -561,17 +561,17 @@ void RelLinksPlugin::disableAll() { TQString RelLinksPlugin::getLinkType(const TQString &lrel) { // Relations to ignore... - if (lrel.contains("stylesheet") + if (lrel.tqcontains("stylesheet") || lrel == "script" || lrel == "icon" || lrel == "shortcut icon" || lrel == "prefetch" ) - return TQString::null; + return TQString(); // ...known relations... if (lrel == "top" || lrel == "origin" || lrel == "start") return "home"; - if (lrel == "parent") + if (lrel == "tqparent") return "up"; if (lrel == "first") return "begin"; @@ -583,7 +583,7 @@ TQString RelLinksPlugin::getLinkType(const TQString &lrel) { return "last"; if (lrel == "toc") return "contents"; - if (lrel == "find") + if (lrel == "tqfind") return "search"; if (lrel == "alternative stylesheet") return "alternate stylesheet"; @@ -612,7 +612,7 @@ TQString RelLinksPlugin::transformRevToRel(const TQString &rev) { return getLinkType("sibling"); //...unknown inverse relation => ignore for the moment - return TQString::null; + return TQString(); } #include "plugin_rellinks.moc" diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h index 9c38795..c6e0942 100644 --- a/konq-plugins/rellinks/plugin_rellinks.h +++ b/konq-plugins/rellinks/plugin_rellinks.h @@ -30,7 +30,7 @@ This plugin create a toolbar similar to the Site Navigation Bar of Mozilla */ -// Qt includes +// TQt includes #include <tqmap.h> // KDE includes @@ -57,9 +57,10 @@ class TQTimer; */ class RelLinksPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: /** Constructor */ - RelLinksPlugin( TQObject *parent, const char *name, const TQStringList & ); + RelLinksPlugin( TQObject *tqparent, const char *name, const TQStringList & ); /** Destructor */ virtual ~RelLinksPlugin(); diff --git a/konq-plugins/rsync/rsyncconfigdialog.cpp b/konq-plugins/rsync/rsyncconfigdialog.cpp index ae89efa..f0e99a4 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.cpp +++ b/konq-plugins/rsync/rsyncconfigdialog.cpp @@ -100,12 +100,12 @@ /* * RsyncConfigDialog implementation */ -RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, +RsyncConfigDialog::RsyncConfigDialog(TQWidget* tqparent, const char* name, const TQString& caption, const TQString& text, const TQString& localfolder, const TQString& remotefolder, int syncmode, bool modal) : KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel | KDialogBase::Ok, - KDialogBase::Ok, parent, name, modal), + KDialogBase::Ok, tqparent, name, modal), mAutoClose(true), mAutoReset(false), mCancelled(false), @@ -113,7 +113,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, mAllowTextEdit(false), mShown(false) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); #endif mShowTimer = new TQTimer(this); @@ -122,19 +122,19 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, mCancelText = actionButton(KDialogBase::Cancel)->text(); TQFrame* mainWidget = plainPage(); - TQVBoxLayout* layout = new TQVBoxLayout(mainWidget, 10); + TQVBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 10); mLabel = new TQLabel(TQString("<b>") + text + TQString("</b><br>")+i18n("Setting up synchronization for local folder")+TQString("<br><i>") + localfolder, mainWidget); - layout->addWidget(mLabel); + tqlayout->addWidget(mLabel); // Create an exclusive button group - TQButtonGroup *layoutg = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget); - layout->addWidget( layoutg ); - layoutg->setExclusive( TRUE ); + TQButtonGroup *tqlayoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget); + tqlayout->addWidget( tqlayoutg ); + tqlayoutg->setExclusive( TRUE ); // Insert radiobuttons - rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), layoutg); - rsync_rb2 = new TQRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), layoutg); - rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), layoutg); + rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), tqlayoutg); + rsync_rb2 = new TQRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), tqlayoutg); + rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), tqlayoutg); if (syncmode == 1) rsync_rb1->setChecked( TRUE ); @@ -143,15 +143,15 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, else if (syncmode == 3) rsync_rb3->setChecked( TRUE ); - //(void)new TQRadioButton( "R&adiobutton 2", layoutg ); - //(void)new TQRadioButton( "Ra&diobutton 3", layoutg ); + //(void)new TQRadioButton( "R&adiobutton 2", tqlayoutg ); + //(void)new TQRadioButton( "Ra&diobutton 3", tqlayoutg ); // Create an exclusive button group - TQButtonGroup *layoutm = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget); - layout->addWidget( layoutm ); - layoutg->setExclusive( TRUE ); + TQButtonGroup *tqlayoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget); + tqlayout->addWidget( tqlayoutm ); + tqlayoutg->setExclusive( TRUE ); - m_rsync_txt = new TQLineEdit(layoutm); + m_rsync_txt = new TQLineEdit(tqlayoutm); if (remotefolder.isEmpty() == false) { m_rsync_txt->setText(remotefolder); } diff --git a/konq-plugins/rsync/rsyncconfigdialog.h b/konq-plugins/rsync/rsyncconfigdialog.h index 8e02d54..44ab118 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.h +++ b/konq-plugins/rsync/rsyncconfigdialog.h @@ -37,13 +37,14 @@ class RsyncConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RsyncConfigDialog(TQWidget* parent = 0, const char* name = 0, - const TQString& caption = TQString::null, - const TQString& text = TQString::null, - const TQString& localfolder = TQString::null, - const TQString& remotefolder = TQString::null, + RsyncConfigDialog(TQWidget* tqparent = 0, const char* name = 0, + const TQString& caption = TQString(), + const TQString& text = TQString(), + const TQString& localfolder = TQString(), + const TQString& remotefolder = TQString(), int syncmode = 1, bool modal = false); /** diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index 81a5253..b223a93 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -106,13 +106,13 @@ typedef KGenericFactory<RsyncPlugin> RsyncPluginFactory; K_EXPORT_COMPONENT_FACTORY(librsyncplugin, RsyncPluginFactory("rsyncplugin")) -RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, +RsyncPlugin::RsyncPlugin (TQObject* tqparent, const char* name, const TQStringList&) - :KParts::Plugin (parent, name), + :KParts::Plugin (tqparent, name), m_pSyncNow(0), m_pSyncSetup(0) { - m_part = ::qt_cast<KonqDirPart*>(parent); + m_part = ::tqqt_cast<KonqDirPart*>(tqparent); if ( !m_part || !m_part->scrollWidget() ) return; @@ -224,7 +224,7 @@ creates the unidirectional sync subprocess bool RsyncPlugin::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) { int fd[2]; int rc, flags; - thisFn = TQString::null; + thisFn = TQString(); rc = open_pty_pair(fd); if (rc == -1) { @@ -361,7 +361,7 @@ creates the bidirectional sync subprocess bool RsyncPlugin::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) { int fd[2]; int rc, flags; - thisFn = TQString::null; + thisFn = TQString(); // Check for and remove the trailing slash in localfolder if (localfolder.endsWith("/")) { @@ -521,17 +521,17 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { buf.truncate(buf.length()-1); myDebug( << "establishing: got " << buf << endl); - while (childPid && ((pos = buf.find('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) { + while (childPid && ((pos = buf.tqfind('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) { if (m_progressDialogExists == true) { - qApp->processEvents(); + tqApp->processEvents(); } pos++; TQString str = buf.left(pos); buf = buf.mid(pos); if (str == "\n") continue; - //if (str.contains("rsync error:")) { - if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) { + //if (str.tqcontains("rsync error:")) { + if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) { KMessageBox::error(NULL, str); } else if (!str.isEmpty()) { @@ -557,12 +557,12 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } else if (!connectionPassword.isEmpty()) { myDebug( << "sending cpass" << endl); connectionAuth.password = connectionPassword+"\n"; - connectionPassword = TQString::null; + connectionPassword = TQString(); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } else { myDebug( << "sending mpass" << endl); connectionAuth.prompt = thisFn+buf; - connectionAuth.password = TQString::null; // don't prefill + connectionAuth.password = TQString(); // don't prefill TQCString thispass; if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + TQString("\n") + i18n("Please input") + TQString(" ") + TQString(buf), NULL) != 1) { shutdownConnection(true, false); @@ -575,7 +575,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { myDebug( << "sending pass" << endl); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } - thisFn = TQString::null; + thisFn = TQString(); return 0; } else if (buf.endsWith("?")) { @@ -585,25 +585,25 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } else { writeChild("no\n",3); } - thisFn = TQString::null; + thisFn = TQString(); return 0; } if (m_progressDialogExists == true) { - if (str.contains("exit()") && str.contains("ICE default IO")) { + if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) { if (m_progressDialogExists == true) { m_progressDialog->progressBar()->setValue(m_progressDialog->progressBar()->totalSteps()); } } else { - if (str.contains(", to-check=")) { + if (str.tqcontains(", to-check=")) { // Parse the to-check output TQString tocheck_out_cur; TQString tocheck_out_tot; - tocheck_out_cur = str.mid(str.find(", to-check=") + 11, str.length()); - tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.find("/") + 1, tocheck_out_cur.length()); - tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.find("/")); - tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.find(")")); + tocheck_out_cur = str.mid(str.tqfind(", to-check=") + 11, str.length()); + tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.tqfind("/") + 1, tocheck_out_cur.length()); + tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.tqfind("/")); + tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.tqfind(")")); m_progressDialog->progressBar()->setTotalSteps(tocheck_out_tot.toInt()-1); m_progressDialog->progressBar()->setValue(tocheck_out_tot.toInt()-tocheck_out_cur.toInt()-2); } @@ -629,17 +629,17 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, buf.truncate(buf.length()-1); myDebug( << "establishing: got " << buf << endl); - while (childPid && (((pos = buf.find('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) { + while (childPid && (((pos = buf.tqfind('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) { if (m_progressDialogExists == true) { - qApp->processEvents(); + tqApp->processEvents(); } pos++; TQString str = buf.left(pos); buf = buf.mid(pos); if (str == "\n") continue; - //if (str.contains("rsync error:")) { - if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) { + //if (str.tqcontains("rsync error:")) { + if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) { KMessageBox::error(NULL, str); } else if (!str.isEmpty()) { @@ -664,12 +664,12 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } else if (!connectionPassword.isEmpty()) { myDebug( << "sending cpass" << endl); connectionAuth.password = connectionPassword+"\n"; - connectionPassword = TQString::null; + connectionPassword = TQString(); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } else { myDebug( << "sending mpass" << endl); connectionAuth.prompt = thisFn+buf; - connectionAuth.password = TQString::null; // don't prefill + connectionAuth.password = TQString(); // don't prefill TQCString thispass; if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + TQString("\n") + i18n("Please input") + TQString(" ") + TQString(buf), NULL) != 1) { slotUnisonCancelled(); @@ -682,11 +682,11 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, myDebug( << "sending pass" << endl); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } - thisFn = TQString::null; + thisFn = TQString(); return 0; } else if (buf.endsWith("?") || buf.endsWith("? []")) { - buf.replace("[]", ""); + buf.tqreplace("[]", ""); if (buf.endsWith("? []")) { int rc = KMessageBox::questionYesNo(NULL, buf); if (rc == KMessageBox::Yes) { @@ -703,7 +703,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, writeChild("no\n",3); } } - thisFn = TQString::null; + thisFn = TQString(); buf = ""; return 0; } @@ -717,11 +717,11 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } TQString file_name; file_name = buf; - file_name.replace("[]", ""); - file_name.replace(TQString("changed "), ""); + file_name.tqreplace("[]", ""); + file_name.tqreplace(TQString("changed "), ""); //file_name = file_name.simplifyWhiteSpace(); KDialogBase *dialog= new KDialogBase(i18n("User Intervention Required"), KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, KDialogBase::Yes, KDialogBase::Cancel, NULL, "warningYesNoCancel", true, true, i18n("Use &Local File"), i18n("Use &Remote File"), i18n("&Ignore")); - int rc = KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, TQString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + TQString("</b><p>") + i18n("Local") + TQString(": ") + localfolder + TQString("/") + file_name + TQString("<br>") + i18n("Remote") + TQString(": ") + remotepath + TQString("/") + file_name + TQString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + TQString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), TQStringList(), TQString::null, NULL, 1); + int rc = KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, TQString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + TQString("</b><p>") + i18n("Local") + TQString(": ") + localfolder + TQString("/") + file_name + TQString("<br>") + i18n("Remote") + TQString(": ") + remotepath + TQString("/") + file_name + TQString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + TQString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), TQStringList(), TQString(), NULL, 1); if (rc == KDialogBase::Yes) { writeChild(">\n",3); } @@ -735,7 +735,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } if (m_progressDialogExists == true) { - if (str.contains("exit()") && str.contains("ICE default IO")) { + if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) { if (m_progressDialogExists == true) { m_progressDialog->progressBar()->setFormat("%v / %m"); m_progressDialog->progressBar()->setTotalSteps(2); @@ -822,7 +822,7 @@ TQString RsyncPlugin::findLocalFolderByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(TQString("file://"), TQString("")); + folderurl_stripped.tqreplace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -841,7 +841,7 @@ TQString RsyncPlugin::findSyncMethodByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(TQString("file://"), TQString("")); + folderurl_stripped.tqreplace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -860,7 +860,7 @@ TQString RsyncPlugin::findLoginSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(TQString("file://"), TQString("")); + folderurl_stripped.tqreplace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -879,7 +879,7 @@ TQString RsyncPlugin::findLogoutSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(TQString("file://"), TQString("")); + folderurl_stripped.tqreplace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -898,7 +898,7 @@ TQString RsyncPlugin::findTimedSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(TQString("file://"), TQString("")); + folderurl_stripped.tqreplace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -917,7 +917,7 @@ int RsyncPlugin::deleteLocalFolderByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(TQString("file://"), TQString("")); + folderurl_stripped.tqreplace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i=cfgfolderlist.remove(i); @@ -937,7 +937,7 @@ int RsyncPlugin::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQ { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(TQString("file://"), TQString("")); + folderurl_stripped.tqreplace(TQString("file://"), TQString("")); cfgfolderlist.append(folderurl); cfgfolderlist.append(remoteurl); cfgfolderlist.append(syncmethod); diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h index 0adbfc0..6c58d0d 100644 --- a/konq-plugins/rsync/rsyncplugin.h +++ b/konq-plugins/rsync/rsyncplugin.h @@ -48,10 +48,11 @@ namespace KParts class RsyncPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - RsyncPlugin (TQObject* parent, const char* name, const TQStringList &); + RsyncPlugin (TQObject* tqparent, const char* name, const TQStringList &); virtual ~RsyncPlugin(); protected: diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index b8cd24c..b4cf210 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -57,9 +57,9 @@ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin, SearchBarPluginFactory("searchbarplugin")) -SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, +SearchBarPlugin::SearchBarPlugin(TQObject *tqparent, const char *name, const TQStringList &) : - KParts::Plugin(parent, name), + KParts::Plugin(tqparent, name), m_searchCombo(0), m_searchMode(UseSearchProvider), m_urlEnterLock(false), @@ -94,7 +94,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, configurationChanged(); - KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(parent); + KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(TQT_TQWIDGET(tqparent)); //Grab the part manager. Don't know of any other way, and neither does Tronical, so.. KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager")); @@ -132,13 +132,13 @@ TQChar delimiter() bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e) { - if( o==m_searchCombo->lineEdit() && e->type() == TQEvent::KeyPress ) + if( TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_searchCombo->lineEdit()) && e->type() == TQEvent::KeyPress ) { TQKeyEvent *k = (TQKeyEvent *)e; TQString text = k->text(); if(!text.isEmpty()) { - if(k->key() != Qt::Key_Return && k->key() != Key_Enter && k->key() != Key_Escape) + if(k->key() != TQt::Key_Return && k->key() != Key_Enter && k->key() != Key_Escape) { emit gsCompleteDelayed(); } @@ -162,7 +162,7 @@ bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e) { if(m_searchCombo->listBox()->isVisible()) { - qApp->sendEvent(m_searchCombo->listBox(), e); + tqApp->sendEvent(m_searchCombo->listBox(), e); return true; } } @@ -174,7 +174,7 @@ bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e) the listbox was visible. if(m_searchCombo->listBox()->isVisible()) { - qApp->sendEvent(m_searchCombo->listBox(),e); + tqApp->sendEvent(m_searchCombo->listBox(),e); }*/ } if (k->key() == Key_Escape) @@ -206,7 +206,7 @@ void SearchBarPlugin::nextSearchEntry() } else { - TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine); it++; if(it==m_searchEngines.end()) { @@ -236,7 +236,7 @@ void SearchBarPlugin::previousSearchEntry() } else { - TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine); if(it==m_searchEngines.begin()) { m_searchMode = FindInThisPage; @@ -273,7 +273,7 @@ void SearchBarPlugin::startSearch(const TQString &_search) TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine)); if (service) { const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + search ); @@ -281,11 +281,11 @@ void SearchBarPlugin::startSearch(const TQString &_search) if(!service || !KURIFilter::self()->filterURI(data, list)) { - data.setData( TQString::fromLatin1( "google" ) + delimiter() + search ); + data.setData( TQString::tqfromLatin1( "google" ) + delimiter() + search ); KURIFilter::self()->filterURI( data, list ); } - if(KApplication::keyboardMouseState() & Qt::ControlButton) + if(KApplication::keyboardMouseState() & TQt::ControlButton) { KParts::URLArgs args; args.setNewTab(true); @@ -318,7 +318,7 @@ void SearchBarPlugin::setIcon() TQString hinttext; if(m_searchMode == FindInThisPage) { - m_searchIcon = SmallIcon("find"); + m_searchIcon = SmallIcon("tqfind"); hinttext = i18n("Find in This Page"); } else @@ -329,7 +329,7 @@ void SearchBarPlugin::setIcon() TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(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").arg(providername);; + hinttext = i18n("%1 Search").tqarg(providername);; } static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext); @@ -363,8 +363,8 @@ void SearchBarPlugin::setIcon() TQPainter p( &arrowmap ); p.drawPixmap(0, 2, m_searchIcon); TQStyle::SFlags arrowFlags = TQStyle::Style_Default; - m_searchCombo->style().drawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, - arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() ); + m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, + arrowmap.height()-6, 6, 5), m_searchCombo->tqcolorGroup(), arrowFlags, TQStyleOption() ); p.end(); m_searchIcon = arrowmap; @@ -382,14 +382,14 @@ void SearchBarPlugin::showSelectionMenu() list << "kurisearchfilter" << "kuriikwsfilter"; m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu"); - m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); + m_popupMenu->insertItem(SmallIcon("tqfind"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); m_popupMenu->insertSeparator(); int i=-1; for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it ) { i++; - service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(*it)); if(!service) { continue; @@ -413,7 +413,7 @@ void SearchBarPlugin::showSelectionMenu() } m_popupMenu->insertSeparator(); - m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu); + m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu)); TQStringList google_modes; google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never"); m_googleMenu->setItems(google_modes); @@ -515,7 +515,7 @@ void SearchBarPlugin::configurationChanged() void SearchBarPlugin::partChanged(KParts::Part *newPart) { - m_part = ::qt_cast<KHTMLPart*>(newPart); + m_part = ::tqqt_cast<KHTMLPart*>(newPart); //Delay since when destroying tabs part 0 gets activated for a bit, before the proper part TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility())); @@ -537,13 +537,17 @@ void SearchBarPlugin::updateComboVisibility() void SearchBarPlugin::focusSearchbar() { +#ifdef USE_QT4 + m_searchCombo->setFocus(); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Shortcut ); m_searchCombo->setFocus(); TQFocusEvent::resetReason(); +#endif // USE_QT4 } -SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : - KHistoryCombo(parent, name), +SearchBarCombo::SearchBarCombo(TQWidget *tqparent, const char *name) : + KHistoryCombo(tqparent, name), m_pluginActive(true) { connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared())); @@ -586,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText) void SearchBarCombo::mousePressEvent(TQMouseEvent *e) { - int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if(e->x() > x0 + 2 && e->x() < lineEdit()->x()) { @@ -677,12 +681,12 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job) if (((KIO::TransferJob*)job)->error() == 0) { TQString temp; - temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); - temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); + temp = m_gsData.mid(m_gsData.tqfind('(') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1); + temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1); temp.remove('"'); TQStringList compList1 = TQStringList::split(',', temp); - temp = m_gsData.mid(m_gsData.find(')') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); - temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); + temp = m_gsData.mid(m_gsData.tqfind(')') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1); + temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1); temp.remove('"'); temp.remove(','); temp.remove('s'); @@ -719,7 +723,7 @@ void SearchBarPlugin::gsSetCompletedText(const TQString& text) currentText = m_searchCombo->currentText(); if (currentText == text.left(currentText.length())) { - m_searchCombo->lineEdit()->setText(text.left(text.find('(') - 1)); + m_searchCombo->lineEdit()->setText(text.left(text.tqfind('(') - 1)); m_searchCombo->lineEdit()->setCursorPosition(currentText.length()); m_searchCombo->lineEdit()->setSelection(currentText.length(), m_searchCombo->currentText().length() - currentText.length()); } diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index b97f82c..3f032ed 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -42,12 +42,13 @@ class TQTimer; class SearchBarCombo : public KHistoryCombo { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - SearchBarCombo(TQWidget *parent, const char *name); + SearchBarCombo(TQWidget *tqparent, const char *name); /** * Returns the icon currently displayed in the combo box. @@ -106,12 +107,13 @@ class SearchBarCombo : public KHistoryCombo class SearchBarPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: /** Possible search modes */ enum SearchModes { FindInThisPage = 0, UseSearchProvider }; - SearchBarPlugin(TQObject *parent, const char *name, + SearchBarPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~SearchBarPlugin(); diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 5e3b0b3..21dbcaf 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -24,8 +24,8 @@ #include <kglobal.h> #include <klocale.h> -BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) - : KListViewItem( parent ), m_desc( desc ) +BookmarkListItem::BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time ) + : KListViewItem( tqparent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); @@ -53,7 +53,7 @@ TQString BookmarkListItem::text( int column ) const else if ( column == 1 ) return KGlobal::locale()->formatDateTime( m_dateTime ); - return TQString::null; + return TQString(); } KURL BookmarkListItem::url() const diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 5b4c8c7..3e37ea4 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -34,7 +34,7 @@ class TQString; class BookmarkListItem: public KListViewItem { public: - BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); + BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time ); KURL url() const; TQDateTime date() const; TQString desc() const; diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 612be03..929ded4 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -42,8 +42,8 @@ #include <kconfig.h> #include <kinputdialog.h> -MainWidget::MainWidget( KConfig * config, TQWidget * parent ) - : MainWidget_base( parent ), m_config( config ) +MainWidget::MainWidget( KConfig * config, TQWidget * tqparent ) + : MainWidget_base( tqparent ), m_config( config ) { loadTags(); @@ -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':" ).arg( oldName ) ); + TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).tqarg( 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?" ).arg( bookmark->desc() ), + int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).tqarg( bookmark->desc() ), i18n( "Delete Bookmark" ), KStdGuiItem::del() ); if ( result == KMessageBox::Continue ) diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h index 15920cd..e77cfc5 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.h +++ b/konq-plugins/sidebar/delicious/mainWidget.h @@ -38,8 +38,9 @@ class KConfig; class MainWidget: public MainWidget_base { Q_OBJECT + TQ_OBJECT public: - MainWidget( KConfig * config, TQWidget * parent ); + MainWidget( KConfig * config, TQWidget * tqparent ); ~MainWidget(); /** diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index 3ed6c09..23244b7 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -27,10 +27,10 @@ #include <klocale.h> #include <kglobal.h> -KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent, +KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *tqparent, TQWidget *widgetParent, TQString &desktopName_, const char* name ) - : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ), + : KonqSidebarPlugin( instance, tqparent, widgetParent, desktopName_, name ), DCOPObject( "sidebar-delicious" ) { diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index cd9f87a..4e220da 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -40,9 +40,10 @@ class TQString; class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: - KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent, + KonqSidebarDelicious( KInstance * instance, TQObject * tqparent, TQWidget * widgetParent, TQString & desktopName_, const char * name = 0 ); ~KonqSidebarDelicious(); virtual void * provides( const TQString & ); diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp index e7396a6..a8b98cd 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.cpp +++ b/konq-plugins/sidebar/delicious/tagListItem.cpp @@ -21,8 +21,8 @@ #include "tagListItem.h" -TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count ) - : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) +TagListItem::TagListItem( TQListView * tqparent, const TQString & tagName, int count ) + : TQCheckListItem( tqparent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) { } @@ -62,7 +62,7 @@ TQString TagListItem::text( int column ) const else if ( column == 1 ) return TQString::number( m_count ); else - return TQString::null; + return TQString(); } TQString TagListItem::name() const diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h index fe557de..f60e0b4 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.h +++ b/konq-plugins/sidebar/delicious/tagListItem.h @@ -25,11 +25,12 @@ #include <tqobject.h> #include <tqlistview.h> -class TagListItem: public TQObject, public QCheckListItem +class TagListItem: public TQObject, public TQCheckListItem { Q_OBJECT + TQ_OBJECT public: - TagListItem( TQListView * parent, const TQString & tagName, int count = 1 ); + TagListItem( TQListView * tqparent, const TQString & tagName, int count = 1 ); int count() const; TQString name() const; void setName( const TQString & name ); diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui index daccbe9..e7a82af 100644 --- a/konq-plugins/sidebar/delicious/widget.ui +++ b/konq-plugins/sidebar/delicious/widget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MainWidget_base</class> <author>Lukáš Tinkl <lukas@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -17,14 +17,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter3</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRefreshTags</cstring> </property> @@ -46,7 +46,7 @@ <string>Refresh the list of tags</string> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Tag</string> @@ -81,7 +81,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -92,7 +92,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>btnRefreshBookmarks</cstring> </property> @@ -103,7 +103,7 @@ <string>Refresh the list of bookmarks according to the selected tags</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>btnNew</cstring> </property> @@ -158,7 +158,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 6c3be21..63d91ac 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "controls.h" -L33tSlider::L33tSlider(TQWidget * parent, const char * name) : - TQSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : + TQSlider(tqparent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : - TQSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(o,tqparent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, TQWidget * parent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -47,7 +47,7 @@ void L33tSlider::setValue(int i) void L33tSlider::mousePressEvent(TQMouseEvent*e) { - if (e->button()!=RightButton) + if (e->button()!=Qt::RightButton) { pressed=true; TQSlider::mousePressEvent(e); @@ -76,8 +76,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) } SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + const char *member, TQObject* tqparent, const char* name ) + : KAction( text, accel, tqparent, name ) { m_receiver = receiver; m_member = member; @@ -91,7 +91,7 @@ int SliderAction::plug( TQWidget *w, int index ) int id = KAction::getToolButtonID(); //Create it. - m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar); + m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); m_slider->setMinimumWidth(10); toolBar->insertWidget(id, 10, m_slider, index ); @@ -115,12 +115,12 @@ return; /* if (pos == KToolBar::Left || pos == KToolBar::Right) { - m_slider->setOrientation(Vertical); + m_slider->setOrientationQt::Vertical); m_slider->setFixedWidth(m_slider->height()); } else { - m_slider->setOrientation(Horizontal); + m_slider->setOrientationQt::Horizontal); m_slider->resize(m_slider->height(), m_slider->height()); } */ diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index 5f376dd..73a8340 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -38,14 +38,15 @@ class TQLabel; * A slider that can be moved around while being * changed internally **/ -class L33tSlider : public QSlider +class L33tSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * tqparent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, TQWidget * parent, const char * name=0); + Qt::Orientation, TQWidget * tqparent, const char * name=0); bool currentlyPressed() const; signals: @@ -71,9 +72,10 @@ private: class SliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ); + const char *member, TQObject* tqparent, const char* name ); virtual int plug( TQWidget *w, int index = -1 ); virtual void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index e4590b6..8f01888 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -71,8 +71,8 @@ public: KURL file; }; -Engine::Engine(TQObject *parent) - : TQObject(parent) +Engine::Engine(TQObject *tqparent) + : TQObject(tqparent) , d(new EnginePrivate) { } diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index 07e46f1..c1d129f 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -40,12 +40,13 @@ class SoundServerV2; * Does almost everything related to multimedia. * Most interfacing should be done with Player **/ -class Engine : public QObject +class Engine : public TQObject { Q_OBJECT + TQ_OBJECT public: - Engine(TQObject *parent=0); + Engine(TQObject *tqparent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index 2de09af..8ea041f 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,8 +27,8 @@ #include <kdemacros.h> #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): - KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name): + KonqSidebarPlugin(instance,tqparent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); } diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index 0e74248..2213ef2 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -27,8 +27,9 @@ class KSB_MediaWidget; class KonqSidebar_MediaPlayer: public KonqSidebarPlugin { Q_OBJECT + TQ_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); virtual void *provides(const TQString &); void emitStatusBarText (const TQString &); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index ac37e9c..a95ae83 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -32,9 +32,9 @@ #include <tqslider.h> #include <tqtooltip.h> -KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) +KSB_MediaWidget::KSB_MediaWidget(TQWidget *tqparent):KSB_MediaWidget_skel(tqparent) { - player = new Player(this); + player = new Player(TQT_TQOBJECT(this)); empty(); TQFont labelFont = time->font(); @@ -100,7 +100,7 @@ void KSB_MediaWidget::playerTimeout() Position->setRange(0, range); if (needLengthUpdate) { - int counter = player->lengthString().length() - (player->lengthString().find("/")+1); + int counter = player->lengthString().length() - (player->lengthString().tqfind("/")+1); TQString length=player->lengthString().right(counter); needLengthUpdate=false; } diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.h b/konq-plugins/sidebar/mediaplayer/mediawidget.h index 69fa0f2..8e106a8 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.h +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h @@ -24,8 +24,9 @@ class KSB_MediaWidget: public KSB_MediaWidget_skel { Q_OBJECT + TQ_OBJECT public: - KSB_MediaWidget(TQWidget *parent); + KSB_MediaWidget(TQWidget *tqparent); ~KSB_MediaWidget(){;} private: diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui index 8780a72..129f737 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui +++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KSB_MediaWidget_skel</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSB_MediaWidget_skel</cstring> </property> @@ -12,9 +12,9 @@ <height>151</height> </rect> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -26,11 +26,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -52,14 +52,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>Play</cstring> </property> @@ -71,7 +71,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -84,11 +84,11 @@ <pixmap>image0</pixmap> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>Pause</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -101,11 +101,11 @@ <pixmap>image1</pixmap> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>Stop</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -148,7 +148,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -166,9 +166,9 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -190,14 +190,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>time</cstring> </property> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -224,7 +224,7 @@ </spacer> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame4</cstring> </property> @@ -242,9 +242,9 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -266,14 +266,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentFile</cstring> </property> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -336,5 +336,5 @@ <includes> <include location="global" impldecl="in declaration">controls.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui index a88dfde..50d0222 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui +++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KSB_MediaWidget_skel</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSB_MediaWidget_skel</cstring> </property> @@ -12,9 +12,9 @@ <height>151</height> </rect> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -26,11 +26,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -52,14 +52,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>Play</cstring> </property> @@ -71,7 +71,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -84,11 +84,11 @@ <pixmap>image0</pixmap> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>Pause</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -101,11 +101,11 @@ <pixmap>image1</pixmap> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>Stop</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -137,7 +137,7 @@ </spacer> </hbox> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>Position</cstring> </property> @@ -148,7 +148,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -166,9 +166,9 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -190,14 +190,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>time</cstring> </property> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -224,7 +224,7 @@ </spacer> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame4</cstring> </property> @@ -242,9 +242,9 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -266,14 +266,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentFile</cstring> </property> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -336,5 +336,5 @@ <includes> <include location="global" impldecl="in declaration">controls.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 741a6b6..c11b2b0 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "engine.h" #include "player.h" -Player::Player(TQObject *parent) - : TQObject(parent) +Player::Player(TQObject *tqparent) + : TQObject(tqparent) , position(0) , unfinished(false) { diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index c262ab6..c0a9159 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -33,13 +33,14 @@ class Engine; /** * This class has slots for all the common media player buttons **/ -class Player : public QObject +class Player : public TQObject { Q_OBJECT + TQ_OBJECT friend class KaboodlePart; public: - Player(TQObject *parent = 0); + Player(TQObject *tqparent = 0); ~Player(); /** diff --git a/konq-plugins/sidebar/metabar/Doxyfile b/konq-plugins/sidebar/metabar/Doxyfile index 323c79e..4dfd560 100644 --- a/konq-plugins/sidebar/metabar/Doxyfile +++ b/konq-plugins/sidebar/metabar/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - contains \ + tqcontains \ represents \ a \ an \ @@ -124,7 +124,7 @@ FILE_PATTERNS = *.c \ *.tlh \ *.diff \ *.patch \ - *.moc \ + *.tqmoc \ *.xpm \ *.dox RECURSIVE = yes diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 3d4850f..ebcf170 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -56,9 +56,9 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const setText(text); } -ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) +ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqparent, name) { - topWidgetName = parent->topLevelWidget()->name(); + topWidgetName = tqparent->tqtopLevelWidget()->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->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + entries_group->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + appearance_group->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + theme_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); themes = new KComboBox(theme_group); - themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); - install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + install_theme->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + link_list->tqsetSizePolicy(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")); - //layout + //tqlayout TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5); general_layout->addWidget(entries_group, 0, 0); general_layout->addWidget(appearance_group, 0, 1); @@ -222,7 +222,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network")); - TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch); if(avItem){ delete avItem; } @@ -236,7 +236,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon)); - TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch); if(avItem){ delete avItem; } @@ -320,7 +320,7 @@ void ConfigDialog::createLink() TQLineEdit *url = new TQLineEdit("file:/", main); KIconButton *icon = new KIconButton(main); - icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + icon->tqsetSizePolicy(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 *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); + 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); TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); - main_layout->addLayout(layout); + main_layout->addLayout(tqlayout); main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); - main->resize(300, main->sizeHint().height()); + main->resize(300, main->tqsizeHint().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->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + icon->tqsetSizePolicy(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 *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); + 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); TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); - main_layout->addLayout(layout); + main_layout->addLayout(tqlayout); main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); - main->resize(300, main->sizeHint().height()); + main->resize(300, main->tqsizeHint().height()); if(main->exec() == TQDialog::Accepted){ TQString name_str = name->text(); @@ -576,7 +576,7 @@ void ConfigDialog::loadThemes() theme_list.remove(".."); themes->insertStringList(theme_list); - if(theme_list.find(theme) != theme_list.end()){ + if(theme_list.tqfind(theme) != theme_list.end()){ foundTheme = true; } } diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 94f5fee..8417d15 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -42,12 +42,13 @@ class LinkEntry{ TQString icon; }; -class ConfigDialog : public QDialog +class ConfigDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - ConfigDialog(TQWidget *parent = 0, const char *name = 0); + ConfigDialog(TQWidget *tqparent = 0, const char *name = 0); ~ConfigDialog(); protected: @@ -98,7 +99,7 @@ class ConfigDialog : public QDialog void loadThemes(); }; -class ActionListItem : public QListBoxPixmap +class ActionListItem : public TQListBoxPixmap { public: ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 6c3982e..5839a64 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -99,19 +99,19 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node) for(TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ if((*it).startsWith("metabar/")){ if((*it).right((*it).length() - 8) == "share"){ - MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", TQString(), actionCount < maxActions ? TQString() : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } else{ - DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8())); if(!action.isNull()){ if(action.call("enabled()")){ TQString text = action.call("plainText()"); TQString icon = iconConfig.readEntry(*it, action.call("icon()")); - MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, TQString(), actionCount < maxActions ? TQString() : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } @@ -156,7 +156,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KDesktopFile desktop(url.path(), TRUE); if(desktop.hasApplicationType ()){ - MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon()); + MetabarWidget::addEntry(innerHTML, i18n("Run %1").tqarg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon()); m_functions->show("open"); } @@ -184,7 +184,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) nam.setNum(id); bool hide = id >= max; - MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), TQString::null, hide ? TQString("hiddenapp") : TQString::null, hide); + MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), TQString(), hide ? TQString("hiddenapp") : TQString(), hide); runMap.insert(id, *it); id++; @@ -294,11 +294,11 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node) innerHTML += "<ul class=\"info\"><b>" + i18n("Size") + ": </b>"; innerHTML += KIO::convertSize(size); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Files") + ": </b>"; - innerHTML += TQString().setNum(files); + innerHTML += TQString(TQString().setNum(files)); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>"; - innerHTML += TQString().setNum(dirs); + innerHTML += TQString(TQString().setNum(dirs)); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Total Entries") + ": </b>"; - innerHTML += TQString().setNum(m_items.count()); + innerHTML += TQString(TQString().setNum(m_items.count())); innerHTML += "</ul>"; node.setInnerHTML(innerHTML); } @@ -364,12 +364,12 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix) buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); bool media = item->mimetype().startsWith("video/"); DOM::DOMString innerHTML; - innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15); + innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").tqarg(pix.height() + 15); if(media){ innerHTML += " href=\"preview:///\""; @@ -377,9 +377,9 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix) innerHTML +="><img id=\"previewimage\" src=\""; innerHTML += src; innerHTML += "\" width=\""; - innerHTML += TQString().setNum(pix.width()); + innerHTML += TQString(TQString().setNum(pix.width())); innerHTML += "\" height=\""; - innerHTML += TQString().setNum(pix.height()); + innerHTML += TQString(TQString().setNum(pix.height())); innerHTML += "\" /></a></ul>"; if(media){ @@ -418,7 +418,7 @@ bool DefaultPlugin::handleRequest(const KURL &url) if(protocol == "exec"){ int id = url.host().toInt(); - TQMap<int,KService::Ptr>::Iterator it = runMap.find(id); + TQMap<int,KService::Ptr>::Iterator it = runMap.tqfind(id); if(it != runMap.end()){ KFileItem *item = m_items.getFirst(); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h index 319d771..7705728 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.h +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h @@ -32,6 +32,7 @@ class DefaultPlugin : public ProtocolPlugin { Q_OBJECT + TQ_OBJECT public: DefaultPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index bbfb9e2..b90852d 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -60,10 +60,10 @@ void HTTPPlugin::killJobs() void HTTPPlugin::loadInformation(DOM::HTMLElement node) { /*DOM::DOMString innerHTML; - innerHTML += "<form action=\"find:///\" method=\"GET\">"; + innerHTML += "<form action=\"tqfind:///\" method=\"GET\">"; innerHTML += "<ul>"; innerHTML += i18n("Keyword"); - innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"find\" id=\"find_text\" value=\""; + innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"tqfind\" id=\"find_text\" value=\""; innerHTML += i18n("Web search"); innerHTML += "\"></ul>"; innerHTML += "<ul><input type=\"submit\" id=\"find_button\" value=\""; @@ -99,15 +99,15 @@ void HTTPPlugin::loadBookmarks(DOM::HTMLElement node) bool HTTPPlugin::handleRequest(const KURL &url) { - if(url.protocol() == "find"){ - TQString keyword = url.queryItem("find"); + if(url.protocol() == "tqfind"){ + TQString keyword = url.queryItem("tqfind"); TQString type = url.queryItem("type"); if(!keyword.isNull() && !keyword.isEmpty()){ KURL url("http://www.google.com/search"); url.addQueryItem("q", keyword); - DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->tqtopLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url.url()); } diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.h b/konq-plugins/sidebar/metabar/src/httpplugin.h index 0d7d3ab..a654816 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.h +++ b/konq-plugins/sidebar/metabar/src/httpplugin.h @@ -31,6 +31,7 @@ class HTTPPlugin : public ProtocolPlugin { Q_OBJECT + TQ_OBJECT public: HTTPPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 6a020f0..bc7d978 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -7,8 +7,8 @@ #include "metabar.h" #include "metabar.moc" -Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) +Metabar::Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) { KImageIO::registerFormats(); KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index d4bb63f..bb2387b 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -13,9 +13,10 @@ class Metabar : public KonqSidebarPlugin { Q_OBJECT + TQ_OBJECT public: - Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~Metabar(); virtual TQWidget *getWidget(){ return widget; } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index 1aaf9e8..d184f58 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -32,7 +32,7 @@ #define RESIZE_SPEED 5 #define RESIZE_STEP 2 -MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) +MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *tqparent, const char* name) : TQObject(tqparent, name), m_html(html) { timer = new TQTimer(this); connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); @@ -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 children = node.childNodes(); + DOM::NodeList tqchildren = 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").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").tqarg(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 children = node.childNodes(); + DOM::NodeList tqchildren = 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").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY); } } } @@ -176,7 +176,7 @@ void MetabarFunctions::animate() } int change = currentHeight < height ? changeValue : -changeValue; - style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY); doc.updateRendering(); } } @@ -187,9 +187,9 @@ void MetabarFunctions::show(DOM::DOMString item) DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item)); if(!node.isNull()){ - DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode()); + DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode()); - DOM::CSSStyleDeclaration style = parent.style(); + DOM::CSSStyleDeclaration style = tqparent.style(); style.setProperty("display", "block", CSS_PRIORITY); } } @@ -199,9 +199,9 @@ void MetabarFunctions::hide(DOM::DOMString item) DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item)); if(!node.isNull()){ - DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode()); + DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode()); - DOM::CSSStyleDeclaration style = parent.style(); + DOM::CSSStyleDeclaration style = tqparent.style(); style.setProperty("display", "none", CSS_PRIORITY); } } @@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item) int MetabarFunctions::getHeight(DOM::HTMLElement &element) { int height = 0; - DOM::NodeList children = element.childNodes(); - for(uint i = 0; i < children.length(); i++){ - DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i)); + DOM::NodeList tqchildren = element.childNodes(); + for(uint i = 0; i < tqchildren.length(); i++){ + DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i)); DOM::CSSStyleDeclaration style = node.style(); DOM::DOMString css_height = style.getPropertyValue("height"); diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index 1ccce3c..96742e5 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -29,12 +29,13 @@ #include <kurl.h> #include <khtml_part.h> -class MetabarFunctions : public QObject +class MetabarFunctions : public TQObject { Q_OBJECT + TQ_OBJECT public: - MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0); + MetabarFunctions(KHTMLPart *html, TQObject *tqparent = 0, const char* name=0); ~MetabarFunctions(); void toggle(DOM::DOMString item); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index bf074e8..965319e 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -73,7 +73,7 @@ #define EVENT_TYPE DOM::DOMString("click") #define ACTIVATION 1 -MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) +MetabarWidget::MetabarWidget(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) { skip = false; loadComplete = false; @@ -94,14 +94,14 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare html->setCaretVisible(false); html->setDNDEnabled(false); html->setJavaEnabled(false); - html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + html->view()->tqsetSizePolicy(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 &))); connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted())); connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &))); - functions = new MetabarFunctions(html, this); + functions = new MetabarFunctions(html, TQT_TQOBJECT(this)); currentPlugin = 0; defaultPlugin = new DefaultPlugin(html, functions); @@ -114,14 +114,14 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare plugins.insert("http", httpPlugin); plugins.insert("https", httpPlugin); - TQVBoxLayout *layout = new TQVBoxLayout(this); - layout->addWidget(html->view()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + tqlayout->addWidget(html->view()); popup = new KPopupMenu(0); - KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); + KAction *configAction = new KAction(i18n("Configure %1...").tqarg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload"); + KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); @@ -210,12 +210,12 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) TQString MetabarWidget::getCurrentURL() { - DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name()); DCOPReply reply = ref.call("currentURL()"); if (reply.isValid()) { TQString url; - reply.get(url, "TQString"); + reply.get(url, TQSTRING_OBJECT_NAME_STRING); if(!url.isNull() && !url.isEmpty()){ return url; @@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL() void MetabarWidget::openURL(const TQString &url) { - DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url); } void MetabarWidget::openTab(const TQString &url) { - DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name()); DCOPReply reply = ref.call("newTab", url); } void MetabarWidget::callAction(const TQString &action) { - DCOPRef ref(kapp->dcopClient()->appId(), TQString(this->topLevelWidget()->name()).append("/action/").append(action).utf8()); + DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->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);").arg(url); + TQString style = TQString("background-image: url(%1);").tqarg(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").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/default.css").tqarg(config->readEntry("Theme", "default"))); if(file.isNull()){ file = locate("data", TQString("metabar/themes/default/default.css")); } @@ -319,7 +319,7 @@ void MetabarWidget::loadCompleted() TQString tmp = stream.read(); cssfile.close(); - tmp.replace("./", KURL::fromPathOrURL(file).directory(false)); + tmp.tqreplace("./", KURL::fromPathOrURL(file).directory(false)); html->setUserStyleSheet(tmp); } @@ -393,15 +393,15 @@ 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\">").arg(image.width(), image.height()); + innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").tqarg(image.width(), image.height()); innerHTML += "<object class=\"preview\" type=\""; innerHTML += item->mimetype(); innerHTML += "\" data=\""; innerHTML += item->url().url(); innerHTML += "\" width=\""; - innerHTML += TQString().setNum(image.width()); + innerHTML += TQString(TQString().setNum(image.width())); innerHTML += "\" height=\""; - innerHTML += TQString().setNum(image.height()); + innerHTML += TQString(TQString().setNum(image.height())); innerHTML += "\" /></ul>"; node.setInnerHTML(innerHTML); } @@ -419,8 +419,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg for(uint i = 0; i < list.length(); i++){ DOM::HTMLElement node = static_cast<DOM::HTMLElement>(list.item(i)); if(!node.isNull()){ - DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode()); - DOM::CSSStyleDeclaration style = parent.style(); + DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode()); + DOM::CSSStyleDeclaration style = tqparent.style(); DOM::DOMString display = style.getPropertyValue("display"); DOM::DOMString newDisplay = display == "none" ? "block" : "none"; @@ -431,13 +431,13 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } if(element.id().string().startsWith("hidden")){ - TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow")); + TQString style = TQString("background-image: url(%1);").tqarg(getIconPath(showMore ? "1downarrow" : "1uparrow")); element.setInnerText( showMore ? i18n("More") : i18n("Less") ); element.setAttribute("style", style); } - DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode()); - functions->adjustSize(parent.id()); + DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode()); + functions->adjustSize(tqparent.id()); } else if(protocol == "function"){ @@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name) buffer.open(IO_WriteOnly); icon.save(&buffer, "PNG"); - return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(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/layout.html").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").tqarg(config->readEntry("Theme", "default"))); html->openURL(KURL(file)); } diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index e88a003..4f6d21b 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -35,18 +35,19 @@ #include "protocolplugin.h" #include "metabarfunctions.h" -class MetabarWidget : public QWidget +class MetabarWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - MetabarWidget(TQWidget *parent = 0, const char* name=0); + MetabarWidget(TQWidget *tqparent = 0, const char* name=0); ~MetabarWidget(); void setFileItems(const KFileItemList &items, bool check = true); static TQString getIconPath(const TQString &name); - static void addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id = TQString::null, const TQString nameatt = TQString::null, bool hidden = false); + static void addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id = TQString(), const TQString nameatt = TQString(), bool hidden = false); private: KFileItemList *currentItems; diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index 99f5b31..333aab5 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::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString icondata = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(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").arg(m_items.count())); + name.setInnerText(i18n("%1 Elements").tqarg(m_items.count())); } } @@ -105,7 +105,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) } } - type.setInnerText(i18n("%1 Folders, %2 Files").arg(dirs).arg(files)); + type.setInnerText(i18n("%1 Folders, %2 Files").tqarg(dirs).tqarg(files)); } diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h index 7fb76b3..81ed149 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.h +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h @@ -28,8 +28,9 @@ #include "metabarfunctions.h" -class ProtocolPlugin : public QObject{ +class ProtocolPlugin : public TQObject{ Q_OBJECT + TQ_OBJECT public: static ProtocolPlugin* activePlugin; diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.h b/konq-plugins/sidebar/metabar/src/remoteplugin.h index dc42bed..61a1b00 100644 --- a/konq-plugins/sidebar/metabar/src/remoteplugin.h +++ b/konq-plugins/sidebar/metabar/src/remoteplugin.h @@ -26,6 +26,7 @@ class RemotePlugin : public DefaultPlugin { Q_OBJECT + TQ_OBJECT public: RemotePlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 1b59527..c9ac8b4 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -37,7 +37,7 @@ #include <kstandarddirs.h> -ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name) +ServiceLoader::ServiceLoader(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) { popups.setAutoDelete(true); } @@ -52,7 +52,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int KURL url = item.url(); TQString mimeType = item.mimetype(); - TQString mimeGroup = mimeType.left(mimeType.find('/')); + TQString mimeGroup = mimeType.left(mimeType.tqfind('/')); urlList.clear(); urlList.append(url); @@ -96,7 +96,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int if(cfg.hasKey("X-KDE-Require")){ const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); - if (capabilities.contains( "Write" )){ + if (capabilities.tqcontains( "Write" )){ continue; } } @@ -123,7 +123,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int // if we have a mimetype, see if we have an exact or a type globbed match if(!ok && (!mimeType.isEmpty() && *it == mimeType) || - (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).find('/')) == mimeGroup))) + (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).tqfind('/')) == mimeGroup))) { checkTheMimetypes = true; } @@ -132,7 +132,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int ok = true; for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ - if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) || + if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) || ((*itex) == mimeType)) { ok = false; @@ -154,7 +154,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int popup = popups[submenuName]; } else{ - MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions); popup = new KPopupMenu(); popups.insert(idString, popup); @@ -168,11 +168,11 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8()); + KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8()); action->plug(popup); } else{ - MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, TQString::null, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, TQString(), count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions); count++; } @@ -188,7 +188,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int void ServiceLoader::runAction() { - KDEDesktopMimeType::Service s = services[sender()->name()]; + KDEDesktopMimeType::Service s = services[TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()]; if(!s.isEmpty()){ KDEDesktopMimeType::executeService(urlList, s); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index 527ea97..31f1366 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -35,12 +35,13 @@ #include "metabarwidget.h" -class ServiceLoader : public QObject +class ServiceLoader : public TQObject { Q_OBJECT + TQ_OBJECT public: - ServiceLoader(TQWidget *parent, const char *name = 0); + ServiceLoader(TQWidget *tqparent, const char *name = 0); ~ServiceLoader(); void loadServices(const KFileItem item, DOM::DOMString &html, int &count); diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h index c1d1cb8..9581e1e 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.h +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h @@ -29,6 +29,7 @@ class SettingsPlugin : public ProtocolPlugin { Q_OBJECT + TQ_OBJECT public: SettingsPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp index dd038b6..5fbc533 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.cpp +++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp @@ -29,7 +29,7 @@ namespace KSB_News { -ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name) +ConfigFeeds::ConfigFeeds(TQWidget* tqparent, const char* name) : ConfigFeedsBase(tqparent, name) { } diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h index 127ba27..5ca80a7 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.h +++ b/konq-plugins/sidebar/newsticker/configfeeds.h @@ -41,9 +41,10 @@ namespace KSB_News { class ConfigFeeds : public ConfigFeedsBase { Q_OBJECT + TQ_OBJECT public: - ConfigFeeds(TQWidget* parent, const char* name = 0); + ConfigFeeds(TQWidget* tqparent, const char* name = 0); }; diff --git a/konq-plugins/sidebar/newsticker/configfeedsbase.ui b/konq-plugins/sidebar/newsticker/configfeedsbase.ui index 8389747..594e72b 100644 --- a/konq-plugins/sidebar/newsticker/configfeedsbase.ui +++ b/konq-plugins/sidebar/newsticker/configfeedsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigFeedsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigFeedsBase</cstring> </property> @@ -18,7 +18,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="0"/> +<tqlayoutdefaults spacing="6" margin="0"/> <includehints> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index db793bd..35ee14d 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -37,17 +37,17 @@ namespace KSB_News { - NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name) - : TQWidget(parent, name) { + NoRSSWidget::NoRSSWidget(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { TQVBoxLayout *topLayout = new TQVBoxLayout(this); topLayout->addStretch(); KPushButton *btn = new KPushButton(i18n("&Configure"), this); - btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked())); - topLayout->addWidget(btn, 0, Qt::AlignHCenter); + topLayout->addWidget(btn, 0, TQt::AlignHCenter); topLayout->addStretch(); } diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h index 91a8c61..70ee265 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.h +++ b/konq-plugins/sidebar/newsticker/norsswidget.h @@ -33,9 +33,10 @@ namespace KSB_News { class NoRSSWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - NoRSSWidget(TQWidget *parent = 0, const char *name = 0); + NoRSSWidget(TQWidget *tqparent = 0, const char *name = 0); private slots: void slotBtnClicked(); diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index a5c1261..e58d0c4 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -35,8 +35,8 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) - : KListBox(parent, name, f), + TTListBox::TTListBox(TQWidget *tqparent, const char *name, WFlags f) + : KListBox(tqparent, name, f), TQToolTip(this) { } @@ -54,16 +54,16 @@ namespace KSB_News { int textWidth = fm.width(text); int widgetSpace = visibleWidth(); if ((textWidth > widgetSpace) || (contentsX() > 0)) - tip(itemRect(item), text); + tip(tqitemRect(item), text); } } } - NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key, + NSPanel::NSPanel(TQObject *tqparent, const char *name, const TQString &key, DCOPRef *rssservice) - :TQObject(parent, name) + :TQObject(tqparent, name) ,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1()) ,m_listbox() ,m_pixmap() diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index d46be5b..01cf1e2 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -44,7 +44,7 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// class TTListBox : public KListBox, TQToolTip { public: - TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + TTListBox (TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); void clear(); protected: @@ -55,10 +55,11 @@ namespace KSB_News { class NSPanel : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: - NSPanel(TQObject *parent, const char *name, const TQString &key, + NSPanel(TQObject *tqparent, const char *name, const TQString &key, DCOPRef *rssservice); ~NSPanel(); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 6c7e44b..9c29b7c 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -50,10 +50,10 @@ namespace KSB_News { - NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name, - TQPixmap appIcon) : TQWidget(parent, name) { + NSStackTabWidget::NSStackTabWidget(TQWidget *tqparent, const char *name, + TQPixmap appIcon) : TQWidget(tqparent, name) { currentPage = 0; - layout = new TQVBoxLayout(this); + tqlayout = 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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + button->tqsetSizePolicy(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); - layout->addWidget(button); - layout->addWidget(sv); + tqlayout->addWidget(button); + tqlayout->addWidget(sv); button->show(); if (pages.count() == 1) { currentPage = sv; @@ -161,7 +161,7 @@ namespace KSB_News { void NSStackTabWidget::updateTitle(NSPanel *nsp) { - TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp); if (! pb->pixmap()) pb->setText(nsp->title()); } @@ -169,11 +169,11 @@ namespace KSB_News { void NSStackTabWidget::updatePixmap(NSPanel *nsp) { - TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp); TQPixmap pixmap = nsp->pixmap(); if ((pixmap.width() > 88) || (pixmap.height() > 31)) { TQImage image = pixmap.convertToImage(); - pixmap.convertFromImage(image.smoothScale(88, 31, TQImage::ScaleMin)); + pixmap.convertFromImage(image.smoothScale(88, 31, TQ_ScaleMin)); } pb->setPixmap(pixmap); } @@ -197,7 +197,7 @@ namespace KSB_News { return; // Find current ScrollView - TQWidget *sv = pages.find(nsp); + TQWidget *sv = pages.tqfind(nsp); // Change visible page if (currentPage != sv) { @@ -213,7 +213,7 @@ namespace KSB_News { bool NSStackTabWidget::eventFilter(TQObject *obj, TQEvent *ev) { if (ev->type() == TQEvent::MouseButtonPress - && ((TQMouseEvent *)ev)->button() == TQMouseEvent::RightButton) { + && ((TQMouseEvent *)ev)->button() == Qt::RightButton) { m_last_button_rightclicked = (TQPushButton *)obj; popup->exec(TQCursor::pos()); return true; @@ -352,7 +352,7 @@ namespace KSB_News { bool NSStackTabWidget::isRegistered(const TQString &key) { m_our_rsssources = SidebarSettings::sources(); - if (m_our_rsssources.findIndex(key) == -1) + if (m_our_rsssources.tqfindIndex(key) == -1) return false; else return true; diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index cf001a0..49650e7 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -47,9 +47,10 @@ namespace KSB_News { class NSStackTabWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - NSStackTabWidget(TQWidget *parent = 0, const char *name = 0, + NSStackTabWidget(TQWidget *tqparent = 0, const char *name = 0, TQPixmap appIcon = TQPixmap()); void addStackTab(NSPanel *nsp, TQWidget *page); void delStackTab(NSPanel *nsp); @@ -73,7 +74,7 @@ namespace KSB_News { private: TQPtrDict<TQWidget> pages; TQPtrDict<TQWidget> pagesheader; - TQVBoxLayout *layout; + TQVBoxLayout *tqlayout; TQWidget *currentPage; KPopupMenu *popup, *helpmenu; KAboutData *m_aboutdata; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index ae9c51b..97f24e3 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -46,15 +46,15 @@ namespace KSB_News { - KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, + KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *tqparent, TQWidget *widgetParent, TQString &desktopName, const char* name) - : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), + : KonqSidebarPlugin(inst, tqparent, widgetParent, desktopName, name), DCOPObject("sidebar-newsticker") { // get the application icon // FIXME: as konqueror knows the icon there might be a possibility to - // access the already present QPixmap + // access the already present TQPixmap KDesktopFile desktopFile(desktopName, true); TQString iconName = desktopFile.readIcon(); KIconLoader iconLoader; @@ -191,7 +191,7 @@ namespace KSB_News { if (NSPanel *nsp = getNSPanelByKey(key)) { newswidget->delStackTab(nsp); - delete nspanelptrlist.take(nspanelptrlist.findRef(nsp)); + delete nspanelptrlist.take(nspanelptrlist.tqfindRef(nsp)); } else kdWarning() << "removedSource called for non-existing id" << endl; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index b40dcab..1c92c0e 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -44,10 +44,11 @@ namespace KSB_News { class KonqSidebar_News : public KonqSidebarPlugin, DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: - KonqSidebar_News(KInstance *instance, TQObject *parent, + KonqSidebar_News(KInstance *instance, TQObject *tqparent, TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_News(); diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index b6ad880..fb5d840 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -47,12 +47,12 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL1(x) TQString::fromLatin1(x) +#define TQFL1(x) TQString::tqfromLatin1(x) -UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, +UAChangerPlugin::UAChangerPlugin( TQObject* tqparent, const char* name, const TQStringList & ) - :KParts::Plugin( parent, name ), + :KParts::Plugin( tqparent, name ), m_bSettingsLoaded(false), m_part(0L), m_config(0L) { setInstance(UAChangerPlugin::instance()); @@ -65,9 +65,9 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, m_pUAMenu->setEnabled ( false ); - if ( parent && parent->inherits( "KHTMLPart" ) ) + if ( tqparent && tqparent->inherits( "KHTMLPart" ) ) { - m_part = static_cast<KHTMLPart*>(parent); + m_part = static_cast<KHTMLPart*>(tqparent); connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(slotStarted(KIO::Job*)) ); } @@ -101,13 +101,13 @@ void UAChangerPlugin::parseDescFiles() TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.find(QFL1("C")); + TQStringList::Iterator it = languageList.tqfind(TQFL1("C")); if( it != languageList.end() ) { - if( languageList.contains( QFL1("en") ) > 0 ) + if( languageList.tqcontains( TQFL1("en") ) > 0 ) languageList.remove( it ); else - (*it) = QFL1("en"); + (*it) = TQFL1("en"); } } @@ -124,32 +124,32 @@ void UAChangerPlugin::parseDescFiles() if ( (*it)->property("X-KDE-UA-DYNAMIC-ENTRY").toBool() ) { - tmp.replace( QFL1("appSysName"), QFL1(utsn.sysname) ); - tmp.replace( QFL1("appSysRelease"), QFL1(utsn.release) ); - tmp.replace( QFL1("appMachineType"), QFL1(utsn.machine) ); - tmp.replace( QFL1("appLanguage"), languageList.join(QFL1(", ")) ); - tmp.replace( QFL1("appPlatform"), QFL1("X11") ); + tmp.tqreplace( TQFL1("appSysName"), TQFL1(utsn.sysname) ); + tmp.tqreplace( TQFL1("appSysRelease"), TQFL1(utsn.release) ); + tmp.tqreplace( TQFL1("appMachineType"), TQFL1(utsn.machine) ); + tmp.tqreplace( TQFL1("appLanguage"), languageList.join(TQFL1(", ")) ); + tmp.tqreplace( TQFL1("appPlatform"), TQFL1("X11") ); } - if ( m_lstIdentity.contains(tmp) ) + if ( m_lstIdentity.tqcontains(tmp) ) continue; // Ignore dups! m_lstIdentity << tmp; - tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE")); + tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-SYSNAME")).tqarg(UA_PTOS("X-KDE-UA-SYSRELEASE")); if ( tmp.stripWhiteSpace().isEmpty() ) { if(tag == "NN" || tag == "IE" || tag == "MOZ") - tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION")); + tmp = i18n("Version %1").tqarg(UA_PTOS("X-KDE-UA-VERSION")); else - tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")); + tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")); } else { if(tag == "NN" || tag == "IE" || tag == "MOZ") - tmp = i18n("Version %1 on %2").arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp); + tmp = i18n("Version %1 on %2").tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp); else - tmp = i18n("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp); + tmp = i18n("%1 %2 on %3").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp); } m_lstAlias << tmp; @@ -161,7 +161,7 @@ void UAChangerPlugin::parseDescFiles() { if ( m_lstAlias[(*e)] > tmp ) { ualist.insert( e, m_lstAlias.count()-1 ); - tmp = TQString::null; + tmp = TQString(); } ++e; } @@ -212,7 +212,7 @@ void UAChangerPlugin::slotAboutToShow() m_pUAMenu->popupMenu()->clear(); m_pUAMenu->popupMenu()->insertTitle(i18n("Identify As")); // imho title doesn't need colon.. - TQString host = m_currentURL.isLocalFile() ? QFL1("localhost") : m_currentURL.host(); + TQString host = m_currentURL.isLocalFile() ? TQFL1("localhost") : m_currentURL.host(); m_currentUserAgent = KProtocolManager::userAgentForHost(host); //kdDebug(90130) << "User Agent: " << m_currentUserAgent << endl; @@ -267,7 +267,7 @@ void UAChangerPlugin::slotItemSelected( int id ) TQString host; m_currentUserAgent = m_lstIdentity[id]; - host = m_currentURL.isLocalFile() ? QFL1("localhost") : filterHost( m_currentURL.host() ); + host = m_currentURL.isLocalFile() ? TQFL1("localhost") : filterHost( m_currentURL.host() ); m_config->setGroup( host.lower() ); m_config->writeEntry( "UserAgent", m_currentUserAgent ); @@ -304,7 +304,7 @@ void UAChangerPlugin::slotDefault() if (partList.count() == 1) break; - domains << partList.join(QFL1(".")); + domains << partList.join(TQFL1(".")); partList.remove(partList.begin()); } @@ -336,7 +336,7 @@ void UAChangerPlugin::slotDefault() void UAChangerPlugin::updateIOSlaves () { // Inform running http(s) io-slaves about the change... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString())) kdWarning() << "UAChangerPlugin::updateIOSlaves: Unable to update running application!" << endl; } @@ -379,7 +379,7 @@ TQString UAChangerPlugin::findTLD (const TQString &hostname) // it should be <surname>.name since people should not be able // to set cookies for everyone with the same surname. // Matches <surname>.name - if( partList[1].lower() == QFL1("name") ) + if( partList[1].lower() == TQFL1("name") ) { break; } @@ -399,7 +399,7 @@ TQString UAChangerPlugin::findTLD (const TQString &hostname) } } - domains.append(partList.join(QFL1("."))); + domains.append(partList.join(TQFL1("."))); partList.remove(partList.begin()); // Remove part } diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h index 7732574..ef5abd4 100644 --- a/konq-plugins/uachanger/uachangerplugin.h +++ b/konq-plugins/uachanger/uachangerplugin.h @@ -41,9 +41,10 @@ namespace KIO class UAChangerPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - UAChangerPlugin( TQObject* parent, const char* name, + UAChangerPlugin( TQObject* tqparent, const char* name, const TQStringList & ); ~UAChangerPlugin(); diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index f669308..3ee1f91 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -44,9 +44,9 @@ static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Pa K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin, PluginValidatorsFactory( &aboutdata ) ) -PluginValidators::PluginValidators( TQObject* parent, const char* name, +PluginValidators::PluginValidators( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( parent, name ), m_configDialog(0), m_part(0) + : Plugin( tqparent, name ), m_configDialog(0), m_part(0) { setInstance(PluginValidatorsFactory::instance()); @@ -71,14 +71,14 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, m_menu->setEnabled( false ); - if ( parent && parent->inherits( "KHTMLPart" )) + if ( tqparent && tqparent->inherits( "KHTMLPart" )) { m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), "configure", 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "configure") ); - m_part = static_cast<KHTMLPart *>( parent ); + m_part = static_cast<KHTMLPart *>( tqparent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); @@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, PluginValidators::~PluginValidators() { delete m_configDialog; -// Dont' delete the action. KActionCollection as parent does the job already +// Dont' delete the action. KActionCollection as tqparent does the job already // and not deleting it at this point also ensures that in case we are not unplugged // from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a // dead pointer. The kxmlgui factory keeps references to the actions, but it does not @@ -140,8 +140,8 @@ void PluginValidators::slotConfigure() void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) { - // The parent is assumed to be a KHTMLPart - if ( !parent()->inherits("KHTMLPart") ) + // The tqparent is assumed to be a KHTMLPart + if ( !tqparent()->inherits("KHTMLPart") ) { TQString title = i18n( "Cannot Validate Source" ); TQString text = i18n( "You cannot validate anything except web pages with " @@ -181,10 +181,10 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) { KMessageBox::sorry( m_part->widget(), - i18n("<qt>The selected URL cannot be verified because it contains " + i18n("<qt>The selected URL cannot be verified because it tqcontains " "a password. Sending this URL to <b>%1</b> would put the security " "of <b>%2</b> at risk.</qt>") - .arg(validatorUrl.host()).arg(partUrl.host())); + .tqarg(validatorUrl.host()).tqarg(partUrl.host())); return; } // Set entered URL as a parameter diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h index 2363ddb..6743d99 100644 --- a/konq-plugins/validators/plugin_validators.h +++ b/konq-plugins/validators/plugin_validators.h @@ -41,8 +41,9 @@ class KURL; class PluginValidators : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - PluginValidators( TQObject* parent, const char* name, + PluginValidators( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~PluginValidators(); diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp index 864de55..bd0e4d9 100644 --- a/konq-plugins/validators/validatorsdialog.cpp +++ b/konq-plugins/validators/validatorsdialog.cpp @@ -29,8 +29,8 @@ #include "validatorsdialog.h" #include "validatorsdialog.moc" -ValidatorsDialog::ValidatorsDialog(TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) +ValidatorsDialog::ValidatorsDialog(TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) { setCaption(i18n("Configure Validating Servers")); setMinimumWidth(300); diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h index 4fe9714..345323a 100644 --- a/konq-plugins/validators/validatorsdialog.h +++ b/konq-plugins/validators/validatorsdialog.h @@ -28,9 +28,10 @@ class ValidatorsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ValidatorsDialog(TQWidget *parent=0, const char *name=0 ); + ValidatorsDialog(TQWidget *tqparent=0, const char *name=0 ); ~ValidatorsDialog(); const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index a28da2c..77ca40d 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -49,9 +49,9 @@ #define CONTENT_TYPE "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" -ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename, +ArchiveDialog::ArchiveDialog(TQWidget *tqparent, const TQString &filename, KHTMLPart *part) : - KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"), + KDialogBase(tqparent, "WebArchiveDialog", false, i18n("Web Archiver"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ), m_bPreserveWS(false), m_tmpFile(0), m_url(part->url()) { @@ -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." ).arg(m_tarBall->fileName()); + const TQString text = i18n( "Unable to open \n %1 \n for writing." ).tqarg(m_tarBall->fileName()); KMessageBox::sorry( 0L, text, title ); } } @@ -144,7 +144,7 @@ void ArchiveDialog::setSavingState() TQString fileName="index.html"; TQFile file(tmpFile.name()); file.open(IO_ReadOnly); - m_tarBall->writeFile(fileName, TQString::null, TQString::null, file.size(), file.readAll()); + m_tarBall->writeFile(fileName, TQString(), TQString(), file.size(), file.readAll()); #ifdef DEBUG_WAR kdDebug(90110) << "HTML-file written: " << fileName << endl; #endif @@ -207,7 +207,7 @@ static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName) } catch (...) { - // No children, stop recursion here + // No tqchildren, stop recursion here child = DOM::Node(); } @@ -237,12 +237,12 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas /* Don't save khtml internal tags '-konq..' * Approximating it with <DIV> */ - text += "<DIV> <!-- -KONQ_BLOCK -->"; + text += "<DIV> <!-- -KONTQ_BLOCK -->"; } else if (nodeName == "BASE") { /* Skip BASE, everything is relative to index.html * Saving SCRIPT but they can cause trouble! */ - } else if ((nodeName == "META") && hasAttribute(pNode, "HTTP-EQUIV", "CONTENT-TYPE")) { + } else if ((nodeName == "META") && hasAttribute(pNode, "HTTP-ETQUIV", "CONTENT-TYPE")) { /* Skip content-type meta tag, we provide our own. */ } else { @@ -284,7 +284,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas ((nodeName == "IMG" || nodeName == "INPUT" || nodeName == "SCRIPT") && attrName == "SRC") || ((nodeName == "BODY" || nodeName == "TABLE" || nodeName == "TH" || nodeName == "TD") && attrName == "BACKGROUND")) { // Some people use carriage return in file names and browsers support that! - attrValue = handleLink(baseURL, attrValue.replace(TQRegExp("\\s"), "")); + attrValue = handleLink(baseURL, attrValue.tqreplace(TQRegExp("\\s"), "")); } /* * ## Make recursion level configurable @@ -346,7 +346,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas } catch (...) { - // No children, stop recursion here + // No tqchildren, stop recursion here child = DOM::Node(); } @@ -370,7 +370,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas text =""; } if (nodeName.at(0)=='-') { - text += "</DIV> <!-- -KONQ_BLOCK -->"; + text += "</DIV> <!-- -KONTQ_BLOCK -->"; } else { text += "</" + pNode.nodeName().string() + ">"; if (nodeName == "PRE") { @@ -425,7 +425,7 @@ void ArchiveDialog::downloadNext() TQString tarFileName; // Only download file once - if (m_downloadedURLDict.contains(url.url())) { + if (m_downloadedURLDict.tqcontains(url.url())) { tarFileName = m_downloadedURLDict[url.url()]; #ifdef DEBUG_WAR kdDebug(90110) << "File already downloaded: " << url.url() @@ -477,7 +477,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job ) // Add file to Tar-Ball TQFile file(m_tmpFile->name()); file.open(IO_ReadOnly); - m_tarBall->writeFile(tarFileName, TQString::null, TQString::null, file.size(), file.readAll()); + m_tarBall->writeFile(tarFileName, TQString(), TQString(), file.size(), file.readAll()); file.close(); m_tmpFile->unlink(); delete m_tmpFile; @@ -512,7 +512,7 @@ TQString ArchiveDialog::getUniqueFileName(const TQString& fileName) kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl; #endif - while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName)) + while (uniqueFileName.isEmpty() || m_linkDict.tqcontains(uniqueFileName)) uniqueFileName = TQString::number(id++) + fileName; return uniqueFileName; @@ -532,14 +532,14 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str int endUrl = 0; int length = string.length(); while (pos < length && pos >= 0) { - pos = str.find("url(", pos); + pos = str.tqfind("url(", pos); if (pos!=-1) { pos += 4; // url( if (str[pos]=='"' || str[pos]=='\'') // CSS 'feature' pos++; startUrl = pos; - pos = str.find(")",startUrl); + pos = str.tqfind(")",startUrl); endUrl = pos; if (str[pos-1]=='"' || str[pos-1]=='\'') // CSS 'feature' endUrl--; @@ -555,7 +555,7 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str kdDebug () << "url: " << url << endl; #endif - str = str.replace(startUrl, endUrl-startUrl, url); + str = str.tqreplace(startUrl, endUrl-startUrl, url); pos++; } } diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h index 6748328..d82b9b0 100644 --- a/konq-plugins/webarchiver/archivedialog.h +++ b/konq-plugins/webarchiver/archivedialog.h @@ -42,8 +42,9 @@ class TQListViewItem; class ArchiveDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ArchiveDialog(TQWidget *parent, const TQString &targetFilename, KHTMLPart *part); + ArchiveDialog(TQWidget *tqparent, const TQString &targetFilename, KHTMLPart *part); ~ArchiveDialog(); void archive(); diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui index a2aceb2..8e5ca1e 100644 --- a/konq-plugins/webarchiver/archiveviewbase.ui +++ b/konq-plugins/webarchiver/archiveviewbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ArchiveViewBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ArchiveViewBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -43,7 +43,7 @@ <string>Local File</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -51,7 +51,7 @@ <string>To:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -119,7 +119,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index c76f56c..280b0e2 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -50,9 +50,9 @@ typedef KGenericFactory<PluginWebArchiver> PluginWebArchiverFactory; K_EXPORT_COMPONENT_FACTORY( libwebarchiverplugin, PluginWebArchiverFactory( "webarchiver" ) ) -PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name, +PluginWebArchiver::PluginWebArchiver( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( parent, name ) + : Plugin( tqparent, name ) { (void) new KAction( i18n("Archive &Web Page..."), "webarchiver", 0, @@ -67,9 +67,9 @@ PluginWebArchiver::~PluginWebArchiver() void PluginWebArchiver::slotSaveToArchive() { // ## Unicode ok? - if( !parent() || !parent()->inherits("KHTMLPart")) + if( !tqparent() || !tqparent()->inherits("KHTMLPart")) return; - KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); + KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() ); TQString archiveName = TQString::fromUtf8(part->htmlDocument().title().string().utf8()); @@ -78,12 +78,12 @@ void PluginWebArchiver::slotSaveToArchive() // Replace space with underscore, proposed Frank Pieczynski <pieczy@knuut.de> - archiveName.replace( "\\s:", " "); + archiveName.tqreplace( "\\s:", " "); archiveName = archiveName.simplifyWhiteSpace(); - archiveName.replace( "?", ""); - archiveName.replace( ":", ""); - archiveName.replace( "/", ""); - archiveName = archiveName.replace( TQRegExp("\\s+"), "_"); + archiveName.tqreplace( "?", ""); + archiveName.tqreplace( ":", ""); + archiveName.tqreplace( "/", ""); + archiveName = archiveName.tqreplace( TQRegExp("\\s+"), "_"); archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ; @@ -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." ).arg(url.prettyURL()); + const TQString text = i18n( "The URL\n%1\nis not valid." ).tqarg(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?" ).arg(url.prettyURL()); + const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).tqarg(url.prettyURL()); if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) { return; } diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h index 530e15b..338eec8 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.h +++ b/konq-plugins/webarchiver/plugin_webarchiver.h @@ -28,9 +28,10 @@ class PluginWebArchiver : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - PluginWebArchiver( TQObject* parent, const char* name, + PluginWebArchiver( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~PluginWebArchiver(); diff --git a/konq-plugins/webarchiver/webarchivecreator.h b/konq-plugins/webarchiver/webarchivecreator.h index 8806390..dfeba5d 100644 --- a/konq-plugins/webarchiver/webarchivecreator.h +++ b/konq-plugins/webarchiver/webarchivecreator.h @@ -29,6 +29,7 @@ class KHTMLPart; class WebArchiveCreator : public TQObject, public ThumbCreator { Q_OBJECT + TQ_OBJECT public: WebArchiveCreator(); virtual ~WebArchiveCreator(); diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index 4ac8e9c..422e985 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -36,7 +36,7 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -KSig::KSig(TQWidget *parent, const char *name) : KMainWindow(parent, name), +KSig::KSig(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name), changed(false) { setupActions(); @@ -63,18 +63,18 @@ KSig::~KSig() void KSig::setupActions() { - KStdAction::openNew(this, TQT_SLOT(add()), actionCollection()); - new KAction(i18n("Remove"), "editdelete", 0, this, TQT_SLOT(remove()), actionCollection(), "remove"); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); - - KStdAction::cut(kapp, TQT_SLOT(cut()), actionCollection()); - KStdAction::copy(kapp, TQT_SLOT(copy()), actionCollection()); - KStdAction::paste(kapp, TQT_SLOT(paste()), actionCollection()); - new KAction(i18n("C&lear"), "editclear", 0, kapp, TQT_SLOT(clear()), actionCollection(), "clear"); - - new KAction(i18n("Edit Standard Header"), 0, 0, this, TQT_SLOT(editHeader()), actionCollection(), "editHeader"); - new KAction(i18n("Edit Standard Footer"), 0, 0, this, TQT_SLOT(editFooter()), actionCollection(), "editFooter"); + KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection()); + new KAction(i18n("Remove"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove"); + KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); + + KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), actionCollection()); + KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), actionCollection()); + KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), actionCollection()); + new KAction(i18n("C&lear"), "editclear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear"); + + new KAction(i18n("Edit Standard Header"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editHeader()), actionCollection(), "editHeader"); + new KAction(i18n("Edit Standard Footer"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editFooter()), actionCollection(), "editFooter"); } void KSig::setupLayout() @@ -86,19 +86,19 @@ void KSig::setupLayout() sigList = SigListView::instance(splitter, "sigList"); sigEdit = new KTextEdit(splitter, "sigEdit"); - sigEdit->setTextFormat(Qt::PlainText); + sigEdit->setTextFormat(TQt::PlainText); sigEdit->setFont(KGlobalSettings::fixedFont()); sigEdit->setEnabled(false); sigEdit->setCheckSpellingEnabled(true); - statusBar()->insertItem(i18n(" Line: %1 ").arg(0), LineNumber, 0, true); - statusBar()->insertItem(i18n(" Col: %1 ").arg(0), ColumnNumber, 0, true); + statusBar()->insertItem(i18n(" Line: %1 ").tqarg(0), LineNumber, 0, true); + statusBar()->insertItem(i18n(" Col: %1 ").tqarg(0), ColumnNumber, 0, true); statusBar()->show(); updateListLock = false; - connect(sigEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(updateList())); - connect(sigList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateEdit())); - connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), this, TQT_SLOT(updateStatus(int,int))); + 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))); } void KSig::setupSearchLine() @@ -167,7 +167,7 @@ void KSig::writeConfig() bool KSig::queryClose() { if(changed) { - int saveChanges = KMessageBox::questionYesNoCancel(this, i18n("Do you want to save your changes before exiting?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard()); + int saveChanges = KMessageBox::questionYesNoCancel(this, i18n("Do you want to save your changes before exiting?"),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()); if(saveChanges == KMessageBox::Cancel) return(false); else if(saveChanges == KMessageBox::Yes) @@ -211,9 +211,9 @@ void KSig::setDataChanged(bool value) changed = value; if(changed) - setCaption(kapp->makeStdCaption(TQString::null, true, true)); + setCaption(kapp->makeStdCaption(TQString(), true, true)); else - setCaption(kapp->makeStdCaption(TQString::null, true, false)); + setCaption(kapp->makeStdCaption(TQString(), true, false)); } void KSig::editHeader() @@ -222,7 +222,7 @@ void KSig::editHeader() t->setLabel(i18n("Standard signature header:")); t->setText(header); - connect(t, TQT_SIGNAL(textUpdated(const TQString &)), this, TQT_SLOT(setHeader(const TQString &))); + connect(t, TQT_SIGNAL(textUpdated(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(setHeader(const TQString &))); t->exec(); } @@ -233,7 +233,7 @@ void KSig::editFooter() t->setLabel(i18n("Standard signature footer:")); t->setText(footer); - connect(t, TQT_SIGNAL(textUpdated(const TQString &)), this, TQT_SLOT(setFooter(const TQString &))); + connect(t, TQT_SIGNAL(textUpdated(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(setFooter(const TQString &))); t->exec(); } @@ -259,10 +259,10 @@ void KSig::updateEdit() updateListLock = false; } -void KSig::updateStatus(int line, int column) +void KSig::updatetqStatus(int line, int column) { - statusBar()->changeItem(i18n(" Line: %1 ").arg(line + 1), LineNumber); - statusBar()->changeItem(i18n(" Col: %1 ").arg(column + 1), ColumnNumber); + statusBar()->changeItem(i18n(" Line: %1 ").tqarg(line + 1), LineNumber); + statusBar()->changeItem(i18n(" Col: %1 ").tqarg(column + 1), ColumnNumber); } void KSig::quit() diff --git a/ksig/ksig.h b/ksig/ksig.h index ece738d..b1c4ef1 100644 --- a/ksig/ksig.h +++ b/ksig/ksig.h @@ -28,9 +28,10 @@ class TQSplitter; class KSig : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KSig(TQWidget *parent = 0, const char *name = 0); + KSig(TQWidget *tqparent = 0, const char *name = 0); virtual ~KSig(); private: @@ -59,7 +60,7 @@ private slots: void updateList(); void updateEdit(); - void updateStatus(int line, int column); + void updatetqStatus(int line, int column); private: TQString header; diff --git a/ksig/ksig.spec b/ksig/ksig.spec index 19d77a3..8844a6a 100644 --- a/ksig/ksig.spec +++ b/ksig/ksig.spec @@ -33,8 +33,8 @@ make -j$numprocs %install make prefix=$RPM_BUILD_ROOT%{prefix} install cd $RPM_BUILD_ROOT -find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list -find . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list +tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list +tqfind . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list %clean #rm -rf $RPM_BUILD_ROOT diff --git a/ksig/siggenerator.cpp b/ksig/siggenerator.cpp index abd2430..42f6141 100644 --- a/ksig/siggenerator.cpp +++ b/ksig/siggenerator.cpp @@ -53,7 +53,7 @@ SigGenerator::~SigGenerator() TQString SigGenerator::random() const { if(signatures.count() <= 0) - return(TQString::null); + return(TQString()); int i = KApplication::random() % signatures.count(); TQString text; @@ -65,7 +65,7 @@ TQString SigGenerator::random() const TQString SigGenerator::daily() const { if(signatures.count() <= 0) - return(TQString::null); + return(TQString()); TQDate date; int i = date.dayOfYear() % signatures.count(); diff --git a/ksig/siglistview.cpp b/ksig/siglistview.cpp index 4bbc693..aaf6ec2 100644 --- a/ksig/siglistview.cpp +++ b/ksig/siglistview.cpp @@ -29,10 +29,10 @@ SigListView *SigListView::listView = 0; // public members //////////////////////////////////////////////////////////////////////////////// -SigListView *SigListView::instance(TQWidget *parent, const char *name) +SigListView *SigListView::instance(TQWidget *tqparent, const char *name) { if(!listView) - listView = new SigListView(parent, name); + listView = new SigListView(tqparent, name); return(listView); } @@ -108,7 +108,7 @@ const SigListViewItem *SigListView::currentItem() const // protected members //////////////////////////////////////////////////////////////////////////////// -SigListView::SigListView(TQWidget *parent, const char *name) : KListView(parent, name) +SigListView::SigListView(TQWidget *tqparent, const char *name) : KListView(tqparent, name) { addColumn(i18n("Signatures")); diff --git a/ksig/siglistview.h b/ksig/siglistview.h index 9e03c5e..be84e5f 100644 --- a/ksig/siglistview.h +++ b/ksig/siglistview.h @@ -37,8 +37,9 @@ class SigListViewItem; class SigListView : public KListView { Q_OBJECT + TQ_OBJECT public: - static SigListView *instance(TQWidget *parent = 0, const char *name = 0); + static SigListView *instance(TQWidget *tqparent = 0, const char *name = 0); void load(); void save(); @@ -57,7 +58,7 @@ public slots: void clear() {} protected: - SigListView(TQWidget *parent = 0, const char *name = 0); + SigListView(TQWidget *tqparent = 0, const char *name = 0); virtual ~SigListView(); private: diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp index 0442c2e..a9f4f5e 100644 --- a/ksig/siglistviewitem.cpp +++ b/ksig/siglistviewitem.cpp @@ -29,7 +29,7 @@ SigListViewItem::~SigListViewItem() { // remove the element from the tree - element.parentNode().removeChild(element); + element.tqparentNode().removeChild(element); } TQString SigListViewItem::text() const @@ -56,14 +56,14 @@ void SigListViewItem::refreshText() void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) { - TQDomNodeList children = n.childNodes(); + TQDomNodeList tqchildren = n.childNodes(); - for(uint i = 0; i < children.count(); i++) { - if(children.item(i).isText()) - s.append(children.item(i).toText().data()); + for(uint i = 0; i < tqchildren.count(); i++) { + if(tqchildren.item(i).isText()) + s.append(tqchildren.item(i).toText().data()); else { - nodeToText(children.item(i), s); - if(children.item(i).isElement() && children.item(i).toElement().tagName() == "p") { + nodeToText(tqchildren.item(i), s); + if(tqchildren.item(i).isElement() && tqchildren.item(i).toElement().tagName() == "p") { s.append("\n"); } } @@ -74,14 +74,14 @@ void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) // private members //////////////////////////////////////////////////////////////////////////////// -SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement) : KListViewItem(parent) +SigListViewItem::SigListViewItem(TQListView *tqparent, TQDomDocument document, TQDomElement signatureElement) : KListViewItem(tqparent) { emptySigString = i18n("<empty signature>"); doc = document; element = signatureElement; nodeToText(element, elementText); - elementText.replace(TQRegExp("\n$"), ""); + elementText.tqreplace(TQRegExp("\n$"), ""); dirty = false; refreshText(); @@ -90,12 +90,12 @@ SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQD void SigListViewItem::render() { if(dirty) { - TQDomNodeList children = element.childNodes(); + TQDomNodeList tqchildren = element.childNodes(); while(!element.firstChild().isNull()) element.removeChild(element.firstChild()); - // create new children + // create new tqchildren TQStringList lines = TQStringList::split("\n", elementText, true); for(TQStringList::Iterator it = lines.begin(); it != lines.end(); it++) { diff --git a/ksig/siglistviewitem.h b/ksig/siglistviewitem.h index 2b51edd..0641576 100644 --- a/ksig/siglistviewitem.h +++ b/ksig/siglistviewitem.h @@ -39,7 +39,7 @@ private: * created using SigListView::createItem(). This is accessible to * SigListView because SigListView is a friend class. */ - SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement); + SigListViewItem(TQListView *tqparent, TQDomDocument document, TQDomElement signatureElement); /** * Renders the data back to the DOM element. diff --git a/ksig/standardtext.cpp b/ksig/standardtext.cpp index 3800eef..1788d7b 100644 --- a/ksig/standardtext.cpp +++ b/ksig/standardtext.cpp @@ -20,7 +20,7 @@ #include "standardtext.h" -StandardText::StandardText(TQWidget *parent, const char *name, bool modal, WFlags fl) : StandardTextBase(parent, name, modal, fl) +StandardText::StandardText(TQWidget *tqparent, const char *name, bool modal, WFlags fl) : StandardTextBase(tqparent, name, modal, fl) { } diff --git a/ksig/standardtext.h b/ksig/standardtext.h index 3ad2120..1ea3667 100644 --- a/ksig/standardtext.h +++ b/ksig/standardtext.h @@ -22,8 +22,9 @@ class StandardText : public StandardTextBase { Q_OBJECT + TQ_OBJECT public: - StandardText(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); + StandardText(TQWidget *tqparent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); virtual ~StandardText(); void setLabel(const TQString &text); diff --git a/ksig/standardtextbase.ui b/ksig/standardtextbase.ui index d1050c2..f7373fd 100644 --- a/ksig/standardtextbase.ui +++ b/ksig/standardtextbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>StandardTextBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>StandardTextBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -32,9 +32,9 @@ <cstring>textEdit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout</cstring> + <cstring>tqlayout</cstring> </property> <hbox> <property name="name"> @@ -56,14 +56,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -80,7 +80,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -112,7 +112,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/noatun-plugins/alarm/Makefile.am b/noatun-plugins/alarm/Makefile.am index 8d2a928..8da06d9 100644 --- a/noatun-plugins/alarm/Makefile.am +++ b/noatun-plugins/alarm/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(kde_includes)/arts $(all_includes) +INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatunwakeup.la noatunwakeup_la_SOURCES = wakeup.cpp \ diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp index 72b6d9d..862eb0c 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").arg(v); + return TQString("0%1").tqarg(v); else return TQString::number(v); } diff --git a/noatun-plugins/alarm/kminutespinbox.h b/noatun-plugins/alarm/kminutespinbox.h index 701caad..d29259b 100644 --- a/noatun-plugins/alarm/kminutespinbox.h +++ b/noatun-plugins/alarm/kminutespinbox.h @@ -26,9 +26,10 @@ #include <tqspinbox.h> -class KMinuteSpinBox : public QSpinBox +class KMinuteSpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: KMinuteSpinBox(int _step = 1, TQWidget *_parent = 0, const char *_name = 0); protected: diff --git a/noatun-plugins/alarm/kpercentspinbox.cpp b/noatun-plugins/alarm/kpercentspinbox.cpp index 3b16c97..ea5a170 100644 --- a/noatun-plugins/alarm/kpercentspinbox.cpp +++ b/noatun-plugins/alarm/kpercentspinbox.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kpercentspinbox.cpp - QSpinbox with % + kpercentspinbox.cpp - TQSpinbox with % ------------------- begin : Sun Apr 15 CEST 2001 copyright: (C) 2001 by Mickael Marchand <mikmak@freenux.org> diff --git a/noatun-plugins/alarm/kpercentspinbox.h b/noatun-plugins/alarm/kpercentspinbox.h index 7f1a3a2..3bfe2e7 100644 --- a/noatun-plugins/alarm/kpercentspinbox.h +++ b/noatun-plugins/alarm/kpercentspinbox.h @@ -1,5 +1,5 @@ /*************************************************************************** - kpercentspinbox.h - QSpinbox with % + kpercentspinbox.h - TQSpinbox with % ------------------- begin : Sun Apr 15 CEST 2001 copyright: (C) 2001 by Mickael Marchand <mikmak@freenux.org> @@ -19,9 +19,10 @@ #include <tqspinbox.h> -class KPercentSpinBox : public QSpinBox +class KPercentSpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: KPercentSpinBox (int _step=1, TQWidget *_parent=0, const char *name=0); diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index 58c478c..1109b6f 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -104,7 +104,7 @@ void Wakeup::slotCheckTime() TQDate d; t=TQTime::currentTime(); - d=TQDate::currentDate(); + d=TQDate::tqcurrentDate(); if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return; @@ -165,11 +165,11 @@ void Wakeup::slotVolumeChange() /////////////////////////////////////////////////////////////////// // Prefs CModule /////////////////////////////////////////////////////////////////// -WakeupPrefs::WakeupPrefs( TQObject *parent ) : - CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent ) +WakeupPrefs::WakeupPrefs( TQObject *tqparent ) : + CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", tqparent ) { - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQGridLayout *grid = new TQGridLayout (layout,8,4); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout (tqlayout,8,4); monday=new TQCheckBox(i18n("Monday"),this); tuesday=new TQCheckBox(i18n("Tuesday"),this); @@ -203,38 +203,38 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) : TQLabel *selectday = new TQLabel (i18n("Select days:"),this); TQLabel *choosehour = new TQLabel (i18n("Hour"),this); TQLabel *choosemin = new TQLabel (i18n("Minute"),this); - grid->addWidget (selectday,0,0,Qt::AlignLeft); - grid->addWidget (choosehour,0,1,Qt::AlignLeft); - grid->addWidget (choosemin,0,2,Qt::AlignLeft); + grid->addWidget (selectday,0,0,TQt::AlignLeft); + grid->addWidget (choosehour,0,1,TQt::AlignLeft); + grid->addWidget (choosemin,0,2,TQt::AlignLeft); applyall = new TQPushButton (this,"applyall"); applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) ); - applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + applyall->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, applyall->sizePolicy().hasHeightForWidth()) ); - grid->addWidget (applyall,1,3,Qt::AlignLeft); - - grid->addWidget (monday,1,0,Qt::AlignLeft); - grid->addWidget (tuesday,2,0,Qt::AlignLeft); - grid->addWidget (wednesday,3,0,Qt::AlignLeft); - grid->addWidget (thursday,4,0,Qt::AlignLeft); - grid->addWidget (friday,5,0,Qt::AlignLeft); - grid->addWidget (saturday,6,0,Qt::AlignLeft); - grid->addWidget (sunday,7,0,Qt::AlignLeft); - grid->addWidget (hour1,1,1,Qt::AlignLeft); - grid->addWidget (hour2,2,1,Qt::AlignLeft); - grid->addWidget (hour3,3,1,Qt::AlignLeft); - grid->addWidget (hour4,4,1,Qt::AlignLeft); - grid->addWidget (hour5,5,1,Qt::AlignLeft); - grid->addWidget (hour6,6,1,Qt::AlignLeft); - grid->addWidget (hour7,7,1,Qt::AlignLeft); - grid->addWidget (minute1,1,2,Qt::AlignLeft); - grid->addWidget (minute2,2,2,Qt::AlignLeft); - grid->addWidget (minute3,3,2,Qt::AlignLeft); - grid->addWidget (minute4,4,2,Qt::AlignLeft); - grid->addWidget (minute5,5,2,Qt::AlignLeft); - grid->addWidget (minute6,6,2,Qt::AlignLeft); - grid->addWidget (minute7,7,2,Qt::AlignLeft); + grid->addWidget (applyall,1,3,TQt::AlignLeft); + + grid->addWidget (monday,1,0,TQt::AlignLeft); + grid->addWidget (tuesday,2,0,TQt::AlignLeft); + grid->addWidget (wednesday,3,0,TQt::AlignLeft); + grid->addWidget (thursday,4,0,TQt::AlignLeft); + grid->addWidget (friday,5,0,TQt::AlignLeft); + grid->addWidget (saturday,6,0,TQt::AlignLeft); + grid->addWidget (sunday,7,0,TQt::AlignLeft); + grid->addWidget (hour1,1,1,TQt::AlignLeft); + grid->addWidget (hour2,2,1,TQt::AlignLeft); + grid->addWidget (hour3,3,1,TQt::AlignLeft); + grid->addWidget (hour4,4,1,TQt::AlignLeft); + grid->addWidget (hour5,5,1,TQt::AlignLeft); + grid->addWidget (hour6,6,1,TQt::AlignLeft); + grid->addWidget (hour7,7,1,TQt::AlignLeft); + grid->addWidget (minute1,1,2,TQt::AlignLeft); + grid->addWidget (minute2,2,2,TQt::AlignLeft); + grid->addWidget (minute3,3,2,TQt::AlignLeft); + grid->addWidget (minute4,4,2,TQt::AlignLeft); + grid->addWidget (minute5,5,2,TQt::AlignLeft); + grid->addWidget (minute6,6,2,TQt::AlignLeft); + grid->addWidget (minute7,7,2,TQt::AlignLeft); grid->setColStretch (0,3); TQButtonGroup *modeGroup = new TQButtonGroup (3, Qt::Vertical, i18n ("Volume Control"),this); @@ -248,9 +248,9 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) : TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame); volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue"); - layout->addWidget(modeGroup); - layout->addWidget(volFrame); - layout->addStretch(); + tqlayout->addWidget(modeGroup); + tqlayout->addWidget(volFrame); + tqlayout->addStretch(); TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); volLayout->addWidget(volEndLabel); diff --git a/noatun-plugins/alarm/wakeup.h b/noatun-plugins/alarm/wakeup.h index e37ff4a..96628dc 100644 --- a/noatun-plugins/alarm/wakeup.h +++ b/noatun-plugins/alarm/wakeup.h @@ -32,6 +32,7 @@ class KPercentSpinBox; class Wakeup : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: @@ -60,9 +61,10 @@ private: class WakeupPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: - WakeupPrefs( TQObject *parent ); + WakeupPrefs( TQObject *tqparent ); virtual void save(); virtual void load(); public slots: diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui index 772af81..925a51f 100644 --- a/noatun-plugins/alsaplayer/AlsaPlayer.ui +++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>APMainWindow</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>APMainWindow</cstring> </property> @@ -18,9 +18,9 @@ <property name="acceptDrops"> <bool>true</bool> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -32,7 +32,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -292,9 +292,9 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -306,7 +306,7 @@ <property name="spacing"> <number>4</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>speedLabelLeft</cstring> </property> @@ -574,13 +574,13 @@ <property name="text"> <string>Speed:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -849,7 +849,7 @@ <string>No time data</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>speedLabel</cstring> </property> @@ -1118,7 +1118,7 @@ <string>100%</string> </property> </widget> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -1387,7 +1387,7 @@ <string>No stream</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>volumeLabel</cstring> </property> @@ -1656,7 +1656,7 @@ <string>100%</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>volumeLabelLeft</cstring> </property> @@ -1924,13 +1924,13 @@ <property name="text"> <string>Volume:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>infoLabel</cstring> </property> @@ -2205,18 +2205,18 @@ <property name="name"> <cstring>seeker</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>16</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -2228,11 +2228,11 @@ <property name="spacing"> <number>4</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -2254,18 +2254,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -2277,7 +2277,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>menuButton</cstring> </property> @@ -2297,7 +2297,7 @@ <string>Menu</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>previousButton</cstring> </property> @@ -2314,7 +2314,7 @@ <string>Skip to previous track</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>playButton</cstring> </property> @@ -2331,7 +2331,7 @@ <string>Play</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>nextButton</cstring> </property> @@ -2348,7 +2348,7 @@ <string>Skip to next track</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>stopButton</cstring> </property> @@ -2365,7 +2365,7 @@ <string>Stop</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>playlistButton</cstring> </property> @@ -2394,7 +2394,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -2403,11 +2403,11 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -2419,11 +2419,11 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -2435,7 +2435,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>pauseButton</cstring> </property> @@ -2455,7 +2455,7 @@ <string>Pause</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>forwardButton</cstring> </property> @@ -2475,7 +2475,7 @@ <string>Forwards, normal speed</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>speedSlider</cstring> </property> @@ -2497,11 +2497,11 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <hbox> <property name="name"> @@ -2513,7 +2513,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>PixmapLabel2</cstring> </property> @@ -2530,7 +2530,7 @@ <string>Balance</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>balanceSlider</cstring> </property> @@ -2547,7 +2547,7 @@ <string>Balance</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>PixmapLabel1</cstring> </property> @@ -2561,7 +2561,7 @@ <string>Volume</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>volumeSlider</cstring> </property> @@ -2636,5 +2636,5 @@ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun-plugins/alsaplayer/Makefile.am b/noatun-plugins/alsaplayer/Makefile.am index 3b149f6..ce584a8 100644 --- a/noatun-plugins/alsaplayer/Makefile.am +++ b/noatun-plugins/alsaplayer/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) -I$(kde_includes)/kde -I$(kde_includes)/arts kde_module_LTLIBRARIES = noatunalsaplayer.la diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 6fd02f8..339b484 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -29,23 +29,23 @@ #include "configmodule.h" -AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) +AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * tqparent) : CModule ( i18n("AlsaPlayer"), i18n("AlsaPlayer Interface Settings"), "appearance", - parent + tqparent ) { scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - TQVBoxLayout * layout = new TQVBoxLayout(this); + TQVBoxLayout * tqlayout = new TQVBoxLayout(this); - layout->addWidget(scroll_); + tqlayout->addWidget(scroll_); - layout->addStretch(100); + tqlayout->addStretch(100); reopen(); } diff --git a/noatun-plugins/alsaplayer/configmodule.h b/noatun-plugins/alsaplayer/configmodule.h index 004ec79..e804cc1 100644 --- a/noatun-plugins/alsaplayer/configmodule.h +++ b/noatun-plugins/alsaplayer/configmodule.h @@ -30,6 +30,7 @@ class TQCheckBox; class AlsaPlayerConfigModule : public CModule { Q_OBJECT + TQ_OBJECT public: diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index 606b461..e3c12c1 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -26,8 +26,8 @@ #include <noatun/player.h> #include "seeker.h" -Seeker::Seeker(TQWidget * parent, const char * name) - : L33tSlider(0, 1000, 10, 0, Horizontal, parent, name) +Seeker::Seeker(TQWidget * tqparent, const char * name) + : L33tSlider(0, 1000, 10, 0,Qt::Horizontal, tqparent, name) { connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h index d17a760..9eb67ed 100644 --- a/noatun-plugins/alsaplayer/seeker.h +++ b/noatun-plugins/alsaplayer/seeker.h @@ -28,10 +28,11 @@ class Seeker : public L33tSlider { Q_OBJECT + TQ_OBJECT public: - Seeker(TQWidget * parent, const char * name = 0); + Seeker(TQWidget * tqparent, const char * name = 0); virtual ~Seeker(); protected slots: diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index f329c4f..cc53b06 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -118,7 +118,7 @@ AlsaPlayer::AlsaPlayer() connect ( - new AlsaPlayerConfigModule(this), + new AlsaPlayerConfigModule(TQT_TQOBJECT(this)), TQT_SIGNAL(saved()), TQT_SLOT(slotConfigChanged()) ); @@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer() loadConfig(); - resize(sizeHint().width(), minimumSizeHint().height()); + resize(tqsizeHint().width(), tqminimumSizeHint().height()); show(); } @@ -196,7 +196,7 @@ void AlsaPlayer::setTitleText(const TQString & s) void AlsaPlayer::slotPlaying() { - setTitleText(TQString::null); + setTitleText(TQString()); playButton->setOn(true); stopButton->setEnabled(true); @@ -212,7 +212,7 @@ void AlsaPlayer::slotStopped() void AlsaPlayer::slotPaused() { - setTitleText(TQString::null); + setTitleText(TQString()); stopButton->setEnabled(true); playButton->setOn(false); @@ -223,11 +223,11 @@ bool AlsaPlayer::eventFilter(TQObject *o, TQEvent *e) switch (e->type()) { case TQEvent::MouseButtonPress: - mousePressEvent(static_cast<TQMouseEvent *>(e)); + mousePressEvent(TQT_TQMOUSEEVENT(e)); break; case TQEvent::Wheel: - wheelEvent(static_cast<TQWheelEvent*>(e)); + wheelEvent(TQT_TQWHEELEVENT(e)); return true; break; @@ -250,7 +250,7 @@ void AlsaPlayer::slotPlayListHidden() void AlsaPlayer::mousePressEvent(TQMouseEvent * e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { NoatunStdAction::ContextMenu::showContextMenu(); return; @@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged() void AlsaPlayer::slotVolumeChanged(int i) { TQString text("%1%"); - volumeLabel->setText(text.arg(i)); + volumeLabel->setText(text.tqarg(i)); volumeSlider->setValue(i); } @@ -284,7 +284,7 @@ void AlsaPlayer::slotTimeout() if (!napp->player()->current()) return; - setTitleText(TQString::null); + setTitleText(TQString()); TQString lengthText(napp->player()->lengthString()); @@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed) speed_ = newSpeed; pauseButton->setEnabled(0 != speed_); - speedLabel->setText(TQString("%1%").arg(speed_)); + speedLabel->setText(TQString("%1%").tqarg(speed_)); Arts::PlayObject playobject(napp->player()->engine()->playObject()); Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject); diff --git a/noatun-plugins/alsaplayer/userinterface.h b/noatun-plugins/alsaplayer/userinterface.h index 210f16b..abec7fd 100644 --- a/noatun-plugins/alsaplayer/userinterface.h +++ b/noatun-plugins/alsaplayer/userinterface.h @@ -37,6 +37,7 @@ class Seeker; class AlsaPlayer : public APMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: diff --git a/noatun-plugins/blurscope/Makefile.am b/noatun-plugins/blurscope/Makefile.am index 6ac86b3..a09d5e7 100644 --- a/noatun-plugins/blurscope/Makefile.am +++ b/noatun-plugins/blurscope/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) $(SDL_CFLAGS) +INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatunblurscope.la noatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp diff --git a/noatun-plugins/blurscope/scopedisplayer.cpp b/noatun-plugins/blurscope/scopedisplayer.cpp index 42b375a..6b10732 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++; } - repaint(); + tqrepaint(); } } @@ -233,7 +233,7 @@ void SDLView::checkInput() #define output2 ((unsigned char*)outputBmp.data) -void SDLView::repaint() +void SDLView::tqrepaint() { SDL_LockSurface(surface); TEST(); diff --git a/noatun-plugins/blurscope/sdlscope.h b/noatun-plugins/blurscope/sdlscope.h index 45c734c..73e6d6d 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 repaint(); + void tqrepaint(); private: int mFd; diff --git a/noatun-plugins/charlatan/Makefile.am b/noatun-plugins/charlatan/Makefile.am index 0603703..3643ec6 100644 --- a/noatun-plugins/charlatan/Makefile.am +++ b/noatun-plugins/charlatan/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatuncharlatan.la diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp index 3624e0b..4d8f157 100644 --- a/noatun-plugins/charlatan/configmodule.cpp +++ b/noatun-plugins/charlatan/configmodule.cpp @@ -29,23 +29,23 @@ #include "configmodule.h" #include "configmodule.moc" -CharlatanConfigModule::CharlatanConfigModule(TQObject * parent) +CharlatanConfigModule::CharlatanConfigModule(TQObject * tqparent) : CModule ( i18n("Charlatan"), i18n("Charlatan Interface Settings"), "appearance", - parent + tqparent ) { scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - TQVBoxLayout * layout = new TQVBoxLayout(this); + TQVBoxLayout * tqlayout = new TQVBoxLayout(this); - layout->addWidget(scroll_); + tqlayout->addWidget(scroll_); - layout->addStretch(100); + tqlayout->addStretch(100); reopen(); } diff --git a/noatun-plugins/charlatan/configmodule.h b/noatun-plugins/charlatan/configmodule.h index d0646c2..d41df89 100644 --- a/noatun-plugins/charlatan/configmodule.h +++ b/noatun-plugins/charlatan/configmodule.h @@ -30,6 +30,7 @@ class TQCheckBox; class CharlatanConfigModule : public CModule { Q_OBJECT + TQ_OBJECT public: diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp index c5ca084..fc55f36 100644 --- a/noatun-plugins/charlatan/seeker.cpp +++ b/noatun-plugins/charlatan/seeker.cpp @@ -27,8 +27,8 @@ #include "seeker.h" #include "seeker.moc" -Seeker::Seeker(TQWidget * parent) - : TQSlider(0, 60, 10, 0, Horizontal, parent), +Seeker::Seeker(TQWidget * tqparent) + : TQSlider(0, 60, 10, 0,Qt::Horizontal, tqparent), adjusting_(false) { delayedUpdateTimer_ = new TQTimer(this); diff --git a/noatun-plugins/charlatan/seeker.h b/noatun-plugins/charlatan/seeker.h index 922f902..98b071a 100644 --- a/noatun-plugins/charlatan/seeker.h +++ b/noatun-plugins/charlatan/seeker.h @@ -27,13 +27,14 @@ class TQTimer; -class Seeker : public QSlider +class Seeker : public TQSlider { Q_OBJECT + TQ_OBJECT public: - Seeker(TQWidget * parent); + Seeker(TQWidget * tqparent); virtual ~Seeker(); protected slots: @@ -51,7 +52,7 @@ class Seeker : public QSlider private: bool adjusting_; - QTimer * delayedUpdateTimer_; + TQTimer * delayedUpdateTimer_; }; #endif diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index b9bb4c1..8e67516 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -48,7 +48,7 @@ #include "seeker.h" Charlatan::Charlatan() - : QWidget (0, "Charlatan"), + : TQWidget (0, "Charlatan"), UserInterface (), previousButton_ (0L), stopButton_ (0L), @@ -189,7 +189,7 @@ Charlatan::Charlatan() connect ( - new CharlatanConfigModule(this), + new CharlatanConfigModule(TQT_TQOBJECT(this)), TQT_SIGNAL(saved()), TQT_SLOT(slotConfigChanged()) ); @@ -321,7 +321,7 @@ bool Charlatan::eventFilter(TQObject *o, TQEvent *e) switch (e->type()) { case TQEvent::Wheel: - wheelEvent(static_cast<TQWheelEvent*>(e)); + wheelEvent(TQT_TQWHEELEVENT(e)); return true; break; @@ -344,7 +344,7 @@ void Charlatan::slotPlayListHidden() void Charlatan::mousePressEvent(TQMouseEvent * e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { NoatunStdAction::ContextMenu::showContextMenu(); return; @@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged() void Charlatan::slotVolumeChanged(int i) { - TQString message(i18n("Volume: %1").arg(i)); + TQString message(i18n("Volume: %1").tqarg(i)); showingVolumeTimer_->start(2000, true); titleLabel_->setText(message); diff --git a/noatun-plugins/charlatan/userinterface.h b/noatun-plugins/charlatan/userinterface.h index 7d74e39..3e40487 100644 --- a/noatun-plugins/charlatan/userinterface.h +++ b/noatun-plugins/charlatan/userinterface.h @@ -38,6 +38,7 @@ class TQLabel; class Charlatan : public TQWidget, public UserInterface { Q_OBJECT + TQ_OBJECT public: @@ -73,7 +74,7 @@ class Charlatan : public TQWidget, public UserInterface virtual void closeEvent (TQCloseEvent *); virtual bool eventFilter (TQObject *, TQEvent *); virtual void wheelEvent (TQWheelEvent *); - virtual void setTitleText (const TQString & = TQString::null); + virtual void setTitleText (const TQString & = TQString()); void loadConfig(); @@ -89,10 +90,10 @@ class Charlatan : public TQWidget, public UserInterface Seeker * seekSlider_; ScrollingLabel * titleLabel_; - QLabel * positionLabel_; + TQLabel * positionLabel_; - QTimer * showingVolumeTimer_; - QString title_; + TQTimer * showingVolumeTimer_; + TQString title_; }; #endif diff --git a/noatun-plugins/dub/dub/Makefile.am b/noatun-plugins/dub/dub/Makefile.am index f49684c..6628217 100644 --- a/noatun-plugins/dub/dub/Makefile.am +++ b/noatun-plugins/dub/dub/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = noatundub.la -INCLUDES = $(all_includes) +INCLUDES = $(all_includes) -I$(kde_includes)/kde noatundub_la_SOURCES = dubprefs.ui dubplaylistitem.cpp dubplaylist.cpp \ fileselectorwidget.cpp dubview.cpp dubapp.cpp dub.cpp dubconfigmodule.cpp diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index 5de4104..e6b6c81 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -174,7 +174,7 @@ KFileItem* Dub::Linear_Seq::last(TQPtrList<KFileItem> & items) return lastFile; } -bool Dub::Linear_Seq::find(TQPtrList<KFileItem> & items, KFileItem* a_file) +bool Dub::Linear_Seq::tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file) { // find file for (KFileItem *file=items.first(); file; file=items.next() ) @@ -192,7 +192,7 @@ KFileItem* Dub::Linear_Seq::next(TQPtrList<KFileItem> & items, assert(active_file); bool found = false; if (*active_file) { - if (find(items, *active_file)) { + if (tqfind(items, *active_file)) { KFileItem* next = items.next(); for (; next && !next->isFile(); next = items.next()) ; // find next file if (next && next->isFile()) @@ -219,7 +219,7 @@ KFileItem* Dub::Linear_Seq::prev(TQPtrList<KFileItem> & items, bool found = false; if (*active_file) { // locate current item - if (find(items, *active_file)) { + if (tqfind(items, *active_file)) { KFileItem* prev = items.prev(); for (; prev && !prev->isFile(); prev = items.prev()) ; // find prev file if (prev && prev->isFile()) { @@ -245,7 +245,7 @@ KFileItem* Dub::Linear_OneDir::first() if (first) set_file(&first_file, first); else { - if (first_file) { // invalidate first + if (first_file) { // tqinvalidate first delete first_file; first_file = 0; } @@ -281,8 +281,8 @@ Dub::Dir_Node::Dir_Node(TQString d, bool forward) // process entry list, form a list of subdirs and normal files file_items.setAutoDelete(true); TQDir dir_obj(dir); - QFileInfoList* entries = - const_cast<QFileInfoList*>(dir_obj.entryInfoList()); + TQFileInfoList* entries = + const_cast<TQFileInfoList*>(dir_obj.entryInfoList()); for ( TQFileInfo *file = entries->first(); file; file = entries->next() ) { if (file->isDir() && file->absFilePath().length()>d.length()) { kdDebug(90010) << "dub: dir " << file->absFilePath() << endl; @@ -451,7 +451,7 @@ void Dub::Recursive_Seq::prev_preorder() } else { TQString subdir = *top->current_subdir; - kdDebug(90010) << "we have children, pushing now " << subdir << endl; + kdDebug(90010) << "we have tqchildren, pushing now " << subdir << endl; push_dir(subdir, false); // push directory w/ backward iterators } } diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h index da220e8..a114248 100644 --- a/noatun-plugins/dub/dub/dub.h +++ b/noatun-plugins/dub/dub/dub.h @@ -47,6 +47,7 @@ class DubPlaylist; class Dub : public DubApp { Q_OBJECT + TQ_OBJECT public: @@ -110,7 +111,7 @@ private: KFileItem* last(TQPtrList<KFileItem> & items); KFileItem* next(TQPtrList<KFileItem> & items, KFileItem** active_file); KFileItem* prev(TQPtrList<KFileItem> & items, KFileItem** active_file); - bool find(TQPtrList<KFileItem> & items, KFileItem* a_file); + bool tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file); }; // sequencer that traverses current directory in view order diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index 4908382..2647203 100644 --- a/noatun-plugins/dub/dub/dubapp.cpp +++ b/noatun-plugins/dub/dub/dubapp.cpp @@ -34,8 +34,8 @@ #define ID_STATUS_MSG 1 -DubApp::DubApp(TQWidget* parent, const char* name) - : KMainWindow(parent, name) +DubApp::DubApp(TQWidget* tqparent, const char* name) + : KMainWindow(tqparent, name) { kdDebug(90010) << "cons dubapp" << endl; config=kapp->config(); @@ -54,7 +54,7 @@ DubApp::~DubApp() void DubApp::initActions() { - fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h index 014d176..9b4f4b7 100644 --- a/noatun-plugins/dub/dub/dubapp.h +++ b/noatun-plugins/dub/dub/dubapp.h @@ -31,13 +31,14 @@ class DubView; class DubApp : public KMainWindow { Q_OBJECT + TQ_OBJECT friend class DubView; public: /** construtor of DubApp, calls all init functions to create the application. */ - DubApp(TQWidget* parent, const char* name="Dub Playlist"); + DubApp(TQWidget* tqparent, const char* name="Dub Playlist"); ~DubApp(); void initActions(); diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp index 581bbf2..b227016 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.cpp +++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp @@ -25,8 +25,8 @@ #include "dubconfigmodule.h" -DubConfigModule::DubConfigModule(TQObject* parent) - : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", parent) +DubConfigModule::DubConfigModule(TQObject* tqparent) + : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", tqparent) , playMode(oneDir) , playOrder(normal) { diff --git a/noatun-plugins/dub/dub/dubconfigmodule.h b/noatun-plugins/dub/dub/dubconfigmodule.h index 1793017..d2545cd 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.h +++ b/noatun-plugins/dub/dub/dubconfigmodule.h @@ -14,11 +14,12 @@ class DubConfigModule : public CModule { Q_OBJECT + TQ_OBJECT public: enum PlayOrder { normal, shuffle, repeat, single }; enum PlayMode { allFiles, oneDir, recursiveDir }; - DubConfigModule(TQObject *parent); + DubConfigModule(TQObject *tqparent); ~DubConfigModule(); diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp index 62d2e5c..db7a2f2 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.cpp +++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp @@ -40,8 +40,8 @@ DubPlaylistItem::~DubPlaylistItem(){ TQString DubPlaylistItem::property(const TQString &key, const TQString &def) const { // kdDebug(90010) << "property " << key << endl; if (isProperty(key)) { - kdDebug(90010) << key << " -> " << property_map.find(key).data() << endl; - return property_map.find(key).data(); + kdDebug(90010) << key << " -> " << property_map.tqfind(key).data() << endl; + return property_map.tqfind(key).data(); } else return def; @@ -69,7 +69,7 @@ TQStringList DubPlaylistItem::properties() const { bool DubPlaylistItem::isProperty(const TQString &key) const { // kdDebug(90010) << "is property? " << key << endl; - return (property_map.find(key) != property_map.end()); + return (property_map.tqfind(key) != property_map.end()); } KURL DubPlaylistItem::url() const { diff --git a/noatun-plugins/dub/dub/dubprefs.ui b/noatun-plugins/dub/dub/dubprefs.ui index 6b27195..c403ae0 100644 --- a/noatun-plugins/dub/dub/dubprefs.ui +++ b/noatun-plugins/dub/dub/dubprefs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>DubPrefs</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DubPrefs</cstring> </property> @@ -27,15 +27,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -61,7 +61,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>playMode</cstring> </property> @@ -72,7 +72,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>allFiles</cstring> </property> @@ -83,7 +83,7 @@ <string>All media files found under Media Home</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>oneDir</cstring> </property> @@ -94,7 +94,7 @@ <string>Play current folder only</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>recursiveDir</cstring> </property> @@ -110,7 +110,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>playOrder</cstring> </property> @@ -121,7 +121,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>normal</cstring> </property> @@ -132,7 +132,7 @@ <string>Play files in normal order</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>shuffle</cstring> </property> @@ -146,7 +146,7 @@ <string>Randomized order</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>repeat</cstring> </property> @@ -160,7 +160,7 @@ <string>Repeat the same file forever</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>single</cstring> </property> @@ -178,7 +178,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/noatun-plugins/dub/dub/dubview.cpp b/noatun-plugins/dub/dub/dubview.cpp index 087e92e..1522918 100644 --- a/noatun-plugins/dub/dub/dubview.cpp +++ b/noatun-plugins/dub/dub/dubview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt #include <tqprinter.h> #include <tqpainter.h> #include <kdebug.h> @@ -26,12 +26,12 @@ #include "dub.h" #include "fileselectorwidget.h" -//DubView::DubView(TQWidget *parent, const char *name) : TQWidget(parent, name) +//DubView::DubView(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) //{ // setBackgroundMode(PaletteBase); //} -DubView::DubView(TQWidget *parent) : FileSelectorWidget(parent) +DubView::DubView(TQWidget *tqparent) : FileSelectorWidget(tqparent) { kdDebug(90010) << "dub view cons" << endl; setBackgroundMode(PaletteBase); diff --git a/noatun-plugins/dub/dub/dubview.h b/noatun-plugins/dub/dub/dubview.h index 079b833..a83d7cb 100644 --- a/noatun-plugins/dub/dub/dubview.h +++ b/noatun-plugins/dub/dub/dubview.h @@ -22,7 +22,7 @@ #include <config.h> #endif -// include files for Qt +// include files for TQt #include <tqwidget.h> #include <fileselectorwidget.h> @@ -31,9 +31,10 @@ class DubView : public FileSelectorWidget { Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ - DubView(TQWidget *parent = 0); + DubView(TQWidget *tqparent = 0); /** Destructor for the main view */ ~DubView(); diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp index c030040..f809629 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.cpp +++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp @@ -36,11 +36,11 @@ #include "fileselectorwidget.h" -FileSelectorWidget::FileSelectorWidget(TQWidget *parent) - : TQWidget(parent, "file selector widget") +FileSelectorWidget::FileSelectorWidget(TQWidget *tqparent) + : TQWidget(tqparent, "file selector widget") { - // widgets and layout + // widgets and tqlayout TQVBoxLayout* lo = new TQVBoxLayout(this); @@ -66,12 +66,12 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent) hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); - dir = new KDirOperator(TQString::null, this, "operator"); + dir = new KDirOperator(TQString(), this, "operator"); dir->setView(KFile::Detail); lo->addWidget(dir); lo->setStretchFactor(dir, 2); @@ -80,7 +80,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent) filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->tqsetSizePolicy( 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 e31b721..516e3ce 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.h +++ b/noatun-plugins/dub/dub/fileselectorwidget.h @@ -31,14 +31,15 @@ class DubPlayListItem; -class FileSelectorWidget : public QWidget +class FileSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT friend class DubPlayListItem; public: - FileSelectorWidget(TQWidget *parent); + FileSelectorWidget(TQWidget *tqparent); ~FileSelectorWidget(); KDirOperator* dirOperator() {return dir;} diff --git a/noatun-plugins/ffrs/Makefile.am b/noatun-plugins/ffrs/Makefile.am index 96eae2d..1ecfd53 100644 --- a/noatun-plugins/ffrs/Makefile.am +++ b/noatun-plugins/ffrs/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(kde_includes)/arts $(all_includes) +INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatun_ffrs.la noatun_ffrs_la_SOURCES = ffrs.cpp diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 38fd56e..73f2685 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -22,7 +22,7 @@ extern "C" Plugin *create_plugin() View::View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel) - : TQWidget(0,0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WType_TopLevel), mChannel(channel) + : TQWidget(0,0, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WType_TopLevel), mChannel(channel) { fg = front; bg = back; @@ -52,26 +52,26 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor // make sure we're on the desktop if ( - !desktop.contains(rect().topLeft()) - || !desktop.contains(rect().bottomRight()) + !desktop.tqcontains(rect().topLeft()) + || !desktop.tqcontains(rect().bottomRight()) ) { move(at); } - TQBitmap mask(width, height); - TQPainter p(&mask); + TQBitmap tqmask(width, height); + TQPainter p(&tqmask); -// Qt::color0 = transparent -// Qt::color1 = opaque - p.fillRect(0, 0, width, height, Qt::color0); +// TQt::color0 = transparent +// TQt::color1 = opaque + p.fillRect(0, 0, width, height, TQt::color0); for (int i=0; i < height; ) { - p.fillRect(0, height-i-block, width, block, Qt::color1); + p.fillRect(0, height-i-block, width, block, TQt::color1); i += block + unblock; } - setMask(mask); + setMask(tqmask); units = block+unblock; show(); @@ -184,52 +184,52 @@ void FFRS::changed() #include <tqhbox.h> #include <tqlabel.h> -FFRSPrefs::FFRSPrefs( TQObject *parent ) - : CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent) +FFRSPrefs::FFRSPrefs( TQObject *tqparent ) + : CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",tqparent) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQHBox *box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Width:"), box); mWidth = new KIntNumInput(width(), box); mWidth->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Height:"), box); mHeight = new KIntNumInput(height(), box); mHeight->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Visible block size:"), box); mFgblock = new KIntNumInput(fgblock(), box); mFgblock->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Transparent block size:"), box); mBgblock = new KIntNumInput(bgblock(), box); mBgblock->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Update interval:"), box); mRate = new KIntNumInput(rate(), box); mRate->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Foreground color:"), box); mFgcolor = new KColorButton(fgcolor(), box); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Background color:"), box); mBgcolor = new KColorButton(bgcolor(), box); - layout->addStretch(); + tqlayout->addStretch(); } void FFRSPrefs::save() diff --git a/noatun-plugins/ffrs/ffrs.h b/noatun-plugins/ffrs/ffrs.h index a29a1c2..c19e86c 100644 --- a/noatun-plugins/ffrs/ffrs.h +++ b/noatun-plugins/ffrs/ffrs.h @@ -5,9 +5,10 @@ #include <noatun/plugin.h> -class View : public QWidget +class View : public TQWidget { Q_OBJECT + TQ_OBJECT public: View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel); ~View(); @@ -31,6 +32,7 @@ class FFRSPrefs; class FFRS : public TQObject, public Plugin, public StereoScope { Q_OBJECT + TQ_OBJECT public: FFRS(); @@ -53,9 +55,10 @@ class KColorButton; class FFRSPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: - FFRSPrefs( TQObject *parent ); + FFRSPrefs( TQObject *tqparent ); virtual void save(); int width(); diff --git a/noatun-plugins/luckytag/Makefile.am b/noatun-plugins/luckytag/Makefile.am index 4e02899..ae0c8e1 100644 --- a/noatun-plugins/luckytag/Makefile.am +++ b/noatun-plugins/luckytag/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatunluckytag.la noatunluckytag_la_SOURCES = luckytag.cpp parsedmp3filename.cpp diff --git a/noatun-plugins/luckytag/parsedmp3filename.cpp b/noatun-plugins/luckytag/parsedmp3filename.cpp index 1c75958..11694bc 100644 --- a/noatun-plugins/luckytag/parsedmp3filename.cpp +++ b/noatun-plugins/luckytag/parsedmp3filename.cpp @@ -31,22 +31,22 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path) TQString fileName = url.fileName(false); m_directories = TQStringList::split("/", url.directory()); - if (fileName.startsWith("(") && fileName.contains(")")) + if (fileName.startsWith("(") && fileName.tqcontains(")")) { - m_artist = fileName.mid(1, fileName.find(")") - 1); - m_title = fileName.right(fileName.length() - fileName.find(")") - 1); + m_artist = fileName.mid(1, fileName.tqfind(")") - 1); + m_title = fileName.right(fileName.length() - fileName.tqfind(")") - 1); validateArtist(); } - else if (fileName.startsWith("[") && fileName.contains("]")) + else if (fileName.startsWith("[") && fileName.tqcontains("]")) { - m_artist = fileName.mid(1, fileName.find("]") - 1); - m_title = fileName.right(fileName.length() - fileName.find("]") - 1); + m_artist = fileName.mid(1, fileName.tqfind("]") - 1); + m_title = fileName.right(fileName.length() - fileName.tqfind("]") - 1); validateArtist(); } - else if (fileName.contains("-")) + else if (fileName.tqcontains("-")) { - m_artist = fileName.left(fileName.find("-") - 1); - m_title = fileName.right(fileName.length() - fileName.find("-") - 1); + m_artist = fileName.left(fileName.tqfind("-") - 1); + m_title = fileName.right(fileName.length() - fileName.tqfind("-") - 1); validateArtist(); } else @@ -56,10 +56,10 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path) m_artist = m_directories[m_directories.count() - 2]; } - if (m_title.contains("(") && m_title.find(")", m_title.find("("))) + if (m_title.tqcontains("(") && m_title.tqfind(")", m_title.tqfind("("))) { - unsigned int start = m_title.find("("); - unsigned int end = m_title.find(")"); + unsigned int start = m_title.tqfind("("); + unsigned int end = m_title.tqfind(")"); m_comment = m_title.mid(start + 1, end - start - 1); m_title.truncate(start); } @@ -86,10 +86,10 @@ TQString ParsedMP3FileName::beautifyString(const TQString &s) temp[0] = temp[0].upper(); - unsigned int numSpaces = temp.contains(" "); + unsigned int numSpaces = temp.tqcontains(" "); unsigned int spacePos = 0; while (numSpaces > 0) { - spacePos = temp.find(" ", spacePos == 0? 0 : spacePos + 1); + spacePos = temp.tqfind(" ", spacePos == 0? 0 : spacePos + 1); temp[spacePos + 1] = temp[spacePos + 1].upper(); numSpaces--; } diff --git a/noatun-plugins/lyrics/Makefile.am b/noatun-plugins/lyrics/Makefile.am index ac34a17..1ddb6ef 100644 --- a/noatun-plugins/lyrics/Makefile.am +++ b/noatun-plugins/lyrics/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatunlyrics.la noatunlyrics_la_SOURCES = lyrics.cpp historymanager.cpp cmodule.cpp diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index efc2d77..6f2183f 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -29,7 +29,7 @@ const char *const DEFAULT_NAME = "Everything2," "Everything2 (author info)"; -const char *const DEFAULT_QUERY = +const char *const DEFAULT_TQUERY = "http://www.google.com/search?q=lyrics+$(title)+$(author)+$(album)," "http://www.purelyrics.com/index.php?search_artist=$(author)&search_album=$(album)&search_title=$(title)&search_lyrics=&search_advsubmit2=Search," "http://search.sing365.com/search.php?searchstr=$(title)&submit=search&category=song," @@ -47,23 +47,23 @@ const char *const DEFAULT_QUERY = 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 *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); - vlayout->setStretchFactor( hlayout, 1 ); + TQVBoxLayout *vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + vtqlayout->setStretchFactor( htqlayout, 1 ); // Search box - TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() ); - boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); + TQVBoxLayout *boxtqlayout = new TQVBoxLayout( htqlayout, KDialog::spacingHint() ); + boxtqlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); providersBox = new KListBox( this, "providersBox" ); - boxlayout->addWidget(providersBox); + boxtqlayout->addWidget(providersBox); - boxButtons = new KButtonBox( this, Vertical ); - boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) ); - boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) ); - boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) ); - boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) ); - boxButtons->layout(); - boxlayout->addWidget( boxButtons ); + 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 ); // 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->setAlignment(Qt::WordBreak); - hlayout->addWidget( propBox, 1 ); + textLabel->tqsetAlignment(TQt::WordBreak); + htqlayout->addWidget( propBox, 1 ); /* Signal/slots */ nameEdit->setEnabled( false ); @@ -88,7 +88,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" - vlayout->addStretch(); + vtqlayout->addStretch(); reopen(); save(); } @@ -205,7 +205,7 @@ void LyricsCModule::reopen() { queryList = conf->readListEntry( "queryList" ); nameList = conf->readListEntry( "nameList" ); if ( queryList.count() == 0 && nameList.count() == 0 ) { - queryList = TQStringList::split( ",", DEFAULT_QUERY ); + queryList = TQStringList::split( ",", DEFAULT_TQUERY ); nameList = TQStringList::split( ",", DEFAULT_NAME ); } TQStringList::Iterator queryIt, nameIt; diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h index a7fdc08..7a6ddc1 100644 --- a/noatun-plugins/lyrics/cmodule.h +++ b/noatun-plugins/lyrics/cmodule.h @@ -16,6 +16,7 @@ struct SearchProvider { class LyricsCModule : public CModule { Q_OBJECT + TQ_OBJECT public: LyricsCModule(TQObject *_parent); public slots: diff --git a/noatun-plugins/lyrics/historymanager.cpp b/noatun-plugins/lyrics/historymanager.cpp index 629466d..ac958e3 100644 --- a/noatun-plugins/lyrics/historymanager.cpp +++ b/noatun-plugins/lyrics/historymanager.cpp @@ -4,7 +4,7 @@ *** TODO: Add more complex support (like in Konqueror) Maybe use Konqueror's History Manager */ -HistoryManager::HistoryManager(TQObject *parent) : TQObject(parent) { +HistoryManager::HistoryManager(TQObject *tqparent) : TQObject(tqparent) { } HistoryManager::~HistoryManager() { diff --git a/noatun-plugins/lyrics/historymanager.h b/noatun-plugins/lyrics/historymanager.h index 910e463..7444f5b 100644 --- a/noatun-plugins/lyrics/historymanager.h +++ b/noatun-plugins/lyrics/historymanager.h @@ -7,8 +7,9 @@ class HistoryManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - HistoryManager(TQObject *parent = NULL); + HistoryManager(TQObject *tqparent = NULL); ~HistoryManager(); KURL back(); KURL forward(); diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 1c7a05b..f0c9ebd 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -27,28 +27,28 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) { lyrics = this; /* Create default actions */ - (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); - //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection()); - //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection()); - //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection()); + (void)KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + ( void )KStdAction::goTo( TQT_TQOBJECT(this), TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); + //(void)KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); + //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection()); + //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection()); + //(void)KStdAction::tqfind(TQT_TQOBJECT(this), TQT_SLOT(tqfind()), actionCollection()); follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); - KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection()); + KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection()); attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool))); - back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); + back_act = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection()); back_act->setEnabled(false); - forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection()); + forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection()); forward_act->setEnabled(false); new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); - site_act = new KSelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); + site_act = new KSelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); /* Add entry to menu */ - menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics())); + menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics())); /* Create history manager and htmlpart */ - history = new HistoryManager(this); + history = new HistoryManager(TQT_TQOBJECT(this)); htmlpart = new KHTMLPart(this); //htmlpart->view()->setMinimumSize(350, 420); @@ -59,9 +59,9 @@ 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()) ); - /* Status bar */ + /* tqStatus bar */ statusBar()->insertItem(i18n("Ready"), 0, 1); - statusBar()->setItemAlignment(0, Qt::AlignLeft); + statusBar()->setItemAlignment(0, TQt::AlignLeft); /* Finalize the GUI */ setCentralWidget(htmlpart->view()); @@ -73,7 +73,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) config->setGroup("Lyrics"); follow_act->setChecked(config->readBoolEntry("follow", true)); /* Create config object */ - new LyricsCModule(this); + new LyricsCModule(TQT_TQOBJECT(this)); } @@ -98,7 +98,7 @@ void Lyrics::attach(bool a) { if ( !napp->player()->current() ) return; if (a) { - KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), TQString::null, "lyrics::attach_info"); + KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), TQString(), "lyrics::attach_info"); kdDebug(90020) << "Setting URL for (attach)" << napp->player()->current().title() << endl; napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url()); site_act->setEnabled(false); @@ -122,7 +122,7 @@ void Lyrics::loadedURL() if ( !napp->player()->current() ) return; statusBar()->changeItem(i18n("Loaded"), 0); - setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title"))); + setCaption(i18n("Lyrics: %1").tqarg(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()); @@ -192,11 +192,11 @@ void Lyrics::viewLyrics(int index) int pos = props_regexp.search(url); while (pos >= 0) { TQString property = props_regexp.cap(1); - url.replace(pos, props_regexp.matchedLength(), napp->player()->current().property(property)); + url.tqreplace(pos, props_regexp.matchedLength(), napp->player()->current().property(property)); pos = props_regexp.search(url); } TQString title(napp->player()->current().property("title")); - setCaption(i18n("Loading Lyrics for %1").arg(title)); + setCaption(i18n("Loading Lyrics for %1").tqarg(title)); // Check if we have a music playing if (napp->player()->current()) { htmlpart->begin(); @@ -207,32 +207,32 @@ 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>").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) ); + "</TABLE>").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( 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()) { /* Use the query one */ _url = url; - _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); + _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the query url" << endl; 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>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) ); + 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() ) ); } else { _url = napp->player()->current().property("Lyrics::URL"); - _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); + _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the stored url" << endl; 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>" ).arg( _url.prettyURL() ).arg( _url.url() ) ); + 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( "</BODY></HTML>" ); htmlpart->end(); go(_url); this->show(); - KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), TQString::null, "Lyrics::usage_info" ); + KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), TQString(), "Lyrics::usage_info" ); active = true; } } diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h index 362c7a4..1011f0a 100644 --- a/noatun-plugins/lyrics/lyrics.h +++ b/noatun-plugins/lyrics/lyrics.h @@ -14,6 +14,7 @@ class HistoryManager; class Lyrics : public KMainWindow, public Plugin { Q_OBJECT + TQ_OBJECT public: Lyrics(); diff --git a/noatun-plugins/nexscope/Makefile.am b/noatun-plugins/nexscope/Makefile.am index d182ff1..79e0b94 100644 --- a/noatun-plugins/nexscope/Makefile.am +++ b/noatun-plugins/nexscope/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) $(SDL_CFLAGS) +INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde METASOURCES = AUTO diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index 9a4776e..d483a22 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -10,23 +10,23 @@ #include "renderers.h" #include "nex.h" -class CreatorItem : public QListViewItem +class CreatorItem : public TQListViewItem { public: - CreatorItem(TQListView *parent, const TQString &title) - : TQListViewItem(parent, title) + CreatorItem(TQListView *tqparent, const TQString &title) + : TQListViewItem(tqparent, title) {} }; -class TreeItem : public QListViewItem +class TreeItem : public TQListViewItem { public: - TreeItem(TreeItem *parent, TreeItem *after, CreatorItem *creator) - : TQListViewItem(parent, after, creator->text(0)) + TreeItem(TreeItem *tqparent, TreeItem *after, CreatorItem *creator) + : TQListViewItem(tqparent, after, creator->text(0)) { RendererList *list; - if (parent) - list=static_cast<RendererList*>(parent->mRenderer); + if (tqparent) + list=static_cast<RendererList*>(tqparent->mRenderer); else list=nex->rendererList(); @@ -35,15 +35,15 @@ public: afterRenderer=after->mRenderer; list->lock(); - int pos=list->renderers().findRef(afterRenderer); + int pos=list->renderers().tqfindRef(afterRenderer); if (pos==-1) pos=list->renderers().count(); list->renderers().insert((uint)pos, mRenderer=nex->renderer(creator->text(0))); list->unlock(); } - TreeItem(TQListView *parent, TreeItem *after, const TQString &title) - : TQListViewItem(parent, after, title) + TreeItem(TQListView *tqparent, TreeItem *after, const TQString &title) + : TQListViewItem(tqparent, after, title) { mRenderer=nex->rendererList(); setExpandable(true); @@ -52,8 +52,8 @@ public: ~TreeItem() { RendererList *list; - if (parent()) - list=static_cast<RendererList*>(static_cast<TreeItem*>(parent())->mRenderer); + if (tqparent()) + list=static_cast<RendererList*>(static_cast<TreeItem*>(tqparent())->mRenderer); else return; @@ -149,9 +149,9 @@ void Control::addCreator(const TQString &title) new CreatorItem(mCreatorsList, title); } -void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter) +void Control::dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter) { -// if ((e->source() == mCreatorsList) && parent) +// if ((e->source() == mCreatorsList) && tqparent) { CreatorItem *i=static_cast<CreatorItem*>(mCreatorsList->currentItem()); if (!i) @@ -159,7 +159,7 @@ void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem * std::cerr << "no creatoritem" << std::endl; } - new TreeItem(static_cast<TreeItem*>(parent), static_cast<TreeItem*>(pafter), i); + new TreeItem(static_cast<TreeItem*>(tqparent), static_cast<TreeItem*>(pafter), i); } } diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h index 3fea2ae..a96e137 100644 --- a/noatun-plugins/nexscope/gui.h +++ b/noatun-plugins/nexscope/gui.h @@ -13,6 +13,7 @@ class Renderer; class Control : public KMainWindow { Q_OBJECT + TQ_OBJECT public: Control(); @@ -28,7 +29,7 @@ public slots: void open(const KURL &file); protected slots: - void dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter); + void dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter); void currentChanged(TQListViewItem *item); private: @@ -42,6 +43,7 @@ private: class RendererListView : public KListView { Q_OBJECT + TQ_OBJECT public: RendererListView(TQWidget *p); diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index c152c95..e7e4332 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -56,9 +56,9 @@ int Thread::threadRun(void *v) return t->run(); } -NexCheckBox::NexCheckBox(TQWidget *parent, +NexCheckBox::NexCheckBox(TQWidget *tqparent, const TQString &name, bool *v) - : TQCheckBox(name, parent) + : TQCheckBox(name, tqparent) { value=v; setChecked(*v); @@ -71,8 +71,8 @@ void NexCheckBox::change(bool b) -NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) - : KColorButton(parent) +NexColorButton::NexColorButton(TQWidget *tqparent, Pixel *color) + : KColorButton(tqparent) { c=color; TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); @@ -82,7 +82,7 @@ NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) void NexColorButton::change(const TQColor &co) { - *c= COLOR(qRed(co.rgb()), qGreen(co.rgb()), qBlue(co.rgb())); + *c= COLOR(tqRed(co.rgb()), tqGreen(co.rgb()), tqBlue(co.rgb())); } void Bitmap::resize(int w, int h) @@ -401,13 +401,13 @@ void RendererList::load(const TQDomElement &e) -TQWidget *RendererList::configure(TQWidget *parent) +TQWidget *RendererList::configure(TQWidget *tqparent) { - return new RendererListConfigurator(this, parent); + return new RendererListConfigurator(this, tqparent); } -RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *parent) - : TQWidget(parent), mList(l) +RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *tqparent) + : TQWidget(tqparent), mList(l) { (new TQVBoxLayout(this))->setAutoAdd(true); mErase=new TQCheckBox(i18n("&Erase between frames"), this); diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h index c9477f2..8340b67 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").arg(TQString::number((pixel>>16) & 8, 16)) \ - .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16)) + TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \ + .tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16)) #define STRCOLOR(pixel) \ Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \ @@ -72,13 +72,14 @@ private: SDL_Thread *mThread; }; -class Spacer : public QWidget +class Spacer : public TQWidget { Q_OBJECT + TQ_OBJECT public: - Spacer(TQWidget *parent) : TQWidget(parent) + Spacer(TQWidget *tqparent) : TQWidget(tqparent) { - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); } }; @@ -220,11 +221,12 @@ private: #include <tqcheckbox.h> #include <kcolorbutton.h> -class NexCheckBox : public QCheckBox +class NexCheckBox : public TQCheckBox { Q_OBJECT + TQ_OBJECT public: - NexCheckBox(TQWidget *parent, const TQString &, bool *v); + NexCheckBox(TQWidget *tqparent, const TQString &, bool *v); private slots: void change(bool b); @@ -237,8 +239,9 @@ private: class NexColorButton : public KColorButton { Q_OBJECT + TQ_OBJECT public: - NexColorButton(TQWidget *parent, Pixel *color); + NexColorButton(TQWidget *tqparent, Pixel *color); private slots: void change(const TQColor &c); @@ -266,11 +269,12 @@ class TQCheckBox; class TQMultiLineEdit; class RendererList; -class RendererListConfigurator : public QWidget +class RendererListConfigurator : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RendererListConfigurator(RendererList *l, TQWidget *parent); + RendererListConfigurator(RendererList *l, TQWidget *tqparent); ~RendererListConfigurator(); public slots: @@ -299,7 +303,7 @@ public: bool clearAfter() const { return mClearAfter; } void setClearAfter(bool b) { mClearAfter=b; } - virtual TQWidget *configure(TQWidget *parent); + virtual TQWidget *configure(TQWidget *tqparent); virtual void save(TQDomElement &e); diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index e0b3d28..64b6f4f 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -45,5 +45,5 @@ void NexPlugin::processExited(KProcess *) unload(); } -#include "noatunplugin.moc" +#include "noatunplugin.tqmoc" diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h index d1b0ec8..47098c5 100644 --- a/noatun-plugins/nexscope/noatunplugin.h +++ b/noatun-plugins/nexscope/noatunplugin.h @@ -7,6 +7,7 @@ class NexPlugin : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT public: NexPlugin(); diff --git a/noatun-plugins/nexscope/output.cpp b/noatun-plugins/nexscope/output.cpp index 84885e2..09bfbd2 100644 --- a/noatun-plugins/nexscope/output.cpp +++ b/noatun-plugins/nexscope/output.cpp @@ -36,7 +36,7 @@ int OutputSDL::display(Bitmap *source) { switch (event.type) { - case SDL_QUIT: + case SDL_TQUIT: return Exit; default: break; diff --git a/noatun-plugins/nexscope/regionwidget.cpp b/noatun-plugins/nexscope/regionwidget.cpp index 119096b..d760619 100644 --- a/noatun-plugins/nexscope/regionwidget.cpp +++ b/noatun-plugins/nexscope/regionwidget.cpp @@ -1,23 +1,23 @@ #include "regionwidget.h" -RegionWidget::RegionWidget(TQWidget *parent) +RegionWidget::RegionWidget(TQWidget *tqparent) { } -RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *parent) +RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *tqparent) { } RegionWidget::RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, - TQWidget *parent) + TQWidget *tqparent) { } RegionWidget::RegionWidget(const TQRect ®ion, const TQSize &viewsize, - TQWidget *parent) + TQWidget *tqparent) { } diff --git a/noatun-plugins/nexscope/regionwidget.h b/noatun-plugins/nexscope/regionwidget.h index 38c919a..ee975ee 100644 --- a/noatun-plugins/nexscope/regionwidget.h +++ b/noatun-plugins/nexscope/regionwidget.h @@ -9,15 +9,16 @@ * text boxes allow the region to be resized and moved, along with * click-n-drag **/ -class RegionWidget : public QFrame +class RegionWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - RegionWidget(TQWidget *parent); - RegionWidget(const TQSize &viewsize, TQWidget *parent); + RegionWidget(TQWidget *tqparent); + RegionWidget(const TQSize &viewsize, TQWidget *tqparent); RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, - TQWidget *parent); - RegionWidget(const TQRect ®ion, const TQSize &viewsize, TQWidget *parent); + TQWidget *tqparent); + RegionWidget(const TQRect ®ion, const TQSize &viewsize, TQWidget *tqparent); ~RegionWidget(); diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp index f5e97c9..37db147 100644 --- a/noatun-plugins/nexscope/renderers.cpp +++ b/noatun-plugins/nexscope/renderers.cpp @@ -6,7 +6,7 @@ #include <tqlayout.h> #include <klocale.h> -struct HorizontalPair : public Renderer +structQt::HorizontalPair : public Renderer { HorizontalPair() : color(0x578cd8) { @@ -15,9 +15,9 @@ struct HorizontalPair : public Renderer pair=true; } - TQWidget *configure(TQWidget *parent) + TQWidget *configure(TQWidget *tqparent) { - TQWidget *config=new TQWidget(parent); + TQWidget *config=new TQWidget(tqparent); (new TQVBoxLayout(config))->setAutoAdd(true); new NexColorButton(config, &color); diff --git a/noatun-plugins/nexscope/renderers.h b/noatun-plugins/nexscope/renderers.h index 5d75eeb..e23304a 100644 --- a/noatun-plugins/nexscope/renderers.h +++ b/noatun-plugins/nexscope/renderers.h @@ -23,7 +23,7 @@ Renderer *function(); REGISTER(fade, Fade) REGISTER(doubler, Doubler) -REGISTER(waveform, HorizontalPair); +REGISTER(waveform,Qt::HorizontalPair); REGISTER(hartley, Hartley); #undef REGISTER diff --git a/noatun-plugins/noatunmadness/Makefile.am b/noatun-plugins/noatunmadness/Makefile.am index 973ae51..e3a6d17 100644 --- a/noatun-plugins/noatunmadness/Makefile.am +++ b/noatun-plugins/noatunmadness/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatunmadness.la noatunmadness_la_SOURCES = madness.cpp diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 7027029..81fa2c4 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -55,7 +55,7 @@ void Madness::update() for (; it != mWindowList.end(); ++it) { TQRect area=KWin::info(*it).frameGeometry; - if (!mOriginalPositions.contains(*it)) + if (!mOriginalPositions.tqcontains(*it)) mOriginalPositions.insert(*it, area.topLeft()); } } diff --git a/noatun-plugins/noatunmadness/madness.h b/noatun-plugins/noatunmadness/madness.h index 8076d0a..c48c676 100644 --- a/noatun-plugins/noatunmadness/madness.h +++ b/noatun-plugins/noatunmadness/madness.h @@ -10,6 +10,7 @@ class Madness : public TQObject, public MonoFFTScope, public Plugin { Q_OBJECT + TQ_OBJECT public: Madness(); virtual ~Madness(); diff --git a/noatun-plugins/oblique/Makefile.am b/noatun-plugins/oblique/Makefile.am index 09b200c..4b2789c 100644 --- a/noatun-plugins/oblique/Makefile.am +++ b/noatun-plugins/oblique/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . schemas -INCLUDES= -I$(top_srcdir)/noatun/library $(all_includes) +INCLUDES= -I$(top_srcdir)/noatun/library $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatun_oblique.la noatun_oblique_la_SOURCES = base.cpp kbuffer.cpp query.cpp oblique.cpp tree.cpp file.cpp selector.cpp menu.cpp cmodule.cpp kdatacollection.cpp view.cpp diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp index c9e6fb6..6288f20 100644 --- a/noatun-plugins/oblique/base.cpp +++ b/noatun-plugins/oblique/base.cpp @@ -133,7 +133,7 @@ File Base::add(const TQString &file) return File(); } -File Base::find(FileId id) +File Base::tqfind(FileId id) { if (id == 0) return File(); @@ -155,7 +155,7 @@ void Base::clear() { for (FileId id = high(); id >= 1; id--) { - File f = find(id); + File f = tqfind(id); if (f) f.remove(); } @@ -171,7 +171,7 @@ File Base::first(FileId first) { if (first > high()) return File(); - while (!find(first)) + while (!tqfind(first)) { ++first; if (first > high()) @@ -183,8 +183,8 @@ File Base::first(FileId first) TQString Base::property(FileId id, const TQString &property) const { loadIntoCache(id); - if (!d->cachedProperties.contains(property)) return TQString::null; - TQMap<TQString,TQString>::Iterator i = d->cachedProperties.find(property); + if (!d->cachedProperties.tqcontains(property)) return TQString(); + TQMap<TQString,TQString>::Iterator i = d->cachedProperties.tqfind(property); return i.data(); } diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h index 611c5fe..948ec78 100644 --- a/noatun-plugins/oblique/base.h +++ b/noatun-plugins/oblique/base.h @@ -15,9 +15,10 @@ class Slice; typedef unsigned int FileId; -class Base : public QObject +class Base : public TQObject { Q_OBJECT + TQ_OBJECT struct Private; Private *d; // not for BC, but for compile times :) @@ -31,7 +32,7 @@ public: File add(const TQString &file); - File find(FileId id); + File tqfind(FileId id); void clear(); @@ -95,7 +96,7 @@ private: // friends for Slice private: /** - * load the xml that lives at the head of the db and contains + * load the xml that lives at the head of the db and tqcontains * potentially lots of structured data **/ void loadMetaXML(const TQString &xml); diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index 729ff54..5df19b0 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -28,17 +28,17 @@ #include <tqtabwidget.h> #include <tqheader.h> -SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) - : TQWidget(parent) +SchemaConfig::SchemaConfig(TQWidget *tqparent, Oblique *oblique) + : TQWidget(tqparent) { mOblique = oblique; mIgnore = true; mRegexpEditor=0; { - TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7); - layout->setAutoAdd(true); - layout->setSpacing(7); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7); + tqlayout->setAutoAdd(true); + tqlayout->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 children become direct children of this node's parent")); + TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's tqparent")); connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); @@ -176,14 +176,14 @@ class QueryGroupItem : public KListViewItem QueryGroup *mItem; public: - QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0) - : KListViewItem(parent, after) + QueryGroupItem(QueryGroupItem *tqparent, QueryGroup *group, QueryGroupItem *after=0) + : KListViewItem(tqparent, after) { init(group); } - QueryGroupItem(KListView *parent, QueryGroup *group, QueryGroupItem *after=0) - : KListViewItem(parent, after) + QueryGroupItem(KListView *tqparent, QueryGroup *group, QueryGroupItem *after=0) + : KListViewItem(tqparent, after) { init(group); } @@ -198,8 +198,8 @@ public: setText(2, item()->presentation()); } - QueryGroupItem *parent() - { return static_cast<QueryGroupItem*>(KListViewItem::parent()); } + QueryGroupItem *tqparent() + { return static_cast<QueryGroupItem*>(KListViewItem::tqparent()); } KListView *listView() { return static_cast<KListView*>(KListViewItem::listView()); } @@ -218,8 +218,8 @@ private: { if (QueryGroup *after = group->nextSibling()) { - if (parent()) - new QueryGroupItem(parent(), after, this); + if (tqparent()) + new QueryGroupItem(tqparent(), after, this); else new QueryGroupItem(listView(), after, this); } @@ -272,7 +272,7 @@ void SchemaConfig::save() TQString SchemaConfig::nameToFilename(const TQString &_name) { TQString name = _name; - name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_"); + name = name.tqreplace(TQRegExp("[^a-zA-Z0-9]"), "_"); return name; } @@ -288,7 +288,7 @@ void SchemaConfig::newSchema() TQString filename = nameToFilename(str); - if (mQueries.contains(nameToFilename(filename))) return; + if (mQueries.tqcontains(nameToFilename(filename))) return; QueryItem queryitem; queryitem.query = Query(); @@ -312,7 +312,7 @@ void SchemaConfig::copySchema() TQString filename = nameToFilename(str); - if (mQueries.contains(nameToFilename(filename))) return; + if (mQueries.tqcontains(nameToFilename(filename))) return; QueryItem queryitem; queryitem.query = currentQuery()->query; @@ -355,7 +355,7 @@ void SchemaConfig::editValueRegexp() { mRegexpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( - "KRegExpEditor/KRegExpEditor", TQString::null, this + "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); } @@ -413,7 +413,7 @@ void SchemaConfig::move(TQListViewItem *_item, TQListViewItem *, TQListViewItem QueryGroupItem *afterNow = static_cast<QueryGroupItem*>(_afterNow); QueryGroup *after, *under; - under = item->parent() ? item->parent()->item() : 0; + under = item->tqparent() ? item->tqparent()->item() : 0; after = afterNow ? afterNow->item() : 0; item->item()->move(¤tQuery()->query, under, after); @@ -436,8 +436,8 @@ void SchemaConfig::addSibling() // now match the action in the tree QueryGroupItem *created; - if (item->parent()) - created = new QueryGroupItem(item->parent(), g, item); + if (item->tqparent()) + created = new QueryGroupItem(item->tqparent(), g, item); else created = new QueryGroupItem(item->listView(), g, item); @@ -500,8 +500,8 @@ SchemaConfig::QueryItem *SchemaConfig::currentQuery() } -SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) - : TQWidget(parent) +SliceConfig::SliceConfig(TQWidget *tqparent, Oblique *oblique) + : TQWidget(tqparent) { mOblique = oblique; (new TQVBoxLayout(this, 11, 7))->setAutoAdd(true); @@ -539,16 +539,16 @@ class SliceListItem : public KListViewItem { Slice *mSlice; public: - SliceListItem(KListView *parent, Slice *slice) - : KListViewItem(parent, slice->name()), mSlice(slice) + SliceListItem(KListView *tqparent, Slice *slice) + : KListViewItem(tqparent, slice->name()), mSlice(slice) { } /** * new item **/ - SliceListItem(KListView *parent) - : KListViewItem(parent, i18n("New Slice")), mSlice(0) + SliceListItem(KListView *tqparent) + : KListViewItem(tqparent, i18n("New Slice")), mSlice(0) { } @@ -621,7 +621,7 @@ void SliceConfig::addSibling() void SliceConfig::removeSelf() { SliceListItem *r = currentItem(); - if (mAddedItems.contains(r)) + if (mAddedItems.tqcontains(r)) { mAddedItems.remove(r); } diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h index e935051..39bc7a9 100644 --- a/noatun-plugins/oblique/cmodule.h +++ b/noatun-plugins/oblique/cmodule.h @@ -16,9 +16,10 @@ class TQComboBox; class TQPushButton; class TQTabWidget; -class SchemaConfig : public QWidget +class SchemaConfig : public TQWidget { Q_OBJECT + TQ_OBJECT Oblique *mOblique; KListView *mSchemaTree; @@ -44,7 +45,7 @@ Q_OBJECT TQMap<TQString, QueryItem> mQueries; public: - SchemaConfig(TQWidget *parent, Oblique *oblique); + SchemaConfig(TQWidget *tqparent, Oblique *oblique); Oblique *oblique() { return mOblique; } @@ -81,9 +82,10 @@ private: class SliceListItem; -class SliceConfig : public QWidget +class SliceConfig : public TQWidget { Q_OBJECT + TQ_OBJECT Oblique *mOblique; KListView *mSliceList; TQPushButton *mAdd, *mRemove; @@ -91,7 +93,7 @@ Q_OBJECT TQValueList<Slice*> mRemovedItems; public: - SliceConfig(TQWidget *parent, Oblique *oblique); + SliceConfig(TQWidget *tqparent, Oblique *oblique); Oblique *oblique() { return mOblique; } void reopen(); @@ -108,12 +110,13 @@ private slots: class Configure : public CModule { Q_OBJECT + TQ_OBJECT TQTabWidget *tabs; SchemaConfig *schema; SliceConfig *slice; public: - Configure(Oblique *parent); + Configure(Oblique *tqparent); virtual void reopen(); virtual void save(); diff --git a/noatun-plugins/oblique/kbuffer.cpp b/noatun-plugins/oblique/kbuffer.cpp index f54110e..04a28fb 100644 --- a/noatun-plugins/oblique/kbuffer.cpp +++ b/noatun-plugins/oblique/kbuffer.cpp @@ -33,12 +33,16 @@ void KBuffer::flush(){ } /** query buffer size */ -Q_ULONG KBuffer::size() const { +#ifdef USE_QT4 +qint64 KBuffer::size() const { +#else // USE_QT4 +TQ_ULONG KBuffer::size() const { +#endif // USE_QT4 return buf.size(); } /** read a block of memory from buffer, advances read/write position */ -Q_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) { +TQ_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) { int len; if ((long unsigned)(buf.end()-bufPos) > maxLen) len = maxLen; @@ -52,7 +56,7 @@ Q_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) { } /** write a block of memory into buffer */ -Q_LONG KBuffer::writeBlock(const char *data, long unsigned int len){ +TQ_LONG KBuffer::writeBlock(const char *data, long unsigned int len){ int pos = bufPos-buf.begin(); copy(data, data+len, inserter(buf,bufPos)); bufPos = buf.begin() + pos + len; diff --git a/noatun-plugins/oblique/kbuffer.h b/noatun-plugins/oblique/kbuffer.h index 63e626b..0341fef 100644 --- a/noatun-plugins/oblique/kbuffer.h +++ b/noatun-plugins/oblique/kbuffer.h @@ -21,15 +21,19 @@ public: /** open a memory buffer */ bool open(int mode); /** read in a block of memory */ - Q_LONG readBlock(char* data, long unsigned int maxLen); + TQ_LONG readBlock(char* data, long unsigned int maxLen); /** query buffer size */ - Q_ULONG size() const; +#ifdef USE_QT4 + qint64 size() const; +#else // USE_QT4 + TQ_ULONG size() const; +#endif // USE_QT4 /** No descriptions */ void flush(); /** Close buffer */ void close(); /** write a block of memory */ - Q_LONG writeBlock(const char *data, long unsigned int maxLen); + TQ_LONG writeBlock(const char *data, long unsigned int maxLen); /** read a byte */ int getch(); /** undo last getch() @@ -40,6 +44,12 @@ public: void* data() { return &buf[0]; } + +#ifdef USE_QT4 + virtual inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); } + virtual inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); } +#endif // USE_QT4 + private: std::vector<char> buf; std::vector<char>::iterator bufPos; diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp index ed57aea..fc92093 100644 --- a/noatun-plugins/oblique/kdatacollection.cpp +++ b/noatun-plugins/oblique/kdatacollection.cpp @@ -85,7 +85,7 @@ TQStringList KDataCollection::names() const { TQFileInfo fi(*i); TQString name = fi.fileName(); - if (!n.contains(name)) + if (!n.tqcontains(name)) { total.append(name); } @@ -108,7 +108,7 @@ void KDataCollection::remove(const TQString &name) } TQStringList n = g.readListEntry(mEntry); - if (n.contains(name)) return; + if (n.tqcontains(name)) return; n.append(name); g.writeEntry(mEntry, n); } @@ -137,7 +137,7 @@ TQString KDataCollection::saveFile(const TQString &name, bool create) } return s; } - return TQString::null; + return TQString(); } diff --git a/noatun-plugins/oblique/kdbt.h b/noatun-plugins/oblique/kdbt.h index 4ecc71a..ec3f25e 100644 --- a/noatun-plugins/oblique/kdbt.h +++ b/noatun-plugins/oblique/kdbt.h @@ -18,7 +18,7 @@ template <typename T> class KDbt : public Dbt { public: - /* assume streaming operators on QDataStream + /* assume streaming operators on TQDataStream TQDataStream & operator>> ( TQDataStream& >>, T &); TQDataStream & operator<< ( TQDataStream& >>, T &); */ diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index 3867f19..ae22592 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -7,8 +7,8 @@ #include "tree.h" -FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) - : KPopupMenu(parent) +FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, File file) + : KPopupMenu(tqparent) { if (file) mFiles.append(file); @@ -20,8 +20,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) (new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(toggleInSlice(Slice *)), - mFiles, this + TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)), + mFiles, TQT_TQOBJECT(this) ))->plug(this); } @@ -39,8 +39,8 @@ static void addTo(TQValueList<File> &files, TreeItem *item) } } -FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) - : KPopupMenu(parent) +FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *items) + : KPopupMenu(tqparent) { addTo(mFiles, items); @@ -52,8 +52,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) (new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(toggleInSlice(Slice *)), - mFiles, this + TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)), + mFiles,TQT_TQOBJECT(this) ))->plug(this); } @@ -67,7 +67,7 @@ void FileMenu::removeFromList() void FileMenu::properties() { - new ObliquePropertiesDialog(mFiles, parentWidget()); + new ObliquePropertiesDialog(mFiles, tqparentWidget()); } void FileMenu::toggleInSlice(Slice *slice) @@ -92,8 +92,8 @@ void FileMenu::toggleInSlice(Slice *slice) SliceListAction::SliceListAction( const TQString &text, Oblique *oblique, TQObject *reciever, const char *slot, - const TQValueList<File> &files, TQObject *parent, const char *name - ) : KActionMenu(text, parent, name) + const TQValueList<File> &files, TQObject *tqparent, const char *name + ) : KActionMenu(text, tqparent, name) { mFiles = files; mOblique = oblique; @@ -153,8 +153,8 @@ void SliceListAction::hit(int index) SchemaListAction::SchemaListAction( const TQString &text, TQObject *reciever, const char *slot, - TQObject *parent, const char *name - ) : KActionMenu(text, parent, name) + TQObject *tqparent, const char *name + ) : KActionMenu(text, tqparent, name) { mTree = 0; if (reciever) @@ -197,8 +197,8 @@ void SchemaListAction::hit(int index) -ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent) - : KPropertiesDialog(makeItems(files), parent), mFiles(files) +ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent) + : KPropertiesDialog(makeItems(files), tqparent), mFiles(files) { connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater())); connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified())); diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h index da464dc..1c12fa7 100644 --- a/noatun-plugins/oblique/menu.h +++ b/noatun-plugins/oblique/menu.h @@ -17,14 +17,15 @@ class FileMenu : public KPopupMenu { Q_OBJECT + TQ_OBJECT TQValueList<File> mFiles; public: - FileMenu(TQWidget *parent, Oblique *oblique, File file); + FileMenu(TQWidget *tqparent, Oblique *oblique, File file); /** * @recursively uses everything under @p files **/ - FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *files); + FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *files); private slots: void removeFromList(); @@ -35,6 +36,7 @@ private slots: class SliceListAction : public KActionMenu { Q_OBJECT + TQ_OBJECT TQMap<int, Slice*> mIndexToSlices; TQValueList<File> mFiles; Oblique *mOblique; @@ -43,7 +45,7 @@ public: SliceListAction( const TQString &text, Oblique *oblique, TQObject *reciever, const char *slot, - const TQValueList<File> &files = TQValueList<File>(), TQObject *parent=0, const char *name=0 + const TQValueList<File> &files = TQValueList<File>(), TQObject *tqparent=0, const char *name=0 ); signals: @@ -58,6 +60,7 @@ private slots: class SchemaListAction : public KActionMenu { Q_OBJECT + TQ_OBJECT TQMap<int, TQString> mIndexToSchemas; Tree *mTree; @@ -65,7 +68,7 @@ public: SchemaListAction( const TQString &text, TQObject *reciever, const char *slot, - TQObject *parent, const char *name + TQObject *tqparent, const char *name ); void setTree(Tree *tree) { mTree = tree; } @@ -82,10 +85,11 @@ private slots: class ObliquePropertiesDialog : public KPropertiesDialog { Q_OBJECT + TQ_OBJECT TQValueList<File> mFiles; public: - ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent); + ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent); private: static KFileItemList makeItems(const TQValueList<File> &files); diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index 234833a..e297e2b 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -215,7 +215,7 @@ void Loader::loadItemsDeferred() return; } - File f = mBase->find(mDeferredLoaderAt); + File f = mBase->tqfind(mDeferredLoaderAt); if (f) { diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h index f7e6bc8..8755e55 100644 --- a/noatun-plugins/oblique/oblique.h +++ b/noatun-plugins/oblique/oblique.h @@ -1,8 +1,8 @@ // Copyright (c) 2003-2005 Charles Samuels <charles@kde.org> // See the file COPYING for redistribution terms. -#ifndef OBLIQUE_H -#define OBLIQUE_H +#ifndef OBLITQUE_H +#define OBLITQUE_H #include <noatun/playlist.h> #include <noatun/plugin.h> @@ -27,6 +27,7 @@ namespace KIO class Oblique : public Playlist, public Plugin { Q_OBJECT + TQ_OBJECT View *mView; Base *mBase; Selector *mSelector; @@ -86,9 +87,10 @@ private slots: /** * loads the database into a Tree **/ -class Loader : public QObject +class Loader : public TQObject { Q_OBJECT + TQ_OBJECT // the id of the next file to load FileId mDeferredLoaderAt; Tree *mTree; @@ -109,9 +111,10 @@ private slots: * emits @ref done() when finished so you * can delete it **/ -class DirectoryAdder : public QObject +class DirectoryAdder : public TQObject { Q_OBJECT + TQ_OBJECT Oblique *mOblique; KURL::List pendingAddDirectories; KURL::List::Iterator lastAddedSubDirectory; diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index 8c85b59..0727ca6 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -171,7 +171,7 @@ TQString QueryGroup::presentation(const File &file) const uint len=counter.cap(1).length()-1; // and half them, and remove one more - format.replace(start-1, len/2+1, ""); + format.tqreplace(start-1, len/2+1, ""); start=start-1+len/2+find.cap(1).length()+3; continue; } @@ -186,7 +186,7 @@ TQString QueryGroup::presentation(const File &file) const uint len=counter.cap(1).length(); // and half them - format.replace(start, len/2, ""); + format.tqreplace(start, len/2, ""); start=start+len/2; } @@ -250,12 +250,12 @@ TQString QueryGroup::presentation(const File &file) const if (propval.length()) { propval = prefix+propval+suffix; - format.replace(start, i+2, propval); + format.tqreplace(start, i+2, propval); start += propval.length(); } else { - format.replace(start, i+2, ""); + format.tqreplace(start, i+2, ""); } } return format; @@ -283,10 +283,10 @@ Query &Query::operator =(const Query ©) if (© == this) return *this; delete mGroupFirst; mGroupFirst=0; - if (const QueryGroup *parent = copy.firstChild()) + if (const QueryGroup *tqparent = copy.firstChild()) { - mGroupFirst = new QueryGroup(*parent); - deepCopy(parent->firstChild(), mGroupFirst); + mGroupFirst = new QueryGroup(*tqparent); + deepCopy(tqparent->firstChild(), mGroupFirst); } return *this; } @@ -321,7 +321,7 @@ void Query::clear() TQString Query::load(const TQString &filename) { TQFile file(filename); - unless (file.open(IO_ReadOnly)) return TQString::null; + unless (file.open(IO_ReadOnly)) return TQString(); TQDomDocument doc; doc.setContent(&file); @@ -346,7 +346,7 @@ TQString Query::load(TQDomElement element) } else { - return TQString::null; + return TQString(); } // for internationalization: @@ -383,7 +383,7 @@ void Query::save(const TQString &name, const TQString &filename) // scourge elimination TQString data = doc.toString(); TQString old = data; - while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) + while (data.tqreplace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) { old = data; } @@ -422,8 +422,8 @@ static void dump(QueryGroup *item, int depth) { for (int d = 0; d < depth; d++) std::cerr << " "; - std::cerr << "prop: " << item->propertyName().utf8() << " pres: " - << item->presentation().utf8() << std::endl; + std::cerr << "prop: " << item->propertyName().utf8().data() << " pres: " + << item->presentation().utf8().data() << std::endl; dump(item->firstChild(), depth+1); } while ((item = item->nextSibling())); @@ -438,17 +438,17 @@ void Query::dump() -void Query::loadGroup(TQDomElement element, QueryGroup *parent) +void Query::loadGroup(TQDomElement element, QueryGroup *tqparent) { TQDomNode node = element.firstChild(); QueryGroup *group = new QueryGroup; - if (parent) + if (tqparent) { - if (QueryGroup *last = parent->lastChild()) + if (QueryGroup *last = tqparent->lastChild()) last->setNextSibling(group); else - parent->setFirstChild(group); + tqparent->setFirstChild(group); } else { @@ -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() == "childrenvisible") + else if (e.tagName().lower() == "tqchildrenvisible") group->setOption(QueryGroup::ChildrenVisible, true); else if (e.tagName().lower() == "autoopen") group->setOption(QueryGroup::AutoOpen, true); @@ -500,11 +500,11 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent) } } -void Query::saveGroup(TQDomElement &parent, QueryGroup *group) +void Query::saveGroup(TQDomElement &tqparent, QueryGroup *group) { - TQDomDocument doc = parent.ownerDocument(); + TQDomDocument doc = tqparent.ownerDocument(); TQDomElement element = doc.createElement("group"); - parent.appendChild(element); + tqparent.appendChild(element); TQDomElement childe; TQDomText childtext; @@ -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("childrenvisible")); + childe.appendChild(doc.createElement("tqchildrenvisible")); if (group->option(QueryGroup::AutoOpen)) childe.appendChild(doc.createElement("autoopen")); } diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h index e8a8d23..60478ff 100644 --- a/noatun-plugins/oblique/query.h +++ b/noatun-plugins/oblique/query.h @@ -1,8 +1,8 @@ // Copyright (c) 2003 Charles Samuels <charles@kde.org> // See the file COPYING for redistribution terms. -#ifndef QUERY_H -#define QUERY_H +#ifndef TQUERY_H +#define TQUERY_H #include "base.h" @@ -99,7 +99,7 @@ private: **/ TQString fuzzify(const TQString &str) const; /** - * @returns the previous or parent of this item (slow) + * @returns the previous or tqparent of this item (slow) **/ QueryGroup *previous(Query *query); QueryGroup *previous(QueryGroup *startWith); @@ -160,8 +160,8 @@ public: TQString dbname(Base *base); private: - void loadGroup(TQDomElement element, QueryGroup *parent=0); - void saveGroup(TQDomElement &parent, QueryGroup *group); + void loadGroup(TQDomElement element, QueryGroup *tqparent=0); + void saveGroup(TQDomElement &tqparent, QueryGroup *group); void deepCopy(const QueryGroup *from, QueryGroup *toParent); diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp index f28c333..004cf91 100644 --- a/noatun-plugins/oblique/selector.cpp +++ b/noatun-plugins/oblique/selector.cpp @@ -129,7 +129,7 @@ Item *SequentialSelector::current() void SequentialSelector::setCurrent(const Item &item) { - TreeItem *current = mTree->find(item.itemFile()); + TreeItem *current = mTree->tqfind(item.itemFile()); setCurrent(current); } @@ -210,7 +210,7 @@ Item *RandomSelector::current() void RandomSelector::setCurrent(const Item &item) { - setCurrent(mTree->find(item.itemFile()), 0); + setCurrent(mTree->tqfind(item.itemFile()), 0); } void RandomSelector::setCurrent(TreeItem *item, TreeItem *previous) diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 0087b99..430d4cf 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -76,7 +76,7 @@ static void treeItemSort(TreeItem **begin, TreeItem **end) static void treeItemSort(TreeItem *first) { - const int count = first->parent() ? first->parent()->childCount() : first->listView()->childCount(); + const int count = first->tqparent() ? first->tqparent()->childCount() : first->listView()->childCount(); if (count < 2) return; Query *q = first->tree()->query(); @@ -149,28 +149,28 @@ inline static void sortify(T *item) } -TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p) - : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) +TreeItem::TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p) + : KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) { if (mFile = file) - parent->mPlayableItemCount++; + tqparent->mPlayableItemCount++; } - sortify(parent); + sortify(tqparent); } -TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p) - : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) +TreeItem::TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p) + : KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) { if (mFile = file) - parent->tree()->mPlayableItemCount++; + tqparent->tree()->mPlayableItemCount++; } - sortify(parent); + sortify(tqparent); } TreeItem::~TreeItem() @@ -180,7 +180,7 @@ TreeItem::~TreeItem() tree()->mPlayableItemCount--; } - // I have to remove my children, because they need their parent + // I have to remove my tqchildren, because they need their tqparent // in tact for the below code while (TreeItem *c = firstChild()) delete c; @@ -258,14 +258,14 @@ TQString TreeItem::presentation() const return text(0); } -TreeItem *TreeItem::find(File item) +TreeItem *TreeItem::tqfind(File item) { TreeItem *i = firstChild(); while (i) { if (i->file() == item) return i; - TreeItem *found = i->find(item); + TreeItem *found = i->tqfind(item); if (found and found->playable()) return found; i = i->nextSibling(); } @@ -297,7 +297,7 @@ void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int w } TQColorGroup newcg(cg); - if (parent() && parent()->isOpen() && !parent()->mUserOpened) + if (tqparent() && tqparent()->isOpen() && !tqparent()->mUserOpened) { // slow, but not often used TQColor text = newcg.text(); @@ -338,8 +338,8 @@ void TreeItem::autoExpand() void TreeItem::forceAutoExpand() { - if (parent()) - parent()->forceAutoExpand(); + if (tqparent()) + tqparent()->forceAutoExpand(); if (!mUserOpened) tree()->addAutoExpanded(this); @@ -352,7 +352,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match) { if (match.length()) { - if (!text(0).contains(match, false)) + if (!text(0).tqcontains(match, false)) { setHidden(true); return false; @@ -367,7 +367,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match) if (match.length()) { - visible = text(0).contains(match, false); + visible = text(0).tqcontains(match, false); } if (visible) @@ -419,7 +419,7 @@ TreeItem *TreeItem::next() { if (upYours->nextSibling()) return upYours->nextSibling(); - upYours = upYours->parent(); + upYours = upYours->tqparent(); } while (upYours); } return 0; @@ -431,8 +431,8 @@ TreeItem *TreeItem::next() -Tree::Tree(Oblique *oblique, TQWidget *parent) - : KListView(parent), mOblique(oblique), mAutoExpanding(0) +Tree::Tree(Oblique *oblique, TQWidget *tqparent) + : KListView(tqparent), mOblique(oblique), mAutoExpanding(0) { mCurrent = 0; lastMenu =0; @@ -503,16 +503,16 @@ void Tree::clear() KListView::clear(); } -void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme) +void Tree::movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme) { TQPtrList<TQListViewItem> items = selectedItems(true); for (TQPtrList<TQListViewItem>::Iterator i(items.begin()); *i; ++i) { - if ((*i)->parent() != parent) + if ((*i)->tqparent() != tqparent) return; } - KListView::movableDropEvent(parent, afterme); + KListView::movableDropEvent(tqparent, afterme); } @@ -535,7 +535,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> & TreeItem *Tree::firstChild() { return static_cast<TreeItem*>(KListView::firstChild()); } -TreeItem *Tree::find(File item) +TreeItem *Tree::tqfind(File item) { TreeItem *i = firstChild(); @@ -543,7 +543,7 @@ TreeItem *Tree::find(File item) { if (i->file() == item) return i; - TreeItem *found = i->find(item); + TreeItem *found = i->tqfind(item); if (found) return found; i = i->nextSibling(); @@ -551,19 +551,19 @@ TreeItem *Tree::find(File item) return i; } -void Tree::insert(TreeItem *replace, File file) +void Tree::insert(TreeItem *tqreplace, File file) { - TreeItem *created = collate(replace, file); - if (mCurrent == replace) + TreeItem *created = collate(tqreplace, file); + if (mCurrent == tqreplace) { mCurrent = created; - repaintItem(created); - if (isSelected(replace)) + tqrepaintItem(created); + if (isSelected(tqreplace)) setSelected(created, true); } - if (created != replace) + if (created != tqreplace) { - delete replace; + delete tqreplace; } } @@ -592,7 +592,7 @@ void Tree::checkRemove(Slice *slice, File f) void Tree::update(File file) { - if (TreeItem *item = find(file)) + if (TreeItem *item = tqfind(file)) { insert(item, file); } @@ -624,8 +624,8 @@ void Tree::setCurrent(TreeItem *cur) mCurrent = cur; TQPtrList<TreeItem> oldAutoExpanded = mAutoExpanded; mAutoExpanded.clear(); - repaintItem(old); - repaintItem(cur); + tqrepaintItem(old); + tqrepaintItem(cur); if (cur) cur->autoExpand(); // do an anti-intersection on oldAutoUpdated and the new mAutoExpanded @@ -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 children - TreeItem *children; + // search childOf's immediate tqchildren + TreeItem *tqchildren; if (childOf) - children = childOf->firstChild(); + tqchildren = childOf->firstChild(); else - children = firstChild(); + tqchildren = firstChild(); TQString presentation = group->presentation(file); - while (children) + while (tqchildren) { // merging would be done here bool matches=false; if (group->fuzzyness(QueryGroup::Case)) { - matches = (children->text(0).lower() == presentation.lower()); + matches = (tqchildren->text(0).lower() == presentation.lower()); } else { - matches = (children->text(0) == presentation); + matches = (tqchildren->text(0) == presentation); } - matches = matches && !children->group()->option(QueryGroup::Playable); + matches = matches && !tqchildren->group()->option(QueryGroup::Playable); if (matches) { - children->setFile(File()); - return children; + tqchildren->setFile(File()); + return tqchildren; } - children = children->nextSibling(); + tqchildren = tqchildren->nextSibling(); } TreeItem *item; @@ -790,7 +790,7 @@ TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeIte else if (fix) { item = fix; - if (fix->parent() != childOf) + if (fix->tqparent() != childOf) moveItem(fix, childOf, 0); item->setText(0, presentation); } diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index f059931..8f92f2a 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -23,15 +23,15 @@ class TreeItem : public KListViewItem bool mHidden:1; public: - TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p=0); - TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p=0); + TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p=0); + TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p=0); ~TreeItem(); QueryGroup *group() { return mGroup; } const QueryGroup *group() const { return mGroup; } void setGroup(QueryGroup *group) { mGroup = group; } - TreeItem *parent() { return static_cast<TreeItem*>(KListViewItem::parent()); } + TreeItem *tqparent() { return static_cast<TreeItem*>(KListViewItem::tqparent()); } Tree *tree(); TreeItem *itemBelow() { return static_cast<TreeItem*>(KListViewItem::itemBelow()); } TreeItem *firstChild() { return static_cast<TreeItem*>(KListViewItem::firstChild()); } @@ -45,13 +45,13 @@ public: void setOpen(bool o); - TreeItem *find(File item); + TreeItem *tqfind(File item); bool playable() const; /** * get the next item that is playable logically. - * that is, if it has a File, and its parent hasn't a + * that is, if it has a File, and its tqparent hasn't a * File **/ TreeItem *nextPlayable(); @@ -61,8 +61,8 @@ public: virtual int compare(TQListViewItem * i, int col, bool) const; /** - * open my parents so that I'm visible, if I'm playing or - * close my parents if I'm not playing, and the user + * open my tqparents so that I'm visible, if I'm playing or + * close my tqparents if I'm not playing, and the user * didn't open **/ void autoExpand(); @@ -86,6 +86,7 @@ class Loader; class Tree : public KListView { Q_OBJECT + TQ_OBJECT Oblique *mOblique; Query mQuery; @@ -103,10 +104,10 @@ Q_OBJECT Loader *mLoader; public: - Tree(Oblique *oblique, TQWidget *parent=0); + Tree(Oblique *oblique, TQWidget *tqparent=0); ~Tree(); TreeItem *firstChild(); - TreeItem *find(File item); + TreeItem *tqfind(File item); TreeItem *current() { return mCurrent; } Query *query() { return &mQuery; } Oblique *oblique() { return mOblique; } @@ -129,10 +130,10 @@ public: protected: virtual TQDragObject *dragObject(); - void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme); + void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme); public slots: - void insert(TreeItem *replace, File file); + void insert(TreeItem *tqreplace, File file); void insert(File file); void remove(File file); void update(File file); @@ -181,7 +182,7 @@ private: TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf); /** - * remove the siblings and children of the treeitem + * remove the siblings and tqchildren of the treeitem **/ void remove(TreeItem *, const File &file); diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 8c7f81d..91d07c9 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -20,8 +20,8 @@ class TabWidget : public KTabWidget { public: - TabWidget(TQWidget *parent) - : KTabWidget(parent) + TabWidget(TQWidget *tqparent) + : KTabWidget(tqparent) { } public: @@ -42,9 +42,9 @@ View::View(Oblique *oblique) setCentralWidget(mTabs); KAction *ac; - ac = new KAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files"); + ac = new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection.")); - ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); + ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); // ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); @@ -52,31 +52,31 @@ View::View(Oblique *oblique) ac = new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices" + TQT_TQOBJECT(this), TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices" ); ac->setWhatsThis(i18n("Select a sub-collection to display")); mSchemaListAction = new SchemaListAction( - i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" + i18n("&Schemas"), TQT_TQOBJECT(this), TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" ); mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree.")); ac = new KAction( - i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()), + i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()), actionCollection(), "newtab" ); mRemoveTabAction = new KAction( - i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()), + i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()), actionCollection(), "removecurrenttab" ); { TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget"); - l->setBackgroundMode( Qt::PaletteButton ); - l->setAlignment( - (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | Qt::ShowPrefix + l->setBackgroundMode( TQt::PaletteButton ); + l->tqsetAlignment( + (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) | + TQt::AlignVCenter | TQt::ShowPrefix ); l->adjustSize(); new KWidgetAction(l, i18n("&Jump:"), KShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label"); @@ -87,7 +87,7 @@ View::View(Oblique *oblique) connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&))); } - KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); applyMainWindowSettings(KGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); @@ -138,7 +138,7 @@ View::~View() int slice = tree->slice()->id(); TQString query = tree->fileOfQuery(); - TQString t = TQString("%1:%2").arg(slice).arg(query); + TQString t = TQString("%1:%2").tqarg(slice).tqarg(query); tabids.append(t); } @@ -241,8 +241,8 @@ void View::use(Slice *s) -LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name) - : KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name) +LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name) + : KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, tqparent, name) { setAutoSized(true); } diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h index bf216ea..4277d06 100644 --- a/noatun-plugins/oblique/view.h +++ b/noatun-plugins/oblique/view.h @@ -16,6 +16,7 @@ class TabWidget; class View : public KMainWindow { Q_OBJECT + TQ_OBJECT Oblique *mOblique; Tree *mTree; TQValueList<Tree*> mTrees; @@ -59,8 +60,9 @@ protected: class LineEditAction : public KWidgetAction { Q_OBJECT + TQ_OBJECT public: - LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name); + LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name); KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); } KLineEdit *lineEdit() { return widget(); } diff --git a/noatun-plugins/pitchablespeed/Makefile.am b/noatun-plugins/pitchablespeed/Makefile.am index b994d98..3879a35 100644 --- a/noatun-plugins/pitchablespeed/Makefile.am +++ b/noatun-plugins/pitchablespeed/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(kde_includes)/arts $(all_includes) +INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde kde_module_LTLIBRARIES = noatunpitchablespeed.la noatunpitchablespeed_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index b59d6e5..17d8e51 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow) void PitchableSpeed::init() { pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"), - this, TQT_SLOT(toggle(void))); + TQT_TQOBJECT(this), TQT_SLOT(toggle(void))); } void PitchableSpeed::toggle(void) diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.h b/noatun-plugins/pitchablespeed/pitchablespeed.h index c5bfadf..7947bb1 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.h +++ b/noatun-plugins/pitchablespeed/pitchablespeed.h @@ -21,6 +21,7 @@ class TQSlider; class PitchableSpeed : public SpeedTuner, public Plugin { Q_OBJECT + TQ_OBJECT public: PitchableSpeed(); diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.plugin b/noatun-plugins/pitchablespeed/pitchablespeed.plugin index 8b1dded..f29c92a 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.plugin +++ b/noatun-plugins/pitchablespeed/pitchablespeed.plugin @@ -61,7 +61,7 @@ Comment[az]=Çalma sür'ətini bir qulp ilə dəyişdirmə imkanı verir Comment[bg]=Регулиране скоростта на изпълнение чрез плъзгач Comment[bs]=Omogućuje prilagođavanje brzine sviranja pomoću klizača Comment[ca]=Fa que es puga variar la velocitat de reproducció amb un cursor -Comment[cs]=Umožní měnit rychlost přehrávání pomocí posuvníku +Comment[cs]=Umožní měnit rychlost přehrávání potqmocí posuvníku Comment[cy]=Newid cyflymder chwarae efo llithrydd Comment[da]=Gør afspilningshastigheden indstillelig med en skyder Comment[de]=Macht die Abspielgeschwindigkeit mit einem Schieberegler einstellbar @@ -98,7 +98,7 @@ Comment[pt]=Torna a velocidade de reprodução ajustável com uma barra Comment[pt_BR]=Torna a velocidade reprodução ajustável com uma barra deslizante Comment[ro]=Permite ajustarea vitezei de redare cu un potenţiometru Comment[ru]=Регулирование скорости проигрывания через бегунок -Comment[sk]=Umožňuje zmeniť rýchlosť prehrávania pomocou posúvadla +Comment[sk]=Umožňuje zmeniť rýchlosť prehrávania potqmocou posúvadla Comment[sl]=Naredi hitrost predvajanja prilagodljivo z drsnikom Comment[sr]=Чини брзину пуштања подесивом помоћу клизача Comment[sr@Latn]=Čini brzinu puštanja podesivom pomoću klizača diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui index 79844c4..e533bd2 100644 --- a/noatun-plugins/pitchablespeed/speedtuner.ui +++ b/noatun-plugins/pitchablespeed/speedtuner.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SpeedTuner</class> <author>Hans Meine <hans@meine.de></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SpeedTuner</cstring> </property> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>slider</cstring> </property> @@ -37,7 +37,7 @@ <enum>Both</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -51,7 +51,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>currentValEdit</cstring> </property> @@ -68,7 +68,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignHCenter</set> </property> <property name="hAlign" stdset="0"> @@ -84,14 +84,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -105,7 +105,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>rangeLabel</cstring> </property> @@ -130,7 +130,7 @@ <string>+/- </string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>offsetLabel</cstring> </property> @@ -154,7 +154,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>preserveFrequencies</cstring> </property> @@ -186,10 +186,10 @@ <slot>offsetChanged(int)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">speedChanged(int)</slot> <slot access="protected">offsetChanged(int)</slot> <slot access="protected">rangeChanged(int)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am index 27c35cc..d49c733 100644 --- a/noatun-plugins/synaescope/Makefile.am +++ b/noatun-plugins/synaescope/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) $(SDL_CFLAGS) +INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde METASOURCES = AUTO diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index 5b881fd..296a541 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -30,14 +30,14 @@ #include "cmodule.h" #include "synaescope.h" -SynaePrefs::SynaePrefs(TQObject *parent) - : CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", parent) +SynaePrefs::SynaePrefs(TQObject *tqparent) + : CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", tqparent) { // kdDebug(66666) << k_funcinfo << endl; xRes = new TQSpinBox(320, 1024, 16, this); yRes = new TQSpinBox(240, 768, 12, this); - TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = 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); - layout->addLayout(xResLayout); - layout->addLayout(yResLayout); - layout->addStretch(); + tqlayout->addLayout(xResLayout); + tqlayout->addLayout(yResLayout); + tqlayout->addStretch(); changed=false; connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); diff --git a/noatun-plugins/synaescope/cmodule.h b/noatun-plugins/synaescope/cmodule.h index c367ad2..8a39a67 100644 --- a/noatun-plugins/synaescope/cmodule.h +++ b/noatun-plugins/synaescope/cmodule.h @@ -27,9 +27,10 @@ class TQSpinBox; class SynaePrefs : public CModule { Q_OBJECT + TQ_OBJECT public: - SynaePrefs(TQObject *parent); + SynaePrefs(TQObject *tqparent); virtual void save(); virtual void reopen(); diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h index af1b6f5..df5417d 100644 --- a/noatun-plugins/synaescope/synaescope.h +++ b/noatun-plugins/synaescope/synaescope.h @@ -17,6 +17,7 @@ class KProcess; class SynaeScope : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT public: SynaeScope(); diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp index 2adc1f7..846a3b7 100644 --- a/noatun-plugins/synaescope/ui.cpp +++ b/noatun-plugins/synaescope/ui.cpp @@ -143,7 +143,7 @@ struct NoatunActionButton : public Button action=""; } - if (action) + if (!action.isNull()) { action+="()"; DCOPClient c; @@ -257,14 +257,14 @@ struct SliderBar : public UIObject struct PopperUpper : public UIObject { - int maskAdd; + int tqmaskAdd; PopperUpper(int _am,int _vm,double _x,double _y, - double _width,double _height, int _maskAdd) + double _width,double _height, int _tqmaskAdd) { activeMask = _am; visibleMask = _vm; x = _x; y = _y; width = _width; height = _height; - maskAdd = _maskAdd; + tqmaskAdd = _tqmaskAdd; } int go(bool mouseDown,bool mouseClick, bool mouseOver, @@ -282,7 +282,7 @@ struct PopperUpper : public UIObject 0x0200, x*scale,y*scale,width*scale,height*scale); - return mouseOver ? maskAdd : 0; + return mouseOver ? tqmaskAdd : 0; } void handleKey(char key, int &action) @@ -330,14 +330,14 @@ void Interface::setupPalette() #undef MAX } -//Visible mask +//Visible tqmask #define ALL 1 #define BUTTONBAR 2 #define TRACKBAR 4 #define DIALBAR 8 #define VOLUMEBAR 16 -//Active mask +//Active tqmask //#define ALL 1 #define PLAYING 2 #define PAUSED 4 @@ -346,7 +346,7 @@ void Interface::setupPalette() #define OPEN 64 -// TODO Lay things out with parents and a stack, like QT +// TODO Lay things out with tqparents and a stack, like QT Interface::Interface() { static const float IconSize=0.2; diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am index b557d10..4a673cd 100644 --- a/noatun-plugins/tippercanoe/Makefile.am +++ b/noatun-plugins/tippercanoe/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) $(SDL_CFLAGS) +INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde METASOURCES = AUTO diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index cf5cbfc..4a617ee 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -52,7 +52,7 @@ SynaeScope::~SynaeScope() void SynaeScope::init() { connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(read(KProcess *, char *, int))); - pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void))); + pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void))); process << KStandardDirs::findExe("noatuntippecanoe.bin"); @@ -81,8 +81,8 @@ void SynaeScope::scopeEvent(float *left, float *right, int size) void SynaeScope::read(KProcess *, char *buf, int) { - TQString num = TQString::fromLatin1(buf); - num = num.left(num.find(TQRegExp("\\s"))); + TQString num = TQString::tqfromLatin1(buf); + num = num.left(num.tqfind(TQRegExp("\\s"))); id = num.toInt(); embed->embed(id); } diff --git a/noatun-plugins/tippercanoe/synaescope.h b/noatun-plugins/tippercanoe/synaescope.h index 59daa93..4479c65 100644 --- a/noatun-plugins/tippercanoe/synaescope.h +++ b/noatun-plugins/tippercanoe/synaescope.h @@ -19,6 +19,7 @@ class SynaeScope : public TQWidget, public StereoScope, public Plugin { Q_OBJECT + TQ_OBJECT public: SynaeScope(); diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp index e260d18..663816c 100644 --- a/noatun-plugins/tippercanoe/ui.cpp +++ b/noatun-plugins/tippercanoe/ui.cpp @@ -170,14 +170,14 @@ struct SliderBar : public UIObject struct PopperUpper : public UIObject { - int maskAdd; + int tqmaskAdd; PopperUpper(int _am,int _vm,double _x,double _y, - double _width,double _height, int _maskAdd) + double _width,double _height, int _tqmaskAdd) { activeMask = _am; visibleMask = _vm; x = _x; y = _y; width = _width; height = _height; - maskAdd = _maskAdd; + tqmaskAdd = _tqmaskAdd; } int go(bool mouseDown,bool mouseClick, bool mouseOver, @@ -195,7 +195,7 @@ struct PopperUpper : public UIObject 0x0200, x*scale,y*scale,width*scale,height*scale); - return mouseOver ? maskAdd : 0; + return mouseOver ? tqmaskAdd : 0; } void handleKey(char key, int &action) @@ -243,14 +243,14 @@ void Interface::setupPalette() #undef MAX } -//Visible mask +//Visible tqmask #define ALL 1 #define BUTTONBAR 2 #define TRACKBAR 4 #define DIALBAR 8 #define VOLUMEBAR 16 -//Active mask +//Active tqmask //#define ALL 1 #define PLAYING 2 #define PAUSED 4 @@ -259,7 +259,7 @@ void Interface::setupPalette() #define OPEN 64 -// TODO Lay things out with parents and a stack, like QT +// TODO Lay things out with tqparents and a stack, like QT Interface::Interface() { static const float IconSize=0.2; diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am index b42b7a0..c243d68 100644 --- a/noatun-plugins/tyler/Makefile.am +++ b/noatun-plugins/tyler/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) $(SDL_CFLAGS) +INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde METASOURCES = AUTO diff --git a/noatun-plugins/tyler/tyler.h b/noatun-plugins/tyler/tyler.h index e919316..d6f540f 100644 --- a/noatun-plugins/tyler/tyler.h +++ b/noatun-plugins/tyler/tyler.h @@ -12,6 +12,7 @@ class Tyler : public TQObject, public StereoScope, public Plugin { Q_OBJECT + TQ_OBJECT public: Tyler(); diff --git a/noatun-plugins/wavecapture/Makefile.am b/noatun-plugins/wavecapture/Makefile.am index 0ffa449..8073542 100644 --- a/noatun-plugins/wavecapture/Makefile.am +++ b/noatun-plugins/wavecapture/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = -I$(kde_includes)/arts $(all_includes) +INCLUDES = -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde -I$(kde_includes)/kde/arts kde_module_LTLIBRARIES = noatunwavecapture.la diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h index 7f92cfa..78cbc5f 100644 --- a/noatun-plugins/wavecapture/wavecapture.h +++ b/noatun-plugins/wavecapture/wavecapture.h @@ -31,6 +31,7 @@ namespace KIO { class Job; } class WaveCapture : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: @@ -55,8 +56,8 @@ private: int pluginMenuItem; bool _enabled; - enum Status { PAUSED, STOPPED, PLAYING }; - Status _status; + enum tqStatus { PAUSED, STOPPED, PLAYING }; + tqStatus _status; Arts::Effect_WAVECAPTURE _capture; int _count; diff --git a/renamedlgplugins/audio/audio_plugin.cpp b/renamedlgplugins/audio/audio_plugin.cpp index 44ae9d0..5aeeb49 100644 --- a/renamedlgplugins/audio/audio_plugin.cpp +++ b/renamedlgplugins/audio/audio_plugin.cpp @@ -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").arg(dest); + sentence1 = i18n("An older file named '%1' already exists.\n").tqarg(dest); else if (mtimeDest == mtimeSrc) - sentence1 = i18n("A similar file named '%1' already exists.\n").arg(dest); + sentence1 = i18n("A similar file named '%1' already exists.\n").tqarg(dest); else - sentence1 = i18n("A newer file named '%1' already exists.\n").arg(dest); + sentence1 = i18n("A newer file named '%1' already exists.\n").tqarg(dest); label_head->setText(sentence1); label_src->setText(i18n("Source File")); label_dst->setText(i18n("Existing File")); @@ -86,10 +86,10 @@ bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, co label_src->adjustSize(); label_dst->adjustSize(); label_ask->adjustSize(); - lay->addMultiCellWidget(label_head, 0, 0, 0, 2, Qt::AlignLeft); - lay->addWidget(label_dst, 1, 0, Qt::AlignLeft); - lay->addWidget(label_src, 1, 2, Qt::AlignLeft); - lay->addMultiCellWidget(label_ask, 3, 3, 0, 2, Qt::AlignLeft); + lay->addMultiCellWidget(label_head, 0, 0, 0, 2, TQt::AlignLeft); + lay->addWidget(label_dst, 1, 0, TQt::AlignLeft); + lay->addWidget(label_src, 1, 2, TQt::AlignLeft); + lay->addMultiCellWidget(label_ask, 3, 3, 0, 2, TQt::AlignLeft); adjustSize(); } AudioPreview *left= new AudioPreview(this, "Preview Left", _dest, mimeDest ); diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp index b618adb..18e25d1 100644 --- a/renamedlgplugins/audio/audiopreview.cpp +++ b/renamedlgplugins/audio/audiopreview.cpp @@ -33,8 +33,8 @@ #include "audiopreview.h" -AudioPreview::AudioPreview( TQWidget *parent, const char *name, const TQString &fileName, const TQString &mimeType) - : TQVBox( parent, name ) +AudioPreview::AudioPreview( TQWidget *tqparent, const char *name, const TQString &fileName, const TQString &mimeType) + : TQVBox( tqparent, name ) { m_isTempFile = false; pic = 0; @@ -72,7 +72,7 @@ AudioPreview::~AudioPreview() void AudioPreview::initView( const TQString& mimeType ) { KURL url = KURL::fromPathOrURL( m_localFile ); - pic->setText( TQString::null ); + pic->setText( TQString() ); pic->setPixmap(KMimeType::pixmapForURL( url )); pic->adjustSize(); @@ -89,33 +89,33 @@ void AudioPreview::initView( const TQString& mimeType ) KSqueezedTextLabel *sl; sl = new KSqueezedTextLabel(this); - sl->setText(i18n("Artist: %1\n").arg(info.item("Artist").value().toString())); + sl->setText(i18n("Artist: %1\n").tqarg(info.item("Artist").value().toString())); sl = new KSqueezedTextLabel(this); - sl->setText(i18n("Title: %1\n").arg(info.item("Title").value().toString())); + sl->setText(i18n("Title: %1\n").tqarg(info.item("Title").value().toString())); sl = new KSqueezedTextLabel(this); - sl->setText(i18n("Comment: %1\n").arg(info.item("Comment").value().toString())); + sl->setText(i18n("Comment: %1\n").tqarg(info.item("Comment").value().toString())); - 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("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").tqarg( info.item("Bitrate").value().toString() ).tqarg( info.item("Bitrate").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("Sample rate: %1 %2\n").tqarg( info.item("Sample Rate").value().toString() ).tqarg( 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:").arg(length/60, 0, 10)); + desc.append(TQString("%1:").tqarg(length/60, 0, 10)); if (length%60 < 10) desc.append("0"); - desc.append(TQString("%1\n").arg(length%60, 0, 10)); + desc.append(TQString("%1\n").tqarg(length%60, 0, 10)); } description = new TQLabel(this); description->setText( desc ); description->adjustSize(); - m_player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString::null, this ); + m_player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(this) ); if ( m_player ) { static_cast<KParts::ReadOnlyPart*>(m_player)->openURL( url ); @@ -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 , topLevelWidget()) ) + if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , tqtopLevelWidget()) ) { m_isTempFile = true; initView( KMimeType::findByPath( m_localFile )->name() ); diff --git a/renamedlgplugins/audio/audiopreview.h b/renamedlgplugins/audio/audiopreview.h index d50c3d2..751233c 100644 --- a/renamedlgplugins/audio/audiopreview.h +++ b/renamedlgplugins/audio/audiopreview.h @@ -29,11 +29,12 @@ namespace KMediaPlayer class TQPixmap; class TQLabel; -class AudioPreview : public QVBox +class AudioPreview : public TQVBox { Q_OBJECT + TQ_OBJECT public: - AudioPreview(TQWidget *parent, const char *name, const TQString &fileName, const TQString &mimeType); + AudioPreview(TQWidget *tqparent, const char *name, const TQString &fileName, const TQString &mimeType); ~AudioPreview(); private slots: diff --git a/renamedlgplugins/images/image_plugin.cpp b/renamedlgplugins/images/image_plugin.cpp index 0bc6567..65023f7 100644 --- a/renamedlgplugins/images/image_plugin.cpp +++ b/renamedlgplugins/images/image_plugin.cpp @@ -70,7 +70,7 @@ bool ImagePlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, co TQLabel *label = new TQLabel(this ); label->setText(i18n("You want to overwrite the left picture with the one on the right.") ); label->adjustSize(); - lay->addMultiCellWidget(label, 1, 1, 0, 2, Qt::AlignHCenter ); + lay->addMultiCellWidget(label, 1, 1, 0, 2, TQt::AlignHCenter ); adjustSize(); } ImageVisualizer *left= new ImageVisualizer(this, "Visualizer Left", _dest ); diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp index 706787c..e9fe6c2 100644 --- a/renamedlgplugins/images/imagevisualizer.cpp +++ b/renamedlgplugins/images/imagevisualizer.cpp @@ -30,8 +30,8 @@ #include "imagevisualizer.h" -ImageVisualizer::ImageVisualizer( TQWidget *parent, const char *name, const TQString &fileName ) - : TQVBox( parent, name ) +ImageVisualizer::ImageVisualizer( TQWidget *tqparent, const char *name, const TQString &fileName ) + : TQVBox( tqparent, name ) { pic = 0; description = 0; @@ -58,14 +58,14 @@ ImageVisualizer::ImageVisualizer( TQWidget *parent, const char *name, const TQSt void ImageVisualizer::loadImage( const TQString& path ) { TQImage img(path); - TQPixmap pixmap(img.smoothScale(180,200, TQImage::ScaleMin) ); - pic->setText( TQString::null ); + TQPixmap pixmap(img.smoothScale(180,200, TQ_ScaleMin) ); + pic->setText( TQString() ); pic->setPixmap(pixmap ); pic->adjustSize(); TQString desc; - 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() )); + 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() )); 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 , topLevelWidget()) ) + if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , tqtopLevelWidget()) ) { loadImage( tmpFile ); KIO::NetAccess::removeTempFile( tmpFile ); diff --git a/renamedlgplugins/images/imagevisualizer.h b/renamedlgplugins/images/imagevisualizer.h index b1a5006..867efea 100644 --- a/renamedlgplugins/images/imagevisualizer.h +++ b/renamedlgplugins/images/imagevisualizer.h @@ -24,11 +24,12 @@ class TQPixmap; class TQLabel; -class ImageVisualizer : public QVBox +class ImageVisualizer : public TQVBox { Q_OBJECT + TQ_OBJECT public: - ImageVisualizer(TQWidget *parent, const char *name, const TQString &fileName ); + ImageVisualizer(TQWidget *tqparent, const char *name, const TQString &fileName ); private: void loadImage( const TQString& path ); |