diff options
360 files changed, 7305 insertions, 7305 deletions
diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index 9bc6dbb..56b561a 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -1,9 +1,9 @@ -#include <qstring.h> -#include <qlayout.h> -#include <qstringlist.h> -#include <qframe.h> -#include <qptrlist.h> -#include <qlabel.h> +#include <tqstring.h> +#include <tqlayout.h> +#include <tqstringlist.h> +#include <tqframe.h> +#include <tqptrlist.h> +#include <tqlabel.h> #include <kcolorbutton.h> #include <kdialogbase.h> @@ -15,7 +15,7 @@ #include "boardinfo.h" -BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, const char *_name, bool modal) +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) { if (!info) @@ -24,8 +24,8 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons setWFlags(WDestructiveClose); - QFrame *about = addPage(i18n("Information")); - QVBoxLayout *aboutLayout = new QVBoxLayout(about, spacingHint()); + TQFrame *about = addPage(i18n("Information")); + TQVBoxLayout *aboutLayout = new TQVBoxLayout(about, spacingHint()); if (editable) { @@ -34,22 +34,22 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons } else { - aboutLayout->addWidget(new QLabel(info->name, about)); + aboutLayout->addWidget(new TQLabel(info->name, about)); name = 0; } - QHBoxLayout *versionLayout = new QHBoxLayout(aboutLayout, spacingHint()); - versionLayout->addWidget(new QLabel(i18n("Version:"), about)); + TQHBoxLayout *versionLayout = new TQHBoxLayout(aboutLayout, spacingHint()); + versionLayout->addWidget(new TQLabel(i18n("Version:"), about)); if (editable) { versionLayout->addWidget(version = new KLineEdit(about)); version->setText(info->version); } else - versionLayout->addWidget(new QLabel(info->version, about)); + versionLayout->addWidget(new TQLabel(info->version, about)); - QHBoxLayout *urlLayout = new QHBoxLayout(aboutLayout, spacingHint()); - urlLayout->addWidget(new QLabel(i18n("URL:"), about)); + TQHBoxLayout *urlLayout = new TQHBoxLayout(aboutLayout, spacingHint()); + urlLayout->addWidget(new TQLabel(i18n("URL:"), about)); if (editable) urlLayout->addWidget(url = new KLineEdit(info->url, about)); else @@ -57,7 +57,7 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons aboutLayout->addStretch(3); - aboutLayout->addWidget(new QLabel(i18n("Description:"), about)); + aboutLayout->addWidget(new TQLabel(i18n("Description:"), about)); aboutLayout->addStretch(); aboutLayout->addWidget(description = new KLineEdit(about)); description->setText(info->description); @@ -68,20 +68,20 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons if (editable) { - QHBoxLayout *bgLayout = new QHBoxLayout(aboutLayout, spacingHint()); - bgLayout->addWidget(new QLabel(i18n("Background color:"), about)); + TQHBoxLayout *bgLayout = new TQHBoxLayout(aboutLayout, spacingHint()); + bgLayout->addWidget(new TQLabel(i18n("Background color:"), about)); bgColor = new KColorButton(info->bgColor, about); bgLayout->addWidget(bgColor); } else bgColor = 0; - QFrame *authorsFrame = addPage(i18n("&Authors")); - QVBoxLayout *authorsLayout = new QVBoxLayout(authorsFrame, spacingHint()); + TQFrame *authorsFrame = addPage(i18n("&Authors")); + TQVBoxLayout *authorsLayout = new TQVBoxLayout(authorsFrame, spacingHint()); authorsLayout->addWidget(authors = new LotsaEdits(editable, info->authors, authorsFrame)); - QFrame *creditsFrame = addPage(i18n("&Thanks To")); - QVBoxLayout *creditsLayout = new QVBoxLayout(creditsFrame, spacingHint()); + TQFrame *creditsFrame = addPage(i18n("&Thanks To")); + TQVBoxLayout *creditsLayout = new TQVBoxLayout(creditsFrame, spacingHint()); creditsLayout->addWidget(credits = new LotsaEdits(editable, info->credits, creditsFrame)); } @@ -110,44 +110,44 @@ void BoardInfoDlg::slotOk() /////////////////////////////////// -LotsaEdits::LotsaEdits(bool editable, QStringList defaults, QWidget *parent, const char *name) : QWidget(parent, name) +LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, const char *name) : TQWidget(parent, name) { list.setAutoDelete(true); this->editable = editable; - layout = new QVBoxLayout(this, KDialogBase::spacingHint()); - QHBoxLayout *hlayout = new QHBoxLayout(layout, KDialogBase::spacingHint()); + layout = new TQVBoxLayout(this, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); if (editable) { KPushButton *more = new KPushButton(i18n("&Add Name"), this); hlayout->addWidget(more); - connect(more, SIGNAL(clicked()), this, SLOT(more())); + connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); hlayout->addStretch(); KPushButton *less= new KPushButton(i18n("&Delete Name"), this); hlayout->addWidget(less); - connect(less, SIGNAL(clicked()), this, SLOT(less())); + connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); } layout->addStretch(); - for (QStringList::Iterator it = defaults.begin(); it != defaults.end(); ++it) + for (TQStringList::Iterator it = defaults.begin(); it != defaults.end(); ++it) { more(); if (editable) static_cast<KLineEdit *>(list.last())->setText(*it); else - static_cast<QLabel *>(list.last())->setText(*it); + static_cast<TQLabel *>(list.last())->setText(*it); } } void LotsaEdits::more() { - QWidget *edit; + TQWidget *edit; if (editable) edit = new KLineEdit(this); else - edit = new QLabel(this); + edit = new TQLabel(this); layout->addWidget(edit); list.append(edit); edit->show(); @@ -157,7 +157,7 @@ void LotsaEdits::less() { list.removeLast(); /* - QWidget *edit = 0; + TQWidget *edit = 0; for (edit = list.first(); edit; edit = list.next()) { if (edit->hasFocus()) @@ -169,16 +169,16 @@ void LotsaEdits::less() */ } -QStringList LotsaEdits::save() +TQStringList LotsaEdits::save() { - QStringList ret; + TQStringList ret; - QWidget *edit = 0; + TQWidget *edit = 0; for (edit = list.first(); edit; edit = list.next()) if (editable) ret.append(static_cast<KLineEdit *>(edit)->text()); else - ret.append(static_cast<QLabel *>(edit)->text()); + ret.append(static_cast<TQLabel *>(edit)->text()); return ret; } diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h index 00825a5..ac2ae00 100644 --- a/atlantikdesigner/designer/boardinfo.h +++ b/atlantikdesigner/designer/boardinfo.h @@ -1,11 +1,11 @@ #ifndef ATLANTIK_BOARDINFO_H #define ATLANTIK_BOARDINFO_H -#include <qcolor.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qptrlist.h> -#include <qwidget.h> +#include <tqcolor.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqptrlist.h> +#include <tqwidget.h> #include <kdialogbase.h> @@ -18,13 +18,13 @@ class QVBoxLayout; struct BoardInfo { BoardInfo() { bgColor = Qt::lightGray; } - QString name; - QStringList authors; - QStringList credits; - QString description; - QString url; - QString version; - QColor bgColor; + TQString name; + TQStringList authors; + TQStringList credits; + TQString description; + TQString url; + TQString version; + TQColor bgColor; }; class LotsaEdits : public QWidget @@ -32,10 +32,10 @@ class LotsaEdits : public QWidget Q_OBJECT public: - LotsaEdits(bool, QStringList=QStringList(), QWidget *parent=0, const char *name=0); + LotsaEdits(bool, QStringList=TQStringList(), TQWidget *parent=0, const char *name=0); public slots: - QStringList save(); + TQStringList save(); private slots: void more(); @@ -43,8 +43,8 @@ class LotsaEdits : public QWidget private: bool editable; - QPtrList<QWidget> list; - QVBoxLayout *layout; + TQPtrList<TQWidget> list; + TQVBoxLayout *layout; }; class BoardInfoDlg : public KDialogBase @@ -52,7 +52,7 @@ class BoardInfoDlg : public KDialogBase Q_OBJECT public: - BoardInfoDlg(bool editable, BoardInfo *, QWidget *parent=0, const char *_name=0, bool = true); + BoardInfoDlg(bool editable, BoardInfo *, TQWidget *parent=0, const char *_name=0, bool = true); protected slots: void slotOk(); diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 11da0e3..87b548d 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -1,17 +1,17 @@ -#include <qcolor.h> -#include <qpalette.h> -#include <qevent.h> -#include <qfile.h> -#include <qguardedptr.h> -#include <qlayout.h> -#include <qpoint.h> -#include <qpopupmenu.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qtextcodec.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qwidget.h> +#include <tqcolor.h> +#include <tqpalette.h> +#include <tqevent.h> +#include <tqfile.h> +#include <tqguardedptr.h> +#include <tqlayout.h> +#include <tqpoint.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqwidget.h> #include <kaction.h> #include <kapplication.h> @@ -35,7 +35,7 @@ #include "editor.h" #include "designer.h" -AtlanticDesigner::AtlanticDesigner(QWidget *parent, const char *name) +AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) : KMainWindow(parent, name) { firstBoard = true; @@ -48,35 +48,35 @@ AtlanticDesigner::AtlanticDesigner(QWidget *parent, const char *name) board = 0; layout = 0; - (void) KStdAction::quit(this, SLOT(close()), actionCollection()); - (void) KStdAction::open(this, SLOT(open()), actionCollection()); - (void) KStdAction::openNew(this, SLOT(openNew()), actionCollection()); - (void) KStdAction::save(this, SLOT(save()), actionCollection()); - (void) KStdAction::saveAs(this, SLOT(saveAs()), actionCollection()); - (void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, SLOT(info()), actionCollection(), "boardinfo"); - (void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, this, SLOT(editGroups()), actionCollection(), "groupeditor"); - - (void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, this, SLOT(larger()), actionCollection(), "larger"); - (void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, this, SLOT(smaller()), actionCollection(), "smaller"); - (void) KStdAction::copy(this, SLOT(copy()), actionCollection()); - (void) KStdAction::paste(this, SLOT(paste()), actionCollection()); - (void) new KAction(i18n("&Up"), Key_Up, this, SLOT(up()), actionCollection(), "up"); - (void) new KAction(i18n("&Down"), Key_Down, this, SLOT(down()), actionCollection(), "down"); - (void) new KAction(i18n("&Left"), Key_Left, this, SLOT(left()), actionCollection(), "left"); - (void) new KAction(i18n("&Right"), Key_Right, this, SLOT(right()), actionCollection(), "right"); + (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"); recentAct = KStdAction::openRecent(0, 0, actionCollection()); - connect(recentAct, SIGNAL(urlSelected(const KURL &)), this, SLOT(openRecent(const KURL &))); + connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), 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"); - connect(estateAct, SIGNAL(activated(int)), SLOT(changeEstate(int))); + connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int))); createGUI("atlantikdesignerui.rc"); KConfig *config = kapp->config(); config->setGroup("General"); - QColor defaultColor = colorGroup().background(); + TQColor defaultColor = colorGroup().background(); defaultBg = config->readColorEntry("alternateBackground", &defaultColor); config->setGroup("WM"); defaultColor = colorGroup().dark(); @@ -135,11 +135,11 @@ void AtlanticDesigner::initBoard() board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board"); setCentralWidget(board); - layout = new QVBoxLayout(board->centerWidget()); + layout = new TQVBoxLayout(board->centerWidget()); editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor"); - connect(editor, SIGNAL(goChecked(int)), this, SLOT(goChanged(int))); - connect(editor, SIGNAL(updateBackground()), this, SLOT(updateBackground())); - connect(editor, SIGNAL(resized()), board, SLOT(slotResizeAftermath())); + connect(editor, TQT_SIGNAL(goChecked(int)), this, TQT_SLOT(goChanged(int))); + connect(editor, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(updateBackground())); + connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath())); layout->addWidget(editor); editor->setReady(false); @@ -159,14 +159,14 @@ void AtlanticDesigner::initToken() board->addToken(m_player); - connect(m_player, SIGNAL(changed(Player *)), board, SLOT(playerChanged(Player *))); + connect(m_player, TQT_SIGNAL(changed(Player *)), board, TQT_SLOT(playerChanged(Player *))); } void AtlanticDesigner::openNew() { if (warnClose()) return; - filename = QString::null; + filename = TQString::null; max = 40; @@ -184,7 +184,7 @@ void AtlanticDesigner::openNew() groupsChanged(); updateBackground(); - QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(false); } @@ -198,8 +198,8 @@ ConfigEstate *AtlanticDesigner::newEstate(int i) estate->setChanged(false); estates.insert(i, estate); - connect(estate, SIGNAL(LMBClicked(Estate *)), this, SLOT(changeEstate(Estate *))); - connect(estate, SIGNAL(changed()), this, SLOT(modified())); + connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); + connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); board->addEstateView(estate); @@ -254,19 +254,19 @@ void AtlanticDesigner::openRecent(const KURL &url) } } -void AtlanticDesigner::openFile(const QString &filename) +void AtlanticDesigner::openFile(const TQString &filename) { enum ParseMode { Parse_Nothing, Parse_General, Parse_Board, Parse_Cards, Parse_EstateGroups, Parse_Estates }; - QFile f(filename); + TQFile f(filename); if (!f.open(IO_ReadOnly)) return; initMembers(); - QTextStream t(&f); - t.setCodec(QTextCodec::codecForName("utf8")); + TQTextStream t(&f); + t.setCodec(TQTextCodec::codecForName("utf8")); - QString s = t.readLine(); + TQString s = t.readLine(); int parseMode = Parse_Nothing; CardStack *curCardStack = 0; @@ -283,7 +283,7 @@ void AtlanticDesigner::openFile(const QString &filename) continue; } - QString name; + TQString name; if (s.left(1) == "<") { @@ -306,8 +306,8 @@ void AtlanticDesigner::openFile(const QString &filename) int eqSign = s.find("="); if (eqSign >= 0) { - QString key = s.left(eqSign); - QString value = s.right(s.length() - eqSign - 1); + TQString key = s.left(eqSign); + TQString value = s.right(s.length() - eqSign - 1); if (parseMode == Parse_Cards) { @@ -328,9 +328,9 @@ void AtlanticDesigner::openFile(const QString &filename) else if (key == "url") boardInfo.url = value; else if (key == "authors") - boardInfo.authors = QStringList::split(",", value); + boardInfo.authors = TQStringList::split(",", value); else if (key == "credits") - boardInfo.credits = QStringList::split(",", value); + boardInfo.credits = TQStringList::split(",", value); } else if (parseMode == Parse_Board) { @@ -352,23 +352,23 @@ void AtlanticDesigner::openFile(const QString &filename) // for estates int type = FreeParking; - QString group, takeCard; + TQString group, takeCard; int price = -1; int rent[6] = {-1, -1, -1, -1, -1, -1}; int tax = -1; int taxPercentage = -1; int passMoney = -1; - QColor forceBg; + TQColor forceBg; // for groups - QColor color, bgColor; - QString rentMath; + TQColor color, bgColor; + TQString rentMath; int housePrice = -1; int globalPrice = -1; // for cards - QStringList keys; - QValueList<int> values; + TQStringList keys; + TQValueList<int> values; while (true) { @@ -384,8 +384,8 @@ void AtlanticDesigner::openFile(const QString &filename) if (eqSign < 0) continue; - QString key = s.left(eqSign); - QString value = s.right(s.length() - eqSign - 1); + TQString key = s.left(eqSign); + TQString value = s.right(s.length() - eqSign - 1); //////////////////////////////// ESTATES if (parseMode == Parse_Estates) @@ -424,7 +424,7 @@ void AtlanticDesigner::openFile(const QString &filename) type = Cards; } else if (key == "bgcolor") - forceBg = QColor(value); + forceBg = TQColor(value); else if (key == "passmoney") passMoney = value.toInt(); } @@ -486,8 +486,8 @@ void AtlanticDesigner::openFile(const QString &filename) estate->setPassMoney(passMoney); estates.append(estate); - connect(estate, SIGNAL(LMBClicked(Estate *)), this, SLOT(changeEstate(Estate *))); - connect(estate, SIGNAL(changed()), this, SLOT(modified())); + connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); + connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); i++; } else if (parseMode == Parse_Cards) @@ -545,15 +545,15 @@ void AtlanticDesigner::openFile(const QString &filename) updateBackground(); updateJumpMenu(); - QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(false); } void AtlanticDesigner::updateJumpMenu() { - QStringList estates; + TQStringList estates; for (int i = 1; i <= max; i++) - estates.append(i18n("Jump to Estate %1").arg(QString::number(i))); + estates.append(i18n("Jump to Estate %1").arg(TQString::number(i))); estateAct->setItems(estates); } @@ -573,8 +573,8 @@ void AtlanticDesigner::setPlayerAtBeginning() void AtlanticDesigner::saveAs() { - QString oldfilename = filename; - filename = QString::null; + TQString oldfilename = filename; + filename = TQString::null; save(); @@ -590,7 +590,7 @@ void AtlanticDesigner::saveAs() void AtlanticDesigner::save() { (void) editor->saveEstate(); - QString oldfilename = filename; + TQString oldfilename = filename; if (filename.isNull()) filename = KFileDialog::getOpenFileName(); @@ -600,12 +600,12 @@ void AtlanticDesigner::save() return; } - QFile f(filename); + TQFile f(filename); if (!f.open(IO_WriteOnly)) return; - QTextStream t(&f); - t.setCodec(QTextCodec::codecForName("utf8")); + TQTextStream t(&f); + t.setCodec(TQTextCodec::codecForName("utf8")); t << "<General>" << endl << endl; if (!boardInfo.name.isEmpty()) @@ -654,7 +654,7 @@ void AtlanticDesigner::save() t << "<EstateGroups>" << endl; // double-prevent duplicates - QStringList writtenGroups; + TQStringList writtenGroups; for (ConfigEstateGroupList::Iterator it = groups.begin(); it != groups.end(); ++it) { @@ -679,7 +679,7 @@ void AtlanticDesigner::save() writtenGroups.append((*it).name()); - t << endl << QString("[%1]").arg((*it).name()) << endl; + t << endl << TQString("[%1]").arg((*it).name()) << endl; if ((*it).globalPrice() > 0) t << "price=" << (*it).globalPrice() << endl; @@ -698,7 +698,7 @@ void AtlanticDesigner::save() // now do the cards - for (QValueList<CardStack>::Iterator it = cards.begin(); it != cards.end(); ++it) + for (TQValueList<CardStack>::Iterator it = cards.begin(); it != cards.end(); ++it) { t << endl << endl; t << "<Cards>" << endl << endl; @@ -707,10 +707,10 @@ void AtlanticDesigner::save() for (CardStack::Iterator cit = (*it).begin(); cit != (*it).end(); ++cit) { t << endl << "[" << (*cit).name << "]" << endl; - QValueList<int>::Iterator vit = (*cit).values.begin(); - for (QStringList::Iterator it = (*cit).keys.begin(); it != (*cit).keys.end(); ++it, ++vit) + TQValueList<int>::Iterator vit = (*cit).values.begin(); + for (TQStringList::Iterator it = (*cit).keys.begin(); it != (*cit).keys.end(); ++it, ++vit) { - QString key = (*it); + TQString key = (*it); int value = (*vit); if (key == "collect") @@ -748,7 +748,7 @@ void AtlanticDesigner::save() for (estate = estates.first(); estate; estate = estates.next()) { - t << endl << QString("[%1]").arg(estate->name()) << endl; + t << endl << TQString("[%1]").arg(estate->name()) << endl; switch (estate->type()) { @@ -828,7 +828,7 @@ void AtlanticDesigner::paste() groupsChanged(); } -void AtlanticDesigner::closeEvent(QCloseEvent *e) +void AtlanticDesigner::closeEvent(TQCloseEvent *e) { if (warnClose()) return; @@ -895,7 +895,7 @@ void AtlanticDesigner::larger() groupsChanged(); updateBackground(); - QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -934,7 +934,7 @@ void AtlanticDesigner::smaller() updateJumpMenu(); groupsChanged(); updateBackground(); - QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -957,9 +957,9 @@ void AtlanticDesigner::editGroups() groupEditor = new GroupEditor(&groups, this); groupEditor->show(); - connect(groupEditor, SIGNAL(changed()), this, SLOT(modified())); - connect(groupEditor, SIGNAL(update()), this, SLOT(groupsChanged())); - connect(groupEditor, SIGNAL(update()), editor, SLOT(groupsChanged())); + connect(groupEditor, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); + connect(groupEditor, TQT_SIGNAL(update()), this, TQT_SLOT(groupsChanged())); + connect(groupEditor, TQT_SIGNAL(update()), editor, TQT_SLOT(groupsChanged())); } else groupEditor->raise(); @@ -998,7 +998,7 @@ void AtlanticDesigner::updateBackground() { if (curEstate->type() != Street || (curEstate->type() == Street && curEstate->group().isNull())) { - curEstate->setColor(QColor()); + curEstate->setColor(TQColor()); curEstate->setBgColor(boardInfo.bgColor); } @@ -1019,8 +1019,8 @@ void AtlanticDesigner::info() boardInfoDlg = new BoardInfoDlg(true, &boardInfo, this, "Board Information", false); boardInfoDlg->show(); - connect(boardInfoDlg, SIGNAL(okClicked()), this, SLOT(updateBackground())); - connect(boardInfoDlg, SIGNAL(okClicked()), this, SLOT(modified())); + connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateBackground())); + connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(modified())); } else boardInfoDlg->raise(); diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index 91dd7b4..c66008b 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -1,11 +1,11 @@ #ifndef ATLANTK_DESIGNER_H #define ATLANTK_DESIGNER_H -#include <qcolor.h> -#include <qguardedptr.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqcolor.h> +#include <tqguardedptr.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <kmainwindow.h> @@ -27,11 +27,11 @@ class AtlanticDesigner : public KMainWindow Q_OBJECT public: - AtlanticDesigner(QWidget *parent = 0, const char *name = 0); + AtlanticDesigner(TQWidget *parent = 0, const char *name = 0); ~AtlanticDesigner(); protected: - void closeEvent(QCloseEvent *); + void closeEvent(TQCloseEvent *); public slots: void modified(); @@ -65,7 +65,7 @@ class AtlanticDesigner : public KMainWindow void updateJumpMenu(); private: - void openFile(const QString &); + void openFile(const TQString &); bool warnClose(); void initBoard(); void initMembers(); @@ -73,34 +73,34 @@ class AtlanticDesigner : public KMainWindow bool firstBoard; ConfigEstate *newEstate(int); - QGuardedPtr<EstateEdit> editor; - QGuardedPtr<QVBoxLayout> layout; - QGuardedPtr<AtlantikBoard> board; - QGuardedPtr<GroupEditor> groupEditor; - QGuardedPtr<BoardInfoDlg> boardInfoDlg; + TQGuardedPtr<EstateEdit> editor; + TQGuardedPtr<TQVBoxLayout> layout; + TQGuardedPtr<AtlantikBoard> board; + TQGuardedPtr<GroupEditor> groupEditor; + TQGuardedPtr<BoardInfoDlg> boardInfoDlg; EstateList estates; KListAction *estateAct; KRecentFilesAction *recentAct; - QValueList<CardStack> cards; + TQValueList<CardStack> cards; BoardInfo boardInfo; ConfigEstateGroupList groups; - QString filename; + TQString filename; ConfigEstate *copiedEstate; void doCaption(bool); int max; - QStringList types; + TQStringList types; Player *m_player; bool isMod; - QColor defaultFg; - QColor defaultBg; + TQColor defaultFg; + TQColor defaultBg; }; #endif diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index f092254..fd978d2 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -1,15 +1,15 @@ -#include <qcheckbox.h> -#include <qevent.h> -#include <qframe.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qvbox.h> -#include <qvgroupbox.h> +#include <tqcheckbox.h> +#include <tqevent.h> +#include <tqframe.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> #include <kcolorbutton.h> #include <kcombobox.h> @@ -59,7 +59,7 @@ void ConfigEstate::setType(const int type) } } -void ConfigEstate::setGroup(const QString &group) +void ConfigEstate::setGroup(const TQString &group) { if (m_group != group) { @@ -104,7 +104,7 @@ void ConfigEstate::setTaxPercentage(const int taxPercentage) } } -void ConfigEstate::setTakeCard(const QString &takeCard) +void ConfigEstate::setTakeCard(const TQString &takeCard) { if (m_takeCard != takeCard) { @@ -113,7 +113,7 @@ void ConfigEstate::setTakeCard(const QString &takeCard) } } -void ConfigEstate::setForceBg(const QColor &forceBg) +void ConfigEstate::setForceBg(const TQColor &forceBg) { if (m_forceBg != forceBg) { @@ -142,10 +142,10 @@ void ConfigEstate::setPassMoney(const int passMoney) /////////////////////////// -QStringList types; +TQStringList types; -EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QValueList<CardStack> *cards, QWidget *parent, const char *name) - : QWidget(parent, name) +EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *parent, const char *name) + : TQWidget(parent, name) { groups = newGroups; @@ -170,12 +170,12 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QV ready = false; locked = false; - connect(this, SIGNAL(somethingChanged()), this, SLOT(saveEstate())); + connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate())); - layout = new QGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); - nameEdit = new QLineEdit(this, "Name Edit"); + layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); + nameEdit = new TQLineEdit(this, "Name Edit"); layout->addWidget(nameEdit, 0, 0); - connect(nameEdit, SIGNAL(returnPressed()), this, SIGNAL(somethingChanged())); + connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged())); confDlg = 0; @@ -183,31 +183,31 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QV layout->addWidget(new KSeparator(this), 3, 0); - QHBoxLayout *typeLayout = new QHBoxLayout(KDialog::spacingHint()); + TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint()); layout->addLayout(typeLayout, 4, 0); - QLabel *typeLabel = new QLabel(i18n("Type:"), this); + TQLabel *typeLabel = new TQLabel(i18n("Type:"), this); typeLayout->addWidget(typeLabel); typeCombo = new KComboBox(false, this, "Type Combo"); typeLayout->addWidget(typeCombo); - connect(typeCombo, SIGNAL(activated(int)), this, SIGNAL(somethingChanged())); - connect(typeCombo, SIGNAL(activated(int)), this, SIGNAL(updateBackground())); + connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(somethingChanged())); + connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(updateBackground())); - goCheck = new QCheckBox(i18n("This estate is 'Go'"), this); - connect(goCheck, SIGNAL(toggled(bool)), this, SIGNAL(somethingChanged())); - connect(goCheck, SIGNAL(toggled(bool)), this, SLOT(goToggled(bool))); + 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); - QHBoxLayout *passMoneyLayout = new QHBoxLayout(KDialog::spacingHint()); + TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint()); layout->addLayout(passMoneyLayout, 6, 0); - QLabel *passMoneyLabel = new QLabel(i18n("Pass money:"), this); + TQLabel *passMoneyLabel = new TQLabel(i18n("Pass money:"), this); passMoneyLayout->addWidget(passMoneyLabel); - passMoney = new QSpinBox(0, 3000, 10, this); + passMoney = new TQSpinBox(0, 3000, 10, this); passMoney->setSpecialValueText(i18n("None")); passMoney->setSuffix("$"); passMoneyLayout->addWidget(passMoney); - QStringList estateTypes(i18n("Street")); + TQStringList estateTypes(i18n("Street")); estateTypes.append(i18n("Cards")); estateTypes.append(i18n("Free Parking")); estateTypes.append(i18n("Go to Jail")); @@ -227,7 +227,7 @@ void EstateEdit::setReady(bool ready) this->ready = ready; } -void EstateEdit::resizeEvent(QResizeEvent *) +void EstateEdit::resizeEvent(TQResizeEvent *) { emit resized(); } @@ -325,7 +325,7 @@ void EstateEdit::configure() confDlg->slotUpdate(estate); - connect(confDlg, SIGNAL(updateBackground()), this, SIGNAL(updateBackground())); + connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground())); layout->addWidget(confDlg, 1, 0); confDlg->show(); @@ -378,16 +378,16 @@ bool EstateEdit::rightArrow()const ///////////////////////////////// -TaxDlg::TaxDlg(QWidget *parent, char *name) +TaxDlg::TaxDlg(TQWidget *parent, char *name) : EstateDlg(parent, name) { - QGridLayout *taxBox = new QGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); - taxBox->addWidget(new QLabel(i18n("Fixed tax:"), this), 0, 0); - taxBox->addWidget(tax = new QSpinBox(0, 3000, 1, this), 0, 1); + TQGridLayout *taxBox = new TQGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); + taxBox->addWidget(new TQLabel(i18n("Fixed tax:"), this), 0, 0); + taxBox->addWidget(tax = new TQSpinBox(0, 3000, 1, this), 0, 1); tax->setSpecialValueText(i18n("None")); tax->setSuffix("$"); - taxBox->addWidget(new QLabel(i18n("Percentage tax:"), this), 1, 0); - taxBox->addWidget(taxPercentage = new QSpinBox(0, 100, 1, this), 1, 1); + taxBox->addWidget(new TQLabel(i18n("Percentage tax:"), this), 1, 0); + taxBox->addWidget(taxPercentage = new TQSpinBox(0, 100, 1, this), 1, 1); taxPercentage->setSpecialValueText(i18n("None")); taxPercentage->setSuffix("%"); } @@ -406,11 +406,11 @@ void TaxDlg::update() ///////////////////////////////// -GenericDlg::GenericDlg(QWidget *parent, char *name) +GenericDlg::GenericDlg(TQWidget *parent, char *name) : EstateDlg(parent, name) { - QHBoxLayout *layout = new QHBoxLayout(this, KDialog::spacingHint()); - layout->addWidget(new QLabel(i18n("Background:"), this)); + TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint()); + layout->addWidget(new TQLabel(i18n("Background:"), this)); col = new KColorButton(this); layout->addWidget(col); @@ -429,7 +429,7 @@ void GenericDlg::update() ///////////////////////////////// -CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWidget *parent, char *name) +CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *parent, char *name) : EstateDlg(parent, name) { estates = newEstates; @@ -437,24 +437,24 @@ CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWid view = 0; - vlayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QHBoxLayout *layout = new QHBoxLayout(vlayout, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); KPushButton *addB = new KPushButton(i18n("&New Stack"), this); - connect(addB, SIGNAL(clicked()), this, SLOT(addStack())); + connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack())); layout->addWidget(addB); layout->addStretch(); - layout->addWidget(new QLabel(i18n("Cards from"), this)); - QStringList cardNames; - for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) + layout->addWidget(new TQLabel(i18n("Cards from"), this)); + TQStringList cardNames; + for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) cardNames.append((*it).name()); - cards = new QComboBox(this); + cards = new TQComboBox(this); cards->insertStringList(cardNames); layout->addWidget(cards); - connect(cards, SIGNAL(activated(const QString &)), this, SLOT(updateView(const QString &))); + connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &))); vlayout->addWidget(new KSeparator(this)); } @@ -462,10 +462,10 @@ CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWid void CardsDlg::addStack() { bool ok; - QString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), QString::null, &ok, this); + TQString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), TQString::null, &ok, this); if (ok) { - for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) + for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) { if ((*it).name() == name) { @@ -481,10 +481,10 @@ void CardsDlg::addStack() } } -void CardsDlg::updateView(const QString &curName) +void CardsDlg::updateView(const TQString &curName) { CardStack *curStack = 0; - for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) + for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) if ((*it).name() == curName) curStack = &(*it); @@ -515,8 +515,8 @@ void CardsDlg::update() ///////////////////////////////// -ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *parent, char *name) - : QWidget (parent, name) +ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *parent, char *name) + : TQWidget (parent, name) { this->id = id; this->card = card; @@ -530,9 +530,9 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *par value = 0; - hlayout = new QHBoxLayout(this, KDialog::spacingHint()); + hlayout = new TQHBoxLayout(this, KDialog::spacingHint()); typeCombo = new KComboBox(this); - QStringList _types(i18n("Pay")); + TQStringList _types(i18n("Pay")); _types.append(i18n("Pay Each Player")); _types.append(i18n("Collect")); _types.append(i18n("Collect From Each Player")); @@ -547,7 +547,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *par _types.append(i18n("Pay for Each Hotel")); typeCombo->insertStringList(_types); hlayout->addWidget(typeCombo); - connect(typeCombo, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); + connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int))); hlayout->addStretch(); } @@ -571,7 +571,7 @@ void ChooseWidget::estateChanged(int i) void ChooseWidget::typeChanged(int i) { - QString key = (*types.at(i)); + TQString key = (*types.at(i)); (*card->keys.at(id)) = key; typeCombo->setCurrentItem(i); @@ -586,10 +586,10 @@ void ChooseWidget::typeChanged(int i) delete estate; estate = 0; - value = new QSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this); + value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this); hlayout->addWidget(value); - connect(value, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); value->show(); } @@ -599,11 +599,11 @@ void ChooseWidget::typeChanged(int i) value = 0; estate = new KComboBox(this); ConfigEstate *curestate = 0; - QStringList estateStrings; + TQStringList estateStrings; for (curestate = estates->first(); curestate; curestate = estates->next()) estateStrings.append(curestate->name()); estate->insertStringList(estateStrings); - connect(estate, SIGNAL(activated(int)), this, SLOT(estateChanged(int))); + connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int))); hlayout->addWidget(estate); estate->show(); @@ -625,8 +625,8 @@ Skipped: } value->setEnabled(!boolean); - QString suffix = ""; - QString prefix = ""; + TQString suffix = ""; + TQString prefix = ""; // first four types are money, pay, payeach, collect, collecteach if (i < 4 || key == "payhouse" || key == "payhotel") @@ -640,7 +640,7 @@ Skipped: ///////////////////////////////// -CardView::CardView(EstateList *estates, CardStack *stack, QWidget *parent, char *name) : QWidget(parent, name) +CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char *name) : TQWidget(parent, name) { card = 0; @@ -649,35 +649,35 @@ CardView::CardView(EstateList *estates, CardStack *stack, QWidget *parent, char choosies.setAutoDelete(true); - layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QHBoxLayout *hlayout = new QHBoxLayout(layout, KDialog::spacingHint()); + layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); addButton = new KPushButton(i18n("&Add Card..."), this); - connect(addButton, SIGNAL(clicked()), this, SLOT(add())); + connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); hlayout->addWidget(addButton); hlayout->addStretch(); renameButton = new KPushButton(i18n("&Rename..."), this); - connect(renameButton, SIGNAL(clicked()), this, SLOT(rename())); + connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename())); hlayout->addWidget(renameButton); hlayout->addStretch(); delButton = new KPushButton(i18n("&Delete"), this); - connect(delButton, SIGNAL(clicked()), this, SLOT(del())); + connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); hlayout->addWidget(delButton); List = new KListBox(this); layout->addWidget(List); - connect(List, SIGNAL(highlighted(int)), this, SLOT(selected(int))); + 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 QHBoxLayout(layout, KDialog::spacingHint()); + hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); moreButton = new KPushButton(i18n("&More Properties"), this); - connect(moreButton, SIGNAL(clicked()), this, SLOT(more())); + connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); hlayout->addWidget(moreButton); hlayout->addStretch(); lessButton = new KPushButton(i18n("&Fewer Properties"), this); - connect(lessButton, SIGNAL(clicked()), this, SLOT(less())); + connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); hlayout->addWidget(lessButton); for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it) @@ -720,7 +720,7 @@ void CardView::less() void CardView::add() { bool ok = false; - QString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), QString::null, &ok, this); + TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), TQString::null, &ok, this); if (ok) List->insertItem(name, 0); @@ -742,7 +742,7 @@ void CardView::rename() return; bool ok = false;; - QString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), (*stack->at(curItem)).name, &ok, this); + TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), (*stack->at(curItem)).name, &ok, this); if (ok) { (*stack->at(curItem)).name = name; @@ -774,8 +774,8 @@ void CardView::selected(int i) card = &(*stack->at(i)); unsigned int num = card->keys.count(); - QValueList<int>::Iterator vit = card->values.begin(); - for (QStringList::Iterator it = card->keys.begin(); it != card->keys.end(); ++it) + TQValueList<int>::Iterator vit = card->values.begin(); + for (TQStringList::Iterator it = card->keys.begin(); it != card->keys.end(); ++it) { ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this); @@ -812,32 +812,32 @@ void CardView::updateButtonsEnabled() ///////////////////////////////// -StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, QWidget *parent, char *name) +StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *name) : EstateDlg(parent, name) { groups = newGroups; - QVBoxLayout *bigbox = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *bigbox = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QVGroupBox *RentPage = new QVGroupBox(i18n("&Rent by Number of Houses"), this); + TQVGroupBox *RentPage = new TQVGroupBox(i18n("&Rent by Number of Houses"), this); RentPage->setInsideSpacing(KDialog::spacingHint()); RentPage->setInsideMargin(KDialog::marginHint()); bigbox->addWidget(RentPage); - QWidget *topRent = new QWidget(RentPage); - QGridLayout *rentBox = new QGridLayout(topRent, 3, 3, KDialog::spacingHint()); - rentBox->addWidget(new QLabel(i18n("None:"), topRent), 0, 0); - rentBox->addWidget(new QLabel(i18n("One:"), topRent), 0, 1); - rentBox->addWidget(new QLabel(i18n("Two:"), topRent), 0, 2); - rentBox->addWidget(new QLabel(i18n("Three:"), topRent), 2, 0); - rentBox->addWidget(new QLabel(i18n("Four:"), topRent), 2, 1); - rentBox->addWidget(new QLabel(i18n("Hotel:"), topRent), 2, 2); - - rentBox->addWidget(houses0 = new QSpinBox(0, 3000, 1, topRent), 1, 0); - rentBox->addWidget(houses1 = new QSpinBox(0, 3000, 1, topRent), 1, 1); - rentBox->addWidget(houses2 = new QSpinBox(0, 3000, 1, topRent), 1, 2); - rentBox->addWidget(houses3 = new QSpinBox(0, 3000, 1, topRent), 3, 0); - rentBox->addWidget(houses4 = new QSpinBox(0, 3000, 1, topRent), 3, 1); - rentBox->addWidget(houses5 = new QSpinBox(0, 3000, 1, topRent), 3, 2); + TQWidget *topRent = new TQWidget(RentPage); + TQGridLayout *rentBox = new TQGridLayout(topRent, 3, 3, KDialog::spacingHint()); + rentBox->addWidget(new TQLabel(i18n("None:"), topRent), 0, 0); + rentBox->addWidget(new TQLabel(i18n("One:"), topRent), 0, 1); + rentBox->addWidget(new TQLabel(i18n("Two:"), topRent), 0, 2); + rentBox->addWidget(new TQLabel(i18n("Three:"), topRent), 2, 0); + rentBox->addWidget(new TQLabel(i18n("Four:"), topRent), 2, 1); + rentBox->addWidget(new TQLabel(i18n("Hotel:"), topRent), 2, 2); + + rentBox->addWidget(houses0 = new TQSpinBox(0, 3000, 1, topRent), 1, 0); + rentBox->addWidget(houses1 = new TQSpinBox(0, 3000, 1, topRent), 1, 1); + rentBox->addWidget(houses2 = new TQSpinBox(0, 3000, 1, topRent), 1, 2); + rentBox->addWidget(houses3 = new TQSpinBox(0, 3000, 1, topRent), 3, 0); + rentBox->addWidget(houses4 = new TQSpinBox(0, 3000, 1, topRent), 3, 1); + rentBox->addWidget(houses5 = new TQSpinBox(0, 3000, 1, topRent), 3, 2); houses0->setSuffix(i18n("$")); houses0->setSpecialValueText(i18n("None")); houses1->setSuffix(i18n("$")); @@ -851,22 +851,22 @@ StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, QWidget *parent, char *na houses5->setSuffix(i18n("$")); houses5->setSpecialValueText(i18n("None")); - QGridLayout *pricesBox = new QGridLayout(bigbox, 2, 2, KDialog::spacingHint()); - pricesBox->addWidget(new QLabel(i18n("Price:"), this), 0, 0); - pricesBox->addWidget(price = new QSpinBox(0, 3000, 25, this), 0, 1); + TQGridLayout *pricesBox = new TQGridLayout(bigbox, 2, 2, KDialog::spacingHint()); + pricesBox->addWidget(new TQLabel(i18n("Price:"), this), 0, 0); + pricesBox->addWidget(price = new TQSpinBox(0, 3000, 25, this), 0, 1); price->setSpecialValueText(i18n("None")); price->setSuffix(i18n("$")); - QLabel *groupLabel = new QLabel(i18n("Group:"), this); + TQLabel *groupLabel = new TQLabel(i18n("Group:"), this); pricesBox->addWidget(groupLabel, 1, 0); groupCombo = new KComboBox(this, "Group Combo"); groupUpdate(); - connect(groupCombo, SIGNAL(activated(const QString &)), this, SLOT(groupChanged(const QString &))); + connect(groupCombo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(groupChanged(const TQString &))); pricesBox->addWidget(groupCombo, 1, 1); } -void StreetDlg::groupChanged(const QString &groupName) +void StreetDlg::groupChanged(const TQString &groupName) { for (ConfigEstateGroupList::Iterator it = groups->begin(); it != groups->end(); ++it) { @@ -885,9 +885,9 @@ void StreetDlg::groupChanged(const QString &groupName) void StreetDlg::groupUpdate() { - QString curGroupName = groupCombo->currentText(); + TQString curGroupName = groupCombo->currentText(); - QStringList newGroups; + TQStringList newGroups; for (ConfigEstateGroupList::Iterator it = groups->begin(); it != groups->end(); ++it) newGroups.append((*it).name()); diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index be6d63a..da6fa6d 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -2,9 +2,9 @@ #define ATLANTIK_EDITOR_H #include <kmainwindow.h> -#include <qstring.h> -#include <qcolor.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqcolor.h> +#include <tqstringlist.h> #include <atlantic/estate.h> @@ -29,8 +29,8 @@ class ConfigEstate : public Estate void setEstateId(const int estateId); int type()const { return m_type; } void setType(const int type); - const QString &group() { return m_group; } - void setGroup(const QString &group); + const TQString &group() { return m_group; } + void setGroup(const TQString &group); int price()const { return m_price; } void setPrice(int); int rent(int _h)const { return m_rent[_h]; } @@ -39,10 +39,10 @@ class ConfigEstate : public Estate void setTax(const int); int taxPercentage() { return m_taxPercentage; } void setTaxPercentage(const int); - const QString &takeCard() { return m_takeCard; } - void setTakeCard(const QString &); - const QColor &forceBg() { return m_forceBg; } - void setForceBg(const QColor &); + const TQString &takeCard() { return m_takeCard; } + void setTakeCard(const TQString &); + const TQColor &forceBg() { return m_forceBg; } + void setForceBg(const TQColor &); bool go()const { return m_go; } void setGo(const bool); int passMoney()const { return m_passMoney; } @@ -52,36 +52,36 @@ class ConfigEstate : public Estate private: int m_type; - QString m_group; + TQString m_group; int m_rent[6]; int m_price; int m_tax; int m_taxPercentage; - QString m_takeCard; - QColor m_forceBg; + TQString m_takeCard; + TQColor m_forceBg; bool m_go; int m_passMoney; }; -typedef QPtrList<ConfigEstate> EstateList; +typedef TQPtrList<ConfigEstate> EstateList; struct Card { Card() {} - Card(const QString &newName) { name = newName; } - QString name; - QStringList keys; - QValueList<int> values; + Card(const TQString &newName) { name = newName; } + TQString name; + TQStringList keys; + TQValueList<int> values; }; -class CardStack : public QValueList<Card> +class CardStack : public TQValueList<Card> { public: CardStack() {} - CardStack(const QString &newName) { setName(newName); } - const QString &name() { return m_name; } - void setName(const QString &newName) { m_name = newName; } + CardStack(const TQString &newName) { setName(newName); } + const TQString &name() { return m_name; } + void setName(const TQString &newName) { m_name = newName; } private: - QString m_name; + TQString m_name; }; class EstateDlg : public QWidget @@ -89,7 +89,7 @@ class EstateDlg : public QWidget Q_OBJECT public: - EstateDlg(QWidget *parent = 0, char *name = 0) : QWidget(parent, name) { estate = 0; } + EstateDlg(TQWidget *parent = 0, char *name = 0) : TQWidget(parent, name) { estate = 0; } signals: void updateBackground(); @@ -111,7 +111,7 @@ class EstateEdit : public QWidget Q_OBJECT public: - EstateEdit(ConfigEstateGroupList *, EstateList *, QValueList<CardStack> *, QWidget *parent = 0, const char *name = 0); + EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, const char *name = 0); ConfigEstate *theEstate() { return estate; } bool upArrow()const; bool downArrow()const; @@ -133,7 +133,7 @@ class EstateEdit : public QWidget void resized(); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(TQResizeEvent *); private slots: void configure(); @@ -141,14 +141,14 @@ class EstateEdit : public QWidget private: KComboBox *typeCombo; - QLineEdit *nameEdit; - QCheckBox *goCheck; - QSpinBox *passMoney; - QWidget *centerWidget; - QGridLayout *layout; + TQLineEdit *nameEdit; + TQCheckBox *goCheck; + TQSpinBox *passMoney; + TQWidget *centerWidget; + TQGridLayout *layout; EstateList *estates; - QValueList<CardStack> *cards; + TQValueList<CardStack> *cards; ConfigEstateGroupList *groups; ConfigEstate *estate; @@ -166,7 +166,7 @@ class ChooseWidget : public QWidget Q_OBJECT public: - ChooseWidget(EstateList *, int id, Card *, QWidget *parent = 0, char *name = 0); + ChooseWidget(EstateList *, int id, Card *, TQWidget *parent = 0, char *name = 0); public slots: void typeChanged(int); @@ -176,12 +176,12 @@ class ChooseWidget : public QWidget private: Card *card; KComboBox *typeCombo; - QSpinBox *value; + TQSpinBox *value; KComboBox *estate; bool number; bool prevNumber; bool init; - QHBoxLayout *hlayout; + TQHBoxLayout *hlayout; EstateList *estates; @@ -193,7 +193,7 @@ class CardView : public QWidget Q_OBJECT public: - CardView(EstateList *, CardStack *, QWidget *parent = 0, char *name = 0); + CardView(EstateList *, CardStack *, TQWidget *parent = 0, char *name = 0); private slots: void selected(int); @@ -214,12 +214,12 @@ class CardView : public QWidget EstateList *estates; - QVBoxLayout *layout; + TQVBoxLayout *layout; Card *card; CardStack *stack; - QPtrList<ChooseWidget> choosies; + TQPtrList<ChooseWidget> choosies; }; class TaxDlg : public EstateDlg @@ -227,15 +227,15 @@ class TaxDlg : public EstateDlg Q_OBJECT public: - TaxDlg(QWidget *parent = 0, char *name = 0); + TaxDlg(TQWidget *parent = 0, char *name = 0); protected: virtual void save(); virtual void update(); private: - QSpinBox *tax; - QSpinBox *taxPercentage; + TQSpinBox *tax; + TQSpinBox *taxPercentage; }; class GenericDlg : public EstateDlg @@ -243,7 +243,7 @@ class GenericDlg : public EstateDlg Q_OBJECT public: - GenericDlg(QWidget *parent = 0, char *name = 0); + GenericDlg(TQWidget *parent = 0, char *name = 0); protected: virtual void save(); @@ -258,7 +258,7 @@ class CardsDlg : public EstateDlg Q_OBJECT public: - CardsDlg(EstateList *, QValueList<CardStack> *, QWidget *parent = 0, char *name = 0); + CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, char *name = 0); protected: virtual void save(); @@ -266,15 +266,15 @@ class CardsDlg : public EstateDlg private slots: void addStack(); - void updateView(const QString &); + void updateView(const TQString &); private: - QValueList<CardStack> *stacks; + TQValueList<CardStack> *stacks; EstateList *estates; - QComboBox *cards; + TQComboBox *cards; CardView *view; - QVBoxLayout *vlayout; + TQVBoxLayout *vlayout; }; class StreetDlg : public EstateDlg @@ -282,7 +282,7 @@ class StreetDlg : public EstateDlg Q_OBJECT public: - StreetDlg(ConfigEstateGroupList *, QWidget *parent = 0, char *name = 0); + StreetDlg(ConfigEstateGroupList *, TQWidget *parent = 0, char *name = 0); protected: virtual void save(); @@ -290,16 +290,16 @@ class StreetDlg : public EstateDlg virtual void groupUpdate(); private slots: - void groupChanged(const QString &); + void groupChanged(const TQString &); private: - QSpinBox *houses0; - QSpinBox *houses1; - QSpinBox *houses2; - QSpinBox *houses3; - QSpinBox *houses4; - QSpinBox *houses5; - QSpinBox *price; + TQSpinBox *houses0; + TQSpinBox *houses1; + TQSpinBox *houses2; + TQSpinBox *houses3; + TQSpinBox *houses4; + TQSpinBox *houses5; + TQSpinBox *price; KComboBox *groupCombo; ConfigEstateGroupList *groups; diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index 41f7c6f..8f4d513 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -1,11 +1,11 @@ -#include <qcombobox.h> -#include <qframe.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qspinbox.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqspinbox.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kcolorbutton.h> #include <kdebug.h> @@ -19,65 +19,65 @@ #include "group.h" -GroupEditor::GroupEditor(ConfigEstateGroupList *newList, QWidget *parent) +GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) : KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, parent, "Group Editor", false, true), mylist(*newList) { setWFlags(WDestructiveClose); list = newList; - QFrame *page = plainPage(); - QHBoxLayout *hlayout = new QHBoxLayout(page, marginHint(), spacingHint()); + TQFrame *page = plainPage(); + TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); groups = new KListBox(page); hlayout->addWidget(groups); - connect(groups, SIGNAL(highlighted(QListBoxItem *)), this, SLOT(updateSettings(QListBoxItem *))); - QStringList newgroups; + connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *))); + TQStringList newgroups; for (ConfigEstateGroupList::Iterator it = list->begin(); it != list->end(); ++it) newgroups.append((*it).name()); groups->insertStringList(newgroups); - connect(groups, SIGNAL(selectionChanged()), this, SLOT(selectionChanged())); + connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - QVBoxLayout *vlayout = new QVBoxLayout(hlayout, spacingHint()); - colorGroupBox = new QVGroupBox(i18n("&Colors"), page); + TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint()); + colorGroupBox = new TQVGroupBox(i18n("&Colors"), page); vlayout->addWidget(colorGroupBox); - (void) new QLabel(i18n("Foreground:"), colorGroupBox); + (void) new TQLabel(i18n("Foreground:"), colorGroupBox); fgButton = new KColorButton(colorGroupBox, "Foreground Button"); - connect(fgButton, SIGNAL(changed(const QColor &)), this, SLOT(fgChanged(const QColor &))); - connect(fgButton, SIGNAL(changed(const QColor &)), this, SIGNAL(changed())); + 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 QLabel(i18n("Background:"), colorGroupBox); + (void) new TQLabel(i18n("Background:"), colorGroupBox); bgButton = new KColorButton(colorGroupBox, "Background Button"); - connect(bgButton, SIGNAL(changed(const QColor &)), this, SLOT(bgChanged(const QColor &))); - connect(bgButton, SIGNAL(changed(const QColor &)), this, SIGNAL(changed())); + 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 QVGroupBox(i18n("&Prices"), page); + pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page); vlayout->addWidget(pricesGroupBox); - pricesWidget = new QWidget(pricesGroupBox); - QGridLayout *pricesLayout = new QGridLayout(pricesWidget, 2, 2, 0, spacingHint()); - pricesLayout->addWidget(new QLabel(i18n("House price:"), pricesWidget), 0, 0); - pricesLayout->addWidget(housePrice = new QSpinBox(0, 3000, 25, pricesWidget), 0, 1); + pricesWidget = new TQWidget(pricesGroupBox); + TQGridLayout *pricesLayout = new TQGridLayout(pricesWidget, 2, 2, 0, spacingHint()); + pricesLayout->addWidget(new TQLabel(i18n("House price:"), pricesWidget), 0, 0); + pricesLayout->addWidget(housePrice = new TQSpinBox(0, 3000, 25, pricesWidget), 0, 1); housePrice->setSpecialValueText(i18n("None")); housePrice->setSuffix(i18n("$")); - connect(housePrice, SIGNAL(valueChanged(int)), this, SLOT(housePriceChanged(int))); + connect(housePrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(housePriceChanged(int))); - pricesLayout->addWidget(new QLabel(i18n("Global price:"), pricesWidget), 1, 0); - pricesLayout->addWidget(globalPrice = new QSpinBox(0, 3000, 25, pricesWidget), 1, 1); + pricesLayout->addWidget(new TQLabel(i18n("Global price:"), pricesWidget), 1, 0); + pricesLayout->addWidget(globalPrice = new TQSpinBox(0, 3000, 25, pricesWidget), 1, 1); globalPrice->setSpecialValueText(i18n("None")); globalPrice->setSuffix(i18n("$")); - connect(globalPrice, SIGNAL(valueChanged(int)), this, SLOT(globalPriceChanged(int))); + connect(globalPrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(globalPriceChanged(int))); - dynamicGroupBox = new QVGroupBox(i18n("&Dynamic Rent"), page); + dynamicGroupBox = new TQVGroupBox(i18n("&Dynamic Rent"), page); vlayout->addWidget(dynamicGroupBox); - mathWidget = new QWidget(dynamicGroupBox); - QGridLayout *mathLayout = new QGridLayout(mathWidget, 2, 2, 0, spacingHint()); - mathLayout->addWidget(new QLabel(i18n("Add rent variable:"), mathWidget), 0, 0); - mathLayout->addWidget(new QLabel(i18n("Expression:"), mathWidget), 1, 0); + mathWidget = new TQWidget(dynamicGroupBox); + TQGridLayout *mathLayout = new TQGridLayout(mathWidget, 2, 2, 0, spacingHint()); + mathLayout->addWidget(new TQLabel(i18n("Add rent variable:"), mathWidget), 0, 0); + mathLayout->addWidget(new TQLabel(i18n("Expression:"), mathWidget), 1, 0); - QComboBox *rentVarCombo = new QComboBox(mathWidget); - QStringList vars; + TQComboBox *rentVarCombo = new TQComboBox(mathWidget); + TQStringList vars; vars << "DICE"; vars << "HOUSES"; vars << "GROUPOWNED"; @@ -85,18 +85,18 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, QWidget *parent) mathLayout->addWidget(rentVarCombo, 0, 1); rentMathEdit = new KLineEdit(mathWidget); - connect(rentMathEdit, SIGNAL(textChanged(const QString &)), this, SLOT(rentMathChanged(const QString &))); - connect(rentVarCombo, SIGNAL(activated(const QString &)), rentMathEdit, SLOT(insert(const QString &))); + connect(rentMathEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(rentMathChanged(const TQString &))); + connect(rentVarCombo, TQT_SIGNAL(activated(const TQString &)), rentMathEdit, TQT_SLOT(insert(const TQString &))); mathLayout->addWidget(rentMathEdit, 1, 1); - QHBoxLayout *buttonlayout = new QHBoxLayout(vlayout, spacingHint()); + TQHBoxLayout *buttonlayout = new TQHBoxLayout(vlayout, spacingHint()); KPushButton *addB = new KPushButton(i18n("&Add..."), page); buttonlayout->addWidget(addB); - connect(addB, SIGNAL(clicked()), this, SLOT(add())); + connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); removeB = new KPushButton(i18n("&Remove"), page); buttonlayout->addWidget(removeB); - connect(removeB, SIGNAL(clicked()), this, SLOT(remove())); + connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); selectionChanged(); } @@ -104,7 +104,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, QWidget *parent) void GroupEditor::add() { bool ok; - QString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), QString::null, &ok, this); + TQString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), TQString::null, &ok, this); if (ok) { for (ConfigEstateGroupList::Iterator it = mylist.begin(); it != mylist.end(); ++it) @@ -125,7 +125,7 @@ void GroupEditor::add() void GroupEditor::remove() { - QString curText = groups->currentText(); + TQString curText = groups->currentText(); if (!curText.isNull()) { groups->removeItem(groups->currentItem()); @@ -142,7 +142,7 @@ void GroupEditor::remove() } } -void GroupEditor::updateSettings(QListBoxItem *item) +void GroupEditor::updateSettings(TQListBoxItem *item) { if (!mylist.size()) return; @@ -166,7 +166,7 @@ void GroupEditor::updateSettings(QListBoxItem *item) ConfigEstateGroup *GroupEditor::currentGroup() { - QListBoxItem *item = groups->item(groups->currentItem()); + TQListBoxItem *item = groups->item(groups->currentItem()); if (!item) return 0; @@ -177,14 +177,14 @@ ConfigEstateGroup *GroupEditor::currentGroup() return 0; } -void GroupEditor::fgChanged(const QColor &color) +void GroupEditor::fgChanged(const TQColor &color) { ConfigEstateGroup *group = currentGroup(); if (group) group->setFgColor(color); } -void GroupEditor::bgChanged(const QColor &color) +void GroupEditor::bgChanged(const TQColor &color) { ConfigEstateGroup *group = currentGroup(); if (group) @@ -205,7 +205,7 @@ void GroupEditor::globalPriceChanged(int newValue) group->setGlobalPrice(newValue); } -void GroupEditor::rentMathChanged(const QString &newValue) +void GroupEditor::rentMathChanged(const TQString &newValue) { ConfigEstateGroup *group = currentGroup(); if (group) diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index b1ebf99..ece7638 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -1,8 +1,8 @@ #ifndef GROUP_H #define GROUP_H -#include <qcolor.h> -#include <qptrlist.h> +#include <tqcolor.h> +#include <tqptrlist.h> #include <kdialogbase.h> @@ -22,40 +22,40 @@ class ConfigEstateGroup { public: ConfigEstateGroup() { init(); } - ConfigEstateGroup(const QString &name) { setName(name); init(); } + ConfigEstateGroup(const TQString &name) { setName(name); init(); } void init() { setHousePrice(0); setGlobalPrice(0); } void setHousePrice(int newPrice) { m_housePrice = newPrice; } int housePrice()const { return m_housePrice; } void setGlobalPrice(int newGlobalPrice) { m_globalPrice = newGlobalPrice; } int globalPrice()const { return m_globalPrice; } - const QString &rentMath() { return m_rentMath; } - void setRentMath(const QString &newMath) { m_rentMath = newMath; } + const TQString &rentMath() { return m_rentMath; } + void setRentMath(const TQString &newMath) { m_rentMath = newMath; } bool dynamicRent()const { return !m_rentMath.isEmpty(); } - void setName(const QString &name) { m_name = name; } - const QString &name() { return m_name; } + void setName(const TQString &name) { m_name = name; } + const TQString &name() { return m_name; } - const QColor &fgColor() { return m_fgColor; } - void setFgColor(const QColor &color) { m_fgColor = color; } - const QColor &bgColor() { return m_bgColor; } - void setBgColor(const QColor &color) { m_bgColor = color; } + const TQColor &fgColor() { return m_fgColor; } + void setFgColor(const TQColor &color) { m_fgColor = color; } + const TQColor &bgColor() { return m_bgColor; } + void setBgColor(const TQColor &color) { m_bgColor = color; } private: - QColor m_fgColor; - QColor m_bgColor; - QString m_rentMath; + TQColor m_fgColor; + TQColor m_bgColor; + TQString m_rentMath; int m_housePrice; int m_globalPrice; - QString m_name; + TQString m_name; }; -typedef QValueList<ConfigEstateGroup> ConfigEstateGroupList; +typedef TQValueList<ConfigEstateGroup> ConfigEstateGroupList; class GroupEditor : public KDialogBase { Q_OBJECT public: - GroupEditor(ConfigEstateGroupList *, QWidget *parent=0); + GroupEditor(ConfigEstateGroupList *, TQWidget *parent=0); signals: void changed(); @@ -66,12 +66,12 @@ class GroupEditor : public KDialogBase virtual void slotApply(); private slots: - void updateSettings(QListBoxItem *item); - void fgChanged(const QColor &); - void bgChanged(const QColor &); + void updateSettings(TQListBoxItem *item); + void fgChanged(const TQColor &); + void bgChanged(const TQColor &); void housePriceChanged(int); void globalPriceChanged(int); - void rentMathChanged(const QString &); + void rentMathChanged(const TQString &); void add(); void remove(); void selectionChanged(); @@ -81,13 +81,13 @@ class GroupEditor : public KDialogBase KLineEdit *rentMathEdit; KColorButton *fgButton; KColorButton *bgButton; - QWidget *pricesWidget; - QWidget *mathWidget; - QSpinBox *housePrice; - QSpinBox *globalPrice; - QVGroupBox *colorGroupBox; - QVGroupBox *pricesGroupBox; - QVGroupBox *dynamicGroupBox; + TQWidget *pricesWidget; + TQWidget *mathWidget; + TQSpinBox *housePrice; + TQSpinBox *globalPrice; + TQVGroupBox *colorGroupBox; + TQVGroupBox *pricesGroupBox; + TQVGroupBox *dynamicGroupBox; KPushButton *removeB; ConfigEstateGroupList *list; diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index 524ad70..4a492f0 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -29,8 +29,8 @@ For further information please visit http://www.gmx.com */ -#include <qfile.h> -#include <qmap.h> +#include <tqfile.h> +#include <tqmap.h> #include <kfiledialog.h> #include <kio/netaccess.h> @@ -48,46 +48,46 @@ 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, QWidget *parent, const char *name ) +GMXXXPort::GMXXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import GMX Address Book..." ) ); createExportAction( i18n( "Export GMX Address Book..." ) ); } -static bool checkDateTime( const QString &dateStr, QDateTime &dt ) +static bool checkDateTime( const TQString &dateStr, TQDateTime &dt ) { if (dateStr.isEmpty()) return false; - dt = QDateTime::fromString(dateStr, Qt::ISODate); + dt = TQDateTime::fromString(dateStr, Qt::ISODate); if (dt.isValid() && dt.date().year()>1901) return true; - dt.setDate(QDate()); + dt.setDate(TQDate()); return false; } /* import */ -KABC::AddresseeList GMXXXPort::importContacts( const QString& ) const +KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - QString fileName = KFileDialog::getOpenFileName( ":xxport_gmx", + TQString fileName = KFileDialog::getOpenFileName( ":xxport_gmx", GMX_FILESELECTION_STRING, 0 ); if ( fileName.isEmpty() ) return addrList; - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - QString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); + TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } - QDateTime dt; - QTextStream gmxStream( &file ); - gmxStream.setEncoding( QTextStream::Latin1 ); - QString line, line2; + TQDateTime dt; + TQTextStream gmxStream( &file ); + gmxStream.setEncoding( TQTextStream::Latin1 ); + TQString line, line2; line = gmxStream.readLine(); line2 = gmxStream.readLine(); if (!line.startsWith("AB_ADDRESSES:") || !line2.startsWith("Address_id")) { @@ -95,15 +95,15 @@ KABC::AddresseeList GMXXXPort::importContacts( const QString& ) const return addrList; } - QStringList strList; - typedef QMap<QString, KABC::Addressee *> AddressMap; + TQStringList strList; + typedef TQMap<TQString, KABC::Addressee *> AddressMap; AddressMap addrMap; // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,Change_date,Status,Address_link_id,Categories" line = gmxStream.readLine(); while (!line.startsWith("####") && !gmxStream.atEnd()) { while (1) { - strList = QStringList::split('#', line, true); + strList = TQStringList::split('#', line, true); if (strList.count() >= 11) break; line.append('\n'); @@ -143,7 +143,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const QString& ) const while (!line.startsWith("####") && !gmxStream.atEnd()) { while (1) { - strList = QStringList::split('#', line, true); + strList = TQStringList::split('#', line, true); if (strList.count() >= 21) break; line.append('\n'); @@ -152,7 +152,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const QString& ) const KABC::Addressee *addr = addrMap[strList[0]]; if (addr) { - for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) + for ( TQStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) *it = (*it).simplifyWhiteSpace(); // strList[1] = Record_id (numbered item, ignore here) int id = strList[14].toInt(); // Record_type_id (0=work,1=home,2=other) @@ -204,7 +204,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const QString& ) const /* export */ -bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const QString& ) +bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& ) { KURL url = KFileDialog::getSaveURL( ":xxport_gmx", GMX_FILESELECTION_STRING ); if ( url.isEmpty() ) @@ -213,7 +213,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const QString& if ( !url.isLocalFile() ) { KTempFile tmpFile; if ( tmpFile.status() != 0 ) { - QString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); + TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); KMessageBox::error( parentWidget(), txt.arg( url.url() ) .arg( strerror( tmpFile.status() ) ) ); return false; @@ -224,11 +224,11 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const QString& return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } else { - QString filename = url.path(); - QFile file( filename ); + TQString filename = url.path(); + TQFile file( filename ); if ( !file.open( IO_WriteOnly ) ) { - QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); + TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); KMessageBox::error( parentWidget(), txt.arg( filename ) ); return false; } @@ -240,25 +240,25 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const QString& } } -static const QString dateString( const QDateTime &dt ) +static const TQString dateString( const TQDateTime &dt ) { if (!dt.isValid()) - return QString::fromLatin1("1000-01-01 00:00:00"); - QString d(dt.toString(Qt::ISODate)); + return TQString::fromLatin1("1000-01-01 00:00:00"); + TQString d(dt.toString(Qt::ISODate)); d[10] = ' '; // remove the "T" in the middle of the string return d; } -void GMXXXPort::doExport( QFile *fp, const KABC::AddresseeList &list ) +void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) { if (!fp || !list.count()) return; - QTextStream t( fp ); - t.setEncoding( QTextStream::Latin1 ); + TQTextStream t( fp ); + t.setEncoding( TQTextStream::Latin1 ); KABC::AddresseeList::ConstIterator it; - typedef QMap<int, const KABC::Addressee *> AddressMap; + typedef TQMap<int, const KABC::Addressee *> AddressMap; AddressMap addrMap; const KABC::Addressee *addr; @@ -267,7 +267,7 @@ void GMXXXPort::doExport( QFile *fp, const KABC::AddresseeList &list ) "Change_date,Status,Address_link_id,Categories\n"; int no = 0; - const QChar DELIM('#'); + const TQChar DELIM('#'); for ( it = list.begin(); it != list.end(); ++it ) { addr = &(*it); if (addr->isEmpty()) @@ -309,8 +309,8 @@ void GMXXXPort::doExport( QFile *fp, const KABC::AddresseeList &list ) cell = addr->phoneNumber(KABC::PhoneNumber::Cell); } - const QStringList emails = addr->emails(); - QString email; + const TQStringList emails = addr->emails(); + TQString email; if (emails.count()>record_id) email = emails[record_id]; t << no << DELIM // Address_id @@ -324,13 +324,13 @@ void GMXXXPort::doExport( QFile *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():QString::null) << DELIM // Homepage - << ((record_id==0)?addr->role():QString::null) << DELIM // Position + << ((record_id==0)?addr->url().url():TQString::null) << DELIM // Homepage + << ((record_id==0)?addr->role():TQString::null) << 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():QString::null) << DELIM // Company - << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):QString::null) << DELIM // Department + << ((record_id==0)?addr->organization():TQString::null) << DELIM // Company + << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):TQString::null) << DELIM // Department << dateString(addr->revision()) << DELIM // Change_date << 5 << DELIM // Preferred << 1 << endl; // Status (should always be "1") diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h index 9ced4da..607455c 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h @@ -32,16 +32,16 @@ class GMXXXPort : public KAB::XXPort Q_OBJECT public: - GMXXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 ); + GMXXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); - QString identifier() const { return "gmx"; } + TQString identifier() const { return "gmx"; } public slots: - bool exportContacts( const KABC::AddresseeList &list, const QString &data ); - KABC::AddresseeList importContacts( const QString &data ) const; + bool exportContacts( const KABC::AddresseeList &list, const TQString &data ); + KABC::AddresseeList importContacts( const TQString &data ) const; private: - void doExport( QFile *fp, const KABC::AddresseeList &list ); + void doExport( TQFile *fp, const KABC::AddresseeList &list ); }; #endif diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp index a2440aa..72256b8 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp @@ -35,39 +35,39 @@ class FlagInfo public: double latitude; double longitude; - QColor color; + TQColor color; }; K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libkaddrbk_geo_xxport, GeoXXPort, "libkaddrbk_geo_xxport" ) -GeoXXPort::GeoXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name ) +GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createExportAction( i18n( "Export Geo Data..." ) ); } -bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const QString& ) +bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& ) { KConfig config( "kworldclockrc" ); // At first we read all exiting flags and compare it with ours to // avoid duplicated flags int flags = config.readNumEntry( "Flags", 0 ); - QValueList<FlagInfo> availableFlags; + TQValueList<FlagInfo> availableFlags; if ( flags != 0 ) { for ( int i = 0; i < flags; ++i ) { FlagInfo info; - info.latitude = config.readDoubleNumEntry( QString( "Flag_%1_Latitude" ).arg( i ) ); - info.longitude = config.readDoubleNumEntry( QString( "Flag_%1_Longitude" ).arg( i ) ); - info.color = config.readColorEntry( QString( "Flag_%1_Color" ).arg( i ) ); + info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).arg( i ) ); + info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).arg( i ) ); + info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).arg( i ) ); availableFlags.append( info ); } } - QValueList<FlagInfo> flagList; + TQValueList<FlagInfo> flagList; KABC::AddresseeList::ConstIterator addrIt; for ( addrIt = list.begin(); addrIt != list.end(); ++addrIt ) { KABC::Geo geo( (*addrIt).geo() ); @@ -75,7 +75,7 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const QString& continue; bool available = false; - QValueList<FlagInfo>::Iterator it; + TQValueList<FlagInfo>::Iterator it; for ( it = availableFlags.begin(); it != availableFlags.end(); ++it ) { if ( !( KABS( (*it).latitude - geo.latitude() ) > DBL_EPSILON ) && !( KABS( (*it).longitude - geo.longitude() ) > DBL_EPSILON ) ) { @@ -88,7 +88,7 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const QString& FlagInfo info; info.latitude = geo.latitude(); info.longitude = geo.longitude(); - info.color = QColor( 0, 255, 0 ); + info.color = TQColor( 0, 255, 0 ); flagList.append( info ); } @@ -100,11 +100,11 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const QString& flagList += availableFlags; int startVal = 0; - QValueList<FlagInfo>::Iterator it; + TQValueList<FlagInfo>::Iterator it; for ( it = flagList.begin(); it != flagList.end(); ++it, ++startVal ) { - config.writeEntry( QString( "Flag_%1_Color" ).arg( startVal ), (*it).color ); - config.writeEntry( QString( "Flag_%1_Latitude" ).arg( startVal ), (*it).latitude ); - config.writeEntry( QString( "Flag_%1_Longitude" ).arg( startVal ), (*it).longitude ); + config.writeEntry( TQString( "Flag_%1_Color" ).arg( startVal ), (*it).color ); + config.writeEntry( TQString( "Flag_%1_Latitude" ).arg( startVal ), (*it).latitude ); + config.writeEntry( TQString( "Flag_%1_Longitude" ).arg( startVal ), (*it).longitude ); } config.writeEntry( "Flags", startVal ); diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h index d3b560a..cdac56a 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h @@ -31,12 +31,12 @@ class GeoXXPort : public KAB::XXPort Q_OBJECT public: - GeoXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 ); + GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); - QString identifier() const { return "geo"; } + TQString identifier() const { return "geo"; } public slots: - bool exportContacts( const KABC::AddresseeList &list, const QString &data ); + bool exportContacts( const KABC::AddresseeList &list, const TQString &data ); }; #endif diff --git a/kate/cppsymbolviewer/cpp_parser.cpp b/kate/cppsymbolviewer/cpp_parser.cpp index 01ee919..b666983 100644 --- a/kate/cppsymbolviewer/cpp_parser.cpp +++ b/kate/cppsymbolviewer/cpp_parser.cpp @@ -20,32 +20,32 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) if (!win->viewManager()->activeView()) return; - QString cl; // Current Line - QString stripped; + TQString cl; // Current Line + TQString stripped; uint i, j, tmpPos = 0; int par = 0, graph = 0, retry = 0; char mclass = 0, block = 0, comment = 0; // comment: 0-no comment 1-inline comment 2-multiline comment 3-string char macro = 0, macro_pos = 0, func_close = 0; bool structure = false; - QPixmap cls( ( const char** ) class_xpm ); - QPixmap sct( ( const char** ) struct_xpm ); - QPixmap mcr( ( const char** ) macro_xpm ); - QPixmap mtd( ( const char** ) method_xpm ); - QListViewItem *node = NULL; - QListViewItem *mcrNode = NULL, *sctNode = NULL, *clsNode = NULL, *mtdNode = NULL; - QListViewItem *lastMcrNode = NULL, *lastSctNode = NULL, *lastClsNode = NULL, *lastMtdNode = NULL; + TQPixmap cls( ( const char** ) class_xpm ); + TQPixmap sct( ( const char** ) struct_xpm ); + TQPixmap mcr( ( const char** ) macro_xpm ); + TQPixmap mtd( ( const char** ) method_xpm ); + TQListViewItem *node = NULL; + TQListViewItem *mcrNode = NULL, *sctNode = NULL, *clsNode = NULL, *mtdNode = NULL; + TQListViewItem *lastMcrNode = NULL, *lastSctNode = NULL, *lastClsNode = NULL, *lastMtdNode = NULL; Kate::Document *kv = win->viewManager()->activeView()->getDoc(); //kdDebug(13000)<<"Lines counted :"<<kv->numLines()<<endl; if(treeMode) { - mcrNode = new QListViewItem(symbols, symbols->lastItem(), i18n("Macros")); - sctNode = new QListViewItem(symbols, symbols->lastItem(), i18n("Structures")); - clsNode = new QListViewItem(symbols, symbols->lastItem(), i18n("Functions")); - mcrNode->setPixmap(0, (const QPixmap &)mcr); - sctNode->setPixmap(0, (const QPixmap &)sct); - clsNode->setPixmap(0, (const QPixmap &)cls); + mcrNode = new TQListViewItem(symbols, symbols->lastItem(), i18n("Macros")); + sctNode = new TQListViewItem(symbols, symbols->lastItem(), i18n("Structures")); + clsNode = new TQListViewItem(symbols, symbols->lastItem(), i18n("Functions")); + mcrNode->setPixmap(0, (const TQPixmap &)mcr); + sctNode->setPixmap(0, (const TQPixmap &)sct); + clsNode->setPixmap(0, (const TQPixmap &)cls); if (expanded_on) { mcrNode->setOpen(TRUE); @@ -105,12 +105,12 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if (treeMode) { - node = new QListViewItem(mcrNode, lastMcrNode, stripped); + node = new TQListViewItem(mcrNode, lastMcrNode, stripped); lastMcrNode = node; } - else node = new QListViewItem(symbols, symbols->lastItem(), stripped); - node->setPixmap(0, (const QPixmap &)mcr); - node->setText(1, QString::number( i, 10)); + else node = new TQListViewItem(symbols, symbols->lastItem(), stripped); + node->setPixmap(0, (const TQPixmap &)mcr); + node->setText(1, TQString::number( i, 10)); } macro = 0; macro_pos = 0; @@ -142,15 +142,15 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if (treeMode) { - node = new QListViewItem(clsNode, lastClsNode, stripped); + node = new TQListViewItem(clsNode, lastClsNode, stripped); if (expanded_on) node->setOpen(TRUE); lastClsNode = node; mtdNode = lastClsNode; lastMtdNode = lastClsNode; } - else node = new QListViewItem(symbols, symbols->lastItem(), stripped); - node->setPixmap(0, (const QPixmap &)cls); - node->setText(1, QString::number( i, 10)); + else node = new TQListViewItem(symbols, symbols->lastItem(), stripped); + node->setPixmap(0, (const TQPixmap &)cls); + node->setText(1, TQString::number( i, 10)); stripped = ""; if (mclass == 1) mclass = 3; } @@ -237,20 +237,20 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if (mclass == 4) { - node = new QListViewItem(mtdNode, lastMtdNode, stripped); + node = new TQListViewItem(mtdNode, lastMtdNode, stripped); lastMtdNode = node; } else { - node = new QListViewItem(clsNode, lastClsNode, stripped); + node = new TQListViewItem(clsNode, lastClsNode, stripped); lastClsNode = node; } } else - node = new QListViewItem(symbols, symbols->lastItem(), stripped); - if (mclass == 4) node->setPixmap(0, (const QPixmap &)mtd); - else node->setPixmap(0, (const QPixmap &)cls); - node->setText(1, QString::number( tmpPos, 10)); + node = new TQListViewItem(symbols, symbols->lastItem(), stripped); + if (mclass == 4) node->setPixmap(0, (const TQPixmap &)mtd); + else node->setPixmap(0, (const TQPixmap &)cls); + node->setText(1, TQString::number( tmpPos, 10)); } stripped = ""; retry = 0; @@ -297,12 +297,12 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if (treeMode) { - node = new QListViewItem(sctNode, lastSctNode, stripped); + node = new TQListViewItem(sctNode, lastSctNode, stripped); lastSctNode = node; } - else node = new QListViewItem(symbols, symbols->lastItem(), stripped); - node->setPixmap(0, (const QPixmap &)sct); - node->setText(1, QString::number( tmpPos, 10)); + else node = new TQListViewItem(symbols, symbols->lastItem(), stripped); + node->setPixmap(0, (const TQPixmap &)sct); + node->setText(1, TQString::number( tmpPos, 10)); } //kdDebug(13000)<<"Structure -- Inserted : "<<stripped<<" at row : "<<i<<endl; stripped = ""; diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 3e18097..9165878 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -11,11 +11,11 @@ * Nov 28 2003 v.1.1 - Structured for multilanguage support * Added preliminary Tcl/Tk parser (thanks Rohit). To be improved. * Various bugfixing. - * Jun 19 2003 v.1.0 - Removed QTimer (polling is Evil(tm)... ) + * Jun 19 2003 v.1.0 - Removed TQTimer (polling is Evil(tm)... ) * - Captured documentChanged() event to refresh symbol list * - Tooltips vanished into nowhere...sigh :( * May 04 2003 v 0.6 - Symbol List becomes a KListView object. Removed Tooltip class. - * Added a QTimer that every 200ms checks: + * Added a TQTimer that every 200ms checks: * * if the list width has changed * * if the document has changed * Added an entry in the popup menu to switch between List and Tree mode @@ -47,15 +47,15 @@ #include <kgenericfactory.h> #include <kfiledialog.h> -#include <qlayout.h> -#include <qgroupbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePluginSymbolViewer>( "katesymbolviewer" ) ) KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) { KGlobal::locale()->insertCatalogue("katecppsymbolviewer"); - KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); + KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); act->setCheckedState(i18n("Show Symbols")); setInstance (new KInstance("kate")); @@ -65,15 +65,15 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) symbols = 0; m_Active = false; - popup = new QPopupMenu(); - popup->insertItem(i18n("Refresh List"), this, SLOT(slotRefreshSymbol())); + popup = new TQPopupMenu(); + popup->insertItem(i18n("Refresh List"), this, TQT_SLOT(slotRefreshSymbol())); popup->insertSeparator(); - m_macro = popup->insertItem(i18n("Show Macros"), this, SLOT(toggleShowMacros())); - m_struct = popup->insertItem(i18n("Show Structures"), this, SLOT(toggleShowStructures())); - m_func = popup->insertItem(i18n("Show Functions"), this, SLOT(toggleShowFunctions())); + m_macro = popup->insertItem(i18n("Show Macros"), this, TQT_SLOT(toggleShowMacros())); + m_struct = popup->insertItem(i18n("Show Structures"), this, TQT_SLOT(toggleShowStructures())); + m_func = popup->insertItem(i18n("Show Functions"), this, TQT_SLOT(toggleShowFunctions())); popup->insertSeparator(); - popup->insertItem(i18n("List/Tree Mode"), this, SLOT(slotChangeMode())); - m_sort = popup->insertItem(i18n("Enable sorting"), this, SLOT(slotEnableSorting())); + popup->insertItem(i18n("List/Tree Mode"), this, TQT_SLOT(slotChangeMode())); + m_sort = popup->insertItem(i18n("Enable sorting"), this, TQT_SLOT(slotEnableSorting())); popup->setItemChecked(m_macro, true); popup->setItemChecked(m_struct, true); @@ -117,7 +117,7 @@ void KatePluginSymbolViewerView::toggleShowFunctions(void) void KatePluginSymbolViewerView::slotInsertSymbol() { - QPixmap cls( ( const char** ) class_xpm ); + TQPixmap cls( ( const char** ) class_xpm ); if (m_Active == false) { @@ -126,17 +126,17 @@ void KatePluginSymbolViewerView::slotInsertSymbol() symbols = new KListView(dock); treeMode = 0; - connect(symbols, SIGNAL(executed(QListViewItem *)), this, SLOT(goToSymbol(QListViewItem *))); - connect(symbols, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint&, int)), - SLOT(slotShowContextMenu(QListViewItem *, const QPoint&, int))); - connect(win->viewManager(), SIGNAL(viewChanged()), this, SLOT(slotDocChanged())); - //connect(symbols, SIGNAL(resizeEvent(QResizeEvent *)), this, SLOT(slotViewChanged(QResizeEvent *))); + connect(symbols, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(goToSymbol(TQListViewItem *))); + connect(symbols, TQT_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint&, int)), + TQT_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint&, int))); + connect(win->viewManager(), TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotDocChanged())); + //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->addColumn(i18n("Position")); - symbols->setColumnWidthMode(1, QListView::Manual); + symbols->setColumnWidthMode(1, TQListView::Manual); symbols->setColumnWidth ( 1, 0 ); symbols->setSorting(-1, FALSE); symbols->setRootIsDecorated(0); @@ -189,13 +189,13 @@ void KatePluginSymbolViewerView::slotDocChanged() slotRefreshSymbol(); } -void KatePluginSymbolViewerView::slotViewChanged(QResizeEvent *) +void KatePluginSymbolViewerView::slotViewChanged(TQResizeEvent *) { kdDebug(13000)<<"View changed !!!!"<<endl; symbols->setColumnWidth(0, symbols->parentWidget()->width()); } -void KatePluginSymbolViewerView::slotShowContextMenu(QListViewItem *, const QPoint &p, int) +void KatePluginSymbolViewerView::slotShowContextMenu(TQListViewItem *, const TQPoint &p, int) { popup->popup(p); } @@ -215,9 +215,9 @@ void KatePluginSymbolViewerView::parseSymbols(void) /** Get the current highlighting mode */ hlMode = kv->hlMode(); - QString hlModeName = kv->hlModeName(hlMode); + TQString hlModeName = kv->hlModeName(hlMode); - //QListViewItem mcrNode = new QListViewItem(symbols, symbols->lastItem(), hlModeName); + //TQListViewItem mcrNode = new TQListViewItem(symbols, symbols->lastItem(), hlModeName); if (hlModeName == "C++" || hlModeName == "C") parseCppSymbols(); @@ -227,7 +227,7 @@ void KatePluginSymbolViewerView::parseSymbols(void) parseCppSymbols(); } -void KatePluginSymbolViewerView::goToSymbol(QListViewItem *it) +void KatePluginSymbolViewerView::goToSymbol(TQListViewItem *it) { Kate::View *kv = win->viewManager()->activeView(); @@ -241,7 +241,7 @@ void KatePluginSymbolViewerView::goToSymbol(QListViewItem *it) kv->gotoLineNumber(it->text(1).toInt(NULL, 10)); } -KatePluginSymbolViewer::KatePluginSymbolViewer( QObject* parent, const char* name, const QStringList& ) +KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application*)parent, name ), pConfig("katecppsymbolviewerpluginrc") { @@ -276,12 +276,12 @@ void KatePluginSymbolViewer::removeView(Kate::MainWindow *win) } Kate::PluginConfigPage* KatePluginSymbolViewer::configPage( - uint, QWidget *w, const char* /*name*/) + uint, TQWidget *w, const char* /*name*/) { KatePluginSymbolViewerConfigPage* p = new KatePluginSymbolViewerConfigPage(this, w); initConfigPage( p ); - connect( p, SIGNAL(configPageApplyRequest(KatePluginSymbolViewerConfigPage*)), - SLOT(applyConfig(KatePluginSymbolViewerConfigPage *)) ); + connect( p, TQT_SIGNAL(configPageApplyRequest(KatePluginSymbolViewerConfigPage*)), + TQT_SLOT(applyConfig(KatePluginSymbolViewerConfigPage *)) ); return (Kate::PluginConfigPage*)p; } @@ -307,24 +307,24 @@ void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p ) // BEGIN KatePluginSymbolViewerConfigPage KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage( - QObject* /*parent*/ /*= 0L*/, QWidget *parentWidget /*= 0L*/) + TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { - QVBoxLayout* top = new QVBoxLayout(this, 0, + TQVBoxLayout* top = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); - QGroupBox* gb = new QGroupBox( i18n("Parser Options"), + TQGroupBox* gb = new TQGroupBox( i18n("Parser Options"), this, "cppsymbolviewer_config_page_layout" ); gb->setColumnLayout(1, Qt::Horizontal); gb->setInsideSpacing(KDialogBase::spacingHint()); - viewReturns = new QCheckBox(i18n("Display functions parameters"), gb); - expandTree = new QCheckBox(i18n("Automatically expand nodes in tree mode"), gb); + viewReturns = new TQCheckBox(i18n("Display functions parameters"), gb); + expandTree = new TQCheckBox(i18n("Automatically expand nodes in tree mode"), gb); top->add(gb); top->addStretch(1); // throw signal changed - connect(viewReturns, SIGNAL(toggled(bool)), this, SIGNAL(changed())); - connect(expandTree, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(viewReturns, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); + connect(expandTree, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); } KatePluginSymbolViewerConfigPage::~KatePluginSymbolViewerConfigPage() {} diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index f20f097..e8ac0e0 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -30,12 +30,12 @@ #include <kate/pluginconfiginterfaceextension.h> #include <kdebug.h> -#include <qmemarray.h> -#include <qpopupmenu.h> -#include <qevent.h> -#include <qcheckbox.h> -//#include <qprocess.h> -#include <qregexp.h> +#include <tqmemarray.h> +#include <tqpopupmenu.h> +#include <tqevent.h> +#include <tqcheckbox.h> +//#include <tqprocess.h> +#include <tqregexp.h> #include <klibloader.h> #include <klocale.h> #include <klistview.h> @@ -43,7 +43,7 @@ #include <kconfig.h> -class KatePluginSymbolViewerView : public QObject, public KXMLGUIClient +class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient { Q_OBJECT @@ -59,17 +59,17 @@ class KatePluginSymbolViewerView : public QObject, public KXMLGUIClient void slotChangeMode(); void slotEnableSorting(); void slotDocChanged(); - void goToSymbol(QListViewItem *); - void slotShowContextMenu(QListViewItem *, const QPoint&, int); + void goToSymbol(TQListViewItem *); + void slotShowContextMenu(TQListViewItem *, const TQPoint&, int); void toggleShowMacros(void); void toggleShowStructures(void); void toggleShowFunctions(void); protected: - void slotViewChanged(QResizeEvent *e); + void slotViewChanged(TQResizeEvent *e); private: - QPopupMenu *popup; + TQPopupMenu *popup; KListView *symbols; - QWidget *dock; + TQWidget *dock; bool m_Active; int m_macro, m_struct, m_func, m_sort; bool macro_on, struct_on, func_on; @@ -92,7 +92,7 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage friend class KatePluginSymbolViewer; public: - KatePluginSymbolViewerConfigPage (QObject* parent = 0L, QWidget *parentWidget = 0L); + KatePluginSymbolViewerConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~KatePluginSymbolViewerConfigPage (); /** @@ -116,8 +116,8 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage void configPageInitRequest( KatePluginSymbolViewerConfigPage* ); private: - QCheckBox* viewReturns; - QCheckBox* expandTree; + TQCheckBox* viewReturns; + TQCheckBox* expandTree; }; class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension @@ -125,17 +125,17 @@ class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, K Q_OBJECT public: - KatePluginSymbolViewer( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + KatePluginSymbolViewer( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSymbolViewer(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , QWidget *w, const char *name=0); - QString configPageName(uint) const { return i18n("Symbol Viewer"); } - QString configPageFullName(uint) const { return i18n("Symbol Viewer Configuration Page"); } - QPixmap configPagePixmap (uint , int ) const { return 0L; } + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + TQString configPageName(uint) const { return i18n("Symbol Viewer"); } + TQString configPageFullName(uint) const { return i18n("Symbol Viewer Configuration Page"); } + TQPixmap configPagePixmap (uint , int ) const { return 0L; } public slots: void applyConfig( KatePluginSymbolViewerConfigPage* ); @@ -144,7 +144,7 @@ class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, K void initConfigPage( KatePluginSymbolViewerConfigPage* ); private: - QPtrList<KatePluginSymbolViewerView> m_views; + TQPtrList<KatePluginSymbolViewerView> m_views; KConfig pConfig; }; diff --git a/kate/cppsymbolviewer/tcl_parser.cpp b/kate/cppsymbolviewer/tcl_parser.cpp index ff51e60..c2eae61 100644 --- a/kate/cppsymbolviewer/tcl_parser.cpp +++ b/kate/cppsymbolviewer/tcl_parser.cpp @@ -21,25 +21,25 @@ void KatePluginSymbolViewerView::parseTclSymbols(void) if (!win->viewManager()->activeView()) return; - QString currline, prevline; + TQString currline, prevline; bool prevComment = false; - QString varStr("set "); - QString procStr("proc"); - QString stripped; + TQString varStr("set "); + TQString procStr("proc"); + TQString stripped; uint i, j, args_par = 0, graph = 0; char block = 0, parse_func = 0; - QListViewItem *node = NULL; - QListViewItem *mcrNode = NULL, *clsNode = NULL; - QListViewItem *lastMcrNode = NULL, *lastClsNode = NULL; + TQListViewItem *node = NULL; + TQListViewItem *mcrNode = NULL, *clsNode = NULL; + TQListViewItem *lastMcrNode = NULL, *lastClsNode = NULL; - QPixmap mcr( ( const char** ) macro_xpm ); - QPixmap cls( ( const char** ) class_xpm ); + TQPixmap mcr( ( const char** ) macro_xpm ); + TQPixmap cls( ( const char** ) class_xpm ); if(treeMode) { - clsNode = new QListViewItem(symbols, symbols->lastItem(), i18n("Functions")); - mcrNode = new QListViewItem(symbols, symbols->lastItem(), i18n("Globals")); + clsNode = new TQListViewItem(symbols, symbols->lastItem(), i18n("Functions")); + mcrNode = new TQListViewItem(symbols, symbols->lastItem(), i18n("Globals")); lastMcrNode = mcrNode; lastClsNode = clsNode; if (expanded_on) @@ -86,14 +86,14 @@ void KatePluginSymbolViewerView::parseTclSymbols(void) if (treeMode) { - node = new QListViewItem(mcrNode, lastMcrNode, stripped); + node = new TQListViewItem(mcrNode, lastMcrNode, stripped); lastMcrNode = node; } else - node = new QListViewItem(symbols, symbols->lastItem(), stripped); + node = new TQListViewItem(symbols, symbols->lastItem(), stripped); - node->setPixmap(0, (const QPixmap &)mcr); - node->setText(1, QString::number( i, 10)); + node->setPixmap(0, (const TQPixmap &)mcr); + node->setText(1, TQString::number( i, 10)); stripped = ""; }//macro } // starts with "set" @@ -127,13 +127,13 @@ void KatePluginSymbolViewerView::parseTclSymbols(void) { if (treeMode) { - node = new QListViewItem(clsNode, lastClsNode, stripped); + node = new TQListViewItem(clsNode, lastClsNode, stripped); lastClsNode = node; } else - node = new QListViewItem(symbols, symbols->lastItem(), stripped); - node->setPixmap(0, (const QPixmap &)cls); - node->setText(1, QString::number( i, 10)); + node = new TQListViewItem(symbols, symbols->lastItem(), stripped); + node->setPixmap(0, (const TQPixmap &)cls); + node->setText(1, TQString::number( i, 10)); } stripped = ""; block = 1; diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 4eb116f..8fb8061 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -20,7 +20,7 @@ #include <kate/pluginmanager.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <kgenericfactory.h> #include <kaction.h> #include <klocale.h> @@ -30,7 +30,7 @@ K_EXPORT_COMPONENT_FACTORY( katefll_initplugin, KGenericFactory<InitPluginKateFileListLoader>( "katefll_loader" ) ) -InitPluginKateFileListLoader::InitPluginKateFileListLoader (QObject * parent, const char *name, const QStringList datalist) +InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList datalist) :InitPlugin((Kate::Application*)parent,name) { } @@ -48,14 +48,14 @@ int InitPluginKateFileListLoader::actionsKateShouldNotPerformOnRealStartup() int InitPluginKateFileListLoader::initKate() { - QString tmpFile; + TQString tmpFile; KURL tmpURL; if( KIO::NetAccess::download( configScript(), tmpFile ) ) { - QFile file(tmpFile); + TQFile file(tmpFile); file.open(IO_ReadOnly); - QTextStream t(&file); + TQTextStream t(&file); bool somethingOpened=false; @@ -79,11 +79,11 @@ int InitPluginKateFileListLoader::initKate() Kate::Plugin *pl=application()->pluginManager()->plugin("katefll_plugin"); if (pl) { - connect(this,SIGNAL(updateInit()),pl,SLOT(updateInit())); + connect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); updateInit(); - disconnect(this,SIGNAL(updateInit()),pl,SLOT(updateInit())); + disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); -/* int id = pl->metaObject()->findSlot( SLOT(updateInit()) ); +/* int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) ); if ( id != -1 ) { kdDebug()<<"Action slot was found, it will be called now"<<endl; diff --git a/kate/filelistloader/katefll_initplugin.h b/kate/filelistloader/katefll_initplugin.h index 7bfd955..55ac1a9 100644 --- a/kate/filelistloader/katefll_initplugin.h +++ b/kate/filelistloader/katefll_initplugin.h @@ -18,7 +18,7 @@ #ifndef _PLUGIN_KATE_FLL_H #define _PLUGIN_KATE_FLL_H -#include <qstring.h> +#include <tqstring.h> #include <kate/plugin.h> #include <kate/application.h> @@ -33,7 +33,7 @@ class InitPluginKateFileListLoader : public Kate::InitPlugin Q_OBJECT public: - InitPluginKateFileListLoader (QObject * =0, const char * =0, const QStringList =QStringList()); + InitPluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList()); virtual ~InitPluginKateFileListLoader(); virtual int actionsKateShouldNotPerformOnRealStartup(); virtual int initKate(); diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index bbb91a3..b10464f 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -20,7 +20,7 @@ #include <kate/pluginmanager.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <kgenericfactory.h> #include <kaction.h> #include <klocale.h> @@ -42,7 +42,7 @@ class PluginView : public KXMLGUIClient KRecentFilesAction *recentFiles; }; -PluginKateFileListLoader::PluginKateFileListLoader (QObject * parent, const char *name, const QStringList) +PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) : Plugin((Kate::Application*)parent,name), PluginViewInterface(), m_config( new KConfig("katefilelistpluginrc") ) { @@ -75,20 +75,20 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction( i18n("Open File List..."), 0, - this, SLOT( slotOpenList() ), + this, TQT_SLOT( slotOpenList() ), view->actionCollection(), "file_kfllopen" ); view->recentFiles = new KRecentFilesAction( i18n("Open Recent"), KShortcut::null(), - this, SLOT(slotOpenList(const KURL&)), view->actionCollection(), + this, TQT_SLOT(slotOpenList(const KURL&)), view->actionCollection(), "file_kfllopenrecent"); view->recentFiles->loadEntries(m_config, "Recent Files"); (void) new KAction( i18n("Save File List"), 0, - this, SLOT( slotSaveList() ), + this, TQT_SLOT( slotSaveList() ), view->actionCollection(), "file_kfllsave" ); (void) new KAction( i18n("Save File List As..."), 0, - this, SLOT( slotSaveListAs() ), + this, TQT_SLOT( slotSaveListAs() ), view->actionCollection(), "file_kfllsaveas" ); view->setInstance (new KInstance("kate")); @@ -133,7 +133,7 @@ void PluginKateFileListLoader::removeURLFromList(const KURL& url) void PluginKateFileListLoader::slotOpenList() { - KURL url = KFileDialog::getOpenURL(QString::null, + KURL url = KFileDialog::getOpenURL(TQString::null, "*.katefl|Kate File List (*.katefl)"); if (url.isValid()) // cancel pressed? slotOpenList(url); @@ -151,13 +151,13 @@ void PluginKateFileListLoader::slotOpenList(const KURL& url) "kate-filelist-loader-close-other" ) == KMessageBox::Yes ) application()->documentManager()->closeAllDocuments(); - QString tmpFile; + TQString tmpFile; if( KIO::NetAccess::download( url, tmpFile, 0 ) ) { - QFile file(tmpFile); + TQFile file(tmpFile); file.open(IO_ReadOnly); - QTextStream t(&file); + TQTextStream t(&file); KURL tmp; while (!t.eof()) { if ( ! tmp.isEmpty() ) @@ -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()),QString::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>").arg(m_saveURL.prettyURL()),TQString::null,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()),QString::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>").arg(m_saveURL.prettyURL()),TQString::null,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(QString::null,"*.katefl|Kate File List (*.katefl)"); + KURL url=KFileDialog::getSaveURL(TQString::null,"*.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 81b7bb8..e40f996 100644 --- a/kate/filelistloader/katefll_plugin.h +++ b/kate/filelistloader/katefll_plugin.h @@ -18,7 +18,7 @@ #ifndef _PLUGIN_KATE_FLL_H #define _PLUGIN_KATE_FLL_H -#include <qstring.h> +#include <tqstring.h> #include <kate/plugin.h> #include <kate/application.h> @@ -35,7 +35,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - PluginKateFileListLoader (QObject * =0, const char * =0, const QStringList =QStringList()); + PluginKateFileListLoader (TQObject * =0, const char * =0, const TQStringList =TQStringList()); virtual ~PluginKateFileListLoader(); void addView (Kate::MainWindow *win); @@ -56,7 +56,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface void save(); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; KRecentFilesAction *m_recentFiles; KConfig* m_config; KURL m_oldInitURL; diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index e1eb847..90b64c9 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -48,21 +48,21 @@ #include <kuser.h> #include <kxmlguifactory.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qcursor.h> -#include <qdatetime.h> -#include <qdict.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqcursor.h> +#include <tqdatetime.h> +#include <tqdict.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqwhatsthis.h> #include <stdlib.h> @@ -98,7 +98,7 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -QObject* KatePluginFactory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new KateFileTemplates( parent, name ); } @@ -110,22 +110,22 @@ KInstance* KatePluginFactory::s_instance = 0L; class TemplateInfo { public: - TemplateInfo( const QString& fn, const QString &t, const QString &g ) + TemplateInfo( const TQString& fn, const TQString &t, const TQString &g ) : filename( fn ), tmplate ( t ), group( g ) { ; } ~TemplateInfo() { ; } - QString filename; - QString tmplate; - QString group; - QString description; - QString author; - QString highlight; - QString icon; + TQString filename; + TQString tmplate; + TQString group; + TQString description; + TQString author; + TQString highlight; + TQString icon; }; //END TemplateInfo //BEGIN KateFileTemplates -KateFileTemplates::KateFileTemplates( QObject* parent, const char* name ) +KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ), m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) ) { @@ -133,29 +133,29 @@ KateFileTemplates::KateFileTemplates( QObject* parent, const char* name ) // We plug them into each view's menus, and update them centrally, so that // new plugins can automatically become visible in all windows. (void) new KAction ( i18n("Any File..."), 0, this, - SLOT( slotAny() ), m_actionCollection, + TQT_SLOT( slotAny() ), m_actionCollection, "file_template_any" ); // recent templates m_acRecentTemplates = new KRecentFilesAction( i18n("&Use Recent"), 0, this, - SLOT(slotOpenTemplate(const KURL &)), + TQT_SLOT(slotOpenTemplate(const KURL &)), m_actionCollection, "file_templates_recent" ); m_acRecentTemplates->loadEntries( kapp->config(), "Recent Templates" ); // template menu m_dw = new KDirWatch( this, "template_dirwatch" ); - QStringList dirs = KGlobal::dirs()->findDirs("data", "kate/plugins/katefiletemplates/templates"); - for ( QStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it ) + TQStringList dirs = KGlobal::dirs()->findDirs("data", "kate/plugins/katefiletemplates/templates"); + for ( TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it ) { m_dw->addDir( *it, true ); } - connect( m_dw, SIGNAL(dirty(const QString&)), - this, SLOT(updateTemplateDirs(const QString&)) ); - connect( m_dw, SIGNAL(created(const QString&)), - this, SLOT(updateTemplateDirs(const QString&)) ); - connect( m_dw, SIGNAL(deleted(const QString&)), - this, SLOT(updateTemplateDirs(const QString&)) ); + connect( m_dw, TQT_SIGNAL(dirty(const TQString&)), + this, TQT_SLOT(updateTemplateDirs(const TQString&)) ); + connect( m_dw, TQT_SIGNAL(created(const TQString&)), + this, TQT_SLOT(updateTemplateDirs(const TQString&)) ); + connect( m_dw, TQT_SIGNAL(deleted(const TQString&)), + this, TQT_SLOT(updateTemplateDirs(const TQString&)) ); m_templates.setAutoDelete( true ); updateTemplateDirs(); @@ -167,29 +167,29 @@ KateFileTemplates::KateFileTemplates( QObject* parent, const char* name ) /** * Called whenever the template dir is changed. Recreates the templates list. */ -void KateFileTemplates::updateTemplateDirs(const QString &d) +void KateFileTemplates::updateTemplateDirs(const TQString &d) { kdDebug()<<"updateTemplateDirs called with arg "<<d<<endl; - QStringList templates = KGlobal::dirs()->findAllResources( + TQStringList templates = KGlobal::dirs()->findAllResources( "data","kate/plugins/katefiletemplates/templates/*.katetemplate", false,true); m_templates.clear(); - QRegExp re( "\\b(\\w+)\\s*=\\s*(.+)(?:\\s+\\w+=|$)" ); + TQRegExp re( "\\b(\\w+)\\s*=\\s*(.+)(?:\\s+\\w+=|$)" ); re.setMinimal( true ); KConfig *config = kapp->config(); - QStringList hidden; + TQStringList hidden; config->readListEntry( "Hidden", hidden, ';' ); - for ( QStringList::Iterator it=templates.begin(); it != templates.end(); ++it ) + for ( TQStringList::Iterator it=templates.begin(); it != templates.end(); ++it ) { - QFile _f( *it ); + TQFile _f( *it ); if ( _f.open( IO_ReadOnly ) ) { - QString fname = (*it).section( '/', -1 ); + TQString fname = (*it).section( '/', -1 ); // skip if hidden if ( hidden.contains( fname ) ) @@ -198,10 +198,10 @@ void KateFileTemplates::updateTemplateDirs(const QString &d) // Read the first line of the file, to get the group/name TemplateInfo *tmp = new TemplateInfo( *it, fname, "Other" ); bool trymore ( true ); - QTextStream stream(&_f); + TQTextStream stream(&_f); while ( trymore ) { - QString _line = stream.readLine(); + TQString _line = stream.readLine(); trymore = _line.startsWith( "katetemplate:" ); if ( ! trymore ) break; @@ -249,7 +249,7 @@ void KateFileTemplates::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction( i18n("&Manage Templates..."), 0, - this, SLOT(slotEditTemplate()), + this, TQT_SLOT(slotEditTemplate()), view->actionCollection(), "settings_manage_templates" ); (void)new KActionMenu( i18n("New From &Template"), "make", @@ -276,10 +276,10 @@ void KateFileTemplates::removeView(Kate::MainWindow *win) } } -QStringList KateFileTemplates::groups() +TQStringList KateFileTemplates::groups() { - QStringList l; - QString s; + TQStringList l; + TQString s; for ( uint i = 0; i < m_templates.count(); i++ ) { @@ -293,7 +293,7 @@ QStringList KateFileTemplates::groups() void KateFileTemplates::refreshMenu( PluginView *v ) { - QPopupMenu *m = (QPopupMenu*)(((KActionMenu*)(v->actionCollection()->action("file_new_fromtemplate")))->popupMenu()); + TQPopupMenu *m = (TQPopupMenu*)(((KActionMenu*)(v->actionCollection()->action("file_new_fromtemplate")))->popupMenu()); // clear the menu for templates m->clear(); @@ -303,12 +303,12 @@ void KateFileTemplates::refreshMenu( PluginView *v ) m_acRecentTemplates->plug( m ); m->insertSeparator(); - QDict<QPopupMenu> submenus; // ### QMAP + TQDict<TQPopupMenu> submenus; // ### QMAP for ( uint i = 0; i < m_templates.count(); i++ ) { if ( ! submenus[ m_templates.at( i )->group ] ) { - QPopupMenu *sm = new QPopupMenu(); + TQPopupMenu *sm = new TQPopupMenu(); submenus.insert( m_templates.at( i )->group, sm ); m->insertItem( m_templates.at( i )->group, sm ); } @@ -316,13 +316,13 @@ void KateFileTemplates::refreshMenu( PluginView *v ) if ( ! m_templates.at( i )->icon.isEmpty() ) submenus[m_templates.at( i )->group]->insertItem( SmallIconSet( m_templates.at( i )->icon ), - m_templates.at( i )->tmplate, this, SLOT(slotOpenTemplate( int )), 0, i ); + m_templates.at( i )->tmplate, this, TQT_SLOT(slotOpenTemplate( int )), 0, i ); else submenus[m_templates.at( i )->group]->insertItem( - m_templates.at( i )->tmplate, this, SLOT(slotOpenTemplate( int )), 0, i ); + m_templates.at( i )->tmplate, this, TQT_SLOT(slotOpenTemplate( int )), 0, i ); // add whatsthis containing the description and author - QString w ( m_templates.at( i )->description ); + TQString w ( m_templates.at( i )->description ); if( ! m_templates.at( i )->author.isEmpty() ) { w.append( "<p>Author: " ); @@ -346,9 +346,9 @@ void KateFileTemplates::slotAny() return; // get a URL and pass that to slotOpenTemplate - QString fn = KFileDialog::getOpenFileName( + TQString fn = KFileDialog::getOpenFileName( "katefiletemplate", - QString::null, + TQString::null, application()->activeMainWindow()->viewManager()->activeView(), i18n("Open as Template") ); if ( ! fn.isEmpty() ) @@ -368,16 +368,16 @@ void KateFileTemplates::slotOpenTemplate( int index ) void KateFileTemplates::slotOpenTemplate( const KURL &url ) { // check if the file can be opened - QString tmpfile; - QString filename = url.fileName(); + TQString tmpfile; + TQString filename = url.fileName(); kdDebug()<<"file: "<<filename<<endl; if ( KIO::NetAccess::download( url, tmpfile, 0L ) ) { bool isTemplate ( filename.endsWith( ".katetemplate" ) ); - QString docname; + TQString docname; // open the file and parse for template variables and macros - QFile file(tmpfile); + TQFile file(tmpfile); if ( ! file.open( IO_ReadOnly ) ) { KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(), @@ -388,7 +388,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) } // this may take a moment.. - kapp->setOverrideCursor( QCursor(QCursor::WaitCursor) ); + kapp->setOverrideCursor( TQCursor(TQCursor::WaitCursor) ); // create a new document application()->activeMainWindow()->viewManager()->openURL( KURL() ); @@ -396,8 +396,8 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) Kate::Document *doc = view->getDoc(); - QTextStream stream(&file); - QString str, tmp; + TQTextStream stream(&file); + TQString str, tmp; uint numlines = 0; uint doneheader = 0; while ( !stream.eof() ) { @@ -407,7 +407,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) // look for document name, highlight if ( ! (doneheader & 1) ) { - QRegExp reName( "\\bdocumentname\\s*=\\s*(.+)(?:\\s+\\w+\\s*=|$)", false ); + TQRegExp reName( "\\bdocumentname\\s*=\\s*(.+)(?:\\s+\\w+\\s*=|$)", false ); reName.setMinimal( true ); if ( reName.search( tmp ) > -1 ) { @@ -419,7 +419,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ! (doneheader & 2) ) { - QRegExp reHl( "\\bhighlight\\s*=\\s*(.+)(?:\\s+\\w+\\s*=|$)", false ); + TQRegExp reHl( "\\bhighlight\\s*=\\s*(.+)(?:\\s+\\w+\\s*=|$)", false ); reHl.setMinimal( true ); kdDebug()<<"looking for a hl mode"<<endl; if ( reHl.search( tmp ) > -1 ) @@ -427,7 +427,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) kdDebug()<<"looking for a hl mode -- "<<reHl.cap()<<endl; // this is overly complex, too bad the interface is // not providing a resonable method.. - QString hlmode = reHl.cap( 1 ); + TQString hlmode = reHl.cap( 1 ); uint _i = 0; while ( _i < doc->hlModeCount() ) { @@ -466,12 +466,12 @@ 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 - QString p = docname; + TQString p = docname; p.replace( "%1", "\\d+" ); p.replace( ".", "\\." ); p.prepend( "^" ); p.append( "$" ); - QRegExp reName( p ); + TQRegExp reName( p ); int count = 1; for ( uint i=0; i < application()->documentManager()->documents(); i++ ) @@ -495,7 +495,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) m_emailstuff = 0; if (isTemplate) { KTextEditor::TemplateInterface *ti=KTextEditor::templateInterface(doc); - ti->insertTemplateText(0,0,str,QMap<QString,QString>()); + ti->insertTemplateText(0,0,str,TQMap<TQString,TQString>()); } else { doc->insertText( 0, 0, str ); view->setCursorPosition( line, col ); @@ -504,9 +504,9 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) } -QWidget *KateFileTemplates::parentWindow() +TQWidget *KateFileTemplates::parentWindow() { - return dynamic_cast<QWidget*>(application()->activeMainWindow()); + return dynamic_cast<TQWidget*>(application()->activeMainWindow()); } // The next part are tools to aid the creation and editing of templates @@ -544,39 +544,39 @@ void KateFileTemplates::slotEditTemplate() //BEGIN KateTemplateInfoWidget // This widget can be used to change the data of a TemplateInfo object -KateTemplateInfoWidget::KateTemplateInfoWidget( QWidget *parent, TemplateInfo *info, KateFileTemplates *kft ) - : QWidget( parent ), +KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *info, KateFileTemplates *kft ) + : TQWidget( parent ), info( info ), kft( kft ) { - QGridLayout *lo = new QGridLayout( this, 6, 2 ); + TQGridLayout *lo = new TQGridLayout( this, 6, 2 ); lo->setAutoAdd( true ); lo->setSpacing( KDialogBase::spacingHint() ); - QLabel *l = new QLabel( i18n("&Template:"), this ); - QHBox *hb = new QHBox( this ); + TQLabel *l = new TQLabel( i18n("&Template:"), this ); + TQHBox *hb = new TQHBox( this ); hb->setSpacing( KDialogBase::spacingHint() ); - leTemplate = new QLineEdit( hb ); + leTemplate = new TQLineEdit( hb ); l->setBuddy( leTemplate ); - QWhatsThis::add( leTemplate, i18n("<p>This string is used as the template's name " + TQWhatsThis::add( leTemplate, i18n("<p>This string is used as the template's name " "and is displayed, for example, in the Template menu. It should describe the " "meaning of the template, for example 'HTML Document'.</p>") ); ibIcon = new KIconButton( hb ); - QWhatsThis::add( ibIcon, i18n( + TQWhatsThis::add( ibIcon, i18n( "Press to select or change the icon for this template") ); - l = new QLabel( i18n("&Group:"), this ); - cmbGroup = new QComboBox( true, this ); + l = new TQLabel( i18n("&Group:"), this ); + cmbGroup = new TQComboBox( true, this ); cmbGroup->insertStringList( kft->groups() ); l->setBuddy( cmbGroup ); - QWhatsThis::add( cmbGroup, i18n("<p>The group is used for chosing a " + TQWhatsThis::add( cmbGroup, i18n("<p>The group is used for chosing a " "submenu for the plugin. If it is empty, 'Other' is used.</p>" "<p>You can type any string to add a new group to your menu.</p>") ); - l = new QLabel( i18n("Document &name:"), this ); - leDocumentName = new QLineEdit( this ); + l = new TQLabel( i18n("Document &name:"), this ); + leDocumentName = new TQLineEdit( this ); l->setBuddy( leDocumentName ); - QWhatsThis::add( leDocumentName, i18n("<p>This string will be used to set a name " + 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 " "increasing with each similarly named file.</p><p> For example, if the " @@ -584,23 +584,23 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( QWidget *parent, TemplateInfo *i "named 'New shellscript (1).sh', the second 'New shellscipt (2).sh', and " "so on.</p>") ); - l = new QLabel( i18n( "&Highlight:"), this ); - btnHighlight = new QPushButton( i18n("None"), this ); + l = new TQLabel( i18n( "&Highlight:"), this ); + btnHighlight = new TQPushButton( i18n("None"), this ); l->setBuddy( btnHighlight ); - QWhatsThis::add( btnHighlight, i18n("<p>Select the highlight to use for the " + TQWhatsThis::add( btnHighlight, i18n("<p>Select the highlight to use for the " "template. If 'None' is chosen, the property will not be set.</p>") ); - l = new QLabel( i18n("&Description:"), this ); - leDescription = new QLineEdit( this ); + l = new TQLabel( i18n("&Description:"), this ); + leDescription = new TQLineEdit( this ); l->setBuddy( leDescription ); - QWhatsThis::add( leDescription, i18n("<p>This string is used, for example, as " + TQWhatsThis::add( leDescription, i18n("<p>This string is used, for example, as " "context help for this template (such as the 'whatsthis' help for the " "menu item.)</p>") ); - l = new QLabel( i18n("&Author:"), this ); - leAuthor = new QLineEdit( this ); + l = new TQLabel( i18n("&Author:"), this ); + leAuthor = new TQLineEdit( this ); l->setBuddy( leAuthor ); - QWhatsThis::add( leAuthor, i18n("<p>You can set this if you want to share your " + TQWhatsThis::add( leAuthor, i18n("<p>You can set this if you want to share your " "template with other users.</p>" "<p>the recommended form is like an Email " "address: 'Anders Lund <anders@alweb.dk>'</p>") ); @@ -622,20 +622,20 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( QWidget *parent, TemplateInfo *i Kate::Document *doc = kft->application()->documentManager()->activeDocument(); if ( doc ) { - QPopupMenu *m = new QPopupMenu( btnHighlight ); - connect( m, SIGNAL( activated( int ) ), this, SLOT( slotHlSet( int ) ) ); - QDict<QPopupMenu> submenus; + TQPopupMenu *m = new TQPopupMenu( btnHighlight ); + connect( m, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotHlSet( int ) ) ); + TQDict<TQPopupMenu> submenus; for ( uint n = 0; n < doc->hlModeCount(); n++ ) { // create the sub menu if it does not exist - QString text( doc->hlModeSectionName( n ) ); + TQString text( doc->hlModeSectionName( n ) ); if ( ! text.isEmpty() ) { if ( ! submenus[ text ] ) { - QPopupMenu *sm = new QPopupMenu(); + TQPopupMenu *sm = new TQPopupMenu(); submenus.insert( text, sm ); - connect( sm, SIGNAL( activated( int ) ), this, SLOT( slotHlSet( int ) ) ); + connect( sm, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotHlSet( int ) ) ); m->insertItem( text, sm ); } @@ -659,7 +659,7 @@ void KateTemplateInfoWidget::slotHlSet( int id ) //BEGIN KateTemplateWizard // A simple wizard to help create a new template :-) -KateTemplateWizard::KateTemplateWizard( QWidget *parent, KateFileTemplates *kft ) +KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft ) : KWizard( parent ), kft( kft ) { @@ -667,47 +667,47 @@ KateTemplateWizard::KateTemplateWizard( QWidget *parent, KateFileTemplates *kft helpButton()->hide(); // 1) Optionally choose a file or existing template to start from - QWidget *page = new QWidget( this ); - QGridLayout *glo = new QGridLayout( page ); + TQWidget *page = new TQWidget( this ); + TQGridLayout *glo = new TQGridLayout( page ); //lo->setAutoAdd( true ); glo->setSpacing( KDialogBase::spacingHint() ); - glo->addMultiCellWidget( new QLabel( i18n("<p>If you want to base this " + glo->addMultiCellWidget( new TQLabel( i18n("<p>If you want to base this " "template on an existing file or template, select the appropriate option " "below.</p>"), page ), 1, 1, 1, 2); - bgOrigin = new QButtonGroup( page ); + bgOrigin = new TQButtonGroup( page ); bgOrigin->hide(); bgOrigin->setRadioButtonExclusive( true ); - QRadioButton *rb = new QRadioButton( i18n("Start with an &empty document" ), page ); + TQRadioButton *rb = new TQRadioButton( i18n("Start with an &empty document" ), page ); bgOrigin->insert( rb, 1 ); glo->addMultiCellWidget( rb, 2, 2, 1, 2 ); rb->setChecked( true ); - rb = new QRadioButton( i18n("Use an existing file:"), page ); + 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( QStyle::SR_RadioButtonIndicator, rb ).width(); - glo->addItem( new QSpacerItem( marg, 1, QSizePolicy::Fixed ), 4, 1 ); + int marg = rb->style().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 ); - rb = new QRadioButton( i18n("Use an existing template:"), page ); + rb = new TQRadioButton( i18n("Use an existing template:"), page ); bgOrigin->insert( rb, 3 ); glo->addMultiCellWidget( rb, 5, 5, 1, 2 ); - glo->addItem( new QSpacerItem( marg, 1, QSizePolicy::Fixed ), 6, 1 ); - btnTmpl = new QPushButton( page ); + glo->addItem( new TQSpacerItem( marg, 1, TQSizePolicy::Fixed ), 6, 1 ); + btnTmpl = new TQPushButton( page ); glo->addWidget( btnTmpl, 6, 2 ); - QPopupMenu *m = new QPopupMenu( btnTmpl ); - connect( m, SIGNAL( activated( int ) ), this, SLOT( slotTmplateSet( int ) ) ); + TQPopupMenu *m = new TQPopupMenu( btnTmpl ); + connect( m, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTmplateSet( int ) ) ); - QDict<QPopupMenu> submenus; + TQDict<TQPopupMenu> submenus; for ( uint i = 0; i < kft->templates().count(); i++ ) { if ( ! submenus[ kft->templates().at( i )->group ] ) { - QPopupMenu *sm = new QPopupMenu(); - connect( sm, SIGNAL( activated( int ) ), this, SLOT( slotTmplateSet( int ) ) ); + TQPopupMenu *sm = new TQPopupMenu(); + connect( sm, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTmplateSet( int ) ) ); submenus.insert( kft->templates().at( i )->group, sm ); m->insertItem( kft->templates().at( i )->group, sm ); } @@ -717,10 +717,10 @@ KateTemplateWizard::KateTemplateWizard( QWidget *parent, KateFileTemplates *kft } btnTmpl->setPopup( m ); - connect( bgOrigin, SIGNAL(clicked(int)), this, SLOT(slotStateChanged(int)) ); - connect( urOrigin, SIGNAL(textChanged(const QString&)), this, SLOT(slotStateChanged(const QString&)) ); + connect( bgOrigin, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int)) ); + connect( urOrigin, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) ); - glo->addMultiCell( new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Expanding ), 7, 7, 1, 2 ); + glo->addMultiCell( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), 7, 7, 1, 2 ); addPage( page, i18n("Choose Template Origin") ); kdDebug()<<"=== Adding template origin page at "<<page<<endl; @@ -729,77 +729,77 @@ KateTemplateWizard::KateTemplateWizard( QWidget *parent, KateFileTemplates *kft kdDebug()<<"=== Adding template info page at "<<kti<<endl; addPage( kti, i18n("Edit Template Properties") ); // get liekly values from KTE - QMap<QString, QString> map; + TQMap<TQString, TQString> map; map[ "fullname" ] = ""; map[ "email" ] = ""; KTextEditor::TemplateInterface::expandMacros( map, parent ); - QString sFullname = map["fullname"]; - QString sEmail = map["email"]; - QString _s = sFullname; + TQString sFullname = map["fullname"]; + TQString sEmail = map["email"]; + TQString _s = sFullname; if ( ! sEmail.isEmpty() ) _s += " <" + sEmail + ">"; kti->leAuthor->setText( _s ); // 3) choose a location - either the template directory (default) or // a custom location - page = new QWidget( this ); - glo = new QGridLayout( page, 7, 2 ); + page = new TQWidget( this ); + glo = new TQGridLayout( page, 7, 2 ); glo->setSpacing( KDialogBase::spacingHint() ); - glo->addMultiCellWidget( new QLabel( i18n("<p>Choose a location for the " + glo->addMultiCellWidget( new TQLabel( i18n("<p>Choose a location for the " "template. If you store it in the template directory, it will " "automatically be added to the template menu.</p>"), page ), 1, 1, 1, 2); - bgLocation = new QButtonGroup( page ); + bgLocation = new TQButtonGroup( page ); bgLocation->hide(); bgLocation->setRadioButtonExclusive( true ); - rb = new QRadioButton( i18n("Template directory"), page ); + rb = new TQRadioButton( i18n("Template directory"), page ); bgLocation->insert( rb, 1 ); glo->addMultiCellWidget( rb, 2, 2, 1, 2 ); rb->setChecked( true ); - glo->addMultiCell( new QSpacerItem( marg, 1, QSizePolicy::Fixed ), 3, 4, 1, 1 ); - leTemplateFileName = new QLineEdit( page ); - QLabel *l = new QLabel( leTemplateFileName, i18n("Template &file name:"), page ); + glo->addMultiCell( new TQSpacerItem( marg, 1, TQSizePolicy::Fixed ), 3, 4, 1, 1 ); + leTemplateFileName = new TQLineEdit( page ); + TQLabel *l = new TQLabel( leTemplateFileName, i18n("Template &file name:"), page ); glo->addWidget( l, 3, 2 ); glo->addWidget( leTemplateFileName, 4, 2 ); - rb = new QRadioButton( i18n("Custom location:"), page ); + rb = new TQRadioButton( i18n("Custom location:"), page ); bgLocation->insert( rb, 2 ); glo->addMultiCellWidget( rb, 5, 5, 1, 2 ); - glo->addItem( new QSpacerItem( marg, 1, QSizePolicy::Fixed ), 6, 1 ); + glo->addItem( new TQSpacerItem( marg, 1, TQSizePolicy::Fixed ), 6, 1 ); urLocation = new KURLRequester( page ); glo->addWidget( urLocation, 6, 2 ); - connect( bgLocation, SIGNAL(clicked(int)), this, SLOT(slotStateChanged(int)) ); - connect( urLocation, SIGNAL(textChanged(const QString&)), this, SLOT(slotStateChanged(const QString&)) ); - connect( leTemplateFileName, SIGNAL(textChanged(const QString &)), this, SLOT(slotStateChanged(const QString &)) ); + connect( bgLocation, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int)) ); + connect( urLocation, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) ); + connect( leTemplateFileName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotStateChanged(const TQString &)) ); - glo->addMultiCell( new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Expanding ), 7, 7, 1, 2 ); + glo->addMultiCell( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), 7, 7, 1, 2 ); addPage( page, i18n("Choose Location") ); kdDebug()<<"=== Adding location page at "<<page<<endl; // 4) Should we edit the text to add some macros, replacing username etc? // This is *only* relevant if the origin is a non-template file. - page = new QWidget( this ); - QVBoxLayout *lo = new QVBoxLayout( page ); + page = new TQWidget( this ); + TQVBoxLayout *lo = new TQVBoxLayout( page ); lo->setSpacing( KDialogBase::spacingHint() ); lo->addWidget( - new QLabel( i18n( "<p>You can replace certain strings in the text with " + new TQLabel( i18n( "<p>You can replace certain strings in the text with " "template macros.<p>If any of the data below is incorrect or missing, " "edit the data in the KDE email information."), page ) ); - cbRRealname = new QCheckBox( i18n("Replace full name '%1' with the " + cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the " "'%{fullname}' macro").arg( sFullname ), page ); cbRRealname->setEnabled( ! sFullname.isEmpty() ); lo->addWidget( cbRRealname ); - cbREmail = new QCheckBox( i18n("Replace email address '%1' with the " + cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the " "'%email' macro").arg( sEmail ), page); cbREmail->setEnabled( ! sEmail.isEmpty() ); lo->addWidget( cbREmail ); @@ -809,17 +809,17 @@ KateTemplateWizard::KateTemplateWizard( QWidget *parent, KateFileTemplates *kft addPage( page, i18n("Autoreplace Macros") ); kdDebug()<<"=== Adding autoreplace page at "<<page<<endl; // 5) Display a summary - page = new QWidget( this ); - lo = new QVBoxLayout( page ); + page = new TQWidget( this ); + lo = new TQVBoxLayout( page ); lo->setSpacing( KDialogBase::spacingHint() ); - QString s = i18n("<p>The template will now be created and saved to the chosen " + TQString s = i18n("<p>The template will now be created and saved to the chosen " "location. To position the cursor put a caret ('^') character where you " "want it in files created from the template.</p>"); - lo->addWidget( new QLabel( s, page ) ); + lo->addWidget( new TQLabel( s, page ) ); - cbOpenTemplate = new QCheckBox( i18n("Open the template for editing"), page ); + cbOpenTemplate = new TQCheckBox( i18n("Open the template for editing"), page ); lo->addWidget( cbOpenTemplate ); @@ -827,7 +827,7 @@ KateTemplateWizard::KateTemplateWizard( QWidget *parent, KateFileTemplates *kft addPage( page, i18n("Create Template") ); kdDebug()<<"=== Adding summary page at "<<endl; - connect( this, SIGNAL(selected(const QString&)), this, SLOT(slotStateChanged(const QString&)) ); + connect( this, TQT_SIGNAL(selected(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) ); } void KateTemplateWizard::slotTmplateSet( int idx ) @@ -902,7 +902,7 @@ void KateTemplateWizard::accept() KURL templateUrl; if ( bgLocation->selectedId() == 1 ) { - QString suggestion; + TQString suggestion; if ( ! leTemplateFileName->text().isEmpty() ) suggestion = leTemplateFileName->text(); else @@ -913,11 +913,11 @@ void KateTemplateWizard::accept() if ( ! suggestion.endsWith(".katetemplate") ) suggestion.append(".katetemplate"); - QString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); + TQString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); templateUrl = dir + suggestion; - if ( QFile::exists( templateUrl.path() ) ) + if ( TQFile::exists( templateUrl.path() ) ) { if ( KMessageBox::warningContinueCancel( this, i18n( "<p>The file <br><strong>'%1'</strong><br> already exists; if you " @@ -933,11 +933,11 @@ void KateTemplateWizard::accept() templateUrl = urLocation->url(); } - QWizard::accept(); + TQWizard::accept(); // The following must be done: // 1) add the collected template information to the top uint ln = 0; - QString s, str; + TQString s, str; if ( ! kti->leTemplate->text().isEmpty() ) s += " Template=" + kti->leTemplate->text(); if ( ! kti->cmbGroup->currentText().isEmpty() ) @@ -968,10 +968,10 @@ void KateTemplateWizard::accept() else // template u = KURL( kft->templates().at( selectedTemplateIdx )->filename ); - QString tmpfile, tmp; + TQString tmpfile, tmp; if ( KIO::NetAccess::download( u, tmpfile, 0L ) ) { - QFile file(tmpfile); + TQFile file(tmpfile); if ( ! file.open( IO_ReadOnly ) ) { KMessageBox::sorry( this, i18n( @@ -983,8 +983,8 @@ void KateTemplateWizard::accept() return; } - QTextStream stream(&file); - QString ln; + TQTextStream stream(&file); + TQString ln; bool trymore = true; while ( !stream.eof() ) { @@ -1005,8 +1005,8 @@ 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( QRegExp("%(?=\\{[^}]+\\})"), "\\%" ); - tmp.replace( QRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); + tmp.replace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" ); + tmp.replace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); //tmp.replace( "^", "\\^" ); if ( cbRRealname->isChecked() && ! sFullname.isEmpty() ) @@ -1028,11 +1028,11 @@ void KateTemplateWizard::accept() { if ( templateUrl.isLocalFile() ) { - QFile file( templateUrl.path() ); + TQFile file( templateUrl.path() ); if ( file.open(IO_WriteOnly) ) { kdDebug()<<"file opened with succes"<<endl; - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << str; file.close(); succes = true; @@ -1041,8 +1041,8 @@ void KateTemplateWizard::accept() else { KTempFile tmp; - QString fn = tmp.name(); - QTextStream stream( tmp.file() ); + TQString fn = tmp.name(); + TQTextStream stream( tmp.file() ); stream << str; tmp.close(); @@ -1083,51 +1083,51 @@ class KateTemplateItem : public KListViewItem //BEGIN KFTNewStuff class KFTNewStuff : public KNewStuff { public: - KFTNewStuff( const QString &type, QWidget *parent=0 ) : KNewStuff( type, parent ), m_win( parent ) {} + KFTNewStuff( const TQString &type, TQWidget *parent=0 ) : KNewStuff( type, parent ), m_win( parent ) {} ~KFTNewStuff() {} - bool install( const QString &/*filename*/ ) { return true; } - bool createUploadFile( const QString &/*filename*/ ) { return false; } - QString downloadDestination( KNS::Entry *entry ) + bool install( const TQString &/*filename*/ ) { return true; } + bool createUploadFile( const TQString &/*filename*/ ) { return false; } + TQString downloadDestination( KNS::Entry *entry ) { - QString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); + TQString dir = KGlobal::dirs()->saveLocation( "data", "kate/plugins/katefiletemplates/templates/", true ); return dir.append( entry->payload().filename() ); } private: - QWidget *m_win; + TQWidget *m_win; }; //END KTNewStuff //BEGIN KateTemplateManager -KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, QWidget *parent, const char *name ) - : QWidget( parent, name ) +KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) , kft( kft ) { - QGridLayout *lo = new QGridLayout( this, 2, 6 ); + TQGridLayout *lo = new TQGridLayout( this, 2, 6 ); lo->setSpacing( KDialogBase::spacingHint() ); lvTemplates = new KListView( this ); lvTemplates->addColumn( i18n("Template") ); lo->addMultiCellWidget( lvTemplates, 1, 1, 1, 6 ); - connect( lvTemplates, SIGNAL(selectionChanged()), this, SLOT(slotUpdateState()) ); + connect( lvTemplates, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateState()) ); - btnNew = new QPushButton( i18n("New..."), this ); - connect( btnNew, SIGNAL(clicked()), kft, SLOT(slotCreateTemplate()) ); + btnNew = new TQPushButton( i18n("New..."), this ); + connect( btnNew, TQT_SIGNAL(clicked()), kft, TQT_SLOT(slotCreateTemplate()) ); lo->addWidget( btnNew, 2, 2 ); - btnEdit = new QPushButton( i18n("Edit..."), this ); - connect( btnEdit, SIGNAL(clicked()), this, SLOT( slotEditTemplate()) ); + btnEdit = new TQPushButton( i18n("Edit..."), this ); + connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditTemplate()) ); lo->addWidget( btnEdit, 2, 3 ); - btnRemove = new QPushButton( i18n("Remove"), this ); - connect( btnRemove, SIGNAL(clicked()), this, SLOT(slotRemoveTemplate()) ); + btnRemove = new TQPushButton( i18n("Remove"), this ); + connect( btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveTemplate()) ); lo->addWidget( btnRemove, 2, 4 ); - btnUpload = new QPushButton( i18n("Upload..."), this ); - connect( btnUpload, SIGNAL(clicked()), this, SLOT(slotUpload()) ); + btnUpload = new TQPushButton( i18n("Upload..."), this ); + connect( btnUpload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpload()) ); lo->addWidget( btnUpload, 2, 5 ); - btnDownload = new QPushButton( i18n("Download..."), this ); - connect( btnDownload, SIGNAL(clicked()), this, SLOT(slotDownload()) ); + btnDownload = new TQPushButton( i18n("Download..."), this ); + connect( btnDownload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownload()) ); lo->addWidget( btnDownload, 2, 6 ); lo->setColStretch( 1, 1 ); @@ -1146,7 +1146,7 @@ void KateTemplateManager::reload() { lvTemplates->clear(); - QDict<KListViewItem> groupitems; // FIXME QMAP + TQDict<KListViewItem> groupitems; // FIXME QMAP for ( uint i = 0; i < kft->templates().count(); i++ ) { if ( ! groupitems[ kft->templates().at( i )->group ] ) @@ -1189,15 +1189,15 @@ void KateTemplateManager::slotRemoveTemplate() // If it fails (there was a global, unwritable instance), add to a // list of removed templates KConfig *config = kapp->config(); - QString fname = item->templateinfo->filename.section( '/', -1 ); - QStringList templates = KGlobal::dirs()->findAllResources( + TQString fname = item->templateinfo->filename.section( '/', -1 ); + TQStringList templates = KGlobal::dirs()->findAllResources( "data", fname.prepend( "kate/plugins/katefiletemplates/templates/" ), false,true); int failed = 0; int removed = 0; - for ( QStringList::Iterator it=templates.begin(); it!=templates.end(); ++it ) + for ( TQStringList::Iterator it=templates.begin(); it!=templates.end(); ++it ) { - if ( ! QFile::remove(*it) ) + if ( ! TQFile::remove(*it) ) failed++; else removed++; @@ -1206,7 +1206,7 @@ void KateTemplateManager::slotRemoveTemplate() if ( failed ) { config->setGroup( "KateFileTemplates" ); - QStringList l; + TQStringList l; config->readListEntry( "Hidden", l, ';' ); l << fname; config->writeEntry( "Hidden", l, ';' ); @@ -1233,7 +1233,7 @@ void KateTemplateManager::slotUpload() if ( item ) { KFTNewStuff *ns = new KFTNewStuff( "katefiletemplates/template", this ); - ns->upload( item->templateinfo->filename, QString::null ); + ns->upload( item->templateinfo->filename, TQString::null ); } } diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index 0eedc38..11734d5 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -34,7 +34,7 @@ #include <kurl.h> #include <kwizard.h> -#include <qptrlist.h> +#include <tqptrlist.h> class KatePluginFactory : public KLibFactory { @@ -44,7 +44,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -75,7 +75,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface Q_OBJECT public: - KateFileTemplates( QObject* parent = 0, const char* name = 0 ); + KateFileTemplates( TQObject* parent = 0, const char* name = 0 ); virtual ~KateFileTemplates(); void addView (Kate::MainWindow *win); @@ -84,12 +84,12 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface /** * @return a list of unique group names in the template list. */ - QStringList groups(); + TQStringList groups(); /** * @return a pointer to the templateinfo collection */ - QPtrList<class TemplateInfo> templates() { return m_templates; } + TQPtrList<class TemplateInfo> templates() { return m_templates; } /** * @return a pointer to the templateInfo for the template at @p index @@ -100,14 +100,14 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface /** * @return a a pointer to the active main window */ - QWidget * parentWindow(); + TQWidget * parentWindow(); public slots: /** * Update the template collection by rereading the template * directories. Also updates the menu. */ - void updateTemplateDirs(const QString &s=QString::null); + void updateTemplateDirs(const TQString &s=TQString::null); private slots: /** @@ -137,12 +137,12 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface void slotCreateTemplate(); private: - void refreshMenu( class PluginView */*class QPopupMenu **/ ); + void refreshMenu( class PluginView */*class TQPopupMenu **/ ); - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; class KActionCollection *m_actionCollection; class KRecentFilesAction *m_acRecentTemplates; - QPtrList<class TemplateInfo> m_templates; + TQPtrList<class TemplateInfo> m_templates; class KDirWatch *m_dw; class KUser *m_user; class KConfig *m_emailstuff; @@ -158,14 +158,14 @@ class KateTemplateInfoWidget : public QWidget { Q_OBJECT public: - KateTemplateInfoWidget( QWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); + KateTemplateInfoWidget( TQWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); ~KateTemplateInfoWidget() {} TemplateInfo *info; - class QLineEdit *leTemplate, *leDocumentName, *leDescription, *leAuthor; - class QComboBox *cmbGroup; - class QPushButton *btnHighlight; + class TQLineEdit *leTemplate, *leDocumentName, *leDescription, *leAuthor; + class TQComboBox *cmbGroup; + class TQPushButton *btnHighlight; class KIconButton *ibIcon; private slots: @@ -192,7 +192,7 @@ class KateTemplateWizard : public KWizard friend class KateFileTemplates; Q_OBJECT public: - KateTemplateWizard( QWidget* parent, KateFileTemplates *ktf ); + KateTemplateWizard( TQWidget* parent, KateFileTemplates *ktf ); ~KateTemplateWizard() {} public slots: @@ -202,36 +202,36 @@ class KateTemplateWizard : public KWizard void slotTmplateSet( int ); void slotStateChanged(); void slotStateChanged( int ) { slotStateChanged(); } - void slotStateChanged( const QString& ) { slotStateChanged(); } + void slotStateChanged( const TQString& ) { slotStateChanged(); } private: KateFileTemplates *kft; KateTemplateInfoWidget *kti; // origin page - class QButtonGroup *bgOrigin; + class TQButtonGroup *bgOrigin; class KURLRequester *urOrigin; - class QPushButton *btnTmpl; + class TQPushButton *btnTmpl; uint selectedTemplateIdx; // location page - class QButtonGroup *bgLocation; + class TQButtonGroup *bgLocation; class KURLRequester *urLocation; - class QLineEdit *leTemplateFileName; + class TQLineEdit *leTemplateFileName; // macro replacement page - class QCheckBox *cbRRealname, *cbRUsername, *cbREmail; - QString sFullname, sEmail/*, sUsername*/; + class TQCheckBox *cbRRealname, *cbRUsername, *cbREmail; + TQString sFullname, sEmail/*, sUsername*/; // final - class QCheckBox *cbOpenTemplate; + class TQCheckBox *cbOpenTemplate; }; class KateTemplateManager : public QWidget { Q_OBJECT public: - KateTemplateManager( KateFileTemplates *kft=0, QWidget *parent=0, const char *name=0 ); + KateTemplateManager( KateFileTemplates *kft=0, TQWidget *parent=0, const char *name=0 ); ~KateTemplateManager() {} public slots: @@ -248,9 +248,9 @@ class KateTemplateManager : public QWidget private: class KListView *lvTemplates; - class QPushButton *btnNew, *btnEdit, *btnRemove, *btnDownload, *btnUpload; + class TQPushButton *btnNew, *btnEdit, *btnRemove, *btnDownload, *btnUpload; KateFileTemplates *kft; - QPtrList<class TemplateInfo> *remove; + TQPtrList<class TemplateInfo> *remove; }; diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 7499c08..3031f51 100644 --- a/kate/helloworld/plugin_katehelloworld.cpp +++ b/kate/helloworld/plugin_katehelloworld.cpp @@ -16,7 +16,7 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -KatePluginHelloWorld::KatePluginHelloWorld( QObject* parent, const char* name, const QStringList& ) +KatePluginHelloWorld::KatePluginHelloWorld( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -31,7 +31,7 @@ void KatePluginHelloWorld::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("Insert Hello World"), 0, this, - SLOT( slotInsertHello() ), view->actionCollection(), + TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_helloworld" ); view->setInstance (new KInstance("kate")); diff --git a/kate/helloworld/plugin_katehelloworld.h b/kate/helloworld/plugin_katehelloworld.h index 84b3e86..7760169 100644 --- a/kate/helloworld/plugin_katehelloworld.h +++ b/kate/helloworld/plugin_katehelloworld.h @@ -14,7 +14,7 @@ class KatePluginHelloWorld : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - KatePluginHelloWorld( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + KatePluginHelloWorld( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginHelloWorld(); void addView (Kate::MainWindow *win); @@ -24,7 +24,7 @@ class KatePluginHelloWorld : public Kate::Plugin, Kate::PluginViewInterface void slotInsertHello(); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; }; #endif diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index f0764f2..f66ef8e 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -36,7 +36,7 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateHtmlTools::PluginKateHtmlTools( QObject* parent, const char* name, const QStringList& ) +PluginKateHtmlTools::PluginKateHtmlTools( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ) { } @@ -51,7 +51,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this, - SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); + TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); view->setInstance (new KInstance("kate")); view->setXMLFile( "plugins/katehtmltools/ui.rc" ); @@ -82,9 +82,9 @@ void PluginKateHtmlTools::slotEditHTMLtag() Kate::View *kv=application()->activeMainWindow()->viewManager()->activeView(); if (!kv) return; - QString text ( KatePrompt ( i18n("HTML Tag"), + TQString text ( KatePrompt ( i18n("HTML Tag"), i18n("Enter HTML tag contents (the <, >, and closing tag will be supplied):"), - (QWidget *)kv) + (TQWidget *)kv) ); if ( !text.isEmpty () ) @@ -93,17 +93,17 @@ void PluginKateHtmlTools::slotEditHTMLtag() } -QString PluginKateHtmlTools::KatePrompt +TQString PluginKateHtmlTools::KatePrompt ( - const QString & strTitle, - const QString & strPrompt, - QWidget * that + const TQString & strTitle, + const TQString & strPrompt, + TQWidget * that ) { // TODO: Make this a "memory edit" field with a combo box // containing prior entries - KLineEditDlg dlg(strPrompt, QString::null, that); + KLineEditDlg dlg(strPrompt, TQString::null, that); dlg.setCaption(strTitle); if (dlg.exec()) @@ -113,13 +113,13 @@ QString PluginKateHtmlTools::KatePrompt } -void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, QString text) // PCP +void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, TQString text) // PCP { // We must add a heavy elaborate HTML markup system. Not! - QStringList list = QStringList::split (' ', text); - QString marked = view.getDoc()->selection (); + TQStringList list = TQStringList::split (' ', text); + TQString marked = view.getDoc()->selection (); uint preDeleteLine = 0, preDeleteCol = 0; view.cursorPosition (&preDeleteLine, &preDeleteCol); @@ -127,8 +127,8 @@ void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, QString text) // P view.keyDelete (); uint line = 0, col = 0; view.cursorPosition (&line, &col); - QString pre ("<" + text + ">"); - QString post; + TQString pre ("<" + text + ">"); + TQString post; if (list.count () > 0) post = "</" + list[0] + ">"; view.insertText (pre + marked + post); diff --git a/kate/htmltools/plugin_katehtmltools.h b/kate/htmltools/plugin_katehtmltools.h index 8f134ce..695211c 100644 --- a/kate/htmltools/plugin_katehtmltools.h +++ b/kate/htmltools/plugin_katehtmltools.h @@ -18,7 +18,7 @@ #ifndef _PLUGIN_KANT_HTMLTOOLS_H #define _PLUGIN_KANT_HTMLTOOLS_H -#include <qstring.h> +#include <tqstring.h> #include <kate/plugin.h> #include <kate/application.h> @@ -33,18 +33,18 @@ class PluginKateHtmlTools : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - PluginKateHtmlTools( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateHtmlTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateHtmlTools(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; - QString KatePrompt (const QString & strTitle, const QString &strPrompt, - QWidget * that); - void slipInHTMLtag (Kate::View & view, QString text); + TQString KatePrompt (const TQString & strTitle, const TQString &strPrompt, + TQWidget * that); + void slipInHTMLtag (Kate::View & view, TQString text); public slots: void slotEditHTMLtag(); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index eadbc02..fb42c3f 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -18,17 +18,17 @@ #include "plugin_kateinsertcommand.h" #include "plugin_kateinsertcommand.moc" -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qdir.h> -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qspinbox.h> -#include <qstringlist.h> -#include <qwhatsthis.h> -#include <qwidget.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqwhatsthis.h> +#include <tqwidget.h> #include <kaction.h> #include <kanimwidget.h> @@ -57,7 +57,7 @@ class PluginView : public KXMLGUIClient //END //BEGIN PluginKateInsertCommand -PluginKateInsertCommand::PluginKateInsertCommand( QObject* parent, const char* name, const QStringList& ) +PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ), kv ( 0 ), sh ( 0 ) @@ -65,7 +65,7 @@ PluginKateInsertCommand::PluginKateInsertCommand( QObject* parent, const char* n config = new KConfig("kateinsertcommandpluginrc"); cmdhist = config->readListEntry("Command History"); wdlg = 0; - workingdir = QDir::currentDirPath(); + workingdir = TQDir::currentDirPath(); } PluginKateInsertCommand::~PluginKateInsertCommand() @@ -84,7 +84,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("Insert Command..."), "", 0, this, - SLOT( slotInsertCommand() ), view->actionCollection(), + TQT_SLOT( slotInsertCommand() ), view->actionCollection(), "edit_insert_command" ); view->setInstance (new KInstance("kate")); @@ -124,12 +124,12 @@ void PluginKateInsertCommand::slotInsertCommand() kv = application()->activeMainWindow()->viewManager()->activeView(); - QString dir = workingdir; - QString docdir; + TQString dir = workingdir; + TQString docdir; KURL docurl = kv->getDoc()->url(); if (docurl.isLocalFile()) docdir = docurl.directory(); - QString lwd( config->readPathEntry("Last WD") ); + TQString lwd( config->readPathEntry("Last WD") ); switch ( (int)config->readNumEntry("Start In", 0) ) { case 1: @@ -142,18 +142,18 @@ void PluginKateInsertCommand::slotInsertCommand() break; } dialogSettings = config->readNumEntry("Dialog Settings", 0); - CmdPrompt *d = new CmdPrompt((QWidget*)kv, 0, cmdhist, dir, + CmdPrompt *d = new CmdPrompt((TQWidget*)kv, 0, cmdhist, dir, docdir, dialogSettings); if ( d->exec() && ! d->command().isEmpty() ) { if ( ! sh ) { sh = new KShellProcess; - connect ( sh, SIGNAL(receivedStdout(KProcess*, char*, int)), - this, SLOT(slotReceivedStdout(KProcess*, char*, int)) ); - connect ( sh, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotReceivedStderr(KProcess*, char*, int)) ); - connect ( sh, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)) ) ; + connect ( sh, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), + this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)) ); + connect ( sh, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) ); + connect ( sh, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)) ) ; } sh->clearArguments(); @@ -169,7 +169,7 @@ void PluginKateInsertCommand::slotInsertCommand() *sh << "cd" << d->wd() << "&&"; config->writePathEntry("Last WD", d->wd()); } - *sh << QFile::encodeName(d->command()); + *sh << TQFile::encodeName(d->command()); sh->start( KProcess::NotifyOnExit, KProcess::All ); // add command to history @@ -207,9 +207,9 @@ void PluginKateInsertCommand::slotAbort() void PluginKateInsertCommand::slotShowWaitDlg() { if ( sh->isRunning() ) { - wdlg = new WaitDlg( (QWidget*)kv, i18n( + wdlg = new WaitDlg( (TQWidget*)kv, i18n( "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd) ); - connect(wdlg, SIGNAL(cancelClicked()), this, SLOT(slotAbort()) ); + connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) ); } if ( sh->isRunning() ) // we may have finished while creating the dialog. wdlg->show(); @@ -222,7 +222,7 @@ void PluginKateInsertCommand::slotShowWaitDlg() void PluginKateInsertCommand::slotReceivedStdout( KProcess* /*p*/, char* text, int len ) { - QString t = QString::fromLocal8Bit ( text ); + TQString t = TQString::fromLocal8Bit ( text ); t.truncate(len); kv->insertText( t ); } @@ -250,12 +250,12 @@ void PluginKateInsertCommand::slotProcessExited( KProcess* p ) //BEGIN PluginConfigPage Kate::PluginConfigPage* PluginKateInsertCommand::configPage (uint, - QWidget *w, const char */*name*/) + TQWidget *w, const char */*name*/) { InsertCommandConfigPage* p = new InsertCommandConfigPage(this, w); initConfigPage( p ); - connect( p, SIGNAL(configPageApplyRequest(InsertCommandConfigPage*)), - this, SLOT(applyConfig(InsertCommandConfigPage*)) ); + connect( p, TQT_SIGNAL(configPageApplyRequest(InsertCommandConfigPage*)), + this, TQT_SLOT(applyConfig(InsertCommandConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -277,20 +277,20 @@ 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(QWidget* parent, +CmdPrompt::CmdPrompt(TQWidget* parent, const char* name, - const QStringList& cmdhist, - const QString& dir, - const QString& /*docdir*/, + const TQStringList& cmdhist, + const TQString& dir, + const TQString& /*docdir*/, int settings) : KDialogBase (parent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) { - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lo = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lo = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *l = new QLabel( i18n("Enter &command:"), page ); + TQLabel *l = new TQLabel( i18n("Enter &command:"), page ); lo->addWidget( l ); cmb_cmd = new KHistoryCombo(true, page); cmb_cmd->setHistoryItems(cmdhist, true); @@ -299,10 +299,10 @@ CmdPrompt::CmdPrompt(QWidget* parent, l->setBuddy(cmb_cmd); cmb_cmd->setFocus(); lo->addWidget(cmb_cmd); - connect( cmb_cmd->lineEdit(),SIGNAL(textChanged ( const QString & )), - this, SLOT( slotTextChanged(const QString &))); + connect( cmb_cmd->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), + this, TQT_SLOT( slotTextChanged(const TQString &))); - QLabel *lwd = new QLabel( i18n("Choose &working folder:"), page ); + TQLabel *lwd = new TQLabel( i18n("Choose &working folder:"), page ); lo->addWidget( lwd ); wdreq = new KURLRequester( page ); if ( ! dir.isEmpty() ) @@ -312,23 +312,23 @@ CmdPrompt::CmdPrompt(QWidget* parent, lo->addWidget( wdreq ); //kdDebug()<<"settings: "<<settings<<endl; - cb_insStdErr = new QCheckBox( i18n("Insert Std&Err messages"), page ); + cb_insStdErr = new TQCheckBox( i18n("Insert Std&Err messages"), page ); cb_insStdErr->setChecked(settings & 1); lo->addWidget( cb_insStdErr ); - cb_printCmd = new QCheckBox( i18n("&Print command name"), page ); + cb_printCmd = new TQCheckBox( i18n("&Print command name"), page ); cb_printCmd->setChecked(settings & 2); lo->addWidget( cb_printCmd ); - QWhatsThis::add( cmb_cmd, i18n( + TQWhatsThis::add( cmb_cmd, i18n( "Enter the shell command, the output of which you want inserted into your " "document. Feel free to use a pipe or two if you wish.") ); - QWhatsThis::add( wdreq, i18n( + TQWhatsThis::add( wdreq, i18n( "Sets the working folder of the command. The command executed is 'cd <dir> " "&& <command>'") ); - QWhatsThis::add( cb_insStdErr, i18n( + TQWhatsThis::add( cb_insStdErr, i18n( "Check this if you want the error output from <command> inserted as well.\n" "Some commands, such as locate, print everything to STDERR") ); - QWhatsThis::add( cb_printCmd, i18n( + TQWhatsThis::add( cb_printCmd, i18n( "If you check this, the command string will be printed followed by a " "newline before the output.") ); slotTextChanged(cmb_cmd->lineEdit()->text()); @@ -336,7 +336,7 @@ CmdPrompt::CmdPrompt(QWidget* parent, CmdPrompt::~CmdPrompt() {} -void CmdPrompt::slotTextChanged(const QString &text) +void CmdPrompt::slotTextChanged(const TQString &text) { enableButtonOK( !text.isEmpty()); } @@ -345,16 +345,16 @@ void CmdPrompt::slotTextChanged(const QString &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(QWidget* parent, const QString& text, const QString& title) +WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title) : KDialogBase( parent, "wait dialog", true, title, Cancel, Cancel, true ) { - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget( page ); - QHBoxLayout *lo = new QHBoxLayout( page, 0, spacingHint() ); + TQHBoxLayout *lo = new TQHBoxLayout( page, 0, spacingHint() ); - KAnimWidget *aw = new KAnimWidget( QString::fromLatin1("kde"), 48, page ); + KAnimWidget *aw = new KAnimWidget( TQString::fromLatin1("kde"), 48, page ); lo->addWidget(aw); - QLabel *l = new QLabel( text, page ); + TQLabel *l = new TQLabel( text, page ); lo->addWidget( l ); aw->start(); @@ -366,40 +366,40 @@ WaitDlg::~WaitDlg() //BEGIN InsertCommandConfigPage // This is the config page for this plugin. -InsertCommandConfigPage::InsertCommandConfigPage(QObject* /*parent*/, - QWidget *parentWidget) +InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*parent*/, + TQWidget *parentWidget) : Kate::PluginConfigPage( parentWidget ) { - QVBoxLayout* lo = new QVBoxLayout( this ); + TQVBoxLayout* lo = new TQVBoxLayout( this ); lo->setSpacing(KDialogBase::spacingHint()); // command history length - QHBox *hb1 = new QHBox( this ); + TQHBox *hb1 = new TQHBox( this ); hb1->setSpacing(KDialogBase::spacingHint()); - (void) new QLabel( i18n("Remember"), hb1 ); - sb_cmdhistlen = new QSpinBox( hb1 ); - QLabel *l1 = new QLabel( sb_cmdhistlen, i18n("Co&mmands"), hb1); + (void) new TQLabel( i18n("Remember"), hb1 ); + sb_cmdhistlen = new TQSpinBox( hb1 ); + TQLabel *l1 = new TQLabel( sb_cmdhistlen, i18n("Co&mmands"), hb1); hb1->setStretchFactor(l1, 1); lo->addWidget( hb1 ); // dir history length // initial dir choice - rg_startin = new QButtonGroup( 1, Qt::Horizontal, i18n("Start In"), this ); + rg_startin = new TQButtonGroup( 1, Qt::Horizontal, i18n("Start In"), this ); rg_startin->setRadioButtonExclusive( true ); - (void) new QRadioButton( i18n("Application &working folder"), rg_startin); - (void) new QRadioButton( i18n("&Document folder"), rg_startin); - (void) new QRadioButton( i18n("&Latest used working folder"), rg_startin); + (void) new TQRadioButton( i18n("Application &working folder"), rg_startin); + (void) new TQRadioButton( i18n("&Document folder"), rg_startin); + (void) new TQRadioButton( i18n("&Latest used working folder"), rg_startin); lo->addWidget( rg_startin ); // other? lo->addStretch(1); // look nice // Be helpfull! - QWhatsThis::add( sb_cmdhistlen, i18n( + TQWhatsThis::add( sb_cmdhistlen, i18n( "Sets the number of commands to remember. The command history is saved " "over sessions.") ); - QWhatsThis::add( rg_startin, i18n( + TQWhatsThis::add( rg_startin, i18n( "<qt><p>Decides what is suggested as <em>working folder</em> for the " "command.</p><p><strong>Application Working Folder (default):</strong> " "The folder from which you launched the application hosting the plugin, " diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index c948b38..aa0f904 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -33,7 +33,7 @@ #include <klibloader.h> #include <klocale.h> #include <kurlrequester.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> class InsertCommandConfigPage; @@ -57,7 +57,7 @@ class PluginKateInsertCommand : public Kate::Plugin, Q_OBJECT public: - PluginKateInsertCommand( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateInsertCommand( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateInsertCommand(); void addView (Kate::MainWindow *win); @@ -66,14 +66,14 @@ class PluginKateInsertCommand : public Kate::Plugin, Kate::View *kv; WaitDlg *wdlg; - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , QWidget *w, const char *name=0); - QString configPageName(uint) const { return i18n("Insert Command"); } - QString configPageFullName(uint) const { + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + TQString configPageName(uint) const { return i18n("Insert Command"); } + TQString configPageFullName(uint) const { return i18n("Configure Insert Command Plugin"); } - QPixmap configPagePixmap (uint /*number = 0*/, + TQPixmap configPagePixmap (uint /*number = 0*/, int /*size = KIcon::SizeSmall*/) const { return 0L; } @@ -81,9 +81,9 @@ class PluginKateInsertCommand : public Kate::Plugin, void initConfigPage( InsertCommandConfigPage* ); KShellProcess *sh; - QString workingdir; - QString cmd; - QStringList cmdhist; + TQString workingdir; + TQString cmd; + TQStringList cmdhist; bool bInsStdErr; int dialogSettings; KConfig *config; @@ -104,35 +104,35 @@ class CmdPrompt : public KDialogBase { Q_OBJECT public: - CmdPrompt(QWidget* parent=0, + CmdPrompt(TQWidget* parent=0, const char* name=0, - const QStringList& cmdhist=QStringList(), - const QString& dir=QString::null, - const QString& docdir=QString::null, + const TQStringList& cmdhist=TQStringList(), + const TQString& dir=TQString::null, + const TQString& docdir=TQString::null, int settings=0); ~CmdPrompt(); - QString command()const { return cmb_cmd->currentText(); } + TQString command()const { return cmb_cmd->currentText(); } bool insertStdErr()const { return cb_insStdErr->isChecked(); } bool printCmd()const { return cb_printCmd->isChecked(); } - QString wd()const { return wdreq->url(); } + TQString wd()const { return wdreq->url(); } private slots: - void slotTextChanged(const QString &text); + void slotTextChanged(const TQString &text); private: KHistoryCombo *cmb_cmd; KURLRequester *wdreq; - QCheckBox *cb_insStdErr; - QCheckBox *cb_printCmd; + TQCheckBox *cb_insStdErr; + TQCheckBox *cb_printCmd; }; class WaitDlg : public KDialogBase { public: - WaitDlg(QWidget* parent, - const QString& text=QString::null, - const QString& title=i18n("Please Wait")); + WaitDlg(TQWidget* parent, + const TQString& text=TQString::null, + const TQString& title=i18n("Please Wait")); ~WaitDlg(); }; @@ -143,7 +143,7 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage friend class PluginKateInsertCommand; public: - InsertCommandConfigPage(QObject* parent = 0L, QWidget *parentWidget = 0L); + InsertCommandConfigPage(TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~InsertCommandConfigPage() {} /** Reimplemented from Kate::PluginConfigPage @@ -161,9 +161,9 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage void configPageInitRequest( InsertCommandConfigPage* ); protected: - QSpinBox *sb_cmdhistlen; - //QCheckBox *cb_startindocdir; - QButtonGroup *rg_startin; + TQSpinBox *sb_cmdhistlen; + //TQCheckBox *cb_startindocdir; + TQButtonGroup *rg_startin; }; #endif // _PLUGIN_KATE_INSERT_COMMAND_H_ diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index fcb8d38..1bb56eb 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -1,7 +1,7 @@ #include "bindings.h" #include "bindings.moc" #include "plugin_katekjswrapper.h" -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> #include <kate/documentmanager.h> #include <kate/document.h> @@ -17,7 +17,7 @@ using namespace Kate::JS; -Bindings::Bindings(QObject *parent): KJSEmbed::Bindings::JSBindingPlugin(parent,"KateAppBindings",QStringList()) { +Bindings::Bindings(TQObject *parent): KJSEmbed::Bindings::JSBindingPlugin(parent,"KateAppBindings",TQStringList()) { } Bindings::~Bindings() { @@ -86,30 +86,30 @@ DocumentManager::~DocumentManager() { } KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - QObject *o=m_proxy->object(); + TQObject *o=m_proxy->object(); Kate::DocumentManager *dm=dynamic_cast<Kate::DocumentManager*>(o); if (!dm) { kdWarning()<<"Object died"<<endl; - QString msg = i18n("Call of DocumentManager member on destroyed object"); + TQString msg = i18n("Call of DocumentManager member on destroyed object"); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); } - QString mdesc; + TQString mdesc; switch (m_id) { case Document: { mdesc="document(int)"; if (args.size()!=1) break; uint index=args[0].toUInt32(exec); if (exec->hadException()) break; - QObject *doc=dynamic_cast<QObject*>(dm->document(index)); + TQObject *doc=dynamic_cast<TQObject*>(dm->document(index)); if (!doc) return KJS::Null(); return m_dict->jsObject(exec,doc,m_proxy); } break; case ActiveDocument: { mdesc="activeDocument()"; if (args.size()!=0) break; - QObject *doc=dynamic_cast<QObject*>(dm->activeDocument()); + TQObject *doc=dynamic_cast<TQObject*>(dm->activeDocument()); if (!doc) return KJS::Null(); return m_dict->jsObject(exec,doc,m_proxy); } break; @@ -118,21 +118,21 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const if (args.size()!=1) break; uint id=args[0].toUInt32(exec); if (exec->hadException()) break; - QObject *doc=dynamic_cast<QObject*>(dm->documentWithID(id)); + TQObject *doc=dynamic_cast<TQObject*>(dm->documentWithID(id)); if (!doc) return KJS::Null(); return m_dict->jsObject(exec,doc,m_proxy); } break; case FindDocument: { mdesc="documentForURL(KURL)"; if (args.size()!=1) break; - KURL url = QString( args[0].toString(exec).qstring() ); + KURL url = TQString( args[0].toString(exec).qstring() ); if (exec->hadException()) break; return KJS::Number(dm->findDocument(url)); } break; case IsOpen: { mdesc="isOpen(KURL)"; if (args.size()!=0) break; - KURL url = QString( args[0].toString(exec).qstring() ); + KURL url = TQString( args[0].toString(exec).qstring() ); if (exec->hadException()) break; return KJS::Boolean(dm->isOpen(url));} @@ -141,14 +141,14 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const mdesc="openURL(KURL[,String encoding])"; uint docID; if (args.size()==1) { - KURL url = QString( args[0].toString(exec).qstring() ); + KURL url = TQString( args[0].toString(exec).qstring() ); if (exec->hadException()) break; - (void)dm->openURL(url,QString::null,&docID); + (void)dm->openURL(url,TQString::null,&docID); return KJS::Number(docID); } else if (args.size()==2) { - KURL url = QString( args[0].toString(exec).qstring() ); + KURL url = TQString( args[0].toString(exec).qstring() ); if (exec->hadException()) break; - QString encoding=QString( args[1].toString(exec).qstring() ); + TQString encoding=TQString( args[1].toString(exec).qstring() ); (void)dm->openURL(url,encoding,&docID); return KJS::Number(docID); } @@ -164,7 +164,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const if (args.size()!=1) break; KJSEmbed::JSObjectProxy *proxy = KJSEmbed::JSProxy::toObjectProxy( args[0].imp() ); if (!proxy) break; - QObject *tmp=proxy->object(); + TQObject *tmp=proxy->object(); Kate::Document *tmpdoc=dynamic_cast<Kate::Document*>(tmp); if (!tmpdoc) break; return KJS::Boolean(dm->closeDocument(tmpdoc)); } @@ -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(); } - QString msg = i18n("Method %1 called with wrong signature").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -194,7 +194,7 @@ Kate::JS::Management::Management(KJS::ExecState *exec, int id, PluginKateKJSWrap KJS::Value Kate::JS::Management::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { if (m_id==AddConfigPage) { if (args.size()!=1) { - QString msg = i18n("One parameter expected"); + TQString msg = i18n("One parameter expected"); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -204,7 +204,7 @@ KJS::Value Kate::JS::Management::call( KJS::ExecState *exec, KJS::Object &self, #warning implement me } else if (m_id==SetConfigPages) { if (args.size()>1) { - QString msg=i18n("One or no parameter expected"); + TQString msg=i18n("One or no parameter expected"); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -212,7 +212,7 @@ KJS::Value Kate::JS::Management::call( KJS::ExecState *exec, KJS::Object &self, m_wrapper->m_configPageFactories=(args.size()>0)?args[0]:KJS::Value(); } else if (m_id==SetWindowConfiguration) { if (args.size()>3) { - QString msg = i18n("A maximum of three parameters expected"); + TQString msg = i18n("A maximum of three parameters expected"); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -273,16 +273,16 @@ Kate::JS::Application::~Application() { } KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - QObject *o=m_proxy->object(); + TQObject *o=m_proxy->object(); Kate::Application *ka=dynamic_cast<Kate::Application*>(o); if (!ka) { kdWarning()<<"Object died"<<endl; - QString msg = i18n("Call of KATE member on destroyed object"); + TQString msg = i18n("Call of KATE member on destroyed object"); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); } - QString mdesc; + TQString mdesc; switch (m_id) { case WindowCount: { mdesc="windowCount()"; @@ -310,7 +310,7 @@ KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self, } - QString msg = i18n("Method %1 called with wrong signature").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); @@ -373,7 +373,7 @@ KJS::Value Kate::JS::General::fieldz(KJS::ExecState *exec, KJS::Object &obj, con } -Kate::JS::RefCountedObjectDict::RefCountedObjectDict(int size): QObject(), QPtrDict<ObjectEntry>(size) { +Kate::JS::RefCountedObjectDict::RefCountedObjectDict(int size): TQObject(), TQPtrDict<ObjectEntry>(size) { m_usageCount=0; setAutoDelete(true); } @@ -389,12 +389,12 @@ void Kate::JS::RefCountedObjectDict::decRef() { } -KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, QObject *obj, KJSEmbed::JSObjectProxy *proxy) { +KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQObject *obj, KJSEmbed::JSObjectProxy *proxy) { ObjectEntry *oe=find(obj); if (oe==0) { oe=new ObjectEntry; oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy); - connect(obj,SIGNAL(destroyed()),this,SLOT(removeSender())); + connect(obj,TQT_SIGNAL(destroyed()),this,TQT_SLOT(removeSender())); insert(obj,oe); return oe->obj; } else return oe->obj; @@ -438,16 +438,16 @@ Kate::JS::MainWindow::~MainWindow() { } KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - QObject *o=m_proxy->object(); + TQObject *o=m_proxy->object(); Kate::MainWindow *mw=dynamic_cast<Kate::MainWindow*>(o); if (!mw) { kdWarning()<<"Object died"<<endl; - QString msg = i18n("Call of MainWindow member on destroyed object"); + TQString msg = i18n("Call of MainWindow member on destroyed object"); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); } - QString mdesc; + TQString mdesc; switch (m_id) { case ActionCollection: { mdesc="actionCollection()"; @@ -458,7 +458,7 @@ KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self, default: return KJS::Undefined(); } - QString msg = i18n("Method %1 called with wrong signature").arg(mdesc); + TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc); KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() ); exec->setException( err ); return KJS::Undefined(); diff --git a/kate/kjswrapper/bindings.h b/kate/kjswrapper/bindings.h index 2e98ee8..f33418f 100644 --- a/kate/kjswrapper/bindings.h +++ b/kate/kjswrapper/bindings.h @@ -5,7 +5,7 @@ #include <kjsembed/jsproxy_imp.h> #include <kjsembed/jsobjectproxy.h> #include <kjsembed/jsfactory.h> -#include <qptrdict.h> +#include <tqptrdict.h> class PluginKateKJSWrapper; @@ -17,13 +17,13 @@ namespace Kate { KJS::Object obj; }; - class RefCountedObjectDict: public QObject, public QPtrDict<ObjectEntry> { + class RefCountedObjectDict: public TQObject, public TQPtrDict<ObjectEntry> { Q_OBJECT public: RefCountedObjectDict(int size); void incRef(); void decRef(); - KJS::Object jsObject(KJS::ExecState *exec, QObject *obj, KJSEmbed::JSObjectProxy *proxy); + KJS::Object jsObject(KJS::ExecState *exec, TQObject *obj, KJSEmbed::JSObjectProxy *proxy); public slots: void removeSender(); private: @@ -33,7 +33,7 @@ namespace Kate { class Bindings: public KJSEmbed::Bindings::JSBindingPlugin { public: - Bindings(QObject *parent); + Bindings(TQObject *parent); 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; diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index c3e54b7..8fc4ae5 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -29,12 +29,12 @@ #include <kjs/object.h> #include <kgenericfactory.h> #include <kdebug.h> -#include <qlayout.h> +#include <tqlayout.h> #include <kstandarddirs.h> #include <kate/mainwindow.h> #include <kate/toolviewmanager.h> #include <kdockwidget.h> -#include <qvbox.h> +#include <tqvbox.h> //END includes K_EXPORT_COMPONENT_FACTORY( katekjswrapperplugin, KGenericFactory<PluginKateKJSWrapper>( "katekjswrapper" ) ) @@ -44,7 +44,7 @@ PluginKateKJSWrapperView::~PluginKateKJSWrapperView() { void PluginKateKJSWrapperView::removeFromWindow() { kdDebug()<<"PluginKateKJSWrapperView::removeFromWindow"<<endl; - for (QValueList<QGuardedPtr<KMDI::ToolViewAccessor> >::iterator it=toolviews.begin();it!=toolviews.end();it=toolviews.begin()) { + for (TQValueList<TQGuardedPtr<KMDI::ToolViewAccessor> >::iterator it=toolviews.begin();it!=toolviews.end();it=toolviews.begin()) { kdDebug()<<"removeFromWindow: removing a toolview"<<endl; KMDI::ToolViewAccessor* tva=(*it); toolviews.remove(it); @@ -53,7 +53,7 @@ void PluginKateKJSWrapperView::removeFromWindow() { win->guiFactory()->removeClient (this); } -PluginKateKJSWrapper::PluginKateKJSWrapper( QObject* parent, const char* name, const QStringList& list) +PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, const TQStringList& list) : Kate::Plugin ( (Kate::Application *)parent, name ) { m_views.setAutoDelete(true); m_scriptname=list[0]; @@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( QObject* parent, const char* name, c w->show(); //w->show();*/ kdDebug()<<"m_scriptname="<<m_scriptname<<endl; - m_part->runFile(locate("appdata",QString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname))); + m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname))); //"/home/jowenn/development/kde/cvs/kdeaddons/kate/kjswrapper/samples/test1.js"); } @@ -104,7 +104,7 @@ uint PluginKateKJSWrapper::configPages () const { if (! (m_configPageFactories.isNull() || (m_configPageFactories.type()==KJS::NullType))) { KJS::Object constrs=m_configPageFactories.toObject(exec); if (!exec->hadException()) { - if (QString(constrs.classInfo()->className)=="Array") { + if (TQString(constrs.classInfo()->className)=="Array") { kdDebug()<<"config page constructor array detected"<<endl; uint size=constrs.get(exec,KJS::Identifier("length")).toInteger(exec); if (exec->hadException()) { @@ -125,7 +125,7 @@ static KJS::Object getObj(KJS::Interpreter *js, KJS::Value mightBeArray, int id) KJS::Object constrs=mightBeArray.toObject(exec); KJS::Value constr; if (!exec->hadException()) { - if (QString(constrs.classInfo()->className)=="Array") { + if (TQString(constrs.classInfo()->className)=="Array") { kdDebug()<<"config page constructor array detected"<<endl; constr=constrs.get(exec,id); } else constr=mightBeArray; @@ -134,14 +134,14 @@ static KJS::Object getObj(KJS::Interpreter *js, KJS::Value mightBeArray, int id) return constr.toObject(js->globalExec()); } -QString PluginKateKJSWrapper::configPageName(uint id) const { +TQString PluginKateKJSWrapper::configPageName(uint id) const { if (id>=configPages()) return ""; KJS::Interpreter *js = m_part->interpreter(); KJS::Object constr=getObj(js,m_configPageFactories,id); KJS::Value o=constr.get(js->globalExec(),KJS::Identifier("name")); - QString retVal( o.toString(js->globalExec()).qstring() ); + TQString retVal( o.toString(js->globalExec()).qstring() ); kdDebug()<<"=============================================================================================="<<endl; kdDebug()<<"PluginKateKJSWrapper::configPageName: "<<retVal<<endl; @@ -150,14 +150,14 @@ QString PluginKateKJSWrapper::configPageName(uint id) const { return retVal; } -QString PluginKateKJSWrapper::configPageFullName(uint id) const { +TQString PluginKateKJSWrapper::configPageFullName(uint id) const { if (id>=configPages()) return ""; KJS::Interpreter *js = m_part->interpreter(); KJS::Object constr=getObj(js,m_configPageFactories,id); KJS::Value o=constr.get(js->globalExec(),KJS::Identifier("fullName")); - QString retVal( o.toString(js->globalExec()).qstring() ); + TQString retVal( o.toString(js->globalExec()).qstring() ); kdDebug()<<"=============================================================================================="<<endl; kdDebug()<<"PluginKateKJSWrapper::configPageFullName: "<<retVal<<endl; @@ -166,14 +166,14 @@ QString PluginKateKJSWrapper::configPageFullName(uint id) const { return retVal; } -QPixmap PluginKateKJSWrapper::configPagePixmap (uint /*number = 0*/, +TQPixmap PluginKateKJSWrapper::configPagePixmap (uint /*number = 0*/, int /*size = KIcon::SizeSmall*/) const { return 0; } Kate::PluginConfigPage* PluginKateKJSWrapper::configPage (uint id, - QWidget *w, const char */*name*/) { + TQWidget *w, const char */*name*/) { kdDebug()<<"PluginKateKJSWrapper::configPage"<<endl; if (id>=configPages()) return 0; @@ -197,8 +197,8 @@ Kate::PluginConfigPage* PluginKateKJSWrapper::configPage (uint id, /* KateKJSWrapperConfigPage* p = new KateKJSWrapperConfigPage(this, w); //init - connect( p, SIGNAL(configPageApplyRequest(KateKJSWrapperConfigPage*)), - this, SLOT(applyConfig(KateKJSWrapperConfigPage*)) ); + connect( p, TQT_SIGNAL(configPageApplyRequest(KateKJSWrapperConfigPage*)), + this, TQT_SLOT(applyConfig(KateKJSWrapperConfigPage*)) ); return (Kate::PluginConfigPage*);*/ } @@ -223,13 +223,13 @@ static KMDI::ToolViewAccessor *createToolView(KJSEmbed::JSFactory *factory,KJS:: exec->clearException(); } } - QString viewName; + TQString viewName; KJS::Value viewNameV=viewConstructor.get(exec,KJS::Identifier("name")); if (exec->hadException()) { viewName="kjs_unknown"; exec->clearException(); } else { - viewName=QString( viewNameV.toString(exec).qstring() ); + viewName=TQString( viewNameV.toString(exec).qstring() ); if (exec->hadException()) { viewName="kjs_unknown"; exec->clearException(); @@ -247,7 +247,7 @@ static KMDI::ToolViewAccessor *createToolView(KJSEmbed::JSFactory *factory,KJS:: return 0; } KMDI::ToolViewAccessor *tva=winN->toolViewManager()->addToolView((KDockWidget::DockPosition)dockPos,tv, - tv->icon()?(*(tv->icon())):QPixmap(),tv->caption()); + tv->icon()?(*(tv->icon())):TQPixmap(),tv->caption()); kdDebug()<<"****************************************************************************************"<<endl; kdDebug()<<"PluginKateKJSWrapper: Toolview has been added"<<endl; kdDebug()<<"****************************************************************************************"<<endl; @@ -260,7 +260,7 @@ PluginKateKJSWrapperView *PluginKateKJSWrapper::getViewObject(Kate::MainWindow * if (!view) { view=new PluginKateKJSWrapperView(); view->win=win; - connect(win,SIGNAL(destroyed()),this,SLOT(slotWindowDestroyed())); + connect(win,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWindowDestroyed())); m_views.insert(win,view); KJS::Interpreter *js = m_part->interpreter(); KJS::ExecState *exec = js->globalExec(); @@ -302,7 +302,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win) if (! (m_toolViewConstructors.isNull() || (m_toolViewConstructors.type()==KJS::NullType))) { KJS::Object constrs=m_toolViewConstructors.toObject(exec); if (!exec->hadException()) { - if (QString(constrs.classInfo()->className)=="Array") { + if (TQString(constrs.classInfo()->className)=="Array") { kdDebug()<<"Toolview constructor array detected"<<endl; int size=constrs.get(exec,KJS::Identifier("length")).toInteger(exec); if (exec->hadException()) { @@ -317,7 +317,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win) } else { KMDI::ToolViewAccessor *w=createToolView(m_part->factory(),js,win,view->winObj,constrO); if (w) { - view->toolviews.append(QGuardedPtr<KMDI::ToolViewAccessor>(w)); + view->toolviews.append(TQGuardedPtr<KMDI::ToolViewAccessor>(w)); } exec->clearException(); } @@ -330,7 +330,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win) } else { KMDI::ToolViewAccessor *w=createToolView(m_part->factory(),js,win,view->winObj,constrs); if (w) { - view->toolviews.append(QGuardedPtr<KMDI::ToolViewAccessor>(w)); + view->toolviews.append(TQGuardedPtr<KMDI::ToolViewAccessor>(w)); } exec->clearException(); } @@ -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(QString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname)); + view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname)); win->guiFactory()->addClient (view); } @@ -371,10 +371,10 @@ void PluginKateKJSWrapper::applyConfig( KateKJSWrapperConfigPage *p ) } KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent, - QWidget *parentWidget) + TQWidget *parentWidget) : Kate::PluginConfigPage( parentWidget ),m_plugin(parent) { - QVBoxLayout *l=new QVBoxLayout(this); + TQVBoxLayout *l=new TQVBoxLayout(this); l->setAutoAdd(true); l->activate(); KJS::Interpreter *js = parent->m_part->interpreter(); @@ -386,7 +386,7 @@ KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,P } -static void callJS(KJSEmbed::KJSEmbedPart *p,KJS::Object o,const QString& funcName){ +static void callJS(KJSEmbed::KJSEmbedPart *p,KJS::Object o,const TQString& funcName){ KJS::Interpreter *js = p->interpreter(); KJS::ExecState *exec = js->globalExec(); KJS::List param; @@ -426,7 +426,7 @@ void KateKJSWrapperConfigPage::defaults() } -Kate::JS::ToolView::ToolView(KJS::Object constr, KJS::ExecState *exec, KJSEmbed::JSFactory *factory, KJS::List parameters, const char *name):QVBox(0,name) { +Kate::JS::ToolView::ToolView(KJS::Object constr, KJS::ExecState *exec, KJSEmbed::JSFactory *factory, KJS::List parameters, const char *name):TQVBox(0,name) { parameters.append(factory->createProxy(exec,this)); handler=constr.construct(exec,parameters); diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h index f04043e..9256b4c 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.h +++ b/kate/kjswrapper/plugin_katekjswrapper.h @@ -34,15 +34,15 @@ #include <klibloader.h> #include <klocale.h> #include <kurlrequester.h> -#include <qcheckbox.h> -#include <qvaluelist.h> +#include <tqcheckbox.h> +#include <tqvaluelist.h> #include <kjs/value.h> #include <kjs/object.h> -#include <qvbox.h> -#include <qptrdict.h> +#include <tqvbox.h> +#include <tqptrdict.h> #include <kxmlguiclient.h> -#include <qvaluelist.h> -#include <qguardedptr.h> +#include <tqvaluelist.h> +#include <tqguardedptr.h> namespace Kate { class PluginConfigPage; @@ -75,7 +75,7 @@ class PluginKateKJSWrapper : public Kate::Plugin, Q_OBJECT public: - PluginKateKJSWrapper( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateKJSWrapper( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateKJSWrapper(); void addView (Kate::MainWindow *win); @@ -84,12 +84,12 @@ class PluginKateKJSWrapper : public Kate::Plugin, Kate::View *kv; - QPtrDict<class PluginKateKJSWrapperView> m_views; + TQPtrDict<class PluginKateKJSWrapperView> m_views; uint configPages () const; - Kate::PluginConfigPage *configPage (uint , QWidget *w, const char *name=0); - QString configPageName(uint) const; - QString configPageFullName(uint) const; - QPixmap configPagePixmap (uint /*number = 0*/, + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + TQString configPageName(uint) const; + TQString configPageFullName(uint) const; + TQPixmap configPagePixmap (uint /*number = 0*/, int /*size = KIcon::SizeSmall*/) const; PluginKateKJSWrapperView *getViewObject(Kate::MainWindow *win); @@ -104,12 +104,12 @@ class PluginKateKJSWrapper : public Kate::Plugin, friend class KateKJSWrapperConfigPage; KJSEmbed::KJSEmbedPart *m_part; Kate::JS::Bindings *m_kateAppBindings; - //QValueList<KJS::Value> m_configPageFactories; + //TQValueList<KJS::Value> m_configPageFactories; KJS::Value m_configPageFactories; KJS::Value m_toolViewConstructors; KJS::Value m_newWindowHandler; KJS::Value m_removeWindowHandler; - QString m_scriptname; + TQString m_scriptname; }; @@ -120,7 +120,7 @@ class KateKJSWrapperConfigPage : public Kate::PluginConfigPage friend class PluginKateKJSWrapper; public: - KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent = 0L, QWidget *parentWidget = 0L); + KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent = 0L, TQWidget *parentWidget = 0L); ~KateKJSWrapperConfigPage() {}; /** Reimplemented from Kate::PluginConfigPage @@ -157,14 +157,14 @@ class PluginKateKJSWrapperView : public KXMLGUIClient Kate::MainWindow *win; KJS::Object winObj; KJS::Object actionCollectionObj; - QValueList<QGuardedPtr<KMDI::ToolViewAccessor> > toolviews; + TQValueList<TQGuardedPtr<KMDI::ToolViewAccessor> > toolviews; }; namespace Kate { namespace JS { - class ToolView: public QVBox { + class ToolView: public TQVBox { Q_OBJECT public: ToolView(KJS::Object constr, KJS::ExecState *exec, KJSEmbed::JSFactory *factory, KJS::List parameters, const char * name); diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 9023e65..183e1e7 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -16,10 +16,10 @@ ***************************************************************************/ #include "kpybrowser.h" -#include <qheader.h> +#include <tqheader.h> #include <kmessagebox.h> #include <klocale.h> -#include <qregexp.h> +#include <tqregexp.h> #include "kpybrowser.moc" @@ -165,7 +165,7 @@ static const char *container_xpm[] = { }; void -getOpenNodes (QValueList < QString > *open_nodes, PyBrowseNode * node) +getOpenNodes (TQValueList < TQString > *open_nodes, PyBrowseNode * node) { if (node == NULL) return; @@ -181,23 +181,23 @@ getOpenNodes (QValueList < QString > *open_nodes, PyBrowseNode * node) } -KPyBrowser::KPyBrowser (QWidget * parent, const char *name): +KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): KListView (parent, name) { addColumn(i18n("Name")); header ()->hide (); class_root = - new PyBrowseNode (this, QString ("Classes"), i18n("Classes"), + new PyBrowseNode (this, TQString ("Classes"), i18n("Classes"), PYOTHER); - class_root->setPixmap (0, QPixmap (container_xpm)); + class_root->setPixmap (0, TQPixmap (container_xpm)); function_root = - new PyBrowseNode (this, QString ("Globals"), i18n("Globals"), + new PyBrowseNode (this, TQString ("Globals"), i18n("Globals"), PYOTHER); - function_root->setPixmap (0, QPixmap (container_xpm)); + function_root->setPixmap (0, TQPixmap (container_xpm)); setRootIsDecorated (1); - connect (this, SIGNAL (executed (QListViewItem *)), this, - SLOT (nodeSelected (QListViewItem *))); + connect (this, TQT_SIGNAL (executed (TQListViewItem *)), this, + TQT_SLOT (nodeSelected (TQListViewItem *))); setTooltipColumn (1); setShowToolTips (1); tooltip = new KPBToolTip (this); @@ -208,7 +208,7 @@ KPyBrowser::~KPyBrowser () } void -KPyBrowser::nodeSelected (QListViewItem * node) +KPyBrowser::nodeSelected (TQListViewItem * node) { PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(node); @@ -217,41 +217,41 @@ KPyBrowser::nodeSelected (QListViewItem * node) return; } - QString method_name; + TQString method_name; int line_no; line_no = browse_node->getLine(); method_name = browse_node->getName(); if (browse_node->getType () == PYCLASS) { - method_name = QString ("class ") + browse_node->getName (); + method_name = TQString ("class ") + browse_node->getName (); } else if (browse_node->getType () == PYMETHOD || browse_node->getType () == PYFUNCTION) { - method_name = QString ("def ") + browse_node->getName (); + method_name = TQString ("def ") + browse_node->getName (); } emit selected(method_name, line_no); } void -KPyBrowser::parseText (QString & pytext) +KPyBrowser::parseText (TQString & pytext) { - QRegExp class_rx (QString ("^class [a-zA-Z0-9_,\\s\\(\\).]+:")); - QRegExp function_rx (QString ("^def [a-zA-Z_]+[^#]*:")); - QRegExp method_rx (QString ("[\\s]+def [a-zA-Z_]+[^#]*:")); + TQRegExp class_rx (TQString ("^class [a-zA-Z0-9_,\\s\\(\\).]+:")); + TQRegExp function_rx (TQString ("^def [a-zA-Z_]+[^#]*:")); + TQRegExp method_rx (TQString ("[\\s]+def [a-zA-Z_]+[^#]*:")); int paren_i; - QStringList lines = QStringList::split ("\n", pytext, TRUE); - QStringList::Iterator iter; - QString *line; - QString class_name, method_name, function_name, class_sig, method_sig, + TQStringList lines = TQStringList::split ("\n", pytext, TRUE); + TQStringList::Iterator iter; + TQString *line; + TQString class_name, method_name, function_name, class_sig, method_sig, function_sig; PyBrowseNode *last_class_node = NULL; PyBrowseNode *last_method_node = NULL; PyBrowseNode *last_function_node = NULL; - QValueList < QString > open_nodes; + TQValueList < TQString > open_nodes; getOpenNodes (&open_nodes, class_root); getOpenNodes (&open_nodes, function_root); @@ -267,13 +267,13 @@ KPyBrowser::parseText (QString & pytext) delete function_root; } class_root = - new PyBrowseNode (this, QString ("Classes"), i18n("Classes"), + new PyBrowseNode (this, TQString ("Classes"), i18n("Classes"), PYOTHER); - class_root->setPixmap (0, QPixmap (container_xpm)); + class_root->setPixmap (0, TQPixmap (container_xpm)); function_root = - new PyBrowseNode (this, QString ("Globals"), i18n("Globals"), + new PyBrowseNode (this, TQString ("Globals"), i18n("Globals"), PYOTHER); - function_root->setPixmap (0, QPixmap (container_xpm)); + function_root->setPixmap (0, TQPixmap (container_xpm)); node_dict.insert (class_root->getQualifiedName (), class_root); node_dict.insert (function_root->getQualifiedName (), function_root); @@ -286,7 +286,7 @@ KPyBrowser::parseText (QString & pytext) line = &(*iter); if (class_rx.search(*line) >= 0) { - //KMessageBox::information(this, *line, QString("Found class on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no)); //strip out the beginning class and ending colon class_sig = line->stripWhiteSpace ().mid (6); class_sig = class_sig.left (class_sig.length () - 1); @@ -318,7 +318,7 @@ KPyBrowser::parseText (QString & pytext) } if ((function_rx.search(*line) >= 0)) { - //KMessageBox::information(this, *line, QString("Found function on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no)); function_sig = line->stripWhiteSpace ().mid (4); function_sig = function_sig.left (function_sig.find (":")); paren_i = function_sig.find ("("); @@ -336,7 +336,7 @@ KPyBrowser::parseText (QString & pytext) //now go through the list of old open nodes and open them in the new //tree. For each node name in the open_nodes list, attempt to find that //node and in the new dict and open it. - QValueList<QString>::iterator it; + TQValueList<TQString>::iterator it; PyBrowseNode *tmp_node; for (it=open_nodes.begin(); it != open_nodes.end(); ++it) { @@ -351,9 +351,9 @@ KPyBrowser::parseText (QString & pytext) void -KPyBrowser::tip (const QPoint & p, QRect & r, QString & str) +KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) { - QListViewItem *item = (QListViewItem *) itemAt (p); + TQListViewItem *item = (TQListViewItem *) itemAt (p); if (item == NULL) { str = ""; @@ -380,15 +380,15 @@ KPyBrowser::tip (const QPoint & p, QRect & r, QString & str) ///////////////////////////////////////////////////////////////////// // KateFileList::KFLToolTip implementation -KPyBrowser::KPBToolTip::KPBToolTip (QWidget * parent):QToolTip (parent) +KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * parent):TQToolTip (parent) { } void -KPyBrowser::KPBToolTip::maybeTip (const QPoint & p) +KPyBrowser::KPBToolTip::maybeTip (const TQPoint & p) { - QString str; - QRect r; + TQString str; + TQRect r; ((KPyBrowser *) parentWidget ())->tip (p, r, str); diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index ae49d3c..5f73c31 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -24,10 +24,10 @@ #include <kapplication.h> #include <klistview.h> -#include <qstring.h> -#include <qvaluelist.h> -#include <qtooltip.h> -#include <qdict.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqtooltip.h> +#include <tqdict.h> #include "pybrowsenode.h" @@ -37,31 +37,31 @@ class KPyBrowser : public KListView Q_OBJECT public: /** construtor */ - KPyBrowser(QWidget* parent=0, const char *name=0); + KPyBrowser(TQWidget* parent=0, const char *name=0); /** destructor */ ~KPyBrowser(); - void parseText(QString &pytext); + void parseText(TQString &pytext); //used by KPBToolTip to dynamically create the needed tooltip - void tip (const QPoint &p, QRect &r, QString &str); + void tip (const TQPoint &p, TQRect &r, TQString &str); private: PyBrowseNode *class_root, *function_root; //create a mapping of names to nodes - QDict<PyBrowseNode> node_dict; + TQDict<PyBrowseNode> node_dict; public slots: - void nodeSelected(QListViewItem *node); + void nodeSelected(TQListViewItem *node); signals: - void selected(QString, int); + void selected(TQString, int); private: class KPBToolTip : public QToolTip { public: - KPBToolTip(QWidget *parent); + KPBToolTip(TQWidget *parent); protected: - void maybeTip( const QPoint & ); + void maybeTip( const TQPoint & ); }; KPBToolTip* tooltip; }; diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index d8b7551..4b8490c 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <qimage.h> +#include <tqimage.h> #include <kdockwidget.h> K_EXPORT_COMPONENT_FACTORY( katepybrowseplugin, KGenericFactory<KatePluginPyBrowse>( "katepybrowse" ) ) @@ -34,7 +34,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w) : win (w) { (void) new KAction ( i18n("Update Python Browser"), 0, this, - SLOT( slotUpdatePyBrowser() ), actionCollection(), + TQT_SLOT( slotUpdatePyBrowser() ), actionCollection(), "python_update_pybrowse" ); //set up the menus @@ -43,8 +43,8 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w) win->guiFactory()->addClient(this); //create a python head pixmap for the tab - QPixmap *py_pixmap = new QPixmap(pybrowse_xpm); - QImage py_image = py_pixmap->convertToImage().smoothScale(20, 20); + TQPixmap *py_pixmap = new TQPixmap(pybrowse_xpm); + TQImage py_image = py_pixmap->convertToImage().smoothScale(20, 20); py_pixmap->convertFromImage(py_image); //create the browser and put it into a dockwidget using kate's tool view manager @@ -53,7 +53,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w) my_dock = tool_view_manager->createToolView("kate_plugin_kpybrowser", Kate::ToolViewManager::Left, (*py_pixmap), i18n("Python Browser")); kpybrowser = new KPyBrowser(my_dock, "kpybrowser"); - connect(kpybrowser, SIGNAL(selected(QString, int)), this, SLOT(slotSelected(QString, int))); + connect(kpybrowser, TQT_SIGNAL(selected(TQString, int)), this, TQT_SLOT(slotSelected(TQString, int))); } PluginViewPyBrowse::~PluginViewPyBrowse () @@ -63,7 +63,7 @@ PluginViewPyBrowse::~PluginViewPyBrowse () } -void PluginViewPyBrowse::slotSelected(QString name, int line) +void PluginViewPyBrowse::slotSelected(TQString name, int line) { //TO DO - deal with setting the active view to be the file that has this class //if multiple files are open. @@ -74,7 +74,7 @@ void PluginViewPyBrowse::slotSelected(QString name, int line) Kate::View *view = win->viewManager()->activeView(); Kate::Document *doc = view->getDoc(); - QString docline = doc->textLine(line); + TQString docline = doc->textLine(line); int numlines = doc->numLines(); int done = 0, apiline = -1, forward_line = line,backward_line = line-1; while (!done) @@ -121,7 +121,7 @@ void PluginViewPyBrowse::slotUpdatePyBrowser() Kate::View *view = viewManager->activeView(); if (view == NULL) return; - QString pytext(view->getDoc()->text()); + TQString pytext(view->getDoc()->text()); kpybrowser->parseText(pytext); } @@ -130,7 +130,7 @@ void PluginViewPyBrowse::slotShowPyBrowser() //TO DO implement this later so that you can turn the browser off and on } -KatePluginPyBrowse::KatePluginPyBrowse( QObject* parent, const char* name, const QStringList& ) +KatePluginPyBrowse::KatePluginPyBrowse( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ) { } diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h index 85aedbb..3769661 100644 --- a/kate/kpybrowser/pybrowse_part.h +++ b/kate/kpybrowser/pybrowse_part.h @@ -30,10 +30,10 @@ #include <kdockwidget.h> #include <klibloader.h> #include <klocale.h> -#include <qstring.h> +#include <tqstring.h> #include "kpybrowser.h" -class PluginViewPyBrowse : public QObject, KXMLGUIClient +class PluginViewPyBrowse : public TQObject, KXMLGUIClient { Q_OBJECT @@ -45,12 +45,12 @@ class PluginViewPyBrowse : public QObject, KXMLGUIClient public slots: void slotShowPyBrowser(); - void slotSelected(QString name, int line); + void slotSelected(TQString name, int line); void slotUpdatePyBrowser(); private: Kate::MainWindow *win; - QWidget *my_dock; + TQWidget *my_dock; KPyBrowser *kpybrowser; }; @@ -59,14 +59,14 @@ class KatePluginPyBrowse : public Kate::Plugin, public Kate::PluginViewInterface Q_OBJECT public: - KatePluginPyBrowse( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + KatePluginPyBrowse( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); ~KatePluginPyBrowse(); void addView(Kate::MainWindow *win); void removeView(Kate::MainWindow *win); private: - QPtrList<PluginViewPyBrowse> m_views; + TQPtrList<PluginViewPyBrowse> m_views; }; #endif diff --git a/kate/kpybrowser/pybrowsenode.cpp b/kate/kpybrowser/pybrowsenode.cpp index 866924b..81c59e5 100644 --- a/kate/kpybrowser/pybrowsenode.cpp +++ b/kate/kpybrowser/pybrowsenode.cpp @@ -99,30 +99,30 @@ static const char *py_function_xpm[] = { }; -PyBrowseNode::PyBrowseNode (QListViewItem * parent, const QString &name, - const QString &signature, int nodeType): -QListViewItem (parent, signature) +PyBrowseNode::PyBrowseNode (TQListViewItem * parent, const TQString &name, + const TQString &signature, int nodeType): +TQListViewItem (parent, signature) { init (name, signature, nodeType); } -PyBrowseNode::PyBrowseNode (QListView * parent, const QString &name, - const QString &signature, int nodeType): -QListViewItem (parent, signature) +PyBrowseNode::PyBrowseNode (TQListView * parent, const TQString &name, + const TQString &signature, int nodeType): +TQListViewItem (parent, signature) { init (name, signature, nodeType); } void -PyBrowseNode::init (const QString &a_name, const QString &a_signature, int nodeType) +PyBrowseNode::init (const TQString &a_name, const TQString &a_signature, int nodeType) { node_type = nodeType; if (nodeType == PYCLASS) - setPixmap (0, QPixmap (py_class_xpm)); + setPixmap (0, TQPixmap (py_class_xpm)); if (nodeType == PYMETHOD) - setPixmap (0, QPixmap (py_method_xpm)); + setPixmap (0, TQPixmap (py_method_xpm)); if (nodeType == PYFUNCTION) - setPixmap (0, QPixmap (py_function_xpm)); + setPixmap (0, TQPixmap (py_function_xpm)); name = a_name; signature = a_signature; @@ -130,11 +130,11 @@ PyBrowseNode::init (const QString &a_name, const QString &a_signature, int nodeT PyBrowseNode::~PyBrowseNode () { - setPixmap (0, QPixmap (py_class_xpm)); + setPixmap (0, TQPixmap (py_class_xpm)); } void -PyBrowseNode::setName (const QString &a_name) +PyBrowseNode::setName (const TQString &a_name) { name = a_name; setText (0, name); @@ -147,7 +147,7 @@ PyBrowseNode::getName ()const } void -PyBrowseNode::setSig (const QString &a_signature) +PyBrowseNode::setSig (const TQString &a_signature) { signature = a_signature; @@ -185,7 +185,7 @@ PyBrowseNode::getType ()const } void -PyBrowseNode::setClass (const QString &a_method_class) +PyBrowseNode::setClass (const TQString &a_method_class) { node_class = a_method_class; } diff --git a/kate/kpybrowser/pybrowsenode.h b/kate/kpybrowser/pybrowsenode.h index d5083f9..d87a81d 100644 --- a/kate/kpybrowser/pybrowsenode.h +++ b/kate/kpybrowser/pybrowsenode.h @@ -18,11 +18,11 @@ #ifndef PYBROWSENODE_H #define PYBROWSENODE_H -#include <qlistview.h> -#include <qpixmap.h> +#include <tqlistview.h> +#include <tqpixmap.h> #define PYCLASS 1 -#define PYMETHOD 2 +#define PYQT_METHOD 2 #define PYFUNCTION 3 #define PYVARIABLE 4 #define PYOTHER 5 @@ -33,33 +33,33 @@ -class PyBrowseNode : public QListViewItem { +class PyBrowseNode : public TQListViewItem { public: - QPixmap *pyClassPixmap; + TQPixmap *pyClassPixmap; - PyBrowseNode(QListView *parent, const QString &a_name, const QString &a_signature, int type); - PyBrowseNode(QListViewItem *parent, const QString &a_name, const QString &a_signature, int type); + 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(); - void init(const QString &a_name, const QString &a_signature, int nodeType); + void init(const TQString &a_name, const TQString &a_signature, int nodeType); - void setName(const QString &name); - QString getName()const ; + void setName(const TQString &name); + TQString getName()const ; void setLine(int line); int getLine()const; - void setSig(const QString &signature); - QString getSig()const; + void setSig(const TQString &signature); + TQString getSig()const; void setType(int type); int getType()const; - void setClass(const QString &a_method_class); - QString getClass()const; + void setClass(const TQString &a_method_class); + TQString getClass()const; - QString getQualifiedName()const; + TQString getQualifiedName()const; private: - QString name; - QString signature; - QString node_class; + TQString name; + TQString signature; + TQString node_class; int line; int node_type; diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 64282dd..e78bda9 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -30,15 +30,15 @@ #include <cassert> #include <config.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qinputdialog.h> -#include <qregexp.h> -#include <qstring.h> -#include <qtextstream.h> -#include <qpalette.h> -#include <qvbox.h> -#include <qlabel.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqinputdialog.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqtextstream.h> +#include <tqpalette.h> +#include <tqvbox.h> +#include <tqlabel.h> #include <kaction.h> #include <kcursor.h> @@ -62,7 +62,7 @@ K_EXPORT_COMPONENT_FACTORY( katemakeplugin, KGenericFactory<PluginKateMake>( "ka // #define FUNCTIONSETUP kdDebug() << k_funcinfo << endl; #define FUNCTIONSETUP -PluginKateMake::PluginKateMake( QObject* parent, const char* name, const QStringList& ) +PluginKateMake::PluginKateMake( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ) { FUNCTIONSETUP; @@ -80,9 +80,9 @@ void PluginKateMake::addView(Kate::MainWindow *win) FUNCTIONSETUP; Kate::ToolViewManager *viewmanager = win->toolViewManager(); - QWidget *w = viewmanager->createToolView("kate_plugin_make", + TQWidget *w = viewmanager->createToolView("kate_plugin_make", Kate::ToolViewManager::Bottom, - SmallIcon(QString::fromLatin1("misc")), + SmallIcon(TQString::fromLatin1("misc")), i18n("Make Output")); PluginKateMakeView *view = new PluginKateMakeView (w,win, "katemakeview"); @@ -123,23 +123,23 @@ void PluginKateMake::removeView(Kate::MainWindow *win) class ErrorMessage : public QListViewItem { public: - ErrorMessage(QListView *parent, - const QString &filename, + ErrorMessage(TQListView *parent, + const TQString &filename, int lineno, - const QString &message) : - QListViewItem(parent, + const TQString &message) : + TQListViewItem(parent, filename, - (lineno > 0 ? QString::number(lineno) : QString::null), + (lineno > 0 ? TQString::number(lineno) : TQString::null), message) { - m_isError = !message.contains(QString::fromLatin1("warning")); + m_isError = !message.contains(TQString::fromLatin1("warning")); m_lineno = lineno; m_serial = s_serial++; } - ErrorMessage(QListView *parent,const QString &message) : - QListViewItem(parent,QString::null,QString::null,QString::null) + ErrorMessage(TQListView *parent,const TQString &message) : + TQListViewItem(parent,TQString::null,TQString::null,TQString::null) { - QString m(message); + TQString m(message); m.remove('\n'); m.stripWhiteSpace(); setText(COL_MSG,m); @@ -149,8 +149,8 @@ public: m_serial = s_serial++; setSelectable(false); } - ErrorMessage(QListView *parent, bool start) : - QListViewItem(parent,QString::null) + ErrorMessage(TQListView *parent, bool start) : + TQListViewItem(parent,TQString::null) { m_isError=false; m_lineno=-1; @@ -162,19 +162,19 @@ public: virtual ~ErrorMessage() ; bool isError() const { return m_isError; } - QString message() const { return text(COL_MSG); } - QString fancyMessage() const; - QString caption() const; - QString filename() const { return text(COL_FILE); } + TQString message() const { return text(COL_MSG); } + TQString fancyMessage() const; + TQString caption() const; + TQString filename() const { return text(COL_FILE); } int line() const { return m_lineno; } int serial() const { return m_serial; } - virtual int compare(QListViewItem *,int,bool) const; + virtual int compare(TQListViewItem *,int,bool) const; static void resetSerial() { s_serial=10; } protected: - virtual void paintCell(QPainter *,const QColorGroup &, + virtual void paintCell(TQPainter *,const TQColorGroup &, int,int,int); bool m_isError; @@ -190,40 +190,40 @@ protected: { } -QString ErrorMessage::caption() const +TQString ErrorMessage::caption() const { - return QString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line()); + return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line()); } -QString ErrorMessage::fancyMessage() const +TQString ErrorMessage::fancyMessage() const { - QString msg = QString::fromLatin1("<qt>"); + TQString msg = TQString::fromLatin1("<qt>"); if (isError()) { - msg.append(QString::fromLatin1("<font color=\"red\">")); + msg.append(TQString::fromLatin1("<font color=\"red\">")); } msg.append(message()); if (isError()) { - msg.append(QString::fromLatin1("</font>")); + msg.append(TQString::fromLatin1("</font>")); } - msg.append(QString::fromLatin1("<qt>")); + msg.append(TQString::fromLatin1("<qt>")); return msg; } -/* virtual */ void ErrorMessage::paintCell(QPainter *p, - const QColorGroup &cg, +/* virtual */ void ErrorMessage::paintCell(TQPainter *p, + const TQColorGroup &cg, int column, int width, int align) { if ((column!=COL_LINE) || (serial()<0)) { - QListViewItem::paintCell(p,cg,column,width,align); + TQListViewItem::paintCell(p,cg,column,width,align); } else { - QColorGroup myCG(cg); + TQColorGroup myCG(cg); #if 0 red, //darkRed, green, //darkGreen, @@ -233,21 +233,21 @@ QString ErrorMessage::fancyMessage() const yellow, //darkYellow, gray); #endif - myCG.setColor(QColorGroup::Light,red); + myCG.setColor(TQColorGroup::Light,red); if (!isSelected()) { - myCG.setColor(QColorGroup::Base,gray); - myCG.setColor(QColorGroup::Text, + myCG.setColor(TQColorGroup::Base,gray); + myCG.setColor(TQColorGroup::Text, m_isError ? red : yellow); } - QListViewItem::paintCell(p,myCG,column,width,align); + TQListViewItem::paintCell(p,myCG,column,width,align); } } -/* virtual */ int ErrorMessage::compare(QListViewItem *i, +/* virtual */ int ErrorMessage::compare(TQListViewItem *i, int /* column */ , bool /* ascending */) const { kdDebug() << "In compare " << serial() << endl; @@ -261,17 +261,17 @@ QString ErrorMessage::fancyMessage() const class LinePopup : public KPassivePopup { protected: - LinePopup( QWidget *parent=0, const char *name=0, WFlags f=0 ); + LinePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~LinePopup(); public: - static LinePopup *message(QWidget *, - const QPoint &p,ErrorMessage *e); + static LinePopup *message(TQWidget *, + const TQPoint &p,ErrorMessage *e); protected: virtual void positionSelf(); - QPoint fLoc; + TQPoint fLoc; // There should be only one static LinePopup *one; @@ -279,7 +279,7 @@ protected: /* static */ LinePopup *LinePopup::one = 0L; -LinePopup::LinePopup(QWidget *p,const char *n,WFlags f) : +LinePopup::LinePopup(TQWidget *p,const char *n,WFlags f) : KPassivePopup(p,n,f), fLoc(-1,-1) { @@ -292,8 +292,8 @@ LinePopup::~LinePopup() one=0L; } -/* static */ LinePopup *LinePopup::message(QWidget *parent, - const QPoint &p, +/* static */ LinePopup *LinePopup::message(TQWidget *parent, + const TQPoint &p, ErrorMessage *e) { if (one) delete one; @@ -301,7 +301,7 @@ LinePopup::~LinePopup() pop->setAutoDelete( true ); - pop->setView( e->caption(), e->fancyMessage(), QPixmap() ); + pop->setView( e->caption(), e->fancyMessage(), TQPixmap() ); // pop->hideDelay = timeout; pop->fLoc=p; pop->show(); @@ -317,14 +317,14 @@ LinePopup::~LinePopup() // Move above or below the intended line if (fLoc.y()>320) fLoc.setY(fLoc.y()-80); else fLoc.setY(fLoc.y()+80); - moveNear(QRect(fLoc.x(),fLoc.y(),40,30)); + moveNear(TQRect(fLoc.x(),fLoc.y(),40,30)); } } -PluginKateMakeView::PluginKateMakeView(QWidget *parent, +PluginKateMakeView::PluginKateMakeView(TQWidget *parent, Kate::MainWindow *mainwin, const char* name) : - QListView(parent,name), + TQListView(parent,name), KXMLGUIClient(), win(mainwin), filenameDetector(0L), @@ -334,26 +334,26 @@ PluginKateMakeView::PluginKateMakeView(QWidget *parent, m_proc=0; (void) new KAction ( i18n("Next Error"), KShortcut(ALT+CTRL+Key_Right), - this, SLOT( slotNext() ), + this, TQT_SLOT( slotNext() ), actionCollection(), "make_right" ); (void) new KAction ( i18n("Previous Error"), KShortcut(ALT+CTRL+Key_Left), - this, SLOT( slotPrev() ), + this, TQT_SLOT( slotPrev() ), actionCollection(), "make_left" ); (void) new KAction ( i18n("Make"), KShortcut(ALT+Key_R), - this, SLOT( slotValidate() ), + this, TQT_SLOT( slotValidate() ), actionCollection(), "make_check" ); (void) new KAction ( i18n("Configure..."), KShortcut(), - this, SLOT( slotConfigure() ), + this, TQT_SLOT( slotConfigure() ), actionCollection(), "make_settings" ); setInstance(new KInstance("kate")); - setXMLFile(QString::fromLatin1("plugins/katemake/ui.rc")); + setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc")); - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQWidget::NoFocus); setSorting(COL_LINE); addColumn(i18n("File"), -1); @@ -361,25 +361,25 @@ PluginKateMakeView::PluginKateMakeView(QWidget *parent, setColumnAlignment(COL_LINE, AlignRight); addColumn(i18n("Message"), -1); setAllColumnsShowFocus(true); - setResizeMode(QListView::LastColumn); - connect(this, SIGNAL(clicked(QListViewItem *)), SLOT(slotClicked(QListViewItem *))); + setResizeMode(TQListView::LastColumn); + connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); m_proc = new KProcess(); - connect(m_proc, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcExited(KProcess*))); - connect(m_proc, SIGNAL(receivedStderr(KProcess*,char*,int)), - this, SLOT(slotReceivedProcStderr(KProcess*, char*, int))); + 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))); KConfig c("katemakepluginrc"); c.setGroup("Prefixes"); - source_prefix = c.readEntry("Source",QString::null); - build_prefix = c.readEntry("Build",QString::null); + source_prefix = c.readEntry("Source",TQString::null); + build_prefix = c.readEntry("Build",TQString::null); // if (source_prefix.isEmpty()) { - filenameDetector = new QRegExp( - QString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + filenameDetector = new TQRegExp( + TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } // else { @@ -398,7 +398,7 @@ PluginKateMakeView::~PluginKateMakeView() } -void PluginKateMakeView::processLine(const QString &l) +void PluginKateMakeView::processLine(const TQString &l) { kdDebug() << "Got line " << l ; @@ -419,10 +419,10 @@ void PluginKateMakeView::processLine(const QString &l) int ofs1 = l.find(':'); int ofs2 = l.find(':',ofs1+1); // - QString m = l.mid(ofs2+1); + TQString m = l.mid(ofs2+1); m.remove('\n'); m.stripWhiteSpace(); - QString filename = l.left(ofs1); + TQString filename = l.left(ofs1); int line = l.mid(ofs1+1,ofs2-ofs1-1).toInt(); ErrorMessage *e = new ErrorMessage(this, filename,line,m); @@ -431,7 +431,7 @@ void PluginKateMakeView::processLine(const QString &l) // Should cache files being found and check for // existence. kdDebug() << ": Looking at " << document_dir+filename << endl; - if (!QFile::exists(document_dir+filename)) + if (!TQFile::exists(document_dir+filename)) { e->setSelectable(false); } @@ -447,7 +447,7 @@ void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int le { FUNCTIONSETUP; - QString l = QString::fromLocal8Bit( QCString(result, len+1) ); + TQString l = TQString::fromLocal8Bit( TQCString(result, len+1) ); output_line += l; @@ -480,13 +480,13 @@ void PluginKateMakeView::slotProcExited(KProcess *p) #endif kdDebug() << "slotProcExited()" << endl; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); sort(); if ( found_error || !p->normalExit() || p->exitStatus() ) { - QListViewItem *i = firstChild(); + TQListViewItem *i = firstChild(); while (i && !i->isSelectable()) { i = i->nextSibling(); @@ -504,8 +504,8 @@ void PluginKateMakeView::slotProcExited(KProcess *p) this); clear(); #if 0 - QListViewItem *i = new QListViewItem(this,QString::null, - QString::null, + TQListViewItem *i = new TQListViewItem(this,TQString::null, + TQString::null, i18n("No Errors.")); i->setSelectable(false); #else @@ -515,7 +515,7 @@ void PluginKateMakeView::slotProcExited(KProcess *p) } -void PluginKateMakeView::slotClicked(QListViewItem *item) +void PluginKateMakeView::slotClicked(TQListViewItem *item) { FUNCTIONSETUP; if (!item) @@ -530,7 +530,7 @@ void PluginKateMakeView::slotClicked(QListViewItem *item) ensureItemVisible(e); - QString filename = document_dir + e->filename(); + TQString filename = document_dir + e->filename(); int lineno = e->line(); if (!build_prefix.isEmpty()) @@ -542,7 +542,7 @@ void PluginKateMakeView::slotClicked(QListViewItem *item) kdDebug() << ": Looking at " << filename << ":" << lineno << endl; - if (QFile::exists(filename)) + if (TQFile::exists(filename)) { KURL u; u.setPath(filename); @@ -552,12 +552,12 @@ void PluginKateMakeView::slotClicked(QListViewItem *item) kv->setCursorPositionReal(lineno-1,1); - QPoint globalPos = kv->mapToGlobal(kv->cursorCoordinates()); + TQPoint globalPos = kv->mapToGlobal(kv->cursorCoordinates()); kdDebug() << ": Want to map at " << globalPos.x() << "," << globalPos.y() << endl; #if 0 KPassivePopup::message( - QString::fromLatin1("%1:%2").arg(filename).arg(lineno), + TQString::fromLatin1("%1:%2").arg(filename).arg(lineno), msg, this); #else @@ -571,10 +571,10 @@ void PluginKateMakeView::slotNext() { FUNCTIONSETUP; - QListViewItem *i = selectedItem(); + TQListViewItem *i = selectedItem(); if (!i) return; - QListViewItem *n = i; + TQListViewItem *n = i; while ((n=n->nextSibling())) { if (n->isSelectable()) @@ -592,10 +592,10 @@ void PluginKateMakeView::slotPrev() { FUNCTIONSETUP; - QListViewItem *i = selectedItem(); + TQListViewItem *i = selectedItem(); if (!i) return; - QListViewItem *n = i; + TQListViewItem *n = i; while ((n=n->itemAbove())) { if (n->isSelectable()) @@ -632,7 +632,7 @@ bool PluginKateMakeView::slotValidate() doc->save(); KURL url(doc->url()); - output_line = QString::null; + output_line = TQString::null; ErrorMessage::resetSerial(); found_error=false; @@ -648,8 +648,8 @@ bool PluginKateMakeView::slotValidate() return false; } - document_dir = QFileInfo(url.path()).dirPath(true) + - QString::fromLatin1("/"); + document_dir = TQFileInfo(url.path()).dirPath(true) + + TQString::fromLatin1("/"); if (document_dir.startsWith(source_prefix)) { @@ -657,7 +657,7 @@ bool PluginKateMakeView::slotValidate() } m_proc->setWorkingDirectory(document_dir); - QString make = KStandardDirs::findExe( "gmake" ); + TQString make = KStandardDirs::findExe( "gmake" ); if (make.isEmpty()) make = KStandardDirs::findExe("make"); *m_proc << make; @@ -666,7 +666,7 @@ bool PluginKateMakeView::slotValidate() "make" : make)); return false; } - QApplication::setOverrideCursor(KCursor::waitCursor()); + TQApplication::setOverrideCursor(KCursor::waitCursor()); running_indicator = new ErrorMessage(this,true); return true; } @@ -674,27 +674,27 @@ bool PluginKateMakeView::slotValidate() class Settings : public KDialogBase { public: - Settings( QWidget *parent, - const QString &src, const QString &bld); + Settings( TQWidget *parent, + const TQString &src, const TQString &bld); KLineEdit *edit_src,*edit_bld; } ; -Settings::Settings(QWidget *p, - const QString &s, const QString &b) : +Settings::Settings(TQWidget *p, + const TQString &s, const TQString &b) : KDialogBase(p,"settings",true, i18n("Directories"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { - QVBox *page = makeVBoxMainWidget(); - QHBox *h = new QHBox(page); - (void) new QLabel(i18n("Source prefix:"),h); + TQVBox *page = makeVBoxMainWidget(); + TQHBox *h = new TQHBox(page); + (void) new TQLabel(i18n("Source prefix:"),h); edit_src = new KLineEdit(h); edit_src->setText(s); - h = new QHBox(page); - (void) new QLabel(i18n("Build prefix:"),h); + h = new TQHBox(page); + (void) new TQLabel(i18n("Build prefix:"),h); edit_bld = new KLineEdit(h); edit_bld->setText(b); } @@ -716,8 +716,8 @@ void PluginKateMakeView::slotConfigure() { if (!filenameDetector) { - filenameDetector = new QRegExp( - QString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + filenameDetector = new TQRegExp( + TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } } //else diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h index 5042f1d..443bb46 100644 --- a/kate/make/plugin_katemake.h +++ b/kate/make/plugin_katemake.h @@ -32,8 +32,8 @@ class QRegExp; -#include <qlistview.h> -#include <qstring.h> +#include <tqlistview.h> +#include <tqstring.h> #include <kate/plugin.h> #include <kate/application.h> @@ -48,12 +48,12 @@ class QRegExp; #include <kprocess.h> #include <ktempfile.h> -class PluginKateMakeView : public QListView, public KXMLGUIClient +class PluginKateMakeView : public TQListView, public KXMLGUIClient { Q_OBJECT public: - PluginKateMakeView(QWidget *parent, + PluginKateMakeView(TQWidget *parent, Kate::MainWindow *mainwin, const char* name); virtual ~PluginKateMakeView(); @@ -61,7 +61,7 @@ class PluginKateMakeView : public QListView, public KXMLGUIClient Kate::MainWindow *win; public slots: - void slotClicked(QListViewItem *item); + void slotClicked(TQListViewItem *item); void slotNext(); void slotPrev(); @@ -72,19 +72,19 @@ class PluginKateMakeView : public QListView, public KXMLGUIClient void slotConfigure(); protected: - void processLine(const QString &); + void processLine(const TQString &); private: KProcess *m_proc; - QString output_line; - QString doc_name; - QString document_dir; - QString source_prefix,build_prefix; + TQString output_line; + TQString doc_name; + TQString document_dir; + TQString source_prefix,build_prefix; - QRegExp *filenameDetector; + TQRegExp *filenameDetector; - QListViewItem *running_indicator; + TQListViewItem *running_indicator; bool found_error; }; @@ -94,14 +94,14 @@ class PluginKateMake : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - PluginKateMake( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateMake( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateMake(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); private: - QPtrList<PluginKateMakeView> m_views; + TQPtrList<PluginKateMakeView> m_views; }; #endif diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index b288856..9184f6a 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <qregexp.h> +#include <tqregexp.h> #include <kgenericfactory.h> #include <klocale.h> #include <kaction.h> @@ -41,7 +41,7 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( katemodelineplugin, KGenericFactory<ModelinePlugin>( "katemodeline" ) ) -ModelinePlugin::ModelinePlugin( QObject* parent, const char* name, const QStringList &args ) +ModelinePlugin::ModelinePlugin( TQObject* parent, const char* name, const TQStringList &args ) : Kate::Plugin ( (Kate::Application *) parent, name ) { } @@ -56,7 +56,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); new KAction( i18n("Apply Modeline"), 0, - this, SLOT(applyModeline()), + this, TQT_SLOT(applyModeline()), view->actionCollection(), "edit_apply_modeline" ); view->setInstance (new KInstance("kate")); @@ -87,34 +87,34 @@ void ModelinePlugin::applyModeline() Kate::Document* doc = application()->documentManager()->activeDocument(); Kate::View* view = application()->activeMainWindow()->viewManager()->activeView(); if( !doc || !view ) return; - static QRegExp vim1( "\\b(?:vi:|vim:|ex:)[ \\t](.*)" ); - static QRegExp vim2( "\\b(?:vi:|vim:|ex:)[ \\t]set (.*):" ); + static TQRegExp vim1( "\\b(?:vi:|vim:|ex:)[ \\t](.*)" ); + static TQRegExp vim2( "\\b(?:vi:|vim:|ex:)[ \\t]set (.*):" ); uint foundAtLine; uint foundAtCol; uint matchLen; - QString options; + TQString options; if( doc->searchText( 0, 0, vim2, &foundAtLine, &foundAtCol, &matchLen ) ) { options = vim2.cap(1); } else if( doc->searchText( 0, 0, vim1, &foundAtLine, &foundAtCol, &matchLen ) ) { options = vim1.cap(1); - options.replace( QRegExp( ":" ), " " ); + options.replace( TQRegExp( ":" ), " " ); } uint configFlags = doc->configFlags(); kdDebug() << "Found modeline: " << options << endl; - if( options.find( QRegExp( "\\bnoet\\b" ) ) >= 0 ) { + if( options.find( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) { kdDebug() << "Clearing replace tabs" << endl; configFlags &= ~Kate::Document::cfReplaceTabs; - } else if( options.find( QRegExp( "\\bet\\b" ) ) >= 0 ) { + } else if( options.find( TQRegExp( "\\bet\\b" ) ) >= 0 ) { kdDebug() << "Setting replace tabs" << endl; configFlags |= Kate::Document::cfReplaceTabs; } - QRegExp ts( "ts=(\\d+)" ); + TQRegExp ts( "ts=(\\d+)" ); if( options.find( ts ) >= 0 ) { uint tabWidth = ts.cap(1).toUInt(); kdDebug() << "Setting tab width " << tabWidth << endl; view->setTabWidth( tabWidth ); } - QRegExp tw( "tw=(\\d+)" ); + TQRegExp tw( "tw=(\\d+)" ); if( options.find( tw ) >= 0 ) { uint textWidth = tw.cap(1).toUInt(); kdDebug() << "Setting text width " << textWidth << endl; diff --git a/kate/modeline/ModelinePlugin.h b/kate/modeline/ModelinePlugin.h index 3f4b818..2f8e2d6 100644 --- a/kate/modeline/ModelinePlugin.h +++ b/kate/modeline/ModelinePlugin.h @@ -25,7 +25,7 @@ class ModelinePlugin : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - ModelinePlugin( QObject* parent = 0, const char* name = 0, const QStringList &args = QStringList() ); + ModelinePlugin( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~ModelinePlugin(); void addView (Kate::MainWindow *win); @@ -34,7 +34,7 @@ private slots: void applyModeline(); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; }; #endif // _ModelinePlugin_H_ diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index f404022..61cd592 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -18,7 +18,7 @@ #include "plugin_kateopenheader.h" #include "plugin_kateopenheader.moc" -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <kgenericfactory.h> #include <kaction.h> #include <klocale.h> @@ -36,7 +36,7 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( kateopenheaderplugin, KGenericFactory<PluginKateOpenHeader>( "kateopenheader" ) ) -PluginKateOpenHeader::PluginKateOpenHeader( QObject* parent, const char* name, const QStringList& ) +PluginKateOpenHeader::PluginKateOpenHeader( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ) { } @@ -51,7 +51,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction( i18n("Open .h/.cpp/.c"), Key_F12, - this, SLOT( slotOpenHeader() ), + this, TQT_SLOT( slotOpenHeader() ), view->actionCollection(), "file_openheader" ); view->setInstance (new KInstance("kate")); @@ -85,11 +85,11 @@ void PluginKateOpenHeader::slotOpenHeader () KURL url=kv->document()->url(); if ((!url.isValid()) || (url.isEmpty())) return; - QFileInfo info( url.path() ); - QString extension = info.extension().lower(); + TQFileInfo info( url.path() ); + TQString extension = info.extension().lower(); - QStringList headers( QStringList() << "h" << "H" << "hh" << "hpp" ); - QStringList sources( QStringList() << "c" << "cpp" << "cc" << "cp" << "cxx" ); + TQStringList headers( TQStringList() << "h" << "H" << "hh" << "hpp" ); + TQStringList sources( TQStringList() << "c" << "cpp" << "cc" << "cp" << "cxx" ); if( sources.find( extension ) != sources.end() ) { tryOpen( url, headers ); @@ -98,15 +98,15 @@ void PluginKateOpenHeader::slotOpenHeader () } } -void PluginKateOpenHeader::tryOpen( const KURL& url, const QStringList& extensions ) +void PluginKateOpenHeader::tryOpen( const KURL& url, const TQStringList& extensions ) { if (!application()->activeMainWindow()) return; kdDebug() << "Trying to open " << url.prettyURL() << " with extensions " << extensions.join(" ") << endl; - QString basename = QFileInfo( url.path() ).baseName(); + TQString basename = TQFileInfo( url.path() ).baseName(); KURL newURL( url ); - for( QStringList::ConstIterator it = extensions.begin(); it != extensions.end(); ++it ) { + for( TQStringList::ConstIterator it = extensions.begin(); it != extensions.end(); ++it ) { newURL.setFileName( basename + "." + *it ); if( KIO::NetAccess::exists( newURL ) ) application()->activeMainWindow()->viewManager()->openURL( newURL ); diff --git a/kate/openheader/plugin_kateopenheader.h b/kate/openheader/plugin_kateopenheader.h index 61b6058..b198a9f 100644 --- a/kate/openheader/plugin_kateopenheader.h +++ b/kate/openheader/plugin_kateopenheader.h @@ -18,7 +18,7 @@ #ifndef _PLUGIN_KANT_HEADER_H #define _PLUGIN_KANT_HEADER_H -#include <qstring.h> +#include <tqstring.h> #include <kate/plugin.h> #include <kate/application.h> @@ -33,7 +33,7 @@ class PluginKateOpenHeader : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - PluginKateOpenHeader( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateOpenHeader( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateOpenHeader(); void addView (Kate::MainWindow *win); @@ -41,10 +41,10 @@ class PluginKateOpenHeader : public Kate::Plugin, Kate::PluginViewInterface public slots: void slotOpenHeader (); - void tryOpen( const KURL& url, const QStringList& extensions ); + void tryOpen( const KURL& url, const TQStringList& extensions ); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; }; #endif // _PLUGIN_KANT_OPENHEADER_H diff --git a/kate/snippets/CWidgetSnippetsBase.ui.h b/kate/snippets/CWidgetSnippetsBase.ui.h index 816d7d8..539442a 100644 --- a/kate/snippets/CWidgetSnippetsBase.ui.h +++ b/kate/snippets/CWidgetSnippetsBase.ui.h @@ -15,9 +15,9 @@ void CWidgetSnippetsBase::init() } -QListViewItem* CWidgetSnippetsBase::insertItem( const QString& name, bool bRename ) +TQListViewItem* CWidgetSnippetsBase::insertItem( const TQString& name, bool bRename ) { - QListViewItem *item = new QListViewItem(lvSnippets, name); + TQListViewItem *item = new TQListViewItem(lvSnippets, name); item->setRenameEnabled(0,true); lvSnippets->setSelected( item, true ); if ( bRename ) { diff --git a/kate/snippets/csnippet.cpp b/kate/snippets/csnippet.cpp index fc7d7e7..2aebb5d 100644 --- a/kate/snippets/csnippet.cpp +++ b/kate/snippets/csnippet.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "csnippet.h" -CSnippet::CSnippet(QString sKey, QString sValue, QListViewItem *lvi, QObject *parent, const char *name) - : QObject(parent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} +CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent, const char *name) + : TQObject(parent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} CSnippet::~CSnippet() {} diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h index a139f03..3c75db4 100644 --- a/kate/snippets/csnippet.h +++ b/kate/snippets/csnippet.h @@ -10,30 +10,30 @@ #ifndef CSNIPPET_H #define CSNIPPET_H -#include <qobject.h> -#include <qlistview.h> +#include <tqobject.h> +#include <tqlistview.h> #include <kaction.h> -#include <qsignalmapper.h> +#include <tqsignalmapper.h> /** @author Stephan Möres */ -class CSnippet : public QObject { +class CSnippet : public TQObject { Q_OBJECT public: - CSnippet(QString sKey, QString sValue, QListViewItem *lvi, QObject *parent = 0, const char *name = 0); + CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent = 0, const char *name = 0); ~CSnippet(); - QString getKey() { return _sKey; } - QString getValue() { return _sValue; } - QListViewItem* getListViewItem() const { return _lvi; } - void setKey(const QString& sKey) { _sKey = sKey; } - void setValue(const QString& sValue) { _sValue = sValue; } + TQString getKey() { return _sKey; } + TQString getValue() { return _sValue; } + TQListViewItem* getListViewItem() const { return _lvi; } + void setKey(const TQString& sKey) { _sKey = sKey; } + void setValue(const TQString& sValue) { _sValue = sValue; } protected: - QString _sKey; - QString _sValue; - QListViewItem *_lvi; + TQString _sKey; + TQString _sValue; + TQListViewItem *_lvi; }; #endif diff --git a/kate/snippets/cwidgetsnippets.cpp b/kate/snippets/cwidgetsnippets.cpp index cf44319..e58c15f 100644 --- a/kate/snippets/cwidgetsnippets.cpp +++ b/kate/snippets/cwidgetsnippets.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "cwidgetsnippets.h" -CWidgetSnippets::CWidgetSnippets( QWidget* parent, const char* name, WFlags fl) +CWidgetSnippets::CWidgetSnippets( TQWidget* parent, const char* name, WFlags fl) : CWidgetSnippetsBase(parent, name, fl) { } diff --git a/kate/snippets/cwidgetsnippets.h b/kate/snippets/cwidgetsnippets.h index 6d246c3..831f335 100644 --- a/kate/snippets/cwidgetsnippets.h +++ b/kate/snippets/cwidgetsnippets.h @@ -17,7 +17,7 @@ */ class CWidgetSnippets : public CWidgetSnippetsBase { public: - CWidgetSnippets( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CWidgetSnippets( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~CWidgetSnippets(); diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 07cba2b..fd594e1 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -23,7 +23,7 @@ K_EXPORT_COMPONENT_FACTORY(katesnippetsplugin, KGenericFactory<KatePluginSnippet * @param w * @return */ -KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, QWidget *dock) : CWidgetSnippets(dock,"snippetswidget") +KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *dock) : CWidgetSnippets(dock,"snippetswidget") , dock (dock) { setInstance (new KInstance("kate")); @@ -35,29 +35,29 @@ KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, QWidget *doc //<make connections> connect ( - lvSnippets, SIGNAL( selectionChanged(QListViewItem *) ), - this, SLOT( slot_lvSnippetsSelectionChanged(QListViewItem *) ) + lvSnippets, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), + this, TQT_SLOT( slot_lvSnippetsSelectionChanged(TQListViewItem *) ) ); connect ( - lvSnippets, SIGNAL( doubleClicked (QListViewItem *) ), - this, SLOT( slot_lvSnippetsClicked(QListViewItem *) ) + lvSnippets, TQT_SIGNAL( doubleClicked (TQListViewItem *) ), + this, TQT_SLOT( slot_lvSnippetsClicked(TQListViewItem *) ) ); connect ( - lvSnippets, SIGNAL( itemRenamed(QListViewItem *, int, const QString &) ), - this, SLOT( slot_lvSnippetsItemRenamed(QListViewItem *, int, const QString &) ) + lvSnippets, TQT_SIGNAL( itemRenamed(TQListViewItem *, int, const TQString &) ), + this, TQT_SLOT( slot_lvSnippetsItemRenamed(TQListViewItem *, int, const TQString &) ) ); connect ( - btnNew, SIGNAL( clicked () ), - this, SLOT( slot_btnNewClicked() ) + btnNew, TQT_SIGNAL( clicked () ), + this, TQT_SLOT( slot_btnNewClicked() ) ); connect ( - btnSave, SIGNAL( clicked () ), - this, SLOT( slot_btnSaveClicked() ) + btnSave, TQT_SIGNAL( clicked () ), + this, TQT_SLOT( slot_btnSaveClicked() ) ); connect ( - btnDelete, SIGNAL( clicked () ), - this, SLOT( slot_btnDeleteClicked() ) + btnDelete, TQT_SIGNAL( clicked () ), + this, TQT_SLOT( slot_btnDeleteClicked() ) ); //</make connections> @@ -99,7 +99,7 @@ KatePluginSnippetsView::~ KatePluginSnippetsView() { * @param name * @return */ -KatePluginSnippets::KatePluginSnippets( QObject* parent, const char* name, const QStringList& ) +KatePluginSnippets::KatePluginSnippets( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application*)parent, name ) {} /** @@ -114,7 +114,7 @@ KatePluginSnippets::~KatePluginSnippets() {} */ void KatePluginSnippets::addView(Kate::MainWindow *win) { - QWidget *dock = win->toolViewManager()->createToolView( + TQWidget *dock = win->toolViewManager()->createToolView( "kate_plugin_snippets", Kate::ToolViewManager::Left, SmallIcon("contents"), @@ -142,7 +142,7 @@ void KatePluginSnippets::removeView(Kate::MainWindow *win) { * * @param item */ -void KatePluginSnippetsView::slot_lvSnippetsSelectionChanged(QListViewItem * item) { +void KatePluginSnippetsView::slot_lvSnippetsSelectionChanged(TQListViewItem * item) { CSnippet *snippet; if ( (snippet = findSnippetByListViewItem(item))!= NULL ) { teSnippetText->setText(snippet->getValue()); @@ -155,14 +155,14 @@ void KatePluginSnippetsView::slot_lvSnippetsSelectionChanged(QListViewItem * it * Special meaning of <mark/> and <cursor/> ... * @param item */ -void KatePluginSnippetsView::slot_lvSnippetsClicked (QListViewItem * item) { +void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) { Kate::View *kv = win->viewManager()->activeView(); CSnippet *snippet; if (kv) { if ( (snippet = findSnippetByListViewItem(item))!= NULL ) { - QString sText = snippet->getValue(); - QString sSelection = ""; + TQString sText = snippet->getValue(); + TQString sSelection = ""; if ( kv->getDoc()->hasSelection() ) { sSelection = kv->getDoc()->selection(); @@ -170,9 +170,9 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (QListViewItem * item) { kv->keyDelete(); } - sText.replace( QRegExp("<mark/>"), sSelection ); - sText.replace( QRegExp("<date/>"), QDate::currentDate().toString(Qt::LocalDate) ); - sText.replace( QRegExp("<time/>"), QTime::currentTime().toString(Qt::LocalDate) ); + sText.replace( TQRegExp("<mark/>"), sSelection ); + sText.replace( TQRegExp("<date/>"), TQDate::currentDate().toString(Qt::LocalDate) ); + sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); kv->insertText ( sText ); } kv->setFocus(); @@ -186,7 +186,7 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (QListViewItem * item) { * @param * @param text */ -void KatePluginSnippetsView::slot_lvSnippetsItemRenamed(QListViewItem *lvi,int /*col*/, const QString& text) { +void KatePluginSnippetsView::slot_lvSnippetsItemRenamed(TQListViewItem *lvi,int /*col*/, const TQString& text) { CSnippet *snippet; if ( (snippet = findSnippetByListViewItem(lvi)) != NULL ) { snippet->setKey( text ); @@ -199,10 +199,10 @@ void KatePluginSnippetsView::slot_lvSnippetsItemRenamed(QListViewItem *lvi,int / * */ void KatePluginSnippetsView::slot_btnNewClicked() { - QString sKey = "New Snippet"; - QString sValue = ""; + TQString sKey = "New Snippet"; + TQString sValue = ""; - QListViewItem *lvi = insertItem(sKey, true); + TQListViewItem *lvi = insertItem(sKey, true); lSnippets.append( new CSnippet(sKey, sValue, lvi) ); } @@ -212,7 +212,7 @@ void KatePluginSnippetsView::slot_btnNewClicked() { */ void KatePluginSnippetsView::slot_btnSaveClicked() { CSnippet *snippet; - QListViewItem *lvi = lvSnippets->selectedItem(); + TQListViewItem *lvi = lvSnippets->selectedItem(); if ( (snippet = findSnippetByListViewItem(lvi)) != NULL ) { snippet->setValue(teSnippetText->text() ); writeConfig(); @@ -225,7 +225,7 @@ void KatePluginSnippetsView::slot_btnSaveClicked() { */ void KatePluginSnippetsView::slot_btnDeleteClicked() { CSnippet *snippet; - QListViewItem *lvi = lvSnippets->selectedItem(); + TQListViewItem *lvi = lvSnippets->selectedItem(); if ( (snippet = findSnippetByListViewItem(lvi)) != NULL ) { @@ -239,15 +239,15 @@ void KatePluginSnippetsView::slot_btnDeleteClicked() { * */ void KatePluginSnippetsView::readConfig() { - QString sKey, sValue; - QListViewItem *lvi; + TQString sKey, sValue; + TQListViewItem *lvi; config->setGroup("Snippets"); int iNrOfSnippets = config->readEntry("NumberOfSnippets", "0").toInt() ; for (int i=0; i < iNrOfSnippets; i++) { - QStringList slFields; - slFields = config->readListEntry ( QString::number(i) ); + TQStringList slFields; + slFields = config->readListEntry ( TQString::number(i) ); sKey = slFields[0]; sValue = slFields[1]; @@ -288,11 +288,11 @@ void KatePluginSnippetsView::writeConfig() { CSnippet *snippet; for ( snippet = lSnippets.first(); snippet; snippet = lSnippets.next() ) { - QStringList slFields; + TQStringList slFields; slFields.append( snippet->getKey() ); slFields.append( snippet->getValue() ); - config->writeEntry ( QString::number(i), slFields, ',' ); + config->writeEntry ( TQString::number(i), slFields, ',' ); i++; } // sync to disc ... @@ -305,7 +305,7 @@ void KatePluginSnippetsView::writeConfig() { * @param item * @return */ -CSnippet* KatePluginSnippetsView::findSnippetByListViewItem(QListViewItem *item) { +CSnippet* KatePluginSnippetsView::findSnippetByListViewItem(TQListViewItem *item) { CSnippet *snippet = NULL; for ( snippet = lSnippets.first(); snippet; snippet = lSnippets.next() ) { if ( snippet->getListViewItem() == item) diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h index 9a940e5..aac5049 100644 --- a/kate/snippets/plugin_katesnippets.h +++ b/kate/snippets/plugin_katesnippets.h @@ -17,12 +17,12 @@ #include <kate/toolviewmanager.h> -#include <qlistview.h> -#include <qregexp.h> +#include <tqlistview.h> +#include <tqregexp.h> #include <kconfig.h> -#include <qptrlist.h> -#include <qtoolbutton.h> -#include <qtextedit.h> +#include <tqptrlist.h> +#include <tqtoolbutton.h> +#include <tqtextedit.h> #include <kiconloader.h> #include "csnippet.h" @@ -35,14 +35,14 @@ class KatePluginSnippetsView : public CWidgetSnippets, public KXMLGUIClient { friend class KatePluginSnippets; public: - KatePluginSnippetsView (Kate::MainWindow *w, QWidget *dock); + KatePluginSnippetsView (Kate::MainWindow *w, TQWidget *dock); virtual ~KatePluginSnippetsView (); - CSnippet* findSnippetByListViewItem(QListViewItem *item); + CSnippet* findSnippetByListViewItem(TQListViewItem *item); public slots: - void slot_lvSnippetsSelectionChanged(QListViewItem * item); - void slot_lvSnippetsClicked (QListViewItem * item); - void slot_lvSnippetsItemRenamed(QListViewItem *lvi,int col, const QString& text); + void slot_lvSnippetsSelectionChanged(TQListViewItem * item); + void slot_lvSnippetsClicked (TQListViewItem * item); + void slot_lvSnippetsItemRenamed(TQListViewItem *lvi,int col, const TQString& text); void slot_btnNewClicked(); void slot_btnSaveClicked(); void slot_btnDeleteClicked(); @@ -53,25 +53,25 @@ protected: private: KConfig *config; - QPtrList<CSnippet> lSnippets; + TQPtrList<CSnippet> lSnippets; public: Kate::MainWindow *win; - QWidget *dock; + TQWidget *dock; }; class KatePluginSnippets : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT public: - KatePluginSnippets( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + KatePluginSnippets( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSnippets(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); private: - QPtrList<class KatePluginSnippetsView> m_views; + TQPtrList<class KatePluginSnippetsView> m_views; }; diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index 7004ff8..cfc4619 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -37,11 +37,11 @@ #include <kiconloader.h> #include <kfiledialog.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qgroupbox.h> -#include <qcheckbox.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> // END class PluginView : public KXMLGUIClient @@ -72,8 +72,8 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -QObject* KatePluginFactory::createObject( - QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KatePluginFactory::createObject( + TQObject* parent, const char* name, const char*, const TQStringList & ) { return new KatePluginTabBarExtension( parent, name ); } @@ -82,7 +82,7 @@ KInstance* KatePluginFactory::s_instance = 0L; // BEGIN KatePluginTabBarExtension KatePluginTabBarExtension::KatePluginTabBarExtension( - QObject* parent, const char* name ) + TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ), pConfig(new KConfig("katetabbarextensionpluginrc")) { @@ -122,8 +122,8 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) KToolBar* toolbar = dynamic_cast<KToolBar*> (win->guiFactory()->container("tabbarExtensionToolBar", view)); if (toolbar) { - connect(toolbar, SIGNAL( orientationChanged(Orientation) ), - view->tabbar, SLOT( slotMoved(Orientation) )); + connect(toolbar, TQT_SIGNAL( orientationChanged(Orientation) ), + view->tabbar, TQT_SLOT( slotMoved(Orientation) )); } } @@ -152,12 +152,12 @@ void KatePluginTabBarExtension::removeView(Kate::MainWindow *win) } Kate::PluginConfigPage* KatePluginTabBarExtension::configPage( - uint, QWidget *w, const char* /*name*/) + uint, TQWidget *w, const char* /*name*/) { KateTabBarExtensionConfigPage* p = new KateTabBarExtensionConfigPage(this, w); initConfigPage( p ); - connect( p, SIGNAL(configPageApplyRequest(KateTabBarExtensionConfigPage*)), - SLOT(applyConfig(KateTabBarExtensionConfigPage*)) ); + connect( p, TQT_SIGNAL(configPageApplyRequest(KateTabBarExtensionConfigPage*)), + TQT_SLOT(applyConfig(KateTabBarExtensionConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -175,8 +175,8 @@ void KatePluginTabBarExtension::applyConfig( KateTabBarExtensionConfigPage* p ) // BEGIN KateTabBarButton KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, - Kate::Document *pDoc, QWidget * parent, const char * name) - : QPushButton(parent, name), + Kate::Document *pDoc, TQWidget * parent, const char * name) + : TQPushButton(parent, name), modified(false), myDocID(pDoc->documentNumber()), doc(pDoc), @@ -184,11 +184,11 @@ KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, { setFlat(true); setToggleButton(true); - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQWidget::NoFocus); setText(pDoc->docName()); - connect(this, SIGNAL(toggled(bool)), SLOT(setOn(bool))); + connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setOn(bool))); } KateTabBarButton::~KateTabBarButton() {} @@ -204,29 +204,29 @@ void KateTabBarButton::setDirty(bool d) setIconSet(SmallIconSet("cancel")); } else { if (modified) setIconSet(SmallIconSet("modified")); - else setIconSet(QIconSet()); + else setIconSet(TQIconSet()); } } -void KateTabBarButton::setText( const QString& newText) +void KateTabBarButton::setText( const TQString& newText) { - QToolTip::remove(this); + TQToolTip::remove(this); if (newText.length() > 20) { // squeeze to length 17+3=20 - QPushButton::setText(newText.left(9) + "..." + newText.right(8)); - QToolTip::add(this, newText); + TQPushButton::setText(newText.left(9) + "..." + newText.right(8)); + TQToolTip::add(this, newText); } else { - QPushButton::setText(newText); + TQPushButton::setText(newText); } } -QString KateTabBarButton::fullName() const +TQString KateTabBarButton::fullName() const { if (doc) { return doc->docName(); } else { - return QString(""); + return TQString(""); } } @@ -234,45 +234,45 @@ void KateTabBarButton::triggerModified() { modified = !modified; if (modified) { - QColor c(255, 0, 0); + TQColor c(255, 0, 0); setPaletteForegroundColor( c ); setIconSet(SmallIconSet("modified")); } else { - QColor c(KGlobalSettings::textColor()); + TQColor c(KGlobalSettings::textColor()); setPaletteForegroundColor( c ); - setIconSet(QIconSet()); + setIconSet(TQIconSet()); } } void KateTabBarButton::setOn(bool on) { - disconnect( SIGNAL(toggled(bool))); + disconnect( TQT_SIGNAL(toggled(bool))); // kdDebug() << "setOn: " << (int)on << endl; if ((!on) && viewManager->activeView()->document()->documentNumber() == documentNumber()) { // kdDebug() << "setOn aborted " << endl; - QPushButton::setOn(true); + TQPushButton::setOn(true); } else { - QPushButton::setOn(on); + TQPushButton::setOn(on); if (on) emit myToggled(this); } - connect(this, SIGNAL(toggled(bool)), SLOT(setOn(bool))); + connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setOn(bool))); } // END KateTabBarButton // BEGIN KateTabBarExtension KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - QWidget* parent, const char* name, WFlags f ) - : QWidget(parent, name, f), + TQWidget* parent, const char* name, WFlags f ) + : TQWidget(parent, name, f), pCurrentTab(0), m_win(win), m_docManager(pDocManager), m_sort(false) { if (bHorizOrientation) { - top = new QBoxLayout(this, QBoxLayout::LeftToRight); + top = new TQBoxLayout(this, TQBoxLayout::LeftToRight); m_orientation = Qt::Horizontal; } else { - top = new QBoxLayout(this, QBoxLayout::TopToBottom); + top = new TQBoxLayout(this, TQBoxLayout::TopToBottom); m_orientation = Qt::Vertical; } @@ -282,13 +282,13 @@ KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, slotDocumentCreated (pDocManager->document(i)); } - connect(m_win->viewManager(), SIGNAL(viewChanged()), SLOT(slotViewChanged())); + connect(m_win->viewManager(), TQT_SIGNAL(viewChanged()), TQT_SLOT(slotViewChanged())); connect(pDocManager, - SIGNAL(documentCreated(Kate::Document *)), - SLOT(slotDocumentCreated(Kate::Document *))); + TQT_SIGNAL(documentCreated(Kate::Document *)), + TQT_SLOT(slotDocumentCreated(Kate::Document *))); connect(pDocManager, - SIGNAL(documentDeleted(uint)), - SLOT(slotDocumentDeleted(uint))); + TQT_SIGNAL(documentDeleted(uint)), + TQT_SLOT(slotDocumentDeleted(uint))); setSortByName(bSort); } @@ -300,11 +300,11 @@ void KateTabBarExtension::slotMoved(Orientation o) // the tabbar moved (top, right, bottom, left or fluently) switch (o) { case Qt::Vertical: - top->setDirection(QBoxLayout::TopToBottom); + top->setDirection(TQBoxLayout::TopToBottom); break; case Qt::Horizontal: - top->setDirection(QBoxLayout::LeftToRight); + top->setDirection(TQBoxLayout::LeftToRight); break; } @@ -357,15 +357,15 @@ void KateTabBarExtension::slotDocumentCreated (Kate::Document *doc) if (!doc) return; KateTabBarButton* tab = new KateTabBarButton(m_win->viewManager(), doc, this); - connect(tab, SIGNAL(myToggled(KateTabBarButton*)), - SLOT(slotActivateView(KateTabBarButton*))); - connect(doc, SIGNAL(nameChanged(Kate::Document *)), - SLOT(slotNameChanged(Kate::Document *))); - connect(doc, SIGNAL(modStateChanged(Kate::Document *)), - SLOT(slotModChanged(Kate::Document *))); + connect(tab, TQT_SIGNAL(myToggled(KateTabBarButton*)), + TQT_SLOT(slotActivateView(KateTabBarButton*))); + connect(doc, TQT_SIGNAL(nameChanged(Kate::Document *)), + TQT_SLOT(slotNameChanged(Kate::Document *))); + connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document *)), + TQT_SLOT(slotModChanged(Kate::Document *))); connect(doc, - SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), - SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); + TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), + TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); if(doc->isModified()) tab->triggerModified(); tab->show(); top->addWidget(tab); @@ -475,22 +475,22 @@ void KateTabBarExtension::slotViewChanged () // BEGIN KateTabBarExtensionConfigPage KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage( - QObject* /*parent*/ /*= 0L*/, QWidget *parentWidget /*= 0L*/) + TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { - QVBoxLayout* top = new QVBoxLayout(this, 0, + TQVBoxLayout* top = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); - QGroupBox* gb = new QGroupBox( i18n("Sorting Behavior"), + TQGroupBox* gb = new TQGroupBox( i18n("Sorting Behavior"), this, "tab_bar_extension_config_page_layout" ); gb->setColumnLayout(1, Qt::Vertical); gb->setInsideSpacing(KDialogBase::spacingHint()); - pSortAlpha = new QCheckBox(i18n("Sort files alphabetically"), gb); + pSortAlpha = new TQCheckBox(i18n("Sort files alphabetically"), gb); top->add(gb); top->addStretch(1); // throw signal changed - connect(pSortAlpha, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(pSortAlpha, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); } KateTabBarExtensionConfigPage::~KateTabBarExtensionConfigPage() {} @@ -503,8 +503,8 @@ void KateTabBarExtensionConfigPage::apply() // BEGIN MyPtrList implementaion -int MyPtrList::compareItems ( QPtrCollection::Item item1_, - QPtrCollection::Item item2_ ) +int MyPtrList::compareItems ( TQPtrCollection::Item item1_, + TQPtrCollection::Item item2_ ) { KateTabBarButton* item1 = reinterpret_cast<KateTabBarButton*>(item1_); KateTabBarButton* item2 = reinterpret_cast<KateTabBarButton*>(item2_); diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index 6b53444..db2df7a 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -39,23 +39,23 @@ #include <klocale.h> #include <ktoolbar.h> -#include <qwidget.h> -#include <qpushbutton.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqptrlist.h> class QBoxLayout; class QCheckBox; class KateTabBarButton; /** - * Same as QPtrList. Only difference is: overwrite comapreItems() for sorting reason. + * Same as TQPtrList. Only difference is: overwrite comapreItems() for sorting reason. */ -class MyPtrList : public QPtrList <KateTabBarButton> +class MyPtrList : public TQPtrList <KateTabBarButton> { public: - MyPtrList() { QPtrList<KateTabBarButton>::QPtrList(); } + MyPtrList() { TQPtrList<KateTabBarButton>::TQPtrList(); } - virtual int compareItems ( QPtrCollection::Item item1_, QPtrCollection::Item item2_ ); + virtual int compareItems ( TQPtrCollection::Item item1_, TQPtrCollection::Item item2_ ); }; class KatePluginFactory : public KLibFactory @@ -66,8 +66,8 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, - const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, + const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -90,7 +90,7 @@ class KateTabBarButton: public QPushButton * @param name name of the tab button */ KateTabBarButton(Kate::ViewManager* pViewManager, Kate::Document *pDoc, - QWidget* parent = 0, const char * name = 0); + TQWidget* parent = 0, const char * name = 0); /** * standard destructor (emtpy) @@ -106,7 +106,7 @@ class KateTabBarButton: public QPushButton * get the document's full name (eg. main.cpp), used for comparison * @return the document's name */ - QString fullName() const; + TQString fullName() const; /** * negate the modified flag and change the button color @@ -124,7 +124,7 @@ class KateTabBarButton: public QPushButton * set text for this tab * @param newText new text */ - virtual void setText( const QString& newText); + virtual void setText( const TQString& newText); signals: /** @@ -167,7 +167,7 @@ class KateTabBarExtension : public QWidget */ KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); /** standard destructor */ ~KateTabBarExtension(); @@ -245,10 +245,10 @@ class KateTabBarExtension : public QWidget private: KateTabBarButton* pCurrentTab; ///< pointer to the current tab - QBoxLayout* top; ///< layout that contains all tabs + TQBoxLayout* top; ///< layout that contains all tabs Kate::MainWindow* m_win; ///< pointer to the main window Kate::DocumentManager* m_docManager; ///< pointer to the document manager -// QPtrList <KateTabBarButton> m_tabs; ///< list containing all tabs +// TQPtrList <KateTabBarButton> m_tabs; ///< list containing all tabs MyPtrList m_tabs; ///< list containing all tabs Qt::Orientation m_orientation; ///< save tabbar's orientation bool m_sort; ///< how to sort @@ -264,7 +264,7 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage friend class KatePluginTabBarExtension; public: - KateTabBarExtensionConfigPage (QObject* parent = 0L, QWidget *parentWidget = 0L); + KateTabBarExtensionConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~KateTabBarExtensionConfigPage (); /** @@ -288,7 +288,7 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage void configPageInitRequest( KateTabBarExtensionConfigPage* ); private: - QCheckBox* pSortAlpha; + TQCheckBox* pSortAlpha; }; class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension @@ -296,17 +296,17 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - KatePluginTabBarExtension( QObject* parent = 0, const char* name = 0 ); + KatePluginTabBarExtension( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePluginTabBarExtension(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); uint configPages () const { return 1; } - Kate::PluginConfigPage *configPage (uint , QWidget *w, const char *name=0); - QString configPageName(uint) const { return i18n("Tab Bar Extension"); } - QString configPageFullName(uint) const { return i18n("Configure Tab Bar Extension"); } - QPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; } + Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0); + TQString configPageName(uint) const { return i18n("Tab Bar Extension"); } + TQString configPageFullName(uint) const { return i18n("Configure Tab Bar Extension"); } + TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; } public slots: void applyConfig( KateTabBarExtensionConfigPage* ); @@ -315,7 +315,7 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface void initConfigPage( KateTabBarExtensionConfigPage* ); private: - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; KConfig* pConfig; }; diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index b5cd1ac..2d8e446 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <cassert> #include <kdebug.h> -#include <qstring.h> +#include <tqstring.h> #include <ktexteditor/editinterfaceext.h> #include <kapplication.h> #include <kcompletion.h> @@ -44,7 +44,7 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateTextFilter::PluginKateTextFilter( QObject* parent, const char* name, const QStringList& ) +PluginKateTextFilter::PluginKateTextFilter( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ), Kate::Command(), m_pFilterShellProcess (NULL) @@ -64,7 +64,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new KAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this, - SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); + TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); view->setInstance (new KInstance("kate")); view->setXMLFile( "plugins/katetextfilter/ui.rc" ); @@ -87,13 +87,13 @@ void PluginKateTextFilter::removeView(Kate::MainWindow *win) } void -splitString (QString q, char c, QStringList &list) // PCP +splitString (TQString q, char c, TQStringList &list) // PCP { // screw the OnceAndOnlyOnce Principle! int pos; - QString item; + TQString item; while ( (pos = q.find(c)) >= 0) { @@ -106,7 +106,7 @@ splitString (QString q, char c, QStringList &list) // PCP static void // PCP -slipInNewText (Kate::View & view, QString pre, QString marked, QString post, bool reselect) +slipInNewText (Kate::View & view, TQString pre, TQString marked, TQString post, bool reselect) { uint preDeleteLine = 0, preDeleteCol = 0; @@ -149,19 +149,19 @@ slipInNewText (Kate::View & view, QString pre, QString marked, QString post, boo } - static QString // PCP + static TQString // PCP KatePrompt ( - const QString & strTitle, - const QString & strPrompt, - QWidget * that, - QStringList *completionList + const TQString & strTitle, + const TQString & strPrompt, + TQWidget * that, + TQStringList *completionList ) { // TODO: Make this a "memory edit" field with a combo box // containing prior entries - KLineEditDlg dlg(strPrompt, QString::null, that); + KLineEditDlg dlg(strPrompt, TQString::null, that); dlg.setCaption(strTitle); KCompletion *comple=dlg.lineEdit()->completionObject(); comple->setItems(*completionList); @@ -189,7 +189,7 @@ PluginKateTextFilter::slotFilterReceivedStdout (KProcess * pProcess, char * got, // TODO: got a better idea? // while (len--) m_strFilterOutput += *got++; - m_strFilterOutput += QString::fromLocal8Bit( got, len ); + m_strFilterOutput += TQString::fromLocal8Bit( got, len ); // POP_(m_strFilterOutput); } @@ -212,7 +212,7 @@ PluginKateTextFilter::slotFilterProcessExited (KProcess * pProcess) if (!kv) return; KTextEditor::EditInterfaceExt *ext=KTextEditor::editInterfaceExt(kv->getDoc()); if (ext) ext->editBegin(); - QString marked = kv->getDoc()->selection (); + TQString marked = kv->getDoc()->selection (); if (marked.length() > 0) kv -> keyDelete (); kv -> insertText (m_strFilterOutput); @@ -224,9 +224,9 @@ PluginKateTextFilter::slotFilterProcessExited (KProcess * pProcess) static void // PCP -slipInFilter (KShellProcess & shell, Kate::View & view, QString command) +slipInFilter (KShellProcess & shell, Kate::View & view, TQString command) { - QString marked = view.getDoc()->selection (); + TQString marked = view.getDoc()->selection (); if( marked.isEmpty()) return; // POP_(command.latin1 ()); @@ -265,9 +265,9 @@ PluginKateTextFilter::slotEditFilter () // PCP Kate::View * kv (application()->activeMainWindow()->viewManager()->activeView()); if (!kv) return; - QString text ( KatePrompt ( i18n("Filter"), + TQString text ( KatePrompt ( i18n("Filter"), i18n("Enter command to pipe selected text through:"), - (QWidget*) kv, + (TQWidget*) kv, &completionList ) ); @@ -275,7 +275,7 @@ PluginKateTextFilter::slotEditFilter () // PCP runFilter( kv, text ); } -void PluginKateTextFilter::runFilter( Kate::View *kv, const QString &filter ) +void PluginKateTextFilter::runFilter( Kate::View *kv, const TQString &filter ) { m_strFilterOutput = ""; @@ -283,29 +283,29 @@ void PluginKateTextFilter::runFilter( Kate::View *kv, const QString &filter ) { m_pFilterShellProcess = new KShellProcess; - connect ( m_pFilterShellProcess, SIGNAL(wroteStdin(KProcess *)), - this, SLOT(slotFilterCloseStdin (KProcess *))); + connect ( m_pFilterShellProcess, TQT_SIGNAL(wroteStdin(KProcess *)), + this, TQT_SLOT(slotFilterCloseStdin (KProcess *))); - connect ( m_pFilterShellProcess, SIGNAL(receivedStdout(KProcess*,char*,int)), - this, SLOT(slotFilterReceivedStdout(KProcess*,char*,int)) ); + connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), + this, TQT_SLOT(slotFilterReceivedStdout(KProcess*,char*,int)) ); - connect ( m_pFilterShellProcess, SIGNAL(receivedStderr(KProcess*,char*,int)), - this, SLOT(slotFilterReceivedStderr(KProcess*,char*,int)) ); + connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), + this, TQT_SLOT(slotFilterReceivedStderr(KProcess*,char*,int)) ); - connect ( m_pFilterShellProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotFilterProcessExited(KProcess*) ) ) ; + connect ( m_pFilterShellProcess, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotFilterProcessExited(KProcess*) ) ) ; } slipInFilter (*m_pFilterShellProcess, *kv, filter); } //BEGIN Kate::Command methods -QStringList PluginKateTextFilter::cmds() +TQStringList PluginKateTextFilter::cmds() { - return QStringList("textfilter"); + return TQStringList("textfilter"); } -bool PluginKateTextFilter::help( Kate::View *, const QString&, QString &msg ) +bool PluginKateTextFilter::help( Kate::View *, const TQString&, TQString &msg ) { msg = i18n( "<qt><p>Usage: <code>textfilter COMMAND</code></p>" @@ -313,7 +313,7 @@ bool PluginKateTextFilter::help( Kate::View *, const QString&, QString &msg ) return true; } -bool PluginKateTextFilter::exec( Kate::View *v, const QString &cmd, QString &msg ) +bool PluginKateTextFilter::exec( Kate::View *v, const TQString &cmd, TQString &msg ) { if (! v->getDoc()->hasSelection() ) { @@ -321,7 +321,7 @@ bool PluginKateTextFilter::exec( Kate::View *v, const QString &cmd, QString &msg return false; } - QString filter = cmd.section( " ", 1 ).stripWhiteSpace(); + TQString filter = cmd.section( " ", 1 ).stripWhiteSpace(); if ( filter.isEmpty() ) { diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index 1b27b89..2d5678d 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -18,7 +18,7 @@ #ifndef _PLUGIN_KANT_TEXTFILTER_H #define _PLUGIN_KANT_TEXTFILTER_H -#include <qstring.h> +#include <tqstring.h> #include <kate/plugin.h> #include <kate/application.h> @@ -35,24 +35,24 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa Q_OBJECT public: - PluginKateTextFilter( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateTextFilter( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateTextFilter(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); // Kate::Command - QStringList cmds (); - bool exec (Kate::View *view, const QString &cmd, QString &msg); - bool help (Kate::View *view, const QString &cmd, QString &msg); + TQStringList cmds (); + bool exec (Kate::View *view, const TQString &cmd, TQString &msg); + bool help (Kate::View *view, const TQString &cmd, TQString &msg); private: - void runFilter( Kate::View *kv, const QString & filter ); + void runFilter( Kate::View *kv, const TQString & filter ); private: - QString m_strFilterOutput; + TQString m_strFilterOutput; KShellProcess * m_pFilterShellProcess; - QPtrList<class PluginView> m_views; - QStringList completionList; + TQPtrList<class PluginView> m_views; + TQStringList completionList; public slots: void slotEditFilter (); void slotFilterReceivedStdout (KProcess * pProcess, char * got, int len); diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 120e04e..253c9d0 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -34,11 +34,11 @@ #include <cassert> #include <config.h> -#include <qfile.h> -#include <qinputdialog.h> -#include <qregexp.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqinputdialog.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqtextstream.h> #include <kaction.h> #include <kcursor.h> @@ -54,7 +54,7 @@ K_EXPORT_COMPONENT_FACTORY( katexmlcheckplugin, KGenericFactory<PluginKateXMLCheck>( "katexmlcheck" ) ) -PluginKateXMLCheck::PluginKateXMLCheck( QObject* parent, const char* name, const QStringList& ) +PluginKateXMLCheck::PluginKateXMLCheck( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application *)parent, name ) { } @@ -68,7 +68,7 @@ PluginKateXMLCheck::~PluginKateXMLCheck() void PluginKateXMLCheck::addView(Kate::MainWindow *win) { Kate::ToolViewManager *viewmanager = win->toolViewManager(); - QWidget *dock = viewmanager->createToolView("kate_plugin_xmlcheck_ouputview", Kate::ToolViewManager::Bottom, SmallIcon("misc"), i18n("XML Checker Output")); + TQWidget *dock = viewmanager->createToolView("kate_plugin_xmlcheck_ouputview", Kate::ToolViewManager::Bottom, SmallIcon("misc"), i18n("XML Checker Output")); PluginKateXMLCheckView *view = new PluginKateXMLCheckView (dock,win,"katexmlcheck_outputview"); view->dock = dock; @@ -94,22 +94,22 @@ void PluginKateXMLCheck::removeView(Kate::MainWindow *win) //--------------------------------- -PluginKateXMLCheckView::PluginKateXMLCheckView(QWidget *parent,Kate::MainWindow *mainwin,const char* name) - :QListView(parent,name),KXMLGUIClient(),win(mainwin) +PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name) + :TQListView(parent,name),KXMLGUIClient(),win(mainwin) { m_tmp_file=0; m_proc=0; (void) new KAction ( i18n("Validate XML"), 0, this, - SLOT( slotValidate() ), actionCollection(), "xml_check" ); + TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" ); // TODO?: //(void) new KAction ( i18n("Indent XML"), 0, this, - // SLOT( slotIndent() ), actionCollection(), "xml_indent" ); + // TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" ); setInstance(new KInstance("kate")); setXMLFile("plugins/katexmlcheck/ui.rc"); - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQWidget::NoFocus); addColumn(i18n("#"), -1); addColumn(i18n("Line"), -1); setColumnAlignment(1, AlignRight); @@ -117,8 +117,8 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(QWidget *parent,Kate::MainWindow setColumnAlignment(2, AlignRight); addColumn(i18n("Message"), -1); setAllColumnsShowFocus(true); - setResizeMode(QListView::LastColumn); - connect(this, SIGNAL(clicked(QListViewItem *)), SLOT(slotClicked(QListViewItem *))); + setResizeMode(TQListView::LastColumn); + connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); /* TODO?: invalidate the listview when document has changed Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView(); @@ -126,17 +126,17 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(QWidget *parent,Kate::MainWindow kdDebug() << "Warning: no Kate::View" << endl; return; } - connect(kv, SIGNAL(modifiedChanged()), this, SLOT(slotUpdate())); + connect(kv, TQT_SIGNAL(modifiedChanged()), this, TQT_SLOT(slotUpdate())); */ m_proc_stderr = ""; m_proc = new KProcess(); - connect(m_proc, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcExited(KProcess*))); + connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcExited(KProcess*))); // we currently only want errors: - //connect(m_proc, SIGNAL(receivedStdout(KProcess*,char*,int)), - // this, SLOT(receivedProcStdout(KProcess*, char*, int))); - connect(m_proc, SIGNAL(receivedStderr(KProcess*,char*,int)), - this, SLOT(slotReceivedProcStderr(KProcess*, char*, int))); + //connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), + // this, TQT_SLOT(receivedProcStdout(KProcess*, char*, int))); + connect(m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), + this, TQT_SLOT(slotReceivedProcStderr(KProcess*, char*, int))); } @@ -152,7 +152,7 @@ PluginKateXMLCheckView::~PluginKateXMLCheckView() void PluginKateXMLCheckView::slotReceivedProcStderr(KProcess *, char *result, int len) { - m_proc_stderr += QString::fromLocal8Bit( QCString(result, len+1) ); + m_proc_stderr += TQString::fromLocal8Bit( TQCString(result, len+1) ); } @@ -165,29 +165,29 @@ void PluginKateXMLCheckView::slotProcExited(KProcess*) kdDebug() << "slotProcExited()" << endl; //kdDebug() << "output: " << endl << m_proc_stderr << endl << endl; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); m_tmp_file->unlink(); clear(); uint list_count = 0; uint err_count = 0; if( ! m_validating ) { // no i18n here, so we don't get an ugly English<->Non-english mixup: - QString msg; + TQString msg; if( m_dtdname.isEmpty() ) { msg = "No DOCTYPE found, will only check well-formedness."; } else { msg = "'" + m_dtdname + "' not found, will only check well-formedness."; } - (void)new QListViewItem(this, QString("1").rightJustify(4,' '), "", "", msg); + (void)new TQListViewItem(this, TQString("1").rightJustify(4,' '), "", "", msg); list_count++; } if( ! m_proc_stderr.isEmpty() ) { - QStringList lines = QStringList::split("\n", m_proc_stderr); - QListViewItem *item = 0; - QString linenumber, msg; + TQStringList lines = TQStringList::split("\n", m_proc_stderr); + TQListViewItem *item = 0; + TQString linenumber, msg; uint line_count = 0; - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { - QString line = *it; + 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); @@ -202,13 +202,13 @@ void PluginKateXMLCheckView::slotProcExited(KProcess*) if( line_count == lines.size() && caret_pos == -1 ) { msg = msg+"\n"+line; } - QString col = QString::number(caret_pos); + TQString col = TQString::number(caret_pos); if( col == "-1" ) { col = ""; } err_count++; list_count++; - item = new QListViewItem(this, QString::number(list_count).rightJustify(4,' '), linenumber, col, msg); + item = new TQListViewItem(this, TQString::number(list_count).rightJustify(4,' '), linenumber, col, msg); item->setMultiLinesEnabled(true); } else { msg = msg+"\n"+line; @@ -217,18 +217,18 @@ void PluginKateXMLCheckView::slotProcExited(KProcess*) sort(); // TODO?: insert in right order } if( err_count == 0 ) { - QString msg; + TQString msg; if( m_validating ) { msg = "No errors found, document is valid."; // no i18n here } else { msg = "No errors found, document is well-formed."; // no i18n here } - (void)new QListViewItem(this, QString::number(list_count+1).rightJustify(4,' '), "", "", msg); + (void)new TQListViewItem(this, TQString::number(list_count+1).rightJustify(4,' '), "", "", msg); } } -void PluginKateXMLCheckView::slotClicked(QListViewItem *item) +void PluginKateXMLCheckView::slotClicked(TQListViewItem *item) { kdDebug() << "slotClicked" << endl; if( item ) { @@ -285,14 +285,14 @@ bool PluginKateXMLCheckView::slotValidate() m_tmp_file=0L; return false; } - QTextStream *s = m_tmp_file->textStream(); + TQTextStream *s = m_tmp_file->textStream(); *s << kv->getDoc()->text(); bool removed = m_tmp_file->close(); if( ! removed ) { kdDebug() << "Warning (slotValidate()): temp file '" << m_tmp_file->name() << "' not deleted: " << m_tmp_file->status() << endl; } - QString exe = KStandardDirs::findExe("xmllint"); + TQString exe = KStandardDirs::findExe("xmllint"); if( exe.isEmpty() ) { exe = locate("exe", "xmllint"); } @@ -300,29 +300,29 @@ bool PluginKateXMLCheckView::slotValidate() // use catalogs for KDE docbook: if( ! getenv("SGML_CATALOG_FILES") ) { KInstance ins("katexmlcheckplugin"); - QString catalogs; + TQString catalogs; catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); catalogs += ":"; catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat"); kdDebug() << "catalogs: " << catalogs << endl; - setenv("SGML_CATALOG_FILES", QFile::encodeName( catalogs ).data(), 1); + setenv("SGML_CATALOG_FILES", TQFile::encodeName( catalogs ).data(), 1); } //kdDebug() << "**catalogs: " << getenv("SGML_CATALOG_FILES") << endl; *m_proc << exe << "--catalogs" << "--noout"; // heuristic: assume that the doctype is in the first 10,000 bytes: - QString text_start = kv->getDoc()->text().left(10000); + TQString text_start = kv->getDoc()->text().left(10000); // remove comments before looking for doctype (as a doctype might be commented out // and needs to be ignored then): - QRegExp re("<!--.*-->"); + TQRegExp re("<!--.*-->"); re.setMinimal(true); text_start.replace(re, ""); - QRegExp re_doctype("<!DOCTYPE\\s+(.*)\\s+(?:PUBLIC\\s+[\"'].*[\"']\\s+[\"'](.*)[\"']|SYSTEM\\s+[\"'](.*)[\"'])", false); + TQRegExp re_doctype("<!DOCTYPE\\s+(.*)\\s+(?:PUBLIC\\s+[\"'].*[\"']\\s+[\"'](.*)[\"']|SYSTEM\\s+[\"'](.*)[\"'])", false); re_doctype.setMinimal(true); if( re_doctype.search(text_start) != -1 ) { - QString dtdname; + TQString dtdname; if( ! re_doctype.cap(2).isEmpty() ) { dtdname = re_doctype.cap(2); } else { @@ -348,6 +348,6 @@ bool PluginKateXMLCheckView::slotValidate() "sure that xmllint is installed. It is part of libxml2.")); return false; } - QApplication::setOverrideCursor(KCursor::waitCursor()); + TQApplication::setOverrideCursor(KCursor::waitCursor()); return true; } diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h index 17c2e53..b078f59 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.h +++ b/kate/xmlcheck/plugin_katexmlcheck.h @@ -25,8 +25,8 @@ #ifndef _PLUGIN_KANT_XMLCHECK_H #define _PLUGIN_KANT_XMLCHECK_H -#include <qlistview.h> -#include <qstring.h> +#include <tqlistview.h> +#include <tqstring.h> #include <kate/plugin.h> #include <kate/application.h> @@ -41,20 +41,20 @@ #include <kprocess.h> #include <ktempfile.h> -class PluginKateXMLCheckView : public QListView, public KXMLGUIClient +class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient { Q_OBJECT public: - PluginKateXMLCheckView(QWidget *parent,Kate::MainWindow *mainwin,const char* name); + PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name); virtual ~PluginKateXMLCheckView(); Kate::MainWindow *win; - QWidget *dock; + TQWidget *dock; public slots: bool slotValidate(); - void slotClicked(QListViewItem *item); + void slotClicked(TQListViewItem *item); void slotProcExited(KProcess*); void slotReceivedProcStderr(KProcess*, char*, int); void slotUpdate(); @@ -64,8 +64,8 @@ class PluginKateXMLCheckView : public QListView, public KXMLGUIClient KParts::ReadOnlyPart *part; bool m_validating; KProcess *m_proc; - QString m_proc_stderr; - QString m_dtdname; + TQString m_proc_stderr; + TQString m_dtdname; }; @@ -74,14 +74,14 @@ class PluginKateXMLCheck : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - PluginKateXMLCheck( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateXMLCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLCheck(); void addView (Kate::MainWindow *win); void removeView (Kate::MainWindow *win); private: - QPtrList<PluginKateXMLCheckView> m_views; + TQPtrList<PluginKateXMLCheckView> m_views; }; #endif // _PLUGIN_KANT_XMLCHECK_H diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index 05f7802..182aeaf 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -63,12 +63,12 @@ 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 QChar::QChar( int rc ) + unicode font +-Show expanded entities with TQChar::TQChar( int rc ) + unicode font -Don't ignore entities defined in the document's prologue -Only offer 'valid' elements, i.e. don't take the elements as a set but check if the DTD is matched ( order, number of occurences, ... ) --Maybe only read the meta DTD file once, then store the resulting QMap on disk ( using QDataStream )? +-Maybe only read the meta DTD file once, then store the resulting TQMap on disk ( using TQDataStream )? We'll then have to compare timeOf_cacheFile <-> timeOf_metaDtd. -Try to use libxml */ @@ -78,16 +78,16 @@ TODO: #include <assert.h> -#include <qdatetime.h> -#include <qdom.h> -#include <qfile.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qprogressdialog.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qstring.h> -#include <qtimer.h> +#include <tqdatetime.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqprogressdialog.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqtimer.h> #include <kaction.h> #include <kbuttonbox.h> @@ -113,13 +113,13 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateXMLTools::PluginKateXMLTools( QObject* parent, const char* name, const QStringList& ) +PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, const TQStringList& ) : Kate::Plugin ( (Kate::Application*)parent, name ) { //kdDebug() << "PluginKateXMLTools constructor called" << endl; - m_dtdString = QString(); - m_urlString = QString(); + m_dtdString = TQString(); + m_urlString = TQString(); m_docToAssignTo = 0L; m_mode = none; @@ -127,17 +127,17 @@ PluginKateXMLTools::PluginKateXMLTools( QObject* parent, const char* name, const m_lastLine = 0; m_lastCol = 0; - m_lastAllowed = QStringList(); + m_lastAllowed = TQStringList(); m_popupOpenCol = -1; m_dtds.setAutoDelete( true ); m_documentManager = ((Kate::Application*)parent)->documentManager(); -// connect( m_documentManager, SIGNAL(documentCreated()), -// this, SLOT(slotDocumentCreated()) ); - connect( m_documentManager, SIGNAL(documentDeleted(uint)), - this, SLOT(slotDocumentDeleted(uint)) ); +// connect( m_documentManager, TQT_SIGNAL(documentCreated()), +// this, TQT_SLOT(slotDocumentCreated()) ); + connect( m_documentManager, TQT_SIGNAL(documentDeleted(uint)), + this, TQT_SLOT(slotDocumentDeleted(uint)) ); } PluginKateXMLTools::~PluginKateXMLTools() @@ -150,11 +150,11 @@ void PluginKateXMLTools::addView( Kate::MainWindow *win ) // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); ( void) new KAction ( i18n("&Insert Element..."), CTRL+Key_Return, this, - SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" ); + TQT_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" ); ( void) new KAction ( i18n("&Close Element"), CTRL+Key_Less, this, - SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" ); + TQT_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" ); ( void) new KAction ( i18n("Assign Meta &DTD..." ), 0, this, - SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); + TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); view->setInstance( new KInstance("kate") ); view->setXMLFile( "plugins/katexmltools/ui.rc" ); @@ -187,14 +187,14 @@ void PluginKateXMLTools::slotDocumentDeleted( uint documentNumber ) kdDebug()<<"XMLTools:slotDocumentDeleted: documents: "<<m_docDtds.count()<<", DTDs: "<<m_dtds.count()<<endl; PseudoDTD *dtd = m_docDtds.take( documentNumber ); - QIntDictIterator<PseudoDTD> it ( m_docDtds ); + TQIntDictIterator<PseudoDTD> it ( m_docDtds ); for ( ; it.current(); ++it ) { if ( it.current() == dtd ) return; } - QDictIterator<PseudoDTD> it1( m_dtds ); + TQDictIterator<PseudoDTD> it1( m_dtds ); for ( ; it1.current() ; ++it1 ) { if ( it1.current() == dtd ) @@ -239,10 +239,10 @@ void PluginKateXMLTools::backspacePressed() void PluginKateXMLTools::emptyKeyEvent() { - keyEvent( 0, 0, QString::null ); + keyEvent( 0, 0, TQString::null ); } -void PluginKateXMLTools::keyEvent( int, int, const QString &/*s*/ ) +void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) { //kdDebug() << "xml tools keyEvent: '" << s << endl; @@ -262,16 +262,16 @@ void PluginKateXMLTools::keyEvent( int, int, const QString &/*s*/ ) return; // debug to test speed: - //QTime t; t.start(); + //TQTime t; t.start(); - QStringList allowed = QStringList(); + TQStringList allowed = TQStringList(); // get char on the left of the cursor: uint line, col; kv->cursorPositionReal( &line, &col ); - QString lineStr = kv->getDoc()->textLine( line ); - QString leftCh = lineStr.mid( col-1, 1 ); - QString secondLeftCh = lineStr.mid( col-2, 1 ); + TQString lineStr = kv->getDoc()->textLine( line ); + TQString leftCh = lineStr.mid( col-1, 1 ); + TQString secondLeftCh = lineStr.mid( col-2, 1 ); if( leftCh == "&" ) { @@ -282,7 +282,7 @@ void PluginKateXMLTools::keyEvent( int, int, const QString &/*s*/ ) else if( leftCh == "<" ) { kdDebug() << "*outside tag -> get elements" << endl; - QString parentElement = getParentElement( *kv, true ); + TQString parentElement = getParentElement( *kv, true ); kdDebug() << "parent: " << parentElement << endl; allowed = m_docDtds[docNumber]->allowedElements(parentElement ); m_mode = elements; @@ -292,8 +292,8 @@ void PluginKateXMLTools::keyEvent( int, int, const QString &/*s*/ ) { // TODO: check secondLeftChar, too?! then you don't need to trigger // with space and we yet save CPU power - QString currentElement = insideTag( *kv ); - QString currentAttribute; + TQString currentElement = insideTag( *kv ); + TQString currentAttribute; if( ! currentElement.isEmpty() ) currentAttribute = insideAttribute( *kv ); @@ -341,12 +341,12 @@ void PluginKateXMLTools::keyEvent( int, int, const QString &/*s*/ ) //} } -QValueList<KTextEditor::CompletionEntry> -PluginKateXMLTools::stringListToCompletionEntryList( QStringList list ) +TQValueList<KTextEditor::CompletionEntry> +PluginKateXMLTools::stringListToCompletionEntryList( TQStringList list ) { - QValueList<KTextEditor::CompletionEntry> compList; + TQValueList<KTextEditor::CompletionEntry> compList; KTextEditor::CompletionEntry entry; - for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + for( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { entry.text = ( *it ); compList << entry; @@ -361,9 +361,9 @@ PluginKateXMLTools::stringListToCompletionEntryList( QStringList list ) */ void PluginKateXMLTools::disconnectSlots( Kate::View *kv ) { - disconnect( kv, SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,QString*)), this, 0 ); - disconnect( kv, SIGNAL(completionDone(KTextEditor::CompletionEntry)), this, 0 ); - disconnect( kv, SIGNAL(completionAborted()), this, 0 ); + disconnect( kv, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), this, 0 ); + disconnect( kv, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), this, 0 ); + disconnect( kv, TQT_SIGNAL(completionAborted()), this, 0 ); } /** @@ -372,11 +372,11 @@ void PluginKateXMLTools::disconnectSlots( Kate::View *kv ) */ void PluginKateXMLTools::connectSlots( Kate::View *kv ) { - connect( kv, SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,QString*) ), - this, SLOT(filterInsertString(KTextEditor::CompletionEntry*,QString*)) ); - connect( kv, SIGNAL(completionDone(KTextEditor::CompletionEntry) ), - this, SLOT(completionDone(KTextEditor::CompletionEntry)) ); - connect( kv, SIGNAL(completionAborted()), this, SLOT(completionAborted()) ); + connect( kv, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*) ), + this, TQT_SLOT(filterInsertString(KTextEditor::CompletionEntry*,TQString*)) ); + connect( kv, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry) ), + this, TQT_SLOT(completionDone(KTextEditor::CompletionEntry)) ); + connect( kv, TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionAborted()) ); } /** @@ -399,7 +399,7 @@ void PluginKateXMLTools::getDTD() // Start where the supplied XML-DTDs are fed by default unless // user changed directory last time: - QString defaultDir = KGlobal::dirs()->findResourceDir("data", "katexmltools/" ) + "katexmltools/"; + TQString defaultDir = KGlobal::dirs()->findResourceDir("data", "katexmltools/" ) + "katexmltools/"; if( m_urlString.isNull() ) { m_urlString = defaultDir; } @@ -411,13 +411,13 @@ void PluginKateXMLTools::getDTD() // Example syntax: // <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> uint checkMaxLines = 200; - QString documentStart = kv->getDoc()->text(0, 0, checkMaxLines+1, 0 ); - QRegExp re( "<!DOCTYPE\\s+(.*)\\s+PUBLIC\\s+[\"'](.*)[\"']", false ); + TQString documentStart = kv->getDoc()->text(0, 0, checkMaxLines+1, 0 ); + TQRegExp re( "<!DOCTYPE\\s+(.*)\\s+PUBLIC\\s+[\"'](.*)[\"']", false ); re.setMinimal( true ); int matchPos = re.search( documentStart ); - QString filename; - QString doctype; - QString topElement; + TQString filename; + TQString doctype; + TQString topElement; if( matchPos != -1 ) { topElement = re.cap( 1 ); @@ -468,7 +468,7 @@ void PluginKateXMLTools::getDTD() "as a document of type \"%1\". The meta DTD for this document type " "will now be loaded.").arg( doctype ), i18n( "Loading XML Meta DTD" ), - QString::fromLatin1( "DTDAssigned") ); + TQString::fromLatin1( "DTDAssigned") ); } if( url.isEmpty() ) @@ -483,11 +483,11 @@ void PluginKateXMLTools::getDTD() m_dtdString = ""; m_docToAssignTo = kv->document(); - QApplication::setOverrideCursor( KCursor::waitCursor() ); + TQApplication::setOverrideCursor( KCursor::waitCursor() ); KIO::Job *job = KIO::get( url ); - connect( job, SIGNAL(result(KIO::Job *)), this, SLOT(slotFinished(KIO::Job *)) ); - connect( job, SIGNAL(data(KIO::Job *, const QByteArray &)), - this, SLOT(slotData(KIO::Job *, const QByteArray &)) ); + connect( job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotFinished(KIO::Job *)) ); + connect( job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)) ); } kdDebug()<<"XMLTools::getDTD: Documents: "<<m_docDtds.count()<<", DTDs: "<<m_dtds.count()<<endl; } @@ -518,23 +518,23 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job ) m_docToAssignTo = 0; m_dtdString = ""; } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } -void PluginKateXMLTools::slotData( KIO::Job *, const QByteArray &data ) +void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data ) { - m_dtdString += QString( data ); + m_dtdString += TQString( data ); } void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ) { m_docDtds.replace( doc->documentNumber(), dtd ); - connect( doc, SIGNAL(charactersInteractivelyInserted(int,int,const QString&) ), - this, SLOT(keyEvent(int,int,const QString&)) ); + connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), + this, TQT_SLOT(keyEvent(int,int,const TQString&)) ); - disconnect( doc, SIGNAL(backspacePressed()), this, 0 ); - connect( doc, SIGNAL(backspacePressed() ), - this, SLOT(backspacePressed()) ); + disconnect( doc, TQT_SIGNAL(backspacePressed()), this, 0 ); + connect( doc, TQT_SIGNAL(backspacePressed() ), + this, TQT_SLOT(backspacePressed()) ); } /** @@ -555,22 +555,22 @@ void PluginKateXMLTools::slotInsertElement() } PseudoDTD *dtd = m_docDtds[kv->document()->documentNumber()]; - QString parentElement = getParentElement( *kv, false ); - QStringList allowed; + TQString parentElement = getParentElement( *kv, false ); + TQStringList allowed; if( dtd ) allowed = dtd->allowedElements(parentElement ); InsertElement *dialog = new InsertElement( - ( QWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" ); - QString text = dialog->showDialog( allowed ); + ( TQWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" ); + TQString text = dialog->showDialog( allowed ); delete dialog; if( !text.isEmpty() ) { - QStringList list = QStringList::split( ' ', text ); - QString pre; - QString post; + TQStringList list = TQStringList::split( ' ', text ); + TQString pre; + TQString post; // anders: use <tagname/> if the tag is required to be empty. // In that case maybe we should not remove the selection? or overwrite it? int adjust = 0; // how much to move cursor. @@ -591,7 +591,7 @@ void PluginKateXMLTools::slotInsertElement() post ="</" + list[0] + ">"; } - QString marked; + TQString marked; if ( ! post.isEmpty() ) marked = kv->getDoc()->selection(); @@ -616,16 +616,16 @@ void PluginKateXMLTools::slotCloseElement() kdDebug() << "Warning: no Kate::View" << endl; return; } - QString parentElement = getParentElement( *kv, false ); + TQString parentElement = getParentElement( *kv, false ); //kdDebug() << "parentElement: '" << parentElement << "'" << endl; - QString closeTag = "</" + parentElement + ">"; + TQString closeTag = "</" + parentElement + ">"; if( ! parentElement.isEmpty() ) kv->insertText( closeTag ); } // modify the completion string before it gets inserted -void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, QString *text ) +void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, TQString *text ) { kdDebug() << "filterInsertString str: " << *text << endl; kdDebug() << "filterInsertString text: " << ce->text << endl; @@ -642,9 +642,9 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, Q uint line, col; kv->cursorPositionReal( &line, &col ); - QString lineStr = kv->getDoc()->textLine(line ); - QString leftCh = lineStr.mid( col-1, 1 ); - QString rightCh = lineStr.mid( col, 1 ); + TQString lineStr = kv->getDoc()->textLine(line ); + TQString leftCh = lineStr.mid( col-1, 1 ); + TQString rightCh = lineStr.mid( col, 1 ); m_correctPos = 0; // where to move the cursor after completion ( >0 = move right ) if( m_mode == entities ) @@ -677,7 +677,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, Q // find left quote: for( startAttValue = col; startAttValue > 0; startAttValue-- ) { - QString ch = lineStr.mid( startAttValue-1, 1 ); + TQString ch = lineStr.mid( startAttValue-1, 1 ); if( isQuote(ch) ) break; } @@ -685,7 +685,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, Q // find right quote: for( endAttValue = col; endAttValue <= lineStr.length(); endAttValue++ ) { - QString ch = lineStr.mid( endAttValue-1, 1 ); + TQString ch = lineStr.mid( endAttValue-1, 1 ); if( isQuote(ch) ) break; } @@ -706,7 +706,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, Q else if( m_mode == elements ) { // anders: if the tag is marked EMPTY, insert in form <tagname/> - QString str; + TQString str; int docNumber = kv->document()->documentNumber(); bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).contains( "__EMPTY" ); if ( isEmptyTag ) @@ -782,7 +782,7 @@ void PluginKateXMLTools::completionDone( KTextEditor::CompletionEntry ) if( m_mode == attributes ) { // immediately show attribute values: - QTimer::singleShot( 10, this, SLOT(emptyKeyEvent()) ); + TQTimer::singleShot( 10, this, TQT_SLOT(emptyKeyEvent()) ); } } @@ -795,23 +795,23 @@ void PluginKateXMLTools::completionDone( KTextEditor::CompletionEntry ) * if "<" occurs before ">" occurs ( on the left side of the cursor ). * Return the tag name, return "" if we cursor is outside a tag. */ -QString PluginKateXMLTools::insideTag( Kate::View &kv ) +TQString PluginKateXMLTools::insideTag( Kate::View &kv ) { uint line = 0, col = 0; kv.cursorPositionReal( &line, &col ); int y = line; // another variable because uint <-> int do { - QString lineStr = kv.getDoc()->textLine(y ); + TQString lineStr = kv.getDoc()->textLine(y ); for( uint x = col; x > 0; x-- ) { - QString ch = lineStr.mid( x-1, 1 ); + TQString ch = lineStr.mid( x-1, 1 ); if( ch == ">" ) // cursor is outside tag return ""; if( ch == "<" ) { - QString tag; + TQString tag; // look for white space on the right to get the tag name for( uint z = x; z <= lineStr.length() ; z++ ) { @@ -846,21 +846,21 @@ QString PluginKateXMLTools::insideTag( Kate::View &kv ) * Note: only call when insideTag() == true. * TODO: allow whitespace around "=" */ -QString PluginKateXMLTools::insideAttribute( Kate::View &kv ) +TQString PluginKateXMLTools::insideAttribute( Kate::View &kv ) { uint line = 0, col = 0; kv.cursorPositionReal( &line, &col ); int y = line; // another variable because uint <-> int uint x = 0; - QString lineStr = ""; - QString ch = ""; + TQString lineStr = ""; + TQString ch = ""; do { lineStr = kv.getDoc()->textLine(y ); for( x = col; x > 0; x-- ) { ch = lineStr.mid( x-1, 1 ); - QString chLeft = lineStr.mid( x-2, 1 ); + TQString chLeft = lineStr.mid( x-2, 1 ); // TODO: allow whitespace if( isQuote(ch) && chLeft == "=" ) break; @@ -874,7 +874,7 @@ QString PluginKateXMLTools::insideAttribute( Kate::View &kv ) } while( !isQuote(ch) ); // look for next white space on the left to get the tag name - QString attr = ""; + TQString attr = ""; for( int z = x; z >= 0; z-- ) { ch = lineStr.mid( z-1, 1 ); @@ -904,7 +904,7 @@ QString PluginKateXMLTools::insideAttribute( Kate::View &kv ) * <p> foo <img/> bar X * <p> foo bar X */ -QString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingleChar ) +TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingleChar ) { enum { parsingText, @@ -921,7 +921,7 @@ QString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingleC uint line, col; kv.cursorPositionReal( &line, &col ); - QString str = kv.getDoc()->textLine(line ); + TQString str = kv.getDoc()->textLine(line ); while( true ) { @@ -930,7 +930,7 @@ QString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingleC { do { - if( !line-- ) return QString::null; // reached start of document + if( !line-- ) return TQString::null; // reached start of document str = kv.getDoc()->textLine(line ); col = str.length(); } while( !col ); @@ -950,7 +950,7 @@ QString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingleC { case '<': // hmm... we were actually inside an element - return QString::null; + return TQString::null; case '>': // we just hit an element boundary @@ -979,7 +979,7 @@ QString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingleC // we just hit the start of the element... if( nestingLevel-- ) break; - QString tag = str.mid( col + 1 ); + TQString tag = str.mid( col + 1 ); for( uint pos = 0, len = tag.length(); pos < len; ++pos ) { ch = tag.at( pos).unicode(); if( ch == ' ' || ch == '\t' || ch == '>' ) { @@ -1036,7 +1036,7 @@ QString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingleC * Return true if the tag is neither a closing tag * nor an empty tag, nor a comment, nor processing instruction. */ -bool PluginKateXMLTools::isOpeningTag( QString tag ) +bool PluginKateXMLTools::isOpeningTag( TQString tag ) { return ( !isClosingTag(tag) && !isEmptyTag(tag ) && !tag.startsWith( "<?") && !tag.startsWith("<!") ); @@ -1046,12 +1046,12 @@ bool PluginKateXMLTools::isOpeningTag( QString tag ) * Return true if the tag is a closing tag. Return false * if the tag is an opening tag or an empty tag ( ! ) */ -bool PluginKateXMLTools::isClosingTag( QString tag ) +bool PluginKateXMLTools::isClosingTag( TQString tag ) { return ( tag.startsWith("</") ); } -bool PluginKateXMLTools::isEmptyTag( QString tag ) +bool PluginKateXMLTools::isEmptyTag( TQString tag ) { return ( tag.right(2) == "/>" ); } @@ -1059,7 +1059,7 @@ bool PluginKateXMLTools::isEmptyTag( QString tag ) /** * Return true if ch is a single or double quote. Expects ch to be of length 1. */ -bool PluginKateXMLTools::isQuote( QString ch ) +bool PluginKateXMLTools::isQuote( TQString ch ) { return ( ch == "\"" || ch == "'" ); } @@ -1068,14 +1068,14 @@ bool PluginKateXMLTools::isQuote( QString ch ) // ======================================================================== // Tools: -/** Sort a QStringList case-insensitively. Static. TODO: make it more simple. */ -QStringList PluginKateXMLTools::sortQStringList( QStringList list ) { +/** 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. - QMap<QString,QString> mapList; - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQMap<TQString,TQString> mapList; + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - QString str = *it; + TQString str = *it; if( mapList.contains(str.lower()) ) { // do not override a previous value, e.g. "Auml" and "auml" are two different @@ -1089,7 +1089,7 @@ QStringList PluginKateXMLTools::sortQStringList( QStringList list ) { } list.clear(); - QMap<QString,QString>::Iterator it; + TQMap<TQString,TQString>::Iterator it; // Qt doc: "the items are alphabetically sorted [by key] when iterating over the map": for( it = mapList.begin(); it != mapList.end(); ++it ) @@ -1099,7 +1099,7 @@ QStringList PluginKateXMLTools::sortQStringList( QStringList list ) { } //BEGIN InsertElement dialog -InsertElement::InsertElement( QWidget *parent, const char *name ) +InsertElement::InsertElement( TQWidget *parent, const char *name ) :KDialogBase( parent, name, true, i18n("Insert XML Element" ), KDialogBase::Ok|KDialogBase::Cancel) { @@ -1109,23 +1109,23 @@ InsertElement::~InsertElement() { } -void InsertElement::slotHistoryTextChanged( const QString& text ) +void InsertElement::slotHistoryTextChanged( const TQString& text ) { enableButtonOK( !text.isEmpty() ); } -QString InsertElement::showDialog( QStringList &completions ) +TQString InsertElement::showDialog( TQStringList &completions ) { - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget( page ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); KHistoryCombo *combo = new KHistoryCombo( page, "value" ); combo->setHistoryItems( completions, true ); - connect( combo->lineEdit(), SIGNAL(textChanged ( const QString & )), - this, SLOT(slotHistoryTextChanged(const QString &)) ); - QString text = i18n( "Enter XML tag name and attributes (\"<\", \">\" and closing tag will be supplied):" ); - QLabel *label = new QLabel( text, page, "insert" ); + connect( combo->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )), + this, TQT_SLOT(slotHistoryTextChanged(const TQString &)) ); + TQString text = i18n( "Enter XML tag name and attributes (\"<\", \">\" and closing tag will be supplied):" ); + TQLabel *label = new TQLabel( text, page, "insert" ); topLayout->addWidget( label ); topLayout->addWidget( combo ); @@ -1135,7 +1135,7 @@ QString InsertElement::showDialog( QStringList &completions ) if( exec() ) return combo->currentText(); - return QString::null; + return TQString::null; } //END InsertElement dialog // kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 9be61c7..843ab15 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -25,11 +25,11 @@ #include "pseudo_dtd.h" -#include <qdict.h> -#include <qstring.h> -#include <qlistbox.h> -#include <qprogressdialog.h> -#include <qintdict.h> +#include <tqdict.h> +#include <tqstring.h> +#include <tqlistbox.h> +#include <tqprogressdialog.h> +#include <tqintdict.h> #include <kate/plugin.h> #include <kate/application.h> @@ -52,7 +52,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateXMLTools( QObject* parent = 0, const char* name = 0, const QStringList& = QStringList() ); + PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); @@ -64,52 +64,52 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface void slotInsertElement(); void slotCloseElement(); - void filterInsertString( KTextEditor::CompletionEntry *ce, QString *str ); + void filterInsertString( KTextEditor::CompletionEntry *ce, TQString *str ); void completionDone( KTextEditor::CompletionEntry completionEntry ); void completionAborted(); void slotFinished( KIO::Job *job ); - void slotData( KIO::Job *, const QByteArray &data ); + void slotData( KIO::Job *, const TQByteArray &data ); void backspacePressed(); void emptyKeyEvent(); - void keyEvent( int, int, const QString & ); + void keyEvent( int, int, const TQString & ); /// Connected to the document manager, to manage the dtd collection. void slotDocumentDeleted( uint n ); protected: - static QStringList sortQStringList( QStringList list ); - //bool eventFilter( QObject *object, QEvent *event ); + static TQStringList sortQStringList( TQStringList list ); + //bool eventFilter( TQObject *object, TQEvent *event ); - QString insideTag( Kate::View &kv ); - QString insideAttribute( Kate::View &kv ); + TQString insideTag( Kate::View &kv ); + TQString insideAttribute( Kate::View &kv ); - bool isOpeningTag( QString tag ); - bool isClosingTag( QString tag ); - bool isEmptyTag( QString tag ); - bool isQuote( QString ch ); + bool isOpeningTag( TQString tag ); + bool isClosingTag( TQString tag ); + bool isEmptyTag( TQString tag ); + bool isQuote( TQString ch ); - QString getParentElement( Kate::View &view, bool ignoreSingleBracket ); + TQString getParentElement( Kate::View &view, bool ignoreSingleBracket ); enum Mode {none, entities, attributevalues, attributes, elements}; enum PopupMode {noPopup, tagname, attributename, attributevalue, entityname}; - QValueList<KTextEditor::CompletionEntry> stringListToCompletionEntryList( QStringList list ); + TQValueList<KTextEditor::CompletionEntry> stringListToCompletionEntryList( TQStringList list ); /// Assign the PseudoDTD @p dtd to the Kate::Document @p doc void assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ); /// temporary placeholder for the metaDTD file - QString m_dtdString; + TQString m_dtdString; /// temporary placeholder for the document to assign a DTD to while the file is loaded KTextEditor::Document *m_docToAssignTo; /// URL of the last loaded meta DTD - QString m_urlString; + TQString m_urlString; uint m_lastLine, m_lastCol; - QStringList m_lastAllowed; + TQStringList m_lastAllowed; int m_popupOpenCol; Mode m_mode; @@ -119,12 +119,12 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface KTextEditor::CodeCompletionInterface* m_codeInterface; /// maps KTE::Document::docNumber -> DTD - QIntDict<PseudoDTD> m_docDtds; + TQIntDict<PseudoDTD> m_docDtds; /// maps DTD filename -> DTD - QDict<PseudoDTD> m_dtds; + TQDict<PseudoDTD> m_dtds; - QPtrList<class PluginView> m_views; + TQPtrList<class PluginView> m_views; void connectSlots( Kate::View *kv ); void disconnectSlots( Kate::View *kv ); @@ -138,11 +138,11 @@ class InsertElement : public KDialogBase Q_OBJECT public: - InsertElement( QWidget *parent, const char *name ); + InsertElement( TQWidget *parent, const char *name ); ~InsertElement(); - QString showDialog( QStringList &completions ); + TQString showDialog( TQStringList &completions ); private slots: - void slotHistoryTextChanged( const QString& ); + void slotHistoryTextChanged( const TQString& ); }; diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index b5c9cd1..05ac58a 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -24,8 +24,8 @@ #include <assert.h> -#include <qdom.h> -#include <qregexp.h> +#include <tqdom.h> +#include <tqregexp.h> #include <klocale.h> #include <kmessagebox.h> @@ -40,9 +40,9 @@ PseudoDTD::~PseudoDTD() { } -void PseudoDTD::analyzeDTD( QString &metaDtdUrl, QString &metaDtd ) +void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) { - QDomDocument doc( "dtdIn_xml" ); + TQDomDocument doc( "dtdIn_xml" ); if ( ! doc.setContent( metaDtd) ) { KMessageBox::error(0, i18n("The file '%1' could not be parsed. " @@ -68,7 +68,7 @@ void PseudoDTD::analyzeDTD( QString &metaDtdUrl, QString &metaDtd ) // count this twice, as it will be iterated twice ( TODO: optimize that? ): listLength += doc.elementsByTagName( "attlist" ).count() * 2; - QProgressDialog progress( i18n("Analyzing meta DTD..."), i18n("Cancel"), listLength, + TQProgressDialog progress( i18n("Analyzing meta DTD..."), i18n("Cancel"), listLength, 0, "progress", TRUE ); progress.setMinimumDuration( 400 ); progress.setProgress(0); @@ -97,16 +97,16 @@ void PseudoDTD::analyzeDTD( QString &metaDtdUrl, QString &metaDtd ) * Iterate through the XML to get a mapping which sub-elements are allowed for * all elements. */ -bool PseudoDTD::parseElements( QDomDocument *doc, QProgressDialog *progress ) +bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) { m_elementsList.clear(); // We only display a list, i.e. we pretend that the content model is just // a set, so we use a map. This is necessay e.g. for xhtml 1.0's head element, // which would otherwise display some elements twice. - QMap<QString,bool> subelementList; // the bool is not used + TQMap<TQString,bool> subelementList; // the bool is not used - QDomNodeList list = doc->elementsByTagName( "element" ); + TQDomNodeList list = doc->elementsByTagName( "element" ); uint listLength = list.count(); // speedup (really! ) for( uint i = 0; i < listLength; i++ ) @@ -119,57 +119,57 @@ bool PseudoDTD::parseElements( QDomDocument *doc, QProgressDialog *progress ) //qApp->processEvents(); subelementList.clear(); - QDomNode node = list.item( i ); - QDomElement elem = node.toElement(); + TQDomNode node = list.item( i ); + TQDomElement elem = node.toElement(); if( !elem.isNull() ) { // Enter the expanded content model, which may also include stuff not allowed. // We do not care if it's a <sequence-group> or whatever. - QDomNodeList contentModelList = elem.elementsByTagName( "content-model-expanded" ); - QDomNode contentModelNode = contentModelList.item(0); - QDomElement contentModelElem = contentModelNode.toElement(); + TQDomNodeList contentModelList = elem.elementsByTagName( "content-model-expanded" ); + TQDomNode contentModelNode = contentModelList.item(0); + TQDomElement contentModelElem = contentModelNode.toElement(); if( ! contentModelElem.isNull() ) { // check for <pcdata/>: - QDomNodeList pcdataList = contentModelElem.elementsByTagName( "pcdata" ); + TQDomNodeList pcdataList = contentModelElem.elementsByTagName( "pcdata" ); // check for other sub elements: - QDomNodeList subList = contentModelElem.elementsByTagName( "element-name" ); + TQDomNodeList subList = contentModelElem.elementsByTagName( "element-name" ); uint subListLength = subList.count(); for( uint l = 0; l < subListLength; l++ ) { - QDomNode subNode = subList.item(l); - QDomElement subElem = subNode.toElement(); + TQDomNode subNode = subList.item(l); + TQDomElement subElem = subNode.toElement(); if( !subElem.isNull() ) subelementList[subElem.attribute( "name" )] = true; } // anders: check if this is an EMPTY element, and put "__EMPTY" in the // sub list, so that we can insert tags in empty form if required. - QDomNodeList emptyList = elem.elementsByTagName( "empty" ); + TQDomNodeList emptyList = elem.elementsByTagName( "empty" ); if ( emptyList.count() ) subelementList["__EMPTY"] = true; } // Now remove the elements not allowed (e.g. <a> is explicitely not allowed in <a> // in the HTML 4.01 Strict DTD): - QDomNodeList exclusionsList = elem.elementsByTagName( "exclusions" ); + TQDomNodeList exclusionsList = elem.elementsByTagName( "exclusions" ); if( exclusionsList.length() > 0 ) { // sometimes there are no exclusions ( e.g. in XML DTDs there are never exclusions ) - QDomNode exclusionsNode = exclusionsList.item(0); - QDomElement exclusionsElem = exclusionsNode.toElement(); + TQDomNode exclusionsNode = exclusionsList.item(0); + TQDomElement exclusionsElem = exclusionsNode.toElement(); if( ! exclusionsElem.isNull() ) { - QDomNodeList subList = exclusionsElem.elementsByTagName( "element-name" ); + TQDomNodeList subList = exclusionsElem.elementsByTagName( "element-name" ); uint subListLength = subList.count(); for( uint l = 0; l < subListLength; l++ ) { - QDomNode subNode = subList.item(l); - QDomElement subElem = subNode.toElement(); + TQDomNode subNode = subList.item(l); + TQDomElement subElem = subNode.toElement(); if( !subElem.isNull() ) { - QMap<QString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) ); + TQMap<TQString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) ); if( it != subelementList.end() ) subelementList.remove(it); } @@ -178,8 +178,8 @@ bool PseudoDTD::parseElements( QDomDocument *doc, QProgressDialog *progress ) } // turn the map into a list: - QStringList subelementListTmp; - QMap<QString,bool>::Iterator it; + TQStringList subelementListTmp; + TQMap<TQString,bool>::Iterator it; for( it = subelementList.begin(); it != subelementList.end(); ++it ) subelementListTmp.append( it.key() ); @@ -196,12 +196,12 @@ bool PseudoDTD::parseElements( QDomDocument *doc, QProgressDialog *progress ) * a list of allowed elements, but it doesn't care about order or if only a certain * number of occurences is allowed. */ -QStringList PseudoDTD::allowedElements( QString parentElement ) +TQStringList PseudoDTD::allowedElements( TQString parentElement ) { if( m_sgmlSupport ) { // find the matching element, ignoring case: - QMap<QString,QStringList>::Iterator it; + TQMap<TQString,TQStringList>::Iterator it; for( it = m_elementsList.begin(); it != m_elementsList.end(); ++it ) { if( it.key().lower() == parentElement.lower() ) @@ -211,18 +211,18 @@ QStringList PseudoDTD::allowedElements( QString parentElement ) else if( m_elementsList.contains(parentElement) ) return m_elementsList[parentElement]; - return QStringList(); + return TQStringList(); } /** * Iterate through the XML to get a mapping which attributes are allowed inside * all elements. */ -bool PseudoDTD::parseAttributes( QDomDocument *doc, QProgressDialog *progress ) +bool PseudoDTD::parseAttributes( TQDomDocument *doc, TQProgressDialog *progress ) { m_attributesList.clear(); -// QStringList allowedAttributes; - QDomNodeList list = doc->elementsByTagName( "attlist" ); +// TQStringList allowedAttributes; + TQDomNodeList list = doc->elementsByTagName( "attlist" ); uint listLength = list.count(); for( uint i = 0; i < listLength; i++ ) @@ -235,16 +235,16 @@ bool PseudoDTD::parseAttributes( QDomDocument *doc, QProgressDialog *progress ) //qApp->processEvents(); ElementAttributes attrs; - QDomNode node = list.item(i); - QDomElement elem = node.toElement(); + TQDomNode node = list.item(i); + TQDomElement elem = node.toElement(); if( !elem.isNull() ) { - QDomNodeList attributeList = elem.elementsByTagName( "attribute" ); + TQDomNodeList attributeList = elem.elementsByTagName( "attribute" ); uint attributeListLength = attributeList.count(); for( uint l = 0; l < attributeListLength; l++ ) { - QDomNode attributeNode = attributeList.item(l); - QDomElement attributeElem = attributeNode.toElement(); + TQDomNode attributeNode = attributeList.item(l); + TQDomElement attributeElem = attributeNode.toElement(); if( ! attributeElem.isNull() ) { @@ -263,12 +263,12 @@ bool PseudoDTD::parseAttributes( QDomDocument *doc, QProgressDialog *progress ) /** Check which attributes are allowed for an element. */ -QStringList PseudoDTD::allowedAttributes( QString element ) +TQStringList PseudoDTD::allowedAttributes( TQString element ) { if( m_sgmlSupport ) { // find the matching element, ignoring case: - QMap<QString,ElementAttributes>::Iterator it; + TQMap<TQString,ElementAttributes>::Iterator it; for( it = m_attributesList.begin(); it != m_attributesList.end(); ++it ) { if( it.key().lower() == element.lower() ) { return it.data().optionalAttributes + it.data().requiredAttributes; @@ -278,14 +278,14 @@ QStringList PseudoDTD::allowedAttributes( QString element ) else if( m_attributesList.contains(element) ) return m_attributesList[element].optionalAttributes + m_attributesList[element].requiredAttributes; - return QStringList(); + return TQStringList(); } -QStringList PseudoDTD::requiredAttributes( const QString &element ) const +TQStringList PseudoDTD::requiredAttributes( const TQString &element ) const { if ( m_sgmlSupport ) { - QMap<QString,ElementAttributes>::ConstIterator it; + TQMap<TQString,ElementAttributes>::ConstIterator it; for( it = m_attributesList.begin(); it != m_attributesList.end(); ++it ) { if( it.key().lower() == element.lower() ) @@ -295,18 +295,18 @@ QStringList PseudoDTD::requiredAttributes( const QString &element ) const else if( m_attributesList.contains(element) ) return m_attributesList[element].requiredAttributes; - return QStringList(); + return TQStringList(); } /** * Iterate through the XML to get a mapping which attribute values are allowed * for all attributes inside all elements. */ -bool PseudoDTD::parseAttributeValues( QDomDocument *doc, QProgressDialog *progress ) +bool PseudoDTD::parseAttributeValues( TQDomDocument *doc, TQProgressDialog *progress ) { m_attributevaluesList.clear(); // 1 element : n possible attributes - QMap<QString,QStringList> attributevaluesTmp; // 1 attribute : n possible values - QDomNodeList list = doc->elementsByTagName( "attlist" ); + TQMap<TQString,TQStringList> attributevaluesTmp; // 1 attribute : n possible values + TQDomNodeList list = doc->elementsByTagName( "attlist" ); uint listLength = list.count(); for( uint i = 0; i < listLength; i++ ) @@ -319,21 +319,21 @@ bool PseudoDTD::parseAttributeValues( QDomDocument *doc, QProgressDialog *progre //qApp->processEvents(); attributevaluesTmp.clear(); - QDomNode node = list.item(i); - QDomElement elem = node.toElement(); + TQDomNode node = list.item(i); + TQDomElement elem = node.toElement(); if( !elem.isNull() ) { // Enter the list of <attribute>: - QDomNodeList attributeList = elem.elementsByTagName( "attribute" ); + TQDomNodeList attributeList = elem.elementsByTagName( "attribute" ); uint attributeListLength = attributeList.count(); for( uint l = 0; l < attributeListLength; l++ ) { - QDomNode attributeNode = attributeList.item(l); - QDomElement attributeElem = attributeNode.toElement(); + TQDomNode attributeNode = attributeList.item(l); + TQDomElement attributeElem = attributeNode.toElement(); if( ! attributeElem.isNull() ) { - QString value = attributeElem.attribute( "value" ); - attributevaluesTmp.insert( attributeElem.attribute("name"), QStringList::split(QRegExp(" "), value) ); + TQString value = attributeElem.attribute( "value" ); + attributevaluesTmp.insert( attributeElem.attribute("name"), TQStringList::split(TQRegExp(" "), value) ); } } m_attributevaluesList.insert( elem.attribute("name"), attributevaluesTmp ); @@ -347,19 +347,19 @@ bool PseudoDTD::parseAttributeValues( QDomDocument *doc, QProgressDialog *progre * (the element is necessary because e.g. "href" inside <a> could be different * to an "href" inside <link>): */ -QStringList PseudoDTD::attributeValues( QString element, QString attribute ) +TQStringList PseudoDTD::attributeValues( TQString element, TQString attribute ) { // Direct access would be faster than iteration of course but not always correct, // because we need to be case-insensitive. if( m_sgmlSupport ) { // first find the matching element, ignoring case: - QMap< QString,QMap<QString,QStringList> >::Iterator it; + TQMap< TQString,TQMap<TQString,TQStringList> >::Iterator it; for( it = m_attributevaluesList.begin(); it != m_attributevaluesList.end(); ++it ) { if( it.key().lower() == element.lower() ) { - QMap<QString,QStringList> attrVals = it.data(); - QMap<QString,QStringList>::Iterator itV; + TQMap<TQString,TQStringList> attrVals = it.data(); + TQMap<TQString,TQStringList>::Iterator itV; // then find the matching attribute for that element, ignoring case: for( itV = attrVals.begin(); itV != attrVals.end(); ++itV ) { @@ -371,23 +371,23 @@ QStringList PseudoDTD::attributeValues( QString element, QString attribute ) } else if( m_attributevaluesList.contains(element) ) { - QMap<QString,QStringList> attrVals = m_attributevaluesList[element]; + TQMap<TQString,TQStringList> attrVals = m_attributevaluesList[element]; if( attrVals.contains(attribute) ) return attrVals[attribute]; } // no predefined values available: - return QStringList(); + return TQStringList(); } /** * Iterate through the XML to get a mapping of all entity names and their expanded * version, e.g. nbsp =>  . Parameter entities are ignored. */ -bool PseudoDTD::parseEntities( QDomDocument *doc, QProgressDialog *progress ) +bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress ) { m_entityList.clear(); - QDomNodeList list = doc->elementsByTagName( "entity" ); + TQDomNodeList list = doc->elementsByTagName( "entity" ); uint listLength = list.count(); for( uint i = 0; i < listLength; i++ ) @@ -398,36 +398,36 @@ bool PseudoDTD::parseEntities( QDomDocument *doc, QProgressDialog *progress ) progress->setProgress( progress->progress()+1 ); //FIXME!! //qApp->processEvents(); - QDomNode node = list.item(i); - QDomElement elem = node.toElement(); + TQDomNode node = list.item(i); + TQDomElement elem = node.toElement(); if( !elem.isNull() && elem.attribute( "type" ) != "param" ) { // TODO: what's cdata <-> gen ? - QDomNodeList expandedList = elem.elementsByTagName( "text-expanded" ); - QDomNode expandedNode = expandedList.item(0); - QDomElement expandedElem = expandedNode.toElement(); + TQDomNodeList expandedList = elem.elementsByTagName( "text-expanded" ); + TQDomNode expandedNode = expandedList.item(0); + TQDomElement expandedElem = expandedNode.toElement(); if( ! expandedElem.isNull() ) { - QString exp = expandedElem.text(); + 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(QRegExp("^&#x[a-zA-Z0-9]+;$")) ) { + if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { // hexadecimal numbers, e.g. "ȶ" uint end = exp.find( ";" ); exp = exp.mid( 3, end-3 ); - exp = QChar(); - } else if( exp.contains(QRegExp("^&#[0-9]+;$")) ) { + exp = TQChar(); + } else if( exp.contains(TQRegExp("^&#[0-9]+;$")) ) { // decimal numbers, e.g. "ì" uint end = exp.find( ";" ); exp = exp.mid( 2, end-2 ); - exp = QChar( exp.toInt() ); + exp = TQChar( exp.toInt() ); } */ m_entityList.insert( elem.attribute("name"), exp ); } else { - m_entityList.insert( elem.attribute("name"), QString() ); + m_entityList.insert( elem.attribute("name"), TQString() ); } } } @@ -437,21 +437,21 @@ bool PseudoDTD::parseEntities( QDomDocument *doc, QProgressDialog *progress ) /** * Get a list of all ( non-parameter ) entities that start with a certain string. */ -QStringList PseudoDTD::entities( QString start ) +TQStringList PseudoDTD::entities( TQString start ) { - QStringList entities; - QMap<QString,QString>::Iterator it; + TQStringList entities; + TQMap<TQString,TQString>::Iterator it; for( it = m_entityList.begin(); it != m_entityList.end(); ++it ) { if( (*it).startsWith(start) ) { - QString str = it.key(); + TQString str = it.key(); /* TODO: show entities as unicode character if( !it.data().isEmpty() ) { //str += " -- " + it.data(); - QRegExp re( "&#(\\d+);" ); + TQRegExp re( "&#(\\d+);" ); if( re.search(it.data()) != -1 ) { uint ch = re.cap( 1).toUInt(); - str += " -- " + QChar( ch).decomposition(); + str += " -- " + TQChar( ch).decomposition(); } //kdDebug() << "#" << it.data() << endl; } diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h index f5cf37e..5da444c 100644 --- a/kate/xmltools/pseudo_dtd.h +++ b/kate/xmltools/pseudo_dtd.h @@ -23,8 +23,8 @@ #ifndef _PLUGIN_KANT_XMLTOOLS_DTD_H #define _PLUGIN_KANT_XMLTOOLS_DTD_H -#include <qdom.h> -#include <qprogressdialog.h> +#include <tqdom.h> +#include <tqprogressdialog.h> /** * This class contains the attributes for one element. @@ -33,8 +33,8 @@ class ElementAttributes { public: - QStringList optionalAttributes; - QStringList requiredAttributes; + TQStringList optionalAttributes; + TQStringList requiredAttributes; }; class PseudoDTD @@ -44,31 +44,31 @@ class PseudoDTD PseudoDTD(); ~PseudoDTD(); - void analyzeDTD( QString &metaDtdUrl, QString &metaDtd ); + void analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ); - QStringList allowedElements( QString parentElement ); - QStringList allowedAttributes( QString parentElement ); - QStringList attributeValues( QString element, QString attribute ); - QStringList entities( QString start ); - QStringList requiredAttributes( const QString &parentElement ) const; + TQStringList allowedElements( TQString parentElement ); + TQStringList allowedAttributes( TQString parentElement ); + TQStringList attributeValues( TQString element, TQString attribute ); + TQStringList entities( TQString start ); + TQStringList requiredAttributes( const TQString &parentElement ) const; protected: - bool parseElements( QDomDocument *doc, QProgressDialog *progress ); - bool parseAttributes( QDomDocument *doc, QProgressDialog *progress ); - bool parseAttributeValues( QDomDocument *doc, QProgressDialog *progress ); - bool parseEntities( QDomDocument *doc, QProgressDialog *progress ); + bool parseElements( TQDomDocument *doc, TQProgressDialog *progress ); + bool parseAttributes( TQDomDocument *doc, TQProgressDialog *progress ); + bool parseAttributeValues( TQDomDocument *doc, TQProgressDialog *progress ); + bool parseEntities( TQDomDocument *doc, TQProgressDialog *progress ); bool m_sgmlSupport; // Entities, e.g. <"nbsp", "160"> - QMap<QString,QString> m_entityList; + TQMap<TQString,TQString> m_entityList; // Elements, e.g. <"a", ( "b", "i", "em", "strong" )> - QMap<QString,QStringList> m_elementsList; + TQMap<TQString,TQStringList> m_elementsList; // Attributes e.g. <"a", ( "href", "lang", "title" )> - QMap<QString,ElementAttributes> m_attributesList; + TQMap<TQString,ElementAttributes> m_attributesList; // Attribute values e.g. <"td", <"align", ( "left", "right", "justify" )>> - QMap< QString,QMap<QString,QStringList> > m_attributevaluesList; + TQMap< TQString,TQMap<TQString,TQStringList> > m_attributevaluesList; }; diff --git a/kfile-plugins/cert/kfile_cert.cpp b/kfile-plugins/cert/kfile_cert.cpp index 78c20f5..8a711ba 100644 --- a/kfile-plugins/cert/kfile_cert.cpp +++ b/kfile-plugins/cert/kfile_cert.cpp @@ -29,17 +29,17 @@ //#include <kdebug.h> //#include <kio/global.h> -#include <qdatetime.h> -#include <qfile.h> -#include <qcstring.h> -//#include <qfileinfo.h> -//#include <qdir.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqcstring.h> +//#include <tqfileinfo.h> +//#include <tqdir.h> typedef KGenericFactory<CertPlugin> CertFactory; K_EXPORT_COMPONENT_FACTORY(kfile_cert, CertFactory("kfile-cert")) -CertPlugin::CertPlugin(QObject *parent, const char *name, const QStringList &args) +CertPlugin::CertPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) { //add the mimetype here - example: @@ -51,41 +51,41 @@ CertPlugin::CertPlugin(QObject *parent, const char *name, const QStringList &arg KFileMimeTypeInfo::ItemInfo* item; group = addGroupInfo(info, "certInfo", i18n("Certificate Information")); - item = addItemInfo(group, "ValidFrom", i18n("Valid From"), QVariant::DateTime); - item = addItemInfo(group, "ValidUntil", i18n("Valid Until"), QVariant::DateTime); - item = addItemInfo(group, "State", i18n("State"), QVariant::String); - item = addItemInfo(group, "SerialNo", i18n("Serial Number"), QVariant::String); + item = addItemInfo(group, "ValidFrom", i18n("Valid From"), TQVariant::DateTime); + item = addItemInfo(group, "ValidUntil", i18n("Valid Until"), TQVariant::DateTime); + item = addItemInfo(group, "State", i18n("State"), TQVariant::String); + item = addItemInfo(group, "SerialNo", i18n("Serial Number"), TQVariant::String); group = addGroupInfo(info, "certSubjectInfo", i18n("Subject")); - item = addItemInfo(group, "O", i18n("Organization"), QVariant::String); - item = addItemInfo(group, "OU", i18n("Organizational Unit"), QVariant::String); - item = addItemInfo(group, "L", i18n("Locality"), QVariant::String); - item = addItemInfo(group, "C", i18n("Country"), QVariant::String); - item = addItemInfo(group, "CN", i18n("Common Name"), QVariant::String); - item = addItemInfo(group, "E", i18n("Email"), QVariant::String); + item = addItemInfo(group, "O", i18n("Organization"), TQVariant::String); + item = addItemInfo(group, "OU", i18n("Organizational Unit"), TQVariant::String); + item = addItemInfo(group, "L", i18n("Locality"), TQVariant::String); + item = addItemInfo(group, "C", i18n("Country"), TQVariant::String); + item = addItemInfo(group, "CN", i18n("Common Name"), TQVariant::String); + item = addItemInfo(group, "E", i18n("Email"), TQVariant::String); group = addGroupInfo(info, "certIssuerInfo", i18n("Issuer")); - item = addItemInfo(group, "O", i18n("Organization"), QVariant::String); - item = addItemInfo(group, "OU", i18n("Organizational Unit"), QVariant::String); - item = addItemInfo(group, "L", i18n("Locality"), QVariant::String); - item = addItemInfo(group, "C", i18n("Country"), QVariant::String); - item = addItemInfo(group, "CN", i18n("Common Name"), QVariant::String); - item = addItemInfo(group, "E", i18n("Email"), QVariant::String); + item = addItemInfo(group, "O", i18n("Organization"), TQVariant::String); + item = addItemInfo(group, "OU", i18n("Organizational Unit"), TQVariant::String); + item = addItemInfo(group, "L", i18n("Locality"), TQVariant::String); + item = addItemInfo(group, "C", i18n("Country"), TQVariant::String); + item = addItemInfo(group, "CN", i18n("Common Name"), TQVariant::String); + item = addItemInfo(group, "E", i18n("Email"), TQVariant::String); //setUnit(item, KFileMimeTypeInfo::KiloBytes); // strings are possible, too: - //addItemInfo(group, "Text", i18n("Document Type"), QVariant::String); + //addItemInfo(group, "Text", i18n("Document Type"), TQVariant::String); } -void CertPlugin::appendDNItems(KFileMetaInfoGroup &group, const QString &DN) +void CertPlugin::appendDNItems(KFileMetaInfoGroup &group, const TQString &DN) { KSSLX509Map map(DN); - QString value; - //QString dbg; - QStringList keys = group.supportedKeys(); - QStringList::ConstIterator end = keys.end(); - for (QStringList::ConstIterator it = keys.begin(); it != end; ++it) { + TQString value; + //TQString dbg; + TQStringList keys = group.supportedKeys(); + TQStringList::ConstIterator end = keys.end(); + for (TQStringList::ConstIterator it = keys.begin(); it != end; ++it) { value = map.getValue(*it); //dbg += *it + " = " + value + "; "; if (!value.isNull()) appendItem(group, *it, value); @@ -93,16 +93,16 @@ void CertPlugin::appendDNItems(KFileMetaInfoGroup &group, const QString &DN) } } -static KSSLCertificate *readCertFromFile(const QString &path) +static KSSLCertificate *readCertFromFile(const TQString &path) { KSSLCertificate *ret = NULL; - QFile file(path); + TQFile file(path); if (!file.open(IO_ReadOnly)) return NULL; - QByteArray file_data = file.readAll(); + TQByteArray file_data = file.readAll(); file.close(); - QCString file_string = QCString(file_data.data(), file_data.size()); + TQCString file_string = TQCString(file_data.data(), file_data.size()); // try as is: ret = KSSLCertificate::fromString(file_string); if (ret) return ret; @@ -116,7 +116,7 @@ static KSSLCertificate *readCertFromFile(const QString &path) int end_pos = file_string.find(end_line, begin_pos); if (end_pos >= 0) { // read the data between begin and end lines - QCString body = file_string.mid(begin_pos, end_pos - begin_pos); + TQCString body = file_string.mid(begin_pos, end_pos - begin_pos); ret = KSSLCertificate::fromString(body); return ret; // even if it's NULL, we can't help it } diff --git a/kfile-plugins/cert/kfile_cert.h b/kfile-plugins/cert/kfile_cert.h index 544ef39..4ecb7a2 100644 --- a/kfile-plugins/cert/kfile_cert.h +++ b/kfile-plugins/cert/kfile_cert.h @@ -32,9 +32,9 @@ class QString; class CertPlugin: public KFilePlugin { Q_OBJECT private: - void appendDNItems(KFileMetaInfoGroup &group, const QString &DN); + void appendDNItems(KFileMetaInfoGroup &group, const TQString &DN); public: - CertPlugin(QObject *parent, const char *name, const QStringList& args); + CertPlugin(TQObject *parent, 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 3a78dbc..5c56d9e 100644 --- a/kfile-plugins/desktop/kfile_desktop.cpp +++ b/kfile-plugins/desktop/kfile_desktop.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory<KDotDesktopPlugin> DotDesktopFactory; K_EXPORT_COMPONENT_FACTORY(kfile_desktop, DotDesktopFactory("kfile_desktop")) -KDotDesktopPlugin::KDotDesktopPlugin(QObject *parent, const char *name, - const QStringList &preferredItems) +KDotDesktopPlugin::KDotDesktopPlugin(TQObject *parent, const char *name, + const TQStringList &preferredItems) : KFilePlugin(parent, name, preferredItems) { kdDebug(7034) << ".desktop plugin\n"; @@ -43,22 +43,22 @@ KDotDesktopPlugin::KDotDesktopPlugin(QObject *parent, const char *name, info = addMimeTypeInfo("application/x-desktop"); group = addGroupInfo(info, "General", i18n("General")); - item = addItemInfo(group, "Name", i18n("Name"), QVariant::String); + item = addItemInfo(group, "Name", i18n("Name"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Name); - item = addItemInfo(group, "Comment", i18n("Comment"), QVariant::String); + item = addItemInfo(group, "Comment", i18n("Comment"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Description); - addItemInfo(group, "Type", i18n("Type"), QVariant::String); + addItemInfo(group, "Type", i18n("Type"), TQVariant::String); - addItemInfo(group, "Device", i18n("Device"), QVariant::String); - addItemInfo(group, "Mount Point", i18n("Mount Point"), QVariant::String); - addItemInfo(group, "File System", i18n("File System"), QVariant::String); - addItemInfo(group, "Writable", i18n("Writable"), QVariant::Bool); + addItemInfo(group, "Device", i18n("Device"), TQVariant::String); + addItemInfo(group, "Mount Point", i18n("Mount Point"), TQVariant::String); + addItemInfo(group, "File System", i18n("File System"), TQVariant::String); + addItemInfo(group, "Writable", i18n("Writable"), TQVariant::Bool); - addItemInfo(group, "File Type", i18n("File Type"), QVariant::String); - addItemInfo(group, "Service Type", i18n("Service Type"), QVariant::String); - addItemInfo(group, "Preferred Items", i18n("Preferred Items"), QVariant::String); - addItemInfo(group, "Link To", i18n("Link To"), QVariant::String); + addItemInfo(group, "File Type", i18n("File Type"), TQVariant::String); + addItemInfo(group, "Service Type", i18n("Service Type"), TQVariant::String); + addItemInfo(group, "Preferred Items", i18n("Preferred Items"), TQVariant::String); + addItemInfo(group, "Link To", i18n("Link To"), TQVariant::String); } bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint ) @@ -68,7 +68,7 @@ bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint ) KDesktopFile file(info.path(), true); - QString s; + TQString s; KFileMetaInfoGroup group = appendGroup(info, "General"); @@ -78,7 +78,7 @@ bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint ) s = file.readComment(); if (!s.isEmpty()) appendItem(group, "Comment", s); - QString type = file.readType(); + TQString type = file.readType(); if (type == "FSDevice") { appendItem(group, "Type", i18n("Device")); @@ -93,7 +93,7 @@ bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint ) if (!s.isEmpty()) appendItem(group, "File System", s); appendItem(group, "Writable", - QVariant(!file.readBoolEntry("ReadOnly", true), 42)); + TQVariant(!file.readBoolEntry("ReadOnly", true), 42)); } else if (type == "Service") @@ -107,18 +107,18 @@ bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint ) appendItem(group, "File Type", mt->comment()); } - QString sType = file.readEntry("ServiceTypes"); + TQString sType = file.readEntry("ServiceTypes"); appendItem(group, "Service Type", sType); if (sType == "KFilePlugin") { - QStringList preferred = file.readListEntry("PreferredItems"); + TQStringList preferred = file.readListEntry("PreferredItems"); appendItem(group, "Preferred Items", preferred); } } else if (type == "Link") { - QString url = file.readPathEntry("URL"); + TQString url = file.readPathEntry("URL"); appendItem(group, "Link To", url); } diff --git a/kfile-plugins/desktop/kfile_desktop.h b/kfile-plugins/desktop/kfile_desktop.h index 1001e22..0ef286e 100644 --- a/kfile-plugins/desktop/kfile_desktop.h +++ b/kfile-plugins/desktop/kfile_desktop.h @@ -30,8 +30,8 @@ class KDotDesktopPlugin: public KFilePlugin Q_OBJECT public: - KDotDesktopPlugin( QObject *parent, const char *name, - const QStringList& args ); + KDotDesktopPlugin( TQObject *parent, 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 911a2e5..fe4ea9a 100644 --- a/kfile-plugins/folder/kfile_folder.cpp +++ b/kfile-plugins/folder/kfile_folder.cpp @@ -23,15 +23,15 @@ #include <kgenericfactory.h> #include <kio/global.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqdir.h> typedef KGenericFactory<KFolderPlugin> KFolderFactory; K_EXPORT_COMPONENT_FACTORY(kfile_folder, KFolderFactory( "kfile_folder" )) -KFolderPlugin::KFolderPlugin(QObject *parent, const char *name, - const QStringList &args) +KFolderPlugin::KFolderPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { @@ -43,8 +43,8 @@ KFolderPlugin::KFolderPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Items", i18n("Items"), QVariant::Int); - item = addItemInfo(group, "Size", i18n("Size"), QVariant::Int); + item = addItemInfo(group, "Items", i18n("Items"), TQVariant::Int); + item = addItemInfo(group, "Size", i18n("Size"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::Bytes); } @@ -55,17 +55,17 @@ bool KFolderPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) if (info.path().isEmpty()) return false; - QDir dir; + TQDir dir; if ( !dir.cd(info.path()) ) return false; - const QPtrList<QFileInfo> *fileList = dir.entryInfoList(); + const TQPtrList<TQFileInfo> *fileList = dir.entryInfoList(); if (!fileList) return false; - QPtrListIterator<QFileInfo> list = QPtrListIterator<QFileInfo>(*fileList); + TQPtrListIterator<TQFileInfo> list = TQPtrListIterator<TQFileInfo>(*fileList); - QFileInfo* file; + TQFileInfo* file; int items = 0; KIO::filesize_t bytes = 0; diff --git a/kfile-plugins/folder/kfile_folder.h b/kfile-plugins/folder/kfile_folder.h index 602c369..96fcd16 100644 --- a/kfile-plugins/folder/kfile_folder.h +++ b/kfile-plugins/folder/kfile_folder.h @@ -29,7 +29,7 @@ class KFolderPlugin: public KFilePlugin Q_OBJECT public: - KFolderPlugin( QObject *parent, const char *name, const QStringList& args ); + KFolderPlugin( TQObject *parent, 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 bfe736b..5adddfc 100644 --- a/kfile-plugins/html/kfile_html.cpp +++ b/kfile-plugins/html/kfile_html.cpp @@ -25,17 +25,17 @@ #include <kurl.h> #include <kprocess.h> #include <kdebug.h> -#include <qcstring.h> -#include <qfile.h> -#include <qregexp.h> -#include <qtextcodec.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqtextcodec.h> typedef KGenericFactory<KHtmlPlugin> HtmlFactory; K_EXPORT_COMPONENT_FACTORY( kfile_html, HtmlFactory( "kfile_html" ) ) -KHtmlPlugin::KHtmlPlugin( QObject *parent, const char *name, - const QStringList &args ) +KHtmlPlugin::KHtmlPlugin( TQObject *parent, const char *name, + const TQStringList &args ) : KFilePlugin( parent, name, args ) { kdDebug(7034) << "html plugin\n"; @@ -46,13 +46,13 @@ KHtmlPlugin::KHtmlPlugin( QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; group = addGroupInfo(info, "General", i18n("General")); - addItemInfo(group, "Doctype", i18n("Document Type"), QVariant::String); - addItemInfo(group, "Javascript", i18n("JavaScript"), QVariant::Bool); - item = addItemInfo(group, "Title", i18n("Title"), QVariant::String); + addItemInfo(group, "Doctype", i18n("Document Type"), TQVariant::String); + addItemInfo(group, "Javascript", i18n("JavaScript"), TQVariant::Bool); + item = addItemInfo(group, "Title", i18n("Title"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Name); group = addGroupInfo(info, "Metatags", i18n("Meta Tags")); - addVariableInfo(group, QVariant::String, 0); + addVariableInfo(group, TQVariant::String, 0); } @@ -61,7 +61,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) if ( info.path().isEmpty() ) // remote file return false; - QFile f(info.path()); + TQFile f(info.path()); if (!f.open(IO_ReadOnly)) return false; @@ -70,14 +70,14 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) // 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); - QByteArray data(maxBufSize + 1); + TQByteArray data(maxBufSize + 1); f.readBlock(data.data(), maxBufSize); data[maxBufSize]='\0'; - QString s(data); + TQString s(data); int start=0, last=0; - QRegExp exp; + TQRegExp exp; exp.setCaseSensitive(false); exp.setMinimal(true); @@ -91,7 +91,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) last += exp.matchedLength(); } - QString title; + TQString title; exp.setPattern("<\\s*title\\s*>\\s*(.*)\\s*<\\s*/\\s*title\\s*>"); if (exp.search(s, last) != -1) { @@ -101,12 +101,12 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) KFileMetaInfoGroup metatags = appendGroup(info, "Metatags"); - QString meta, name, content; + TQString meta, name, content; exp.setPattern("<\\s*meta\\s*([^>]*)\\s*>"); - QRegExp rxName("(?:name|http-equiv)\\s*=\\s*\"([^\"]+)\"", false); - QRegExp rxContent("content\\s*=\\s*\"([^\"]+)\"", false); - QRegExp rxCharset("charset\\s*=\\s*(.*)", false); - QTextCodec *codec = 0; + TQRegExp rxName("(?:name|http-equiv)\\s*=\\s*\"([^\"]+)\"", false); + TQRegExp rxContent("content\\s*=\\s*\"([^\"]+)\"", false); + TQRegExp rxCharset("charset\\s*=\\s*(.*)", false); + TQTextCodec *codec = 0; // find the meta tags last = 0; @@ -133,7 +133,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) if ( rxCharset.search(content) != -1 ) { kdDebug(7034) << "CodecForName : " << rxCharset.cap(1) << endl; - codec = QTextCodec::codecForName(rxCharset.cap(1).ascii()); + codec = TQTextCodec::codecForName(rxCharset.cap(1).ascii()); } } @@ -151,7 +151,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) // find out if it contains javascript exp.setPattern("<script>"); - appendItem(group, "Javascript", QVariant( s.find(exp)!=-1, 42)); + appendItem(group, "Javascript", TQVariant( s.find(exp)!=-1, 42)); return true; } diff --git a/kfile-plugins/html/kfile_html.h b/kfile-plugins/html/kfile_html.h index 4d9eec6..adf2046 100644 --- a/kfile-plugins/html/kfile_html.h +++ b/kfile-plugins/html/kfile_html.h @@ -31,7 +31,7 @@ class KHtmlPlugin: public KFilePlugin Q_OBJECT public: - KHtmlPlugin( QObject *parent, const char *name, const QStringList& args ); + KHtmlPlugin( TQObject *parent, 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 6d8ea94..eb9e106 100644 --- a/kfile-plugins/lnk/kfile_lnk.cpp +++ b/kfile-plugins/lnk/kfile_lnk.cpp @@ -35,8 +35,8 @@ K_EXPORT_COMPONENT_FACTORY(kfile_lnk, lnkFactory( "kfile_lnk" )) //-------------------------------------------------------------------------------- -lnkPlugin::lnkPlugin(QObject *parent, const char *name, - const QStringList &args) +lnkPlugin::lnkPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-win-lnk" ); @@ -48,12 +48,12 @@ lnkPlugin::lnkPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; // our new items in the group - item = addItemInfo(group, "TargetSize", i18n("Size of Target"), QVariant::Int); + item = addItemInfo(group, "TargetSize", i18n("Size of Target"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::Bytes); - addItemInfo(group, "Where", i18n("Location"), QVariant::String); - addItemInfo(group, "PointsTo", i18n("Points To"), QVariant::String); - addItemInfo(group, "Description", i18n("Description"), QVariant::String); + addItemInfo(group, "Where", i18n("Location"), TQVariant::String); + addItemInfo(group, "PointsTo", i18n("Points To"), TQVariant::String); + addItemInfo(group, "Description", i18n("Description"), TQVariant::String); } //-------------------------------------------------------------------------------- @@ -76,7 +76,7 @@ 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", QString("%1%2").arg(lnkInfo.driveName).arg(lnkInfo.path)); + appendItem(group, "PointsTo", TQString("%1%2").arg(lnkInfo.driveName).arg(lnkInfo.path)); } else { diff --git a/kfile-plugins/lnk/kfile_lnk.h b/kfile-plugins/lnk/kfile_lnk.h index 3ee4ae8..6f48013 100644 --- a/kfile-plugins/lnk/kfile_lnk.h +++ b/kfile-plugins/lnk/kfile_lnk.h @@ -37,7 +37,7 @@ class lnkPlugin: public KFilePlugin Q_OBJECT public: - lnkPlugin( QObject *parent, const char *name, const QStringList& args ); + lnkPlugin( TQObject *parent, 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 a79a7db..af4492b 100644 --- a/kfile-plugins/lnk/lnkforward.cpp +++ b/kfile-plugins/lnk/lnkforward.cpp @@ -72,9 +72,9 @@ int LNKForwarder::run(KCmdLineArgs *args) bool ret = readLNK(args->arg(0), info); if ( ! ret ) return 1; - info.path.replace(QChar('\\'), QChar('/')); + info.path.replace(TQChar('\\'), TQChar('/')); - QString path; + TQString path; if ( info.isNetworkPath ) { @@ -109,8 +109,8 @@ int LNKForwarder::run(KCmdLineArgs *args) kdDebug(7034) << "running:" << path << endl; KRun * run = new KRun(path); - QObject::connect(run, SIGNAL(finished()), this, SLOT(delayedQuit())); - QObject::connect(run, SIGNAL(error()), this, SLOT(delayedQuit())); + TQObject::connect(run, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedQuit())); + TQObject::connect(run, TQT_SIGNAL(error()), this, TQT_SLOT(delayedQuit())); return exec(); } @@ -122,7 +122,7 @@ void LNKForwarder::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up // "app not found" in KProcessRunner, if that was the case. - QTimer::singleShot(2000, this, SLOT(deref())); + TQTimer::singleShot(2000, this, TQT_SLOT(deref())); } //-------------------------------------------------------------------------------- diff --git a/kfile-plugins/lnk/read_lnk.cpp b/kfile-plugins/lnk/read_lnk.cpp index 2d627fb..f65b657 100644 --- a/kfile-plugins/lnk/read_lnk.cpp +++ b/kfile-plugins/lnk/read_lnk.cpp @@ -62,7 +62,7 @@ bool readLNK(const KURL &url, LNKInfo &info) { const char* lnkFile = 0; - QString tempFile; + TQString tempFile; if ( KIO::NetAccess::download(url, tempFile, 0) ) lnkFile = tempFile.latin1(); else @@ -156,7 +156,7 @@ bool readLNK(const KURL &url, LNKInfo &info) { info.volumeName = (start + loc.localVolume + 0x10); // volume label - info.path = QString::null; + info.path = TQString::null; if ( *(start + loc.basePath) ) { @@ -181,7 +181,7 @@ bool readLNK(const KURL &url, LNKInfo &info) } else // network path { - info.path = QString("%1\\%2") + info.path = TQString("%1\\%2") .arg(start + loc.netVolume + 0x14) // network share name .arg(start + loc.pathname); } diff --git a/kfile-plugins/lnk/read_lnk.h b/kfile-plugins/lnk/read_lnk.h index da947a1..ff8fe63 100644 --- a/kfile-plugins/lnk/read_lnk.h +++ b/kfile-plugins/lnk/read_lnk.h @@ -24,7 +24,7 @@ #ifndef _READ_LNK_H_ #define _READ_LNK_H_ -#include <qstring.h> +#include <tqstring.h> class KURL; struct LNKInfo @@ -35,10 +35,10 @@ struct LNKInfo bool isNetworkPath; bool isDirectory; bool isFileOrDir; - QString volumeName; - QString driveName; - QString path; - QString description; + TQString volumeName; + TQString driveName; + TQString path; + TQString description; }; bool readLNK(const KURL &url, LNKInfo &info); diff --git a/kfile-plugins/mhtml/kfile_mhtml.cpp b/kfile-plugins/mhtml/kfile_mhtml.cpp index f9ef320..0a07ea9 100644 --- a/kfile-plugins/mhtml/kfile_mhtml.cpp +++ b/kfile-plugins/mhtml/kfile_mhtml.cpp @@ -24,48 +24,48 @@ #include <kgenericfactory.h> #include <kmdcodec.h> -#include <qstring.h> -#include <qcstring.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qtextcodec.h> +#include <tqstring.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> typedef KGenericFactory<mhtmlPlugin> mhtmlFactory; K_EXPORT_COMPONENT_FACTORY(kfile_mhtml, mhtmlFactory( "kfile_mhtml" )) -mhtmlPlugin::mhtmlPlugin(QObject *parent, const char *name, - const QStringList &args) +mhtmlPlugin::mhtmlPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-mimearchive" ); KFileMimeTypeInfo::GroupInfo* group = 0L; group = addGroupInfo(info, "mhtmlInfo", i18n("Document Information")); KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Subject", i18n("Subject"), QVariant::String); - item = addItemInfo(group, "Sender", i18n("Sender"), QVariant::String); - item = addItemInfo(group, "Recipient", i18n("Recipient"), QVariant::String); - item = addItemInfo(group, "CopyTo", i18n("CC"), QVariant::String); - item = addItemInfo(group, "BlindCopyTo", i18n("BCC"), QVariant::String); - item = addItemInfo(group, "Date", i18n("Date"), QVariant::String); + item = addItemInfo(group, "Subject", i18n("Subject"), TQVariant::String); + item = addItemInfo(group, "Sender", i18n("Sender"), TQVariant::String); + item = addItemInfo(group, "Recipient", i18n("Recipient"), TQVariant::String); + item = addItemInfo(group, "CopyTo", i18n("CC"), TQVariant::String); + item = addItemInfo(group, "BlindCopyTo", i18n("BCC"), TQVariant::String); + item = addItemInfo(group, "Date", i18n("Date"), TQVariant::String); } bool mhtmlPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) { - QString mSender; - QString mRecipient; - QString mCopyTo; - QString mBlindCopyTo; - QString mSubject; - QString mDate; + TQString mSender; + TQString mRecipient; + TQString mCopyTo; + TQString mBlindCopyTo; + TQString mSubject; + TQString mDate; bool canUnfold; if ( info.path().isEmpty() ) // remote file return false; - QFile f(info.path()); + TQFile f(info.path()); if (!f.open(IO_ReadOnly)) return false; - QTextStream stream(&f); - QString l=stream.readLine(); + TQTextStream stream(&f); + TQString l=stream.readLine(); int nFieldsFound = 0; while(!l.isEmpty()){ if(l.startsWith("From: ")) { @@ -95,7 +95,7 @@ bool mhtmlPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) }else if(l.startsWith(" ") || l.startsWith("\t")){ // unfold field if(canUnfold){ - QString tmp=l.stripWhiteSpace(); + TQString tmp=l.stripWhiteSpace(); if(nFieldsFound & 16) mBlindCopyTo=mBlindCopyTo+" "+tmp; else if(nFieldsFound & 8) mCopyTo=mCopyTo+" "+tmp; else if(nFieldsFound & 4) mSubject=mSubject+" "+tmp; @@ -119,19 +119,19 @@ bool mhtmlPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) return true; } -QString mhtmlPlugin::decodeRFC2047Phrase(const QString &msg, bool removeLessGreater){ +TQString mhtmlPlugin::decodeRFC2047Phrase(const TQString &msg, bool removeLessGreater){ int st=msg.find("=?"); int en=-1; - QString msgCopy=msg; - QString decodedText=msgCopy.left(st); - QString encodedText=msgCopy.mid(st); + TQString msgCopy=msg; + TQString decodedText=msgCopy.left(st); + TQString encodedText=msgCopy.mid(st); st=encodedText.find("=?"); while(st!=-1){ en=encodedText.find("?="); while(encodedText.mid(en+2,1)!=" " && en+2<(int)encodedText.length()) en=encodedText.find("?=",en+1); if(en==-1) break; decodedText+=encodedText.left(st); - QString tmp=encodedText.mid(st,en-st+2); + TQString tmp=encodedText.mid(st,en-st+2); encodedText=encodedText.mid(en+2); decodedText+=decodeRFC2047String(tmp); st=encodedText.find("=?",st+1); @@ -140,12 +140,12 @@ QString mhtmlPlugin::decodeRFC2047Phrase(const QString &msg, bool removeLessGrea // remove unwanted '<' and '>' if(removeLessGreater){ if(decodedText.stripWhiteSpace().startsWith("<") && decodedText.stripWhiteSpace().endsWith(">")){ - QString tmp=decodedText.stripWhiteSpace(); + TQString tmp=decodedText.stripWhiteSpace(); tmp=tmp.mid(1,tmp.length()-2); decodedText=tmp; }else{ - QString dec=decodedText; - QString tmp; + TQString dec=decodedText; + TQString tmp; st=decodedText.find("<"); while(st!=-1){ @@ -165,12 +165,12 @@ QString mhtmlPlugin::decodeRFC2047Phrase(const QString &msg, bool removeLessGrea return decodedText; } -QString mhtmlPlugin::decodeRFC2047String(const QString &msg){ - QString charset; - QString encoding; - QString notEncodedText; - QString encodedText; - QString decodedText; +TQString mhtmlPlugin::decodeRFC2047String(const TQString &msg){ + TQString charset; + TQString encoding; + TQString notEncodedText; + TQString encodedText; + TQString decodedText; int encEnd=0; if(msg.startsWith("=?") && (encEnd=msg.findRev("?="))!=-1){ notEncodedText=msg.mid(encEnd+2); @@ -183,13 +183,13 @@ QString mhtmlPlugin::decodeRFC2047String(const QString &msg){ if(encoding!="b" && encoding!="q") return msg; encodedText=encodedText.mid(questionMark+3); if(charset.find(" ")!=-1 && encodedText.find(" ")!=-1) return msg; - QCString tmpIn; - QCString tmpOut; + TQCString tmpIn; + TQCString tmpOut; tmpIn = encodedText.local8Bit(); if(encoding=="q")tmpOut=KCodecs::quotedPrintableDecode(tmpIn); else tmpOut=KCodecs::base64Decode(tmpIn); if(charset!="us-ascii"){ - QTextCodec *codec = QTextCodec::codecForName(charset.local8Bit()); + TQTextCodec *codec = TQTextCodec::codecForName(charset.local8Bit()); if(!codec) return msg; decodedText=codec->toUnicode(tmpOut); decodedText=decodedText.replace("_"," "); diff --git a/kfile-plugins/mhtml/kfile_mhtml.h b/kfile-plugins/mhtml/kfile_mhtml.h index dc29ec3..cb5abe9 100644 --- a/kfile-plugins/mhtml/kfile_mhtml.h +++ b/kfile-plugins/mhtml/kfile_mhtml.h @@ -34,11 +34,11 @@ class mhtmlPlugin: public KFilePlugin Q_OBJECT public: - mhtmlPlugin( QObject *parent, const char *name, const QStringList& args ); + mhtmlPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); private: - QString decodeRFC2047Phrase(const QString &msg, bool removeLessGreater=TRUE); - QString decodeRFC2047String(const QString &msg); + TQString decodeRFC2047Phrase(const TQString &msg, bool removeLessGreater=TRUE); + TQString decodeRFC2047String(const TQString &msg); }; #endif // __KFILE_MHTML_H__ diff --git a/kfile-plugins/txt/kfile_txt.cpp b/kfile-plugins/txt/kfile_txt.cpp index 02e166c..fbd1c8b 100644 --- a/kfile-plugins/txt/kfile_txt.cpp +++ b/kfile-plugins/txt/kfile_txt.cpp @@ -22,22 +22,22 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <qfile.h> -#include <qstringlist.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqregexp.h> typedef KGenericFactory<KTxtPlugin> TxtFactory; K_EXPORT_COMPONENT_FACTORY(kfile_txt, TxtFactory("kfile_txt")) -KTxtPlugin::KTxtPlugin(QObject *parent, const char *name, - const QStringList &args) : KFilePlugin(parent, name, args) +KTxtPlugin::KTxtPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { kdDebug(7034) << "Text file meta info plugin\n"; makeMimeTypeInfo( "text/plain" ); } -void KTxtPlugin::makeMimeTypeInfo(const QString& mimeType) +void KTxtPlugin::makeMimeTypeInfo(const TQString& mimeType) { KFileMimeTypeInfo* info = addMimeTypeInfo(mimeType); @@ -45,13 +45,13 @@ void KTxtPlugin::makeMimeTypeInfo(const QString& mimeType) addGroupInfo(info, "General", i18n("General")); KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Lines", i18n("Lines"), QVariant::Int); + item = addItemInfo(group, "Lines", i18n("Lines"), TQVariant::Int); setAttributes(item, KFileMimeTypeInfo::Averaged); - item = addItemInfo(group, "Words", i18n("Words"), QVariant::Int); + item = addItemInfo(group, "Words", i18n("Words"), TQVariant::Int); setAttributes(item, KFileMimeTypeInfo::Averaged); - item = addItemInfo(group, "Characters", i18n("Characters"), QVariant::ULongLong); + item = addItemInfo(group, "Characters", i18n("Characters"), TQVariant::ULongLong); setAttributes(item, KFileMimeTypeInfo::Averaged); - item = addItemInfo(group, "Format", i18n("Format"), QVariant::String); + item = addItemInfo(group, "Format", i18n("Format"), TQVariant::String); } bool KTxtPlugin::readInfo(KFileMetaInfo& info, uint) @@ -59,7 +59,7 @@ bool KTxtPlugin::readInfo(KFileMetaInfo& info, uint) if ( info.path().isEmpty() ) // remote file return false; - QFile f(info.path()); + TQFile f(info.path()); if (!f.open(IO_ReadOnly)) return false; @@ -67,8 +67,8 @@ bool KTxtPlugin::readInfo(KFileMetaInfo& info, uint) int totLines = 0; int totWords = 0; unsigned long long totChars = f.size(); - QString fileFormat; - QString line; + TQString fileFormat; + TQString line; bool skipTotals = (totChars > 100*1024); // 100K is the max we read unsigned int bytesRead = 0; @@ -79,7 +79,7 @@ bool KTxtPlugin::readInfo(KFileMetaInfo& info, uint) int len = line.length(); // The checks below are necessary to handle embedded NULLs - // QFile::readLine() does not handle them well + // TQFile::readLine() does not handle them well bytesRead += len; if (bytesRead > totChars) break; @@ -102,7 +102,7 @@ bool KTxtPlugin::readInfo(KFileMetaInfo& info, uint) break; } - totWords += (QStringList::split(QRegExp("\\s+"), line)).count(); + totWords += (TQStringList::split(TQRegExp("\\s+"), line)).count(); totLines++; } diff --git a/kfile-plugins/txt/kfile_txt.h b/kfile-plugins/txt/kfile_txt.h index 9b0196d..ad926b1 100644 --- a/kfile-plugins/txt/kfile_txt.h +++ b/kfile-plugins/txt/kfile_txt.h @@ -29,11 +29,11 @@ class KTxtPlugin: public KFilePlugin Q_OBJECT public: - KTxtPlugin(QObject *parent, const char *name, const QStringList& args); + KTxtPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: - void makeMimeTypeInfo(const QString& mimeType); + void makeMimeTypeInfo(const TQString& mimeType); }; #endif diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp index 19efc1d..c87e11a 100644 --- a/kicker-applets/kbinaryclock/datepicker.cpp +++ b/kicker-applets/kbinaryclock/datepicker.cpp @@ -29,11 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kwin.h> -DatePicker::DatePicker(QWidget *parent, const QDate& date) - : QVBox( parent, 0, WType_TopLevel | WDestructiveClose | +DatePicker::DatePicker(TQWidget *parent, const TQDate& date) + : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { - setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); + setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); KWin::setOnAllDesktops( handle(), true ); picker = new KDatePicker(this, date); picker->setCloseButton(true); @@ -43,7 +43,7 @@ DatePicker::DatePicker(QWidget *parent, const QDate& date) setIcon(SmallIcon("date")); } -void DatePicker::keyReleaseEvent(QKeyEvent *e) +void DatePicker::keyReleaseEvent(TQKeyEvent *e) { DATEPICKER_INHERITED::keyReleaseEvent(e); if (e->key() == Qt::Key_Escape) diff --git a/kicker-applets/kbinaryclock/datepicker.h b/kicker-applets/kbinaryclock/datepicker.h index 2cf524a..d0010af 100644 --- a/kicker-applets/kbinaryclock/datepicker.h +++ b/kicker-applets/kbinaryclock/datepicker.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __DATEPICKER_H #define __DATEPICKER_H -#include <qvbox.h> +#include <tqvbox.h> class QDate; class KDatePicker; @@ -33,10 +33,10 @@ class KDatePicker; class DatePicker : public QVBox { public: - DatePicker(QWidget*, const QDate&); + DatePicker(TQWidget*, const TQDate&); private: KDatePicker *picker; - void keyReleaseEvent(QKeyEvent *e); + void keyReleaseEvent(TQKeyEvent *e); }; #endif diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 33e8ced..30682e4 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -25,30 +25,30 @@ #include <kiconloader.h> #include <kglobalsettings.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include <kcolorbutton.h> #include <kpopupmenu.h> -#include <qslider.h> -#include <qcursor.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qlabel.h> +#include <tqslider.h> +#include <tqcursor.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqlabel.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <qclipboard.h> +#include <tqclipboard.h> #include <kled.h> extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile ) { + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue( "kbinaryclock"); return new KBinaryClock( configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "kbinaryclock"); } } -KConfigDialogImp::KConfigDialogImp( QWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : +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) { // As a temporary mesure until the kicker applet's app name is set to the @@ -58,10 +58,10 @@ KConfigDialogImp::KConfigDialogImp( QWidget *parent, const char *name, KConfigSk settings = new SettingsImp(0, "General"); addPage(settings, i18n("General"), "package_settings"); - connect(this, SIGNAL(widgetModified()), settings, SLOT(updatePreview())); + connect(this, TQT_SIGNAL(widgetModified()), settings, TQT_SLOT(updatePreview())); } -SettingsImp::SettingsImp(QWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){ +SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){ } /** @@ -72,9 +72,9 @@ void SettingsImp::updatePreview(){ int look = KLed::Raised; look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look; look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look; - QColor color = kcfg_Color->color(); + TQColor color = kcfg_Color->color(); int darkFactor = kcfg_DarkFactor->value(); - QColor backgroundColor = kcfg_Background->color(); + TQColor backgroundColor = kcfg_Background->color(); frame1->setBackgroundColor(backgroundColor); kLed1->setBackgroundColor(backgroundColor); @@ -116,7 +116,7 @@ void SettingsImp::updatePreview(){ /** * Constructor, create LED's */ -KBinaryClock::KBinaryClock(const QString& configFile, Type type, int actions, QWidget *parent, const char *name) +KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), ledWidth(6), _calendar(NULL), _disableCalendar(false), prefs( new Prefs(sharedConfig())), m_tooltip(this) @@ -137,8 +137,8 @@ KBinaryClock::KBinaryClock(const QString& configFile, Type type, int actions, QW updateClock(); loadSettings(); - QTimer *timer=new QTimer(this); - connect (timer, SIGNAL (timeout()), this, SLOT (updateClock())); + TQTimer *timer=new TQTimer(this); + connect (timer, TQT_SIGNAL (timeout()), this, TQT_SLOT (updateClock())); timer->start(500,false); } @@ -162,11 +162,11 @@ int KBinaryClock::heightForWidth( int width ) const { return (width/ledWidth)*4; } -void KBinaryClock::resizeEvent( QResizeEvent *e ) { +void KBinaryClock::resizeEvent( TQResizeEvent *e ) { int width = e->size().width(); for (int i=0; i < ledWidth; i++) for (int j=0; j < 4; j++) - ledMatrix[i][j]->setGeometry( QRect( (width/ledWidth)*i, (width/ledWidth)*j, width/ledWidth, width/ledWidth) ); + ledMatrix[i][j]->setGeometry( TQRect( (width/ledWidth)*i, (width/ledWidth)*j, width/ledWidth, width/ledWidth) ); } /** @@ -175,10 +175,10 @@ void KBinaryClock::resizeEvent( QResizeEvent *e ) { void KBinaryClock::loadSettings(){ int shape = prefs->shape(); int look = prefs->look(); - QColor color = prefs->color(); + TQColor color = prefs->color(); int darkFactor = prefs->darkFactor(); - QColor backgroundColor = prefs->background(); + TQColor backgroundColor = prefs->background(); bool modifyBackground = false; if(backgroundColor != KApplication::palette().active().background()){ setPaletteBackgroundColor(backgroundColor); @@ -217,7 +217,7 @@ void KBinaryClock::preferences(){ return; KConfigDialogImp *dialog = new KConfigDialogImp(this, "settings", prefs, KDialogBase::Swallow); - connect(dialog, SIGNAL(settingsChanged()), this, SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); dialog->show(); dialog->settings->updatePreview(); } @@ -226,11 +226,11 @@ void KBinaryClock::preferences(){ * Get the time and update the LED's */ void KBinaryClock::updateClock(){ - QString time = "hhmmss"; + TQString time = "hhmmss"; if(KGlobal::locale()->use12Clock()) time += "ap"; - QString currentTime = (QTime::currentTime()).toString(time); + TQString currentTime = (TQTime::currentTime()).toString(time); int splice[6]; splice[0] = currentTime.mid( 0, 1 ).toInt(); splice[1] = currentTime.mid( 1, 1 ).toInt(); @@ -262,18 +262,18 @@ void KBinaryClock::updateClock(){ /** * Catch the right click press */ - void KBinaryClock::mousePressEvent(QMouseEvent *event) { + void KBinaryClock::mousePressEvent(TQMouseEvent *event) { switch (event->button()) { - case QMouseEvent::RightButton: - QToolTip::remove(this); + case TQMouseEvent::RightButton: + TQToolTip::remove(this); openContextMenu(); break; - case QMouseEvent::LeftButton: + case TQMouseEvent::LeftButton: toggleCalendar(); - QToolTip::remove(this); + TQToolTip::remove(this); break; - case QMouseEvent::MidButton: - QToolTip::remove(this); + case TQMouseEvent::MidButton: + TQToolTip::remove(this); break; default: break; @@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() { menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); KLocale *loc = KGlobal::locale(); - QDateTime dt = QDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); KPopupMenu *copyMenu = new KPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); @@ -301,7 +301,7 @@ void KBinaryClock::openContextMenu() { copyMenu->insertItem(dt.date().toString(), 206); copyMenu->insertItem(dt.time().toString(), 207); copyMenu->insertItem(dt.toString(), 208); - connect( copyMenu, SIGNAL( activated(int) ), this, SLOT( slotCopyMenuActivated(int) ) ); + connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) ); if (!bImmutable) { @@ -318,7 +318,7 @@ void KBinaryClock::openContextMenu() { menu->insertSeparator(7); menu->insertItem(SmallIcon("configure"), i18n("&Configure KBinaryClock..."), 102, 8); } - int result = menu->exec( QCursor::pos() ); + int result = menu->exec( TQCursor::pos() ); KProcess proc; switch (result) { @@ -328,7 +328,7 @@ void KBinaryClock::openContextMenu() { case 103: proc << locate("exe", "kdesu"); proc << "--nonewdcop"; - proc << QString("%1 clock --lang %2") + proc << TQString("%1 clock --lang %2") .arg(locate("exe", "kcmshell")) .arg(KGlobal::locale()->language()); proc.start(KProcess::DontCare); @@ -346,9 +346,9 @@ void KBinaryClock::openContextMenu() { } void KBinaryClock::slotCopyMenuActivated( int id ) { - QPopupMenu *m = (QPopupMenu *) sender(); - QString s = m->text(id); - QApplication::clipboard()->setText(s); + TQPopupMenu *m = (TQPopupMenu *) sender(); + TQString s = m->text(id); + TQApplication::clipboard()->setText(s); } void KBinaryClock::toggleCalendar() @@ -361,11 +361,11 @@ void KBinaryClock::toggleCalendar() if (_calendar || _disableCalendar){ return; } - _calendar = new DatePicker(this, QDateTime::currentDateTime().date()); - connect( _calendar, SIGNAL( destroyed() ), SLOT( slotCalendarDeleted() )); + _calendar = new DatePicker(this, TQDateTime::currentDateTime().date()); + connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() )); // some extra spacing is included if aligned on a desktop edge - QPoint c = mapToGlobal(QPoint(0,0)); + TQPoint c = mapToGlobal(TQPoint(0,0)); int w = _calendar->sizeHint().width() + 28; // Added 28 px. to size poperly as said in API @@ -379,7 +379,7 @@ void KBinaryClock::toggleCalendar() } // make calendar fully visible - QRect deskR = KGlobalSettings::desktopGeometry(QPoint(0,0)); + TQRect deskR = KGlobalSettings::desktopGeometry(TQPoint(0,0)); if (c.y()+h > deskR.bottom()) c.setY(deskR.bottom()-h-1); if (c.x()+w > deskR.right()) c.setX(deskR.right()-w-1); @@ -393,7 +393,7 @@ void KBinaryClock::slotCalendarDeleted() _calendar = 0L; // don't reopen the calendar immediately ... _disableCalendar = true; - QTimer::singleShot(100, this, SLOT(slotEnableCalendar())); + TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar())); } void KBinaryClock::slotEnableCalendar() @@ -401,11 +401,11 @@ void KBinaryClock::slotEnableCalendar() _disableCalendar = false; } -ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : QToolTip( clock ), m_clock( clock ) {} +ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock ), m_clock( clock ) {} -void ClockAppletToolTip::maybeTip( const QPoint & /*point*/ ) +void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) { - tip(m_clock->geometry(), KGlobal::locale()->formatDate(QDateTime::currentDateTime().date(), false)); + tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); } #include "kbinaryclock.moc" diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h index 9edf51d..ba88456 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.h +++ b/kicker-applets/kbinaryclock/kbinaryclock.h @@ -20,11 +20,11 @@ #define KBINARYCLOCK_H #include <kpanelapplet.h> -#include <qevent.h> +#include <tqevent.h> #include <kglobal.h> #include <kaboutdata.h> -#include <qdatetime.h> -#include <qtooltip.h> +#include <tqdatetime.h> +#include <tqtooltip.h> #include <kconfigdialog.h> #include "settings.h" @@ -39,7 +39,7 @@ class KBinaryClock; class SettingsImp : public Settings { Q_OBJECT public: - SettingsImp(QWidget* parent=0, + SettingsImp(TQWidget* parent=0, const char* name=0, WFlags fl=0); public slots: @@ -49,7 +49,7 @@ public slots: class KConfigDialogImp : public KConfigDialog { public: - KConfigDialogImp(QWidget *parent, const char *name, + KConfigDialogImp(TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType = KDialogBase::IconList, KDialogBase::ButtonCode defaultButton = Ok, @@ -63,7 +63,7 @@ class ClockAppletToolTip : public QToolTip ClockAppletToolTip( KBinaryClock* clock ); protected: - virtual void maybeTip( const QPoint & ); + virtual void maybeTip( const TQPoint & ); private: KBinaryClock *m_clock; @@ -72,15 +72,15 @@ class ClockAppletToolTip : public QToolTip class KBinaryClock : public KPanelApplet { Q_OBJECT public: - KBinaryClock(const QString& configFile, Type t = Normal, int actions = 0, QWidget *parent = 0, const char *name = 0); + KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0); ~KBinaryClock(); virtual int widthForHeight (int height) const; virtual int heightForWidth (int width) const; protected: - virtual void resizeEvent(QResizeEvent *event); - virtual void mousePressEvent(QMouseEvent *event); + virtual void resizeEvent(TQResizeEvent *event); + virtual void mousePressEvent(TQMouseEvent *event); protected slots: void preferences(); diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 98f5302..cadbb2d 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -19,16 +19,16 @@ $Id$ */ -#include <qfile.h> -#include <qtextstream.h> -#include <qlayout.h> -#include <qimage.h> -#include <qclipboard.h> -#include <qregexp.h> -#include <qbitmap.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qcursor.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqlayout.h> +#include <tqimage.h> +#include <tqclipboard.h> +#include <tqregexp.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqcursor.h> #include <kglobal.h> #include <klocale.h> @@ -48,7 +48,7 @@ $Id$ // Applet initialization function extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, @@ -57,8 +57,8 @@ extern "C" } } -KolourPicker::KolourPicker(const QString& configFile, Type type, - int actions, QWidget *parent, const char *name) +KolourPicker::KolourPicker(const TQString& configFile, Type type, + int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), m_picking(0) { @@ -73,17 +73,17 @@ KolourPicker::KolourPicker(const QString& configFile, Type type, KConfig *conf = config(); conf->setGroup("General"); - QStringList history = conf->readListEntry("History"); - for (QStringList::ConstIterator it = history.begin(); it != history.end(); ++it) - m_history.append(QColor(*it)); + TQStringList history = conf->readListEntry("History"); + for (TQStringList::ConstIterator it = history.begin(); it != history.end(); ++it) + m_history.append(TQColor(*it)); setBackgroundOrigin(AncestorOrigin); m_colourButton = new SimpleButton(this); m_colourButton->setPixmap(SmallIcon("colorpicker")); m_colourButton->setFixedSize(20, 20); - QToolTip::add(m_colourButton, i18n("Pick a color")); - connect(m_colourButton, SIGNAL(clicked()), SLOT(slotPick())); + TQToolTip::add(m_colourButton, i18n("Pick a color")); + connect(m_colourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPick())); m_historyButton = new SimpleButton(this); m_historyButton->setFixedSize(20, 20); @@ -91,11 +91,11 @@ KolourPicker::KolourPicker(const QString& configFile, Type type, m_historyButton->setPixmap(colorPixmap(m_history.last())); else { - m_historyButton->setPixmap(colorPixmap(QColor())); + m_historyButton->setPixmap(colorPixmap(TQColor())); m_historyButton->setEnabled(false); } - QToolTip::add(m_historyButton, i18n("History")); - connect(m_historyButton, SIGNAL(clicked()), SLOT(slotHistory())); + TQToolTip::add(m_historyButton, i18n("History")); + connect(m_historyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHistory())); } KolourPicker::~KolourPicker() @@ -131,21 +131,21 @@ void KolourPicker::slotHistory() { KPopupMenu popup; popup.insertTitle(SmallIcon("colorize"), i18n("History")); - QPtrList<QPopupMenu> subMenus; + TQPtrList<TQPopupMenu> subMenus; subMenus.setAutoDelete(true); - for (QValueList<QColor>::ConstIterator it = m_history.fromLast(); + for (TQValueList<TQColor>::ConstIterator it = m_history.fromLast(); it != m_history.end(); --it) { - QPopupMenu *sub = copyPopup(*it, false); + TQPopupMenu *sub = copyPopup(*it, false); subMenus.append(sub); popup.insertItem(colorPixmap(*it), - QString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()), + TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()), sub); } popup.insertSeparator(); int clear = popup.insertItem(SmallIcon("history_clear"), i18n("&Clear History")); - int id = popup.exec(QCursor::pos()); + int id = popup.exec(TQCursor::pos()); if (id == clear) { m_history.clear(); @@ -153,28 +153,28 @@ void KolourPicker::slotHistory() arrangeButtons(); KConfig *conf = config(); conf->setGroup("General"); - conf->writeEntry("History", QStringList()); + conf->writeEntry("History", TQStringList()); conf->sync(); } else if (id != -1) setClipboard(popup.findItem(id)->text()); } -void KolourPicker::mouseReleaseEvent(QMouseEvent *e) +void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) { if (m_picking) { m_picking = false; releaseMouse(); releaseKeyboard(); - QWidget *desktop = QApplication::desktop(); - QPixmap pm = QPixmap::grabWindow(desktop->winId(), + TQWidget *desktop = TQApplication::desktop(); + TQPixmap pm = TQPixmap::grabWindow(desktop->winId(), e->globalPos().x(), e->globalPos().y(), 1, 1); - QImage img = pm.convertToImage(); - QColor color(img.pixel(0, 0)); + TQImage img = pm.convertToImage(); + TQColor color(img.pixel(0, 0)); // eventually remove a dupe - QValueListIterator<QColor> dupe = m_history.find(color); + TQValueListIterator<TQColor> dupe = m_history.find(color); if (dupe != m_history.end()) m_history.remove(dupe); @@ -183,8 +183,8 @@ void KolourPicker::mouseReleaseEvent(QMouseEvent *e) m_history.remove(m_history.begin()); m_historyButton->setEnabled(true); arrangeButtons(); - QStringList history; - for (QValueList<QColor>::ConstIterator it = m_history.begin(); + TQStringList history; + for (TQValueList<TQColor>::ConstIterator it = m_history.begin(); it != m_history.end(); ++it) { @@ -195,7 +195,7 @@ void KolourPicker::mouseReleaseEvent(QMouseEvent *e) conf->writeEntry("History", history); conf->sync(); m_historyButton->setPixmap(colorPixmap(color)); - QPopupMenu *popup = copyPopup(color, true); + TQPopupMenu *popup = copyPopup(color, true); int id = popup->exec(e->globalPos()); if (id != -1) setClipboard( popup->findItem(id)->text() ); @@ -206,9 +206,9 @@ void KolourPicker::mouseReleaseEvent(QMouseEvent *e) } // set both clipboard and selection -void KolourPicker::setClipboard(const QString& text) +void KolourPicker::setClipboard(const TQString& text) { - QClipboard *clip = QApplication::clipboard(); + QClipboard *clip = TQApplication::clipboard(); bool oldMode = clip->selectionModeEnabled(); clip->setSelectionMode(true); clip->setText(text); @@ -217,7 +217,7 @@ void KolourPicker::setClipboard(const QString& text) clip->setSelectionMode( oldMode ); } -void KolourPicker::keyPressEvent(QKeyEvent *e) +void KolourPicker::keyPressEvent(TQKeyEvent *e) { if (m_picking) { @@ -233,7 +233,7 @@ void KolourPicker::keyPressEvent(QKeyEvent *e) KPanelApplet::keyPressEvent(e); } -void KolourPicker::resizeEvent(QResizeEvent *) +void KolourPicker::resizeEvent(TQResizeEvent *) { arrangeButtons(); } @@ -282,19 +282,19 @@ void KolourPicker::arrangeButtons() updateGeometry(); } -QPopupMenu *KolourPicker::copyPopup(const QColor &c, bool title) const +TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const { KPopupMenu *popup = new KPopupMenu; if (title) popup->insertTitle(colorPixmap(c), i18n("Copy Color Value")); - QString value; + TQString value; // r, g, b value.sprintf("%u, %u, %u", c.red(), c.green(), c.blue()); popup->insertItem(SmallIcon("text"), value); // HTML, lower case hex chars value.sprintf("#%.2x%.2x%.2x", c.red(), c.green(), c.blue()); popup->insertItem(SmallIcon("html"), value); - if (value.find(QRegExp("[a-f]")) >= 0) + if (value.find(TQRegExp("[a-f]")) >= 0) { // HTML, upper case hex chars value.sprintf("#%.2X%.2X%.2X", c.red(), c.green(), c.blue()); @@ -303,26 +303,26 @@ QPopupMenu *KolourPicker::copyPopup(const QColor &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( QRegExp( "[a-f]" ) ) >= 0 ) + if ( value.find( TQRegExp( "[a-f]" ) ) >= 0 ) { // upper case hex chars value.sprintf( "%.2X%.2X%.2X", c.red(), c.green(), c.blue() ); popup->insertItem( SmallIcon( "html" ), value ); } // Color name - QStringList names = colorNames(c.red(), c.green(), c.blue()); - for (QStringList::ConstIterator it = names.begin(); it != names.end(); ++it) + TQStringList names = colorNames(c.red(), c.green(), c.blue()); + for (TQStringList::ConstIterator it = names.begin(); it != names.end(); ++it) popup->insertItem(SmallIcon("text"), *it); return popup; } #define AAFACTOR 4 -QPixmap KolourPicker::colorPixmap(const QColor &c) const +TQPixmap KolourPicker::colorPixmap(const TQColor &c) const { int x, y, dx, dy, d; - QImage img(16 * AAFACTOR, 16 * AAFACTOR, 32); + TQImage img(16 * AAFACTOR, 16 * AAFACTOR, 32); img.setAlphaBuffer(true); img.fill(0); @@ -339,30 +339,30 @@ QPixmap KolourPicker::colorPixmap(const QColor &c) const img.setPixel(x, y, qRgba(128, 128, 128, 255)); } - QBitmap mask(16, 16); + TQBitmap mask(16, 16); mask.fill(Qt::color0); - QPainter p(&mask); + TQPainter p(&mask); p.setPen(Qt::NoPen); p.setBrush(Qt::color1); p.drawEllipse(0, 0, 15, 15); p.end(); - QPixmap pm = QPixmap(img.smoothScale(16, 16)); + TQPixmap pm = TQPixmap(img.smoothScale(16, 16)); pm.setMask(mask); return pm; } -const QStringList &KolourPicker::colorNames(int r, int g, int b) const +const TQStringList &KolourPicker::colorNames(int r, int g, int b) const { - static QStringList NullList; + static TQStringList NullList; if (m_colorNames.isEmpty()) { - QFile f("/usr/lib/X11/rgb.txt"); + TQFile f("/usr/lib/X11/rgb.txt"); if (!f.open(IO_ReadOnly)) return NullList; - QTextStream str(&f); - QString red, green, blue; + TQTextStream str(&f); + TQString red, green, blue; while (!str.atEnd()) { str >> red; diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h index 0b576e9..20780f9 100644 --- a/kicker-applets/kolourpicker/kolourpicker.h +++ b/kicker-applets/kolourpicker/kolourpicker.h @@ -21,8 +21,8 @@ #ifndef _KOLOURPICKER_H_ #define _KOLOURPICKER_H_ -#include <qmap.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqvaluelist.h> #include <kpanelapplet.h> @@ -35,34 +35,34 @@ class KolourPicker : public KPanelApplet { Q_OBJECT public: - KolourPicker(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + KolourPicker(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); ~KolourPicker(); virtual int heightForWidth(int) const; virtual int widthForHeight(int) const; virtual void about(); protected: - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void keyPressEvent(QKeyEvent *); - virtual void resizeEvent(QResizeEvent*); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void keyPressEvent(TQKeyEvent *); + virtual void resizeEvent(TQResizeEvent*); private slots: void slotPick(); void slotHistory(); private: - QPopupMenu *copyPopup(const QColor &, bool title) const; - QPixmap colorPixmap(const QColor &) const; - const QStringList &colorNames(int r, int g, int b) const; + TQPopupMenu *copyPopup(const TQColor &, bool title) const; + TQPixmap colorPixmap(const TQColor &) const; + const TQStringList &colorNames(int r, int g, int b) const; void arrangeButtons(); - void setClipboard(const QString& text); + void setClipboard(const TQString& text); KInstance *m_instance; bool m_picking; SimpleButton *m_historyButton, *m_colourButton; - QValueList<QColor> m_history; - QMap<int, QStringList> m_colorNames; + TQValueList<TQColor> m_history; + TQMap<int, TQStringList> m_colorNames; }; #endif diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 9daa926..478ca2d 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -20,8 +20,8 @@ #include "simplebutton.h" -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kapplication.h> #include <kcursor.h> @@ -32,17 +32,17 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(QWidget *parent, const char *name) - : QButton(parent, name), +SimpleButton::SimpleButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_orientation(Qt::Horizontal) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, SIGNAL( settingsChanged( int ) ), - SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, SIGNAL( iconChanged( int ) ), - SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), + TQT_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQT_SIGNAL( iconChanged( int ) ), + TQT_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); @@ -50,9 +50,9 @@ SimpleButton::SimpleButton(QWidget *parent, const char *name) slotSettingsChanged( KApplication::SETTINGS_MOUSE ); } -void SimpleButton::setPixmap(const QPixmap &pix) +void SimpleButton::setPixmap(const TQPixmap &pix) { - QButton::setPixmap(pix); + TQButton::setPixmap(pix); generateIcons(); update(); } @@ -63,39 +63,39 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -QSize SimpleButton::sizeHint() const +TQSize SimpleButton::sizeHint() const { - const QPixmap* pm = pixmap(); + const TQPixmap* pm = pixmap(); if (!pm) - return QButton::sizeHint(); + return TQButton::sizeHint(); else - return QSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); + return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -QSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { - const QPixmap* pm = pixmap(); + const TQPixmap* pm = pixmap(); if (!pm) - return QButton::minimumSizeHint(); + return TQButton::minimumSizeHint(); else - return QSize(pm->width(), pm->height()); + return TQSize(pm->width(), pm->height()); } -void SimpleButton::drawButton( QPainter *p ) +void SimpleButton::drawButton( TQPainter *p ) { drawButtonLabel(p); } -void SimpleButton::drawButtonLabel( QPainter *p ) +void SimpleButton::drawButtonLabel( TQPainter *p ) { if (!pixmap()) { return; } - QPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon; + TQPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon; if (isOn() || isDown()) { @@ -108,7 +108,7 @@ void SimpleButton::drawButtonLabel( QPainter *p ) int ph = pix.height(); int pw = pix.width(); int margin = KDialog::spacingHint(); - QPoint origin(margin / 2, margin / 2); + TQPoint origin(margin / 2, margin / 2); if (ph < (h - margin)) { @@ -130,7 +130,7 @@ void SimpleButton::generateIcons() return; } - QImage image = pixmap()->convertToImage(); + TQImage image = pixmap()->convertToImage(); KIconEffect effect; m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState); @@ -170,29 +170,29 @@ void SimpleButton::slotIconChanged( int group ) update(); } -void SimpleButton::enterEvent( QEvent *e ) +void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; repaint( false ); - QButton::enterEvent( e ); + TQButton::enterEvent( e ); } -void SimpleButton::leaveEvent( QEvent *e ) +void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; repaint( false ); - QButton::enterEvent( e ); + TQButton::enterEvent( e ); } -void SimpleButton::resizeEvent( QResizeEvent * ) +void SimpleButton::resizeEvent( TQResizeEvent * ) { generateIcons(); } -SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const char *name) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name) : SimpleButton(parent, name) { setBackgroundOrigin(AncestorOrigin); @@ -200,9 +200,9 @@ SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const _inside = false; } -QSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::sizeHint() const { - return QSize( 12, 12 ); + return TQSize( 12, 12 ); } void SimpleArrowButton::setArrowType(Qt::ArrowType a) @@ -219,32 +219,32 @@ Qt::ArrowType SimpleArrowButton::arrowType() const return _arrow; } -void SimpleArrowButton::drawButton( QPainter *p ) +void SimpleArrowButton::drawButton( TQPainter *p ) { - QRect r(1, 1, width() - 2, height() - 2); + TQRect r(1, 1, width() - 2, height() - 2); - QStyle::PrimitiveElement pe = QStyle::PE_ArrowLeft; + TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = QStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = QStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = QStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = QStyle::PE_ArrowDown; break; + 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; } - int flags = QStyle::Style_Default | QStyle::Style_Enabled; - if (isDown() || isOn()) flags |= QStyle::Style_Down; + int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; + if (isDown() || isOn()) flags |= TQStyle::Style_Down; style().drawPrimitive(pe, p, r, colorGroup(), flags); } -void SimpleArrowButton::enterEvent( QEvent *e ) +void SimpleArrowButton::enterEvent( TQEvent *e ) { _inside = true; SimpleButton::enterEvent( e ); update(); } -void SimpleArrowButton::leaveEvent( QEvent *e ) +void SimpleArrowButton::leaveEvent( TQEvent *e ) { _inside = false; SimpleButton::enterEvent( e ); diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index 5423dff..1ea5c7a 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -21,8 +21,8 @@ #ifndef SIMPLEBUTTON_H #define SIMPLEBUTTON_H -#include <qbutton.h> -#include <qpixmap.h> +#include <tqbutton.h> +#include <tqpixmap.h> #include <kdemacros.h> @@ -31,20 +31,20 @@ class KDE_EXPORT SimpleButton : public QButton Q_OBJECT public: - SimpleButton(QWidget *parent, const char *name = 0); - void setPixmap(const QPixmap &pix); + SimpleButton(TQWidget *parent, const char *name = 0); + void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: - void drawButton( QPainter *p ); - void drawButtonLabel( QPainter *p ); + void drawButton( TQPainter *p ); + void drawButtonLabel( TQPainter *p ); void generateIcons(); - void enterEvent( QEvent *e ); - void leaveEvent( QEvent *e ); - void resizeEvent( QResizeEvent *e ); + void enterEvent( TQEvent *e ); + void leaveEvent( TQEvent *e ); + void resizeEvent( TQResizeEvent *e ); protected slots: virtual void slotSettingsChanged( int category ); @@ -52,9 +52,9 @@ class KDE_EXPORT SimpleButton : public QButton private: bool m_highlight; - QPixmap m_normalIcon; - QPixmap m_activeIcon; - QPixmap m_disabledIcon; + TQPixmap m_normalIcon; + TQPixmap m_activeIcon; + TQPixmap m_disabledIcon; Qt::Orientation m_orientation; class SimpleButtonPrivate; SimpleButtonPrivate* d; @@ -65,14 +65,14 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton Q_OBJECT public: - SimpleArrowButton(QWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - QSize sizeHint() const; + TQSize sizeHint() const; protected: - virtual void enterEvent( QEvent *e ); - virtual void leaveEvent( QEvent *e ); - virtual void drawButton(QPainter *p); + virtual void enterEvent( TQEvent *e ); + virtual void leaveEvent( TQEvent *e ); + virtual void drawButton(TQPainter *p); Qt::ArrowType arrowType() const; public slots: diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc index ff5ab9d..df3fffe 100644 --- a/kicker-applets/ktimemon/confdlg.cc +++ b/kicker-applets/ktimemon/confdlg.cc @@ -11,14 +11,14 @@ #include <config.h> #include <stdio.h> -#include <qgroupbox.h> -#include <qlineedit.h> -#include <qslider.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qvgroupbox.h> -#include <qcheckbox.h> -#include <qcombobox.h> +#include <tqgroupbox.h> +#include <tqlineedit.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvgroupbox.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> #include <kcolorbutton.h> #include <klineedit.h> @@ -36,11 +36,11 @@ KConfDialog::KConfDialog(KTimeMon *t) Ok|Cancel|Apply, Ok, t, 0, false ), timemon(t) { - QFrame *page; - QBoxLayout *bl; - QGridLayout *gl; - QLabel *l; - QGroupBox *b; + TQFrame *page; + TQBoxLayout *bl; + TQGridLayout *gl; + TQLabel *l; + TQGroupBox *b; KColorButton *cb; unsigned i, j; @@ -49,9 +49,9 @@ KConfDialog::KConfDialog(KTimeMon *t) // first tab: general page = addPage( i18n( "&General" ) ); - bl = new QVBoxLayout(page, 0, spacingHint()); + bl = new TQVBoxLayout(page, 0, spacingHint()); - b = new QVGroupBox(i18n("Sample &Rate"), page); + b = new TQVGroupBox(i18n("Sample &Rate"), page); bl->addWidget(b); intervalEdit = new KIntNumInput(250, b); @@ -59,13 +59,13 @@ KConfDialog::KConfDialog(KTimeMon *t) intervalEdit->setSuffix(i18n(" msec")); // scaling group box - b = new QVGroupBox(i18n("Scaling"), page); + b = new TQVGroupBox(i18n("Scaling"), page); bl->addWidget(b); bl->addStretch(); - autoScaleBox = new QCheckBox(i18n("&Automatic"), b); - connect(autoScaleBox, SIGNAL(toggled(bool)), this, SLOT(toggle(bool))); + autoScaleBox = new TQCheckBox(i18n("&Automatic"), b); + connect(autoScaleBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle(bool))); pageScaleEdit = new KIntNumInput(intervalEdit, 1000, b); pageScaleEdit->setRange(10, 10000, 10); @@ -84,7 +84,7 @@ KConfDialog::KConfDialog(KTimeMon *t) // second tab: colours page = addPage( i18n( "C&olors" ) ); - gl = new QGridLayout(page, 12, 10, 0, spacingHint()); + gl = new TQGridLayout(page, 12, 10, 0, spacingHint()); gl->setColStretch(3, 1); gl->setColStretch(6, 1); // eat up horizontal space gl->setRowStretch(11, 1); // eat up vertical space @@ -94,85 +94,85 @@ KConfDialog::KConfDialog(KTimeMon *t) gl->addColSpacing(0, 10); gl->addColSpacing(9, 25); - QString cpuColourLabels[4]; + TQString cpuColourLabels[4]; cpuColourLabels[0] = i18n("Kernel:"); cpuColourLabels[1] = i18n("User:"); cpuColourLabels[2] = i18n("Nice:"); cpuColourLabels[3] = i18n("IOWait:"); - QString memColourLabels[4]; + TQString memColourLabels[4]; memColourLabels[0] = i18n("Kernel:"); memColourLabels[1] = i18n("Used:"); memColourLabels[2] = i18n("Buffers:"); memColourLabels[3] = i18n("Cached:"); KColorButton **cpuColourButtons[4] = { &kernelCB, &userCB, &niceCB, &iowaitCB }; - b = new QGroupBox(i18n("CPU"), page); + b = new TQGroupBox(i18n("CPU"), page); gl->addMultiCellWidget(b, 0, 2, 0, 13); for (j = 0; j < 4; j++) { - l = new QLabel(cpuColourLabels[j], page); + l = new TQLabel(cpuColourLabels[j], page); gl->addWidget(l, 1, 3*j+1, AlignVCenter | AlignRight); cb = *cpuColourButtons[j] = new KColorButton(white, page); gl->addWidget(cb, 1, 3*j+2, AlignCenter); - connect(cb, SIGNAL(changed(const QColor &)), - this, SLOT(updateSampleWidget(const QColor &))); + connect(cb, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(updateSampleWidget(const TQColor &))); } KColorButton **memColourButtons[4] = { &mkernelCB, &usedCB, &buffersCB, &cachedCB }; - b = new QGroupBox(i18n("Memory"), page); + b = new TQGroupBox(i18n("Memory"), page); gl->addMultiCellWidget(b, 4, 6, 0, 13); for (j = 0; j < 4; j++) { - l = new QLabel(memColourLabels[j], page); + l = new TQLabel(memColourLabels[j], page); gl->addWidget(l, 5, 3*j+1, AlignVCenter | AlignRight); cb = *memColourButtons[j] = new KColorButton(white, page); gl->addWidget(cb, 5, 3*j+2, AlignCenter); - connect(cb, SIGNAL(changed(const QColor &)), - this, SLOT(updateSampleWidget(const QColor &))); + connect(cb, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(updateSampleWidget(const TQColor &))); } - b = new QGroupBox(i18n("Swap"), page); + b = new TQGroupBox(i18n("Swap"), page); gl->addMultiCellWidget(b, 8, 10, 0, 6); - l = new QLabel(i18n("Swap:"), page); + l = new TQLabel(i18n("Swap:"), page); gl->addWidget(l, 9, 1, AlignVCenter | AlignRight); cb = swapCB = new KColorButton(red, page); gl->addWidget(cb, 9, 2); - connect(cb, SIGNAL(changed(const QColor &)), - this, SLOT(updateSampleWidget(const QColor &))); + connect(cb, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(updateSampleWidget(const TQColor &))); - l = new QLabel(i18n("Backgd:"), page); + l = new TQLabel(i18n("Backgd:"), page); gl->addWidget(l, 9, 4, AlignVCenter | AlignRight); cb = bgCB = new KColorButton(blue, page); gl->addWidget(cb, 9, 5); - connect(cb, SIGNAL(changed(const QColor &)), - this, SLOT(updateSampleWidget(const QColor &))); + connect(cb, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(updateSampleWidget(const TQColor &))); - //b = new QGroupBox(i18n("Sample"), page); + //b = new TQGroupBox(i18n("Sample"), page); //gl->addMultiCellWidget(b, 8, 10, 7, 9); // third tab: interaction page = addPage( i18n( "&Interaction" ) ); - bl = new QVBoxLayout(page, 0, spacingHint()); + bl = new TQVBoxLayout(page, 0, spacingHint()); - b = new QGroupBox(i18n("Mouse Events"), page); + b = new TQGroupBox(i18n("Mouse Events"), page); b->setColumnLayout( 0, Qt::Vertical ); bl->addWidget(b); bl->addStretch(); - QVBoxLayout *vbox = new QVBoxLayout( b->layout() ); + TQVBoxLayout *vbox = new TQVBoxLayout( b->layout() ); - gl = new QGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 ); + gl = new TQGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 ); vbox->addLayout( gl ); @@ -180,13 +180,13 @@ KConfDialog::KConfDialog(KTimeMon *t) gl->setRowStretch(i, 1); gl->setColStretch(2, 1); - QString buttonText[MAX_MOUSE_ACTIONS] = { i18n("Left button:"), + TQString buttonText[MAX_MOUSE_ACTIONS] = { i18n("Left button:"), i18n("Middle button:"), i18n("Right button:") }; for (i = 0; i < (int) MAX_MOUSE_ACTIONS; i++) { - l = new QLabel(buttonText[i], b); + l = new TQLabel(buttonText[i], b); gl->addWidget(l, i+1, 0); mouseC[i] = new KComboBox(false, b); @@ -197,8 +197,8 @@ KConfDialog::KConfDialog(KTimeMon *t) mouseC[i]->insertItem(i18n("Starts"), KTimeMon::COMMAND - 1); gl->addWidget(mouseC[i], i+1, 1); - connect( mouseC[ i ], SIGNAL( activated( int ) ), this, - SLOT( mouseCommandEnable() ) ); + connect( mouseC[ i ], TQT_SIGNAL( activated( int ) ), this, + TQT_SLOT( mouseCommandEnable() ) ); mouseLE[i] = new KURLRequester(b); mouseLE[i]->lineEdit()->setText(t->mouseActionCommand[i]); @@ -209,12 +209,12 @@ KConfDialog::KConfDialog(KTimeMon *t) resize(380, 300); - connect(this, SIGNAL(applyClicked()), timemon, SLOT(apply())); - connect(this, SIGNAL(okClicked()), timemon, SLOT(apply())); + connect(this, TQT_SIGNAL(applyClicked()), timemon, TQT_SLOT(apply())); + connect(this, TQT_SIGNAL(okClicked()), timemon, TQT_SLOT(apply())); } // Adjust the colours of the sample widget in the configuration dialog. -void KConfDialog::updateSampleWidget(const QColor &) +void KConfDialog::updateSampleWidget(const TQColor &) { #if 0 sample->kernelColour = kernelCB->color(); diff --git a/kicker-applets/ktimemon/confdlg.h b/kicker-applets/ktimemon/confdlg.h index d458bf2..25d0501 100644 --- a/kicker-applets/ktimemon/confdlg.h +++ b/kicker-applets/ktimemon/confdlg.h @@ -18,9 +18,9 @@ #ifndef CONFDLG_H #define CONFDLG_H -#include <qcolor.h> -#include <qcheckbox.h> -#include <qtabdialog.h> +#include <tqcolor.h> +#include <tqcheckbox.h> +#include <tqtabdialog.h> #include <kcolorbutton.h> #include <kcombobox.h> @@ -56,16 +56,16 @@ public: void update(); // get values from timemon unsigned getInterval() const { return intervalEdit->value(); } - QColor getKernelColour() const { return kernelCB->color(); } - QColor getUserColour() const { return userCB->color(); } - QColor getNiceColour() const { return niceCB->color(); } - QColor getIOWaitColour() const { return iowaitCB->color(); } - QColor getCachedColour() const { return cachedCB->color(); } - QColor getUsedColour() const { return usedCB->color(); } - QColor getBuffersColour() const { return buffersCB->color(); } - QColor getMKernelColour() const { return mkernelCB->color(); } - QColor getSwapColour() const { return swapCB->color(); } - QColor getBgColour() const { return bgCB->color(); } + TQColor getKernelColour() const { return kernelCB->color(); } + TQColor getUserColour() const { return userCB->color(); } + TQColor getNiceColour() const { return niceCB->color(); } + TQColor getIOWaitColour() const { return iowaitCB->color(); } + TQColor getCachedColour() const { return cachedCB->color(); } + TQColor getUsedColour() const { return usedCB->color(); } + TQColor getBuffersColour() const { return buffersCB->color(); } + TQColor getMKernelColour() const { return mkernelCB->color(); } + TQColor getSwapColour() const { return swapCB->color(); } + TQColor getBgColour() const { return bgCB->color(); } bool getAutoScale() const { return autoScaleBox->isChecked(); } unsigned getPageScale() const { return pageScaleEdit->value(); } @@ -73,10 +73,10 @@ public: unsigned getCtxScale() const { return ctxScaleEdit->value(); } unsigned getMouseAction(int i) const; - QString getMouseActionCommand(int i) const { return mouseLE[i]->lineEdit()->text(); } + TQString getMouseActionCommand(int i) const { return mouseLE[i]->lineEdit()->text(); } private slots: - void updateSampleWidget(const QColor &); // update colours in configuration + void updateSampleWidget(const TQColor &); // update colours in configuration void toggle(bool state); // enable/disable scales void mouseCommandEnable(); @@ -84,8 +84,8 @@ private: KTimeMon *timemon; KIntNumInput *intervalEdit, *swapScaleEdit, *pageScaleEdit, *ctxScaleEdit; - QLineEdit *procFileEdit; - QCheckBox *autoScaleBox; + TQLineEdit *procFileEdit; + TQCheckBox *autoScaleBox; KColorButton *kernelCB, *userCB, *niceCB, *iowaitCB; KColorButton *buffersCB, *usedCB, *cachedCB, *mkernelCB; KColorButton *swapCB, *bgCB; diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc index 25f25a3..99ea20b 100644 --- a/kicker-applets/ktimemon/sample.cc +++ b/kicker-applets/ktimemon/sample.cc @@ -33,7 +33,7 @@ #include <sys/swap.h> #endif -#include <qwidget.h> +#include <tqwidget.h> #include <klocale.h> #include <kmessagebox.h> @@ -162,7 +162,7 @@ void KSample::setScaling(bool a, unsigned p, unsigned s, unsigned c) // ----------------------------------------------------------------------------- // Show a message box with the given message and terminate the application. -void KSample::fatal(const QString& msg) +void KSample::fatal(const TQString& msg) { timemon->stop(); @@ -174,7 +174,7 @@ void KSample::fatal(const QString& msg) // ----------------------------------------------------------------------------- // Show a message box with the given message and don't terminate the app ;-) -void KSample::nonfatal(const QString& msg) +void KSample::nonfatal(const TQString& msg) { timemon->stop(); @@ -263,7 +263,7 @@ void KSample::readSample() #elif defined(__osf__) // in OSF/2, we can use table() - QString msg = i18n("Unable to obtain system information.\n" + TQString msg = i18n("Unable to obtain system information.\n" "The table(2) system call returned an error " "for table %1.\n" "Please contact the maintainer at mueller@kde.org " diff --git a/kicker-applets/ktimemon/sample.h b/kicker-applets/ktimemon/sample.h index b4a0723..63974fc 100644 --- a/kicker-applets/ktimemon/sample.h +++ b/kicker-applets/ktimemon/sample.h @@ -72,8 +72,8 @@ private: // converts pages to MB void makeMBytes(unsigned long &pages); - void fatal(const QString& msg); - void nonfatal(const QString& msg); + void fatal(const TQString& msg); + void nonfatal(const TQString& msg); KTimeMon *timemon; #ifdef __linux__ diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 84b0e79..75164f4 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -13,9 +13,9 @@ #include <config.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <kconfig.h> #include <kglobal.h> @@ -35,7 +35,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("ktimemon"); KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal, @@ -85,7 +85,7 @@ void KTimeMon::preferences() // Repaint the object; get the current sample and paint the bar graphs // correspondingly. Use a pixmap to minimise flicker. -void KTimeMon::paintEvent(QPaintEvent *) +void KTimeMon::paintEvent(TQPaintEvent *) { int w, h, x, y, b, r; @@ -103,10 +103,10 @@ void KTimeMon::paintEvent(QPaintEvent *) else s.fill(h); - QPixmap pixmap(width(), height()); + TQPixmap pixmap(width(), height()); pixmap.fill(this, 0, 0); - QPainter painter(&pixmap); + TQPainter painter(&pixmap); b = r / 3; // bar width r -= b; @@ -152,7 +152,7 @@ void KTimeMon::paintEvent(QPaintEvent *) // ----------------------------------------------------------------------------- // Draw part of a bar, depending on the bar orientation. -void KTimeMon::paintRect(int x, int y, int w, int h, QColor c, QPainter *p) +void KTimeMon::paintRect(int x, int y, int w, int h, TQColor c, TQPainter *p) { if (vertical) p->fillRect(x, y, w, h, c); @@ -161,7 +161,7 @@ void KTimeMon::paintRect(int x, int y, int w, int h, QColor c, QPainter *p) } // Show a tool-tip with some status information. -void KTimeMon::maybeTip(const QPoint& p) +void KTimeMon::maybeTip(const TQPoint& p) { if (sample == 0) return; // no associated sample... if(!rect().contains(p)) return; @@ -170,7 +170,7 @@ void KTimeMon::maybeTip(const QPoint& p) int idle = 100 - s.kernel - s.user - s.nice; if ( idle < 0 ) idle = 0; - QString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") + 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) @@ -184,9 +184,9 @@ void KTimeMon::maybeTip(const QPoint& p) // Initialise the member variables, read the configuration data base, // set up the widget, and start the timer. -KTimeMon::KTimeMon(const QString& configFile, Type type, int actions, - QWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name, WRepaintNoErase), QToolTip(this), +KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name, WRepaintNoErase), TQToolTip(this), configDialog(0), bgProcess(0), kernelColour("red1"), userColour("blue"), niceColour("yellow"), iowaitColour("darkgreen"), @@ -207,12 +207,12 @@ KTimeMon::KTimeMon(const QString& configFile, Type type, int actions, swapScale = conf->readUnsignedNumEntry("SwapScale", 5); ctxScale = conf->readUnsignedNumEntry("ContextScale", 300); for (int i = 0; i < MAX_MOUSE_ACTIONS; i++) { - QString n; + TQString n; n.setNum(i); mouseAction[i] = (MouseAction) - conf->readUnsignedNumEntry(QString("MouseAction")+n, mouseAction[i]); - mouseActionCommand[i] = conf->readPathEntry(QString("MouseActionCommand")+n); + conf->readUnsignedNumEntry(TQString("MouseAction")+n, mouseAction[i]); + mouseActionCommand[i] = conf->readPathEntry(TQString("MouseActionCommand")+n); } conf->setGroup("Interface"); @@ -229,13 +229,13 @@ KTimeMon::KTimeMon(const QString& configFile, Type type, int actions, vertical = conf->readBoolEntry("Vertical", true); - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(timeout())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); timer->start(interval); sample = new KSample(this, autoScale, pageScale, swapScale, ctxScale); - QString aboutmsg = i18n("KTimeMon for KDE\n" + TQString aboutmsg = i18n("KTimeMon for KDE\n" "Maintained by Dirk A. Mueller <dmuell@gmx.net>\n" "Written by M. Maierhofer (m.maierhofer@tees.ac.uk)\n" "Based on timemon by H. Maierhofer"); @@ -249,8 +249,8 @@ KTimeMon::KTimeMon(const QString& configFile, Type type, int actions, menu->insertSeparator(); menu->insertItem(SmallIcon( "help" ), i18n("Help"), hmenu->menu(), 1); - menu->connectItem(2, this, SLOT(configure())); - menu->connectItem(4, this, SLOT(orientation())); + menu->connectItem(2, this, TQT_SLOT(configure())); + menu->connectItem(4, this, TQT_SLOT(orientation())); menu->setCheckable(true); @@ -328,11 +328,11 @@ void KTimeMon::writeConfiguration() conf->writeEntry("ContextScale", ctxScale); conf->writeEntry("WidgetSize", size()); for (int i = 0; i < MAX_MOUSE_ACTIONS; i++) { - QString n; + TQString n; n.setNum(i); - conf->writeEntry(QString("MouseAction")+n, (unsigned)mouseAction[i]); - conf->writePathEntry(QString("MouseActionCommand")+n, mouseActionCommand[i]); + conf->writeEntry(TQString("MouseAction")+n, (unsigned)mouseAction[i]); + conf->writePathEntry(TQString("MouseActionCommand")+n, mouseActionCommand[i]); } conf->sync(); } @@ -380,7 +380,7 @@ void KTimeMon::orientation() } // Pop up the menu when the appropriate button has been pressed. -void KTimeMon::mousePressEvent(QMouseEvent *event) +void KTimeMon::mousePressEvent(TQMouseEvent *event) { if (event == 0) return; @@ -413,8 +413,8 @@ void KTimeMon::runCommand(int index) bgProcess = new KShellProcess; *bgProcess << mouseActionCommand[index]; - connect(bgProcess, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(commandStderr(KProcess *, char *, int))); + connect(bgProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(commandStderr(KProcess *, char *, int))); bgProcess->start(KProcess::DontCare, KProcess::Stderr); } @@ -423,10 +423,10 @@ void KTimeMon::runCommand(int index) void KTimeMon::commandStderr(KProcess * /*proc*/, char *buffer, int /*length*/) { - QString msgbuf; + TQString msgbuf; msgbuf = i18n("Got diagnostic output from child command:\n\n"); - msgbuf += QString::fromLocal8Bit(buffer); + msgbuf += TQString::fromLocal8Bit(buffer); KMessageBox::information(this, msgbuf); } diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 8f5664c..cf39a35 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -15,7 +15,7 @@ #ifndef TIMEMON_H #define TIMEMON_H -#include <qtooltip.h> +#include <tqtooltip.h> #include <kiconloader.h> #include <kpanelapplet.h> @@ -44,13 +44,13 @@ class KPopupMenu; * case it hides itself). */ -class KTimeMon : public KPanelApplet, QToolTip { +class KTimeMon : public KPanelApplet, TQToolTip { Q_OBJECT public: enum MouseAction { NOTHING, SWITCH, MENU, COMMAND }; - KTimeMon(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + KTimeMon(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~KTimeMon(); void writeConfiguration(); // write back the configuration data @@ -70,10 +70,10 @@ public slots: void apply(); // apply configuration information protected: - virtual void maybeTip(const QPoint&); - virtual void mousePressEvent(QMouseEvent *event); + virtual void maybeTip(const TQPoint&); + virtual void mousePressEvent(TQMouseEvent *event); virtual void updateConfig(KConfDialog *d); - virtual void paintEvent(QPaintEvent *event); + virtual void paintEvent(TQPaintEvent *event); private slots: // called from the menu void configure(); // show the configuration dialog @@ -82,23 +82,23 @@ private slots: // called from the menu private: void runCommand(int index); - void paintRect(int x, int y, int w, int h, QColor c, QPainter *p); + void paintRect(int x, int y, int w, int h, TQColor c, TQPainter *p); unsigned interval; bool autoScale; unsigned pageScale, swapScale, ctxScale; KPopupMenu* menu; KHelpMenu* hmenu; - QTimer* timer; + TQTimer* timer; KConfDialog *configDialog; MouseAction mouseAction[MAX_MOUSE_ACTIONS]; - QString mouseActionCommand[MAX_MOUSE_ACTIONS]; + TQString mouseActionCommand[MAX_MOUSE_ACTIONS]; KShellProcess *bgProcess; KSample *sample; - QColor kernelColour, userColour, niceColour, iowaitColour; - QColor usedColour, buffersColour, cachedColour, mkernelColour; - QColor swapColour, bgColour; + TQColor kernelColour, userColour, niceColour, iowaitColour; + TQColor usedColour, buffersColour, cachedColour, mkernelColour; + TQColor swapColour, bgColour; bool vertical, tooltip; friend class KConfDialog; diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index b4966b2..9d7ca38 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlabel.h> -#include <qfont.h> -#include <qstringlist.h> -#include <qpushbutton.h> -#include <qhbox.h> +#include <tqlabel.h> +#include <tqfont.h> +#include <tqstringlist.h> +#include <tqpushbutton.h> +#include <tqhbox.h> #include <kapplication.h> #include <kglobal.h> @@ -49,23 +49,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmathapplet"); return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet"); } } -MathApplet::MathApplet(const QString& configFile, Type type, int actions, - QWidget *parent, const char *name) +MathApplet::MathApplet(const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), m_hasFocus(false) { // setBackgroundMode(X11ParentRelative); setBackgroundOrigin( AncestorOrigin ); // setup label - _label = new QLabel(i18n("Evaluate:"), this); - QFont f(_label->font()); + _label = new TQLabel(i18n("Evaluate:"), this); + TQFont f(_label->font()); f.setPixelSize(12); // _label->setBackgroundMode(X11ParentRelative); _label->setBackgroundOrigin( AncestorOrigin ); @@ -73,19 +73,19 @@ MathApplet::MathApplet(const QString& configFile, Type type, int actions, _label->setFont(f); // setup popup button - _btn = new QPushButton(this); + _btn = new TQPushButton(this); f = _btn->font(); f.setPixelSize(12); _btn->setFont(f); - connect(_btn, SIGNAL(clicked()), SLOT(popup_combo())); + connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo())); // setup history combo _input = new KHistoryCombo(this); _input->setFocus(); _input->clearEdit(); watchForFocus(_input->lineEdit()); - connect(_input, SIGNAL(activated(const QString&)), - SLOT(evaluate(const QString&))); + connect(_input, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(evaluate(const TQString&))); initContextMenu(); useDegrees(); @@ -95,14 +95,14 @@ MathApplet::MathApplet(const QString& configFile, Type type, int actions, // restore history and completion list - QStringList list = c->readListEntry("Completion list"); + TQStringList list = c->readListEntry("Completion list"); _input->completionObject()->setItems(list); list = c->readListEntry("History list"); _input->setHistoryItems(list); int mode = c->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() ); _input->setCompletionMode( (KGlobalSettings::Completion) mode ); - _hbox = new QHBox( 0, 0, WStyle_Customize | WType_Popup ); + _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); _hbox->setFixedSize(120, 22); @@ -112,8 +112,8 @@ void MathApplet::initContextMenu() { mContextMenu = new KPopupMenu(this); mContextMenu->setCheckable(true); - mContextMenu->insertItem(i18n("Use &Degrees"), this, SLOT(useDegrees()), 0, 0, 0); - mContextMenu->insertItem(i18n("Use &Radians"), this, SLOT(useRadians()), 0, 1, 1); + mContextMenu->insertItem(i18n("Use &Degrees"), this, TQT_SLOT(useDegrees()), 0, 0, 0); + mContextMenu->insertItem(i18n("Use &Radians"), this, TQT_SLOT(useRadians()), 0, 1, 1); setCustomMenu(mContextMenu); } @@ -124,7 +124,7 @@ MathApplet::~MathApplet() c->setGroup("General"); // save history and completion list - QStringList list = _input->completionObject()->items(); + TQStringList list = _input->completionObject()->items(); c->writeEntry("Completion list", list); list = _input->historyItems(); c->writeEntry("History list", list); @@ -149,12 +149,12 @@ void MathApplet::useRadians() { dummy.setAngleMode(0); } -void MathApplet::resizeEvent(QResizeEvent*) +void MathApplet::resizeEvent(TQResizeEvent*) { if(orientation() == Horizontal) { _btn->hide(); - _input->reparent(this, QPoint(0,0), true); + _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); if(height() >= _input->sizeHint().height() + _label->height()) @@ -185,7 +185,7 @@ void MathApplet::resizeEvent(QResizeEvent*) { _btn->show(); _btn->setFixedSize(width(), 22); - _input->reparent( _hbox, QPoint(0, 0), false); + _input->reparent( _hbox, TQPoint(0, 0), false); _label->hide(); } setButtonText(); @@ -198,7 +198,7 @@ void MathApplet::positionChange(KPanelApplet::Position) void MathApplet::setButtonText() { - QString t; + TQString t; if (position() == pLeft) { @@ -230,19 +230,19 @@ int MathApplet::heightForWidth(int ) const void MathApplet::popup_combo() { - QPoint p; + TQPoint p; if (position() == pLeft) - p = mapToGlobal(QPoint(-_input->width()-1, 0)); + p = mapToGlobal(TQPoint(-_input->width()-1, 0)); else - p = mapToGlobal(QPoint(width()+1, 0)); + p = mapToGlobal(TQPoint(width()+1, 0)); _hbox->move(p); _hbox->show(); _input->setFocus(); } -void MathApplet::evaluate(const QString& command) +void MathApplet::evaluate(const TQString& command) { - QString exec; + TQString exec; Parser evaluator; @@ -251,7 +251,7 @@ void MathApplet::evaluate(const QString& command) _input->addToHistory(command); - QString cmd = command; + TQString cmd = command; // Nothing interesting. Quit! if ( cmd.isEmpty() ){ @@ -260,7 +260,7 @@ void MathApplet::evaluate(const QString& command) } else { double answer = evaluator.eval(command); if (evaluator.errmsg() == 0) { - QString ansAsString = QString::number(answer); + TQString ansAsString = TQString::number(answer); _input->clearEdit(); _input->setEditText(ansAsString); } else { @@ -273,7 +273,7 @@ void MathApplet::evaluate(const QString& command) _hbox->hide(); } -void MathApplet::mousePressEvent(QMouseEvent *e) +void MathApplet::mousePressEvent(TQMouseEvent *e) { if ( e->button() != RightButton ) { diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h index 1a918c3..8b483f2 100644 --- a/kicker-applets/math/mathapplet.h +++ b/kicker-applets/math/mathapplet.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __mathapplet_h__ #define __mathapplet_h__ -#include <qstring.h> +#include <tqstring.h> #include <kpanelapplet.h> class QLabel; @@ -40,19 +40,19 @@ class MathApplet : public KPanelApplet Q_OBJECT public: - MathApplet(const QString& configFile, Type t = Stretch, int actions = 0, - QWidget *parent = 0, const char *name = 0); + MathApplet(const TQString& configFile, Type t = Stretch, int actions = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~MathApplet(); int widthForHeight(int height) const; int heightForWidth(int width) const; protected: - void resizeEvent(QResizeEvent*); + void resizeEvent(TQResizeEvent*); void positionChange(KPanelApplet::Position); protected slots: - void evaluate(const QString&); + void evaluate(const TQString&); void popup_combo(); void setButtonText(); void useDegrees(); @@ -61,12 +61,12 @@ protected slots: private: void initContextMenu(); - void mousePressEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); KHistoryCombo *_input; - QLabel *_label; - QPushButton *_btn; - QHBox *_hbox; + TQLabel *_label; + TQPushButton *_btn; + TQHBox *_hbox; KPopupMenu *mContextMenu; bool m_hasFocus; }; diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp index 7d99c87..8a58064 100644 --- a/kicker-applets/math/parser.cpp +++ b/kicker-applets/math/parser.cpp @@ -136,7 +136,7 @@ double Parser::anglemode() { return m_anglemode; } -double Parser::eval(QString str) +double Parser::eval(TQString str) { double erg; stack=new double [stacksize]; @@ -235,7 +235,7 @@ int Parser::getNextIndex() return ix; } -int Parser::addfkt(QString str) +int Parser::addfkt(TQString str) { int ix; @@ -250,11 +250,11 @@ int Parser::addfkt(QString str) //insert '*' when it is needed for(int i=p1+3; i < (int) str.length();i++) { - if( (str.at(i).isNumber() || str.at(i).category()==QChar::Letter_Uppercase )&& ( str.at(i-1).isLetter() || str.at(i-1) == ')' ) ) + if( (str.at(i).isNumber() || str.at(i).category()==TQChar::Letter_Uppercase )&& ( str.at(i-1).isLetter() || str.at(i-1) == ')' ) ) { str.insert(i,'*'); } - else if( (str.at(i).isNumber() || str.at(i) == ')' || str.at(i).category()==QChar::Letter_Uppercase) && ( str.at(i+1).isLetter() || str.at(i+1) == '(' ) ) + else if( (str.at(i).isNumber() || str.at(i) == ')' || str.at(i).category()==TQChar::Letter_Uppercase) && ( str.at(i+1).isLetter() || str.at(i+1) == '(' ) ) { str.insert(i+1,'*'); i++; @@ -316,7 +316,7 @@ int Parser::addfkt(QString str) } -int Parser::delfkt(QString name) +int Parser::delfkt(TQString name) { int ix; ix=getfix(name); @@ -333,7 +333,7 @@ int Parser::delfkt(int ix) } -double Parser::fkt(QString name, double x) +double Parser::fkt(TQString name, double x) { int ix; ix=getfix(name); @@ -632,7 +632,7 @@ int Parser::chkfix(int ix) } -int Parser::getfkt(int ix, QString& name, QString& str) +int Parser::getfkt(int ix, TQString& name, TQString& str) { if(ix<0 || ix>=ufanz) return -1; // ungltiger Index if(ufkt[ix].fname.isEmpty()) return -1; // keine Funktion name=ufkt[ix].fname.copy(); @@ -641,7 +641,7 @@ int Parser::getfkt(int ix, QString& name, QString& str) } -int Parser::getfix(QString name) +int Parser::getfix(TQString name) { int ix; err=0; @@ -656,41 +656,41 @@ int Parser::getfix(QString name) int Parser::errmsg() { switch(err) { case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Syntax error").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Missing parenthesis").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Function name unknown").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Void function variable").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Too many functions").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Token-memory overflow").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Stack overflow").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Name of function not free").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "recursive function not allowed").arg(QString::number(errpos)), i18n("Math Expression Evaluator")); + "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(QString::number(errpos)), + case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 11: KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator")); diff --git a/kicker-applets/math/parser.h b/kicker-applets/math/parser.h index 44e82ba..4ee0e7d 100644 --- a/kicker-applets/math/parser.h +++ b/kicker-applets/math/parser.h @@ -30,8 +30,8 @@ * \brief Contains the parser core class Parser. */ // Qt includes -#include <qstring.h> -#include <qvaluevector.h> +#include <tqstring.h> +#include <tqvaluevector.h> #ifndef parser_included #define parser_included @@ -125,23 +125,23 @@ public: ~Parser(); /// Evaluates the given expression. - double eval(QString); + double eval(TQString); /// Evaluates the function with the given name at the position. - double fkt(QString, double); + double fkt(TQString, double); /// Evaluates the function with the given index at the position. double fkt(int ix, double x) {return ufkt[ix].fkt(x);} /// Adds a user defined function with the given equation. - int addfkt(QString); + int addfkt(TQString); /// Removes the function with the given name. - int delfkt(QString); + int delfkt(TQString); /// Removes the function with the given index. int delfkt(int); /// Returns name and expression of the function with the given index. - int getfkt(int, QString&, QString&); + int getfkt(int, TQString&, TQString&); /// Checks, if at the given index a function is stored. int chkfix(int); /// Returns the index of the function with the given name. - int getfix(QString); + int getfix(TQString); /// Returns the lowest index in the array of user defined functions which is empty, /// or -1, if the array is full. int getNextIndex(); @@ -154,7 +154,7 @@ public: /// sets the angletype. TRUE is radians and FALSE degrees void setAngleMode(int); - QValueVector<Constant> constant; + TQValueVector<Constant> constant; /// Error codes. /** @@ -188,9 +188,9 @@ 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. - QString fvar; ///< Dummy variable. - QString fpar; ///< Parameter. - QString fstr; ///< Function expression. + TQString fvar; ///< Dummy variable. + TQString fpar; ///< Parameter. + TQString fstr; ///< Function expression. int memsize; ///< Size of token memory int stacksize; ///< Size of the stack. double k, ///< Function parameter. diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index 2045c12..f52ae4b 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -21,8 +21,8 @@ #include "amarokInterface.moc" #include <kdebug.h> -#include <qstringlist.h> -#include <qstrlist.h> +#include <tqstringlist.h> +#include <tqstrlist.h> #include <kurldrag.h> #define TIMER_FAST 250 @@ -30,18 +30,18 @@ AmarokInterface::AmarokInterface() : PlayerInterface() { mTimerValue = TIMER_FAST; - mAmarokTimer = new QTimer ( this, "mAmaroKTimer" ); + mAmarokTimer = new TQTimer ( this, "mAmaroKTimer" ); - connect(mAmarokTimer, SIGNAL(timeout()), SLOT(updateSlider()) ); + connect(mAmarokTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); kapp->dcopClient()->setNotifications ( true ); - connect(kapp->dcopClient(), SIGNAL(applicationRegistered(const QCString&)), - SLOT(appRegistered(const QCString&)) ); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), + TQT_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)), - SLOT(appRemoved(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(appRemoved(const TQCString&))); - QTimer::singleShot(0, this, SLOT(myInit())); + TQTimer::singleShot(0, this, TQT_SLOT(myInit())); } AmarokInterface::~AmarokInterface() @@ -66,7 +66,7 @@ void AmarokInterface::myInit() } } -void AmarokInterface::appRegistered ( const QCString &appId ) +void AmarokInterface::appRegistered ( const TQCString &appId ) { if(appId.contains("amarok",false) ) { @@ -76,7 +76,7 @@ void AmarokInterface::appRegistered ( const QCString &appId ) } } -void AmarokInterface::appRemoved ( const QCString &appId ) +void AmarokInterface::appRemoved ( const TQCString &appId ) { if ( appId.contains("amarok",false) ) { @@ -93,8 +93,8 @@ void AmarokInterface::updateSlider ( ) { // length/time in msecs, -1 means "no playobject in amarok" int len, time; - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (!kapp->dcopClient()->call(mAppId, "player", "trackTotalTime()",data, replyType, replyData)) { @@ -104,7 +104,7 @@ void AmarokInterface::updateSlider ( ) } else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") { reply >> len; @@ -128,7 +128,7 @@ void AmarokInterface::updateSlider ( ) } else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") { reply >> time; @@ -151,20 +151,20 @@ void AmarokInterface::updateSlider ( ) // Drag-n-Drop stuff ================================================================= -void AmarokInterface::dragEnterEvent(QDragEnterEvent* event) +void AmarokInterface::dragEnterEvent(TQDragEnterEvent* event) { // kdDebug(90200) << "AmarokInterface::dragEnterEvent()" << endl; event->accept( KURLDrag::canDecode(event) ); } -void AmarokInterface::dropEvent(QDropEvent* event) +void AmarokInterface::dropEvent(TQDropEvent* event) { kdDebug(90200) << "AmarokInterface::dropEvent()" << endl; KURL::List list; if (KURLDrag::decode(event, list)) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << list; if (!kapp->dcopClient()->send(mAppId, "player", "addMediaList(KURL::List)",data)) kdDebug(90200) << "Couldn't send drop to amarok" << endl; @@ -185,8 +185,8 @@ void AmarokInterface::sliderStopDrag() void AmarokInterface::jumpToTime( int sec ) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << sec; kapp->dcopClient()->send(mAppId, "player", "seek(int)", data); } @@ -195,54 +195,54 @@ void AmarokInterface::playpause() { if (!findRunningAmarok()) startPlayer("amarok"); - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "player", "playPause()", data); } void AmarokInterface::stop() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "player", "stop()", data); } void AmarokInterface::next() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "player", "next()", data); } void AmarokInterface::prev() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "player", "prev()", data); } void AmarokInterface::volumeUp() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "player", "volumeUp()", data); } void AmarokInterface::volumeDown() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "player", "volumeDown()", data); } -const QString AmarokInterface::getTrackTitle() const +const TQString AmarokInterface::getTrackTitle() const { - QString title; - QByteArray data, replyData; - QCString replyType; + TQString title; + TQByteArray data, replyData; + TQCString replyType; if (!kapp->dcopClient()->call(mAppId, "player", "nowPlaying()",data, replyType, replyData)) { //kdDebug(90200) << "mediacontrol: DCOP communication Error" << endl; - return QString(""); + return TQString(""); } else { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQString") { reply >> title; return title; @@ -250,7 +250,7 @@ const QString AmarokInterface::getTrackTitle() const else { //kdDebug(90200) << "mediacontrol: unexpected type of DCOP-reply" << endl; - return QString(""); + return TQString(""); } } } @@ -258,9 +258,9 @@ const QString AmarokInterface::getTrackTitle() const bool AmarokInterface::findRunningAmarok() { QCStringList allApps = kapp->dcopClient()->registeredApplications(); - QValueList<QCString>::const_iterator iterator; - QByteArray data, replyData; - QCString replyType; + TQValueList<TQCString>::const_iterator iterator; + TQByteArray data, replyData; + TQCString replyType; for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { @@ -270,7 +270,7 @@ bool AmarokInterface::findRunningAmarok() { if ( replyType == "QCStringList" ) { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); QCStringList list; reply >> list; @@ -291,14 +291,14 @@ bool AmarokInterface::findRunningAmarok() int AmarokInterface::playingStatus() { - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (kapp->dcopClient()->call(mAppId, "player", "status()", data, replyType, replyData)) { int status = 0; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> status; if (status == 2) diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h index 3a71031..53f1ac6 100644 --- a/kicker-applets/mediacontrol/amarokInterface.h +++ b/kicker-applets/mediacontrol/amarokInterface.h @@ -24,7 +24,7 @@ #include <kapplication.h> #include <dcopclient.h> -#include <qtimer.h> +#include <tqtimer.h> class AmarokInterface : public PlayerInterface { @@ -44,20 +44,20 @@ class AmarokInterface : public PlayerInterface virtual void prev(); virtual void volumeUp(); virtual void volumeDown(); - virtual void dragEnterEvent(QDragEnterEvent* event); - virtual void dropEvent(QDropEvent* event); - virtual const QString getTrackTitle() const; + virtual void dragEnterEvent(TQDragEnterEvent* event); + virtual void dropEvent(TQDropEvent* event); + virtual const TQString getTrackTitle() const; virtual int playingStatus(); private slots: void myInit(); - void appRegistered ( const QCString &appId ); - void appRemoved ( const QCString &appId ); + void appRegistered ( const TQCString &appId ); + void appRemoved ( const TQCString &appId ); private: - QTimer *mAmarokTimer; + TQTimer *mAmarokTimer; int mTimerValue; - QCString mAppId; + TQCString mAppId; /** * Tries to find a DCOP registered instance of AmaroK diff --git a/kicker-applets/mediacontrol/configfrontend.cpp b/kicker-applets/mediacontrol/configfrontend.cpp index ba206c8..4deab8b 100644 --- a/kicker-applets/mediacontrol/configfrontend.cpp +++ b/kicker-applets/mediacontrol/configfrontend.cpp @@ -21,9 +21,9 @@ #include "configfrontend.h" // #include <kdebug.h> -ConfigFrontend::ConfigFrontend() : QObject(0, 0) +ConfigFrontend::ConfigFrontend() : TQObject(0, 0) { - _config = new KConfig(QString::null, true, false); + _config = new KConfig(TQString::null, true, false); _ownConfig = true; } @@ -35,7 +35,7 @@ ConfigFrontend::~ConfigFrontend() } } -ConfigFrontend::ConfigFrontend(KConfig *config) : QObject(0, 0) +ConfigFrontend::ConfigFrontend(KConfig *config) : TQObject(0, 0) { _config = config; _config->setGroup("MediaControl"); @@ -57,12 +57,12 @@ void ConfigFrontend::setMouseWheelSpeed(const uint mouseWheelSpeed) // ==================================================================================== -QString ConfigFrontend::player() const +TQString ConfigFrontend::player() const { return _config->readPathEntry("Player", "Noatun"); } -void ConfigFrontend::setPlayer(const QString &player) +void ConfigFrontend::setPlayer(const TQString &player) { _config->writePathEntry("Player", player); _config->sync(); @@ -70,12 +70,12 @@ void ConfigFrontend::setPlayer(const QString &player) // ==================================================================================== -QString ConfigFrontend::theme() const +TQString ConfigFrontend::theme() const { return _config->readEntry("Theme", "default"); } -void ConfigFrontend::setTheme(const QString &theme) +void ConfigFrontend::setTheme(const TQString &theme) { _config->writeEntry("Theme", theme); _config->sync(); diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h index 87a0bf4..b625c70 100644 --- a/kicker-applets/mediacontrol/configfrontend.h +++ b/kicker-applets/mediacontrol/configfrontend.h @@ -33,14 +33,14 @@ class ConfigFrontend : public QObject virtual ~ConfigFrontend(); uint mouseWheelSpeed() const; - QString player() const; - QString theme() const; + TQString player() const; + TQString theme() const; bool useCustomTheme() const; public slots: void setMouseWheelSpeed(const uint); - void setPlayer(const QString &player); - void setTheme(const QString &theme); + void setPlayer(const TQString &player); + void setTheme(const TQString &theme); void setUseCustomTheme(const bool use); void reparseConfiguration() { _config->reparseConfiguration(); } diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index 302e7f2..be99528 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -20,9 +20,9 @@ #include <kapplication.h> #include <kdebug.h> -#include <qstringlist.h> -#include <qstrlist.h> -#include <qprocess.h> +#include <tqstringlist.h> +#include <tqstrlist.h> +#include <tqprocess.h> #include <kurldrag.h> #define TIMER_FAST 250 @@ -30,18 +30,18 @@ JuKInterface::JuKInterface() : PlayerInterface(), mProc(0) { mTimerValue = TIMER_FAST; - mJuKTimer = new QTimer ( this, "mJukTimer" ); + mJuKTimer = new TQTimer ( this, "mJukTimer" ); - connect(mJuKTimer, SIGNAL(timeout()), SLOT(updateSlider()) ); + connect(mJuKTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); kapp->dcopClient()->setNotifications ( true ); - connect(kapp->dcopClient(), SIGNAL(applicationRegistered(const QCString&)), - SLOT(appRegistered(const QCString&)) ); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), + TQT_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)), - SLOT(appRemoved(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(appRemoved(const TQCString&))); - QTimer::singleShot(0, this, SLOT(myInit())); + TQTimer::singleShot(0, this, TQT_SLOT(myInit())); } JuKInterface::~JuKInterface() @@ -66,7 +66,7 @@ void JuKInterface::myInit() } } -void JuKInterface::appRegistered ( const QCString &appId ) +void JuKInterface::appRegistered ( const TQCString &appId ) { if(appId.contains("juk",false) ) { @@ -80,18 +80,18 @@ void JuKInterface::appRegistered ( const QCString &appId ) // So what we do is launch the dcop command instead, and let // *it* block for us. As soon as the command exits, we know // that JuK is ready to go (and so are we). - mProc = new QProcess(this, "jukdcopCheckProc"); + mProc = new TQProcess(this, "jukdcopCheckProc"); mProc->addArgument("dcop"); mProc->addArgument("juk"); mProc->addArgument("Player"); mProc->addArgument("status()"); - connect(mProc, SIGNAL(processExited()), SLOT(jukIsReady())); + connect(mProc, TQT_SIGNAL(processExited()), TQT_SLOT(jukIsReady())); mProc->start(); } } -void JuKInterface::appRemoved ( const QCString &appId ) +void JuKInterface::appRemoved ( const TQCString &appId ) { if ( appId.contains("juk",false) ) { @@ -119,13 +119,13 @@ void JuKInterface::updateSlider () // length/time in msecs, -1 means "no playobject in juk" int len = -1; int time = -1; - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (kapp->dcopClient()->call(mAppId, "Player", "totalTime()", data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> len; } @@ -137,7 +137,7 @@ void JuKInterface::updateSlider () if (kapp->dcopClient()->call(mAppId, "Player", "currentTime()", data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> time; } @@ -153,22 +153,22 @@ void JuKInterface::updateSlider () // Drag-n-Drop stuff ================================================================= -void JuKInterface::dragEnterEvent(QDragEnterEvent* event) +void JuKInterface::dragEnterEvent(TQDragEnterEvent* event) { // kdDebug(90200) << "JuKInterface::dragEnterEvent()" << endl; event->accept( KURLDrag::canDecode(event) ); } -void JuKInterface::dropEvent(QDropEvent* event) +void JuKInterface::dropEvent(TQDropEvent* event) { // kdDebug(90200) << "JuKInterface::dropEvent()" << endl; KURL::List list; if (KURLDrag::decode(event, list)) { - QByteArray data, replyData; - QStringList fileList; - QCString replyType; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQStringList fileList; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); // Juk doesn't handle KURL's yet, so we need to form a list // that contains the local paths. @@ -179,18 +179,18 @@ void JuKInterface::dropEvent(QDropEvent* event) // Use call instead of send to make sure the files are added // before we try to play. - if (!kapp->dcopClient()->call(mAppId, "Collection", "openFile(QStringList)", data, + if (!kapp->dcopClient()->call(mAppId, "Collection", "openFile(TQStringList)", data, replyType, replyData, true)) { kdDebug(90200) << "Couldn't send drop to juk" << endl; } // Apparently we should auto-play? - QByteArray strData; - QDataStream strArg(strData, IO_WriteOnly); + TQByteArray strData; + TQDataStream strArg(strData, IO_WriteOnly); strArg << *fileList.begin(); - if (!kapp->dcopClient()->send(mAppId, "Player", "play(QString)", strData)) + if (!kapp->dcopClient()->send(mAppId, "Player", "play(TQString)", strData)) kdDebug(90200) << "Couldn't send play command to juk" << endl; } } @@ -209,8 +209,8 @@ void JuKInterface::sliderStopDrag() void JuKInterface::jumpToTime( int sec ) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << sec; // Used in JuK shipping with KDE < 3.3 //kapp->dcopClient()->send(mAppId, "Player", "setTime(int)", data); @@ -221,64 +221,64 @@ void JuKInterface::playpause() { if (!findRunningJuK()) startPlayer("juk"); - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "Player", "playPause()", data); } void JuKInterface::stop() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "Player", "stop()", data); } void JuKInterface::next() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "Player", "forward()", data); } void JuKInterface::prev() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "Player", "back()", data); } void JuKInterface::volumeUp() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "Player", "volumeUp()", data); } void JuKInterface::volumeDown() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "Player", "volumeDown()", data); } -const QString JuKInterface::getTrackTitle() const +const TQString JuKInterface::getTrackTitle() const { - QString title; - QByteArray data, replyData; - QCString replyType; + TQString title; + TQByteArray data, replyData; + TQCString replyType; if (kapp->dcopClient()->call(mAppId, "Player", "playingString()",data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQString") { reply >> title; return title; } } - return QString(""); + return TQString(""); } // FIXME: what if we have a dcop app named, let's say, 'jukfrontend'? bool JuKInterface::findRunningJuK() { QCStringList allApps = kapp->dcopClient()->registeredApplications(); - QValueList<QCString>::const_iterator iterator; + TQValueList<TQCString>::const_iterator iterator; for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { @@ -293,14 +293,14 @@ bool JuKInterface::findRunningJuK() int JuKInterface::playingStatus() { - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (kapp->dcopClient()->call(mAppId, "Player", "status()", data, replyType, replyData)) { int status = 0; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> status; diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h index fb7f9bb..f305ab0 100644 --- a/kicker-applets/mediacontrol/jukInterface.h +++ b/kicker-applets/mediacontrol/jukInterface.h @@ -23,7 +23,7 @@ #include <kapplication.h> #include <dcopclient.h> -#include <qtimer.h> +#include <tqtimer.h> class QProcess; @@ -45,22 +45,22 @@ class JuKInterface : public PlayerInterface void prev(); void volumeUp(); void volumeDown(); - void dragEnterEvent(QDragEnterEvent* event); - void dropEvent(QDropEvent* event); - const QString getTrackTitle() const; + void dragEnterEvent(TQDragEnterEvent* event); + void dropEvent(TQDropEvent* event); + const TQString getTrackTitle() const; int playingStatus(); private slots: void myInit(); - void appRegistered ( const QCString &appId ); - void appRemoved ( const QCString &appId ); + void appRegistered ( const TQCString &appId ); + void appRemoved ( const TQCString &appId ); void jukIsReady(); private: - QTimer *mJuKTimer; - QProcess *mProc; + TQTimer *mJuKTimer; + TQProcess *mProc; int mTimerValue; - QCString mAppId; + TQCString mAppId; /** * Tries to find a DCOP registered instance of juk diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index f7f7e90..fea1048 100644 --- a/kicker-applets/mediacontrol/kscdInterface.cpp +++ b/kicker-applets/mediacontrol/kscdInterface.cpp @@ -21,8 +21,8 @@ #include <kapplication.h> #include <kdebug.h> -#include <qstringlist.h> -#include <qstrlist.h> +#include <tqstringlist.h> +#include <tqstrlist.h> #include <kurldrag.h> #include <klocale.h> @@ -30,18 +30,18 @@ KsCDInterface::KsCDInterface() : PlayerInterface() { - mKsCDTimer = new QTimer(this, "mKsCDTimer"); + mKsCDTimer = new TQTimer(this, "mKsCDTimer"); - connect(mKsCDTimer, SIGNAL(timeout()), SLOT(updateSlider()) ); + connect(mKsCDTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); kapp->dcopClient()->setNotifications ( true ); - connect(kapp->dcopClient(), SIGNAL(applicationRegistered(const QCString&)), - SLOT(appRegistered(const QCString&)) ); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), + TQT_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)), - SLOT(appRemoved(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(appRemoved(const TQCString&))); - QTimer::singleShot(0, this, SLOT(myInit())); + TQTimer::singleShot(0, this, TQT_SLOT(myInit())); } KsCDInterface::~KsCDInterface() @@ -66,7 +66,7 @@ void KsCDInterface::myInit() } } -void KsCDInterface::appRegistered(const QCString &appId) +void KsCDInterface::appRegistered(const TQCString &appId) { if((appId) == "kscd") { @@ -76,7 +76,7 @@ void KsCDInterface::appRegistered(const QCString &appId) } } -void KsCDInterface::appRemoved(const QCString &appId) +void KsCDInterface::appRemoved(const TQCString &appId) { if ((appId) == "kscd") { @@ -97,13 +97,13 @@ void KsCDInterface::updateSlider() // length/time in secs, -1 means "no playobject in kscd" int len = -1; int time = -1; - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackLength()", data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> len; } @@ -115,7 +115,7 @@ void KsCDInterface::updateSlider() if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentPosition()", data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> time; } @@ -134,12 +134,12 @@ void KsCDInterface::updateSlider() // or even no application to drag AudioCD track from (not the KIO-wrapped track // path (audiocd:/...) like from Konqueror) -void KsCDInterface::dragEnterEvent(QDragEnterEvent* event) +void KsCDInterface::dragEnterEvent(TQDragEnterEvent* event) { event->ignore(); } -void KsCDInterface::dropEvent(QDropEvent* event) +void KsCDInterface::dropEvent(TQDropEvent* event) { event->ignore(); } @@ -158,8 +158,8 @@ void KsCDInterface::sliderStopDrag() void KsCDInterface::jumpToTime(int sec) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << sec; kapp->dcopClient()->send(mAppId, "CDPlayer", "jumpTo(int)", data); } @@ -168,52 +168,52 @@ void KsCDInterface::playpause() { if (!findRunningKsCD()) startPlayer("kscd"); - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "CDPlayer", "play()", data); } void KsCDInterface::stop() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "CDPlayer", "stop()", data); } void KsCDInterface::next() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "CDPlayer", "next()", data); } void KsCDInterface::prev() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "CDPlayer", "previous()", data); } void KsCDInterface::volumeUp() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "CDPlayer", "volumeUp()", data); } void KsCDInterface::volumeDown() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send(mAppId, "CDPlayer", "volumeDown()", data); } -const QString KsCDInterface::getTrackTitle() const +const TQString KsCDInterface::getTrackTitle() const { - QString title, artist, album, result; - QByteArray data, replyData; - QCString replyType; + TQString title, artist, album, result; + TQByteArray data, replyData; + TQCString replyType; // Get track title from KsCD... if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackTitle()", data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQString") { reply >> title; } @@ -223,8 +223,8 @@ const QString KsCDInterface::getTrackTitle() const if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentAlbum()", data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQString") { reply >> album; } @@ -234,8 +234,8 @@ const QString KsCDInterface::getTrackTitle() const if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentArtist()", data, replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQString") { reply >> artist; } @@ -292,7 +292,7 @@ const QString KsCDInterface::getTrackTitle() const bool KsCDInterface::findRunningKsCD() { QCStringList allApps = kapp->dcopClient()->registeredApplications(); - QValueList<QCString>::const_iterator iterator; + TQValueList<TQCString>::const_iterator iterator; for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { @@ -307,14 +307,14 @@ bool KsCDInterface::findRunningKsCD() int KsCDInterface::playingStatus() { - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (kapp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType, replyData)) { int status = 0; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> status; diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h index 0817b1e..8af0d1d 100644 --- a/kicker-applets/mediacontrol/kscdInterface.h +++ b/kicker-applets/mediacontrol/kscdInterface.h @@ -24,7 +24,7 @@ #include <kapplication.h> #include <dcopclient.h> -#include <qtimer.h> +#include <tqtimer.h> class KsCDInterface : public PlayerInterface { @@ -44,19 +44,19 @@ class KsCDInterface : public PlayerInterface void prev(); void volumeUp(); void volumeDown(); - void dragEnterEvent(QDragEnterEvent* event); - void dropEvent(QDropEvent* event); - const QString getTrackTitle() const; + void dragEnterEvent(TQDragEnterEvent* event); + void dropEvent(TQDropEvent* event); + const TQString getTrackTitle() const; int playingStatus(); private slots: void myInit(); - void appRegistered ( const QCString &appId ); - void appRemoved ( const QCString &appId ); + void appRegistered ( const TQCString &appId ); + void appRemoved ( const TQCString &appId ); private: - QTimer *mKsCDTimer; - QCString mAppId; + TQTimer *mKsCDTimer; + TQCString mAppId; /** * Tries to find a DCOP registered instance of KsCD diff --git a/kicker-applets/mediacontrol/mcslider.cpp b/kicker-applets/mediacontrol/mcslider.cpp index 642d2e2..cad953d 100644 --- a/kicker-applets/mediacontrol/mcslider.cpp +++ b/kicker-applets/mediacontrol/mcslider.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include <qpixmap.h> +#include <tqpixmap.h> #include "mcslider.h" -MCSlider::MCSlider( Orientation orientation, QWidget *parent, const char *name ) - : QSlider( orientation, parent, name ) +MCSlider::MCSlider( Orientation orientation, TQWidget *parent, const char *name ) + : TQSlider( orientation, parent, name ) { setBackgroundOrigin(WidgetOrigin); setBackground(); @@ -38,13 +38,13 @@ void MCSlider::setBackground() if (parentWidget()->paletteBackgroundPixmap()) { - QPixmap pm(width(), height()); + TQPixmap pm(width(), height()); pm.fill(parentWidget(), pos()); setPaletteBackgroundPixmap(pm); } } -void MCSlider::wheelEvent(QWheelEvent *e) +void MCSlider::wheelEvent(TQWheelEvent *e) { if (e->orientation() == Horizontal) return; @@ -59,7 +59,7 @@ void MCSlider::wheelEvent(QWheelEvent *e) } else { - QSlider::wheelEvent(e); + TQSlider::wheelEvent(e); } } diff --git a/kicker-applets/mediacontrol/mcslider.h b/kicker-applets/mediacontrol/mcslider.h index 9b11893..d58aac0 100644 --- a/kicker-applets/mediacontrol/mcslider.h +++ b/kicker-applets/mediacontrol/mcslider.h @@ -18,18 +18,18 @@ #ifndef MCSLIDER_H #define MCSLIDER_H -#include <qslider.h> +#include <tqslider.h> class MCSlider : public QSlider { Q_OBJECT public: - MCSlider( Orientation orientation, QWidget *parent, const char *name = 0 ); + MCSlider( Orientation orientation, TQWidget *parent, const char *name = 0 ); ~MCSlider(); void setBackground(); private: - virtual void wheelEvent(QWheelEvent *e); + virtual void wheelEvent(TQWheelEvent *e); signals: void volumeUp(); void volumeDown(); diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index e69e0e0..433f52d 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -35,13 +35,13 @@ #include "mcslider.h" -#include <qfile.h> -#include <qdragobject.h> -#include <qtooltip.h> -#include <qstyle.h> -#include <qslider.h> -#include <qpainter.h> -#include <qiconset.h> +#include <tqfile.h> +#include <tqdragobject.h> +#include <tqtooltip.h> +#include <tqstyle.h> +#include <tqslider.h> +#include <tqpainter.h> +#include <tqiconset.h> #include <kpopupmenu.h> #include <kapplication.h> @@ -57,7 +57,7 @@ const int NO_BUTTONS = 4; extern "C" { - KDE_EXPORT KPanelApplet *init( QWidget *parent, const QString &configFile) + KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile) { KGlobal::locale()->insertCatalogue("mediacontrol"); return new MediaControl(configFile, KPanelApplet::Normal, @@ -71,27 +71,27 @@ extern "C" class MediaControlToolTip : public QToolTip { public: - MediaControlToolTip(QWidget *widget, PlayerInterface *pl_obj) : - QToolTip(widget), mWidget(widget), mPlayer(pl_obj) {} + MediaControlToolTip(TQWidget *widget, PlayerInterface *pl_obj) : + TQToolTip(widget), mWidget(widget), mPlayer(pl_obj) {} protected: - virtual void maybeTip(const QPoint &pt) + virtual void maybeTip(const TQPoint &pt) { - QRect rc( mWidget->rect()); + TQRect rc( mWidget->rect()); if (rc.contains(pt)) { tip ( rc, mPlayer->getTrackTitle() ); } } private: - QWidget *mWidget; + TQWidget *mWidget; PlayerInterface *mPlayer; }; // ============================================================================= -MediaControl::MediaControl(const QString &configFile, Type t, int actions, - QWidget *parent, const char *name) +MediaControl::MediaControl(const TQString &configFile, Type t, int actions, + TQWidget *parent, const char *name) : DCOPObject("MediaControl"), KPanelApplet(configFile, t, actions, parent, name), mInstance(new KInstance("mediacontrol")), @@ -139,7 +139,7 @@ MediaControl::MediaControl(const QString &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 (QSlider::Horizontal, this, "time_slider" ); + time_slider = new MCSlider (TQSlider::Horizontal, this, "time_slider" ); time_slider->setRange(0,0); time_slider->setValue(0); time_slider->setTracking( false ); @@ -147,15 +147,15 @@ MediaControl::MediaControl(const QString &configFile, Type t, int actions, // request notification of changes in icon style kapp->addKipcEventMask(KIPC::IconChanged); - connect(kapp, SIGNAL(iconChanged(int)), this, SLOT(slotIconChanged())); + connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged())); reparseConfig(); rmbMenu = new KPopupMenu(this, "RMBMenu"); rmbMenu->insertTitle(i18n("MediaControl"), 0, 0); rmbMenu->insertItem(SmallIcon("configure"), i18n("Configure MediaControl..."), - this, SLOT(preferences())); - rmbMenu->insertItem(i18n("About MediaControl"), this, SLOT(about())); + this, TQT_SLOT(preferences())); + rmbMenu->insertItem(i18n("About MediaControl"), this, TQT_SLOT(about())); } MediaControl::~MediaControl() @@ -168,12 +168,12 @@ MediaControl::~MediaControl() // Drag-n-Drop stuff =========================================================== -void MediaControl::dragEnterEvent(QDragEnterEvent* event) +void MediaControl::dragEnterEvent(TQDragEnterEvent* event) { _player->dragEnterEvent(event); // Just pass dnd to the playerInterface } -void MediaControl::dropEvent(QDropEvent* event) +void MediaControl::dropEvent(TQDropEvent* event) { _player->dropEvent(event); // Just pass dnd to the playerInterface } @@ -202,7 +202,7 @@ void MediaControl::enableAll() { prev_button->setDisabled(false); playpause_button->setDisabled(false); - QToolTip::remove(playpause_button); + TQToolTip::remove(playpause_button); stop_button->setDisabled(false); next_button->setDisabled(false); time_slider->setDisabled(false); @@ -212,12 +212,12 @@ void MediaControl::disableAll() { prev_button->setDisabled(true); playpause_button->setDisabled(false); - QToolTip::add(playpause_button, i18n("Start the player")); + TQToolTip::add(playpause_button, i18n("Start the player")); stop_button->setDisabled(true); next_button->setDisabled(true); time_slider->setDisabled(true); if(_configFrontend->useCustomTheme()) { - QString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); + TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png"))); } else @@ -230,7 +230,7 @@ void MediaControl::slotPlayingStatusChanged(int status) return; mLastStatus = status; - QString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); + TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); switch (status) { @@ -275,12 +275,12 @@ void MediaControl::preferences() else { _prefsDialog = new MediaControlConfig ( _configFrontend ); - connect ( _prefsDialog, SIGNAL(closing()), - this, SLOT(slotClosePrefsDialog()) ); - connect ( _prefsDialog, SIGNAL(destroyed()), - this, SLOT(slotPrefsDialogClosing()) ); - connect ( _prefsDialog, SIGNAL(configChanged()), - this, SLOT(slotConfigChanged()) ); + connect ( _prefsDialog, TQT_SIGNAL(closing()), + this, TQT_SLOT(slotClosePrefsDialog()) ); + connect ( _prefsDialog, TQT_SIGNAL(destroyed()), + this, TQT_SLOT(slotPrefsDialogClosing()) ); + connect ( _prefsDialog, TQT_SIGNAL(configChanged()), + this, TQT_SLOT(slotConfigChanged()) ); } } @@ -352,7 +352,7 @@ void MediaControl::reparseConfig() mLastTime = -1; mLastStatus = -1; - QString playerString = _configFrontend->player(); + TQString playerString = _configFrontend->player(); #ifdef HAVE_XMMS @@ -396,21 +396,21 @@ void MediaControl::reparseConfig() } // this signal gets emitted by a playerInterface when the player's playtime changed - connect(_player, SIGNAL(newSliderPosition(int,int)), - this, SLOT(setSliderPosition(int,int))); + connect(_player, TQT_SIGNAL(newSliderPosition(int,int)), + this, TQT_SLOT(setSliderPosition(int,int))); - connect(_player, SIGNAL(playerStarted()), SLOT(enableAll())); - connect(_player, SIGNAL(playerStopped()), SLOT(disableAll())); - connect(_player, SIGNAL(playingStatusChanged(int)), SLOT(slotPlayingStatusChanged(int))); + connect(_player, TQT_SIGNAL(playerStarted()), TQT_SLOT(enableAll())); + connect(_player, TQT_SIGNAL(playerStopped()), TQT_SLOT(disableAll())); + connect(_player, TQT_SIGNAL(playingStatusChanged(int)), TQT_SLOT(slotPlayingStatusChanged(int))); // do we use our icons or the default ones from KDE? if(_configFrontend->useCustomTheme()) { // load theme - QString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); + TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); // the user has to take care if all pixmaps are there, we only check for one of them - if (QFile(skindir+"play.png").exists()) + if (TQFile(skindir+"play.png").exists()) { prev_button->setIconSet(SmallIconSet(locate("data",skindir+"prev.png"))); if (_player->playingStatus() == PlayerInterface::Playing) @@ -441,17 +441,17 @@ void MediaControl::reparseConfig() slider_tooltip = new MediaControlToolTip(time_slider, _player); - connect(prev_button, SIGNAL(clicked()), _player, SLOT(prev())); - connect(playpause_button, SIGNAL(clicked()), _player, SLOT(playpause())); - connect(stop_button, SIGNAL(clicked()), _player, SLOT(stop())); - connect(next_button, SIGNAL(clicked()), _player, SLOT(next())); - - connect(time_slider, SIGNAL(sliderPressed()), _player, SLOT(sliderStartDrag())); - connect(time_slider, SIGNAL(sliderReleased()), _player, SLOT(sliderStopDrag())); - connect(time_slider, SIGNAL(valueChanged(int)), this, SLOT(adjustTime(int))); - connect(time_slider, SIGNAL(volumeUp()), _player, SLOT(volumeUp())); - connect(time_slider, SIGNAL(volumeDown()), _player, SLOT(volumeDown())); - connect(this, SIGNAL(newJumpToTime(int)), _player, SLOT(jumpToTime(int))); + connect(prev_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(prev())); + connect(playpause_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(playpause())); + connect(stop_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(stop())); + connect(next_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(next())); + + connect(time_slider, TQT_SIGNAL(sliderPressed()), _player, TQT_SLOT(sliderStartDrag())); + connect(time_slider, TQT_SIGNAL(sliderReleased()), _player, TQT_SLOT(sliderStopDrag())); + connect(time_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(adjustTime(int))); + connect(time_slider, TQT_SIGNAL(volumeUp()), _player, TQT_SLOT(volumeUp())); + connect(time_slider, TQT_SIGNAL(volumeDown()), _player, TQT_SLOT(volumeDown())); + connect(this, TQT_SIGNAL(newJumpToTime(int)), _player, TQT_SLOT(jumpToTime(int))); } // Widget Placement =================================================================== @@ -496,18 +496,18 @@ int MediaControl::heightForWidth(int width) const } } -void MediaControl::mousePressEvent(QMouseEvent* e) +void MediaControl::mousePressEvent(TQMouseEvent* e) { - if (e->button() == QMouseEvent::RightButton) + if (e->button() == TQMouseEvent::RightButton) rmbMenu->popup(e->globalPos()); } -bool MediaControl::eventFilter(QObject *, QEvent *e) +bool MediaControl::eventFilter(TQObject *, TQEvent *e) { - if (e->type() == QEvent::MouseButtonPress) + if (e->type() == TQEvent::MouseButtonPress) { - QMouseEvent *me = static_cast<QMouseEvent *>(e); - if (me->button() == QMouseEvent::RightButton) + TQMouseEvent *me = static_cast<TQMouseEvent *>(e); + if (me->button() == TQMouseEvent::RightButton) { rmbMenu->popup(me->globalPos()); return true; @@ -516,25 +516,25 @@ bool MediaControl::eventFilter(QObject *, QEvent *e) return false; } -void MediaControl::paletteChange( const QPalette& ) +void MediaControl::paletteChange( const TQPalette& ) { time_slider->setBackground(); } -void MediaControl::moveEvent( QMoveEvent* ) +void MediaControl::moveEvent( TQMoveEvent* ) { time_slider->setBackground(); } // Danger: Weird Code ahead! ;)) -void MediaControl::resizeEvent( QResizeEvent* ) +void MediaControl::resizeEvent( TQResizeEvent* ) { // kdDebug(90200) << "resizeEvent()" << endl; int w = width(); int h = height(); if ( orientation() == Vertical ) { // ====== VERTICAL ================================================= - time_slider->setOrientation(QSlider::Vertical); + time_slider->setOrientation(TQSlider::Vertical); int slider_width = time_slider->minimumSizeHint().width(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_width > w ) slider_width = w; @@ -566,7 +566,7 @@ void MediaControl::resizeEvent( QResizeEvent* ) } else // ====== HORIZONTAL =============================================== { - time_slider->setOrientation(QSlider::Horizontal); + time_slider->setOrientation(TQSlider::Horizontal); int slider_height = time_slider->minimumSizeHint().height(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_height > h ) slider_height = h; @@ -600,15 +600,15 @@ void MediaControl::resizeEvent( QResizeEvent* ) // Our Button ======================================================================== -TrayButton::TrayButton(QWidget* parent, const char* name) +TrayButton::TrayButton(TQWidget* parent, const char* name) : SimpleButton (parent, name) { setBackgroundMode(PaletteBackground); setBackgroundOrigin(AncestorOrigin); } -void TrayButton::setIconSet(const QIconSet &iconSet) +void TrayButton::setIconSet(const TQIconSet &iconSet) { - setPixmap(iconSet.pixmap(QIconSet::Automatic, QIconSet::Normal, QIconSet::On)); + setPixmap(iconSet.pixmap(TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On)); } diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h index f5a6e5e..c6ec47b 100644 --- a/kicker-applets/mediacontrol/mediacontrol.h +++ b/kicker-applets/mediacontrol/mediacontrol.h @@ -29,10 +29,10 @@ #include <kaboutdata.h> #include <kaboutapplication.h> -#include <qpalette.h> +#include <tqpalette.h> // used everywhere :) -#include <qstring.h> +#include <tqstring.h> #include "playerInterface.h" #include "configfrontend.h" @@ -55,9 +55,9 @@ class TrayButton : public SimpleButton Q_OBJECT public: - TrayButton(QWidget* parent, const char* name); + TrayButton(TQWidget* parent, const char* name); virtual ~TrayButton() {} - void setIconSet(const QIconSet &iconSet); + void setIconSet(const TQIconSet &iconSet); }; // ============================================================================= @@ -67,13 +67,13 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface Q_OBJECT public: - MediaControl(const QString&, Type, int ,QWidget * = 0, const char * = 0); + MediaControl(const TQString&, Type, int ,TQWidget * = 0, const char * = 0); virtual ~MediaControl(); int widthForHeight(int height) const; int heightForWidth(int width) const; - void dragEnterEvent(QDragEnterEvent* event); - void dropEvent(QDropEvent* event); + void dragEnterEvent(TQDragEnterEvent* event); + void dropEvent(TQDropEvent* event); virtual void reparseConfig(); public slots: @@ -96,11 +96,11 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface int mLastLen, mLastTime, mLastStatus; KPopupMenu *rmbMenu; - virtual void mousePressEvent(QMouseEvent* e); - virtual void moveEvent(QMoveEvent*); - virtual void paletteChange(const QPalette&); - virtual void resizeEvent(QResizeEvent*); - virtual bool eventFilter(QObject *watched, QEvent *e); + virtual void mousePressEvent(TQMouseEvent* e); + virtual void moveEvent(TQMoveEvent*); + virtual void paletteChange(const TQPalette&); + virtual void resizeEvent(TQResizeEvent*); + virtual bool eventFilter(TQObject *watched, TQEvent *e); friend class MediaControlToolTip; MediaControlToolTip *slider_tooltip; diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index b146ff1..0217a25 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -25,12 +25,12 @@ #include "mediacontrolconfig.h" #include "mediacontrolconfigwidget.h" -#include <qdir.h> -#include <qcheckbox.h> -#include <qlistbox.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qgroupbox.h> +#include <tqdir.h> +#include <tqcheckbox.h> +#include <tqlistbox.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqgroupbox.h> #include <kapplication.h> #include <kdebug.h> @@ -42,7 +42,7 @@ #include <knuminput.h> #include <kstandarddirs.h> -MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, QWidget *parent, const char* name) +MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, const char* name) : KDialogBase( parent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false ) { _configFrontend = cfg; @@ -64,16 +64,16 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, QWidget *parent, co _child->themeListBox->clear(); // fill with available skins KGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); - QStringList list = KGlobal::dirs()->resourceDirs("themes"); - for (QStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) + TQStringList list = KGlobal::dirs()->resourceDirs("themes"); + for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) readSkinDir(*it); - connect(_child->mWheelScrollAmount, SIGNAL(valueChanged(int)), SLOT(slotConfigChanged())); - connect(_child->playerListBox, SIGNAL(selectionChanged()), SLOT(slotConfigChanged())); - connect(_child->themeListBox, SIGNAL(selectionChanged()), SLOT(slotConfigChanged())); - connect(_child->themeListBox, SIGNAL(selectionChanged(QListBoxItem *)), SLOT(slotChangePreview(QListBoxItem *))); - connect(_child->mUseThemes, SIGNAL(toggled(bool)), SLOT(slotConfigChanged()) ); - connect(_child->mUseThemes, SIGNAL(toggled(bool)), SLOT(slotUseThemesToggled(bool)) ); + connect(_child->mWheelScrollAmount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotConfigChanged())); + connect(_child->playerListBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotConfigChanged())); + connect(_child->themeListBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotConfigChanged())); + connect(_child->themeListBox, TQT_SIGNAL(selectionChanged(TQListBoxItem *)), TQT_SLOT(slotChangePreview(TQListBoxItem *))); + connect(_child->mUseThemes, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotConfigChanged()) ); + connect(_child->mUseThemes, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUseThemesToggled(bool)) ); load(); show(); @@ -81,9 +81,9 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, QWidget *parent, co enableButtonApply ( false ); // apply id disabled until something changed } -void MediaControlConfig::readSkinDir( const QString &dir ) +void MediaControlConfig::readSkinDir( const TQString &dir ) { - QDir directory( dir ); + TQDir directory( dir ); if (!directory.exists()) return; @@ -93,7 +93,7 @@ void MediaControlConfig::readSkinDir( const QString &dir ) while ( it.current() ) { // append directory-name to our theme-listbox - if ( QFile(it.current()->absFilePath()+"/play.png").exists() ) + if ( TQFile(it.current()->absFilePath()+"/play.png").exists() ) _child->themeListBox->insertItem ( it.current()->baseName(), -1 ); ++it; } @@ -104,7 +104,7 @@ void MediaControlConfig::readSkinDir( const QString &dir ) void MediaControlConfig::load() { // find the playerstring from config in the playerlist and select it if found - QListBoxItem *item = 0; + TQListBoxItem *item = 0; item = _child->playerListBox->findItem( _configFrontend->player() ); if ( item ) @@ -178,9 +178,9 @@ void MediaControlConfig::slotConfigChanged() enableButtonApply ( true ); } -void MediaControlConfig::slotChangePreview(QListBoxItem *item) +void MediaControlConfig::slotChangePreview(TQListBoxItem *item) { - QString skindir = item->text(); + TQString skindir = item->text(); _child->previewPrev->setIconSet(SmallIconSet(locate("themes",skindir+"/prev.png"))); _child->previewPlay->setIconSet(SmallIconSet(locate("themes",skindir+"/play.png"))); _child->previewPause->setIconSet(SmallIconSet(locate("themes",skindir+"/pause.png"))); diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h index 5869722..4467177 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.h +++ b/kicker-applets/mediacontrol/mediacontrolconfig.h @@ -29,9 +29,9 @@ class MediaControlConfig: public KDialogBase { Q_OBJECT public: - MediaControlConfig(ConfigFrontend *cfg, QWidget *parent = 0, const char* name = "MediaControlConfig"); + MediaControlConfig(ConfigFrontend *cfg, TQWidget *parent = 0, const char* name = "MediaControlConfig"); - void readSkinDir(const QString &dir); + void readSkinDir(const TQString &dir); void load(); void save(); @@ -41,7 +41,7 @@ signals: protected slots: void slotConfigChanged(); - void slotChangePreview(QListBoxItem *item); + void slotChangePreview(TQListBoxItem *item); void slotUseThemesToggled(bool); virtual void slotApply(); virtual void slotOk(); diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp index 8027f82..98ba0cb 100644 --- a/kicker-applets/mediacontrol/mpdInterface.cpp +++ b/kicker-applets/mediacontrol/mpdInterface.cpp @@ -23,7 +23,7 @@ #include <cstring> -#include <qregexp.h> +#include <tqregexp.h> #include <kmessagebox.h> #include <kdebug.h> @@ -39,16 +39,16 @@ MpdInterface::MpdInterface() , slider_timer(0) , reconnect_timer(0) { - connect(&sock, SIGNAL(error(int)), this, SLOT(connectionError(int))); - connect(&sock, SIGNAL(error(int)), this, SLOT(stopSliderClock())); + connect(&sock, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError(int))); + connect(&sock, TQT_SIGNAL(error(int)), this, TQT_SLOT(stopSliderClock())); - connect(&sock, SIGNAL(connected()), this, SLOT(startSliderClock())); - connect(&sock, SIGNAL(connected()), this, SLOT(stopReconnectClock())); - connect(&sock, SIGNAL(connected()), this, SLOT(connected())); + connect(&sock, TQT_SIGNAL(connected()), this, TQT_SLOT(startSliderClock())); + connect(&sock, TQT_SIGNAL(connected()), this, TQT_SLOT(stopReconnectClock())); + connect(&sock, TQT_SIGNAL(connected()), this, TQT_SLOT(connected())); - connect(&sock, SIGNAL(connectionClosed()), this, SLOT(stopSliderClock())); - connect(&sock, SIGNAL(connectionClosed()), this, SLOT(startReconnectClock())); - connect(&sock, SIGNAL(connectionClosed()), this, SIGNAL(playerStopped())); + connect(&sock, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(stopSliderClock())); + connect(&sock, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(startReconnectClock())); + connect(&sock, TQT_SIGNAL(connectionClosed()), this, TQT_SIGNAL(playerStopped())); reconnect(); } @@ -95,7 +95,7 @@ void MpdInterface::stopReconnectClock() } -void MpdInterface::timerEvent(QTimerEvent* te) +void MpdInterface::timerEvent(TQTimerEvent* te) { if (te->timerId() == slider_timer) updateSlider(); else if (te->timerId() == reconnect_timer) reconnect(); @@ -104,7 +104,7 @@ void MpdInterface::timerEvent(QTimerEvent* te) void MpdInterface::reconnect() const { - if (sock.state()==QSocket::Idle) + if (sock.state()==TQSocket::Idle) { sock_mutex.tryLock(); //kdDebug(90200) << "Connecting to " << hostname.latin1() << ":" << port << "...\n"; @@ -131,18 +131,18 @@ void MpdInterface::connectionError(int e) { sock_mutex.unlock(); emit playerStopped(); - QString message; + TQString message; if (messagebox_mutex.tryLock()) { switch (e) { - case QSocket::ErrConnectionRefused: + case TQSocket::ErrConnectionRefused: message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port); break; - case QSocket::ErrHostNotFound: + case TQSocket::ErrHostNotFound: message=i18n("Host '%1' not found.").arg(hostname); break; - case QSocket::ErrSocketRead: + case TQSocket::ErrSocketRead: message=i18n("Error reading socket."); break; default: @@ -166,7 +166,7 @@ void MpdInterface::connectionError(int e) bool MpdInterface::dispatch(const char* cmd) const { - if (sock.state()==QSocket::Connected && sock_mutex.tryLock()) + if (sock.state()==TQSocket::Connected && sock_mutex.tryLock()) { long cmd_len=strlen(cmd); //kdDebug(90200) << "sending: " << cmd; @@ -186,10 +186,10 @@ bool MpdInterface::dispatch(const char* cmd) const return false; } -bool MpdInterface::fetchLine(QString& res) const +bool MpdInterface::fetchLine(TQString& res) const { - QString errormessage; - while (sock.state()==QSocket::Connected) + TQString errormessage; + while (sock.state()==TQSocket::Connected) { if (!sock.canReadLine()) { @@ -231,7 +231,7 @@ bool MpdInterface::fetchLine(QString& res) const bool MpdInterface::fetchOk() const { - QString res; + TQString res; while (fetchLine(res)) { } if (res.startsWith("OK")) return true; @@ -244,8 +244,8 @@ void MpdInterface::updateSlider() //kdDebug(90200) << "update slider\n"; if (!dispatch("status\n")) return; - QString res; - QRegExp time_re("time: (\\d+):(\\d+)"); + TQString res; + TQRegExp time_re("time: (\\d+):(\\d+)"); while(fetchLine(res)) { if (res.startsWith("state: ")) @@ -265,7 +265,7 @@ void MpdInterface::updateSlider() } else if (time_re.search(res)>=0) { - QStringList timeinfo=time_re.capturedTexts(); + TQStringList timeinfo=time_re.capturedTexts(); timeinfo.pop_front(); int elapsed_seconds=timeinfo.first().toInt(); timeinfo.pop_front(); @@ -292,13 +292,13 @@ void MpdInterface::jumpToTime(int sec) long songid=-1; - QString res; - QRegExp songid_re("songid: (\\d+)"); + TQString res; + TQRegExp songid_re("songid: (\\d+)"); while(fetchLine(res)) { if (songid_re.search(res)>=0) { - QStringList songidinfo=songid_re.capturedTexts(); + TQStringList songidinfo=songid_re.capturedTexts(); songidinfo.pop_front(); songid=songidinfo.first().toInt(); } @@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec) if (songid>-1) { - if (dispatch(QString("seekid %1 %2\n").arg(songid).arg(sec).latin1())) + if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1())) { fetchOk(); // unlocks } @@ -349,13 +349,13 @@ void MpdInterface::changeVolume(int delta) int volume=-1; - QString res; - QRegExp volume_re("volume: (\\d+)"); + TQString res; + TQRegExp volume_re("volume: (\\d+)"); while(fetchLine(res)) { if (volume_re.search(res)>=0) { - QStringList info=volume_re.capturedTexts(); + TQStringList info=volume_re.capturedTexts(); info.pop_front(); volume=info.first().toInt(); } @@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta) volume+=delta; if (volume<0) volume=0; if (volume>100) volume=100; - if (dispatch(QString("setvol %1\n").arg(volume).latin1())) + if (dispatch(TQString("setvol %1\n").arg(volume).latin1())) { fetchOk(); } @@ -385,12 +385,12 @@ void MpdInterface::volumeDown() changeVolume(-5); } -void MpdInterface::dragEnterEvent(QDragEnterEvent* event) +void MpdInterface::dragEnterEvent(TQDragEnterEvent* event) { event->accept( KURLDrag::canDecode(event) ); } -void MpdInterface::dropEvent(QDropEvent* event) +void MpdInterface::dropEvent(TQDropEvent* event) { reconnect(); @@ -403,15 +403,15 @@ void MpdInterface::dropEvent(QDropEvent* event) if (dispatch("playlistid\n")) { long songid=-1; - QString file; - QString res; + TQString file; + TQString res; while(fetchLine(res)) { - QRegExp file_re("file: (.+)"); - QRegExp id_re("Id: (.+)"); + TQRegExp file_re("file: (.+)"); + TQRegExp id_re("Id: (.+)"); if (file.isEmpty() && file_re.search(res)>=0) { - QStringList info=file_re.capturedTexts(); + TQStringList info=file_re.capturedTexts(); info.pop_front(); // if the dropped file ends with the same name, record it if (list.front().path().endsWith(info.first())) @@ -422,7 +422,7 @@ void MpdInterface::dropEvent(QDropEvent* event) else if (!file.isEmpty() && id_re.search(res)>=0) { // when we have the file, pick up the id (file scomes first) - QStringList info=id_re.capturedTexts(); + TQStringList info=id_re.capturedTexts(); info.pop_front(); songid=info.first().toInt(); fetchOk(); // skip to the end @@ -433,7 +433,7 @@ void MpdInterface::dropEvent(QDropEvent* event) // found song, so lets play it if (songid>-1) { - if (dispatch((QString("playid %1\n").arg(songid)).latin1())) + if (dispatch((TQString("playid %1\n").arg(songid)).latin1())) { if (fetchOk()) list.pop_front(); return; @@ -447,13 +447,13 @@ void MpdInterface::dropEvent(QDropEvent* event) { if ((*i).isLocalFile()) { - QStringList path=QStringList::split("/",(*i).path()); + TQStringList path=TQStringList::split("/",(*i).path()); while (!path.empty()) { - if (dispatch((QString("add \"") + if (dispatch((TQString("add \"") +path.join("/").replace("\"","\\\"") - +QString("\"\n")).latin1())) + +TQString("\"\n")).latin1())) { if (fetchOk()) break; } @@ -468,22 +468,22 @@ void MpdInterface::dropEvent(QDropEvent* event) } } -const QString MpdInterface::getTrackTitle() const +const TQString MpdInterface::getTrackTitle() const { - QString result; + TQString result; reconnect(); if (!dispatch("status\n")) return result; long songid=-1; - QString res; + TQString res; while(fetchLine(res)) { - QRegExp songid_re("songid: (\\d+)"); + TQRegExp songid_re("songid: (\\d+)"); if (songid_re.search(res)>=0) { - QStringList songidinfo=songid_re.capturedTexts(); + TQStringList songidinfo=songid_re.capturedTexts(); songidinfo.pop_front(); songid=songidinfo.first().toInt(); } @@ -491,48 +491,48 @@ const QString MpdInterface::getTrackTitle() const if (!(songid>-1)) return result; - if (!dispatch(QString("playlistid %1\n").arg(songid).latin1())) + if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1())) return result; - QString artist; - QString album; - QString title; - QString track; - QString file; + TQString artist; + TQString album; + TQString title; + TQString track; + TQString file; while(fetchLine(res)) { - QRegExp artist_re("Artist: (.+)"); - QRegExp album_re("Album: (.+)"); - QRegExp track_re("Album: (.+)"); - QRegExp title_re("Title: (.+)"); - QRegExp file_re("file: (.+)"); + TQRegExp artist_re("Artist: (.+)"); + TQRegExp album_re("Album: (.+)"); + TQRegExp track_re("Album: (.+)"); + TQRegExp title_re("Title: (.+)"); + TQRegExp file_re("file: (.+)"); if (artist_re.search(res)>=0) { - QStringList info=artist_re.capturedTexts(); + TQStringList info=artist_re.capturedTexts(); info.pop_front(); artist=info.first(); } else if (album_re.search(res)>=0) { - QStringList info=album_re.capturedTexts(); + TQStringList info=album_re.capturedTexts(); info.pop_front(); album=info.first(); } else if (title_re.search(res)>=0) { - QStringList info=title_re.capturedTexts(); + TQStringList info=title_re.capturedTexts(); info.pop_front(); title=info.first(); } else if (track_re.search(res)>=0) { - QStringList info=track_re.capturedTexts(); + TQStringList info=track_re.capturedTexts(); info.pop_front(); track=info.first(); } else if (file_re.search(res)>=0) { - QStringList info=file_re.capturedTexts(); + TQStringList info=file_re.capturedTexts(); info.pop_front(); file=info.first(); } @@ -568,7 +568,7 @@ int MpdInterface::playingStatus() if (!dispatch("status\n")) return Stopped; PlayingStatus status=Stopped; - QString res; + TQString res; while(fetchLine(res)) { if (res.startsWith("state: ")) diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h index d891586..ab95637 100644 --- a/kicker-applets/mediacontrol/mpdInterface.h +++ b/kicker-applets/mediacontrol/mpdInterface.h @@ -23,10 +23,10 @@ #define MPDINTERFACE_H #include "playerInterface.h" -#include <qtimer.h> +#include <tqtimer.h> #include <klocale.h> -#include <qsocket.h> -#include <qmutex.h> +#include <tqsocket.h> +#include <tqmutex.h> class MpdInterface : public PlayerInterface @@ -47,9 +47,9 @@ class MpdInterface virtual void prev(); virtual void volumeUp(); virtual void volumeDown(); - virtual void dragEnterEvent(QDragEnterEvent* event); - virtual void dropEvent(QDropEvent* event); - virtual const QString getTrackTitle() const; + virtual void dragEnterEvent(TQDragEnterEvent* event); + virtual void dropEvent(TQDropEvent* event); + virtual const TQString getTrackTitle() const; virtual int playingStatus(); void changeVolume(int delta); @@ -65,15 +65,15 @@ class MpdInterface protected: - virtual void timerEvent(QTimerEvent* te); + virtual void timerEvent(TQTimerEvent* te); private: - mutable QSocket sock; - mutable QMutex sock_mutex; + mutable TQSocket sock; + mutable TQMutex sock_mutex; - mutable QMutex messagebox_mutex; + mutable TQMutex messagebox_mutex; - QString hostname; + TQString hostname; int port; static const int SLIDER_TIMER_INTERVAL = 500; // ms @@ -94,7 +94,7 @@ class MpdInterface /** fetches a line and returns true, or false if OK or ACK (end of message). Will unlock the sock_mutex on the end of message. */ - bool fetchLine(QString& res) const; + bool fetchLine(TQString& res) const; }; #endif // MPDINTERFACE_H diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index f6cdfc8..c7355dc 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -20,8 +20,8 @@ #include <kapplication.h> #include <kdebug.h> -#include <qstringlist.h> -#include <qstrlist.h> +#include <tqstringlist.h> +#include <tqstrlist.h> #include <kurldrag.h> #define TIMER_FAST 250 @@ -29,18 +29,18 @@ NoatunInterface::NoatunInterface() : PlayerInterface() { mTimerValue = TIMER_FAST; - mNoatunTimer = new QTimer(this, "mNoatunTimer"); + mNoatunTimer = new TQTimer(this, "mNoatunTimer"); - connect(mNoatunTimer, SIGNAL(timeout()), SLOT(updateSlider())); + connect(mNoatunTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider())); - connect(kapp->dcopClient(), SIGNAL(applicationRegistered(const QCString&)), - SLOT(appRegistered(const QCString&)) ); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), + TQT_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)), - SLOT(appRemoved(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(appRemoved(const TQCString&))); kapp->dcopClient()->setNotifications(true); - QTimer::singleShot(0, this, SLOT(myInit())); + TQTimer::singleShot(0, this, TQT_SLOT(myInit())); } NoatunInterface::~NoatunInterface() @@ -64,7 +64,7 @@ void NoatunInterface::myInit() } } -void NoatunInterface::appRegistered(const QCString &appId) +void NoatunInterface::appRegistered(const TQCString &appId) { if (appId.contains("noatun",false)) { @@ -74,7 +74,7 @@ void NoatunInterface::appRegistered(const QCString &appId) } } -void NoatunInterface::appRemoved(const QCString &appId) +void NoatunInterface::appRemoved(const TQCString &appId) { if (appId.contains("noatun",false)) { @@ -91,8 +91,8 @@ void NoatunInterface::updateSlider() { // length/time in msecs, -1 means "no playobject in noatun" int len, time; - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (!kapp->dcopClient()->call(mAppId, "Noatun", "length()", data, replyType, replyData, false, 200)) { @@ -102,7 +102,7 @@ void NoatunInterface::updateSlider() } else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") { reply >> len; @@ -127,7 +127,7 @@ void NoatunInterface::updateSlider() } else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") { reply >> time; @@ -150,8 +150,8 @@ void NoatunInterface::updateSlider() int NoatunInterface::playingStatus() { - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if (!kapp->dcopClient()->call(mAppId, "Noatun", "state()", data, replyType, replyData, false, 200)) @@ -161,7 +161,7 @@ int NoatunInterface::playingStatus() else { int status = 0; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if (replyType == "int") reply >> status; @@ -177,22 +177,22 @@ int NoatunInterface::playingStatus() // Drag-n-Drop stuff ================================================================= -void NoatunInterface::dragEnterEvent(QDragEnterEvent* event) +void NoatunInterface::dragEnterEvent(TQDragEnterEvent* event) { // kdDebug(90200) << "NoatunInterface::dragEnterEvent()" << endl; event->accept(KURLDrag::canDecode(event)); } -void NoatunInterface::dropEvent(QDropEvent* event) +void NoatunInterface::dropEvent(TQDropEvent* event) { // kdDebug(90200) << "NoatunInterface::dropEvent()" << endl; KURL::List list; if (KURLDrag::decode(event, list)) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << list.toStringList() << false; - kapp->dcopClient()->send(mAppId, "Noatun", "addFile(QStringList,bool)", data); + kapp->dcopClient()->send(mAppId, "Noatun", "addFile(TQStringList,bool)", data); } } @@ -210,8 +210,8 @@ void NoatunInterface::sliderStopDrag() void NoatunInterface::jumpToTime(int sec) { - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << (sec*1000); // noatun wants milliseconds kapp->dcopClient()->send(mAppId, "Noatun", "skipTo(int)", data); } @@ -220,46 +220,46 @@ void NoatunInterface::playpause() { if (!findRunningNoatun()) startPlayer("noatun"); - kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", QString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString::null); } void NoatunInterface::stop() { - kapp->dcopClient()->send(mAppId, "Noatun", "stop()", QString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString::null); } void NoatunInterface::next() { // fastForward() is noatun from kde2 - //kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", QString::null); - kapp->dcopClient()->send(mAppId, "Noatun", "forward()", QString::null); + //kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString::null); } void NoatunInterface::prev() { - kapp->dcopClient()->send(mAppId, "Noatun", "back()", QString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString::null); } void NoatunInterface::volumeUp() { - kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", QString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString::null); } void NoatunInterface::volumeDown() { - kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", QString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString::null); } -const QString NoatunInterface::getTrackTitle() const +const TQString NoatunInterface::getTrackTitle() const { - QString title(""); - QByteArray data, replyData; - QCString replyType; + TQString title(""); + TQByteArray data, replyData; + TQCString replyType; if (kapp->dcopClient()->call(mAppId, "Noatun", "title()", data, replyType, replyData, false, 200)) { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") + TQDataStream reply(replyData, IO_ReadOnly); + if (replyType == "TQString") reply >> title; } return title; @@ -269,7 +269,7 @@ bool NoatunInterface::findRunningNoatun() { // FIXME: what if we have a dcop app named, let's say, 'noatunfrontend'? QCStringList allApps = kapp->dcopClient()->registeredApplications(); - QValueList<QCString>::const_iterator iterator; + TQValueList<TQCString>::const_iterator iterator; for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h index 99191b5..36fa21c 100644 --- a/kicker-applets/mediacontrol/noatunInterface.h +++ b/kicker-applets/mediacontrol/noatunInterface.h @@ -23,7 +23,7 @@ #include <kapplication.h> #include <dcopclient.h> -#include <qtimer.h> +#include <tqtimer.h> class NoatunInterface : public PlayerInterface { @@ -43,19 +43,19 @@ class NoatunInterface : public PlayerInterface void prev(); void volumeUp(); void volumeDown(); - void dragEnterEvent(QDragEnterEvent* event); - void dropEvent(QDropEvent* event); - const QString getTrackTitle() const; - void appRegistered(const QCString &appId); - void appRemoved(const QCString &appId); + void dragEnterEvent(TQDragEnterEvent* event); + void dropEvent(TQDropEvent* event); + const TQString getTrackTitle() const; + void appRegistered(const TQCString &appId); + void appRemoved(const TQCString &appId); int playingStatus(); void myInit(void); private: - QTimer *mNoatunTimer; + TQTimer *mNoatunTimer; int mTimerValue; - QCString mAppId; + TQCString mAppId; /** * Tries to find a DCOP registered instance of Noatun diff --git a/kicker-applets/mediacontrol/playerInterface.cpp b/kicker-applets/mediacontrol/playerInterface.cpp index cc388c0..9517aa8 100644 --- a/kicker-applets/mediacontrol/playerInterface.cpp +++ b/kicker-applets/mediacontrol/playerInterface.cpp @@ -24,9 +24,9 @@ PlayerInterface::PlayerInterface() { } // Constructor PlayerInterface::~PlayerInterface() { } // Destructor -void PlayerInterface::startPlayer(const QString &desktopname) +void PlayerInterface::startPlayer(const TQString &desktopname) { - if (KApplication::startServiceByDesktopName(desktopname, QStringList(), + if (KApplication::startServiceByDesktopName(desktopname, TQStringList(), 0, 0, 0, "", false) > 0) { KMessageBox::error(0, i18n("Could not start media player.")); diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h index aa4701e..4d7fa7c 100644 --- a/kicker-applets/mediacontrol/playerInterface.h +++ b/kicker-applets/mediacontrol/playerInterface.h @@ -18,8 +18,8 @@ #ifndef PLAYERINTERFACE_H #define PLAYERINTERFACE_H -#include <qobject.h> -#include <qdragobject.h> +#include <tqobject.h> +#include <tqdragobject.h> class PlayerInterface : public QObject { @@ -41,12 +41,12 @@ class PlayerInterface : public QObject virtual void prev()=0; virtual void volumeUp()=0; virtual void volumeDown()=0; - virtual void dragEnterEvent(QDragEnterEvent* event)=0; - virtual void dropEvent(QDropEvent* event)=0; - virtual const QString getTrackTitle() const=0; + virtual void dragEnterEvent(TQDragEnterEvent* event)=0; + virtual void dropEvent(TQDropEvent* event)=0; + virtual const TQString getTrackTitle() const=0; virtual int playingStatus()=0; - void startPlayer(const QString &desktopname); + void startPlayer(const TQString &desktopname); signals: void newSliderPosition(int, int); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 9daa926..478ca2d 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -20,8 +20,8 @@ #include "simplebutton.h" -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kapplication.h> #include <kcursor.h> @@ -32,17 +32,17 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(QWidget *parent, const char *name) - : QButton(parent, name), +SimpleButton::SimpleButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_orientation(Qt::Horizontal) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, SIGNAL( settingsChanged( int ) ), - SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, SIGNAL( iconChanged( int ) ), - SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), + TQT_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQT_SIGNAL( iconChanged( int ) ), + TQT_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); @@ -50,9 +50,9 @@ SimpleButton::SimpleButton(QWidget *parent, const char *name) slotSettingsChanged( KApplication::SETTINGS_MOUSE ); } -void SimpleButton::setPixmap(const QPixmap &pix) +void SimpleButton::setPixmap(const TQPixmap &pix) { - QButton::setPixmap(pix); + TQButton::setPixmap(pix); generateIcons(); update(); } @@ -63,39 +63,39 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -QSize SimpleButton::sizeHint() const +TQSize SimpleButton::sizeHint() const { - const QPixmap* pm = pixmap(); + const TQPixmap* pm = pixmap(); if (!pm) - return QButton::sizeHint(); + return TQButton::sizeHint(); else - return QSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); + return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -QSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { - const QPixmap* pm = pixmap(); + const TQPixmap* pm = pixmap(); if (!pm) - return QButton::minimumSizeHint(); + return TQButton::minimumSizeHint(); else - return QSize(pm->width(), pm->height()); + return TQSize(pm->width(), pm->height()); } -void SimpleButton::drawButton( QPainter *p ) +void SimpleButton::drawButton( TQPainter *p ) { drawButtonLabel(p); } -void SimpleButton::drawButtonLabel( QPainter *p ) +void SimpleButton::drawButtonLabel( TQPainter *p ) { if (!pixmap()) { return; } - QPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon; + TQPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon; if (isOn() || isDown()) { @@ -108,7 +108,7 @@ void SimpleButton::drawButtonLabel( QPainter *p ) int ph = pix.height(); int pw = pix.width(); int margin = KDialog::spacingHint(); - QPoint origin(margin / 2, margin / 2); + TQPoint origin(margin / 2, margin / 2); if (ph < (h - margin)) { @@ -130,7 +130,7 @@ void SimpleButton::generateIcons() return; } - QImage image = pixmap()->convertToImage(); + TQImage image = pixmap()->convertToImage(); KIconEffect effect; m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState); @@ -170,29 +170,29 @@ void SimpleButton::slotIconChanged( int group ) update(); } -void SimpleButton::enterEvent( QEvent *e ) +void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; repaint( false ); - QButton::enterEvent( e ); + TQButton::enterEvent( e ); } -void SimpleButton::leaveEvent( QEvent *e ) +void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; repaint( false ); - QButton::enterEvent( e ); + TQButton::enterEvent( e ); } -void SimpleButton::resizeEvent( QResizeEvent * ) +void SimpleButton::resizeEvent( TQResizeEvent * ) { generateIcons(); } -SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const char *name) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name) : SimpleButton(parent, name) { setBackgroundOrigin(AncestorOrigin); @@ -200,9 +200,9 @@ SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const _inside = false; } -QSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::sizeHint() const { - return QSize( 12, 12 ); + return TQSize( 12, 12 ); } void SimpleArrowButton::setArrowType(Qt::ArrowType a) @@ -219,32 +219,32 @@ Qt::ArrowType SimpleArrowButton::arrowType() const return _arrow; } -void SimpleArrowButton::drawButton( QPainter *p ) +void SimpleArrowButton::drawButton( TQPainter *p ) { - QRect r(1, 1, width() - 2, height() - 2); + TQRect r(1, 1, width() - 2, height() - 2); - QStyle::PrimitiveElement pe = QStyle::PE_ArrowLeft; + TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = QStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = QStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = QStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = QStyle::PE_ArrowDown; break; + 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; } - int flags = QStyle::Style_Default | QStyle::Style_Enabled; - if (isDown() || isOn()) flags |= QStyle::Style_Down; + int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; + if (isDown() || isOn()) flags |= TQStyle::Style_Down; style().drawPrimitive(pe, p, r, colorGroup(), flags); } -void SimpleArrowButton::enterEvent( QEvent *e ) +void SimpleArrowButton::enterEvent( TQEvent *e ) { _inside = true; SimpleButton::enterEvent( e ); update(); } -void SimpleArrowButton::leaveEvent( QEvent *e ) +void SimpleArrowButton::leaveEvent( TQEvent *e ) { _inside = false; SimpleButton::enterEvent( e ); diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h index 5423dff..1ea5c7a 100644 --- a/kicker-applets/mediacontrol/simplebutton.h +++ b/kicker-applets/mediacontrol/simplebutton.h @@ -21,8 +21,8 @@ #ifndef SIMPLEBUTTON_H #define SIMPLEBUTTON_H -#include <qbutton.h> -#include <qpixmap.h> +#include <tqbutton.h> +#include <tqpixmap.h> #include <kdemacros.h> @@ -31,20 +31,20 @@ class KDE_EXPORT SimpleButton : public QButton Q_OBJECT public: - SimpleButton(QWidget *parent, const char *name = 0); - void setPixmap(const QPixmap &pix); + SimpleButton(TQWidget *parent, const char *name = 0); + void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - QSize sizeHint() const; - QSize minimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: - void drawButton( QPainter *p ); - void drawButtonLabel( QPainter *p ); + void drawButton( TQPainter *p ); + void drawButtonLabel( TQPainter *p ); void generateIcons(); - void enterEvent( QEvent *e ); - void leaveEvent( QEvent *e ); - void resizeEvent( QResizeEvent *e ); + void enterEvent( TQEvent *e ); + void leaveEvent( TQEvent *e ); + void resizeEvent( TQResizeEvent *e ); protected slots: virtual void slotSettingsChanged( int category ); @@ -52,9 +52,9 @@ class KDE_EXPORT SimpleButton : public QButton private: bool m_highlight; - QPixmap m_normalIcon; - QPixmap m_activeIcon; - QPixmap m_disabledIcon; + TQPixmap m_normalIcon; + TQPixmap m_activeIcon; + TQPixmap m_disabledIcon; Qt::Orientation m_orientation; class SimpleButtonPrivate; SimpleButtonPrivate* d; @@ -65,14 +65,14 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton Q_OBJECT public: - SimpleArrowButton(QWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - QSize sizeHint() const; + TQSize sizeHint() const; protected: - virtual void enterEvent( QEvent *e ); - virtual void leaveEvent( QEvent *e ); - virtual void drawButton(QPainter *p); + virtual void enterEvent( TQEvent *e ); + virtual void leaveEvent( TQEvent *e ); + virtual void drawButton(TQPainter *p); Qt::ArrowType arrowType() const; public slots: diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp index e2512e5..7d8e236 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.cpp +++ b/kicker-applets/mediacontrol/xmmsInterface.cpp @@ -34,9 +34,9 @@ XmmsInterface::XmmsInterface() : PlayerInterface() { timervalue = TIMER_FAST; bStartingXMMS = false; - xmms_timer = new QTimer ( this, "xmms_timer" ); + xmms_timer = new TQTimer ( this, "xmms_timer" ); - QObject::connect( xmms_timer, SIGNAL(timeout()), SLOT(updateSlider()) ); + TQObject::connect( xmms_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); // Better start the timer as late as possible in initialization xmms_timer->start ( timervalue ); @@ -85,16 +85,16 @@ void XmmsInterface::updateSlider ( void ) // Drag-n-Drop stuff ================================================================= -void XmmsInterface::dragEnterEvent(QDragEnterEvent* event) +void XmmsInterface::dragEnterEvent(TQDragEnterEvent* event) { - event->accept( QTextDrag::canDecode(event) ); + event->accept( TQTextDrag::canDecode(event) ); } -void XmmsInterface::dropEvent(QDropEvent* event) +void XmmsInterface::dropEvent(TQDropEvent* event) { - QString text; + TQString text; // kdDebug(90200) << "XmmsInterface::dropEvent()" << endl; - if ( QTextDrag::decode(event, text) ) + if ( TQTextDrag::decode(event, text) ) { xmms_remote_playlist_add_url_string(XMMS_SESSION, (gchar *)text.local8Bit().data()); @@ -127,7 +127,7 @@ void XmmsInterface::playpause() return; startPlayer("xmms"); bStartingXMMS = true; - QTimer::singleShot(500, this, SLOT(playpause())); + TQTimer::singleShot(500, this, TQT_SLOT(playpause())); } else { @@ -174,9 +174,9 @@ int XmmsInterface::playingStatus() return Stopped; } -const QString XmmsInterface::getTrackTitle() const +const TQString XmmsInterface::getTrackTitle() const { - return QString::fromLocal8Bit( + return TQString::fromLocal8Bit( xmms_remote_get_playlist_title(XMMS_SESSION, xmms_remote_get_playlist_pos(XMMS_SESSION))); } diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h index ca514b2..34db157 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.h +++ b/kicker-applets/mediacontrol/xmmsInterface.h @@ -25,7 +25,7 @@ #define XMMSINTERFACE_H #include "playerInterface.h" -#include <qtimer.h> +#include <tqtimer.h> class XmmsInterface : public PlayerInterface { @@ -45,13 +45,13 @@ class XmmsInterface : public PlayerInterface virtual void prev(); virtual void volumeUp(); virtual void volumeDown(); - virtual void dragEnterEvent(QDragEnterEvent* event); - virtual void dropEvent(QDropEvent* event); - virtual const QString getTrackTitle() const; + virtual void dragEnterEvent(TQDragEnterEvent* event); + virtual void dropEvent(TQDropEvent* event); + virtual const TQString getTrackTitle() const; virtual int playingStatus(); private: - QTimer *xmms_timer; + TQTimer *xmms_timer; int timervalue; bool bStartingXMMS; }; diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 30878fd..c18c061 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -49,14 +49,14 @@ #include <dom/dom_node.h> using namespace DOM; -#include <qpixmap.h> -#include <qcursor.h> -#include <qregexp.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqregexp.h> typedef KGenericFactory<AdBlock> AdBlockFactory; K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) ) -AdBlock::AdBlock(QObject *parent, const char *name, const QStringList &) : +AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), m_label(0), m_menu(0) { @@ -65,10 +65,10 @@ AdBlock::AdBlock(QObject *parent, const char *name, const QStringList &) : m_menu = new KPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Adblock")); - m_menu->insertItem(i18n("Configure"), this, SLOT(showKCModule())); - m_menu->insertItem(i18n("Show Elements"), this, SLOT(showDialogue())); + m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showKCModule())); + m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue())); - connect(m_part, SIGNAL(completed()), this, SLOT(initLabel())); + connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(initLabel())); } AdBlock::~AdBlock() @@ -95,14 +95,14 @@ void AdBlock::initLabel() KIconLoader *loader = instance()->iconLoader(); m_label->setFixedHeight(loader->currentSize(KIcon::Small)); - m_label->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_label->setUseCursor(false); m_label->setPixmap(loader->loadIcon("filter", KIcon::Small)); statusBarEx->addStatusBarItem(m_label, 0, false); - connect(m_label, SIGNAL(leftClickedURL()), this, SLOT(showDialogue())); - connect(m_label, SIGNAL(rightClickedURL()), this, SLOT(contextMenu())); + connect(m_label, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(showDialogue())); + connect(m_label, TQT_SIGNAL(rightClickedURL()), this, TQT_SLOT(contextMenu())); } void AdBlock::showDialogue() @@ -120,9 +120,9 @@ void AdBlock::showDialogue() fillBlockableElements(elements); AdBlockDlg *dialogue = new AdBlockDlg(m_part->widget(), elements); - connect(dialogue, SIGNAL( notEmptyFilter(const QString&) ), this, SLOT( addAdFilter(const QString&) )); - connect(dialogue, SIGNAL( cancelClicked() ), dialogue, SLOT( delayedDestruct() )); - connect(dialogue, SIGNAL( closeClicked() ), dialogue, SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( notEmptyFilter(const TQString&) ), this, TQT_SLOT( addAdFilter(const TQString&) )); + connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); dialogue->show(); } @@ -130,14 +130,14 @@ void AdBlock::showKCModule() { KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget()); dialogue->addModule("khtml_filter"); - connect(dialogue, SIGNAL( cancelClicked() ), dialogue, SLOT( delayedDestruct() )); - connect(dialogue, SIGNAL( closeClicked() ), dialogue, SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); dialogue->show(); } void AdBlock::contextMenu() { - m_menu->popup(QCursor::pos()); + m_menu->popup(TQCursor::pos()); } void AdBlock::fillBlockableElements(AdElementList &elements) @@ -172,7 +172,7 @@ void AdBlock::fillWithImages(AdElementList &elements) DOMString src = image.src(); - QString url = htmlDoc.completeURL(src).string(); + TQString url = htmlDoc.completeURL(src).string(); if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, "image", "IMG", false); @@ -185,7 +185,7 @@ void AdBlock::fillWithImages(AdElementList &elements) void AdBlock::fillWithHtmlTag(AdElementList &elements, const DOMString &tagName, const DOMString &attrName, - const QString &category) + const TQString &category) { Document doc = m_part->document(); @@ -199,7 +199,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, DOMString src = attr.nodeValue(); if (src.isNull()) continue; - QString url = doc.completeURL(src).string(); + TQString url = doc.completeURL(src).string(); if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, tagName.string(), category, false); @@ -209,7 +209,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, } } -void AdBlock::addAdFilter(const QString &url) +void AdBlock::addAdFilter(const TQString &url) { //FIXME hackish KHTMLSettings *settings = const_cast<KHTMLSettings *>(m_part->settings()); @@ -221,8 +221,8 @@ void AdBlock::addAdFilter(const QString &url) AdElement::AdElement() : m_url(0), m_category(0), m_type(0), m_blocked(false) {} -AdElement::AdElement(const QString &url, const QString &category, - const QString &type, bool blocked) : +AdElement::AdElement(const TQString &url, const TQString &category, + const TQString &type, bool blocked) : m_url(url), m_category(category), m_type(type), m_blocked(blocked) {} AdElement &AdElement::operator=(const AdElement &obj) @@ -250,17 +250,17 @@ void AdElement::setBlocked(bool blocked) m_blocked = blocked; } -const QString &AdElement::url() const +const TQString &AdElement::url() const { return m_url; } -const QString &AdElement::category() const +const TQString &AdElement::category() const { return m_category; } -const QString &AdElement::type() const +const TQString &AdElement::type() const { return m_type; } diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index 4b6154e..0a9b15b 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -21,8 +21,8 @@ #ifndef KONQ_ADBLOCK_H #define KONQ_ADBLOCK_H -#include <qguardedptr.h> -#include <qvaluelist.h> +#include <tqguardedptr.h> +#include <tqvaluelist.h> #include <kparts/plugin.h> class KHTMLPart; @@ -41,18 +41,18 @@ namespace DOM class DOMString; } -typedef QValueList<AdElement> AdElementList; +typedef TQValueList<AdElement> AdElementList; class AdBlock : public KParts::Plugin { Q_OBJECT public: - AdBlock(QObject *parent, const char *name, const QStringList &); + AdBlock(TQObject *parent, const char *name, const TQStringList &); ~AdBlock(); private: - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; KURLLabel *m_label; KPopupMenu *m_menu; @@ -61,12 +61,12 @@ private: void fillWithHtmlTag(AdElementList &elements, const DOM::DOMString &tagName, const DOM::DOMString &attrName, - const QString &category); + const TQString &category); private slots: void initLabel(); void showDialogue(); - void addAdFilter(const QString &url); + void addAdFilter(const TQString &url); void contextMenu(); void showKCModule(); }; @@ -76,24 +76,24 @@ private slots: class AdElement { private: - QString m_url; - QString m_category; - QString m_type; + TQString m_url; + TQString m_category; + TQString m_type; bool m_blocked; public: AdElement(); - AdElement(const QString &url, const QString &category, - const QString &type, bool blocked); + AdElement(const TQString &url, const TQString &category, + const TQString &type, bool blocked); AdElement &operator=(const AdElement &); bool operator==(const AdElement &e1); bool isBlocked() const; void setBlocked(bool blocked); - const QString &url() const; - const QString &category() const; - const QString &type() const; + const TQString &url() const; + const TQString &category() const; + const TQString &type() const; }; #endif diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index 5de6efa..1aff0f6 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -24,30 +24,30 @@ #include <kpopupmenu.h> #include <klocale.h> -#include <qcursor.h> -#include <qlabel.h> -#include <qvbox.h> -#include <qlineedit.h> -#include <qcolor.h> -#include <qfont.h> -#include <qpainter.h> - -AdBlockDlg::AdBlockDlg(QWidget *parent, AdElementList &elements) : +#include <tqcursor.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqlineedit.h> +#include <tqcolor.h> +#include <tqfont.h> +#include <tqpainter.h> + +AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : KDialogBase( parent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) { - QVBox *page = makeVBoxMainWidget(); - m_label1 = new QLabel( i18n("All blockable items in this page:"), page, "label1" ); + TQVBox *page = makeVBoxMainWidget(); + m_label1 = new TQLabel( i18n("All blockable items in this page:"), page, "label1" ); - m_list = new QListView(page); + m_list = new TQListView(page); m_list->setAllColumnsShowFocus( true ); m_list->addColumn( i18n("Source") ); m_list->addColumn( i18n("Category") ); m_list->addColumn( i18n("Node Name") ); - m_list->setColumnWidthMode(0, QListView::Manual); - m_list->setColumnWidthMode(1, QListView::Manual); - m_list->setColumnWidthMode(2, QListView::Manual); + m_list->setColumnWidthMode(0, TQListView::Manual); + m_list->setColumnWidthMode(1, TQListView::Manual); + m_list->setColumnWidthMode(2, TQListView::Manual); m_list->setColumnWidth(0, 600); m_list->setColumnWidth(1, 90); @@ -58,30 +58,30 @@ AdBlockDlg::AdBlockDlg(QWidget *parent, AdElementList &elements) : { AdElement &element = (*it); - QString url = element.url(); + TQString url = element.url(); ListViewItem *item = new ListViewItem( m_list, url, element.category(), element.type() ); item->setBlocked(element.isBlocked()); } - m_label2 = new QLabel( i18n("New filter (use * as a wildcard):"), page, "label2" ); + m_label2 = new TQLabel( i18n("New filter (use * as a wildcard):"), page, "label2" ); - m_filter = new QLineEdit( "", page, "lineedit" ); + m_filter = new TQLineEdit( "", page, "lineedit" ); - connect(this, SIGNAL( okClicked() ), this, SLOT( validateFilter() )); - connect(m_list, SIGNAL( doubleClicked(QListViewItem *, const QPoint &, int) ), this, SLOT(updateFilter(QListViewItem *)) ); + connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() )); + connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) ); m_menu = new KPopupMenu(this); - m_menu->insertItem(i18n("Filter this item"), this, SLOT(filterItem())); - m_menu->insertItem(i18n("Filter all items at same path"), this, SLOT(filterPath())); + m_menu->insertItem(i18n("Filter this item"), this, TQT_SLOT(filterItem())); + m_menu->insertItem(i18n("Filter all items at same path"), this, TQT_SLOT(filterPath())); connect(m_list, - SIGNAL( contextMenuRequested( QListViewItem *, const QPoint& , int ) ), + TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), this, - SLOT( showContextMenu(QListViewItem *, const QPoint &) ) ); + TQT_SLOT( showContextMenu(TQListViewItem *, const TQPoint &) ) ); } -void AdBlockDlg::updateFilter(QListViewItem *selected) +void AdBlockDlg::updateFilter(TQListViewItem *selected) { ListViewItem *item = dynamic_cast<ListViewItem *>(selected); @@ -96,7 +96,7 @@ void AdBlockDlg::updateFilter(QListViewItem *selected) void AdBlockDlg::validateFilter() { - const QString text = m_filter->text().stripWhiteSpace(); + const TQString text = m_filter->text().stripWhiteSpace(); if (!text.isEmpty()) emit notEmptyFilter(text); @@ -104,7 +104,7 @@ void AdBlockDlg::validateFilter() delayedDestruct(); } -void AdBlockDlg::showContextMenu(QListViewItem *item, const QPoint &point) +void AdBlockDlg::showContextMenu(TQListViewItem *item, const TQPoint &point) { if (!item) return; m_menu->popup(point); @@ -112,14 +112,14 @@ void AdBlockDlg::showContextMenu(QListViewItem *item, const QPoint &point) void AdBlockDlg::filterItem() { - QListViewItem* item = m_list->selectedItem(); + TQListViewItem* item = m_list->selectedItem(); m_filter->setText( item->text(0) ); } void AdBlockDlg::filterPath() { - QListViewItem* item = m_list->selectedItem(); - QString value = item->text(0); + TQListViewItem* item = m_list->selectedItem(); + TQString value = item->text(0); m_filter->setText( value.section( '/', 0, -2 ).append("/*") ); } @@ -133,20 +133,20 @@ AdBlockDlg::~AdBlockDlg() // ---------------------------------------------------------------------------- -void ListViewItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align) +void ListViewItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align) { p->save(); - QColorGroup g( cg ); + TQColorGroup g( cg ); if ( isBlocked() ) { - g.setColor(QColorGroup::Text, red); - QFont font; + g.setColor(TQColorGroup::Text, red); + TQFont font; font.setItalic(true); p->setFont(font); } - QListViewItem::paintCell(p, g, column, width, align); + TQListViewItem::paintCell(p, g, column, width, align); p->restore(); } diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h index ab41bc2..8645d65 100644 --- a/konq-plugins/adblock/adblockdialogue.h +++ b/konq-plugins/adblock/adblockdialogue.h @@ -21,7 +21,7 @@ #define KONQ_ADBLOCKDLG_H #include <kdialogbase.h> -#include <qlistview.h> +#include <tqlistview.h> class QLabel; class QLineEdit; @@ -32,25 +32,25 @@ class AdBlockDlg : public KDialogBase Q_OBJECT private: - QLineEdit *m_filter; - QListView *m_list; - QLabel *m_label1; - QLabel *m_label2; + TQLineEdit *m_filter; + TQListView *m_list; + TQLabel *m_label1; + TQLabel *m_label2; KPopupMenu *m_menu; public: - AdBlockDlg(QWidget *parent, AdElementList &elements); + AdBlockDlg(TQWidget *parent, AdElementList &elements); ~AdBlockDlg(); private slots: void validateFilter (); - void updateFilter(QListViewItem *item); - void showContextMenu(QListViewItem *item, const QPoint &point); + void updateFilter(TQListViewItem *item); + void showContextMenu(TQListViewItem *item, const TQPoint &point); void filterPath(); void filterItem(); signals: - void notEmptyFilter (const QString &url); + void notEmptyFilter (const TQString &url); }; // ---------------------------------------------------------------------------- @@ -61,13 +61,13 @@ private: bool m_blocked; public: - ListViewItem(QListView *listView, - const QString &label1, - const QString &label2, - const QString &label3) : QListViewItem(listView, label1, label2, label3), + ListViewItem(TQListView *listView, + const TQString &label1, + const TQString &label2, + const TQString &label3) : TQListViewItem(listView, label1, label2, label3), m_blocked(false){}; - void paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align); + void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align); bool isBlocked(); void setBlocked(bool blocked); diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index a2a82f2..2f59adc 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -38,21 +38,21 @@ #include <khtmlview.h> #include <kmessagebox.h> -#include <qdir.h> -#include <qcstring.h> -#include <qobject.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqcstring.h> +#include <tqobject.h> +#include <tqstringlist.h> using namespace Akregator; typedef KGenericFactory<AkregatorMenu, KonqPopupMenu> AkregatorMenuFactory; K_EXPORT_COMPONENT_FACTORY( libakregatorkonqplugin, AkregatorMenuFactory("akregatorkonqplugin") ) -AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList& /* list */ ) +AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringList& /* list */ ) : KonqPopupMenuPlugin( popupmenu, name), PluginBase(), m_conf(0), m_part(0) { kdDebug() << "AkregatorMenu::AkregatorMenu()" << endl; - if ( QCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) + if ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) return; // Do nothing if user has turned us off. @@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const if (isFeedUrl(it)) { kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; - KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); + KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); addAction( action ); addSeparator(); m_feedURL = it->url().url(); @@ -101,7 +101,7 @@ AkregatorMenu::~AkregatorMenu() delete m_conf; } -bool AkregatorMenu::isFeedUrl(const QString &url) +bool AkregatorMenu::isFeedUrl(const TQString &url) { if (url.contains(".htm", false) != 0) return false; if (url.contains("rss", false) != 0) return true; @@ -116,7 +116,7 @@ bool AkregatorMenu::isFeedUrl(const KFileItem * item) return true; else { - QString url = item->url().url(); + TQString url = item->url().url(); // If URL ends in .htm or .html, it is not a feed url. return isFeedUrl(url); } @@ -125,9 +125,9 @@ bool AkregatorMenu::isFeedUrl(const KFileItem * item) void AkregatorMenu::slotAddFeed() { - QString url = m_part ? fixRelativeURL(m_feedURL, m_part->baseURL()) : m_feedURL; + TQString url = m_part ? fixRelativeURL(m_feedURL, m_part->baseURL()) : m_feedURL; if(akregatorRunning()) - addFeedsViaDCOP(QStringList(url)); + addFeedsViaDCOP(TQStringList(url)); else addFeedViaCmdLine(url); } diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h index 8074f2f..9fb6787 100644 --- a/konq-plugins/akregator/akregatorplugin.h +++ b/konq-plugins/akregator/akregatorplugin.h @@ -37,21 +37,21 @@ class AkregatorMenu : public KonqPopupMenuPlugin, PluginBase { Q_OBJECT public: - AkregatorMenu( KonqPopupMenu *, const char *name, const QStringList &list ); + AkregatorMenu( KonqPopupMenu *, const char *name, const TQStringList &list ); virtual ~AkregatorMenu(); public slots: void slotAddFeed(); protected: - bool isFeedUrl(const QString &s); + bool isFeedUrl(const TQString &s); bool isFeedUrl(const KFileItem *item); private: - QStringList m_feedMimeTypes; + TQStringList m_feedMimeTypes; KConfig *m_conf; KHTMLPart *m_part; - QString m_feedURL; + TQString m_feedURL; }; } diff --git a/konq-plugins/akregator/feeddetector.cpp b/konq-plugins/akregator/feeddetector.cpp index 928a282..57a333c 100644 --- a/konq-plugins/akregator/feeddetector.cpp +++ b/konq-plugins/akregator/feeddetector.cpp @@ -22,10 +22,10 @@ without including the source code for Qt in the source distribution. */ -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> #include <kcharsets.h> #include "feeddetector.h" @@ -33,26 +33,26 @@ using namespace Akregator; -FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) +FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s) { //reduce all sequences of spaces, newlines etc. to one space: - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); // extracts <link> tags - QRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); + TQRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts type attribute - QRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts the title (title="title") - QRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); int pos = 0; int matchpos = 0; // get all <link> tags - QStringList linkTags; + TQStringList linkTags; //int strlength = str.length(); while ( matchpos != -1 ) { @@ -66,9 +66,9 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) FeedDetectorEntryList list; - for ( QStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) + for ( TQStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) { - QString type; + TQString type; int pos = reType.search(*it, 0); if (pos != -1) type = reType.cap(1).lower(); @@ -78,14 +78,14 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) && type != "application/atom+xml" && type != "text/xml" ) continue; - QString title; + TQString title; pos = reTitle.search(*it, 0); if (pos != -1) title = reTitle.cap(1); title = KCharsets::resolveEntities(title); - QString url; + TQString url; pos = reHref.search(*it, 0); if (pos != -1) url = reHref.cap(1); @@ -104,33 +104,33 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) return list; } -QStringList FeedDetector::extractBruteForce(const QString& s) +TQStringList FeedDetector::extractBruteForce(const TQString& s) { - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); - QRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); + TQRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); - QRegExp rssrdfxml(".*(RSS|RDF|XML)", false); + TQRegExp rssrdfxml(".*(RSS|RDF|XML)", false); int pos = 0; int matchpos = 0; // get all <a href> tags and capture url - QStringList list; + TQStringList list; //int strlength = str.length(); while ( matchpos != -1 ) { matchpos = reAhrefTag.search(str, pos); if ( matchpos != -1 ) { - QString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); + TQString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); int hrefpos = reHref.search(ahref, 0); if ( hrefpos != -1 ) { - QString url = reHref.cap(1); + TQString url = reHref.cap(1); url = KCharsets::resolveEntities(url); diff --git a/konq-plugins/akregator/feeddetector.h b/konq-plugins/akregator/feeddetector.h index b557e33..8002d42 100644 --- a/konq-plugins/akregator/feeddetector.h +++ b/konq-plugins/akregator/feeddetector.h @@ -25,8 +25,8 @@ #ifndef AKREGATORFEEDDETECTOR_H #define AKREGATORFEEDDETECTOR_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> class QStringList; @@ -37,18 +37,18 @@ namespace Akregator { public: FeedDetectorEntry() {} - FeedDetectorEntry(const QString& url, const QString& title) + FeedDetectorEntry(const TQString& url, const TQString& title) : m_url(url), m_title(title) {} - const QString& url() const { return m_url; } - const QString& title() const { return m_title; } + const TQString& url() const { return m_url; } + const TQString& title() const { return m_title; } private: - const QString m_url; - const QString m_title; + const TQString m_url; + const TQString m_title; }; - typedef QValueList<FeedDetectorEntry> FeedDetectorEntryList; + typedef TQValueList<FeedDetectorEntry> FeedDetectorEntryList; /** a class providing functions to detect linked feeds in HTML sources */ class FeedDetector @@ -60,14 +60,14 @@ namespace Akregator @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static FeedDetectorEntryList extractFromLinkTags(const QString& s); + static FeedDetectorEntryList extractFromLinkTags(const TQString& s); /** \brief searches an HTML page for slightly feed-like looking links and catches everything not running away quickly enough. Extracts links from @c <a @c href> tags which end with @c xml, @c rss or @c rdf @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static QStringList extractBruteForce(const QString& s); + static TQStringList extractBruteForce(const TQString& s); private: FeedDetector() {} diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 436a4be..ce6f89e 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -41,13 +41,13 @@ #include <kurllabel.h> #include <kurl.h> -#include <qcursor.h> -#include <qobjectlist.h> -#include <qpixmap.h> -#include <qstringlist.h> -#include <qstylesheet.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqcursor.h> +#include <tqobjectlist.h> +#include <tqpixmap.h> +#include <tqstringlist.h> +#include <tqstylesheet.h> +#include <tqtimer.h> +#include <tqtooltip.h> using namespace Akregator; @@ -55,7 +55,7 @@ typedef KGenericFactory<KonqFeedIcon> KonqFeedIconFactory; K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIconFactory("akregatorkonqfeedicon")) -KonqFeedIcon::KonqFeedIcon(QObject *parent, const char *name, const QStringList &) +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) { KGlobal::locale()->insertCatalogue("akregator_konqplugin"); @@ -63,15 +63,15 @@ KonqFeedIcon::KonqFeedIcon(QObject *parent, const char *name, const QStringList m_part = dynamic_cast<KHTMLPart*>(parent); 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(), SIGNAL(finishedLayout()), this, SLOT(addFeedIcon())); - QTimer::singleShot(0, this, SLOT(waitPartToLoad())); + //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); + TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); } void KonqFeedIcon::waitPartToLoad() { - connect(m_part, SIGNAL(completed()), this, SLOT(addFeedIcon())); - connect(m_part, SIGNAL(completed(bool)), this, SLOT(addFeedIcon())); // to make pages with metarefresh to work - connect(m_part, SIGNAL(started(KIO::Job *)), this, SLOT(removeFeedIcon())); + connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addFeedIcon())); + connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addFeedIcon())); // to make pages with metarefresh to work + connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeFeedIcon())); addFeedIcon(); } @@ -101,7 +101,7 @@ bool KonqFeedIcon::feedFound() return false; unsigned int i; - QString doc = ""; + TQString doc = ""; for (i = 0; i < linkNodes.length(); i++) { @@ -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 += QStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); + doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); doc += "\" "; } doc += "/>"; @@ -126,21 +126,21 @@ void KonqFeedIcon::contextMenu() m_menu = new KPopupMenu(m_part->widget()); if(m_feedList.count() == 1) { m_menu->insertTitle(m_feedList.first().title()); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, SLOT(addFeeds()) ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) ); } else { m_menu->insertTitle(i18n("Add Feeds to Akregator")); - connect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int))); + connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); int id = 0; for(FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).title(), id); id++; } - //disconnect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int))); + //disconnect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, SLOT(addFeeds()), 0, 50000 ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, TQT_SLOT(addFeeds()), 0, 50000 ); } - m_menu->popup(QCursor::pos()); + m_menu->popup(TQCursor::pos()); } void KonqFeedIcon::addFeedIcon() @@ -156,17 +156,17 @@ void KonqFeedIcon::addFeedIcon() // from khtmlpart's ualabel m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_feedIcon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_feedIcon->setUseCursor(false); //FIXME hackish - m_feedIcon->setPixmap(QPixmap(locate("data", "akregator/pics/rss.png"))); + m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png"))); - QToolTip::remove(m_feedIcon); - QToolTip::add(m_feedIcon, i18n("Monitor this site for updates (using news feed)")); + TQToolTip::remove(m_feedIcon); + TQToolTip::add(m_feedIcon, i18n("Monitor this site for updates (using news feed)")); m_statusBarEx->addStatusBarItem(m_feedIcon, 0, true); - connect(m_feedIcon, SIGNAL(leftClickedURL()), this, SLOT(contextMenu())); + connect(m_feedIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); } void KonqFeedIcon::removeFeedIcon() @@ -188,7 +188,7 @@ void KonqFeedIcon::addFeed(int id) { if(id == 50000) return; if(akregatorRunning()) - addFeedsViaDCOP(QStringList(fixRelativeURL(m_feedList[id].url(), m_part->baseURL()))); + addFeedsViaDCOP(TQStringList(fixRelativeURL(m_feedList[id].url(), m_part->baseURL()))); else addFeedViaCmdLine(fixRelativeURL(m_feedList[id].url(), m_part->baseURL())); } @@ -198,7 +198,7 @@ void KonqFeedIcon::addFeeds() { if(akregatorRunning()) { - QStringList list; + TQStringList list; for ( FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it ) list.append(fixRelativeURL((*it).url(), m_part->baseURL())); addFeedsViaDCOP(list); diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index ba3bb8c..2fccffb 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -25,7 +25,7 @@ #ifndef KONQFEEDICON_H #define KONQFEEDICON_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kparts/plugin.h> #include <kpopupmenu.h> #include "feeddetector.h" @@ -47,7 +47,7 @@ class KonqFeedIcon : public KParts::Plugin, PluginBase { Q_OBJECT public: - KonqFeedIcon(QObject *parent, const char *name, const QStringList &); + KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqFeedIcon(); @@ -58,11 +58,11 @@ private: */ bool feedFound(); - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; KURLLabel *m_feedIcon; KParts::StatusBarExtension *m_statusBarEx; FeedDetectorEntryList m_feedList; - QGuardedPtr<KPopupMenu> m_menu; + TQGuardedPtr<KPopupMenu> m_menu; private slots: void waitPartToLoad(); diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp index 4c6b5b1..f837426 100644 --- a/konq-plugins/akregator/pluginbase.cpp +++ b/konq-plugins/akregator/pluginbase.cpp @@ -30,7 +30,7 @@ #include "feeddetector.h" #include "pluginbase.h" -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> @@ -49,7 +49,7 @@ bool PluginBase::akregatorRunning() return reply.isValid(); } -void PluginBase::addFeedsViaDCOP(const QStringList& urls) +void PluginBase::addFeedsViaDCOP(const TQStringList& urls) { kdDebug() << "PluginBase::addFeedsViaDCOP" << endl; DCOPRef akr("akregator", "AkregatorIface"); @@ -60,7 +60,7 @@ void PluginBase::addFeedsViaDCOP(const QStringList& urls) }*/ } -void PluginBase::addFeedViaCmdLine(QString url) +void PluginBase::addFeedViaCmdLine(TQString url) { KProcess *proc = new KProcess; *proc << "akregator" << "-g" << i18n("Imported Feeds"); @@ -70,9 +70,9 @@ void PluginBase::addFeedViaCmdLine(QString url) } // handle all the wild stuff that KURL doesn't handle -QString PluginBase::fixRelativeURL(const QString &s, const KURL &baseurl) +TQString PluginBase::fixRelativeURL(const TQString &s, const KURL &baseurl) { - QString s2=s; + TQString s2=s; KURL u; if (KURL::isRelativeURL(s2)) { @@ -84,8 +84,8 @@ QString PluginBase::fixRelativeURL(const QString &s, const KURL &baseurl) else if (s2.startsWith("/")) { KURL b2(baseurl); - b2.setPath(QString()); // delete path and query, so that only protocol://host remains - b2.setQuery(QString()); + b2.setPath(TQString()); // delete path and query, so that only protocol://host remains + b2.setQuery(TQString()); u = KURL(b2, s2.remove(0,1)); // remove leading "/" } else diff --git a/konq-plugins/akregator/pluginbase.h b/konq-plugins/akregator/pluginbase.h index 8dcecf5..0bb24b9 100644 --- a/konq-plugins/akregator/pluginbase.h +++ b/konq-plugins/akregator/pluginbase.h @@ -48,12 +48,12 @@ class PluginBase /** * Adds feed to aKregator via DCOP. */ - void addFeedsViaDCOP(const QStringList& urls); + void addFeedsViaDCOP(const TQStringList& urls); /** * Adds feed to aKregator via command line. */ - void addFeedViaCmdLine(QString url); - QString fixRelativeURL(const QString &s, const KURL &baseurl); + void addFeedViaCmdLine(TQString url); + TQString fixRelativeURL(const TQString &s, const KURL &baseurl); }; } diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 35e610e..9d5e0f8 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -33,19 +33,19 @@ #include <kurl.h> #include <kio/netaccess.h> -#include <qdir.h> -#include <qcstring.h> -#include <qsignalmapper.h> -#include <qobject.h> +#include <tqdir.h> +#include <tqcstring.h> +#include <tqsignalmapper.h> +#include <tqobject.h> typedef KGenericFactory<ArkMenu, KonqPopupMenu> ArkMenuFactory; K_EXPORT_COMPONENT_FACTORY( libarkplugin, ArkMenuFactory("arkplugin") ) -ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList& /* list */ ) +ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringList& /* list */ ) : KonqPopupMenuPlugin( popupmenu, name), m_compAsMapper( 0 ), m_addToMapper( 0 ), m_conf( 0 ) { - if ( ( QCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) + if ( ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) || ( KStandardDirs::findExe( "ark" ).isNull() ) ) return; @@ -86,7 +86,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList break; } - QString ext; + TQString ext; KActionMenu * actionMenu; KAction * action; if ( hasOther && itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() ) // don't try to compress if we right click on a folder without files selected @@ -99,13 +99,13 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList item = itemList.first(); m_name = itemList.first()->name(); action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, - SLOT( slotCompressAsDefault() ), actionCollection() ); + TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } else { action = new KAction( KMimeType::mimeType( m_conf->readEntry( "LastMimeType", "application/x-tgz" ) )->comment(), - 0, this, SLOT( slotCompressAsDefault() ), actionCollection() ); + 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } actionMenu->insert( action ); @@ -117,14 +117,14 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList if ( itemList.first()->url().isLocalFile() ) actionMenu->insert( m_addToMenu ); - connect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareCompAsMenu() ) ); - connect( m_addToMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareAddToMenu() ) ); + connect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareCompAsMenu() ) ); + connect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareAddToMenu() ) ); action = new KAction( i18n( "Add to Archive..." ), 0, this, - SLOT( slotAdd() ), actionCollection() ); + TQT_SLOT( slotAdd() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } @@ -136,30 +136,30 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList actionMenu = new KActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" ); action = new KAction( i18n( "Extract Here" ), 0, this, - SLOT( slotExtractHere() ), actionCollection() ); + TQT_SLOT( slotExtractHere() ), actionCollection() ); actionMenu->insert( action ); // stolen from arkwidget.cpp if ( itemCount == 1 ) { - QString targetName = itemList.first()->name(); + TQString targetName = itemList.first()->name(); stripExtension( targetName ); action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, - SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } else { action = new KAction( i18n( "Extract to Subfolders" ), 0, this, - SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } actionMenu->insert( action ); action = new KAction( i18n( "Extract To..." ), 0 , this, - SLOT( slotExtractTo() ), actionCollection() ); + TQT_SLOT( slotExtractTo() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } else { - action = new KAction( i18n( "Extract To..." ), "ark", 0, this, SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); + action = new KAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); addAction( action ); } } @@ -173,17 +173,17 @@ ArkMenu::~ArkMenu() void ArkMenu::slotPrepareCompAsMenu() { - disconnect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareCompAsMenu() ) ); + disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareCompAsMenu() ) ); KAction * action; - m_compAsMapper = new QSignalMapper( this, "compAsMapper" ); - QString ext; - QStringList newExt; + m_compAsMapper = new TQSignalMapper( this, "compAsMapper" ); + TQString ext; + TQStringList newExt; unsigned int counter = 0; - QCString actionName; - QStringList::Iterator eit; - QStringList::Iterator mit; + TQCString actionName; + TQStringList::Iterator eit; + TQStringList::Iterator mit; mit = m_archiveMimeTypes.begin(); for ( ; mit != m_archiveMimeTypes.end(); ++mit ) { @@ -195,13 +195,13 @@ void ArkMenu::slotPrepareCompAsMenu() if ( m_urlList.count() == 1 ) { action = new KAction( m_name + (*eit), 0, m_compAsMapper, - SLOT( map() ), actionCollection() ); + TQT_SLOT( map() ), actionCollection() ); } else { ext = KMimeType::mimeType(*mit)->comment(); action = new KAction( ext, 0, m_compAsMapper, - SLOT( map() ), actionCollection() ); + TQT_SLOT( map() ), actionCollection() ); } m_compAsMenu->insert( action ); @@ -218,13 +218,13 @@ void ArkMenu::slotPrepareCompAsMenu() m_extensionList += newExt; } - connect( m_compAsMapper, SIGNAL( mapped( int ) ), SLOT( slotCompressAs( int ) ) ); + connect( m_compAsMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotCompressAs( int ) ) ); } void ArkMenu::slotPrepareAddToMenu() { - disconnect( m_addToMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareAddToMenu() ) ); + disconnect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareAddToMenu() ) ); if ( m_extensionList.isEmpty() ) // is filled in slotPrepareCompAsMenu @@ -232,20 +232,20 @@ void ArkMenu::slotPrepareAddToMenu() unsigned int counter = 0; KAction * action; - m_addToMapper = new QSignalMapper( this, "addToMapper" ); - QCString actionName; - QStringList::Iterator mit; + m_addToMapper = new TQSignalMapper( this, "addToMapper" ); + TQCString actionName; + TQStringList::Iterator mit; KURL archive; - QDir dir( m_urlList.first().directory() ); - QStringList entries = dir.entryList(); - QStringList::Iterator uit = entries.begin(); + TQDir dir( m_urlList.first().directory() ); + TQStringList entries = dir.entryList(); + TQStringList::Iterator uit = entries.begin(); for ( ; uit != entries.end(); ++uit ) { for ( mit = m_extensionList.begin(); mit != m_extensionList.end(); ++mit ) if ( (*uit).endsWith(*mit) ) { action = new KAction( *uit, 0, m_addToMapper, - SLOT( map() ), actionCollection() ); + TQT_SLOT( map() ), actionCollection() ); m_addToMenu->insert( action ); m_addToMapper->setMapping( action, counter ); archive.setPath( *uit ); @@ -254,7 +254,7 @@ void ArkMenu::slotPrepareAddToMenu() break; } } - connect( m_addToMapper, SIGNAL( mapped( int ) ), SLOT( slotAddTo( int ) ) ); + connect( m_addToMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotAddTo( int ) ) ); } void ArkMenu::compMimeTypes() @@ -395,11 +395,11 @@ void ArkMenu::extMimeTypes() m_extractMimeTypes << "application/x-archive"; } -void ArkMenu::stripExtension( QString & name ) +void ArkMenu::stripExtension( TQString & name ) { - QStringList patternList = KMimeType::findByPath( name )->patterns(); - QStringList::Iterator it = patternList.begin(); - QString ext; + TQStringList patternList = KMimeType::findByPath( name )->patterns(); + TQStringList::Iterator it = patternList.begin(); + TQString ext; for ( ; it != patternList.end(); ++it ) { ext = (*it).remove( '*' ); @@ -413,10 +413,10 @@ void ArkMenu::stripExtension( QString & name ) void ArkMenu::slotCompressAs( int pos ) { - QCString name; - QString extension, mimeType; + TQCString name; + TQString extension, mimeType; KURL target; - QStringList filelist( m_urlStringList ); + TQStringList filelist( m_urlStringList ); //if KMimeType returns .ZIP, .7Z or .RAR. convert them to lowercase if ( m_extensionList[ pos ].contains ( ".ZIP" ) ) @@ -446,9 +446,9 @@ void ArkMenu::slotCompressAs( int pos ) m_conf->setGroup( "ArkPlugin" ); m_conf->writeEntry( "LastExtension", extension ); - QStringList extensions; - QStringList::Iterator eit; - QStringList::Iterator mit = m_archiveMimeTypes.begin(); + TQStringList extensions; + TQStringList::Iterator eit; + TQStringList::Iterator mit = m_archiveMimeTypes.begin(); bool done = false; for ( ; mit != m_archiveMimeTypes.end() && !done; ++mit ) { @@ -488,9 +488,9 @@ void ArkMenu::slotCompressAsDefault() } // make work for URLs -void ArkMenu::compressAs( const QStringList &name, const KURL & compressed ) +void ArkMenu::compressAs( const TQStringList &name, const KURL & compressed ) { - QStringList args; + TQStringList args; args << "--add-to"; args += name; args << compressed.url(); @@ -499,7 +499,7 @@ void ArkMenu::compressAs( const QStringList &name, const KURL & compressed ) void ArkMenu::slotAddTo( int pos ) { - QStringList args( m_urlStringList ); + TQStringList args( m_urlStringList ); args.prepend( "--add-to" ); KURL archive( m_urlStringList.first() ); @@ -512,7 +512,7 @@ void ArkMenu::slotAddTo( int pos ) void ArkMenu::slotAdd() { - QStringList args( m_urlStringList ); + TQStringList args( m_urlStringList ); args.prepend( "--add" ); kapp->kdeinitExec( "ark", args ); @@ -520,11 +520,11 @@ void ArkMenu::slotAdd() void ArkMenu::slotExtractHere() { - for ( QValueList<KURL>::ConstIterator it = m_urlList.constBegin(); + for ( TQValueList<KURL>::ConstIterator it = m_urlList.constBegin(); it != m_urlList.constEnd(); ++it ) { - QStringList args; + TQStringList args; KURL targetDirectory = ( *it ).url(); targetDirectory.setPath( targetDirectory.directory() ); args << "--extract-to" << targetDirectory.url() << ( *it ).url(); @@ -534,13 +534,13 @@ void ArkMenu::slotExtractHere() void ArkMenu::slotExtractToSubfolders() { - for ( QStringList::ConstIterator it = m_urlStringList.constBegin(); + for ( TQStringList::ConstIterator it = m_urlStringList.constBegin(); it != m_urlStringList.constEnd(); ++it ) { KURL targetDir; - QString dirName; - QStringList args; + TQString dirName; + TQStringList args; targetDir = *it; dirName = targetDir.path(); @@ -553,11 +553,11 @@ void ArkMenu::slotExtractToSubfolders() void ArkMenu::slotExtractTo() { - for ( QStringList::ConstIterator it = m_urlStringList.constBegin(); + for ( TQStringList::ConstIterator it = m_urlStringList.constBegin(); it != m_urlStringList.constEnd(); ++it ) { - QStringList args; + TQStringList args; args << "--extract" << *it; kapp->kdeinitExec( "ark", args ); } diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h index 8732294..6b9a6fe 100644 --- a/konq-plugins/arkplugin/arkplugin.h +++ b/konq-plugins/arkplugin/arkplugin.h @@ -31,7 +31,7 @@ class QSignalMapper; class ArkMenu : public KonqPopupMenuPlugin { Q_OBJECT public: - ArkMenu( KonqPopupMenu *, const char *name, const QStringList & list ); + ArkMenu( KonqPopupMenu *, const char *name, const TQStringList & list ); virtual ~ArkMenu(); public slots: @@ -48,24 +48,24 @@ public slots: protected: void extMimeTypes(); void compMimeTypes(); - void compressAs( const QStringList &name, const KURL & compressed ); + void compressAs( const TQStringList &name, const KURL & compressed ); - void stripExtension( QString & name ); + void stripExtension( TQString & name ); private: - QString m_name, m_ext; - QValueList<KURL> m_urlList; - QStringList m_urlStringList; + TQString m_name, m_ext; + TQValueList<KURL> m_urlList; + TQStringList m_urlStringList; KURL::List m_archiveList; - QStringList m_archiveMimeTypes; - QStringList m_extractMimeTypes; - QStringList m_extensionList; + TQStringList m_archiveMimeTypes; + TQStringList m_extractMimeTypes; + TQStringList m_extensionList; KActionMenu * m_compAsMenu; KActionMenu * m_addToMenu; - QSignalMapper * m_compAsMapper; - QSignalMapper * m_addToMapper; + TQSignalMapper * m_compAsMapper; + TQSignalMapper * m_addToMapper; KConfig * m_conf; - QString m_dir; //contains the currect directory + TQString m_dir; //contains the currect directory }; #endif diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index 6d06ea0..64be883 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -11,22 +11,22 @@ #include <kaction.h> #include <kinstance.h> #include <kiconloader.h> -#include <qmessagebox.h> +#include <tqmessagebox.h> #include <klocale.h> -#include <qtimer.h> +#include <tqtimer.h> #include <kgenericfactory.h> -AutoRefresh::AutoRefresh( QObject* parent, const char* name, const QStringList & /*args*/ ) +AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList & /*args*/ ) : Plugin( parent, name ) { - timer = new QTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( slotRefresh() ) ); + timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); refresher = new KSelectAction( i18n("&Auto Refresh"), "reload", 0, - this, SLOT(slotIntervalChanged()), + this, TQT_SLOT(slotIntervalChanged()), actionCollection(), "autorefresh" ); - QStringList sl; + TQStringList sl; sl << i18n("None"); sl << i18n("Every 15 Seconds"); sl << i18n("Every 30 Seconds"); @@ -86,10 +86,10 @@ void AutoRefresh::slotIntervalChanged() void AutoRefresh::slotRefresh() { if ( !parent()->inherits("KParts::ReadOnlyPart") ) { - QString title = i18n( "Cannot Refresh Source" ); - QString text = i18n( "<qt>This plugin cannot auto-refresh the current part.</qt>" ); + TQString title = i18n( "Cannot Refresh Source" ); + TQString text = i18n( "<qt>This plugin cannot auto-refresh the current part.</qt>" ); - QMessageBox::warning( 0, title, text ); + TQMessageBox::warning( 0, title, text ); } else { diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h index 370e42b..7616382 100644 --- a/konq-plugins/autorefresh/autorefresh.h +++ b/konq-plugins/autorefresh/autorefresh.h @@ -36,7 +36,7 @@ public: /** * Construct a new KParts plugin. */ - AutoRefresh( QObject* parent = 0, const char* name = 0, const QStringList &args = QStringList() ); + AutoRefresh( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); /** * Destructor. @@ -49,7 +49,7 @@ public slots: private: KSelectAction *refresher; - QTimer *timer; + TQTimer *timer; }; #endif diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index 302b71a..fc7a80e 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -34,8 +34,8 @@ 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( QObject* parent, const char* name, - const QStringList & ) +PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ) { setInstance(BabelFishFactory::instance()); @@ -60,104 +60,104 @@ PluginBabelFish::PluginBabelFish( QObject* parent, const char* name, actionCollection(), "translatewebpage_nl" ); m_en->insert( new KAction( i18n("&Chinese (Simplified)"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_zh") ); m_en->insert( new KAction( i18n("Chinese (&Traditional)"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_zhTW") ); m_en->insert( new KAction( i18n("&Dutch"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_nl") ); m_en->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_fr") ); m_en->insert( new KAction( i18n("&German"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_de") ); m_en->insert( new KAction( i18n("&Italian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_it") ); m_en->insert( new KAction( i18n("&Japanese"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_ja") ); m_en->insert( new KAction( i18n("&Korean"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_ko") ); m_en->insert( new KAction( i18n("&Norwegian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_no") ); m_en->insert( new KAction( i18n("&Portuguese"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_pt") ); m_en->insert( new KAction( i18n("&Russian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_ru") ); m_en->insert( new KAction( i18n("&Spanish"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_es") ); m_en->insert( new KAction( i18n("T&hai"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_th") ); m_fr->insert( new KAction( i18n("&Dutch"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_nl") ); m_fr->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_en") ); m_fr->insert( new KAction( i18n("&German"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_de") ); m_fr->insert( new KAction( i18n("&Italian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_it") ); m_fr->insert( new KAction( i18n("&Portuguese"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_pt") ); m_fr->insert( new KAction( i18n("&Spanish"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_es") ); m_de->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "de_en") ); m_de->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "de_fr") ); m_es->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "es_en") ); m_es->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "es_fr") ); m_pt->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "pt_en") ); m_pt->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "pt_fr") ); m_it->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "it_en") ); m_it->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "it_fr") ); m_nl->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "nl_en") ); m_nl->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "nl_fr") ); m_menu->insert( new KAction( i18n("&Chinese (Simplified) to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "zh_en") ); m_menu->insert( new KAction( i18n("Chinese (&Traditional) to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "zhTW_en") ); m_menu->insert( m_nl ); m_menu->insert( m_en ); @@ -165,14 +165,14 @@ PluginBabelFish::PluginBabelFish( QObject* parent, const char* name, m_menu->insert( m_de ); m_menu->insert( m_it ); m_menu->insert( new KAction( i18n("&Japanese to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "ja_en") ); m_menu->insert( new KAction( i18n("&Korean to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "ko_en") ); m_menu->insert( m_pt ); m_menu->insert( new KAction( i18n("&Russian to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "ru_en") ); m_menu->insert( m_es ); m_menu->setEnabled( true ); @@ -181,8 +181,8 @@ PluginBabelFish::PluginBabelFish( QObject* parent, const char* name, if ( parent && parent->inherits( "KHTMLPart" ) ) { KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent); - connect( part, SIGNAL(started(KIO::Job*)), this, - SLOT(slotStarted(KIO::Job*)) ); + connect( part, TQT_SIGNAL(started(KIO::Job*)), this, + TQT_SLOT(slotStarted(KIO::Job*)) ); } } @@ -214,8 +214,8 @@ void PluginBabelFish::translateURL() // The parent is assumed to be a KHTMLPart if ( !parent()->inherits("KHTMLPart") ) { - QString title = i18n( "Cannot Translate Source" ); - QString text = i18n( "Only web pages can be translated using " + TQString title = i18n( "Cannot Translate Source" ); + TQString text = i18n( "Only web pages can be translated using " "this plugin." ); KMessageBox::sorry( 0L, text, title ); @@ -224,7 +224,7 @@ void PluginBabelFish::translateURL() // Select engine KConfig cfg( "translaterc", true ); - QString engine = cfg.readEntry( sender()->name(), "babelfish" ); + TQString engine = cfg.readEntry( sender()->name(), "babelfish" ); // Get URL KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); @@ -233,7 +233,7 @@ void PluginBabelFish::translateURL() // we check if we have text selected. if so, we translate that. If // not, we translate the url - QString totrans; + TQString totrans; if ( part->hasSelection() ) { if( engine == "reverso" || engine == "tsail" ) @@ -248,8 +248,8 @@ void PluginBabelFish::translateURL() // Check syntax if ( !url.isValid() ) { - QString title = i18n( "Malformed URL" ); - QString text = i18n( "The URL you entered is not valid, please " + TQString title = i18n( "Malformed URL" ); + TQString text = i18n( "The URL you entered is not valid, please " "correct it and try again." ); KMessageBox::sorry( 0L, text, title ); return; @@ -259,36 +259,36 @@ void PluginBabelFish::translateURL() // Create URL KURL result; - QString query; + TQString query; if( engine == "freetranslation" ) { query = "sequence=core&Submit=FREE Translation&language="; - if( sender()->name() == QString( "en_es" ) ) + if( sender()->name() == TQString( "en_es" ) ) query += "English/Spanish"; - else if( sender()->name() == QString( "en_de" ) ) + else if( sender()->name() == TQString( "en_de" ) ) query += "English/German"; - else if( sender()->name() == QString( "en_it" ) ) + else if( sender()->name() == TQString( "en_it" ) ) query += "English/Italian"; - else if( sender()->name() == QString( "en_nl" ) ) + else if( sender()->name() == TQString( "en_nl" ) ) query += "English/Dutch"; - else if( sender()->name() == QString( "en_pt" ) ) + else if( sender()->name() == TQString( "en_pt" ) ) query += "English/Portuguese"; - else if( sender()->name() == QString( "en_no" ) ) + else if( sender()->name() == TQString( "en_no" ) ) query += "English/Norwegian"; - else if( sender()->name() == QString( "en_zh" ) ) + else if( sender()->name() == TQString( "en_zh" ) ) query += "English/SimplifiedChinese"; - else if( sender()->name() == QString( "en_zhTW" ) ) + else if( sender()->name() == TQString( "en_zhTW" ) ) query += "English/TraditionalChinese"; - else if( sender()->name() == QString( "es_en" ) ) + else if( sender()->name() == TQString( "es_en" ) ) query += "Spanish/English"; - else if( sender()->name() == QString( "fr_en" ) ) + else if( sender()->name() == TQString( "fr_en" ) ) query += "French/English"; - else if( sender()->name() == QString( "de_en" ) ) + else if( sender()->name() == TQString( "de_en" ) ) query += "German/English"; - else if( sender()->name() == QString( "it_en" ) ) + else if( sender()->name() == TQString( "it_en" ) ) query += "Italian/English"; - else if( sender()->name() == QString( "nl_en" ) ) + else if( sender()->name() == TQString( "nl_en" ) ) query += "Dutch/English"; - else if( sender()->name() == QString( "pt_en" ) ) + else if( 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() == QString( "de_fr" ) ) + if( sender()->name() == TQString( "de_fr" ) ) query += "524292"; - else if( sender()->name() == QString( "fr_en" ) ) + else if( sender()->name() == TQString( "fr_en" ) ) query += "65544"; - else if( sender()->name() == QString( "fr_de" ) ) + else if( sender()->name() == TQString( "fr_de" ) ) query += "262152"; - else if( sender()->name() == QString( "de_en" ) ) + else if( sender()->name() == TQString( "de_en" ) ) query += "65540"; - else if( sender()->name() == QString( "en_de" ) ) + else if( sender()->name() == TQString( "en_de" ) ) query += "262145"; - else if( sender()->name() == QString( "en_es" ) ) + else if( sender()->name() == TQString( "en_es" ) ) query += "2097153"; - else if( sender()->name() == QString( "es_en" ) ) + else if( sender()->name() == TQString( "es_en" ) ) query += "65568"; - else if( sender()->name() == QString( "fr_es" ) ) + else if( sender()->name() == TQString( "fr_es" ) ) query += "2097160"; else // "en_fr" query += "524289"; @@ -336,9 +336,9 @@ void PluginBabelFish::translateURL() } else if( engine == "tsail" ) { result = KURL( "http://www.t-mail.com/cgi-bin/tsail" ); query = "sail=full&lp="; - if( sender()->name() == QString( "zhTW_en" ) ) + if( sender()->name() == TQString( "zhTW_en" ) ) query += "tw-en"; - else if( sender()->name() == QString( "en_zhTW" ) ) + else if( sender()->name() == TQString( "en_zhTW" ) ) query += "en-tw"; else { diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h index d4e8b01..1844ce1 100644 --- a/konq-plugins/babelfish/plugin_babelfish.h +++ b/konq-plugins/babelfish/plugin_babelfish.h @@ -29,8 +29,8 @@ class PluginBabelFish : public KParts::Plugin { Q_OBJECT public: - PluginBabelFish( QObject* parent, const char* name, - const QStringList & ); + PluginBabelFish( TQObject* parent, const char* name, + const TQStringList & ); virtual ~PluginBabelFish(); public slots: diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index 8d01553..b1e1f6f 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -37,7 +37,7 @@ typedef KGenericFactory<CrashesPlugin> CrashesPluginFactory; K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplugin" ) ) -CrashesPlugin::CrashesPlugin( QObject* parent, const char* name, const QStringList & ) +CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ) : KParts::Plugin( parent, name ) { m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; @@ -48,8 +48,8 @@ CrashesPlugin::CrashesPlugin( QObject* parent, const char* name, const QStringLi m_pCrashesMenu->setDelayed( false ); m_pCrashesMenu->setEnabled( true ); - connect( m_pCrashesMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotAboutToShow() ) ); + connect( m_pCrashesMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotAboutToShow() ) ); } CrashesPlugin::~CrashesPlugin() @@ -62,10 +62,10 @@ void CrashesPlugin::slotAboutToShow() KCrashBookmarkImporter importer(KCrashBookmarkImporter::crashBookmarksDir()); - connect( &importer, SIGNAL( newBookmark( const QString &, const QCString &, const QString &) ), - SLOT( newBookmarkCallback( const QString &, const QCString &, const QString & ) ) ); + connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQT_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, SIGNAL( endFolder() ), SLOT( endFolderCallback() ) ); + connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolderCallback() ) ); int count = m_pCrashesMenu->popupMenu()->count(); @@ -89,7 +89,7 @@ void CrashesPlugin::slotAboutToShow() m_crashRangesList.append( CrashRange(firstItem, count) ); m_pCrashesMenu->popupMenu()->insertItem( i18n("All Pages of This Crash"), this, - SLOT(slotGroupSelected(int)), + TQT_SLOT(slotGroupSelected(int)), 0, crashGroup--); } m_pCrashesMenu->popupMenu()->insertSeparator(); @@ -97,14 +97,14 @@ void CrashesPlugin::slotAboutToShow() gotSep = true; firstItem = ++count; } else { - QString str = (*e).first; + TQString str = (*e).first; if (str.length() > 48) { str.truncate(48); str.append("..."); } m_pCrashesMenu->popupMenu()->insertItem( str, this, - SLOT(slotItemSelected(int)), + TQT_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; } @@ -113,13 +113,13 @@ void CrashesPlugin::slotAboutToShow() m_crashRangesList.append( CrashRange(firstItem, count) ); m_pCrashesMenu->popupMenu()->insertItem( i18n("All Pages of This Crash"), this, - SLOT(slotGroupSelected(int)), + TQT_SLOT(slotGroupSelected(int)), 0, crashGroup--); } } else { m_pCrashesMenu->popupMenu()->insertItem( i18n("No Recovered Crashes"), this, - SLOT(slotItemSelected(int)), + TQT_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; enable = false; @@ -131,20 +131,20 @@ void CrashesPlugin::slotAboutToShow() } int id =m_pCrashesMenu->popupMenu()->insertItem( i18n("&Clear List of Crashes"), this, - SLOT(slotClearCrashes()), + TQT_SLOT(slotClearCrashes()), 0, ++count ); m_pCrashesMenu->popupMenu()->setItemEnabled( id, enable); } -void CrashesPlugin::newBookmarkCallback( const QString & text, const QCString & url, - const QString & ) +void CrashesPlugin::newBookmarkCallback( const TQString & text, const TQCString & url, + const TQString & ) { m_crashesList.prepend(qMakePair(text,url)); } void CrashesPlugin::endFolderCallback( ) { - m_crashesList.prepend(qMakePair(QString("-"),QCString("-"))); + m_crashesList.prepend(qMakePair(TQString("-"),TQCString("-"))); } void CrashesPlugin::slotClearCrashes() { diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h index cff0831..3c6a402 100644 --- a/konq-plugins/crashes/crashesplugin.h +++ b/konq-plugins/crashes/crashesplugin.h @@ -21,9 +21,9 @@ #ifndef __CRASHES_PLUGIN_H #define __CRASHES_PLUGIN_H -#include <qmap.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <kurl.h> #include <klibloader.h> @@ -37,8 +37,8 @@ class CrashesPlugin : public KParts::Plugin Q_OBJECT public: - CrashesPlugin( QObject* parent, const char* name, - const QStringList & ); + CrashesPlugin( TQObject* parent, const char* name, + const TQStringList & ); ~CrashesPlugin(); protected slots: @@ -46,7 +46,7 @@ protected slots: void slotClearCrashes(); void slotItemSelected(int); void slotGroupSelected(int); - void newBookmarkCallback( const QString &, const QCString &, const QString & ); + void newBookmarkCallback( const TQString &, const TQCString &, const TQString & ); void endFolderCallback( ); private: @@ -55,13 +55,13 @@ private: KHTMLPart* m_part; KActionMenu* m_pCrashesMenu; - typedef QPair<QString,QCString> Crash; - typedef QValueList<Crash> CrashesList; + typedef QPair<TQString,TQCString> Crash; + typedef TQValueList<Crash> CrashesList; CrashesList m_crashesList; typedef QPair<int, int> CrashRange; - typedef QValueList<CrashRange> CrashRangesList; + typedef TQValueList<CrashRange> CrashRangesList; CrashRangesList m_crashRangesList; diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index 8401238..ff2eecd 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -19,13 +19,13 @@ #include <unistd.h> #include <sys/types.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qwhatsthis.h> -#include <qiconview.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> +#include <tqiconview.h> #include <klistview.h> #include <kdebug.h> @@ -71,9 +71,9 @@ SessionManager::~SessionManager() m_self = 0; } -QString SessionManager::generateKey (const KURL& url) const +TQString SessionManager::generateKey (const KURL& url) const { - QString key; + TQString key; key = url.protocol (); key += ':'; @@ -86,32 +86,32 @@ QString SessionManager::generateKey (const KURL& url) const key += url.path (); key += ':'; - key += QString::number (m_pid); + key += TQString::number (m_pid); return key; } -QStringList SessionManager::restoreMimeFilters (const KURL& url) const +TQStringList SessionManager::restoreMimeFilters (const KURL& url) const { - QString key(generateKey(url)); + TQString key(generateKey(url)); return m_filters[key]; } -QString SessionManager::restoreTypedFilter (const KURL& url) const +TQString SessionManager::restoreTypedFilter (const KURL& url) const { - QString key(generateKey(url)); + TQString key(generateKey(url)); return m_typedFilter[key]; } -void SessionManager::save (const KURL& url, const QStringList& filters) +void SessionManager::save (const KURL& url, const TQStringList& filters) { - QString key = generateKey(url); + TQString key = generateKey(url); m_filters[key] = filters; } -void SessionManager::save (const KURL& url, const QString& typedFilter) +void SessionManager::save (const KURL& url, const TQString& typedFilter) { - QString key = generateKey(url); + TQString key = generateKey(url); m_typedFilter[key] = typedFilter; } @@ -141,8 +141,8 @@ void SessionManager::loadSettings() -DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name, - const QStringList&) +DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, + const TQStringList&) :KParts::Plugin (parent, name), m_pFilterMenu(0), m_searchWidget(0), @@ -158,23 +158,23 @@ DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name, m_pFilterMenu->setDelayed (false); m_pFilterMenu->setWhatsThis(i18n("Allow to filter the currently displayed items by filetype.")); - connect (m_pFilterMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowPopup())); + connect (m_pFilterMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowPopup())); - connect (m_part, SIGNAL (itemRemoved(const KFileItem*)), - SLOT( slotItemRemoved (const KFileItem*))); - connect (m_part, SIGNAL (itemsAdded(const KFileItemList&)), - SLOT (slotItemsAdded(const KFileItemList&))); - connect (m_part, SIGNAL (itemsFilteredByMime(const KFileItemList&)), - SLOT (slotItemsAdded(const KFileItemList&))); - connect (m_part, SIGNAL(aboutToOpenURL()), SLOT(slotOpenURL())); + connect (m_part, TQT_SIGNAL (itemRemoved(const KFileItem*)), + TQT_SLOT( slotItemRemoved (const KFileItem*))); + connect (m_part, TQT_SIGNAL (itemsAdded(const KFileItemList&)), + TQT_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQT_SIGNAL (itemsFilteredByMime(const KFileItemList&)), + TQT_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); // add a searchline filter for konqis icons/list views - QHBox *hbox = new QHBox(m_part->widget()); + TQHBox *hbox = new TQHBox(m_part->widget()); hbox->hide(); KAction *clear = new KAction(i18n("Clear Filter Field"), - QApplication::reverseLayout() ? "clear_left" : "locationbar_erase", + TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, 0, 0, actionCollection(), "clear_filter"); clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field.")); @@ -184,18 +184,18 @@ DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name, m_searchWidget = new KListViewSearchLine(hbox); static_cast<KListViewSearchLine*>(m_searchWidget)->setListView(static_cast<KListView*>(m_part->scrollWidget())); } - else if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) + else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { m_searchWidget = new KIconViewSearchLine(hbox); - static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<QIconView*>(m_part->scrollWidget())); + static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget())); } if ( m_searchWidget ) { - QWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown.")); - connect(clear, SIGNAL(activated()), m_searchWidget, SLOT(clear())); - connect(m_searchWidget, SIGNAL(textChanged(const QString&)), this, SLOT(searchTextChanged(const QString&))); + TQWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown.")); + connect(clear, TQT_SIGNAL(activated()), m_searchWidget, TQT_SLOT(clear())); + connect(m_searchWidget, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(searchTextChanged(const TQString&))); } KWidgetAction *filterAction = new KWidgetAction(hbox, i18n("Filter Field"), @@ -205,11 +205,11 @@ DirFilterPlugin::DirFilterPlugin (QObject* 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! - m_refreshTimer = new QTimer( this ); - m_reactivateRefreshTimer = new QTimer( this ); - connect( m_refreshTimer, SIGNAL(timeout()), this, SLOT(activateSearch()) ); + m_refreshTimer = new TQTimer( this ); + m_reactivateRefreshTimer = new TQTimer( this ); + connect( m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(activateSearch()) ); m_refreshTimer->start( 200, FALSE ); // 200 millisecond continuous timer - connect( m_reactivateRefreshTimer, SIGNAL(timeout()), this, SLOT(reactivateRefreshTimer()) ); + connect( m_reactivateRefreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reactivateRefreshTimer()) ); } @@ -222,7 +222,7 @@ DirFilterPlugin::~DirFilterPlugin() delete m_reactivateRefreshTimer; } -void DirFilterPlugin::searchTextChanged(const QString& newtext) +void DirFilterPlugin::searchTextChanged(const TQString& newtext) { m_refreshTimer->stop(); m_reactivateRefreshTimer->stop(); @@ -249,7 +249,7 @@ void DirFilterPlugin::slotOpenURL () SessionManager::self()->save(m_pURL, m_searchWidget->text()); m_searchWidget->clear(); - QString typedFilter(SessionManager::self()->restoreTypedFilter(url)); + TQString typedFilter(SessionManager::self()->restoreTypedFilter(url)); m_searchWidget->completionObject()->addItem(typedFilter); m_searchWidget->setText(typedFilter); } @@ -271,8 +271,8 @@ void DirFilterPlugin::slotShowPopup() int id = 0; uint enableReset = 0; - QString label; - QStringList inodes; + TQString label; + TQStringList inodes; m_pFilterMenu->popupMenu()->clear(); m_pFilterMenu->popupMenu()->insertTitle (i18n("Only Show Items of Type")); @@ -293,13 +293,13 @@ void DirFilterPlugin::slotShowPopup() { label = it.data().mimeComment; label += " ("; - label += QString::number (it.data().filenames.size ()); + label += TQString::number (it.data().filenames.size ()); label += ")"; } m_pMimeInfo[it.key()].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(it.data().iconName), label, - this, SLOT(slotItemSelected(int)), 0, ++id); + this, TQT_SLOT(slotItemSelected(int)), 0, ++id); if (it.data().useAsFilter) { @@ -313,8 +313,8 @@ void DirFilterPlugin::slotShowPopup() { m_pFilterMenu->popupMenu()->insertSeparator (); - QStringList::Iterator it = inodes.begin(); - QStringList::Iterator end = inodes.end(); + TQStringList::Iterator it = inodes.begin(); + TQStringList::Iterator end = inodes.end(); for (; it != end; ++it) { @@ -324,13 +324,13 @@ void DirFilterPlugin::slotShowPopup() { label = m_pMimeInfo[(*it)].mimeComment; label += " ("; - label += QString::number (m_pMimeInfo[(*it)].filenames.size ()); + label += TQString::number (m_pMimeInfo[(*it)].filenames.size ()); label += ")"; } m_pMimeInfo[(*it)].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(m_pMimeInfo[(*it)].iconName), label, - this, SLOT(slotItemSelected(int)), 0, ++id); + this, TQT_SLOT(slotItemSelected(int)), 0, ++id); if (m_pMimeInfo[(*it)].useAsFilter) { @@ -342,16 +342,16 @@ void DirFilterPlugin::slotShowPopup() m_pFilterMenu->popupMenu()->insertSeparator (); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Use Multiple Filters"), - this, SLOT(slotMultipleFilters())); + this, TQT_SLOT(slotMultipleFilters())); m_pFilterMenu->popupMenu()->setItemEnabled (id, enableReset <= 1); m_pFilterMenu->popupMenu()->setItemChecked (id, SessionManager::self()->useMultipleFilters); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Show Count"), this, - SLOT(slotShowCount())); + TQT_SLOT(slotShowCount())); m_pFilterMenu->popupMenu()->setItemChecked (id, SessionManager::self()->showCount); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Reset"), this, - SLOT(slotReset())); + TQT_SLOT(slotReset())); m_pFilterMenu->popupMenu()->setItemEnabled (id, enableReset); } @@ -367,7 +367,7 @@ void DirFilterPlugin::slotItemSelected (int id) if (it != m_pMimeInfo.end()) { - QStringList filters; + TQStringList filters; if (it.data().useAsFilter) { @@ -420,7 +420,7 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) { static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); } - else if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) + else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); } @@ -432,16 +432,16 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) for (KFileItemListIterator it (list); it.current (); ++it) { - QString name = it.current()->name(); + TQString name = it.current()->name(); KMimeType::Ptr mime = it.current()->mimeTypePtr(); // don't resolve mimetype if unknown if (!mime) continue; - QString mimeType = mime->name(); + TQString mimeType = mime->name(); if (!m_pMimeInfo.contains (mimeType)) { MimeInfo& mimeInfo = m_pMimeInfo[mimeType]; - QStringList filters = m_part->mimeFilter (); + TQStringList filters = m_part->mimeFilter (); mimeInfo.useAsFilter = (!filters.isEmpty () && filters.contains (mimeType)); mimeInfo.mimeComment = mime->comment(); mimeInfo.iconName = mime->icon(KURL(), false); @@ -468,11 +468,11 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item) // NOTE: This bug is NOT present in qlistviewitem // HACK around it here... - if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) { + if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name()); } - QString mimeType = item->mimetype().stripWhiteSpace(); + TQString mimeType = item->mimetype().stripWhiteSpace(); if (m_pMimeInfo.contains (mimeType)) { MimeInfo info = m_pMimeInfo [mimeType]; @@ -481,11 +481,11 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item) m_pMimeInfo [mimeType].filenames.remove (item->name ()); else { if (info.useAsFilter) { - QStringList filters = m_part->mimeFilter (); + TQStringList filters = m_part->mimeFilter (); filters.remove (mimeType); m_part->setMimeFilter (filters); SessionManager::self()->save (m_part->url(), filters); - QTimer::singleShot( 0, this, SLOT(slotTimeout()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotTimeout()) ); } m_pMimeInfo.remove (mimeType); } @@ -509,7 +509,7 @@ void DirFilterPlugin::activateSearch() if ( ::qt_cast<KListView*>(m_part->scrollWidget()) ) { static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); } - else if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) { + else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); } } @@ -523,7 +523,7 @@ void DirFilterPlugin::slotReset() for (; it != m_pMimeInfo.end(); ++it) it.data().useAsFilter = false; - QStringList filters; + TQStringList filters; KURL url = m_part->url(); m_part->setMimeFilter (filters); diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h index c1313be..ff3497e 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.h +++ b/konq-plugins/dirfilter/dirfilterplugin.h @@ -19,9 +19,9 @@ #ifndef __DIR_FILTER_PLUGIN_H #define __DIR_FILTER_PLUGIN_H -#include <qmap.h> -#include <qtimer.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqtimer.h> +#include <tqstringlist.h> #include <kurl.h> @@ -50,17 +50,17 @@ public: ~SessionManager (); static SessionManager* self (); - QStringList restoreMimeFilters (const KURL& url) const; - QString restoreTypedFilter(const KURL& url) const; - void save (const KURL& url, const QStringList& filters); - void save (const KURL& url, const QString& typedFilter); + TQStringList restoreMimeFilters (const KURL& url) const; + TQString restoreTypedFilter(const KURL& url) const; + void save (const KURL& url, const TQStringList& filters); + void save (const KURL& url, const TQString& typedFilter); bool showCount; bool useMultipleFilters; protected: - QString generateKey (const KURL& url) const; + TQString generateKey (const KURL& url) const; void loadSettings (); void saveSettings (); @@ -73,8 +73,8 @@ private: int m_pid; bool m_bSettingsLoaded; static SessionManager* m_self; - QMap<QString,QStringList> m_filters; - QMap<QString,QString> m_typedFilter; + TQMap<TQString,TQStringList> m_filters; + TQMap<TQString,TQString> m_typedFilter; }; @@ -84,7 +84,7 @@ class DirFilterPlugin : public KParts::Plugin public: - DirFilterPlugin (QObject* parent, const char* name, const QStringList &); + DirFilterPlugin (TQObject* parent, const char* name, const TQStringList &); ~DirFilterPlugin (); protected: @@ -100,11 +100,11 @@ protected: int id; bool useAsFilter; - QString mimeType; - QString iconName; - QString mimeComment; + TQString mimeType; + TQString iconName; + TQString mimeComment; - QMap<QString, bool> filenames; + TQMap<TQString, bool> filenames; }; void loadSettings(); @@ -121,19 +121,19 @@ private slots: void slotItemRemoved(const KFileItem *); void slotItemsAdded(const KFileItemList &); void activateSearch(); - void searchTextChanged(const QString& newtext); + void searchTextChanged(const TQString& newtext); void reactivateRefreshTimer(); private: KURL m_pURL; KonqDirPart* m_part; - QTimer *m_refreshTimer; - QTimer *m_reactivateRefreshTimer; + TQTimer *m_refreshTimer; + TQTimer *m_reactivateRefreshTimer; KActionMenu* m_pFilterMenu; - QString m_oldFilterString; + TQString m_oldFilterString; KLineEdit *m_searchWidget; - QMap<QString,MimeInfo> m_pMimeInfo; - typedef QMap<QString,MimeInfo>::Iterator MimeInfoIterator; + TQMap<TQString,MimeInfo> m_pMimeInfo; + typedef TQMap<TQString,MimeInfo>::Iterator MimeInfoIterator; }; #endif diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index c24df96..7ab20b4 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -17,32 +17,32 @@ #include "domlistviewitem.h" -#include <qpainter.h> -#include <qlistview.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqlistview.h> +#include <tqapplication.h> #include <kglobalsettings.h> -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListView *parent ) - : QListViewItem( parent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListView *parent, QListViewItem *after) - : QListViewItem( parent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListViewItem *parent ) - : QListViewItem( parent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListViewItem *parent, QListViewItem *after) - : QListViewItem( parent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } @@ -54,20 +54,20 @@ DOMListViewItem::~DOMListViewItem() void DOMListViewItem::init() { - m_color = QApplication::palette().color( QPalette::Active, QColorGroup::Text ); + m_color = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Text ); m_font = KGlobalSettings::generalFont(); clos = false; } -void DOMListViewItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment ) +void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { - QColorGroup _cg( cg ); - QColor c = _cg.text(); + TQColorGroup _cg( cg ); + TQColor c = _cg.text(); p->setFont(m_font); - _cg.setColor( QColorGroup::Text, m_color ); - QListViewItem::paintCell( p, _cg, column, width, alignment ); - _cg.setColor( QColorGroup::Text, c ); + _cg.setColor( TQColorGroup::Text, m_color ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); + _cg.setColor( TQColorGroup::Text, c ); } diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h index 22f34b2..9a85fbf 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.h +++ b/konq-plugins/domtreeviewer/domlistviewitem.h @@ -18,26 +18,26 @@ #include <dom/dom_node.h> -#include <qlistview.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqlistview.h> +#include <tqcolor.h> +#include <tqfont.h> class DOMListViewItem : public QListViewItem { public: - DOMListViewItem( const DOM::Node &, QListView *parent ); - DOMListViewItem( const DOM::Node &, QListView *parent, QListViewItem *after ); - DOMListViewItem( const DOM::Node &, QListViewItem *parent ); - DOMListViewItem( const DOM::Node &, QListViewItem *parent, QListViewItem *after ); + 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 ); virtual ~DOMListViewItem(); - virtual void paintCell( QPainter *p, const QColorGroup &cg, + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); - void setColor( const QColor &color) { m_color = color; } + void setColor( const TQColor &color) { m_color = color; } - void setFont( const QFont &font) { m_font = font;} + void setFont( const TQFont &font) { m_font = font;} void setItalic( bool b) {m_font.setItalic(b);} void setBold( bool b) {m_font.setBold(b);} void setUnderline(bool b) {m_font.setUnderline(b);} @@ -49,8 +49,8 @@ class DOMListViewItem : public QListViewItem private: void init(); - QColor m_color; - QFont m_font; + TQColor m_color; + TQFont m_font; DOM::Node m_node; bool clos; }; diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index 1f91cf1..0bbb918 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -25,7 +25,7 @@ #include <klocale.h> -#include <qmap.h> +#include <tqmap.h> using namespace domtreeviewer; @@ -50,7 +50,7 @@ static const char * const dom_error_msgs[] = { // == global functions ============================================== -QString domtreeviewer::domErrorMessage(int dom_err) +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); @@ -87,7 +87,7 @@ inline static bool operator <(const DOM::Node &n1, const DOM::Node &n2) return (long)n1.handle() - (long)n2.handle() < 0; } -class ChangedNodeSet : public QMap<DOM::Node, bool> +class ChangedNodeSet : public TQMap<DOM::Node, bool> { }; @@ -104,15 +104,15 @@ ManipulationCommand::~ManipulationCommand() { } -void ManipulationCommand::connect(const char *signal, QObject *recv, const char *slot) +void ManipulationCommand::connect(const char *signal, TQObject *recv, const char *slot) { - QObject::connect(mcse(), signal, recv, slot); + TQObject::connect(mcse(), signal, recv, slot); } void ManipulationCommand::handleException(DOM::DOMException &ex) { _exception = ex; - QString msg = name() + ": " + domErrorMessage(ex.code); + TQString msg = name() + ": " + domErrorMessage(ex.code); emit mcse()->error(ex.code, msg); } @@ -178,7 +178,7 @@ void ManipulationCommand::reapply() // == MultiCommand =========================================== -MultiCommand::MultiCommand(const QString &desc) +MultiCommand::MultiCommand(const TQString &desc) : _name(desc) { cmds.setAutoDelete(true); @@ -197,7 +197,7 @@ void MultiCommand::addCommand(ManipulationCommand *cmd) void MultiCommand::apply() { // apply in forward order - for (QPtrListIterator<ManipulationCommand> it = cmds; *it; ++it) { + for (TQPtrListIterator<ManipulationCommand> it = cmds; *it; ++it) { try { if (shouldReapply()) (*it)->reapply(); else (*it)->apply(); @@ -223,7 +223,7 @@ void MultiCommand::apply() void MultiCommand::unapply() { // unapply in reverse order - QPtrListIterator<ManipulationCommand> it = cmds; + TQPtrListIterator<ManipulationCommand> it = cmds; for (it.toLast(); *it; --it) { try { (*it)->unapply(); @@ -258,14 +258,14 @@ void MultiCommand::mergeChangedNodesFrom(ManipulationCommand *cmd) cmd->changedNodes->clear(); } -QString MultiCommand::name() const +TQString MultiCommand::name() const { return _name; } // == AddAttributeCommand =========================================== -AddAttributeCommand::AddAttributeCommand(const DOM::Element &element, const QString &attrName, const QString &attrValue) +AddAttributeCommand::AddAttributeCommand(const DOM::Element &element, const TQString &attrName, const TQString &attrValue) : _element(element), attrName(attrName), attrValue(attrValue) { if (attrValue.isEmpty()) this->attrValue = "<dummy>"; @@ -287,7 +287,7 @@ void AddAttributeCommand::unapply() addChangedNode(_element); } -QString AddAttributeCommand::name() const +TQString AddAttributeCommand::name() const { return i18n("Add attribute"); } @@ -295,7 +295,7 @@ QString AddAttributeCommand::name() const // == ChangeAttributeValueCommand ==================================== ChangeAttributeValueCommand::ChangeAttributeValueCommand( -const DOM::Element &element, const QString &attr, const QString &value) +const DOM::Element &element, const TQString &attr, const TQString &value) : _element(element), _attr(attr), new_value(value) { } @@ -317,14 +317,14 @@ void ChangeAttributeValueCommand::unapply() addChangedNode(_element); } -QString ChangeAttributeValueCommand::name() const +TQString ChangeAttributeValueCommand::name() const { return i18n("Change attribute value"); } // == RemoveAttributeCommand ======================================== -RemoveAttributeCommand::RemoveAttributeCommand(const DOM::Element &element, const QString &attrName) +RemoveAttributeCommand::RemoveAttributeCommand(const DOM::Element &element, const TQString &attrName) : _element(element), attrName(attrName) { } @@ -348,14 +348,14 @@ void RemoveAttributeCommand::unapply() addChangedNode(_element); } -QString RemoveAttributeCommand::name() const +TQString RemoveAttributeCommand::name() const { return i18n("Remove attribute"); } // == RenameAttributeCommand ======================================== -RenameAttributeCommand::RenameAttributeCommand(const DOM::Element &element, const QString &attrOldName, const QString &attrNewName) +RenameAttributeCommand::RenameAttributeCommand(const DOM::Element &element, const TQString &attrOldName, const TQString &attrNewName) : _element(element), attrOldName(attrOldName), attrNewName(attrNewName) { } @@ -380,14 +380,14 @@ void RenameAttributeCommand::unapply() addChangedNode(_element); } -QString RenameAttributeCommand::name() const +TQString RenameAttributeCommand::name() const { return i18n("Rename attribute"); } // == ChangeCDataCommand ======================================== -ChangeCDataCommand::ChangeCDataCommand(const DOM::CharacterData &cdata, const QString &value) +ChangeCDataCommand::ChangeCDataCommand(const DOM::CharacterData &cdata, const TQString &value) : cdata(cdata), value(value), has_newlines(false) { } @@ -401,8 +401,8 @@ void ChangeCDataCommand::apply() if (!shouldReapply()) { oldValue = cdata.data(); has_newlines = - QConstString(value.unicode(), value.length()).string().contains('\n') - || QConstString(oldValue.unicode(), oldValue.length()).string().contains('\n'); + TQConstString(value.unicode(), value.length()).string().contains('\n') + || TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n'); } cdata.setData(value); addChangedNode(cdata); @@ -416,7 +416,7 @@ void ChangeCDataCommand::unapply() struc_changed = has_newlines; } -QString ChangeCDataCommand::name() const +TQString ChangeCDataCommand::name() const { return i18n("Change textual content"); } @@ -478,7 +478,7 @@ void InsertNodeCommand::unapply() struc_changed = true; } -QString InsertNodeCommand::name() const +TQString InsertNodeCommand::name() const { return i18n("Insert node"); } @@ -506,7 +506,7 @@ void RemoveNodeCommand::unapply() struc_changed = true; } -QString RemoveNodeCommand::name() const +TQString RemoveNodeCommand::name() const { return i18n("Remove node"); } @@ -552,7 +552,7 @@ void MoveNodeCommand::unapply() struc_changed = true; } -QString MoveNodeCommand::name() const +TQString MoveNodeCommand::name() const { return i18n("Move node"); } diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h index bf893dc..f068426 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.h +++ b/konq-plugins/domtreeviewer/domtreecommands.h @@ -32,8 +32,8 @@ #include <kcommand.h> -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> class DOMTreeView; class KPrinter; @@ -45,7 +45,7 @@ class ManipulationCommandSignalEmitter; class ChangedNodeSet; /** returns a localized string for the given dom exception code */ -QString domErrorMessage(int exception_code); +TQString domErrorMessage(int exception_code); /** * Internal class for emitting signals. @@ -71,7 +71,7 @@ signals: * @param err_id DOM error id * @param msg error message */ - void error(int err_id, const QString &msg); + void error(int err_id, const TQString &msg); private: // make moc not complain friend class ManipulationCommand; @@ -97,7 +97,7 @@ public: bool allowSignals() const { return allow_signals; } /** connects the given signal to a slot */ - static void connect(const char *signal, QObject *recv, const char *slot); + static void connect(const char *signal, TQObject *recv, const char *slot); /** does grunt work and calls apply()/reapply() */ virtual void execute(); @@ -136,13 +136,13 @@ private: class MultiCommand : public ManipulationCommand { public: - MultiCommand(const QString &name); + MultiCommand(const TQString &name); virtual ~MultiCommand(); /** Adds a new command. Will take ownership of \c cmd */ void addCommand(ManipulationCommand *cmd); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -151,8 +151,8 @@ protected: void mergeChangedNodesFrom(ManipulationCommand *cmd); protected: - QPtrList<ManipulationCommand> cmds; - QString _name; + TQPtrList<ManipulationCommand> cmds; + TQString _name; }; /** @@ -162,10 +162,10 @@ protected: class AddAttributeCommand : public ManipulationCommand { public: - AddAttributeCommand(const DOM::Element &element, const QString &attrName, const QString &attrValue); + AddAttributeCommand(const DOM::Element &element, const TQString &attrName, const TQString &attrValue); virtual ~AddAttributeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -184,10 +184,10 @@ protected: class ChangeAttributeValueCommand : public ManipulationCommand { public: - ChangeAttributeValueCommand(const DOM::Element &element, const QString &attr, const QString &value); + ChangeAttributeValueCommand(const DOM::Element &element, const TQString &attr, const TQString &value); virtual ~ChangeAttributeValueCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -207,10 +207,10 @@ protected: class RemoveAttributeCommand : public ManipulationCommand { public: - RemoveAttributeCommand(const DOM::Element &element, const QString &attrName); + RemoveAttributeCommand(const DOM::Element &element, const TQString &attrName); virtual ~RemoveAttributeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -229,10 +229,10 @@ protected: class RenameAttributeCommand : public ManipulationCommand { public: - RenameAttributeCommand(const DOM::Element &element, const QString &attrOldName, const QString &attrNewName); + RenameAttributeCommand(const DOM::Element &element, const TQString &attrOldName, const TQString &attrNewName); virtual ~RenameAttributeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -252,10 +252,10 @@ protected: class ChangeCDataCommand : public ManipulationCommand { public: - ChangeCDataCommand(const DOM::CharacterData &, const QString &value); + ChangeCDataCommand(const DOM::CharacterData &, const TQString &value); virtual ~ChangeCDataCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -309,7 +309,7 @@ public: InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~InsertNodeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -335,7 +335,7 @@ public: RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~RemoveNodeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -358,7 +358,7 @@ public: MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~MoveNodeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 167d85a..d26dbfc 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -30,17 +30,17 @@ #include <assert.h> -#include <qapplication.h> -#include <qcheckbox.h> -#include <qevent.h> -#include <qfont.h> -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpopupmenu.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qwidgetstack.h> +#include <tqapplication.h> +#include <tqcheckbox.h> +#include <tqevent.h> +#include <tqfont.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpopupmenu.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqwidgetstack.h> #include <dom/dom_core.h> #include <dom/html_base.h> @@ -64,45 +64,45 @@ using namespace domtreeviewer; -DOMTreeView::DOMTreeView(QWidget *parent, const char* name, bool /*allowSaving*/) +DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/) : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0), m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true), m_findDialog(0), focused_child(0) { part = 0; - const QFont font(KGlobalSettings::generalFont()); + const TQFont font(KGlobalSettings::generalFont()); m_listView->setFont( font ); m_listView->setSorting(-1); m_rootListView = m_listView; m_pureCheckBox->setChecked(m_bPure); - connect(m_pureCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotPureToggled(bool))); + connect(m_pureCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPureToggled(bool))); m_showAttributesCheckBox->setChecked(m_bShowAttributes); - connect(m_showAttributesCheckBox, SIGNAL(toggled(bool)), this, - SLOT(slotShowAttributesToggled(bool))); + connect(m_showAttributesCheckBox, TQT_SIGNAL(toggled(bool)), this, + TQT_SLOT(slotShowAttributesToggled(bool))); m_highlightHTMLCheckBox->setChecked(m_bHighlightHTML); - connect(m_highlightHTMLCheckBox, SIGNAL(toggled(bool)), this, - SLOT(slotHighlightHTMLToggled(bool))); + connect(m_highlightHTMLCheckBox, TQT_SIGNAL(toggled(bool)), this, + TQT_SLOT(slotHighlightHTMLToggled(bool))); - connect(m_listView, SIGNAL(clicked(QListViewItem *)), this, - SLOT(slotItemClicked(QListViewItem *))); - connect(m_listView, SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)), - SLOT(showDOMTreeContextMenu(QListViewItem *, const QPoint &, int))); - connect(m_listView, SIGNAL(moved(QPtrList<QListViewItem> &, QPtrList<QListViewItem> &, QPtrList<QListViewItem> &)), - SLOT(slotMovedItems(QPtrList<QListViewItem> &, QPtrList<QListViewItem> &, QPtrList<QListViewItem> &))); + connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), this, + TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(m_listView, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQT_SLOT(showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(m_listView, TQT_SIGNAL(moved(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)), + TQT_SLOT(slotMovedItems(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &))); // set up message line messageLinePane->hide(); - connect(messageHideBtn, SIGNAL(clicked()), SLOT(hideMessageLine())); - connect(messageListBtn, SIGNAL(clicked()), mainWindow(), SLOT(showMessageLog())); + connect(messageHideBtn, TQT_SIGNAL(clicked()), TQT_SLOT(hideMessageLine())); + connect(messageListBtn, TQT_SIGNAL(clicked()), mainWindow(), TQT_SLOT(showMessageLog())); installEventFilter(m_listView); - ManipulationCommand::connect(SIGNAL(nodeChanged(const DOM::Node &)), this, SLOT(slotRefreshNode(const DOM::Node &))); - ManipulationCommand::connect(SIGNAL(structureChanged()), this, SLOT(refresh())); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh())); initDOMNodeInfo(); @@ -126,7 +126,7 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part) parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") ); - QTimer::singleShot(0, this, SLOT(slotSetHtmlPartDelayed())); + TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed())); } DOMTreeWindow *DOMTreeView::mainWindow() const @@ -134,10 +134,10 @@ DOMTreeWindow *DOMTreeView::mainWindow() const return static_cast<DOMTreeWindow *>(parentWidget()); } -bool DOMTreeView::eventFilter(QObject *o, QEvent *e) +bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::AccelOverride) { - QKeyEvent *ke = static_cast<QKeyEvent *>(e); + if (e->type() == TQEvent::AccelOverride) { + TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); kdDebug(90180) << " acceloverride " << ke->key() << " o " << o->name() << endl; if (o == m_listView) { // DOM tree @@ -152,14 +152,14 @@ bool DOMTreeView::eventFilter(QObject *o, QEvent *e) } - } else if (e->type() == QEvent::FocusIn) { + } else if (e->type() == TQEvent::FocusIn) { kdDebug(90180) << " focusin o " << o->name() << endl; if (o != this) { focused_child = o; } - } else if (e->type() == QEvent::FocusOut) { + } else if (e->type() == TQEvent::FocusOut) { kdDebug(90180) << " focusout o " << o->name() << endl; if (o != this) { @@ -180,7 +180,7 @@ void DOMTreeView::activateNode(const DOM::Node &node) void DOMTreeView::slotShowNode(const DOM::Node &pNode) { - if (QListViewItem *item = m_itemdict[pNode.handle()]) { + if (TQListViewItem *item = m_itemdict[pNode.handle()]) { m_listView->setCurrentItem(item); m_listView->ensureItemVisible(item); } @@ -265,8 +265,8 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item { cur_item->setClosing(isLast); - const QString nodeName(node.nodeName().string()); - QString text; + const TQString nodeName(node.nodeName().string()); + TQString text; const DOM::Element element = node; if (!element.isNull()) { if (!m_bPure) { @@ -281,7 +281,7 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item } if (m_bShowAttributes && !isLast) { - QString attributes; + TQString attributes; DOM::Attr attr; DOM::NamedNodeMap attrs = element.attributes(); unsigned long lmap = attrs.length(); @@ -307,10 +307,10 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item text = "`" + node.nodeValue().string() + "'"; // Hacks to deal with PRE - QTextStream ts( text, IO_ReadOnly ); + TQTextStream ts( text, IO_ReadOnly ); while (!ts.eof()) { - const QString txt(ts.readLine()); - const QFont font(KGlobalSettings::fixedFont()); + const TQString txt(ts.readLine()); + const TQFont font(KGlobalSettings::fixedFont()); cur_item->setFont( font ); cur_item->setText(0, txt); @@ -337,14 +337,14 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item } } -void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const QString &nodeName) +void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeName) { /* This is slow. I could make it O(1) be using the tokenizer of khtml but I don't * think it's worth it. */ - QColor namedColor(palette().active().text()); - QString tagName = nodeName.upper(); + TQColor namedColor(palette().active().text()); + TQString tagName = nodeName.upper(); if ( tagName == "HTML" ) { namedColor = "#0000ff"; cur_item->setBold(true); @@ -421,7 +421,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const QString &nodeNa cur_item->setColor(namedColor); } -void DOMTreeView::slotItemClicked(QListViewItem *cur_item) +void DOMTreeView::slotItemClicked(TQListViewItem *cur_item) { DOMListViewItem *cur = static_cast<DOMListViewItem *>(cur_item); if (!cur) return; @@ -436,7 +436,7 @@ void DOMTreeView::slotFindClicked() { if (m_findDialog == 0) { m_findDialog = new KEdFind(this); - connect(m_findDialog, SIGNAL(search()), this, SLOT(slotSearch())); + connect(m_findDialog, TQT_SIGNAL(search()), this, TQT_SLOT(slotSearch())); } m_findDialog->show(); } @@ -459,20 +459,20 @@ void DOMTreeView::slotPrepareMove() current_node = item->node(); } -void DOMTreeView::slotMovedItems(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &/*afterFirst*/, QPtrList<QListViewItem> &afterNow) +void DOMTreeView::slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &/*afterFirst*/, TQPtrList<TQListViewItem> &afterNow) { MultiCommand *cmd = new MultiCommand(i18n("Move Nodes")); _refreshed = false; - QPtrList<QListViewItem>::Iterator it = items.begin(); - QPtrList<QListViewItem>::Iterator anit = afterNow.begin(); + TQPtrList<TQListViewItem>::Iterator it = items.begin(); + TQPtrList<TQListViewItem>::Iterator anit = afterNow.begin(); 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()); -// kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : QString()) << "=" << (anitem ? anitem->node().nodeValue().string() : QString()) << endl; +// 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()) @@ -490,7 +490,7 @@ void DOMTreeView::slotMovedItems(QPtrList<QListViewItem> &items, QPtrList<QListV void DOMTreeView::slotSearch() { assert(m_findDialog); - const QString& searchText = m_findDialog->getText(); + const TQString& searchText = m_findDialog->getText(); bool caseSensitive = m_findDialog->case_sensitive(); searchRecursive(static_cast<DOMListViewItem*>(m_rootListView->firstChild()), @@ -499,10 +499,10 @@ void DOMTreeView::slotSearch() m_findDialog->hide(); } -void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const QString& searchText, +void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const TQString& searchText, bool caseSensitive) { - const QString text(cur_item->text(0)); + const TQString text(cur_item->text(0)); if (text.contains(searchText, caseSensitive) > 0) { cur_item->setUnderline(true); cur_item->setItalic(true); @@ -526,11 +526,11 @@ void DOMTreeView::slotSaveClicked() KURL url = KFileDialog::getSaveFileName( part->url().url(), "*.html", this, i18n("Save DOM Tree as HTML") ); if (!(url.isEmpty()) && url.isValid()) { - QFile file(url.path()); + TQFile file(url.path()); if (file.exists()) { - const QString title = i18n( "File Exists" ); - const QString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url()); + const TQString title = i18n( "File Exists" ); + const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url()); if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) { return; } @@ -538,19 +538,19 @@ void DOMTreeView::slotSaveClicked() if (file.open(IO_WriteOnly) ) { kdDebug(90180) << "Opened File: " << url.url() << endl; - m_textStream = new QTextStream(&file); //(stdOut) + m_textStream = new TQTextStream(&file); //(stdOut) saveTreeAsHTML(part->document()); file.close(); kdDebug(90180) << "File closed " << endl; delete m_textStream; } else { - const QString title = i18n( "Unable to Open File" ); - const QString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path()); + const TQString title = i18n( "Unable to Open File" ); + const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path()); KMessageBox::sorry( this, text, title ); } } else { - const QString title = i18n( "Invalid URL" ); - const QString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url()); + const TQString title = i18n( "Invalid URL" ); + const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url()); KMessageBox::sorry( this, text, title ); } } @@ -571,9 +571,9 @@ void DOMTreeView::saveTreeAsHTML(const DOM::Node &pNode) void DOMTreeView::saveRecursive(const DOM::Node &pNode, int indent) { - const QString nodeName(pNode.nodeName().string()); - QString text; - QString strIndent; + const TQString nodeName(pNode.nodeName().string()); + TQString text; + TQString strIndent; strIndent.fill(' ', indent); const DOM::Element element = static_cast<const DOM::Element>(pNode); @@ -588,7 +588,7 @@ void DOMTreeView::saveRecursive(const DOM::Node &pNode, int indent) } else { text += "<" + nodeName; - QString attributes; + TQString attributes; DOM::Attr attr; const DOM::NamedNodeMap attrs = element.attributes(); unsigned long lmap = attrs.length(); @@ -652,7 +652,7 @@ void DOMTreeView::refresh() m_listView->setUpdatesEnabled(false); slotShowTree(part->document()); - QTimer::singleShot(0, this, SLOT(slotRestoreScrollOffset())); + TQTimer::singleShot(0, this, TQT_SLOT(slotRestoreScrollOffset())); _refreshed = true; } @@ -664,7 +664,7 @@ void DOMTreeView::increaseExpansionDepth() adjustDepth(); updateIncrDecreaseButton(); } else { - QApplication::beep(); + TQApplication::beep(); } } @@ -676,7 +676,7 @@ void DOMTreeView::decreaseExpansionDepth() adjustDepth(); updateIncrDecreaseButton(); } else { - QApplication::beep(); + TQApplication::beep(); } } @@ -695,7 +695,7 @@ void DOMTreeView::adjustDepth() } -void DOMTreeView::adjustDepthRecursively(QListViewItem *cur_item, uint currDepth) +void DOMTreeView::adjustDepthRecursively(TQListViewItem *cur_item, uint currDepth) { if (!(cur_item == 0)) { while( cur_item ) { @@ -706,7 +706,7 @@ void DOMTreeView::adjustDepthRecursively(QListViewItem *cur_item, uint currDept } } -void DOMTreeView::setMessage(const QString &msg) +void DOMTreeView::setMessage(const TQString &msg) { messageLine->setText(msg); messageLinePane->show(); @@ -733,9 +733,9 @@ void DOMTreeView::moveToParent() activateNode(cur); } -void DOMTreeView::showDOMTreeContextMenu(QListViewItem */*lvi*/, const QPoint &pos, int /*col*/) +void DOMTreeView::showDOMTreeContextMenu(TQListViewItem */*lvi*/, const TQPoint &pos, int /*col*/) { - QPopupMenu *ctx = mainWindow()->domTreeViewContextMenu(); + TQPopupMenu *ctx = mainWindow()->domTreeViewContextMenu(); Q_ASSERT(ctx); ctx->popup(pos); } @@ -764,7 +764,7 @@ void DOMTreeView::deleteNodes() DOM::Node last; MultiCommand *cmd = new MultiCommand(i18n("Delete Nodes")); - QListViewItemIterator it(m_listView, QListViewItemIterator::Selected); + TQListViewItemIterator it(m_listView, TQListViewItemIterator::Selected); for (; *it; ++it) { DOMListViewItem *item = static_cast<DOMListViewItem *>(*it); // kdDebug(90180) << " item->node " << item->node().nodeName().string() << " clos " << item->isClosing() << endl; @@ -775,7 +775,7 @@ void DOMTreeView::deleteNodes() // check for selected parent bool has_selected_parent = false; - for (QListViewItem *p = item->parent(); p; p = p->parent()) { + for (TQListViewItem *p = item->parent(); p; p = p->parent()) { if (p->isSelected()) { has_selected_parent = true; break; } } if (has_selected_parent) continue; @@ -805,9 +805,9 @@ void DOMTreeView::disconnectFromTornDownPart() void DOMTreeView::connectToPart() { if (part) { - connect(part, SIGNAL(nodeActivated(const DOM::Node &)), this, - SLOT(activateNode(const DOM::Node &))); - connect(part, SIGNAL(completed()), this, SLOT(refresh())); + connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, + TQT_SLOT(activateNode(const DOM::Node &))); + connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(refresh())); // insert a style rule to indicate activated nodes try { @@ -865,18 +865,18 @@ void DOMTreeView::slotAddElementDlg() DOMListViewItem *item = static_cast<DOMListViewItem *>(m_listView->currentItem()); if (!item) return; - QString qname; - QString namespc; + TQString qname; + TQString namespc; SignalReceiver addBefore; { ElementEditDialog dlg(this, "ElementEditDialog", true); - connect(dlg.insBeforeBtn, SIGNAL(clicked()), &addBefore, SLOT(slot())); + connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); // ### activate when namespaces are supported dlg.elemNamespace->setEnabled(false); - if (dlg.exec() != QDialog::Accepted) return; + if (dlg.exec() != TQDialog::Accepted) return; qname = dlg.elemName->text(); namespc = dlg.elemNamespace->currentText(); @@ -906,14 +906,14 @@ void DOMTreeView::slotAddTextDlg() DOMListViewItem *item = static_cast<DOMListViewItem *>(m_listView->currentItem()); if (!item) return; - QString text; + TQString text; SignalReceiver addBefore; { TextEditDialog dlg(this, "TextEditDialog", true); - connect(dlg.insBeforeBtn, SIGNAL(clicked()), &addBefore, SLOT(slot())); + connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); - if (dlg.exec() != QDialog::Accepted) return; + if (dlg.exec() != TQDialog::Accepted) return; text = dlg.textPane->text(); } @@ -938,25 +938,25 @@ void DOMTreeView::slotAddTextDlg() // == DOM Node info panel ============================================= -static QString *clickToAdd; +static TQString *clickToAdd; /** * List view item for attribute list. */ class AttributeListItem : public QListViewItem { - typedef QListViewItem super; + typedef TQListViewItem super; bool _new; public: - AttributeListItem(QListView *parent, QListViewItem *prev) + AttributeListItem(TQListView *parent, TQListViewItem *prev) : super(parent, prev), _new(true) { } - AttributeListItem(const QString &attrName, const QString &attrValue, - QListView *parent, QListViewItem *prev) + AttributeListItem(const TQString &attrName, const TQString &attrValue, + TQListView *parent, TQListViewItem *prev) : super(parent, prev), _new(false) { setText(0, attrName); @@ -966,33 +966,33 @@ public: bool isNew() const { return _new; } void setNew(bool s) { _new = s; } - virtual int compare(QListViewItem *item, int column, bool ascend) const + virtual int compare(TQListViewItem *item, int column, bool ascend) const { return _new ? 1 : super::compare(item, column, ascend); } protected: - virtual void paintCell( QPainter *p, const QColorGroup &cg, + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { bool updates_enabled = listView()->isUpdatesEnabled(); listView()->setUpdatesEnabled(false); - QColor c = cg.text(); + TQColor c = cg.text(); bool text_changed = false; - QString oldText; + TQString oldText; if (_new) { - c = QApplication::palette().color( QPalette::Disabled, QColorGroup::Text ); + c = TQApplication::palette().color( TQPalette::Disabled, TQColorGroup::Text ); - if (!clickToAdd) clickToAdd = new QString(i18n("<Click to add>")); + if (!clickToAdd) clickToAdd = new TQString(i18n("<Click to add>")); oldText = text(column); text_changed = true; - if (column == 0) setText(0, *clickToAdd); else setText(1, QString()); + if (column == 0) setText(0, *clickToAdd); else setText(1, TQString()); } - QColorGroup _cg( cg ); - _cg.setColor( QColorGroup::Text, c ); + TQColorGroup _cg( cg ); + _cg.setColor( TQColorGroup::Text, c ); super::paintCell( p, _cg, column, width, alignment ); if (text_changed) setText(column, oldText); @@ -1003,19 +1003,19 @@ protected: void DOMTreeView::initDOMNodeInfo() { - connect(m_listView, SIGNAL(clicked(QListViewItem *)), - SLOT(initializeOptionsFromListItem(QListViewItem *))); + connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), + TQT_SLOT(initializeOptionsFromListItem(TQListViewItem *))); - connect(nodeAttributes, SIGNAL(itemRenamed(QListViewItem *, const QString &, int)), - SLOT(slotItemRenamed(QListViewItem *, const QString &, int))); - connect(nodeAttributes, SIGNAL(executed(QListViewItem *, const QPoint &, int)), - SLOT(slotEditAttribute(QListViewItem *, const QPoint &, int))); - connect(nodeAttributes, SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)), - SLOT(showInfoPanelContextMenu(QListViewItem *, const QPoint &, int))); + connect(nodeAttributes, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), + TQT_SLOT(slotItemRenamed(TQListViewItem *, const TQString &, int))); + connect(nodeAttributes, TQT_SIGNAL(executed(TQListViewItem *, const TQPoint &, int)), + TQT_SLOT(slotEditAttribute(TQListViewItem *, const TQPoint &, int))); + connect(nodeAttributes, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQT_SLOT(showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int))); - connect(applyContent, SIGNAL(clicked()), SLOT(slotApplyContent())); + connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent())); - ManipulationCommand::connect(SIGNAL(nodeChanged(const DOM::Node &)), this, SLOT(initializeOptionsFromNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); nodeAttributes->setRenameable(0, true); nodeAttributes->setRenameable(1, true); @@ -1040,7 +1040,7 @@ void DOMTreeView::initializeOptionsFromNode(const DOM::Node &node) } nodeName->setText(node.nodeName().string()); - nodeType->setText(QString::number(node.nodeType())); + nodeType->setText(TQString::number(node.nodeType())); nodeNamespace->setText(node.namespaceURI().string()); // nodeValue->setText(node.value().string()); @@ -1060,7 +1060,7 @@ void DOMTreeView::initializeOptionsFromNode(const DOM::Node &node) nodeInfoStack->raiseWidget(EmptyPanel); } -void DOMTreeView::initializeOptionsFromListItem(QListViewItem *item) +void DOMTreeView::initializeOptionsFromListItem(TQListViewItem *item) { const DOMListViewItem *cur_item = static_cast<const DOMListViewItem *>(item); @@ -1070,7 +1070,7 @@ void DOMTreeView::initializeOptionsFromListItem(QListViewItem *item) void DOMTreeView::initializeOptionsFromElement(const DOM::Element &element) { - QListViewItem *last = 0; + TQListViewItem *last = 0; nodeAttributes->clear(); DOM::NamedNodeMap attrs = element.attributes(); @@ -1078,7 +1078,7 @@ void DOMTreeView::initializeOptionsFromElement(const DOM::Element &element) for (unsigned int j = 0; j < lmap; j++) { DOM::Attr attr = attrs.item(j); // kdDebug(90180) << attr.name().string() << "=" << attr.value().string() << endl; - QListViewItem *item = new AttributeListItem(attr.name().string(), + TQListViewItem *item = new AttributeListItem(attr.name().string(), attr.value().string(), nodeAttributes, last); last = item; } @@ -1099,7 +1099,7 @@ void DOMTreeView::initializeOptionsFromCData(const DOM::CharacterData &cdata) nodeInfoStack->raiseWidget(CDataPanel); } -void DOMTreeView::slotItemRenamed(QListViewItem *lvi, const QString &str, int col) +void DOMTreeView::slotItemRenamed(TQListViewItem *lvi, const TQString &str, int col) { AttributeListItem *item = static_cast<AttributeListItem *>(lvi); @@ -1120,7 +1120,7 @@ void DOMTreeView::slotItemRenamed(QListViewItem *lvi, const QString &str, int co break; } case 1: { - if (item->isNew()) { lvi->setText(1, QString()); break; } + if (item->isNew()) { lvi->setText(1, TQString()); break; } ChangeAttributeValueCommand *cmd = new ChangeAttributeValueCommand( element, item->text(0), str); @@ -1130,12 +1130,12 @@ void DOMTreeView::slotItemRenamed(QListViewItem *lvi, const QString &str, int co } } -void DOMTreeView::slotEditAttribute(QListViewItem *lvi, const QPoint &, int col) +void DOMTreeView::slotEditAttribute(TQListViewItem *lvi, const TQPoint &, int col) { if (!lvi) return; - QString attrName = lvi->text(0); - QString attrValue = lvi->text(1); + TQString attrName = lvi->text(0); + TQString attrValue = lvi->text(1); int res = 0; { @@ -1159,7 +1159,7 @@ void DOMTreeView::slotEditAttribute(QListViewItem *lvi, const QPoint &, int col) // kdDebug(90180) << "name=" << attrName << " value=" << attrValue << endl; - if (res == QDialog::Accepted) do { + if (res == TQDialog::Accepted) do { if (attrName.isEmpty()) break; if (lvi->text(0) != attrName) { @@ -1188,9 +1188,9 @@ void DOMTreeView::slotApplyContent() mainWindow()->executeAndAddCommand(cmd); } -void DOMTreeView::showInfoPanelContextMenu(QListViewItem */*lvi*/, const QPoint &pos, int /*col*/) +void DOMTreeView::showInfoPanelContextMenu(TQListViewItem */*lvi*/, const TQPoint &pos, int /*col*/) { - QPopupMenu *ctx = mainWindow()->infoPanelAttrContextMenu(); + TQPopupMenu *ctx = mainWindow()->infoPanelAttrContextMenu(); Q_ASSERT(ctx); ctx->popup(pos); } @@ -1213,7 +1213,7 @@ void DOMTreeView::pasteAttributes() void DOMTreeView::deleteAttributes() { MultiCommand *cmd = new MultiCommand(i18n("Delete Attributes")); - QListViewItemIterator it(nodeAttributes, QListViewItemIterator::Selected); + TQListViewItemIterator it(nodeAttributes, TQListViewItemIterator::Selected); for (; *it; ++it) { AttributeListItem *item = static_cast<AttributeListItem *>(*it); if (item->isNew()) continue; diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index 0e9977d..80c4c10 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -22,8 +22,8 @@ #ifndef DOMTREEVIEW_H #define DOMTREEVIEW_H -#include <qptrdict.h> -#include <qptrlist.h> +#include <tqptrdict.h> +#include <tqptrlist.h> #include <dom/css_stylesheet.h> #include <dom/css_rule.h> #include <dom/dom_node.h> @@ -49,7 +49,7 @@ class DOMTreeView : public DOMTreeViewBase Q_OBJECT public: - DOMTreeView(QWidget *parent, const char* name, bool allowSaving = true); + DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true); ~DOMTreeView(); KHTMLPart *htmlPart() const { return part; } @@ -62,7 +62,7 @@ class DOMTreeView : public DOMTreeViewBase /* void saveTreeAsHTML(const DOM::Node &pNode); */ - virtual bool eventFilter(QObject *o, QEvent *e); + virtual bool eventFilter(TQObject *o, TQEvent *e); signals: /** emitted when the part has been changed. */ @@ -72,7 +72,7 @@ class DOMTreeView : public DOMTreeViewBase void refresh(); void increaseExpansionDepth(); void decreaseExpansionDepth(); - void setMessage(const QString &msg); + void setMessage(const TQString &msg); void hideMessageLine(); void moveToParent(); @@ -104,9 +104,9 @@ class DOMTreeView : public DOMTreeViewBase protected slots: void slotShowNode(const DOM::Node &pNode); void slotShowTree(const DOM::Node &pNode); - void slotItemClicked(QListViewItem *); + void slotItemClicked(TQListViewItem *); void slotRefreshNode(const DOM::Node &pNode); - void slotMovedItems(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &afterFirst, QPtrList<QListViewItem> &afterNow); + void slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &afterFirst, TQPtrList<TQListViewItem> &afterNow); void slotPrepareMove(); void slotSearch(); @@ -116,13 +116,13 @@ class DOMTreeView : public DOMTreeViewBase void slotShowAttributesToggled(bool); void slotHighlightHTMLToggled(bool); - void showDOMTreeContextMenu(QListViewItem *, const QPoint &, int); + void showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int); void slotSetHtmlPartDelayed(); void slotRestoreScrollOffset(); private: - QPtrDict<DOMListViewItem> m_itemdict; + TQPtrDict<DOMListViewItem> m_itemdict; DOM::Node m_document; uint m_expansionDepth, m_maxDepth; @@ -135,13 +135,13 @@ class DOMTreeView : public DOMTreeViewBase // void saveRecursive(const DOM::Node &node, int ident); void searchRecursive(DOMListViewItem *cur_item, - const QString &searchText, + const TQString &searchText, bool caseSensitive); void adjustDepth(); - void adjustDepthRecursively(QListViewItem *cur_item, uint currDepth); + void adjustDepthRecursively(TQListViewItem *cur_item, uint currDepth); void highlightHTML(DOMListViewItem *cur_item, - const QString &nodeName); + const TQString &nodeName); void addElement(const DOM::Node &node, DOMListViewItem *cur_item, bool isLast); @@ -151,12 +151,12 @@ class DOMTreeView : public DOMTreeViewBase KEdFind* m_findDialog; KHTMLPart *part; - QTextStream* m_textStream; + TQTextStream* m_textStream; const KListView* m_rootListView; KPushButton* m_saveButton; - QObject *focused_child; + TQObject *focused_child; DOM::Node current_node; DOM::CSSStyleSheet stylesheet; DOM::CSSRule active_node_rule; @@ -173,7 +173,7 @@ class DOMTreeView : public DOMTreeViewBase public slots: void initializeOptionsFromNode(const DOM::Node &); - void initializeOptionsFromListItem(QListViewItem *); + void initializeOptionsFromListItem(TQListViewItem *); void copyAttributes(); void cutAttributes(); @@ -187,11 +187,11 @@ class DOMTreeView : public DOMTreeViewBase void initializeOptionsFromCData(const DOM::CharacterData &); private slots: - void slotItemRenamed(QListViewItem *, const QString &str, int col); - void slotEditAttribute(QListViewItem *, const QPoint &, int col); + void slotItemRenamed(TQListViewItem *, const TQString &str, int col); + void slotEditAttribute(TQListViewItem *, const TQPoint &, int col); void slotApplyContent(); - void showInfoPanelContextMenu(QListViewItem *, const QPoint &, int); + void showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int); private: DOM::Node infoNode; // node these infos apply to diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index f8b9ed5..0dd6d7f 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -50,8 +50,8 @@ #include <kaction.h> #include <kstdaction.h> -#include <qdatetime.h> -#include <qtimer.h> +#include <tqdatetime.h> +#include <tqtimer.h> using domtreeviewer::ManipulationCommand; @@ -84,16 +84,16 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) // allow the view to change the statusbar and caption #if 0 - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); #endif - connect(view(), SIGNAL(htmlPartChanged(KHTMLPart *)), - SLOT(slotHtmlPartChanged(KHTMLPart *))); + connect(view(), TQT_SIGNAL(htmlPartChanged(KHTMLPart *)), + TQT_SLOT(slotHtmlPartChanged(KHTMLPart *))); - ManipulationCommand::connect(SIGNAL(error(int, const QString &)), - this, SLOT(addMessage(int, const QString &))); + ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)), + this, TQT_SLOT(addMessage(int, const TQString &))); infopanel_ctx = createInfoPanelAttrContextMenu(); domtree_ctx = createDOMTreeViewContextMenu(); @@ -119,74 +119,74 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd) void DOMTreeWindow::setupActions() { - KStdAction::close(this, SLOT(close()), actionCollection()); + KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - KStdAction::cut(this, SLOT(slotCut()), actionCollection())->setEnabled(false); - KStdAction::copy(this, SLOT(slotCopy()), actionCollection())->setEnabled(false); - KStdAction::paste(this, SLOT(slotPaste()), actionCollection())->setEnabled(false); + 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); m_commandHistory = new KCommandHistory(actionCollection()); - KStdAction::find(this, SLOT(slotFind()), actionCollection()); + KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::redisplay(m_view, SLOT(refresh()), actionCollection()); + KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection()); // toggle manipulation dialog KAction *showMsgDlg = new KAction(i18n("Show Message Log"), CTRL+Key_E, actionCollection(), "show_msg_dlg"); - connect(showMsgDlg, SIGNAL(activated()), SLOT(showMessageLog())); + connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog())); // KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, -// this, SLOT(optionsPreferences()), +// this, TQT_SLOT(optionsPreferences()), // actionCollection(), "custom_action"); // actions for the dom tree list view toolbar - KStdAction::up(view(), SLOT(moveToParent()), actionCollection(), "tree_up"); + KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); KAction *tree_inc_level = new KAction(i18n("Expand"), "1rightarrow", CTRL+Key_Greater, view(), - SLOT(increaseExpansionDepth()), actionCollection(), + 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(), - SLOT(decreaseExpansionDepth()), actionCollection(), + TQT_SLOT(decreaseExpansionDepth()), actionCollection(), "tree_dec_level"); tree_dec_level->setToolTip(i18n("Decrease expansion level")); // actions for the dom tree list view context menu del_tree = new KAction(i18n("&Delete"), "editdelete", - Key_Delete, view(), SLOT(deleteNodes()), + Key_Delete, view(), TQT_SLOT(deleteNodes()), actionCollection(), "tree_delete"); del_tree->setToolTip(i18n("Delete nodes")); /*KAction *new_elem = */new KAction(i18n("New &Element ..."), "bookmark", KShortcut(), view(), - SLOT(slotAddElementDlg()), actionCollection(), + TQT_SLOT(slotAddElementDlg()), actionCollection(), "tree_add_element"); /*KAction *new_text = */new KAction(i18n("New &Text Node ..."), - "text", KShortcut(), view(), SLOT(slotAddTextDlg()), + "text", KShortcut(), 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(), SLOT(deleteAttributes()), + Key_Delete, view(), TQT_SLOT(deleteAttributes()), actionCollection(), "attr_delete"); del_attr->setToolTip(i18n("Delete attributes")); } -QPopupMenu *DOMTreeWindow::createInfoPanelAttrContextMenu() +TQPopupMenu *DOMTreeWindow::createInfoPanelAttrContextMenu() { - QWidget *w = factory()->container("infopanelattr_context", this); + TQWidget *w = factory()->container("infopanelattr_context", this); Q_ASSERT(w); - return static_cast<QPopupMenu *>(w); + return static_cast<TQPopupMenu *>(w); } -QPopupMenu *DOMTreeWindow::createDOMTreeViewContextMenu() +TQPopupMenu *DOMTreeWindow::createDOMTreeViewContextMenu() { - QWidget *w = factory()->container("domtree_context", this); + TQWidget *w = factory()->container("domtree_context", this); Q_ASSERT(w); - return static_cast<QPopupMenu *>(w); + return static_cast<TQPopupMenu *>(w); } void DOMTreeWindow::saveProperties(KConfig *config) @@ -214,20 +214,20 @@ void DOMTreeWindow::readProperties(KConfig *config) // in 'saveProperties' #if 0 - QString url = config->readPathEntry("lastURL"); + TQString url = config->readPathEntry("lastURL"); if (!url.isEmpty()) m_view->openURL(KURL::fromPathOrURL(url)); #endif } -void DOMTreeWindow::dragEnterEvent(QDragEnterEvent *event) +void DOMTreeWindow::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void DOMTreeWindow::dropEvent(QDropEvent *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* @@ -246,14 +246,14 @@ void DOMTreeWindow::dropEvent(QDropEvent *event) } } -void DOMTreeWindow::addMessage(int msg_id, const QString &msg) +void DOMTreeWindow::addMessage(int msg_id, const TQString &msg) { - QDateTime t(QDateTime::currentDateTime()); - QString fullmsg = t.toString(); + TQDateTime t(TQDateTime::currentDateTime()); + TQString fullmsg = t.toString(); fullmsg += ":"; if (msg_id != 0) - fullmsg += " (" + QString::number(msg_id) + ") "; + fullmsg += " (" + TQString::number(msg_id) + ") "; fullmsg += msg; if (msgdlg) msgdlg->addMessage(fullmsg); @@ -292,7 +292,7 @@ void DOMTreeWindow::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(newToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); dlg.exec(); } @@ -316,13 +316,13 @@ void DOMTreeWindow::optionsPreferences() #endif } -void DOMTreeWindow::changeStatusbar(const QString& text) +void DOMTreeWindow::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text); } -void DOMTreeWindow::changeCaption(const QString& text) +void DOMTreeWindow::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); @@ -339,13 +339,13 @@ void DOMTreeWindow::slotHtmlPartChanged(KHTMLPart *p) part_manager = p->manager(); - connect(part_manager, SIGNAL(activePartChanged(KParts::Part *)), - SLOT(slotActivePartChanged(KParts::Part *))); - connect(part_manager, SIGNAL(partRemoved(KParts::Part *)), - SLOT(slotPartRemoved(KParts::Part *))); + connect(part_manager, TQT_SIGNAL(activePartChanged(KParts::Part *)), + TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect(part_manager, TQT_SIGNAL(partRemoved(KParts::Part *)), + TQT_SLOT(slotPartRemoved(KParts::Part *))); // set up browser extension connections - connect(p, SIGNAL(docCreated()), SLOT(slotClosePart())); + connect(p, TQT_SIGNAL(docCreated()), TQT_SLOT(slotClosePart())); } } diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h index f942798..e71a3c7 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.h +++ b/konq-plugins/domtreeviewer/domtreewindow.h @@ -27,7 +27,7 @@ #include <kmainwindow.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> namespace domtreeviewer { class ManipulationCommand; @@ -85,22 +85,22 @@ public: /** * creates and returns the context menu for the list info panel */ - QPopupMenu *createInfoPanelAttrContextMenu(); + TQPopupMenu *createInfoPanelAttrContextMenu(); /** * returns the context menu for the list info panel */ - QPopupMenu *infoPanelAttrContextMenu() { return infopanel_ctx; } + TQPopupMenu *infoPanelAttrContextMenu() { return infopanel_ctx; } /** * creates and returns the context menu for the DOM tree view */ - QPopupMenu *createDOMTreeViewContextMenu(); + TQPopupMenu *createDOMTreeViewContextMenu(); /** * returns the context menu for the DOM tree view */ - QPopupMenu *domTreeViewContextMenu() { return domtree_ctx; } + TQPopupMenu *domTreeViewContextMenu() { return domtree_ctx; } /** * Executes the given command and adds it to the history. @@ -125,7 +125,7 @@ public slots: * @param id message id * @param msg message text */ - void addMessage(int id, const QString &msg); + void addMessage(int id, const TQString &msg); /** * Displays the message log window. @@ -136,8 +136,8 @@ protected: /** * Overridden virtuals for Qt drag 'n drop (XDND) */ - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); protected: /** * This function is called when it is time for the app to save its @@ -164,8 +164,8 @@ private slots: void optionsPreferences(); void newToolbarConfig(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); void slotHtmlPartChanged(KHTMLPart *); void slotActivePartChanged(KParts::Part *); @@ -182,13 +182,13 @@ private: MessageDialog *msgdlg; KCommandHistory *m_commandHistory; - QPopupMenu *infopanel_ctx; - QPopupMenu *domtree_ctx; + TQPopupMenu *infopanel_ctx; + TQPopupMenu *domtree_ctx; KConfig *_config; KAction *del_tree, *del_attr; - QGuardedPtr<KParts::PartManager> part_manager; + TQGuardedPtr<KParts::PartManager> part_manager; }; #endif // domtreewindow_H diff --git a/konq-plugins/domtreeviewer/messagedialog.ui.h b/konq-plugins/domtreeviewer/messagedialog.ui.h index dcb6609..33a2951 100644 --- a/konq-plugins/domtreeviewer/messagedialog.ui.h +++ b/konq-plugins/domtreeviewer/messagedialog.ui.h @@ -12,9 +12,9 @@ #include <kdebug.h> -#include <qdatetime.h> +#include <tqdatetime.h> -void MessageDialog::addMessage( const QString &msg ) +void MessageDialog::addMessage( const TQString &msg ) { messagePane->append(msg); } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index 3555a84..c33f132 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -15,13 +15,13 @@ typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory; K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) ) -PluginDomtreeviewer::PluginDomtreeviewer( QObject* parent, const char* name, - const QStringList & ) +PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ), m_dialog( 0 ) { (void) new KAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, - this, SLOT(slotShowDOMTree()), + this, TQT_SLOT(slotShowDOMTree()), actionCollection(), "viewdomtree" ); } @@ -41,7 +41,7 @@ void PluginDomtreeviewer::slotShowDOMTree() if (KHTMLPart *part = ::qt_cast<KHTMLPart *>(parent())) { m_dialog = new DOMTreeWindow(this); - connect( m_dialog, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); m_dialog->view()->setHtmlPart(part); m_dialog->show(); } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h index ba380a9..c6d7320 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h @@ -13,8 +13,8 @@ class PluginDomtreeviewer : public KParts::Plugin { Q_OBJECT public: - PluginDomtreeviewer( QObject* parent, const char* name, - const QStringList & ); + PluginDomtreeviewer( TQObject* parent, const char* name, + const TQStringList & ); virtual ~PluginDomtreeviewer(); public slots: diff --git a/konq-plugins/domtreeviewer/signalreceiver.cpp b/konq-plugins/domtreeviewer/signalreceiver.cpp index f928036..a0c0b1b 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.cpp +++ b/konq-plugins/domtreeviewer/signalreceiver.cpp @@ -20,8 +20,8 @@ #include "signalreceiver.h" -SignalReceiver::SignalReceiver(QObject *parent, const char *name) -: QObject(parent, name), rcvd(false) +SignalReceiver::SignalReceiver(TQObject *parent, const char *name) +: TQObject(parent, name), rcvd(false) { } diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index 8c0f5d9..cf67495 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -21,7 +21,7 @@ #ifndef SIGNALCATCHER_H #define SIGNALCATCHER_H -#include <qobject.h> +#include <tqobject.h> /** * \brief Class for receiving signals. @@ -32,7 +32,7 @@ * Use as follows: * \code * SignalReceiver sr; - * sr.connect(some_obj, SIGNAL(someSignal()), SLOT(slot())); + * sr.connect(some_obj, TQT_SIGNAL(someSignal()), TQT_SLOT(slot())); * <do something with some_obj> ... * if (sr.receivedSignal()) { // yes, signal was received * } @@ -47,7 +47,7 @@ class SignalReceiver : public QObject Q_OBJECT public: - SignalReceiver(QObject *parent = 0, const char *name = 0); + SignalReceiver(TQObject *parent = 0, const char *name = 0); virtual ~SignalReceiver(); /** returns true if any signal has been received */ diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index b0c82d8..931c43f 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -21,9 +21,9 @@ */ -#include <qdir.h> -#include <qpopupmenu.h> -#include <qtimer.h> +#include <tqdir.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> #include <kapplication.h> #include <kconfig.h> @@ -41,9 +41,9 @@ // FSView -QMap<QString, MetricEntry> FSView::_dirMetric; +TQMap<TQString, MetricEntry> FSView::_dirMetric; -FSView::FSView(Inode* base, QWidget* parent, const char* name) +FSView::FSView(Inode* base, TQWidget* parent, const char* name) : TreeMapWidget(base, parent, name) { setFieldType(0, i18n("Name")); @@ -81,25 +81,25 @@ FSView::FSView(Inode* base, QWidget* parent, const char* name) _config = new KConfig("fsviewrc"); // restore TreeMap visualization options of last execution - KConfigGroup tmconfig(_config, QCString("TreeMap")); + KConfigGroup tmconfig(_config, TQCString("TreeMap")); restoreOptions(&tmconfig); - QString str = tmconfig.readEntry("ColorMode"); + TQString str = tmconfig.readEntry("ColorMode"); if (!str.isEmpty()) setColorMode(str); if (_dirMetric.count() == 0) { // restore metric cache - KConfigGroup cconfig(_config, QCString("MetricCache")); + KConfigGroup cconfig(_config, TQCString("MetricCache")); int ccount = cconfig.readNumEntry("Count", 0); int i, f, d; double s; - QString str; + TQString str; for (i=1;i<=ccount;i++) { - str = QString("Dir%1").arg(i); + str = TQString("Dir%1").arg(i); if (!cconfig.hasKey(str)) continue; str = cconfig.readPathEntry(str); - s = cconfig.readDoubleNumEntry(QString("Size%1").arg(i), 0.0); - f = cconfig.readNumEntry(QString("Files%1").arg(i), 0); - d = cconfig.readNumEntry(QString("Dirs%1").arg(i), 0); + s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0); + f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0); + d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0); if (s==0.0 || f==0 || d==0) continue; setDirMetric(str, s, f, d); } @@ -118,7 +118,7 @@ void FSView::stop() _sm.stopScan(); } -void FSView::setPath(QString p) +void FSView::setPath(TQString p) { Inode* b = (Inode*)base(); if (!b) return; @@ -128,7 +128,7 @@ void FSView::setPath(QString p) // stop any previous updating stop(); - QFileInfo fi(p); + TQFileInfo fi(p); _path = fi.absFilePath(); if (!fi.isDir()) { _path = fi.dirPath(true); @@ -139,7 +139,7 @@ void FSView::setPath(QString p) u.setPath(_path); if (!kapp->authorizeURLAction("list", KURL(), u)) { - QString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, u.prettyURL()); + TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, u.prettyURL()); KMessageBox::queuedMessageBox(this, KMessageBox::Sorry, msg); } @@ -147,7 +147,7 @@ void FSView::setPath(QString p) b->setPeer(d); - setCaption(QString("%1 - FSView").arg(_path)); + setCaption(TQString("%1 - FSView").arg(_path)); requestUpdate(b); } @@ -165,10 +165,10 @@ KURL::List FSView::selectedUrls() return urls; } -bool FSView::getDirMetric(const QString& k, +bool FSView::getDirMetric(const TQString& k, double& s, unsigned int& f, unsigned int& d) { - QMap<QString, MetricEntry>::iterator it; + TQMap<TQString, MetricEntry>::iterator it; it = _dirMetric.find(k); if (it == _dirMetric.end()) return false; @@ -183,7 +183,7 @@ bool FSView::getDirMetric(const QString& k, return true; } -void FSView::setDirMetric(const QString& k, +void FSView::setDirMetric(const TQString& k, double s, unsigned int f, unsigned int d) { if (0) kdDebug(90100) << "setDirMetric '" << k << "': size " @@ -203,8 +203,8 @@ void FSView::requestUpdate(Inode* i) i->clear(); if (!_sm.scanRunning()) { - QTimer::singleShot(0, this, SLOT(doUpdate())); - QTimer::singleShot(100, this, SLOT(doRedraw())); + TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); + TQTimer::singleShot(100, this, TQT_SLOT(doRedraw())); /* start new progress chunk */ _progressPhase = 1; @@ -266,14 +266,14 @@ void FSView::selected(TreeMapItem* i) setPath(((Inode*)i)->path()); } -void FSView::contextMenu(TreeMapItem* i, const QPoint& p) +void FSView::contextMenu(TreeMapItem* i, const TQPoint& p) { - QPopupMenu popup; + TQPopupMenu popup; - QPopupMenu* spopup = new QPopupMenu(); - QPopupMenu* dpopup = new QPopupMenu(); - QPopupMenu* apopup = new QPopupMenu(); - QPopupMenu* fpopup = new QPopupMenu(); + TQPopupMenu* spopup = new TQPopupMenu(); + TQPopupMenu* dpopup = new TQPopupMenu(); + TQPopupMenu* apopup = new TQPopupMenu(); + TQPopupMenu* fpopup = new TQPopupMenu(); // choosing from the selection menu will give a selectionChanged() signal addSelectionItems(spopup, 901, i); @@ -297,10 +297,10 @@ void FSView::contextMenu(TreeMapItem* i, const QPoint& p) popup.insertSeparator(); - QPopupMenu* cpopup = new QPopupMenu(); + TQPopupMenu* cpopup = new TQPopupMenu(); addColorItems(cpopup, 1401); popup.insertItem(i18n("Color Mode"), cpopup, 1400); - QPopupMenu* vpopup = new QPopupMenu(); + TQPopupMenu* vpopup = new TQPopupMenu(); addVisualizationItems(vpopup, 1301); popup.insertItem(i18n("Visualization"), vpopup, 1300); @@ -328,13 +328,13 @@ void FSView::contextMenu(TreeMapItem* i, const QPoint& p) void FSView::saveMetric(KConfigGroup* g) { - QMap<QString, MetricEntry>::iterator it; + TQMap<TQString, MetricEntry>::iterator it; int c = 1; for (it=_dirMetric.begin();it!=_dirMetric.end();++it) { - g->writePathEntry(QString("Dir%1").arg(c), it.key()); - g->writeEntry(QString("Size%1").arg(c), (*it).size); - g->writeEntry(QString("Files%1").arg(c), (*it).fileCount); - g->writeEntry(QString("Dirs%1").arg(c), (*it).dirCount); + g->writePathEntry(TQString("Dir%1").arg(c), it.key()); + g->writeEntry(TQString("Size%1").arg(c), (*it).size); + g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount); + g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount); c++; } g->writeEntry("Count", c-1); @@ -348,7 +348,7 @@ void FSView::setColorMode(FSView::ColorMode cm) redraw(); } -bool FSView::setColorMode(QString mode) +bool FSView::setColorMode(TQString mode) { if (mode == "None") setColorMode(None); else if (mode == "Depth") setColorMode(Depth); @@ -361,9 +361,9 @@ bool FSView::setColorMode(QString mode) return true; } -QString FSView::colorModeString() const +TQString FSView::colorModeString() const { - QString mode; + TQString mode; switch(_colorMode) { case None: mode = "None"; break; case Depth: mode = "Depth"; break; @@ -376,13 +376,13 @@ QString FSView::colorModeString() const return mode; } -void FSView::addColorItems(QPopupMenu* popup, int id) +void FSView::addColorItems(TQPopupMenu* popup, int id) { _colorID = id; popup->setCheckable(true); - connect(popup, SIGNAL(activated(int)), - this, SLOT(colorActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(colorActivated(int))); popup->insertItem(i18n("None"), id); popup->insertItem(i18n("Depth"), id+1); @@ -414,14 +414,14 @@ void FSView::colorActivated(int id) void FSView::saveFSOptions() { - KConfigGroup tmconfig(_config, QCString("TreeMap")); + KConfigGroup tmconfig(_config, TQCString("TreeMap")); saveOptions(&tmconfig); tmconfig.writeEntry("ColorMode", colorModeString()); - KConfigGroup gconfig(_config, QCString("General")); + KConfigGroup gconfig(_config, TQCString("General")); gconfig.writeEntry("Path", _path); - KConfigGroup cconfig(_config, QCString("MetricCache")); + KConfigGroup cconfig(_config, TQCString("MetricCache")); saveMetric(&cconfig); } @@ -458,7 +458,7 @@ void FSView::doRedraw() redo = true; if (redo) { - QTimer::singleShot(500, this, SLOT(doRedraw())); + TQTimer::singleShot(500, this, TQT_SLOT(doRedraw())); redrawCounter++; } } @@ -532,7 +532,7 @@ void FSView::doUpdate() } if (_sm.scanRunning()) - QTimer::singleShot(0, this, SLOT(doUpdate())); + TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); else emit completed(_dirsFinished); } diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h index 17d926f..2e12986 100644 --- a/konq-plugins/fsview/fsview.h +++ b/konq-plugins/fsview/fsview.h @@ -23,10 +23,10 @@ #ifndef FSVIEW_H #define FSVIEW_H -#include <qmap.h> -#include <qptrlist.h> -#include <qfileinfo.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqfileinfo.h> +#include <tqstring.h> #include <kmimetype.h> @@ -62,20 +62,20 @@ class FSView : public TreeMapWidget, public ScanListener public: enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime }; - FSView(Inode*, QWidget* parent=0, const char* name=0); + FSView(Inode*, TQWidget* parent=0, const char* name=0); ~FSView(); KConfig* config() { return _config; } - void setPath(QString); - QString path() { return _path; } + void setPath(TQString); + TQString path() { return _path; } int pathDepth() { return _pathDepth; } void setColorMode(FSView::ColorMode cm); FSView::ColorMode colorMode() const { return _colorMode; } // returns true if string was recognized - bool setColorMode(QString); - QString colorModeString() const; + bool setColorMode(TQString); + TQString colorModeString() const; void requestUpdate(Inode*); @@ -85,19 +85,19 @@ public: void stop(); - static bool getDirMetric(const QString&, double&, unsigned int&, unsigned int&); - static void setDirMetric(const QString&, double, unsigned int, unsigned int); + static bool getDirMetric(const TQString&, double&, unsigned int&, unsigned int&); + static void setDirMetric(const TQString&, double, unsigned int, unsigned int); void saveMetric(KConfigGroup*); void saveFSOptions(); // for color mode - void addColorItems(QPopupMenu*, int); + void addColorItems(TQPopupMenu*, int); KURL::List selectedUrls(); public slots: void selected(TreeMapItem*); - void contextMenu(TreeMapItem*, const QPoint &); + void contextMenu(TreeMapItem*, const TQPoint &); void quit(); void doUpdate(); void doRedraw(); @@ -105,7 +105,7 @@ public slots: signals: void started(); - void progress(int percent, int dirs, const QString& lastDir); + void progress(int percent, int dirs, const TQString& lastDir); void completed(int dirs); private: @@ -115,11 +115,11 @@ public slots: // when a contextMenu is shown, we don't allow async. refreshs bool _allowRefresh; // a cache for directory sizes with long lasting updates - static QMap<QString, MetricEntry> _dirMetric; + static TQMap<TQString, MetricEntry> _dirMetric; // current root path int _pathDepth; - QString _path; + TQString _path; // for progress info int _progressPhase; diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 745cb63..02df4c6 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -20,9 +20,9 @@ * The KPart embedding the FSView widget */ -#include <qclipboard.h> -#include <qtimer.h> -#include <qwhatsthis.h> +#include <tqclipboard.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> #include <kinstance.h> #include <kfiledialog.h> @@ -57,8 +57,8 @@ FSJob::FSJob(FSView* v) : KIO::Job(false) { _view = v; - QObject::connect(v, SIGNAL(progress(int,int,const QString&)), - this, SLOT(progressSlot(int,int,const QString&))); + TQObject::connect(v, TQT_SIGNAL(progress(int,int,const TQString&)), + this, TQT_SLOT(progressSlot(int,int,const TQString&))); } void FSJob::kill(bool quietly) @@ -68,7 +68,7 @@ void FSJob::kill(bool quietly) Job::kill(quietly); } -void FSJob::progressSlot(int percent, int dirs, const QString& cDir) +void FSJob::progressSlot(int percent, int dirs, const TQString& cDir) { if (percent<100) { emitPercent(percent, 100); @@ -93,16 +93,16 @@ KAboutData* FSViewPart::createAboutData() return aboutData; } -FSViewPart::FSViewPart(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const QStringList& /* args */) +FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const TQStringList& /* args */) : KParts::ReadOnlyPart(parent, name) { // we need an instance setInstance( FSViewPartFactory::instance() ); _view = new FSView(new Inode(), parentWidget, widgetName); - QWhatsThis::add(_view, i18n("<p>This is the FSView plugin, a graphical " + TQWhatsThis::add(_view, i18n("<p>This is the FSView plugin, a graphical " "browsing mode showing filesystem utilization " "by using a tree map visualization.</p>" "<p>Note that in this mode, automatic updating " @@ -129,40 +129,40 @@ FSViewPart::FSViewPart(QWidget *parentWidget, const char *widgetName, KAction* action; action = new KAction( i18n( "&FSView Manual" ), "fsview", - KShortcut(), this, SLOT(showHelp()), + KShortcut(), this, TQT_SLOT(showHelp()), actionCollection(), "help_fsview" ); action->setToolTip(i18n("Show FSView manual")); action->setWhatsThis(i18n("Opens the help browser with the " "FSView documentation")); - QObject::connect (_visMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowVisMenu())); - QObject::connect (_areaMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowAreaMenu())); - QObject::connect (_depthMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowDepthMenu())); - QObject::connect (_colorMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowColorMenu())); + TQObject::connect (_visMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowVisMenu())); + TQObject::connect (_areaMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowAreaMenu())); + TQObject::connect (_depthMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowDepthMenu())); + TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowColorMenu())); slotSettingsChanged(KApplication::SETTINGS_MOUSE); if (kapp) - connect( kapp, SIGNAL( settingsChanged(int) ), - SLOT( slotSettingsChanged(int) ) ); - - QObject::connect(_view,SIGNAL(returnPressed(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); - QObject::connect(_view,SIGNAL(selectionChanged()), - _ext,SLOT(updateActions())); - QObject::connect(_view, - SIGNAL(contextMenuRequested(TreeMapItem*,const QPoint&)), + connect( kapp, TQT_SIGNAL( settingsChanged(int) ), + TQT_SLOT( slotSettingsChanged(int) ) ); + + TQObject::connect(_view,TQT_SIGNAL(returnPressed(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQT_SIGNAL(selectionChanged()), + _ext,TQT_SLOT(updateActions())); + TQObject::connect(_view, + TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), _ext, - SLOT(contextMenu(TreeMapItem*, const QPoint&))); + TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); - QObject::connect(_view, SIGNAL(started()), this, SLOT(startedSlot())); - QObject::connect(_view, SIGNAL(completed(int)), - this, SLOT(completedSlot(int))); + TQObject::connect(_view, TQT_SIGNAL(started()), this, TQT_SLOT(startedSlot())); + TQObject::connect(_view, TQT_SIGNAL(completed(int)), + this, TQT_SLOT(completedSlot(int))); - QTimer::singleShot(1, this, SLOT(showInfo())); + TQTimer::singleShot(1, this, TQT_SLOT(showInfo())); setXMLFile( "fsview_part.rc" ); } @@ -180,34 +180,34 @@ void FSViewPart::slotSettingsChanged(int category) { if (category != KApplication::SETTINGS_MOUSE) return; - QObject::disconnect(_view,SIGNAL(clicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); - QObject::disconnect(_view,SIGNAL(doubleClicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); if (KGlobalSettings::singleClick()) - QObject::connect(_view,SIGNAL(clicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); else - QObject::connect(_view,SIGNAL(doubleClicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); } void FSViewPart::showInfo() { - QString info; + TQString info; info = i18n("FSView intentionally does not support automatic updates " "when changes are made to files or directories, " "currently visible in FSView, from the outside.\n" "For details, see the 'Help/FSView Manual'."); - KMessageBox::information( _view, info, QString::null, "ShowFSViewInfo"); + KMessageBox::information( _view, info, TQString::null, "ShowFSViewInfo"); } void FSViewPart::showHelp() { KApplication::startServiceByDesktopName("khelpcenter", - QString("help:/konq-plugins/fsview/index.html")); + TQString("help:/konq-plugins/fsview/index.html")); } void FSViewPart::startedSlot() @@ -219,12 +219,12 @@ void FSViewPart::startedSlot() void FSViewPart::completedSlot(int dirs) { if (_job) { - _job->progressSlot(100, dirs, QString::null); + _job->progressSlot(100, dirs, TQString::null); delete _job; _job = 0; } - KConfigGroup cconfig(_view->config(), QCString("MetricCache")); + KConfigGroup cconfig(_view->config(), TQCString("MetricCache")); _view->saveMetric(&cconfig); emit completed(); @@ -331,20 +331,20 @@ void FSViewBrowserExtension::del() // - search for the KonqOperations child of _view (name "KonqOperations") // - connect to destroyed signal KonqOperations* o = (KonqOperations*) _view->child("KonqOperations"); - if (o) connect(o, SIGNAL(destroyed()), SLOT(refresh())); + if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); } void FSViewBrowserExtension::trash() { KonqOperations::del(_view, KonqOperations::TRASH, _view->selectedUrls()); KonqOperations* o = (KonqOperations*) _view->child("KonqOperations"); - if (o) connect(o, SIGNAL(destroyed()), SLOT(refresh())); + if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); } void FSViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move ); - QApplication::clipboard()->setData( urlData ); + TQApplication::clipboard()->setData( urlData ); } void FSViewBrowserExtension::editMimeType() @@ -386,7 +386,7 @@ void FSViewBrowserExtension::selected(TreeMapItem* i) emit openURLRequest(url); } -void FSViewBrowserExtension::contextMenu(TreeMapItem* /*item*/,const QPoint& p) +void FSViewBrowserExtension::contextMenu(TreeMapItem* /*item*/,const TQPoint& p) { TreeMapItemList s = _view->selection(); TreeMapItem* i; @@ -396,8 +396,8 @@ void FSViewBrowserExtension::contextMenu(TreeMapItem* /*item*/,const QPoint& p) for(i=s.first();i;i=s.next()) { KURL u; u.setPath( ((Inode*)i)->path() ); - QString mimetype = ((Inode*)i)->mimeType()->name(); - const QFileInfo& info = ((Inode*)i)->fileInfo(); + TQString mimetype = ((Inode*)i)->mimeType()->name(); + const TQFileInfo& info = ((Inode*)i)->fileInfo(); mode_t mode = info.isFile() ? S_IFREG : info.isDir() ? S_IFDIR : diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h index 4f2c734..ff0a17e 100644 --- a/konq-plugins/fsview/fsview_part.h +++ b/konq-plugins/fsview/fsview_part.h @@ -44,7 +44,7 @@ public: protected slots: void selected(TreeMapItem*); - void contextMenu(TreeMapItem*,const QPoint&); + void contextMenu(TreeMapItem*,const TQPoint&); void updateActions(); void refresh(); @@ -71,7 +71,7 @@ public: virtual void kill( bool quietly = true ); public slots: - void progressSlot(int percent, int dirs, const QString& lastDir); + void progressSlot(int percent, int dirs, const TQString& lastDir); private: FSView* _view; @@ -83,8 +83,8 @@ class FSViewPart : public KParts::ReadOnlyPart Q_OBJECT Q_PROPERTY( bool supportsUndo READ supportsUndo ) public: - FSViewPart(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList &args); + FSViewPart(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList &args); virtual ~FSViewPart(); diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 0411d3a..6f5073c 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -43,7 +43,7 @@ Inode::Inode() Inode::Inode(ScanDir* d, Inode* parent) : TreeMapItem(parent) { - QString absPath; + TQString absPath; if (parent) { absPath = parent->path(); if (!absPath.endsWith("/")) absPath += "/"; @@ -59,7 +59,7 @@ Inode::Inode(ScanDir* d, Inode* parent) Inode::Inode(ScanFile* f, Inode* parent) : TreeMapItem(parent) { - QString absPath; + TQString absPath; if (parent) absPath = parent->path() + "/"; absPath += f->name(); @@ -95,17 +95,17 @@ void Inode::setPeer(ScanDir* d) init(d->name()); } -QString Inode::path() const +TQString Inode::path() const { return _info.absFilePath(); } -void Inode::init(const QString& path) +void Inode::init(const TQString& path) { if (0) kdDebug(90100) << "Inode::init [" << path << "]" << endl; - _info = QFileInfo(path); + _info = TQFileInfo(path); if (!FSView::getDirMetric(path, _sizeEstimation, _fileCountEstimation, @@ -260,16 +260,16 @@ unsigned int Inode::dirCount() const } -QColor Inode::backColor() const +TQColor Inode::backColor() const { - QString n; + TQString n; int id = 0; switch( ((FSView*)widget())->colorMode() ) { case FSView::Depth: { int d = ((FSView*)widget())->pathDepth() + depth(); - return QColor((100*d)%360, 192,128, QColor::Hsv); + return TQColor((100*d)%360, 192,128, TQColor::Hsv); } case FSView::Name: n = text(0); break; @@ -281,7 +281,7 @@ QColor Inode::backColor() const break; } - if (id>0) n = QString::number(id); + if (id>0) n = TQString::number(id); if (n.isEmpty()) return widget()->colorGroup().button(); @@ -293,7 +293,7 @@ QColor Inode::backColor() const s = (s * 17 + h* (unsigned)*str) % 192; str++; } - return QColor(h, 64+s, 192, QColor::Hsv); + return TQColor(h, 64+s, 192, TQColor::Hsv); } KMimeType::Ptr Inode::mimeType() const @@ -308,10 +308,10 @@ KMimeType::Ptr Inode::mimeType() const return _mimeType; } -QString Inode::text(int i) const +TQString Inode::text(int i) const { if (i==0) { - QString name; + TQString name; if (_dirPeer) { name = _dirPeer->name(); if (!name.endsWith("/")) name += "/"; @@ -321,25 +321,25 @@ QString Inode::text(int i) const return name; } if (i==1) { - QString text; + TQString text; double s = size(); if (s < 1000) - text = QString("%1 B").arg((int)(s+.5)); + text = TQString("%1 B").arg((int)(s+.5)); else if (s < 10 * 1024) - text = QString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = QString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) - text = QString("%1 kB").arg((int)(s/1024+.5)); + text = TQString("%1 kB").arg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = QString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = QString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) - text = QString("%1 MB").arg((int)(s/1024/1024+.5)); + text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); else - text = QString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); if (_sizeEstimation>0) text += "+"; return text; @@ -347,17 +347,17 @@ QString Inode::text(int i) const if ((i==2) || (i==3)) { /* file/dir count makes no sense for files */ - if (_filePeer) return QString(); + if (_filePeer) return TQString(); - QString text; + TQString text; unsigned int f = (i==2) ? fileCount() : dirCount(); if (f>0) { while (f>1000) { - text = QString("%1 %2").arg(QString::number(f).right(3)).arg(text); + text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text); f /= 1000; } - text = QString("%1 %2").arg(QString::number(f)).arg(text); + text = TQString("%1 %2").arg(TQString::number(f)).arg(text); if (_fileCountEstimation>0) text += "+"; } return text; @@ -367,12 +367,12 @@ QString Inode::text(int i) const if (i==5) return _info.owner(); if (i==6) return _info.group(); if (i==7) return mimeType()->comment(); - return QString(); + return TQString(); } -QPixmap Inode::pixmap(int i) const +TQPixmap Inode::pixmap(int i) const { - if (i!=0) return QPixmap(); + if (i!=0) return TQPixmap(); if (!_mimePixmapSet) { KURL u; diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h index 8289f6b..eb1e3dd 100644 --- a/konq-plugins/fsview/inode.h +++ b/konq-plugins/fsview/inode.h @@ -23,10 +23,10 @@ #ifndef INODE_H #define INODE_H -#include <qmap.h> -#include <qptrlist.h> -#include <qfileinfo.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqfileinfo.h> +#include <tqstring.h> #include <kmimetype.h> @@ -49,7 +49,7 @@ public: Inode(ScanDir*, Inode*); Inode(ScanFile*, Inode*); ~Inode(); - void init(const QString&); + void init(const TQString&); void setPeer(ScanDir*); @@ -59,13 +59,13 @@ public: double size() const; unsigned int fileCount() const; unsigned int dirCount() const; - QString path() const; - QString text(int i) const; - QPixmap pixmap(int i) const; - QColor backColor() const; + TQString path() const; + TQString text(int i) const; + TQPixmap pixmap(int i) const; + TQColor backColor() const; KMimeType::Ptr mimeType() const; - const QFileInfo& fileInfo() const { return _info; } + const TQFileInfo& fileInfo() const { return _info; } ScanDir* dirPeer() { return _dirPeer; } ScanFile* filePeer() { return _filePeer; } bool isDir() { return (_dirPeer != 0); } @@ -78,7 +78,7 @@ public: private: void setMetrics(double, unsigned int); - QFileInfo _info; + TQFileInfo _info; ScanDir* _dirPeer; ScanFile* _filePeer; @@ -91,7 +91,7 @@ private: // This means a change even in const methods, thus has to be "mutable" mutable bool _mimeSet, _mimePixmapSet; mutable KMimeType::Ptr _mimeType; - mutable QPixmap _mimePixmap; + mutable TQPixmap _mimePixmap; }; #endif diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index da18dcf..5a93886 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -31,8 +31,8 @@ int main(int argc, char* argv[]) KCmdLineArgs::addCmdLineOptions(options); KApplication a; - KConfigGroup gconfig(KGlobal::config(), QCString("General")); - QString path = gconfig.readPathEntry("Path", "."); + KConfigGroup gconfig(KGlobal::config(), TQCString("General")); + TQString path = gconfig.readPathEntry("Path", "."); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args->count()>0) path = args->arg(0); @@ -40,17 +40,17 @@ int main(int argc, char* argv[]) // TreeMap Widget as toplevel window FSView w(new Inode()); - QObject::connect(&w,SIGNAL(clicked(TreeMapItem*)), - &w,SLOT(selected(TreeMapItem*))); - QObject::connect(&w,SIGNAL(returnPressed(TreeMapItem*)), - &w,SLOT(selected(TreeMapItem*))); - QObject::connect(&w, - SIGNAL(contextMenuRequested(TreeMapItem*,const QPoint&)), - &w,SLOT(contextMenu(TreeMapItem*, const QPoint&))); + TQObject::connect(&w,TQT_SIGNAL(clicked(TreeMapItem*)), + &w,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(&w,TQT_SIGNAL(returnPressed(TreeMapItem*)), + &w,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(&w, + TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), + &w,TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); w.setPath(path); w.show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &w, SLOT( quit() ) ); + a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &w, TQT_SLOT( quit() ) ); return a.exec(); } diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp index ed691e3..1d3d06a 100644 --- a/konq-plugins/fsview/scan.cpp +++ b/konq-plugins/fsview/scan.cpp @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#include <qdir.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqstringlist.h> #include <kapplication.h> #include <kdebug.h> @@ -34,7 +34,7 @@ ScanManager::ScanManager() _listener = 0; } -ScanManager::ScanManager(const QString& path) +ScanManager::ScanManager(const TQString& path) { _topDir = 0; _listener = 0; @@ -52,7 +52,7 @@ void ScanManager::setListener(ScanListener* l) _listener = l; } -ScanDir* ScanManager::setTop(const QString& path, int data) +ScanDir* ScanManager::setTop(const TQString& path, int data) { stopScan(); if (_topDir) { @@ -120,7 +120,7 @@ ScanFile::ScanFile() _listener = 0; } -ScanFile::ScanFile(const QString& n, KIO::fileoffset_t s) +ScanFile::ScanFile(const TQString& n, KIO::fileoffset_t s) { _name = n; _size = s; @@ -145,7 +145,7 @@ ScanDir::ScanDir() _data = 0; } -ScanDir::ScanDir(const QString& n, ScanManager* m, +ScanDir::ScanDir(const TQString& n, ScanManager* m, ScanDir* p, int data) : _name(n) { @@ -168,10 +168,10 @@ void ScanDir::setListener(ScanListener* l) _listener = l; } -QString ScanDir::path() +TQString ScanDir::path() { if (_parent) { - QString p = _parent->path(); + TQString p = _parent->path(); if (!p.endsWith("/")) p += "/"; return p + _name; } @@ -231,30 +231,30 @@ int ScanDir::scan(ScanItem* si, ScanItemList& list, int data) return 0; } - QDir d(si->absPath); - QStringList fileList = d.entryList( QDir::Files | - QDir::Hidden | QDir::NoSymLinks ); + TQDir d(si->absPath); + TQStringList fileList = d.entryList( TQDir::Files | + TQDir::Hidden | TQDir::NoSymLinks ); if (fileList.count()>0) { KDE_struct_stat buff; _files.reserve(fileList.count()); - QStringList::Iterator it; + TQStringList::Iterator it; for (it = fileList.begin(); it != fileList.end(); ++it ) { - KDE_lstat( QFile::encodeName(si->absPath + "/" + (*it)), &buff ); + KDE_lstat( TQFile::encodeName(si->absPath + "/" + (*it)), &buff ); _files.append( ScanFile(*it, buff.st_size) ); _fileSize += buff.st_size; } } - QStringList dirList = d.entryList( QDir::Dirs | - QDir::Hidden | QDir::NoSymLinks ); + TQStringList dirList = d.entryList( TQDir::Dirs | + TQDir::Hidden | TQDir::NoSymLinks ); if (dirList.count()>2) { _dirs.reserve(dirList.count()-2); - QStringList::Iterator it; + TQStringList::Iterator it; for (it = dirList.begin(); it != dirList.end(); ++it ) { if ( ((*it) == "..") || ((*it) == ".") ) continue; _dirs.append( ScanDir(*it, _manager, this, data) ); diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h index 38b015c..ca4ce4f 100644 --- a/konq-plugins/fsview/scan.h +++ b/konq-plugins/fsview/scan.h @@ -23,9 +23,9 @@ #ifndef FSDIR_H #define FSDIR_H -#include <qptrlist.h> -#include <qvaluevector.h> -#include <qfile.h> +#include <tqptrlist.h> +#include <tqvaluevector.h> +#include <tqfile.h> /* Use KDE_lstat and KIO::fileoffset_t for 64-bit sizes */ #include <klargefile.h> @@ -37,14 +37,14 @@ class ScanFile; class ScanItem { public: - ScanItem(const QString& p, ScanDir* d) + ScanItem(const TQString& p, ScanDir* d) { absPath = p; dir = d; } - QString absPath; + TQString absPath; ScanDir* dir; }; -typedef QPtrList<ScanItem> ScanItemList; +typedef TQPtrList<ScanItem> ScanItemList; /** @@ -83,13 +83,13 @@ class ScanManager { public: ScanManager(); - ScanManager(const QString& path); + ScanManager(const TQString& path); ~ScanManager(); /** Set the top path for scanning * The ScanDir object created gets attribute data. */ - ScanDir* setTop(const QString& path, int data = 0); + ScanDir* setTop(const TQString& path, int data = 0); ScanDir* top() { return _topDir; } bool scanRunning(); @@ -131,10 +131,10 @@ class ScanFile { public: ScanFile(); - ScanFile(const QString& n, KIO::fileoffset_t s); + ScanFile(const TQString& n, KIO::fileoffset_t s); ~ScanFile(); - const QString& name() { return _name; } + const TQString& name() { return _name; } KIO::fileoffset_t size() { return _size; } /* set listener to get callbacks from this ScanDir */ @@ -142,13 +142,13 @@ class ScanFile ScanListener* listener() { return _listener; } private: - QString _name; + TQString _name; KIO::fileoffset_t _size; ScanListener* _listener; }; -typedef QValueVector<ScanFile> ScanFileVector; -typedef QValueVector<ScanDir> ScanDirVector; +typedef TQValueVector<ScanFile> ScanFileVector; +typedef TQValueVector<ScanDir> ScanDirVector; /** * A directory to scan. @@ -159,7 +159,7 @@ class ScanDir { public: ScanDir(); - ScanDir(const QString& n, ScanManager* m, + ScanDir(const TQString& n, ScanManager* m, ScanDir* p = 0, int data = 0); ~ScanDir(); @@ -180,7 +180,7 @@ class ScanDir void setupChildRescan(); /* Absolute path. Warning: Slow, loops to top parent. */ - QString path(); + TQString path(); /* get integer data attribute */ int data() { return _data; } @@ -188,7 +188,7 @@ class ScanDir ScanFileVector& files() { return _files; } ScanDirVector& dirs() { return _dirs; } - const QString& name() { return _name; } + const TQString& name() { return _name; } KIO::fileoffset_t size() { update(); return _size; } unsigned int fileCount() { update(); return _fileCount; } unsigned int dirCount() { update(); return _dirCount; } @@ -217,7 +217,7 @@ class ScanDir ScanFileVector _files; ScanDirVector _dirs; - QString _name; + TQString _name; bool _dirty; /* needs a call to update() */ KIO::fileoffset_t _size, _fileSize; unsigned int _fileCount, _dirCount; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index 8de5c01..5a42c75 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -18,16 +18,16 @@ /* * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. */ #include <math.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qpopupmenu.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqpopupmenu.h> #include <klocale.h> #include <kconfig.h> @@ -56,7 +56,7 @@ StoredDrawParams::StoredDrawParams() // field array has size 0 } -StoredDrawParams::StoredDrawParams(QColor c, +StoredDrawParams::StoredDrawParams(TQColor c, bool selected, bool current) { _backColor = c; @@ -69,18 +69,18 @@ StoredDrawParams::StoredDrawParams(QColor c, // field array has size 0 } -QString StoredDrawParams::text(int f) const +TQString StoredDrawParams::text(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QString::null; + return TQString::null; return _field[f].text; } -QPixmap StoredDrawParams::pixmap(int f) const +TQPixmap StoredDrawParams::pixmap(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QPixmap(); + return TQPixmap(); return _field[f].pix; } @@ -101,10 +101,10 @@ int StoredDrawParams::maxLines(int f) const return _field[f].maxLines; } -const QFont& StoredDrawParams::font() const +const TQFont& StoredDrawParams::font() const { - static QFont* f = 0; - if (!f) f = new QFont(QApplication::font()); + static TQFont* f = 0; + if (!f) f = new TQFont(TQApplication::font()); return *f; } @@ -124,7 +124,7 @@ void StoredDrawParams::ensureField(int f) } -void StoredDrawParams::setField(int f, const QString& t, QPixmap pm, +void StoredDrawParams::setField(int f, const TQString& t, TQPixmap pm, Position p, int maxLines) { if (f<0 || f>=MAX_FIELD) return; @@ -136,7 +136,7 @@ void StoredDrawParams::setField(int f, const QString& t, QPixmap pm, _field[f].maxLines = maxLines; } -void StoredDrawParams::setText(int f, const QString& t) +void StoredDrawParams::setText(int f, const TQString& t) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -144,7 +144,7 @@ void StoredDrawParams::setText(int f, const QString& t) _field[f].text = t; } -void StoredDrawParams::setPixmap(int f, const QPixmap& pm) +void StoredDrawParams::setPixmap(int f, const TQPixmap& pm) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -174,7 +174,7 @@ void StoredDrawParams::setMaxLines(int f, int m) // RectDrawing // -RectDrawing::RectDrawing(QRect r) +RectDrawing::RectDrawing(TQRect r) { _fm = 0; _dp = 0; @@ -203,7 +203,7 @@ void RectDrawing::setDrawParams(DrawParams* dp) _dp = dp; } -void RectDrawing::setRect(QRect r) +void RectDrawing::setRect(TQRect r) { _rect = r; @@ -217,7 +217,7 @@ void RectDrawing::setRect(QRect r) _fontHeight = 0; } -QRect RectDrawing::remainingRect(DrawParams* dp) +TQRect RectDrawing::remainingRect(DrawParams* dp) { if (!dp) dp = drawParams(); @@ -242,19 +242,19 @@ QRect RectDrawing::remainingRect(DrawParams* dp) } -void RectDrawing::drawBack(QPainter* p, DrawParams* dp) +void RectDrawing::drawBack(TQPainter* p, DrawParams* dp) { if (!dp) dp = drawParams(); if (_rect.width()<=0 || _rect.height()<=0) return; - QRect r = _rect; - QColor normal = dp->backColor(); + TQRect r = _rect; + TQColor normal = dp->backColor(); if (dp->selected()) normal = normal.light(); bool isCurrent = dp->current(); // 3D raised/sunken frame effect... - QColor high = normal.light(); - QColor low = normal.dark(); + TQColor high = normal.light(); + TQColor low = normal.dark(); p->setPen( isCurrent ? low:high); p->drawLine(r.left(), r.top(), r.right(), r.top()); p->drawLine(r.left(), r.top(), r.left(), r.bottom()); @@ -269,7 +269,7 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) bool goDark = qGray(normal.rgb())>128; int rBase, gBase, bBase; normal.rgb(&rBase, &gBase, &bBase); - p->setBrush(QBrush::NoBrush); + p->setBrush(TQBrush::NoBrush); // shade parameters: int d = 7; @@ -290,7 +290,7 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) int gDiff = goDark ? -gBase/d : (255-gBase)/d; int bDiff = goDark ? -bBase/d : (255-bBase)/d; - QColor shadeColor; + TQColor shadeColor; while (factor<.95) { shadeColor.setRgb((int)(rBase+factor*rDiff+.5), (int)(gBase+factor*gDiff+.5), @@ -329,22 +329,22 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) } // fill inside - p->setPen(QPen::NoPen); + p->setPen(TQPen::NoPen); p->setBrush(normal); p->drawRect(r); } -bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) +bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) { if (!dp) dp = drawParams(); if (!_fm) { - _fm = new QFontMetrics(dp->font()); + _fm = new TQFontMetrics(dp->font()); _fontHeight = _fm->height(); } - QRect r = _rect; + TQRect r = _rect; if (0) kdDebug(90100) << "DrawField: Rect " << r.x() << "/" << r.y() << " - " << r.width() << "x" << r.height() << endl; @@ -484,9 +484,9 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) // get text and pixmap now, only if we need to, because it is possible // that they are calculated on demand (and this can take some time) - QString name = dp->text(f); + TQString name = dp->text(f); if (name.isEmpty()) return 0; - QPixmap pix = dp->pixmap(f); + TQPixmap pix = dp->pixmap(f); // check if pixmap can be drawn int pixW = pix.width(); @@ -548,14 +548,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) * If the text is to be written at the bottom, we start with the * end of the string (so everything is reverted) */ - QString remaining; + TQString remaining; int origLines = lines; while (lines>0) { if (w>width && lines>1) { int lastBreakPos = name.length(), lastWidth = w; int len = name.length(); - QChar::Category caOld, ca; + TQChar::Category caOld, ca; if (!isBottom) { // start with comparing categories of last 2 chars @@ -565,8 +565,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) ca = name[len-1].category(); if (ca != caOld) { // "Aa" has no break between... - if (ca == QChar::Letter_Uppercase && - caOld == QChar::Letter_Lowercase) { + if (ca == TQChar::Letter_Uppercase && + caOld == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -580,7 +580,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.mid(lastBreakPos); // remove space on break point - if (name[lastBreakPos-1].category() == QChar::Separator_Space) + if (name[lastBreakPos-1].category() == TQChar::Separator_Space) name = name.left(lastBreakPos-1); else name = name.left(lastBreakPos); @@ -594,8 +594,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) if (ca != caOld) { // "Aa" has no break between... - if (caOld == QChar::Letter_Uppercase && - ca == QChar::Letter_Lowercase) { + if (caOld == TQChar::Letter_Uppercase && + ca == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -609,14 +609,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.left(l-lastBreakPos); // remove space on break point - if (name[l-lastBreakPos].category() == QChar::Separator_Space) + if (name[l-lastBreakPos].category() == TQChar::Separator_Space) name = name.right(lastBreakPos-1); else name = name.right(lastBreakPos); } } else - remaining = QString::null; + remaining = TQString::null; /* truncate and add ... if needed */ if (w>width) { @@ -776,8 +776,8 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, - QString text1, QString text2, - QString text3, QString text4) + TQString text1, TQString text2, + TQString text3, TQString text4) { _value = value; _parent = parent; @@ -861,13 +861,13 @@ void TreeMapItem::refresh() } -QStringList TreeMapItem::path(int textNo) const +TQStringList TreeMapItem::path(int textNo) const { - QStringList list(text(textNo)); + TQStringList list(text(textNo)); TreeMapItem* i = _parent; while (i) { - QString text = i->text(textNo); + TQString text = i->text(textNo); if (!text.isEmpty()) list.prepend(i->text(textNo)); i = i->_parent; @@ -934,7 +934,7 @@ DrawParams::Position TreeMapItem::position(int f) const } // use widget font -const QFont& TreeMapItem::font() const +const TQFont& TreeMapItem::font() const { return _widget->currentFont(); } @@ -1013,7 +1013,7 @@ TreeMapItemList* TreeMapItem::children() void TreeMapItem::clearItemRect() { - _rect = QRect(); + _rect = TQRect(); clearFreeRects(); } @@ -1022,13 +1022,13 @@ void TreeMapItem::clearFreeRects() if (_freeRects) _freeRects->clear(); } -void TreeMapItem::addFreeRect(const QRect& r) +void TreeMapItem::addFreeRect(const TQRect& r) { // don't add invalid rects if ((r.width() < 1) || (r.height() < 1)) return; if (!_freeRects) { - _freeRects = new QPtrList<QRect>; + _freeRects = new TQPtrList<TQRect>; _freeRects->setAutoDelete(true); } @@ -1036,9 +1036,9 @@ void TreeMapItem::addFreeRect(const QRect& r) << r.x() << "/" << r.y() << "-" << r.width() << "x" << r.height() << ")" << endl; - QRect* last = _freeRects->last(); + TQRect* last = _freeRects->last(); if (!last) { - _freeRects->append(new QRect(r)); + _freeRects->append(new TQRect(r)); return; } @@ -1060,7 +1060,7 @@ void TreeMapItem::addFreeRect(const QRect& r) } if (!replaced) { - _freeRects->append(new QRect(r)); + _freeRects->append(new TQRect(r)); return; } @@ -1075,13 +1075,13 @@ void TreeMapItem::addFreeRect(const QRect& r) class TreeMapTip: public QToolTip { public: - TreeMapTip( QWidget* p ):QToolTip(p) {} + TreeMapTip( TQWidget* p ):TQToolTip(p) {} protected: - void maybeTip( const QPoint & ); + void maybeTip( const TQPoint & ); }; -void TreeMapTip::maybeTip( const QPoint& pos ) +void TreeMapTip::maybeTip( const TQPoint& pos ) { if ( !parentWidget()->inherits( "TreeMapWidget" ) ) return; @@ -1089,9 +1089,9 @@ void TreeMapTip::maybeTip( const QPoint& pos ) TreeMapWidget* p = (TreeMapWidget*)parentWidget(); TreeMapItem* i; i = p->item(pos.x(), pos.y()); - QPtrList<QRect>* rList = i ? i->freeRects() : 0; + TQPtrList<TQRect>* rList = i ? i->freeRects() : 0; if (rList) { - QRect* r; + TQRect* r; for(r=rList->first();r;r=rList->next()) if (r->contains(pos)) tip(*r, p->tipString(i)); @@ -1103,8 +1103,8 @@ void TreeMapTip::maybeTip( const QPoint& pos ) // TreeMapWidget TreeMapWidget::TreeMapWidget(TreeMapItem* base, - QWidget* parent, const char* name) - : QWidget(parent, name) + TQWidget* parent, const char* name) + : TQWidget(parent, name) { _base = base; _base->setWidget(this); @@ -1140,7 +1140,7 @@ TreeMapWidget::TreeMapWidget(TreeMapItem* base, _needsRefresh = _base; setBackgroundMode(Qt::NoBackground); - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); _tip = new TreeMapTip(this); } @@ -1148,7 +1148,7 @@ TreeMapWidget::~TreeMapWidget() { } -const QFont& TreeMapWidget::currentFont() const +const TQFont& TreeMapWidget::currentFont() const { return _font; } @@ -1166,7 +1166,7 @@ TreeMapItem::SplitMode TreeMapWidget::splitMode() const return _splitMode; } -bool TreeMapWidget::setSplitMode(QString mode) +bool TreeMapWidget::setSplitMode(TQString mode) { if (mode == "Bisection") setSplitMode(TreeMapItem::Bisection); else if (mode == "Columns") setSplitMode(TreeMapItem::Columns); @@ -1182,9 +1182,9 @@ bool TreeMapWidget::setSplitMode(QString mode) return true; } -QString TreeMapWidget::splitModeString() const +TQString TreeMapWidget::splitModeString() const { - QString mode; + TQString mode; switch(splitMode()) { case TreeMapItem::Bisection: mode = "Bisection"; break; case TreeMapItem::Columns: mode = "Columns"; break; @@ -1250,14 +1250,14 @@ void TreeMapWidget::setMaxDrawingDepth(int d) redraw(); } -QString TreeMapWidget::defaultFieldType(int f) const +TQString TreeMapWidget::defaultFieldType(int f) const { return i18n("Text %1").arg(f+1); } -QString TreeMapWidget::defaultFieldStop(int) const +TQString TreeMapWidget::defaultFieldStop(int) const { - return QString(); + return TQString(); } bool TreeMapWidget::defaultFieldVisible(int f) const @@ -1302,7 +1302,7 @@ bool TreeMapWidget::resizeAttr(int size) return true; } -void TreeMapWidget::setFieldType(int f, QString type) +void TreeMapWidget::setFieldType(int f, TQString type) { if (((int)_attr.size() < f+1) && (type == defaultFieldType(f))) return; @@ -1311,13 +1311,13 @@ void TreeMapWidget::setFieldType(int f, QString type) // no need to redraw: the type string is not visible in the TreeMap } -QString TreeMapWidget::fieldType(int f) const +TQString TreeMapWidget::fieldType(int f) const { if (f<0 || (int)_attr.size()<f+1) return defaultFieldType(f); return _attr[f].type; } -void TreeMapWidget::setFieldStop(int f, QString stop) +void TreeMapWidget::setFieldStop(int f, TQString stop) { if (((int)_attr.size() < f+1) && (stop == defaultFieldStop(f))) return; @@ -1327,7 +1327,7 @@ void TreeMapWidget::setFieldStop(int f, QString stop) } } -QString TreeMapWidget::fieldStop(int f) const +TQString TreeMapWidget::fieldStop(int f) const { if (f<0 || (int)_attr.size()<f+1) return defaultFieldStop(f); return _attr[f].stop; @@ -1390,7 +1390,7 @@ DrawParams::Position TreeMapWidget::fieldPosition(int f) const return _attr[f].pos; } -void TreeMapWidget::setFieldPosition(int f, QString pos) +void TreeMapWidget::setFieldPosition(int f, TQString pos) { if (pos == "TopLeft") setFieldPosition(f, DrawParams::TopLeft); @@ -1408,17 +1408,17 @@ void TreeMapWidget::setFieldPosition(int f, QString pos) setFieldPosition(f, DrawParams::Default); } -QString TreeMapWidget::fieldPositionString(int f) const +TQString TreeMapWidget::fieldPositionString(int f) const { TreeMapItem::Position pos = fieldPosition(f); - if (pos == DrawParams::TopLeft) return QString("TopLeft"); - if (pos == DrawParams::TopCenter) return QString("TopCenter"); - if (pos == DrawParams::TopRight) return QString("TopRight"); - if (pos == DrawParams::BottomLeft) return QString("BottomLeft"); - if (pos == DrawParams::BottomCenter) return QString("BottomCenter"); - if (pos == DrawParams::BottomRight) return QString("BottomRight"); - if (pos == DrawParams::Default) return QString("Default"); - return QString("unknown"); + if (pos == DrawParams::TopLeft) return TQString("TopLeft"); + if (pos == DrawParams::TopCenter) return TQString("TopCenter"); + if (pos == DrawParams::TopRight) return TQString("TopRight"); + if (pos == DrawParams::BottomLeft) return TQString("BottomLeft"); + if (pos == DrawParams::BottomCenter) return TQString("BottomCenter"); + if (pos == DrawParams::BottomRight) return TQString("BottomRight"); + if (pos == DrawParams::Default) return TQString("Default"); + return TQString("unknown"); } void TreeMapWidget::setMinimalArea(int area) @@ -1453,9 +1453,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i) } -QString TreeMapWidget::tipString(TreeMapItem* i) const +TQString TreeMapWidget::tipString(TreeMapItem* i) const { - QString tip, itemTip; + TQString tip, itemTip; while (i) { if (!i->text(0).isEmpty()) { @@ -1572,7 +1572,7 @@ void TreeMapWidget::setSelected(TreeMapItem* item, bool selected) redraw(changed); if (0) kdDebug(90100) << (selected ? "S":"Des") << "elected Item " - << (item ? item->path(0).join("") : QString("(null)")) + << (item ? item->path(0).join("") : TQString("(null)")) << " (depth " << (item ? item->depth() : -1) << ")" << endl; } @@ -1764,16 +1764,16 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, return changed; } -void TreeMapWidget::contextMenuEvent( QContextMenuEvent* e ) +void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( SIGNAL(contextMenuRequested(TreeMapItem*, const QPoint &)) ) ) + if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); - if ( e->reason() == QContextMenuEvent::Keyboard ) { - QRect r = (_current) ? _current->itemRect() : _base->itemRect(); - QPoint p = QPoint(r.left() + r.width()/2, r.top() + r.height()/2); + if ( e->reason() == TQContextMenuEvent::Keyboard ) { + TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); + TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } else { @@ -1783,7 +1783,7 @@ void TreeMapWidget::contextMenuEvent( QContextMenuEvent* e ) } -void TreeMapWidget::mousePressEvent( QMouseEvent* e ) +void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) { //kdDebug(90100) << "TreeMapWidget::mousePressEvent" << endl; @@ -1851,7 +1851,7 @@ void TreeMapWidget::mousePressEvent( QMouseEvent* e ) } } -void TreeMapWidget::mouseMoveEvent( QMouseEvent* e ) +void TreeMapWidget::mouseMoveEvent( TQMouseEvent* e ) { //kdDebug(90100) << "TreeMapWidget::mouseMoveEvent" << endl; @@ -1894,7 +1894,7 @@ void TreeMapWidget::mouseMoveEvent( QMouseEvent* e ) redraw(changed); } -void TreeMapWidget::mouseReleaseEvent( QMouseEvent* ) +void TreeMapWidget::mouseReleaseEvent( TQMouseEvent* ) { //kdDebug(90100) << "TreeMapWidget::mouseReleaseEvent" << endl; @@ -1924,7 +1924,7 @@ void TreeMapWidget::mouseReleaseEvent( QMouseEvent* ) } -void TreeMapWidget::mouseDoubleClickEvent( QMouseEvent* e ) +void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) { TreeMapItem* over = item(e->x(), e->y()); @@ -1943,7 +1943,7 @@ int nextVisible(TreeMapItem* i) while (idx < (int)p->children()->count()-1) { idx++; - QRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1961,7 +1961,7 @@ int prevVisible(TreeMapItem* i) while (idx > 0) { idx--; - QRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1971,7 +1971,7 @@ int prevVisible(TreeMapItem* i) -void TreeMapWidget::keyPressEvent( QKeyEvent* e ) +void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) { if (e->key() == Key_Escape && _pressed) { @@ -2085,24 +2085,24 @@ void TreeMapWidget::keyPressEvent( QKeyEvent* e ) } } -void TreeMapWidget::fontChange( const QFont& ) +void TreeMapWidget::fontChange( const TQFont& ) { redraw(); } -void TreeMapWidget::resizeEvent( QResizeEvent * ) +void TreeMapWidget::resizeEvent( TQResizeEvent * ) { // this automatically redraws (as size is changed) drawTreeMap(); } -void TreeMapWidget::paintEvent( QPaintEvent * ) +void TreeMapWidget::paintEvent( TQPaintEvent * ) { drawTreeMap(); } -void TreeMapWidget::showEvent( QShowEvent * ) +void TreeMapWidget::showEvent( TQShowEvent * ) { // refresh only if needed drawTreeMap(); @@ -2125,14 +2125,14 @@ void TreeMapWidget::drawTreeMap() if (_needsRefresh == _base) { // redraw whole widget - _pixmap = QPixmap(size()); + _pixmap = TQPixmap(size()); _pixmap.fill(backgroundColor()); } - QPainter p(&_pixmap); + TQPainter p(&_pixmap); if (_needsRefresh == _base) { p.setPen(black); - p.drawRect(QRect(2, 2, QWidget::width()-4, QWidget::height()-4)); - _base->setItemRect(QRect(3, 3, QWidget::width()-6, QWidget::height()-6)); + p.drawRect(TQRect(2, 2, TQWidget::width()-4, TQWidget::height()-4)); + _base->setItemRect(TQRect(3, 3, TQWidget::width()-6, TQWidget::height()-6)); } else { // only subitem @@ -2148,12 +2148,12 @@ void TreeMapWidget::drawTreeMap() } bitBlt( this, 0, 0, &_pixmap, 0, 0, - QWidget::width(), QWidget::height(), CopyROP, true); + TQWidget::width(), TQWidget::height(), CopyROP, true); if (hasFocus()) { - QPainter p(this); - style().drawPrimitive( QStyle::PE_FocusRect, &p, - QRect(0, 0, QWidget::width(), QWidget::height()), + TQPainter p(this); + style().drawPrimitive( TQStyle::PE_FocusRect, &p, + TQRect(0, 0, TQWidget::width(), TQWidget::height()), colorGroup() ); } } @@ -2177,7 +2177,7 @@ void TreeMapWidget::redraw(TreeMapItem* i) } } -void TreeMapWidget::drawItem(QPainter* p, +void TreeMapWidget::drawItem(TQPainter* p, TreeMapItem* item) { bool isSelected = false; @@ -2206,7 +2206,7 @@ void TreeMapWidget::drawItem(QPainter* p, } -bool TreeMapWidget::horizontal(TreeMapItem* i, const QRect& r) +bool TreeMapWidget::horizontal(TreeMapItem* i, const TQRect& r) { switch(i->splitMode()) { case TreeMapItem::HAlternate: @@ -2227,7 +2227,7 @@ bool TreeMapWidget::horizontal(TreeMapItem* i, const QRect& r) /** * Draw TreeMapItems recursive, starting from item */ -void TreeMapWidget::drawItems(QPainter* p, +void TreeMapWidget::drawItems(TQPainter* p, TreeMapItem* item) { if (DEBUG_DRAWING) @@ -2240,9 +2240,9 @@ void TreeMapWidget::drawItems(QPainter* p, drawItem(p, item); item->clearFreeRects(); - QRect origRect = item->itemRect(); + TQRect origRect = item->itemRect(); int bw = item->borderWidth(); - QRect r = QRect(origRect.x()+bw, origRect.y()+bw, + TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); TreeMapItemList* list = item->children(); @@ -2266,7 +2266,7 @@ void TreeMapWidget::drawItems(QPainter* p, // stop drawing if stopAtText is reached if (!stopDrawing) for (int no=0;no<(int)_attr.size();no++) { - QString stopAt = fieldStop(no); + TQString stopAt = fieldStop(no); if (!stopAt.isEmpty() && (item->text(no) == stopAt)) { stopDrawing = true; break; @@ -2320,7 +2320,7 @@ void TreeMapWidget::drawItems(QPainter* p, << i->value() << endl; } - QRect orig = r; + TQRect orig = r; // if we have space for text... if ((r.height() >= _fontHeight) && (r.width() >= _fontHeight)) { @@ -2337,12 +2337,12 @@ void TreeMapWidget::drawItems(QPainter* p, if (orig.x() == r.x()) { // Strings on top - item->addFreeRect(QRect(orig.x(), orig.y(), + item->addFreeRect(TQRect(orig.x(), orig.y(), orig.width(), orig.height()-r.height())); } else { // Strings on the left - item->addFreeRect(QRect(orig.x(), orig.y(), + item->addFreeRect(TQRect(orig.x(), orig.y(), orig.width()-r.width(), orig.height())); } @@ -2389,7 +2389,7 @@ void TreeMapWidget::drawItems(QPainter* p, self / user_sum + .5); if (self_length > 0) { // take space for self cost - QRect sr = r; + TQRect sr = r; if (rotate) { sr.setWidth( self_length ); r.setRect(r.x()+sr.width(), r.y(), r.width()-sr.width(), r.height()); @@ -2450,7 +2450,7 @@ void TreeMapWidget::drawItems(QPainter* p, // we always split horizontally int nextPos = (int)((double)r.width() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), nextPos, r.height()); + TQRect firstRect = TQRect(r.x(), r.y(), nextPos, r.height()); if (nextPos < _visibleWidth) { if (item->sorting(0) == -1) { @@ -2501,7 +2501,7 @@ void TreeMapWidget::drawItems(QPainter* p, // we always split horizontally int nextPos = (int)((double)r.height() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), r.width(), nextPos); + TQRect firstRect = TQRect(r.x(), r.y(), r.width(), nextPos); if (nextPos < _visibleWidth) { if (item->sorting(0) == -1) { @@ -2538,7 +2538,7 @@ void TreeMapWidget::drawItems(QPainter* p, } // fills area with a pattern if to small to draw children -void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r) +void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) { p->setBrush(Qt::Dense4Pattern); p->setPen(Qt::NoPen); @@ -2547,7 +2547,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r) } // fills area with a pattern if to small to draw children -void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r, +void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack) { if (DEBUG_DRAWING) @@ -2577,8 +2577,8 @@ void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r, } // returns false if rect gets to small -bool TreeMapWidget::drawItemArray(QPainter* p, TreeMapItem* item, - QRect& r, double user_sum, +bool TreeMapWidget::drawItemArray(TQPainter* p, TreeMapItem* item, + TQRect& r, double user_sum, TreeMapItemListIterator it, int len, bool goBack) { @@ -2618,14 +2618,14 @@ bool TreeMapWidget::drawItemArray(QPainter* p, TreeMapItem* item, if (r.width() > r.height()) { int halfPos = (int)((double)r.width() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), halfPos, r.height()); + TQRect firstRect = TQRect(r.x(), r.y(), halfPos, r.height()); drawOn = drawItemArray(p, item, firstRect, valSum, first, len-lenLeft, goBack); r.setRect(r.x()+halfPos, r.y(), r.width()-halfPos, r.height()); } else { int halfPos = (int)((double)r.height() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), r.width(), halfPos); + TQRect firstRect = TQRect(r.x(), r.y(), r.width(), halfPos); drawOn = drawItemArray(p, item, firstRect, valSum, first, len-lenLeft, goBack); r.setRect(r.x(), r.y()+halfPos, r.width(), r.height()-halfPos); @@ -2694,7 +2694,7 @@ bool TreeMapWidget::drawItemArray(QPainter* p, TreeMapItem* item, return false; } - QRect currRect = r; + TQRect currRect = r; if (hor) currRect.setWidth(nextPos); @@ -2769,13 +2769,13 @@ void TreeMapWidget::splitActivated(int id) } -void TreeMapWidget::addSplitDirectionItems(QPopupMenu* popup, int id) +void TreeMapWidget::addSplitDirectionItems(TQPopupMenu* popup, int id) { _splitID = id; popup->setCheckable(true); - connect(popup, SIGNAL(activated(int)), - this, SLOT(splitActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(splitActivated(int))); popup->insertItem(i18n("Recursive Bisection"), id); popup->insertItem(i18n("Columns"), id+1); @@ -2824,21 +2824,21 @@ void TreeMapWidget::visualizationActivated(int id) else if ((id%10) == 8) setFieldPosition(f, DrawParams::BottomRight); } -void TreeMapWidget::addVisualizationItems(QPopupMenu* popup, int id) +void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) { _visID = id; popup->setCheckable(true); - QPopupMenu* bpopup = new QPopupMenu(); + TQPopupMenu* bpopup = new TQPopupMenu(); bpopup->setCheckable(true); - connect(popup, SIGNAL(activated(int)), - this, SLOT(visualizationActivated(int))); - connect(bpopup, SIGNAL(activated(int)), - this, SLOT(visualizationActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(visualizationActivated(int))); + connect(bpopup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(visualizationActivated(int))); - QPopupMenu* spopup = new QPopupMenu(); + TQPopupMenu* spopup = new TQPopupMenu(); addSplitDirectionItems(spopup, id+100); popup->insertItem(i18n("Nesting"), spopup, id); @@ -2864,10 +2864,10 @@ void TreeMapWidget::addVisualizationItems(QPopupMenu* popup, int id) popup->insertSeparator(); int f; - QPopupMenu* tpopup; + TQPopupMenu* tpopup; id += 20; for (f=0;f<(int)_attr.size();f++, id+=10) { - tpopup = new QPopupMenu(); + tpopup = new TQPopupMenu(); tpopup->setCheckable(true); popup->insertItem(_attr[f].type, tpopup, id); tpopup->insertItem(i18n("Visible"), id+1); @@ -2896,8 +2896,8 @@ void TreeMapWidget::addVisualizationItems(QPopupMenu* popup, int id) tpopup->setItemChecked(id+7,_attr[f].pos == DrawParams::BottomCenter); tpopup->setItemChecked(id+8,_attr[f].pos == DrawParams::BottomRight); - connect(tpopup, SIGNAL(activated(int)), - this, SLOT(visualizationActivated(int))); + connect(tpopup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(visualizationActivated(int))); } } @@ -2913,7 +2913,7 @@ void TreeMapWidget::selectionActivated(int id) setSelected(i, true); } -void TreeMapWidget::addSelectionItems(QPopupMenu* popup, +void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, int id, TreeMapItem* i) { if (!i) return; @@ -2921,11 +2921,11 @@ void TreeMapWidget::addSelectionItems(QPopupMenu* popup, _selectionID = id; _menuItem = i; - connect(popup, SIGNAL(activated(int)), - this, SLOT(selectionActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(selectionActivated(int))); while (i) { - QString name = i->text(0); + TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id++); i = i->parent(); @@ -2934,7 +2934,7 @@ void TreeMapWidget::addSelectionItems(QPopupMenu* popup, void TreeMapWidget::fieldStopActivated(int id) { - if (id == _fieldStopID) setFieldStop(0, QString::null); + if (id == _fieldStopID) setFieldStop(0, TQString::null); else { TreeMapItem* i = _menuItem; id -= _fieldStopID+1; @@ -2947,13 +2947,13 @@ void TreeMapWidget::fieldStopActivated(int id) } } -void TreeMapWidget::addFieldStopItems(QPopupMenu* popup, +void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, int id, TreeMapItem* i) { _fieldStopID = id; - connect(popup, SIGNAL(activated(int)), - this, SLOT(fieldStopActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(fieldStopActivated(int))); popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); @@ -2964,7 +2964,7 @@ void TreeMapWidget::addFieldStopItems(QPopupMenu* popup, while (i) { id++; - QString name = i->text(0); + TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id); if (fieldStop(0) == i->text(0)) { @@ -2996,14 +2996,14 @@ void TreeMapWidget::areaStopActivated(int id) else if (id == _areaStopID+6) setMinimalArea(minimalArea()/2); } -void TreeMapWidget::addAreaStopItems(QPopupMenu* popup, +void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, int id, TreeMapItem* i) { _areaStopID = id; _menuItem = i; - connect(popup, SIGNAL(activated(int)), - this, SLOT(areaStopActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(areaStopActivated(int))); bool foundArea = false; @@ -3061,14 +3061,14 @@ void TreeMapWidget::depthStopActivated(int id) else if (id == _depthStopID+6) setMaxDrawingDepth(6); } -void TreeMapWidget::addDepthStopItems(QPopupMenu* popup, +void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, int id, TreeMapItem* i) { _depthStopID = id; _menuItem = i; - connect(popup, SIGNAL(activated(int)), - this, SLOT(depthStopActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(depthStopActivated(int))); bool foundDepth = false; @@ -3117,7 +3117,7 @@ void TreeMapWidget::addDepthStopItems(QPopupMenu* popup, * Option saving/restoring */ -void TreeMapWidget::saveOptions(KConfigGroup* config, QString prefix) +void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix) { config->writeEntry(prefix+"Nesting", splitModeString()); config->writeEntry(prefix+"AllowRotation", allowRotation()); @@ -3130,23 +3130,23 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, QString prefix) int f, fCount = _attr.size(); config->writeEntry(prefix+"FieldCount", fCount); for (f=0;f<fCount;f++) { - config->writeEntry(QString(prefix+"FieldVisible%1").arg(f), + config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f), _attr[f].visible); - config->writeEntry(QString(prefix+"FieldForced%1").arg(f), + config->writeEntry(TQString(prefix+"FieldForced%1").arg(f), _attr[f].forced); - config->writeEntry(QString(prefix+"FieldStop%1").arg(f), + config->writeEntry(TQString(prefix+"FieldStop%1").arg(f), _attr[f].stop); - config->writeEntry(QString(prefix+"FieldPosition%1").arg(f), + config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f), fieldPositionString(f)); } } -void TreeMapWidget::restoreOptions(KConfigGroup* config, QString prefix) +void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix) { bool enabled; int num; - QString str; + TQString str; str = config->readEntry(prefix+"Nesting"); if (!str.isEmpty()) setSplitMode(str); @@ -3180,18 +3180,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, QString prefix) int f; for (f=0;f<num;f++) { - str = QString(prefix+"FieldVisible%1").arg(f); + str = TQString(prefix+"FieldVisible%1").arg(f); if (config->hasKey(str)) setFieldVisible(f, config->readBoolEntry(str)); - str = QString(prefix+"FieldForced%1").arg(f); + str = TQString(prefix+"FieldForced%1").arg(f); if (config->hasKey(str)) setFieldForced(f, config->readBoolEntry(str)); - str = config->readEntry(QString(prefix+"FieldStop%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f)); setFieldStop(f, str); - str = config->readEntry(QString(prefix+"FieldPosition%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f)); if (!str.isEmpty()) setFieldPosition(f, str); } } diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index a834d23..1deee35 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -18,7 +18,7 @@ /** * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. * * This file defines the following classes: * DrawParams, RectDrawing, TreeMapItem, TreeMapWidget @@ -30,14 +30,14 @@ #ifndef TREEMAP_H #define TREEMAP_H -#include <qstring.h> -#include <qwidget.h> -#include <qpixmap.h> -#include <qptrlist.h> -#include <qvaluevector.h> -#include <qcolor.h> -#include <qapplication.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqptrlist.h> +#include <tqvaluevector.h> +#include <tqcolor.h> +#include <tqapplication.h> +#include <tqstringlist.h> class QPopupMenu; class TreeMapTip; @@ -74,15 +74,15 @@ public: // no constructor as this is an abstract class virtual ~DrawParams() {} - virtual QString text(int) const = 0; - virtual QPixmap pixmap(int) const = 0; + virtual TQString text(int) const = 0; + virtual TQPixmap pixmap(int) const = 0; virtual Position position(int) const = 0; // 0: no limit, negative: leave at least -maxLines() free virtual int maxLines(int) const { return 0; } virtual int fieldCount() const { return 0; } - virtual QColor backColor() const { return Qt::white; } - virtual const QFont& font() const = 0; + virtual TQColor backColor() const { return Qt::white; } + virtual const TQFont& font() const = 0; virtual bool selected() const { return false; } virtual bool current() const { return false; } @@ -98,39 +98,39 @@ class StoredDrawParams: public DrawParams { public: StoredDrawParams(); - StoredDrawParams(QColor c, + StoredDrawParams(TQColor c, bool selected = false, bool current = false); // getters - QString text(int) const; - QPixmap pixmap(int) const; + TQString text(int) const; + TQPixmap pixmap(int) const; Position position(int) const; int maxLines(int) const; int fieldCount() const { return _field.size(); } - QColor backColor() const { return _backColor; } + TQColor backColor() const { return _backColor; } bool selected() const { return _selected; } bool current() const { return _current; } bool shaded() const { return _shaded; } bool rotated() const { return _rotated; } - const QFont& font() const; + const TQFont& font() const; // attribute setters - void setField(int f, const QString& t, QPixmap pm = QPixmap(), + void setField(int f, const TQString& t, TQPixmap pm = TQPixmap(), Position p = Default, int maxLines = 0); - void setText(int f, const QString&); - void setPixmap(int f, const QPixmap&); + void setText(int f, const TQString&); + void setPixmap(int f, const TQPixmap&); void setPosition(int f, Position); void setMaxLines(int f, int); - void setBackColor(const QColor& c) { _backColor = c; } + void setBackColor(const TQColor& c) { _backColor = c; } void setSelected(bool b) { _selected = b; } void setCurrent(bool b) { _current = b; } void setShaded(bool b) { _shaded = b; } void setRotated(bool b) { _rotated = b; } protected: - QColor _backColor; + TQColor _backColor; bool _selected, _current, _shaded, _rotated; private: @@ -138,13 +138,13 @@ private: void ensureField(int f); struct Field { - QString text; - QPixmap pix; + TQString text; + TQPixmap pix; Position pos; int maxLines; }; - QValueVector<Field> _field; + TQValueVector<Field> _field; }; @@ -160,7 +160,7 @@ private: class RectDrawing { public: - RectDrawing(QRect); + RectDrawing(TQRect); ~RectDrawing(); // The default DrawParams object used. @@ -168,33 +168,33 @@ public: // we take control over the given object (i.e. delete at destruction) void setDrawParams(DrawParams*); - // draw on a given QPainter, use this class as info provider per default - void drawBack(QPainter*, DrawParams* dp = 0); + // draw on a given TQPainter, use this class as info provider per default + void drawBack(TQPainter*, DrawParams* dp = 0); /* Draw field at position() from pixmap()/text() with maxLines(). * Returns true if something was drawn */ - bool drawField(QPainter*, int f, DrawParams* dp = 0); + bool drawField(TQPainter*, int f, DrawParams* dp = 0); // resets rectangle for free space - void setRect(QRect); + void setRect(TQRect); // Returns the rectangle area still free of text/pixmaps after // a number of drawText() calls. - QRect remainingRect(DrawParams* dp = 0); + TQRect remainingRect(DrawParams* dp = 0); private: int _usedTopLeft, _usedTopCenter, _usedTopRight; int _usedBottomLeft, _usedBottomCenter, _usedBottomRight; - QRect _rect; + TQRect _rect; // temporary int _fontHeight; - QFontMetrics* _fm; + TQFontMetrics* _fm; DrawParams* _dp; }; -class TreeMapItemList: public QPtrList<TreeMapItem> +class TreeMapItemList: public TQPtrList<TreeMapItem> { public: TreeMapItem* commonParent(); @@ -202,7 +202,7 @@ protected: int compareItems ( Item item1, Item item2 ); }; -typedef QPtrListIterator<TreeMapItem> TreeMapItemListIterator; +typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator; /** @@ -239,8 +239,8 @@ public: TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 ); TreeMapItem(TreeMapItem* parent, double value, - QString text1, QString text2 = QString::null, - QString text3 = QString::null, QString text4 = QString::null); + TQString text1, TQString text2 = TQString::null, + TQString text3 = TQString::null, TQString text4 = TQString::null); virtual ~TreeMapItem(); bool isChildOf(TreeMapItem*); @@ -272,7 +272,7 @@ public: * Returns a list of text strings of specified text number, * from root up to this item. */ - QStringList path(int) const; + TQStringList path(int) const; /** * Depth of this item. This is the distance to root. @@ -288,9 +288,9 @@ public: * Temporary rectangle used for drawing this item the last time. * This is internally used to map from a point to an item. */ - void setItemRect(const QRect& r) { _rect = r; } + void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const QRect& itemRect() const { return _rect; } + const TQRect& itemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } @@ -299,8 +299,8 @@ public: * Used internally to enable tooltip. */ void clearFreeRects(); - QPtrList<QRect>* freeRects() const { return _freeRects; } - void addFreeRect(const QRect& r); + TQPtrList<TQRect>* freeRects() const { return _freeRects; } + void addFreeRect(const TQRect& r); /** * Temporary child item index of the child that was current() recently. @@ -323,7 +323,7 @@ public: virtual double value() const; // replace "Default" position with setting from TreeMapWidget virtual Position position(int) const; - virtual const QFont& font() const; + virtual const TQFont& font() const; virtual bool isMarked(int) const; virtual int borderWidth() const; @@ -373,8 +373,8 @@ private: bool _sortAscending; // temporary layout - QRect _rect; - QPtrList<QRect>* _freeRects; + TQRect _rect; + TQPtrList<TQRect>* _freeRects; int _depth; // temporary self value (when using level skipping) @@ -400,7 +400,7 @@ public: */ enum SelectionMode { Single, Multi, Extended, NoSelection }; - TreeMapWidget(TreeMapItem* base, QWidget* parent=0, const char* name=0); + TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0); ~TreeMapWidget(); /** @@ -411,7 +411,7 @@ public: /** * Returns a reference to the current widget font. */ - const QFont& currentFont() const; + const TQFont& currentFont() const; /** * Returns the area item at position x/y, independent from any @@ -493,8 +493,8 @@ public: void setSplitMode(TreeMapItem::SplitMode m); TreeMapItem::SplitMode splitMode() const; // returns true if string was recognized - bool setSplitMode(QString); - QString splitModeString() const; + bool setSplitMode(TQString); + TQString splitModeString() const; /* @@ -542,8 +542,8 @@ public: int minimalArea() const { return _minimalArea; } /* defaults for text attributes */ - QString defaultFieldType(int) const; - QString defaultFieldStop(int) const; + TQString defaultFieldType(int) const; + TQString defaultFieldStop(int) const; bool defaultFieldVisible(int) const; bool defaultFieldForced(int) const; DrawParams::Position defaultFieldPosition(int) const; @@ -553,14 +553,14 @@ public: * This is important for the visualization menu generated * with visualizationMenu() */ - void setFieldType(int, QString); - QString fieldType(int) const; + void setFieldType(int, TQString); + TQString fieldType(int) const; /** * Stop drawing at item with name */ - void setFieldStop(int, QString); - QString fieldStop(int) const; + void setFieldStop(int, TQString); + TQString fieldStop(int) const; /** * Should the text with number textNo be visible? @@ -583,8 +583,8 @@ public: */ void setFieldPosition(int, DrawParams::Position); DrawParams::Position fieldPosition(int) const; - void setFieldPosition(int, QString); - QString fieldPositionString(int) const; + void setFieldPosition(int, TQString); + TQString fieldPositionString(int) const; /** * Do we allow the texts to be rotated by 90 degrees for better fitting? @@ -598,8 +598,8 @@ public: /** * Save/restore options. */ - void saveOptions(KConfigGroup*, QString prefix = QString::null); - void restoreOptions(KConfigGroup*, QString prefix = QString::null); + void saveOptions(KConfigGroup*, TQString prefix = TQString::null); + void restoreOptions(KConfigGroup*, TQString prefix = TQString::null); /** * These functions populate given popup menus. @@ -607,12 +607,12 @@ public: * * The int is the menu id where to start for the items (100 IDs reserved). */ - void addSplitDirectionItems(QPopupMenu*, int); - void addSelectionItems(QPopupMenu*, int, TreeMapItem*); - void addFieldStopItems(QPopupMenu*, int, TreeMapItem*); - void addAreaStopItems(QPopupMenu*, int, TreeMapItem*); - void addDepthStopItems(QPopupMenu*, int, TreeMapItem*); - void addVisualizationItems(QPopupMenu*, int); + void addSplitDirectionItems(TQPopupMenu*, int); + void addSelectionItems(TQPopupMenu*, int, TreeMapItem*); + void addFieldStopItems(TQPopupMenu*, int, TreeMapItem*); + void addAreaStopItems(TQPopupMenu*, int, TreeMapItem*); + void addDepthStopItems(TQPopupMenu*, int, TreeMapItem*); + void addVisualizationItems(TQPopupMenu*, int); TreeMapWidget* widget() { return this; } TreeMapItem* current() const { return _current; } @@ -625,7 +625,7 @@ public: * Return tooltip string to show for a item (can be rich text) * Default implementation gives lines with "text0 (text1)" going to root. */ - virtual QString tipString(TreeMapItem* i) const; + virtual TQString tipString(TreeMapItem* i) const; /** * Redraws an item with all children. @@ -666,20 +666,20 @@ signals: void clicked(TreeMapItem*); void returnPressed(TreeMapItem*); void doubleClicked(TreeMapItem*); - void rightButtonPressed(TreeMapItem*, const QPoint &); - void contextMenuRequested(TreeMapItem*, const QPoint &); + void rightButtonPressed(TreeMapItem*, const TQPoint &); + void contextMenuRequested(TreeMapItem*, const TQPoint &); protected: - void mousePressEvent( QMouseEvent * ); - void contextMenuEvent( QContextMenuEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void mouseDoubleClickEvent( QMouseEvent * ); - void keyPressEvent( QKeyEvent* ); - void paintEvent( QPaintEvent * ); - void resizeEvent( QResizeEvent * ); - void showEvent( QShowEvent * ); - void fontChange( const QFont& ); + void mousePressEvent( TQMouseEvent * ); + void contextMenuEvent( TQContextMenuEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void mouseDoubleClickEvent( TQMouseEvent * ); + void keyPressEvent( TQKeyEvent* ); + void paintEvent( TQPaintEvent * ); + void resizeEvent( TQResizeEvent * ); + void showEvent( TQShowEvent * ); + void fontChange( const TQFont& ); private: TreeMapItemList diff(TreeMapItemList&, TreeMapItemList&); @@ -689,13 +689,13 @@ private: TreeMapItem* i2, bool selected); bool isTmpSelected(TreeMapItem* i); - void drawItem(QPainter* p, TreeMapItem*); - void drawItems(QPainter* p, TreeMapItem*); - bool horizontal(TreeMapItem* i, const QRect& r); - void drawFill(TreeMapItem*,QPainter* p, QRect& r); - void drawFill(TreeMapItem*,QPainter* p, QRect& r, + void drawItem(TQPainter* p, TreeMapItem*); + void drawItems(TQPainter* p, TreeMapItem*); + bool horizontal(TreeMapItem* i, const TQRect& r); + void drawFill(TreeMapItem*,TQPainter* p, TQRect& r); + void drawFill(TreeMapItem*,TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack); - bool drawItemArray(QPainter* p, TreeMapItem*, QRect& r, double, + bool drawItemArray(TQPainter* p, TreeMapItem*, TQRect& r, double, TreeMapItemListIterator it, int len, bool); bool resizeAttr(int); @@ -706,11 +706,11 @@ private: // attributes for field, per textNo struct FieldAttr { - QString type, stop; + TQString type, stop; bool visible, forced; DrawParams::Position pos; }; - QValueVector<FieldAttr> _attr; + TQValueVector<FieldAttr> _attr; SelectionMode _selectionMode; TreeMapItem::SplitMode _splitMode; @@ -732,11 +732,11 @@ private: bool _inShiftDrag, _inControlDrag; // temporary widget font metrics while drawing - QFont _font; + TQFont _font; int _fontHeight; // back buffer pixmap - QPixmap _pixmap; + TQPixmap _pixmap; }; #endif diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp index 74f2613..989ec43 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp @@ -39,8 +39,8 @@ static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Setting K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin, SettingsPluginFactory( &aboutdata ) ) -SettingsPlugin::SettingsPlugin( QObject* parent, const char* name, - const QStringList & ) +SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, + const TQStringList & ) : KParts::Plugin( parent, name ), mConfig(0) { @@ -57,40 +57,40 @@ SettingsPlugin::SettingsPlugin( QObject* parent, const char* name, action = new KToggleAction( i18n("Java&Script"), 0, - this, SLOT(toggleJavascript()), + this, TQT_SLOT(toggleJavascript()), actionCollection(), "javascript" ); menu->insert( action ); action = new KToggleAction( i18n("&Java"), 0, - this, SLOT(toggleJava()), + this, TQT_SLOT(toggleJava()), actionCollection(), "java" ); menu->insert( action ); action = new KToggleAction( i18n("&Cookies"), 0, - this, SLOT(toggleCookies()), + this, TQT_SLOT(toggleCookies()), actionCollection(), "cookies" ); menu->insert( action ); action = new KToggleAction( i18n("&Plugins"), 0, - this, SLOT(togglePlugins()), + this, TQT_SLOT(togglePlugins()), actionCollection(), "plugins" ); menu->insert( action ); action = new KToggleAction( i18n("Autoload &Images"), 0, - this, SLOT(toggleImageLoading()), + this, TQT_SLOT(toggleImageLoading()), actionCollection(), "imageloading" ); menu->insert( action ); menu->insert( new KActionSeparator(actionCollection()) ); action = new KToggleAction( i18n("Enable Pro&xy"), 0, - this, SLOT(toggleProxy()), + this, TQT_SLOT(toggleProxy()), actionCollection(), "useproxy" ); action->setCheckedState(i18n("Disable Pro&xy")); menu->insert( action ); action = new KToggleAction( i18n("Enable Cac&he"), 0, - this, SLOT(toggleCache()), + this, TQT_SLOT(toggleCache()), actionCollection(), "usecache" ); action->setCheckedState(i18n("Disable Cac&he")); menu->insert( action ); @@ -99,16 +99,16 @@ SettingsPlugin::SettingsPlugin( QObject* parent, const char* name, KSelectAction *sAction = new KSelectAction( i18n("Cache Po&licy"), 0, 0, 0, actionCollection(), "cachepolicy" ); - QStringList policies; + TQStringList policies; policies += i18n( "&Keep Cache in Sync" ); policies += i18n( "&Use Cache if Possible" ); policies += i18n( "&Offline Browsing Mode" ); sAction->setItems( policies ); - connect( sAction, SIGNAL( activated( int ) ), SLOT( cachePolicyChanged(int) ) ); + connect( sAction, TQT_SIGNAL( activated( int ) ), TQT_SLOT( cachePolicyChanged(int) ) ); menu->insert( sAction ); - connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() )); + connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() )); } SettingsPlugin::~SettingsPlugin() @@ -182,16 +182,16 @@ void SettingsPlugin::toggleCookies() KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); - QString advice; + TQString advice; bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); advice = enable ? "Accept" : "Reject"; - QCString replyType; - QByteArray data, replyData; - QDataStream stream( data, IO_WriteOnly ); + TQCString replyType; + TQByteArray data, replyData; + TQDataStream stream( data, IO_WriteOnly ); stream << part->url().url() << advice; bool ok = kapp->dcopClient()->call( "kded", "kcookiejar", - "setDomainAdvice(QString,QString)", + "setDomainAdvice(TQString,TQString)", data, replyType, replyData, true ); if ( !ok ) @@ -219,20 +219,20 @@ void SettingsPlugin::toggleImageLoading() } } -bool SettingsPlugin::cookiesEnabled( const QString& url ) +bool SettingsPlugin::cookiesEnabled( const TQString& url ) { - QByteArray data, reply; - QCString replyType; - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data, reply; + TQCString replyType; + TQDataStream stream( data, IO_WriteOnly ); stream << url; - kapp->dcopClient()->call( "kcookiejar", "kcookiejar", "getDomainAdvice(QString)", data, replyType, reply, true ); + kapp->dcopClient()->call( "kcookiejar", "kcookiejar", "getDomainAdvice(TQString)", data, replyType, reply, true ); bool enabled = false; - if ( replyType == "QString" ) + if ( replyType == "TQString" ) { - QString advice; - QDataStream s( reply, IO_ReadOnly ); + TQString advice; + TQDataStream s( reply, IO_ReadOnly ); s >> advice; enabled = ( advice == "Accept" ); if ( !enabled && advice == "Dunno" ) { @@ -288,7 +288,7 @@ void SettingsPlugin::toggleCache() void SettingsPlugin::cachePolicyChanged( int p ) { - QString policy; + TQString policy; switch ( p ) { case 0: @@ -312,17 +312,17 @@ void SettingsPlugin::cachePolicyChanged( int p ) void SettingsPlugin::updateIOSlaves() { - QByteArray data; - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream stream( data, IO_WriteOnly ); DCOPClient* client = kapp->dcopClient(); if ( !client->isAttached() ) client->attach(); - QString protocol; // null -> all of them + TQString protocol; // null -> all of them stream << protocol; client->send( "*", "KIO::Scheduler", - "reparseSlaveConfiguration(QString)", data ); + "reparseSlaveConfiguration(TQString)", data ); } #include "settingsplugin.moc" diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h index 367846b..63be54d 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h @@ -29,12 +29,12 @@ class SettingsPlugin : public KParts::Plugin { Q_OBJECT public: - SettingsPlugin( QObject* parent, const char* name, - const QStringList & ); + SettingsPlugin( TQObject* parent, const char* name, + const TQStringList & ); virtual ~SettingsPlugin(); private: - bool cookiesEnabled( const QString& url ); + bool cookiesEnabled( const TQString& url ); void updateIOSlaves(); private slots: diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 54db458..87e2e31 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -18,15 +18,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qvbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qspinbox.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqspinbox.h> #include <klocale.h> @@ -44,7 +44,7 @@ Boston, MA 02110-1301, USA. #include "imgallerydialog.h" #include "imgallerydialog.moc" -KIGPDialog::KIGPDialog(QWidget *parent, const QString& path, const char *name ) +KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name ) : KDialogBase( IconList, i18n("Configure"), Default|Ok|Cancel, Ok, parent, name, true, true ), m_dialogOk( false ) @@ -67,8 +67,8 @@ void KIGPDialog::slotDefault() m_imageProperty->setChecked(false); m_fontName->setCurrentText( KGlobalSettings::generalFont().family() ); m_fontSize->setValue(14); - m_foregroundColor->setColor( QColor( "#d0ffd0") ); - m_backgroundColor->setColor( QColor("#333333") ); + m_foregroundColor->setColor( TQColor( "#d0ffd0") ); + m_backgroundColor->setColor( TQColor("#333333") ); m_imageNameReq->setURL(m_path + "images.html"); m_recurseSubDir->setChecked( false ); @@ -84,19 +84,19 @@ void KIGPDialog::slotDefault() m_colorDepth->setCurrentText("8"); } -void KIGPDialog::setupLookPage(const QString& path) { - QFrame *page = addPage( i18n("Look"), i18n("Page Look"), +void KIGPDialog::setupLookPage(const TQString& path) { + TQFrame *page = addPage( i18n("Look"), i18n("Page Look"), BarIcon("colorize", KIcon::SizeMedium ) ); m_config->setGroup("Look"); - QVBoxLayout *vlay = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *label; + TQLabel *label; - label = new QLabel( i18n("&Page title:"), page); + label = new TQLabel( i18n("&Page title:"), page); vlay->addWidget(label); - m_title = new QLineEdit(i18n("Image Gallery for %1").arg(path), page); + m_title = new TQLineEdit(i18n("Image Gallery for %1").arg(path), page); vlay->addWidget( m_title ); label->setBuddy(m_title); @@ -105,67 +105,67 @@ void KIGPDialog::setupLookPage(const QString& path) { m_imagesPerRow->setLabel( i18n("I&mages per row:") ); vlay->addWidget( m_imagesPerRow ); - QGridLayout *grid = new QGridLayout( 2, 2 ); + TQGridLayout *grid = new TQGridLayout( 2, 2 ); vlay->addLayout( grid ); - m_imageName = new QCheckBox( i18n("Show image file &name"), page); + m_imageName = new TQCheckBox( i18n("Show image file &name"), page); m_imageName->setChecked( m_config->readBoolEntry("ImageName", true) ); grid->addWidget( m_imageName, 0, 0 ); - m_imageSize = new QCheckBox( i18n("Show image file &size"), page); + m_imageSize = new TQCheckBox( i18n("Show image file &size"), page); m_imageSize->setChecked( m_config->readBoolEntry("ImageSize", false) ); grid->addWidget( m_imageSize, 0, 1 ); - m_imageProperty = new QCheckBox( i18n("Show image &dimensions"), page); + m_imageProperty = new TQCheckBox( i18n("Show image &dimensions"), page); m_imageProperty->setChecked( m_config->readBoolEntry("ImageProperty", false) ); grid->addWidget( m_imageProperty, 1, 0 ); - QHBoxLayout *hlay11 = new QHBoxLayout( ); + TQHBoxLayout *hlay11 = new TQHBoxLayout( ); vlay->addLayout( hlay11 ); - m_fontName = new QComboBox( false,page ); - QStringList standardFonts; + m_fontName = new TQComboBox( false,page ); + TQStringList standardFonts; KFontChooser::getFontList(standardFonts, 0); m_fontName->insertStringList( standardFonts ); m_fontName->setCurrentText( m_config->readEntry("FontName", KGlobalSettings::generalFont().family() ) ); - label = new QLabel( i18n("Fon&t name:"), page ); + label = new TQLabel( i18n("Fon&t name:"), page ); label->setBuddy( m_fontName ); hlay11->addWidget( label ); hlay11->addStretch( 1 ); hlay11->addWidget( m_fontName ); - QHBoxLayout *hlay12 = new QHBoxLayout( ); + TQHBoxLayout *hlay12 = new TQHBoxLayout( ); vlay->addLayout( hlay12 ); - m_fontSize = new QSpinBox( 6, 15, 1, page ); + m_fontSize = new TQSpinBox( 6, 15, 1, page ); m_fontSize->setValue( m_config->readNumEntry("FontSize", 14) ); - label = new QLabel( i18n("Font si&ze:"), page ); + label = new TQLabel( i18n("Font si&ze:"), page ); label->setBuddy( m_fontSize ); hlay12->addWidget( label ); hlay12->addStretch( 1 ); hlay12->addWidget( m_fontSize ); - QHBoxLayout *hlay1 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay1 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay1 ); m_foregroundColor = new KColorButton(page); - m_foregroundColor->setColor( QColor( m_config->readEntry("ForegroundColor", "#d0ffd0") ) ); + m_foregroundColor->setColor( TQColor( m_config->readEntry("ForegroundColor", "#d0ffd0") ) ); - label = new QLabel( i18n("&Foreground color:"), page); + label = new TQLabel( i18n("&Foreground color:"), page); label->setBuddy( m_foregroundColor ); hlay1->addWidget( label ); hlay1->addStretch( 1 ); hlay1->addWidget(m_foregroundColor); - QHBoxLayout *hlay2 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay2 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay2 ); m_backgroundColor = new KColorButton(page); - m_backgroundColor->setColor( QColor(m_config->readEntry("BackgroundColor", "#333333") ) ); + m_backgroundColor->setColor( TQColor(m_config->readEntry("BackgroundColor", "#333333") ) ); - label = new QLabel( i18n("&Background color:"), page); + label = new TQLabel( i18n("&Background color:"), page); hlay2->addWidget( label ); label->setBuddy( m_backgroundColor ); hlay2->addStretch( 1 ); @@ -174,33 +174,33 @@ void KIGPDialog::setupLookPage(const QString& path) { vlay->addStretch(1); } -void KIGPDialog::setupDirectoryPage(const QString& path) { - QFrame *page = addPage( i18n("Folders"), i18n("Folders"), +void KIGPDialog::setupDirectoryPage(const TQString& path) { + TQFrame *page = addPage( i18n("Folders"), i18n("Folders"), BarIcon("folder", KIcon::SizeMedium ) ); m_config->setGroup("Directory"); - QVBoxLayout *dvlay = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *dvlay = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *label; - label = new QLabel(i18n("&Save to HTML file:"), page); + TQLabel *label; + label = new TQLabel(i18n("&Save to HTML file:"), page); dvlay->addWidget( label ); - QString whatsThis; + TQString whatsThis; whatsThis = i18n("<p>The name of the HTML file this gallery will be saved to."); - QWhatsThis::add( label, whatsThis ); + TQWhatsThis::add( label, whatsThis ); m_imageNameReq = new KURLRequester(path + "images.html", page); label->setBuddy( m_imageNameReq ); dvlay->addWidget(m_imageNameReq); - connect( m_imageNameReq, SIGNAL(textChanged(const QString&)), - this, SLOT(imageUrlChanged(const QString&)) ); - QWhatsThis::add( m_imageNameReq, whatsThis ); + connect( m_imageNameReq, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(imageUrlChanged(const TQString&)) ); + TQWhatsThis::add( m_imageNameReq, whatsThis ); const bool recurseSubDir = m_config->readBoolEntry("RecurseSubDirectories", false); - m_recurseSubDir = new QCheckBox(i18n("&Recurse subfolders"), page); + m_recurseSubDir = new TQCheckBox(i18n("&Recurse subfolders"), page); m_recurseSubDir->setChecked( recurseSubDir ); whatsThis = i18n("<p>Whether subfolders should be included for the " "image gallery creation or not."); - QWhatsThis::add( m_recurseSubDir, whatsThis ); + TQWhatsThis::add( m_recurseSubDir, whatsThis ); const int recursionLevel = m_config->readNumEntry("RecursionLevel", 0); m_recursionLevel = new KIntNumInput( recursionLevel, page ); @@ -212,25 +212,25 @@ void KIGPDialog::setupDirectoryPage(const QString& path) { whatsThis = i18n("<p>You can limit the number of folders the " "image gallery creator will traverse to by setting an " "upper bound for the recursion depth."); - QWhatsThis::add( m_recursionLevel, whatsThis ); + TQWhatsThis::add( m_recursionLevel, whatsThis ); - connect(m_recurseSubDir, SIGNAL( toggled(bool) ), - m_recursionLevel, SLOT( setEnabled(bool) ) ); + connect(m_recurseSubDir, TQT_SIGNAL( toggled(bool) ), + m_recursionLevel, TQT_SLOT( setEnabled(bool) ) ); dvlay->addWidget(m_recurseSubDir); dvlay->addWidget(m_recursionLevel); - m_copyOriginalFiles = new QCheckBox(i18n("Copy or&iginal files"), page); + m_copyOriginalFiles = new TQCheckBox(i18n("Copy or&iginal files"), page); m_copyOriginalFiles->setChecked(m_config->readBoolEntry("CopyOriginalFiles", false) ); dvlay->addWidget(m_copyOriginalFiles); whatsThis = i18n("<p>This makes a copy of all images and the gallery will refer " "to these copies instead of the original images."); - QWhatsThis::add( m_copyOriginalFiles, whatsThis ); + TQWhatsThis::add( m_copyOriginalFiles, whatsThis ); const bool useCommentFile = m_config->readBoolEntry("UseCommentFile", false); - m_useCommentFile = new QCheckBox(i18n("Use &comment file"), page); + m_useCommentFile = new TQCheckBox(i18n("Use &comment file"), page); m_useCommentFile->setChecked(useCommentFile); dvlay->addWidget(m_useCommentFile); @@ -239,9 +239,9 @@ void KIGPDialog::setupDirectoryPage(const QString& path) { "subtitles for the images." "<p>For details about the file format please see " "the \"What's This?\" help below."); - QWhatsThis::add( m_useCommentFile, whatsThis ); + TQWhatsThis::add( m_useCommentFile, whatsThis ); - label = new QLabel(i18n("Comments &file:"), page); + label = new TQLabel(i18n("Comments &file:"), page); label->setEnabled( useCommentFile ); dvlay->addWidget( label ); whatsThis = i18n("<p>You can specify the name of the comment file here. " @@ -254,40 +254,40 @@ void KIGPDialog::setupDirectoryPage(const QString& path) { "<br>Description" "<br>" "<br>and so on"); - QWhatsThis::add( label, whatsThis ); + TQWhatsThis::add( label, whatsThis ); m_commentFileReq = new KURLRequester(path + "comments", page); m_commentFileReq->setEnabled(useCommentFile); label->setBuddy( m_commentFileReq ); dvlay->addWidget(m_commentFileReq); - QWhatsThis::add( m_commentFileReq, whatsThis ); + TQWhatsThis::add( m_commentFileReq, whatsThis ); - connect(m_useCommentFile, SIGNAL(toggled(bool)), - label, SLOT(setEnabled(bool))); - connect(m_useCommentFile, SIGNAL(toggled(bool)), - m_commentFileReq, SLOT(setEnabled(bool))); + connect(m_useCommentFile, TQT_SIGNAL(toggled(bool)), + label, TQT_SLOT(setEnabled(bool))); + connect(m_useCommentFile, TQT_SIGNAL(toggled(bool)), + m_commentFileReq, TQT_SLOT(setEnabled(bool))); dvlay->addStretch(1); } -void KIGPDialog::setupThumbnailPage(const QString& path) { - QFrame *page = addPage( i18n("Thumbnails"), i18n("Thumbnails"), +void KIGPDialog::setupThumbnailPage(const TQString& path) { + TQFrame *page = addPage( i18n("Thumbnails"), i18n("Thumbnails"), BarIcon("thumbnail", KIcon::SizeMedium ) ); m_config->setGroup("Thumbnails"); - QLabel *label; + TQLabel *label; - QVBoxLayout *vlay = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); - QHBoxLayout *hlay3 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay3 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay3 ); - m_imageFormat = new QComboBox(false, page); + m_imageFormat = new TQComboBox(false, page); m_imageFormat->insertItem("JPEG"); m_imageFormat->insertItem("PNG"); m_imageFormat->setCurrentText( m_config->readEntry("ImageFormat", "JPEG") ); - label = new QLabel( i18n("Image format f&or the thumbnails:"), page); + label = new TQLabel( i18n("Image format f&or the thumbnails:"), page); hlay3->addWidget( label ); label->setBuddy( m_imageFormat ); hlay3->addStretch( 1 ); @@ -298,17 +298,17 @@ void KIGPDialog::setupThumbnailPage(const QString& path) { m_thumbnailSize->setLabel( i18n("Thumbnail size:") ); vlay->addWidget( m_thumbnailSize ); - QGridLayout *grid = new QGridLayout( 2, 2 ); + TQGridLayout *grid = new TQGridLayout( 2, 2 ); vlay->addLayout( grid ); - QHBoxLayout *hlay4 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay4 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay4 ); const bool colorDepthSet = m_config->readBoolEntry("ColorDepthSet", false); - m_colorDepthSet = new QCheckBox(i18n("&Set different color depth:"), page); + m_colorDepthSet = new TQCheckBox(i18n("&Set different color depth:"), page); m_colorDepthSet->setChecked(colorDepthSet); hlay4->addWidget( m_colorDepthSet ); - m_colorDepth = new QComboBox(false, page); + m_colorDepth = new TQComboBox(false, page); m_colorDepth->insertItem("1"); m_colorDepth->insertItem("8"); m_colorDepth->insertItem("16"); @@ -317,8 +317,8 @@ void KIGPDialog::setupThumbnailPage(const QString& path) { m_colorDepth->setEnabled(colorDepthSet); hlay4->addWidget( m_colorDepth ); - connect(m_colorDepthSet, SIGNAL( toggled(bool) ), - m_colorDepth, SLOT( setEnabled(bool) ) ); + connect(m_colorDepthSet, TQT_SIGNAL( toggled(bool) ), + m_colorDepth, TQT_SLOT( setEnabled(bool) ) ); vlay->addStretch(1); @@ -354,7 +354,7 @@ KIGPDialog::~KIGPDialog() { } -void KIGPDialog::imageUrlChanged(const QString &url ) +void KIGPDialog::imageUrlChanged(const TQString &url ) { enableButtonOK( !url.isEmpty()); } @@ -414,42 +414,42 @@ bool KIGPDialog::colorDepthSet() const return m_colorDepthSet->isChecked(); } -const QString KIGPDialog::getTitle() const +const TQString KIGPDialog::getTitle() const { return m_title->text(); } -const QString KIGPDialog::getImageName() const +const TQString KIGPDialog::getImageName() const { return m_imageNameReq->url(); } -const QString KIGPDialog::getCommentFile() const +const TQString KIGPDialog::getCommentFile() const { return m_commentFileReq->url(); } -const QString KIGPDialog::getFontName() const +const TQString KIGPDialog::getFontName() const { return m_fontName->currentText(); } -const QString KIGPDialog::getFontSize() const +const TQString KIGPDialog::getFontSize() const { return m_fontSize->text(); } -const QColor KIGPDialog::getBackgroundColor() const +const TQColor KIGPDialog::getBackgroundColor() const { return m_backgroundColor->color(); } -const QColor KIGPDialog::getForegroundColor() const +const TQColor KIGPDialog::getForegroundColor() const { return m_foregroundColor->color(); } -const QString KIGPDialog::getImageFormat() const +const TQString KIGPDialog::getImageFormat() const { return m_imageFormat->currentText(); } diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h index 7aa6163..22cf68e 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.h +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h @@ -34,14 +34,14 @@ class QSpinBox; class KColorButton; class KConfig; -typedef QMap<QString,QString> CommentMap; +typedef TQMap<TQString,TQString> CommentMap; class KIGPDialog : public KDialogBase { Q_OBJECT public: - KIGPDialog(QWidget *parent=0, const QString& path=0, const char *name=0 ); + KIGPDialog(TQWidget *parent=0, const TQString& path=0, const char *name=0 ); ~KIGPDialog(); bool isDialogOk() const; @@ -58,45 +58,45 @@ class KIGPDialog : public KDialogBase int getThumbnailSize() const; int getColorDepth() const; - const QString getTitle() const; - const QString getImageName() const; - const QString getCommentFile() const; - const QString getFontName() const; - const QString getFontSize() const; + const TQString getTitle() const; + const TQString getImageName() const; + const TQString getCommentFile() const; + const TQString getFontName() const; + const TQString getFontSize() const; - const QColor getBackgroundColor() const; - const QColor getForegroundColor() const; + const TQColor getBackgroundColor() const; + const TQColor getForegroundColor() const; - const QString getImageFormat() const; + const TQString getImageFormat() const; void writeConfig(); protected slots: - void imageUrlChanged(const QString & ); + void imageUrlChanged(const TQString & ); void slotDefault(); private: KColorButton *m_foregroundColor; KColorButton *m_backgroundColor; - QLineEdit *m_title; - QString m_path; + TQLineEdit *m_title; + TQString m_path; KIntNumInput *m_imagesPerRow; KIntNumInput *m_thumbnailSize; KIntNumInput *m_recursionLevel; - QSpinBox *m_fontSize; + TQSpinBox *m_fontSize; - QCheckBox *m_copyOriginalFiles; - QCheckBox *m_imageName; - QCheckBox *m_imageSize; - QCheckBox *m_imageProperty; - QCheckBox *m_useCommentFile; - QCheckBox *m_recurseSubDir; - QCheckBox *m_colorDepthSet; + TQCheckBox *m_copyOriginalFiles; + TQCheckBox *m_imageName; + TQCheckBox *m_imageSize; + TQCheckBox *m_imageProperty; + TQCheckBox *m_useCommentFile; + TQCheckBox *m_recurseSubDir; + TQCheckBox *m_colorDepthSet; - QComboBox* m_fontName; - QComboBox* m_imageFormat; - QComboBox* m_colorDepth; + TQComboBox* m_fontName; + TQComboBox* m_imageFormat; + TQComboBox* m_colorDepth; KURLRequester *m_imageNameReq; KURLRequester *m_commentFileReq; @@ -105,9 +105,9 @@ class KIGPDialog : public KDialogBase KConfig *m_config; private: - void setupLookPage(const QString& path); - void setupDirectoryPage(const QString& path); - void setupThumbnailPage(const QString& path); + void setupLookPage(const TQString& path); + void setupDirectoryPage(const TQString& path); + void setupThumbnailPage(const TQString& path); }; #endif diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 43df35b..4b9a5e0 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -18,16 +18,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qdir.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qfont.h> -#include <qdatetime.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qprogressdialog.h> -#include <qtextcodec.h> -#include <qstylesheet.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqfont.h> +#include <tqdatetime.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqprogressdialog.h> +#include <tqtextcodec.h> +#include <tqstylesheet.h> #include <kaction.h> #include <kglobal.h> @@ -48,11 +48,11 @@ Boston, MA 02110-1301, USA. typedef KGenericFactory<KImGalleryPlugin> KImGalleryPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) ) -KImGalleryPlugin::KImGalleryPlugin( QObject* parent, const char* name, const QStringList & ) +KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) : KParts::Plugin( parent, name ), m_commentMap(0) { new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, - SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); + TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); } void KImGalleryPlugin::slotExecute() @@ -71,7 +71,7 @@ void KImGalleryPlugin::slotExecute() kdDebug(90170) << "dialog is ok" << endl; m_configDlg = new KIGPDialog(m_part->widget(), m_part->url().path(+1)); - if ( m_configDlg->exec() == QDialog::Accepted ) { + if ( m_configDlg->exec() == TQDialog::Accepted ) { kdDebug(90170) << "dialog is ok" << endl; m_configDlg->writeConfig(); m_copyFiles = m_configDlg->copyOriginalFiles(); @@ -81,8 +81,8 @@ void KImGalleryPlugin::slotExecute() KURL url(m_configDlg->getImageName()); if ( !url.isEmpty() && url.isValid()) { - m_progressDlg = new QProgressDialog(m_part->widget(), "progressDlg", true ); - QObject::connect(m_progressDlg, SIGNAL( cancelled() ), this, SLOT( slotCancelled() ) ); + m_progressDlg = new TQProgressDialog(m_part->widget(), "progressDlg", true ); + TQObject::connect(m_progressDlg, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( slotCancelled() ) ); m_progressDlg->setLabelText( i18n("Creating thumbnails") ); m_progressDlg->setCancelButton(new KPushButton(KStdGuiItem::cancel(),m_progressDlg)); @@ -100,7 +100,7 @@ void KImGalleryPlugin::slotExecute() delete m_progressDlg; } -bool KImGalleryPlugin::createDirectory(QDir thumb_dir, QString imgGalleryDir, QString dirName) +bool KImGalleryPlugin::createDirectory(TQDir thumb_dir, TQString imgGalleryDir, TQString dirName) { if (!thumb_dir.exists()) { thumb_dir.setPath( imgGalleryDir); @@ -116,25 +116,25 @@ bool KImGalleryPlugin::createDirectory(QDir thumb_dir, QString imgGalleryDir, QS } } -void KImGalleryPlugin::createHead(QTextStream& stream) +void KImGalleryPlugin::createHead(TQTextStream& stream) { - const QString chsetName = QTextCodec::codecForLocale()->mimeName(); + const TQString chsetName = TQTextCodec::codecForLocale()->mimeName(); stream << "<?xml version=\"1.0\" encoding=\"" + chsetName + "\" ?>" << endl; stream << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">" << endl; stream << "<html xmlns=\"http://www.w3.org/1999/xhtml\">" << endl; stream << "<head>" << endl; - stream << "<title>" << QStyleSheet::escape(m_configDlg->getTitle()) << "</title>" << endl; + stream << "<title>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</title>" << endl; stream << "<meta http-equiv=\"content-type\" content=\"text/html; charset=" << chsetName << "\"/>" << endl; stream << "<meta name=\"GENERATOR\" content=\"KDE Konqueror KImgallery plugin version " KDE_VERSION_STRING "\"/>" << endl; createCSSSection(stream); stream << "</head>" << endl; } -void KImGalleryPlugin::createCSSSection(QTextStream& stream) +void KImGalleryPlugin::createCSSSection(TQTextStream& stream) { - const QString backgroundColor = m_configDlg->getBackgroundColor().name(); - const QString foregroundColor = m_configDlg->getForegroundColor().name(); + const TQString backgroundColor = m_configDlg->getBackgroundColor().name(); + const TQString foregroundColor = m_configDlg->getForegroundColor().name(); //adding a touch of style stream << "<style type='text/css'>\n"; stream << "BODY {color: " << foregroundColor << "; background: " << backgroundColor << ";" << endl; @@ -148,24 +148,24 @@ void KImGalleryPlugin::createCSSSection(QTextStream& stream) } -QString KImGalleryPlugin::extension(const QString& imageFormat) +TQString KImGalleryPlugin::extension(const TQString& imageFormat) { if (imageFormat == "PNG") return ".png"; if (imageFormat == "JPEG") return ".jpg"; Q_ASSERT(false); - return QString::null; + return TQString::null; } -void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirName, const QStringList& subDirList, - const QDir& imageDir, const KURL& url, const QString& imageFormat) +void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDirName, const TQStringList& subDirList, + const TQDir& imageDir, const KURL& url, const TQString& imageFormat) { int numOfImages = imageDir.count(); - const QString imgGalleryDir = url.directory(); - const QString today(KGlobal::locale()->formatDate(QDate::currentDate())); + const TQString imgGalleryDir = url.directory(); + const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); - stream << "<body>\n<h1>" << QStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl; + 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; @@ -173,7 +173,7 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN if (m_recurseSubDirectories && subDirList.count() > 2) { //subDirList.count() is always >= 2 because of the "." and ".." directories stream << i18n("<i>Subfolders</i>:") << "<br>" << endl; - for (QStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { + for (TQStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { if (*it == "." || *it == "..") continue; //disregard the "." and ".." directories stream << "<a href=\"" << *it << "/" << url.fileName() @@ -186,13 +186,13 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN //table with images int imgIndex; - QFileInfo imginfo; - QPixmap imgProp; + TQFileInfo imginfo; + TQPixmap imgProp; for (imgIndex = 0; !m_cancelled && (imgIndex < numOfImages);) { stream << "<tr>" << endl; for (int col=0; !m_cancelled && (col < m_imagesPerRow) && (imgIndex < numOfImages); col++) { - const QString imgName = imageDir[imgIndex]; + const TQString imgName = imageDir[imgIndex]; if (m_copyFiles) { stream << "<td align='center'>\n<a href=\"images/" << imgName << "\">"; @@ -202,7 +202,7 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN if (createThumb(imgName, sourceDirName, imgGalleryDir, imageFormat)) { - const QString imgPath("thumbs/" + imgName + extension(imageFormat)); + 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) ); @@ -227,8 +227,8 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN } if (m_useCommentFile) { - QString imgComment = (*m_commentMap)[imgName]; - stream << "<div>" << QStyleSheet::escape(imgComment) << "</div>" << endl; + TQString imgComment = (*m_commentMap)[imgName]; + stream << "<div>" << TQStyleSheet::escape(imgComment) << "</div>" << endl; } stream << "</td>" << endl; @@ -244,7 +244,7 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN } -bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat) +bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat) { if(m_cancelled) return false; @@ -253,16 +253,16 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, return false; KonqDirPart * part = static_cast<KonqDirPart *>(parent()); - QStringList subDirList; + TQStringList subDirList; if (m_recurseSubDirectories && (recursionLevel >= 0)) { //recursionLevel == 0 means endless - QDir toplevel_dir = QDir( sourceDirName ); - toplevel_dir.setFilter( QDir::Dirs | QDir::Readable | QDir::Writable ); + TQDir toplevel_dir = TQDir( sourceDirName ); + toplevel_dir.setFilter( TQDir::Dirs | TQDir::Readable | TQDir::Writable ); subDirList = toplevel_dir.entryList(); - for (QStringList::ConstIterator it = subDirList.begin(); it != subDirList.end() && !m_cancelled; it++) { - const QString currentDir = *it; + for (TQStringList::ConstIterator it = subDirList.begin(); it != subDirList.end() && !m_cancelled; it++) { + const TQString currentDir = *it; if (currentDir == "." || currentDir == "..") { continue;} //disregard the "." and ".." directories - QDir subDir = QDir( url.directory() + "/" + currentDir ); + TQDir subDir = TQDir( url.directory() + "/" + currentDir ); if (!subDir.exists()) { subDir.setPath( url.directory() ); if (!(subDir.mkdir(currentDir, false))) { @@ -284,33 +284,33 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, kdDebug(90170) << "sourceDirName: " << sourceDirName << endl; //We're interested in only the patterns, so look for the first | //#### perhaps an accessor should be added to KImageIO instead? - QString filter = KImageIO::pattern(KImageIO::Reading).section('|', 0, 0); + TQString filter = KImageIO::pattern(KImageIO::Reading).section('|', 0, 0); - QDir imageDir( sourceDirName, filter.latin1(), - QDir::Name|QDir::IgnoreCase, QDir::Files|QDir::Readable); + TQDir imageDir( sourceDirName, filter.latin1(), + TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable); - const QString imgGalleryDir = url.directory(); + const TQString imgGalleryDir = url.directory(); kdDebug(90170) << "imgGalleryDir: " << imgGalleryDir << endl; // Create the "thumbs" subdirectory if necessary - QDir thumb_dir( imgGalleryDir + QString::fromLatin1("/thumbs/")); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false) return false; // Create the "images" subdirectory if necessary - QDir images_dir( imgGalleryDir + QString::fromLatin1("/images/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); if (m_copyFiles) { if (createDirectory(images_dir, imgGalleryDir, "images") == false) return false; } - QFile file( url.path() ); + TQFile file( url.path() ); kdDebug(90170) << "url.path(): " << url.path() << ", thumb_dir: "<< thumb_dir.path() << ", imageDir: "<< imageDir.path() << endl; if ( imageDir.exists() && file.open(IO_WriteOnly) ) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::Locale); + TQTextStream stream(&file); + stream.setEncoding(TQTextStream::Locale); createHead(stream); createBody(stream, sourceDirName, subDirList, imageDir, url, imageFormat); //ugly @@ -325,15 +325,15 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, } } -void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat) +void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat) { if (m_recurseSubDirectories && (recursionLevel >= 0)) { - QStringList subDirList; - QDir toplevel_dir = QDir( sourceDirName ); - toplevel_dir.setFilter( QDir::Dirs ); + TQStringList subDirList; + TQDir toplevel_dir = TQDir( sourceDirName ); + toplevel_dir.setFilter( TQDir::Dirs ); subDirList = toplevel_dir.entryList(); - for (QStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { + for (TQStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { if (*it == "." || *it == ".." || *it == "thumbs" || (m_copyFiles && *it == "images")) { continue; //disregard the "." and ".." directories } @@ -343,19 +343,19 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& so } } - const QString imgGalleryDir = url.directory(); - QDir thumb_dir( imgGalleryDir + QString::fromLatin1("/thumbs/")); - QDir images_dir( imgGalleryDir + QString::fromLatin1("/images/")); - QDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP", - QDir::Name|QDir::IgnoreCase, QDir::Files|QDir::Readable); - QFile file( url.path() ); + const TQString imgGalleryDir = url.directory(); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); + TQDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP", + TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable); + TQFile file( url.path() ); // Remove the image file .. file.remove(); // ..all the thumbnails .. for (uint i=0; i < imageDir.count(); i++) { - const QString imgName = imageDir[i]; - const QString imgNameFormat = imgName + extension(imageFormat); + const TQString imgName = imageDir[i]; + const TQString imgNameFormat = imgName + extension(imageFormat); bool isRemoved = thumb_dir.remove(imgNameFormat); kdDebug(90170) << "removing: " << thumb_dir.path() << "/" << imgNameFormat << "; "<< isRemoved << endl; } @@ -365,7 +365,7 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& so // ..and the images directory if images were to be copied if (m_copyFiles) { for (uint i=0; i < imageDir.count(); i++) { - const QString imgName = imageDir[i]; + const TQString imgName = imageDir[i]; bool isRemoved = images_dir.remove(imgName); kdDebug(90170) << "removing: " << images_dir.path() << "/" << imgName << "; "<< isRemoved << endl; } @@ -375,24 +375,24 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& so void KImGalleryPlugin::loadCommentFile() { - QFile file(m_configDlg->getCommentFile()); + TQFile file(m_configDlg->getCommentFile()); if (file.open(IO_ReadOnly)) { kdDebug(90170) << "File opened."<< endl; - QTextStream* m_textStream = new QTextStream(&file); - m_textStream->setEncoding(QTextStream::Locale); + TQTextStream* m_textStream = new TQTextStream(&file); + m_textStream->setEncoding(TQTextStream::Locale); delete m_commentMap; m_commentMap = new CommentMap; - QString picName, picComment, curLine, curLineStripped; + TQString picName, picComment, curLine, curLineStripped; while (!m_textStream->eof()) { curLine = m_textStream->readLine(); curLineStripped = curLine.stripWhiteSpace(); // Lines starting with '#' are comment if (!(curLineStripped.isEmpty()) && !curLineStripped.startsWith("#")) { if (curLineStripped.endsWith(":")) { - picComment = QString::null; + picComment = TQString::null; picName = curLineStripped.left(curLineStripped.length()-1); kdDebug(90170) << "picName: " << picName << endl; } else { @@ -420,22 +420,22 @@ void KImGalleryPlugin::loadCommentFile() } } -bool KImGalleryPlugin::createThumb( const QString& imgName, const QString& sourceDirName, - const QString& imgGalleryDir, const QString& imageFormat) +bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sourceDirName, + const TQString& imgGalleryDir, const TQString& imageFormat) { - QImage img; - const QString pixPath = sourceDirName + QString::fromLatin1("/") + imgName; + TQImage img; + const TQString pixPath = sourceDirName + TQString::fromLatin1("/") + imgName; if (m_copyFiles) { KURL srcURL = KURL::fromPathOrURL(pixPath); //kdDebug(90170) << "srcURL: " << srcURL << endl; - KURL destURL = KURL::fromPathOrURL(imgGalleryDir + QString::fromLatin1("/images/") + imgName); + KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName); //kdDebug(90170) << "destURL: " << destURL << endl; KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget()); } - const QString imgNameFormat = imgName + extension(imageFormat); - const QString thumbDir = imgGalleryDir + QString::fromLatin1("/thumbs/"); + const TQString imgNameFormat = imgName + extension(imageFormat); + const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/"); int extent = m_configDlg->getThumbnailSize(); // this code is stolen from kdebase/kioslave/thumbnail/imagecreator.cpp @@ -465,7 +465,7 @@ bool KImGalleryPlugin::createThumb( const QString& imgName, const QString& sourc h = extent; Q_ASSERT( w <= extent ); } - const QImage scaleImg(img.smoothScale( w, h )); + const TQImage scaleImg(img.smoothScale( w, h )); if ( scaleImg.width() != w || scaleImg.height() != h ) { kdDebug(90170) << "Resizing failed. Aborting." << endl; @@ -474,7 +474,7 @@ bool KImGalleryPlugin::createThumb( const QString& imgName, const QString& sourc img = scaleImg; if (m_configDlg->colorDepthSet() == true ) { - const QImage depthImg(img.convertDepth(m_configDlg->getColorDepth())); + const TQImage depthImg(img.convertDepth(m_configDlg->getColorDepth())); img = depthImg; } } diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h index 6b580a0..7520f0b 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h @@ -30,14 +30,14 @@ class QProgressDialog; class KURL; class KIGPDialog; -typedef QMap<QString,QString> CommentMap; +typedef TQMap<TQString,TQString> CommentMap; class KImGalleryPlugin : public KParts::Plugin { Q_OBJECT public: - KImGalleryPlugin( QObject* parent, const char* name, - const QStringList & ); + KImGalleryPlugin( TQObject* parent, const char* name, + const TQStringList & ); ~KImGalleryPlugin() {} public slots: @@ -54,7 +54,7 @@ class KImGalleryPlugin : public KParts::Plugin int m_imgHeight; int m_imagesPerRow; - QProgressDialog *m_progressDlg; + TQProgressDialog *m_progressDlg; KonqDirPart* m_part; @@ -62,19 +62,19 @@ class KImGalleryPlugin : public KParts::Plugin CommentMap* m_commentMap; - bool createDirectory(QDir thumb_dir, QString imgGalleryDir, QString dirName); + bool createDirectory(TQDir thumb_dir, TQString imgGalleryDir, TQString dirName); - void createHead(QTextStream& stream); - void createCSSSection(QTextStream& stream); - void createBody(QTextStream& stream, const QString& sourceDirName, const QStringList& subDirList, const QDir& imageDir, const KURL& url, const QString& imageFormat); + void createHead(TQTextStream& stream); + void createCSSSection(TQTextStream& stream); + void createBody(TQTextStream& stream, const TQString& sourceDirName, const TQStringList& subDirList, const TQDir& imageDir, const KURL& url, const TQString& imageFormat); - bool createThumb( const QString& imgName, const QString& sourceDirName, const QString& imgGalleryDir, const QString& imageFormat); + bool createThumb( const TQString& imgName, const TQString& sourceDirName, const TQString& imgGalleryDir, const TQString& imageFormat); - bool createHtml( const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat); - void deleteCancelledGallery( const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat); + bool createHtml( const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat); + void deleteCancelledGallery( const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat); void loadCommentFile(); - static QString extension(const QString& imageFormat); + static TQString extension(const TQString& imageFormat); }; #endif diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index fdbf5c0..27459ee 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -14,8 +14,8 @@ #include "kcmkuick.h" -#include <qlayout.h> -#include <qfile.h> +#include <tqlayout.h> +#include <tqfile.h> #include <kglobal.h> #include <klocale.h> #include <kconfig.h> @@ -24,16 +24,16 @@ #include <kstandarddirs.h> #include <kservice.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qstring.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> +#include <tqstring.h> -typedef KGenericFactory<KCMKuick, QWidget> KuickFactory; +typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) ) -KCMKuick::KCMKuick(QWidget *parent, const char *name, const QStringList &) +KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) :KCModule(parent, name) { KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), @@ -42,16 +42,16 @@ KCMKuick::KCMKuick(QWidget *parent, const char *name, const QStringList &) ab->addAuthor("Holger Freyther",0, "freyther@kde.org"); setAboutData( ab ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0); dialog = new KCMKuickDialog(this); topLayout->add(dialog); topLayout->addStretch(); - connect( dialog->m_sbCopy, SIGNAL(valueChanged(int) ), SLOT(configChanged() ) ); - connect( dialog->m_sbMove, SIGNAL(valueChanged(int) ), SLOT(configChanged() ) ); - connect( dialog->pbCopyClear, SIGNAL(pressed() ), SLOT(slotClearCopyCache() ) ); - connect( dialog->pbMoveClear, SIGNAL(pressed() ), SLOT(slotClearMoveCache() ) ); - connect( dialog->m_chkShow, SIGNAL(clicked() ), SLOT(slotShowToggled() ) ); + connect( dialog->m_sbCopy, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); + connect( dialog->m_sbMove, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); + connect( dialog->pbCopyClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearCopyCache() ) ); + connect( dialog->pbMoveClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearMoveCache() ) ); + connect( dialog->m_chkShow, TQT_SIGNAL(clicked() ), TQT_SLOT(slotShowToggled() ) ); load(); } @@ -86,7 +86,7 @@ KCMKuick::~KCMKuick() { } -void KCMKuick::load(const QString & /*s*/) +void KCMKuick::load(const TQString & /*s*/) { } @@ -108,8 +108,8 @@ void KCMKuick::save() config.sync(); //is it necessary ? if ( dialog->m_chkShow->isChecked() ) { - QString servicespath = KGlobal::dirs()->saveLocation( "services"); - QFile::remove(servicespath+"/kuick_plugin.desktop"); + TQString servicespath = KGlobal::dirs()->saveLocation( "services"); + TQFile::remove(servicespath+"/kuick_plugin.desktop"); } else { KConfig cfg("kuick_plugin.desktop", false, false, "services"); @@ -124,14 +124,14 @@ void KCMKuick::save() void KCMKuick::slotClearCopyCache( ) { KConfig config("konquerorrc"); config.setGroup("kuick-copy" ); - config.writePathEntry("Paths", QStringList() ); + config.writePathEntry("Paths", TQStringList() ); config.sync(); //is it necessary ? } void KCMKuick::slotClearMoveCache() { KConfig config("konquerorrc"); config.setGroup("kuick-move" ); - config.writePathEntry("Paths", QStringList() ); + config.writePathEntry("Paths", TQStringList() ); config.sync(); //is it necessary ? } @@ -146,7 +146,7 @@ void KCMKuick::defaults() emit changed( true ); } -QString KCMKuick::quickHelp() const +TQString KCMKuick::quickHelp() const { return i18n("<h1>Kuick</h1> With this module you can configure Kuick, the KDE quick" "copy and move plugin for Konqueror."); diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h index c10d04e..d4316eb 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.h +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h @@ -26,13 +26,13 @@ class KCMKuick Q_OBJECT public: - KCMKuick (QWidget *parent, const char *name, const QStringList &); + KCMKuick (TQWidget *parent, const char *name, const TQStringList &); ~KCMKuick(); void load(); - void load(const QString &); + void load(const TQString &); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; public slots: void configChanged(); private: diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 2cbf6de..4dbd212 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -17,9 +17,9 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qiconset.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqiconset.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <kaction.h> #include <kapplication.h> @@ -32,11 +32,11 @@ #define CICON(a) (*_icons)[a] -QMap<QString, QPixmap> *KDirMenu::_icons = 0; +TQMap<TQString, TQPixmap> *KDirMenu::_icons = 0; -KDirMenu::KDirMenu ( QWidget *parent, const KURL &_src, - const QString &_path, const QString &_name, bool /*showfile*/ ) - : QPopupMenu(parent), +KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, + const TQString &_path, const TQString &_name, bool /*showfile*/ ) + : TQPopupMenu(parent), path(_path), name(_name), src( _src ), @@ -44,33 +44,33 @@ KDirMenu::KDirMenu ( QWidget *parent, const KURL &_src, { children.setAutoDelete( true ); initIconMap( ); - connect( this, SIGNAL( aboutToShow( ) ), this, SLOT( slotAboutToShow( ) ) ); - connect( this, SIGNAL( aboutToHide( ) ), this, SLOT( slotAboutToHide( ) ) ); + connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); + connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); children.clear(); // just in case - QFileInfo fileInfo(path); + TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new KAction(name, 0, this, SLOT(new_slot( ) ), this); + action = new KAction(name, 0, this, TQT_SLOT(new_slot( ) ), this); } KDirMenu::~KDirMenu( ) { delete action; clear( ); children.clear( ); } -void KDirMenu::insert( KDirMenu *submenu, const QString &_path ) { - static const QIconSet folder = SmallIconSet("folder"); - QString escapedPath = _path; - QString completPath=path+'/'+_path; +void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { + static const TQIconSet folder = SmallIconSet("folder"); + TQString escapedPath = _path; + TQString completPath=path+'/'+_path; // parse .directory if it does exist - if (QFile::exists(completPath + "/.directory")) { + if (TQFile::exists(completPath + "/.directory")) { KSimpleConfig c(completPath + "/.directory", true); c.setDesktopGroup(); - QString iconPath = c.readEntry("Icon"); + TQString iconPath = c.readEntry("Icon"); if ( iconPath.startsWith("./") ) iconPath = _path + '/' + iconPath.mid(2); - QPixmap icon; + TQPixmap icon; icon = KGlobal::iconLoader()->loadIcon(iconPath, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); @@ -81,8 +81,8 @@ void KDirMenu::insert( KDirMenu *submenu, const QString &_path ) { else insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); children.append( submenu ); - connect(submenu, SIGNAL(fileChosen(const QString &)), - this, SLOT(slotFileSelected(const QString &))); + connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), + this, TQT_SLOT(slotFileSelected(const TQString &))); } void KDirMenu::slotAboutToShow( ) { @@ -92,7 +92,7 @@ void KDirMenu::slotAboutToShow( ) { //Precaution: if not a directory, exit, in case some path in KMetaMenu //isn't checked right - if ( !QFileInfo(path).isDir() ) + if ( !TQFileInfo(path).isDir() ) return; if ( action ) @@ -101,9 +101,9 @@ void KDirMenu::slotAboutToShow( ) { setItemEnabled( insertItem( name ), false ); // all dirs writeable and readable - QDir dir(path, QString::null, - QDir::Name | QDir::DirsFirst | QDir::IgnoreCase, - QDir::Dirs | QDir::Readable | QDir::Executable); + TQDir dir(path, TQString::null, + TQDir::Name | TQDir::DirsFirst | TQDir::IgnoreCase, + TQDir::Dirs | TQDir::Readable | TQDir::Executable); const QFileInfoList* dirList = dir.entryInfoList(); if ( !dirList || dirList->isEmpty() ) { @@ -120,11 +120,11 @@ void KDirMenu::slotAboutToShow( ) { return; } - static const QString& dot = KGlobal::staticQString( "." ); - static const QString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = KGlobal::staticQString( "." ); + static const TQString& dotdot = KGlobal::staticQString( ".." ); for ( QFileInfoListIterator it( *dirList ); *it; ++it ) { - QString fileName = (*it)->fileName(); + TQString fileName = (*it)->fileName(); if ( fileName == dot || fileName == dotdot ) continue; @@ -146,7 +146,7 @@ void KDirMenu::initIconMap() // kdDebug(90160) << "PanelBrowserMenu::initIconMap" << endl; - _icons = new QMap<QString, QPixmap>; + _icons = new TQMap<TQString, TQPixmap>; _icons->insert("folder", SmallIcon("folder")); _icons->insert("unknown", SmallIcon("mime_empty")); @@ -158,7 +158,7 @@ void KDirMenu::initIconMap() _icons->insert("exec", SmallIcon("exec")); _icons->insert("chardevice", SmallIcon("chardevice")); } -void KDirMenu::slotFileSelected(const QString &_path ){ +void KDirMenu::slotFileSelected(const TQString &_path ){ emit fileChosen( _path ); } diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index 6356e83..5bbe68e 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -21,38 +21,38 @@ #ifndef __kdirmenu_h #define __kdirmenu_h -#include <qpopupmenu.h> -#include <qptrlist.h> -#include <qmap.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> +#include <tqmap.h> class KAction; class KURL; -class KDirMenu : public QPopupMenu { +class KDirMenu : public TQPopupMenu { Q_OBJECT public: - KDirMenu( QWidget *parent, const KURL &src, const QString &_path, - const QString &name, bool showfiles = false ); + KDirMenu( TQWidget *parent, const KURL &src, const TQString &_path, + const TQString &name, bool showfiles = false ); ~KDirMenu( ); - void setPath( const QString &_path); - void insert( KDirMenu *menu, const QString &path ); + void setPath( const TQString &_path); + void insert( KDirMenu *menu, const TQString &path ); protected: int target_id; - static QMap<QString, QPixmap> *_icons; + static TQMap<TQString, TQPixmap> *_icons; signals: - void fileChosen( const QString &_path ); + void fileChosen( const TQString &_path ); private: - QString path; - QString name; + TQString path; + TQString name; KURL src; KAction *action; - QPtrList<KDirMenu> children; + TQPtrList<KDirMenu> children; void initIconMap( ); public slots: void slotAboutToShow( ); void slotAboutToHide( ); - void slotFileSelected(const QString &_path ); + void slotFileSelected(const TQString &_path ); /** No descriptions */ void new_slot(); }; diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index 42cf980..77ef7a4 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -#include <qstringlist.h> +#include <tqstringlist.h> // The following enables kabc for contact name lookups instead of using Kopete's idea of their name. //#define KIMCONTACTS_USE_KABC @@ -34,14 +34,14 @@ #include "kimcontactmenu.h" -KIMContactMenu::KIMContactMenu( QWidget *parent, KIMProxy *proxy ) - : QPopupMenu( parent), mProxy( proxy ) +KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) + : TQPopupMenu( parent), mProxy( proxy ) { #ifdef KIMCONTACTS_USE_KABC m_addressBook = KABC::StdAddressBook::self( false ); #endif - connect( this, SIGNAL( activated( int ) ), SLOT( slotItemActivated( int ) ) ); - connect( this, SIGNAL( aboutToShow( ) ), this, SLOT( slotAboutToShow( ) ) ); + connect( this, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotItemActivated( int ) ) ); + connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); } KIMContactMenu::~KIMContactMenu() @@ -61,7 +61,7 @@ void KIMContactMenu::slotAboutToShow() int i = 0; - for ( QStringList::Iterator it = mContacts.begin(); it != mContacts.end(); ++it, ++i ) + for ( TQStringList::Iterator it = mContacts.begin(); it != mContacts.end(); ++it, ++i ) { #ifdef KIMCONTACTS_USE_KABC insertItem( mProxy->presenceIcon( *it ), m_addressBook->findByUid( *it ).realName(), i ); @@ -74,7 +74,7 @@ void KIMContactMenu::slotAboutToShow() void KIMContactMenu::slotItemActivated( int item ) { // look up corresponding UID - QString uid = mContacts[ item ]; + TQString uid = mContacts[ item ]; // emit signal emit contactChosen( uid ); } diff --git a/konq-plugins/kuick/kimcontactmenu.h b/konq-plugins/kuick/kimcontactmenu.h index 62c13bc..478c55b 100644 --- a/konq-plugins/kuick/kimcontactmenu.h +++ b/konq-plugins/kuick/kimcontactmenu.h @@ -23,8 +23,8 @@ #ifndef __kim_contact_menu_h #define __kim_contact_menu_h -#include <qpopupmenu.h> -#include <qstringlist.h> +#include <tqpopupmenu.h> +#include <tqstringlist.h> class KIMProxy; namespace KABC { @@ -35,7 +35,7 @@ class KIMContactMenu : public QPopupMenu { Q_OBJECT public: - KIMContactMenu( QWidget *parent, KIMProxy *proxy ); + KIMContactMenu( TQWidget *parent, KIMProxy *proxy ); ~KIMContactMenu(); protected slots: // populate menus if not already populated @@ -43,11 +43,11 @@ protected slots: void slotAboutToHide(); void slotItemActivated( int item ); signals: - void contactChosen( const QString &uid ); + void contactChosen( const TQString &uid ); protected: KIMProxy *mProxy; - QStringList mContacts; + TQStringList mContacts; KABC::AddressBook* m_addressBook; }; diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 065a825..2b5d78a 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -26,53 +26,53 @@ #include <kurl.h> #include <konq_popupmenu.h> -#include <qpixmap.h> -#include <qdir.h> -#include <qiconset.h> -#include <qstringlist.h> +#include <tqpixmap.h> +#include <tqdir.h> +#include <tqiconset.h> +#include <tqstringlist.h> #include "kmetamenu.h" #include "kdirmenu.h" #include "kimcontactmenu.h" #include "kmetamenu.moc" -KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, - const QString &text, const QString &key, KIMProxy *imProxy ) -: QPopupMenu( parent), +KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, + const TQString &text, const TQString &key, KIMProxy *imProxy ) +: TQPopupMenu( parent), m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) { int recent_no; group = key; actions.setAutoDelete( TRUE ); - QStringList dirList; + TQStringList dirList; KURL u; - u.setPath(QDir::homeDirPath()); + u.setPath(TQDir::homeDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { m_home = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); - connect(m_home, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_home, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } - u.setPath(QDir::rootDirPath()); + u.setPath(TQDir::rootDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { m_root = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); - connect(m_root, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_root, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } - QString confDir = QDir::rootDirPath()+ "etc"; + TQString confDir = TQDir::rootDirPath()+ "etc"; u.setPath(confDir); - if ( QFileInfo( confDir ).isWritable() && + if ( TQFileInfo( confDir ).isWritable() && kapp->authorizeURLAction("list", u, u) ) { m_etc = new KDirMenu( parent, url, confDir, text ); @@ -80,14 +80,14 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, i18n("&System Configuration"), m_etc); dirList << confDir; - connect(m_etc , SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_etc , TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } if ( url.isLocalFile() && dirList.find( url.path() ) == dirList.end() - && QFileInfo( url.path() ).isWritable() - && QFileInfo( url.path() ).isDir() + && TQFileInfo( url.path() ).isWritable() + && TQFileInfo( url.path() ).isDir() && kapp->authorizeURLAction("list", url, url) ) //Need to check whether a directory so we don't crash trying to access it //(#60192) @@ -97,21 +97,21 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); - connect(m_current, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_current, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } if ( imProxy ) { m_contacts = new KIMContactMenu( parent, imProxy ); int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts ); - connect ( m_contacts, SIGNAL( contactChosen( const QString &) ), SIGNAL( contactChosen( const QString & ) ) ); + connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) setItemEnabled( item, false ); } - m_browse = new KAction(i18n("&Browse..."), 0, this, SLOT(slotBrowse()), this ); + m_browse = new KAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -122,18 +122,18 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, if ( list.count() > 0 ) insertSeparator(); int i=1; - QStringList::Iterator it = list.begin(); + TQStringList::Iterator it = list.begin(); while( it != list.end() ) { if( i == (recent_no + 1) ) break; - QDir dir( *it ); + TQDir dir( *it ); u.setPath( *it ); if ( !dir.exists() || !kapp->authorizeURLAction("list", u, u) ) { it = list.remove( it ); continue; } - QString escapedDir = *it; - KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, SLOT(slotFastPath()), this); + TQString escapedDir = *it; + KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this); action->plug(this ); actions.append( action ); ++it; @@ -152,7 +152,7 @@ KMetaMenu::~KMetaMenu(){ delete m_browse; actions.clear(); } -void KMetaMenu::slotFileChosen(const QString &path ){ +void KMetaMenu::slotFileChosen(const TQString &path ){ writeConfig(path ); emit fileChosen(path ); } @@ -160,10 +160,10 @@ void KMetaMenu::slotFileChosen(const QString &path ){ void KMetaMenu::slotFastPath( ) { KAction *action; action = (KAction*) sender(); - QString text = action->plainText( ); + TQString text = action->plainText( ); slotFileChosen( text ); } -void KMetaMenu::writeConfig( const QString &path){ +void KMetaMenu::writeConfig( const TQString &path){ list.remove(path ); list.prepend(path ); conf->setGroup( group ); diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index f6670f6..ff33df6 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -20,8 +20,8 @@ #ifndef _kmetamenu_h #define _kmetamenu_h -#include <qpopupmenu.h> -#include <qptrlist.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> #include <kaction.h> @@ -33,22 +33,22 @@ class KIMContactMenu; class KIMProxy; class KURL; -class KMetaMenu : public QPopupMenu { +class KMetaMenu : public TQPopupMenu { Q_OBJECT public: - KMetaMenu( QWidget *parent, const KURL &url, const QString &text, - const QString &key, KIMProxy * imProxy = 0L ); + KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, + const TQString &key, KIMProxy * imProxy = 0L ); KMetaMenu(); ~KMetaMenu(); - void writeConfig( const QString &path ); + void writeConfig( const TQString &path ); public slots: - void slotFileChosen( const QString &path); + void slotFileChosen( const TQString &path); void slotFastPath( ); void slotBrowse( ); signals: - void fileChosen( const QString &path ); - void contactChosen( const QString &uid ); + void fileChosen( const TQString &path ); + void contactChosen( const TQString &uid ); private: KDirMenu *m_root; KDirMenu *m_home; @@ -57,10 +57,10 @@ private: KIMContactMenu *m_contacts; KIMProxy *m_proxy; KAction *m_browse; - QStringList list; + TQStringList list; KConfig *conf; - QString group; - QPtrList<KAction> actions; + TQString group; + TQPtrList<KAction> actions; }; #endif diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 80a7cc7..772f169 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -30,7 +30,7 @@ #include <konq_popupmenu.h> #include <kmessagebox.h> #include <kgenericfactory.h> -#include <qobject.h> +#include <tqobject.h> #include <kio/jobclasses.h> #include <kio/job.h> #include <kurl.h> @@ -38,15 +38,15 @@ typedef KGenericFactory<KTestMenu, KonqPopupMenu> KTestMenuFactory; K_EXPORT_COMPONENT_FACTORY( libkuickplugin, KTestMenuFactory("kuick_plugin") ) -KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const QStringList& /*list*/ ) : KonqPopupMenuPlugin( popupmenu, name) { +KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQStringList& /*list*/ ) : KonqPopupMenuPlugin( popupmenu, name) { popup= popupmenu ; meta_copy_mmu = 0L; meta_move_mmu = 0L; - my_action = new KAction( "kuick_plugin", 0, this, SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); + my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); addAction( my_action ); addSeparator(); //popupmenu->addMerge(); - connect( popup, SIGNAL(aboutToShow() ), this, SLOT(slotPrepareMenu( ) ) ); + connect( popup, TQT_SIGNAL(aboutToShow() ), this, TQT_SLOT(slotPrepareMenu( ) ) ); m_imProxy = KIMProxy::instance( kapp->dcopClient() ); } KTestMenu::~KTestMenu( ){ @@ -56,20 +56,20 @@ KTestMenu::~KTestMenu( ){ void KTestMenu::slotPopupMaeh( ){ } -void KTestMenu::slotStartCopyJob( const QString &path ) { +void KTestMenu::slotStartCopyJob( const TQString &path ) { KURL url = KURL::fromPathOrURL( path ); KIO::CopyJob *copy; copy = KIO::copy( popup->popupURLList(), url); copy->setAutoErrorHandlingEnabled( true ); } -void KTestMenu::slotStartMoveJob( const QString &path) { +void KTestMenu::slotStartMoveJob( const TQString &path) { KURL url = KURL::fromPathOrURL( path ); KIO::CopyJob *move; move = KIO::move( popup->popupURLList(), url ); move->setAutoErrorHandlingEnabled( true ); } -void KTestMenu::slotFileTransfer( const QString &uid ) { +void KTestMenu::slotFileTransfer( const TQString &uid ) { m_imProxy->sendFile( uid, popup->popupURLList().first() ); } @@ -77,11 +77,11 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... // search for the dummy entry 'kuick_plugin' stores it index reomev it plug copy at the position KGlobal::locale()->insertCatalogue("kuick_plugin"); - bool isKDesktop = QCString( kapp->name() ) == "kdesktop"; + bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; for(int i= popup->count(); i >=1; i--) { int id = popup->idAt( i ); - QString text = popup->text( id ); + TQString text = popup->text( id ); if( text.contains("kuick_plugin") ) { popup->removeItem( id ); if (isKDesktop && !kapp->authorize("editable_desktop_icons")) @@ -95,18 +95,18 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... meta_copy_mmu = new KMetaMenu(popup, popup->url(), i18n("&Copy Here") , "kuick-copy", m_imProxy ); popup->insertItem(i18n("Copy To"), meta_copy_mmu, -1, i ); - connect( meta_copy_mmu, SIGNAL(fileChosen(const QString &) ), - SLOT(slotStartCopyJob(const QString & )) ); + connect( meta_copy_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), + TQT_SLOT(slotStartCopyJob(const TQString & )) ); - connect( meta_copy_mmu, SIGNAL( contactChosen( const QString & ) ), - SLOT( slotFileTransfer( const QString & )) ); + connect( meta_copy_mmu, TQT_SIGNAL( contactChosen( const TQString & ) ), + TQT_SLOT( slotFileTransfer( const TQString & )) ); if( popup->protocolInfo().supportsMoving() ){ meta_move_mmu = new KMetaMenu(popup, popup->url(), i18n("&Move Here"), "kuick-move"); popup->insertItem(i18n("Move To"), meta_move_mmu, -1, i+1 ); - connect( meta_move_mmu, SIGNAL(fileChosen(const QString &) ), - SLOT(slotStartMoveJob(const QString & )) ); + connect( meta_move_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), + TQT_SLOT(slotStartMoveJob(const TQString & )) ); } break; } diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h index 15ffdcd..8369f7f 100644 --- a/konq-plugins/kuick/kuick_plugin.h +++ b/konq-plugins/kuick/kuick_plugin.h @@ -29,7 +29,7 @@ class KURL; class KTestMenu : public KonqPopupMenuPlugin { Q_OBJECT public: - KTestMenu (KonqPopupMenu *, const char *name, const QStringList &list); + KTestMenu (KonqPopupMenu *, const char *name, const TQStringList &list); virtual ~KTestMenu( ); KMetaMenu *meta_copy_mmu; KMetaMenu *meta_move_mmu; @@ -41,11 +41,11 @@ private: public slots: void slotPopupMaeh( ); - void slotStartCopyJob(const QString &path ); + void slotStartCopyJob(const TQString &path ); //void slotStartCopyJob(const KURL &url ); - void slotStartMoveJob(const QString &path ); + void slotStartMoveJob(const TQString &path ); //void slotStartMoveJob(const KURL &url ); - void slotFileTransfer( const QString &uid ); + void slotFileTransfer( const TQString &uid ); void slotPrepareMenu( ); }; diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 51fdd97..9dfa53c 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -32,16 +32,16 @@ #include <kstatusbar.h> #include <kurllabel.h> -#include <qcursor.h> -#include <qstylesheet.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqcursor.h> +#include <tqstylesheet.h> +#include <tqtimer.h> +#include <tqtooltip.h> typedef KGenericFactory<KonqMFIcon> KonqMFIconFactory; K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIconFactory("mfkonqmficon")) -KonqMFIcon::KonqMFIcon(QObject *parent, const char *name, const QStringList &) +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) { KGlobal::locale()->insertCatalogue("mf_konqplugin"); @@ -50,14 +50,14 @@ KonqMFIcon::KonqMFIcon(QObject *parent, const char *name, const QStringList &) kdDebug() << "couldn't get part" << endl; return; } - QTimer::singleShot(0, this, SLOT(waitPartToLoad())); + TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); } void KonqMFIcon::waitPartToLoad() { - connect(m_part, SIGNAL(completed()), this, SLOT(addMFIcon())); - connect(m_part, SIGNAL(completed(bool)), this, SLOT(addMFIcon())); // to make pages with metarefresh to work - connect(m_part, SIGNAL(started(KIO::Job *)), this, SLOT(removeMFIcon())); + connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addMFIcon())); + connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addMFIcon())); // to make pages with metarefresh to work + connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeMFIcon())); } @@ -68,8 +68,8 @@ KonqMFIcon::~KonqMFIcon() { } -static QString textForNode(DOM::Node node) { - QString rc; +static TQString textForNode(DOM::Node node) { + TQString rc; DOM::NodeList nl = node.childNodes(); for (unsigned int i = 0; i < nl.length(); ++i) { DOM::Node n = nl.item(i); @@ -82,9 +82,9 @@ static QString textForNode(DOM::Node node) { } -static QString extractAddress(DOM::Node node) { - QString rc = ";;"; - QMap<QString,QString> entry; +static TQString extractAddress(DOM::Node node) { + TQString rc = ";;"; + TQMap<TQString,TQString> entry; DOM::NodeList nodes = node.childNodes(); unsigned int n = nodes.length(); for (unsigned int i = 0; i < n; ++i) { @@ -94,7 +94,7 @@ static QString extractAddress(DOM::Node node) { if (map.item(j).nodeName().string() != "class") { continue; } - QString a = map.item(j).nodeValue().string(); + TQString a = map.item(j).nodeValue().string(); if (a == "street-address") { entry["street-address"] = textForNode(node); } else if (a == "locality") { @@ -113,7 +113,7 @@ static QString extractAddress(DOM::Node node) { void KonqMFIcon::extractCard(DOM::Node node) { - QString name, value; + TQString name, value; DOM::NodeList nodes = node.childNodes(); unsigned int n = nodes.length(); value += "BEGIN:VCARD\nVERSION:3.0\n"; @@ -124,8 +124,8 @@ void KonqMFIcon::extractCard(DOM::Node node) { if (map.item(j).nodeName().string() != "class") { continue; } - QStringList l = QStringList::split(' ', map.item(j).nodeValue().string()); - for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { + TQStringList l = TQStringList::split(' ', map.item(j).nodeValue().string()); + for (TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { if (*it == "photo") { } else if (*it == "adr") { value += "ADR:" + extractAddress(node) + "\n"; @@ -142,7 +142,7 @@ void KonqMFIcon::extractCard(DOM::Node node) { } else if (*it == "email") { DOM::Node at = node.attributes().getNamedItem("href"); if (!at.isNull()) { - QString v = at.nodeValue().string(); + TQString v = at.nodeValue().string(); if (v.startsWith("mailto:")) { v = v.mid(7); } @@ -163,7 +163,7 @@ void KonqMFIcon::extractCard(DOM::Node node) { void KonqMFIcon::extractEvent(DOM::Node node) { - QString name, value = "BEGIN:VCALENDAR\nPRODID:-//Konqueror//EN\nVERSION:2.0\nBEGIN:VEVENT\n"; + TQString name, value = "BEGIN:VCALENDAR\nPRODID:-//Konqueror//EN\nVERSION:2.0\nBEGIN:VEVENT\n"; DOM::NodeList nodes = node.childNodes(); unsigned int n = nodes.length(); for (unsigned int i = 0; i < n; ++i) { @@ -173,8 +173,8 @@ void KonqMFIcon::extractEvent(DOM::Node node) { if (map.item(j).nodeName().string() != "class") { continue; } - QStringList l = QStringList::split(' ', map.item(j).nodeValue().string()); - for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { + TQStringList l = TQStringList::split(' ', map.item(j).nodeValue().string()); + for (TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { if (*it == "url") { DOM::Node at = node.attributes().getNamedItem("href"); if (!at.isNull()) { @@ -247,19 +247,19 @@ void KonqMFIcon::contextMenu() { delete m_menu; m_menu = new KPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Microformats")); - connect(m_menu, SIGNAL(activated(int)), this, SLOT(addMF(int))); + connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int))); int id = 0; - for (QValueList<QPair<QString, QString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { + for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); id++; } - for (QValueList<QPair<QString, QString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) { + for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); id++; } m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, SLOT(addMFs()), 0, 50000 ); - m_menu->popup(QCursor::pos()); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, TQT_SLOT(addMFs()), 0, 50000 ); + m_menu->popup(TQCursor::pos()); } @@ -275,17 +275,17 @@ void KonqMFIcon::addMFIcon() { m_mfIcon = new KURLLabel(m_statusBarEx->statusBar()); m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_mfIcon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mfIcon->setUseCursor(false); //FIXME hackish - m_mfIcon->setPixmap(QPixmap(locate("data", "microformat/pics/microformat.png"))); + m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png"))); - QToolTip::remove(m_mfIcon); - QToolTip::add(m_mfIcon, i18n("This site has a microformat entry", "This site has %n microformat entries", _events.count() + _cards.count())); + TQToolTip::remove(m_mfIcon); + TQToolTip::add(m_mfIcon, i18n("This site has a microformat entry", "This site has %n microformat entries", _events.count() + _cards.count())); m_statusBarEx->addStatusBarItem(m_mfIcon, 0, true); - connect(m_mfIcon, SIGNAL(leftClickedURL()), this, SLOT(contextMenu())); + connect(m_mfIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); } diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h index 819bb2e..3b928c6 100644 --- a/konq-plugins/microformat/konqmficon.h +++ b/konq-plugins/microformat/konqmficon.h @@ -42,7 +42,7 @@ namespace KParts { class KonqMFIcon : public KParts::Plugin, PluginBase { Q_OBJECT public: - KonqMFIcon(QObject *parent, const char *name, const QStringList &); + KonqMFIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqMFIcon(); @@ -52,11 +52,11 @@ class KonqMFIcon : public KParts::Plugin, PluginBase { void extractCard(DOM::Node node); void extractEvent(DOM::Node node); - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; KURLLabel *m_mfIcon; KParts::StatusBarExtension *m_statusBarEx; - QGuardedPtr<KPopupMenu> m_menu; - QValueList<QPair<QString, QString> > _events, _cards; + TQGuardedPtr<KPopupMenu> m_menu; + TQValueList<QPair<TQString, TQString> > _events, _cards; private slots: void waitPartToLoad(); diff --git a/konq-plugins/microformat/pluginbase.cpp b/konq-plugins/microformat/pluginbase.cpp index 9f73dd6..486721a 100644 --- a/konq-plugins/microformat/pluginbase.cpp +++ b/konq-plugins/microformat/pluginbase.cpp @@ -37,7 +37,7 @@ PluginBase::~PluginBase() { } -void PluginBase::addVCardViaDCOP(const QString& card) { +void PluginBase::addVCardViaDCOP(const TQString& card) { DCOPRef("kaddressbook", "AddressBookServiceIface").send("importVCard", card); } diff --git a/konq-plugins/microformat/pluginbase.h b/konq-plugins/microformat/pluginbase.h index e37ea36..7cfd26b 100644 --- a/konq-plugins/microformat/pluginbase.h +++ b/konq-plugins/microformat/pluginbase.h @@ -32,7 +32,7 @@ class PluginBase { ~PluginBase(); public: - void addVCardViaDCOP(const QString& vcard); + void addVCardViaDCOP(const TQString& vcard); }; #endif diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 53f109b..a1a5bfc 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <qfile.h> +#include <tqfile.h> #include <kdebug.h> #include <kaction.h> @@ -42,7 +42,7 @@ typedef KGenericFactory<MinitoolsPlugin> MinitoolsPluginFactory; K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitoolsplugin") ) -MinitoolsPlugin::MinitoolsPlugin(QObject* parent, const char* name, const QStringList &) +MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &) : KParts::Plugin(parent, name) { m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; @@ -51,8 +51,8 @@ MinitoolsPlugin::MinitoolsPlugin(QObject* parent, const char* name, const QStrin m_pMinitoolsMenu->setDelayed(false); m_pMinitoolsMenu->setEnabled(true); - connect(m_pMinitoolsMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotAboutToShow() )); + connect(m_pMinitoolsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotAboutToShow() )); } MinitoolsPlugin::~MinitoolsPlugin() { @@ -63,17 +63,17 @@ void MinitoolsPlugin::slotAboutToShow() { m_minitoolsList.clear(); KXBELBookmarkImporterImpl importer; - connect(&importer, SIGNAL( newBookmark( const QString &, const QCString &, const QString &) ), - SLOT( newBookmarkCallback( const QString &, const QCString &, const QString & ) )); - connect(&importer, SIGNAL( endFolder() ), - SLOT( endFolderCallback() )); - QString filename = minitoolsFilename(true); - if (!filename.isEmpty() && QFile::exists(filename)) { + connect(&importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQT_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) )); + connect(&importer, TQT_SIGNAL( endFolder() ), + TQT_SLOT( endFolderCallback() )); + TQString filename = minitoolsFilename(true); + if (!filename.isEmpty() && TQFile::exists(filename)) { importer.setFilename(filename); importer.parse(); } filename = minitoolsFilename(false); - if (!filename.isEmpty() && QFile::exists(filename)) { + if (!filename.isEmpty() && TQFile::exists(filename)) { importer.setFilename(filename); importer.parse(); } @@ -94,7 +94,7 @@ void MinitoolsPlugin::slotAboutToShow() { gotSep = true; count++; } else { - QString str = (*e).first; + TQString str = (*e).first; // emsquieezzy thingy? if (str.length() > 48) { str.truncate(48); @@ -102,7 +102,7 @@ void MinitoolsPlugin::slotAboutToShow() { } m_pMinitoolsMenu->popupMenu()->insertItem( str, this, - SLOT(slotItemSelected(int)), + TQT_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; } @@ -116,12 +116,12 @@ void MinitoolsPlugin::slotAboutToShow() { m_pMinitoolsMenu->popupMenu() ->insertItem(i18n("&Edit Minitools"), - this, SLOT(slotEditBookmarks()), + this, TQT_SLOT(slotEditBookmarks()), 0, ++count ); } void MinitoolsPlugin::newBookmarkCallback( - const QString & text, const QCString & url, const QString & + const TQString & text, const TQCString & url, const TQString & ) { kdDebug(90150) << "MinitoolsPlugin::newBookmarkCallback" << text << url << endl; m_minitoolsList.prepend(qMakePair(text,url)); @@ -129,12 +129,12 @@ void MinitoolsPlugin::newBookmarkCallback( void MinitoolsPlugin::endFolderCallback() { kdDebug(90150) << "MinitoolsPlugin::endFolderCallback" << endl; - m_minitoolsList.prepend(qMakePair(QString("-"),QCString("-"))); + m_minitoolsList.prepend(qMakePair(TQString("-"),TQCString("-"))); } -QString MinitoolsPlugin::minitoolsFilename(bool local) { - return local ? locateLocal("data", QString::fromLatin1("konqueror/minitools.xml")) - : locateLocal("data", QString::fromLatin1("konqueror/minitools-global.xml")); +TQString MinitoolsPlugin::minitoolsFilename(bool local) { + return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml")) + : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml")); } void MinitoolsPlugin::slotEditBookmarks() { @@ -145,12 +145,12 @@ void MinitoolsPlugin::slotEditBookmarks() { void MinitoolsPlugin::slotItemSelected(int id) { if (m_minitoolsList.count() == 0) return; - QString tmp = m_minitoolsList[id-1].second; - QString script = KURL::decode_string(tmp.right(tmp.length() - 11)); // sizeof("javascript:") - connect(this, SIGNAL( executeScript(const QString &) ), - m_part, SLOT( executeScript(const QString &) )); + TQString tmp = m_minitoolsList[id-1].second; + TQString script = KURL::decode_string(tmp.right(tmp.length() - 11)); // sizeof("javascript:") + connect(this, TQT_SIGNAL( executeScript(const TQString &) ), + m_part, TQT_SLOT( executeScript(const TQString &) )); emit executeScript(script); - disconnect(this, SIGNAL( executeScript(const QString &) ), 0, 0); + disconnect(this, TQT_SIGNAL( executeScript(const TQString &) ), 0, 0); } #include "minitoolsplugin.moc" diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index 7db1a77..04d2ae8 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -21,9 +21,9 @@ #ifndef __MINITOOLS_PLUGIN_H #define __MINITOOLS_PLUGIN_H -#include <qmap.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <kurl.h> #include <klibloader.h> @@ -36,29 +36,29 @@ class MinitoolsPlugin : public KParts::Plugin { Q_OBJECT public: - MinitoolsPlugin( QObject* parent, const char* name, const QStringList & ); + MinitoolsPlugin( TQObject* parent, const char* name, const TQStringList & ); ~MinitoolsPlugin(); protected slots: void slotAboutToShow(); void slotEditBookmarks(); void slotItemSelected(int); - void newBookmarkCallback( const QString &, const QCString &, const QString & ); + void newBookmarkCallback( const TQString &, const TQCString &, const TQString & ); void endFolderCallback( ); signals: - void executeScript( const QString &script ); + void executeScript( const TQString &script ); private: - QString minitoolsFilename(bool local); + TQString minitoolsFilename(bool local); int m_selectedItem; KHTMLPart* m_part; KActionMenu* m_pMinitoolsMenu; - typedef QPair<QString,QCString> Minitool; - typedef QValueList<Minitool> MinitoolsList; + typedef QPair<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 212c37f..14a47a3 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -24,8 +24,8 @@ // Qt includes -#include <qapplication.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqtimer.h> // KDE include #include <dom/dom_doc.h> @@ -61,7 +61,7 @@ K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") ) #endif /** Constructor of the plugin. */ -RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringList &) +RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin( parent, name ), m_part(0), m_viewVisible(false) @@ -70,28 +70,28 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL setInstance(RelLinksFactory::instance()); // ------------- Navigation links -------------- - kaction_map["home"] = new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, SLOT(goHome()), actionCollection(), "rellinks_top" ); + kaction_map["home"] = new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" ); 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, SLOT(goUp()), actionCollection(), "rellinks_up" ); + 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>") ); - bool isRTL = QApplication::reverseLayout(); + bool isRTL = TQApplication::reverseLayout(); - kaction_map["begin"] = new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this, SLOT(goFirst()), actionCollection(), "rellinks_first" ); + kaction_map["begin"] = new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" ); kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") ); - kaction_map["prev"] = new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this, SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); + kaction_map["prev"] = new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") ); - kaction_map["next"] = new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this, SLOT(goNext()), actionCollection(), "rellinks_next" ); + kaction_map["next"] = new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" ); kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") ); - kaction_map["last"] = new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this, SLOT(goLast()), actionCollection(), "rellinks_last" ); + kaction_map["last"] = new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" ); 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, SLOT(goSearch()), actionCollection(), "rellinks_search" ); + kaction_map["search"] = new KAction( i18n("&Search"), "filefind", 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 --------------- @@ -99,39 +99,39 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") ); m_document->setDelayed(false); - kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"), this, SLOT(goContents()), actionCollection(), "rellinks_toc" ); + kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" ); m_document->insert(kaction_map["contents"]); kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") ); kactionmenu_map["chapter"] = new KActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" ); m_document->insert(kactionmenu_map["chapter"]); - connect( kactionmenu_map["chapter"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT(goChapter(int))); + connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int))); kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") ); kactionmenu_map["chapter"]->setDelayed(false); kactionmenu_map["section"] = new KActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" ); m_document->insert(kactionmenu_map["section"]); - connect( kactionmenu_map["section"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goSection( int ) ) ); + connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) ); kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") ); kactionmenu_map["section"]->setDelayed(false); kactionmenu_map["subsection"] = new KActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" ); m_document->insert(kactionmenu_map["subsection"]); - connect( kactionmenu_map["subsection"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goSubsection( int ) ) ); + connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) ); kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") ); kactionmenu_map["subsection"]->setDelayed(false); kactionmenu_map["appendix"] = new KActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" ); m_document->insert(kactionmenu_map["appendix"]); - connect( kactionmenu_map["appendix"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goAppendix( int ) ) ); + connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) ); kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") ); kactionmenu_map["appendix"]->setDelayed(false); - kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); + kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); m_document->insert(kaction_map["glossary"]); kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") ); - kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, SLOT(goIndex()), actionCollection(), "rellinks_index" ); + kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" ); m_document->insert(kaction_map["index"]); kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") ); @@ -140,35 +140,35 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") ); m_more->setDelayed(false); - kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, SLOT(goHelp()), actionCollection(), "rellinks_help" ); + kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" ); m_more->insert(kaction_map["help"]); kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") ); - kaction_map["author"] = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); + kaction_map["author"] = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); m_more->insert(kaction_map["author"]); kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") ); - kaction_map["copyright"] = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); + kaction_map["copyright"] = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); m_more->insert(kaction_map["copyright"]); kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") ); kactionmenu_map["bookmark"] = new KActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" ); m_more->insert(kactionmenu_map["bookmark"]); kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") ); - connect( kactionmenu_map["bookmark"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goBookmark( int ) ) ); + connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) ); kactionmenu_map["bookmark"]->setDelayed(false); kactionmenu_map["alternate"] = new KActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" ); m_more->insert(kactionmenu_map["alternate"]); kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") ); - connect( kactionmenu_map["alternate"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goAlternate( int ) ) ); + connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) ); kactionmenu_map["alternate"]->setDelayed(false); // Unclassified menu m_links = new KActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" ); kactionmenu_map["unclassified"] = m_links; kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") ); - connect( kactionmenu_map["unclassified"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goAllElements( int ) ) ); + connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) ); kactionmenu_map["unclassified"]->setDelayed(false); // We unactivate all the possible actions @@ -179,22 +179,22 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL if (!m_part) return; - connect( m_part, SIGNAL( docCreated() ), this, SLOT( newDocument() ) ); - connect( m_part, SIGNAL( completed() ), this, SLOT( loadingFinished() ) ); + connect( m_part, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( newDocument() ) ); + connect( m_part, TQT_SIGNAL( completed() ), this, TQT_SLOT( loadingFinished() ) ); // create polling timer and connect it - m_pollTimer = new QTimer(this, "polling timer"); - connect( m_pollTimer, SIGNAL( timeout() ), this, SLOT( updateToolbar() ) ); + m_pollTimer = new TQTimer(this, "polling timer"); + connect( m_pollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateToolbar() ) ); // delay access to our part's members until it has finished its initialisation - QTimer::singleShot(0, this, SLOT(delayedSetup())); + TQTimer::singleShot(0, this, TQT_SLOT(delayedSetup())); } /** Destructor */ RelLinksPlugin::~RelLinksPlugin() { } -bool RelLinksPlugin::eventFilter(QObject *watched, QEvent* event) { +bool RelLinksPlugin::eventFilter(TQObject *watched, TQEvent* event) { if (m_part == 0) return false; if (watched == 0 || event == 0) return false; @@ -203,17 +203,17 @@ bool RelLinksPlugin::eventFilter(QObject *watched, QEvent* event) { { switch (event->type()) { - case QEvent::Show: + case TQEvent::Show: m_viewVisible = true; updateToolbar(); break; - case QEvent::Hide: + case TQEvent::Hide: m_viewVisible = false; updateToolbar(); break; - case QEvent::Close: + case TQEvent::Close: m_pollTimer->stop(); m_view->removeEventFilter(this); break; @@ -277,11 +277,11 @@ void RelLinksPlugin::updateToolbar() { // --- Retrieve of the relation type -- - QString rel = e.getAttribute( "rel" ).string(); + TQString rel = e.getAttribute( "rel" ).string(); rel = rel.simplifyWhiteSpace(); if (rel.isEmpty()) { // If the "rel" attribut is null then use the "rev" attribute... - QString rev = e.getAttribute( "rev" ).string(); + TQString rev = e.getAttribute( "rev" ).string(); rev = rev.simplifyWhiteSpace(); if (rev.isEmpty()) { // if "rev" attribut is also empty => ignore @@ -291,18 +291,18 @@ void RelLinksPlugin::updateToolbar() { rel = transformRevToRel(rev); } // Determin the name used internally - QString lrel = getLinkType(rel.lower()); + TQString lrel = getLinkType(rel.lower()); // relation to ignore if (lrel.isEmpty()) continue; // kdDebug() << "lrel=" << lrel << endl; // -- Retrieve of other usefull informations -- - QString href = e.getAttribute( "href" ).string(); + TQString href = e.getAttribute( "href" ).string(); // if nowhere to go, ignore the link if (href.isEmpty()) continue; - QString title = e.getAttribute( "title" ).string(); - QString hreflang = e.getAttribute( "hreflang" ).string(); + TQString title = e.getAttribute( "title" ).string(); + TQString hreflang = e.getAttribute( "hreflang" ).string(); KURL ref( m_part->url(), href ); if ( title.isEmpty() ) @@ -378,23 +378,23 @@ void RelLinksPlugin::guessRelations() // - We make sure that the number is followed by a dot, a &, or the end, we // don't want to match stuff like that: page.html?id=A14E12FD // - We make also sure the number is not preceded dirrectly by others number - QRegExp rx("^(.*[=/?&][^=/?&.\\-0-9]*)([\\d]{1,3})([.&][^/0-9]{0,15})?$"); + TQRegExp rx("^(.*[=/?&][^=/?&.\\-0-9]*)([\\d]{1,3})([.&][^/0-9]{0,15})?$"); - const QString zeros("0000"); - QString url=m_part->url().url(); + const TQString zeros("0000"); + TQString url=m_part->url().url(); if(rx.search(url)!=-1) { uint val=rx.cap(2).toUInt(); uint lenval=rx.cap(2).length(); - QString nval_str=QString::number(val+1); + TQString nval_str=TQString::number(val+1); //prepend by zeros if the original also contains zeros. if(nval_str.length() < lenval && rx.cap(2)[0]=='0') nval_str.prepend(zeros.left(lenval-nval_str.length())); - QString href=rx.cap(1)+ nval_str + rx.cap(3); + TQString href=rx.cap(1)+ nval_str + rx.cap(3); KURL ref( m_part->url(), href ); - QString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); DOM::Element e= m_part->document().createElement("link"); e.setAttribute("href",href); element_map["next"][0] = e; @@ -403,12 +403,12 @@ void RelLinksPlugin::guessRelations() if(val>1) { - nval_str=QString::number(val-1); + nval_str=TQString::number(val-1); if(nval_str.length() < lenval && rx.cap(2)[0]=='0') nval_str.prepend(zeros.left(lenval-nval_str.length())); - QString href=rx.cap(1)+ nval_str + rx.cap(3); + TQString href=rx.cap(1)+ nval_str + rx.cap(3); KURL ref( m_part->url(), href ); - QString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); e= m_part->document().createElement("link"); e.setAttribute("href",href); element_map["prev"][0] = e; @@ -420,16 +420,16 @@ void RelLinksPlugin::guessRelations() /** Menu links */ -void RelLinksPlugin::goToLink(const QString & rel, int id) { +void RelLinksPlugin::goToLink(const TQString & rel, int id) { // have the KHTML part open it KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); if (!part) return; DOM::Element e = element_map[rel][id]; - QString href = e.getAttribute("href").string(); + TQString href = e.getAttribute("href").string(); KURL url( part->url(), href ); - QString target = e.getAttribute("target").string(); + TQString target = e.getAttribute("target").string(); // URL arguments KParts::URLArgs args; @@ -440,7 +440,7 @@ void RelLinksPlugin::goToLink(const QString & rel, int id) { part->browserExtension()->openURLRequest(url, args); } else { KURL baseURL = part->baseURL(); - QString endURL = url.prettyURL(); + TQString endURL = url.prettyURL(); KURL realURL = KURL(baseURL, endURL); part->browserExtension()->openURLRequest(realURL, args); } @@ -559,14 +559,14 @@ void RelLinksPlugin::disableAll() { } -QString RelLinksPlugin::getLinkType(const QString &lrel) { +TQString RelLinksPlugin::getLinkType(const TQString &lrel) { // Relations to ignore... if (lrel.contains("stylesheet") || lrel == "script" || lrel == "icon" || lrel == "shortcut icon" || lrel == "prefetch" ) - return QString::null; + return TQString::null; // ...known relations... if (lrel == "top" || lrel == "origin" || lrel == "start") @@ -596,8 +596,8 @@ QString RelLinksPlugin::getLinkType(const QString &lrel) { return lrel; } -QString RelLinksPlugin::transformRevToRel(const QString &rev) { - QString altRev = getLinkType(rev); +TQString RelLinksPlugin::transformRevToRel(const TQString &rev) { + TQString altRev = getLinkType(rev); // Known relations if (altRev == "prev") @@ -612,7 +612,7 @@ QString RelLinksPlugin::transformRevToRel(const QString &rev) { return getLinkType("sibling"); //...unknown inverse relation => ignore for the moment - return QString::null; + return TQString::null; } #include "plugin_rellinks.moc" diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h index 63260ce..e856e4a 100644 --- a/konq-plugins/rellinks/plugin_rellinks.h +++ b/konq-plugins/rellinks/plugin_rellinks.h @@ -31,16 +31,16 @@ */ // Qt includes -#include <qmap.h> +#include <tqmap.h> // KDE includes #include <kparts/plugin.h> #include <dom/dom_string.h> // type definitions -typedef QMap<int,DOM::Element> DOMElementMap; -typedef QMap<QString, KAction*> KActionMap; -typedef QMap<QString, KActionMenu*> KActionMenuMap; +typedef TQMap<int,DOM::Element> DOMElementMap; +typedef TQMap<TQString, KAction*> KActionMap; +typedef TQMap<TQString, KActionMenu*> KActionMenuMap; // forward declarations class KActionMenu; @@ -59,11 +59,11 @@ class RelLinksPlugin : public KParts::Plugin { Q_OBJECT public: /** Constructor */ - RelLinksPlugin( QObject *parent, const char *name, const QStringList & ); + RelLinksPlugin( TQObject *parent, const char *name, const TQStringList & ); /** Destructor */ virtual ~RelLinksPlugin(); - bool eventFilter(QObject *watched, QEvent* event); + bool eventFilter(TQObject *watched, TQEvent* event); private slots: void delayedSetup(); @@ -125,7 +125,7 @@ private: * @param lrel Previous relation name * @return New relation name */ - QString getLinkType(const QString &lrel); + TQString getLinkType(const TQString &lrel); /** * Function used to return the "rel" equivalent of "rev" link type @@ -133,7 +133,7 @@ private: * @param rev Inverse relation name * @return Equivalent relation name */ - QString transformRevToRel(const QString &rev) ; + TQString transformRevToRel(const TQString &rev) ; /** * Function used to disable all the item of the toolbar @@ -145,7 +145,7 @@ private: * @param rel Relation name * @param id Identifier of the menu item */ - void goToLink(const QString & rel, int id=0); + void goToLink(const TQString & rel, int id=0); private: KHTMLPart* m_part; @@ -162,9 +162,9 @@ private: KActionMenuMap kactionmenu_map; /** Map of all the link element which can be managed by rellinks */ - QMap<QString,DOMElementMap> element_map; + TQMap<TQString,DOMElementMap> element_map; - QTimer* m_pollTimer; + TQTimer* m_pollTimer; }; #endif // _PLUGIN_RELLINKS_H_ diff --git a/konq-plugins/rsync/rsyncconfigdialog.cpp b/konq-plugins/rsync/rsyncconfigdialog.cpp index 0549356..ae89efa 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.cpp +++ b/konq-plugins/rsync/rsyncconfigdialog.cpp @@ -50,25 +50,25 @@ #include <util.h> #endif -#include <qfile.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qwhatsthis.h> -#include <qiconview.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qtimer.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> +#include <tqiconview.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqtimer.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> #include <kdebug.h> #include <klocale.h> @@ -100,9 +100,9 @@ /* * RsyncConfigDialog implementation */ -RsyncConfigDialog::RsyncConfigDialog(QWidget* parent, const char* name, - const QString& caption, const QString& text, - const QString& localfolder, const QString& remotefolder, +RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, 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), @@ -116,25 +116,25 @@ RsyncConfigDialog::RsyncConfigDialog(QWidget* parent, const char* name, #ifdef Q_WS_X11 KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); #endif - mShowTimer = new QTimer(this); + mShowTimer = new TQTimer(this); showButton(KDialogBase::Close, false); mCancelText = actionButton(KDialogBase::Cancel)->text(); - QFrame* mainWidget = plainPage(); - QVBoxLayout* layout = new QVBoxLayout(mainWidget, 10); - mLabel = new QLabel(QString("<b>") + text + QString("</b><br>")+i18n("Setting up synchronization for local folder")+QString("<br><i>") + localfolder, mainWidget); + TQFrame* mainWidget = plainPage(); + TQVBoxLayout* layout = 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); // Create an exclusive button group - QButtonGroup *layoutg = new QButtonGroup( 1, QGroupBox::Horizontal, i18n("Synchronization Method")+QString(":"), mainWidget); + TQButtonGroup *layoutg = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget); layout->addWidget( layoutg ); layoutg->setExclusive( TRUE ); // Insert radiobuttons - rsync_rb1 = new QRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), layoutg); - rsync_rb2 = new QRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), layoutg); - rsync_rb3 = new QRadioButton(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"), 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); if (syncmode == 1) rsync_rb1->setChecked( TRUE ); @@ -143,15 +143,15 @@ RsyncConfigDialog::RsyncConfigDialog(QWidget* parent, const char* name, else if (syncmode == 3) rsync_rb3->setChecked( TRUE ); - //(void)new QRadioButton( "R&adiobutton 2", layoutg ); - //(void)new QRadioButton( "Ra&diobutton 3", layoutg ); + //(void)new TQRadioButton( "R&adiobutton 2", layoutg ); + //(void)new TQRadioButton( "Ra&diobutton 3", layoutg ); // Create an exclusive button group - QButtonGroup *layoutm = new QButtonGroup( 1, QGroupBox::Horizontal, i18n("Remote Folder")+QString(":"), mainWidget); + TQButtonGroup *layoutm = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget); layout->addWidget( layoutm ); layoutg->setExclusive( TRUE ); - m_rsync_txt = new QLineEdit(layoutm); + m_rsync_txt = new TQLineEdit(layoutm); if (remotefolder.isEmpty() == false) { m_rsync_txt->setText(remotefolder); } @@ -168,12 +168,12 @@ int RsyncConfigDialog::getSyncMode() return 3; } -QLineEdit* RsyncConfigDialog::lineEdit() +TQLineEdit* RsyncConfigDialog::lineEdit() { return m_rsync_txt; } -const QLineEdit* RsyncConfigDialog::lineEdit() const +const TQLineEdit* RsyncConfigDialog::lineEdit() const { return m_rsync_txt; } diff --git a/konq-plugins/rsync/rsyncconfigdialog.h b/konq-plugins/rsync/rsyncconfigdialog.h index 38f8687..8e02d54 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.h +++ b/konq-plugins/rsync/rsyncconfigdialog.h @@ -19,10 +19,10 @@ #ifndef __RSYNC_CONFIG_DIALOG_H #define __RSYNC_CONFIG_DIALOG_H -#include <qmap.h> -#include <qstringlist.h> -#include <qlineedit.h> -#include <qradiobutton.h> +#include <tqmap.h> +#include <tqstringlist.h> +#include <tqlineedit.h> +#include <tqradiobutton.h> #include <kurl.h> #include <kprocess.h> @@ -39,26 +39,26 @@ class RsyncConfigDialog : public KDialogBase Q_OBJECT public: - RsyncConfigDialog(QWidget* parent = 0, const char* name = 0, - const QString& caption = QString::null, - const QString& text = QString::null, - const QString& localfolder = QString::null, - const QString& remotefolder = QString::null, + 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, int syncmode = 1, bool modal = false); /** - * Returns the QLineEdit used in this dialog. + * Returns the TQLineEdit used in this dialog. * To set the number of lines or other text box related * settings, access the KTextEdit object directly via this method. */ - QLineEdit* lineEdit(); + TQLineEdit* lineEdit(); /** - * Returns the QLineEdit used in this dialog. + * Returns the TQLineEdit used in this dialog. * To set the number of lines or other text box related * settings, access the KTextEdit object directly via this method. */ - const QLineEdit* lineEdit() const; + const TQLineEdit* lineEdit() const; /** * Returns index of selected synchronization mode @@ -75,14 +75,14 @@ class RsyncConfigDialog : public KDialogBase bool mAllowCancel; bool mAllowTextEdit; bool mShown; - QString mCancelText; - QLabel* mLabel; + TQString mCancelText; + TQLabel* mLabel; KProgress* mProgressBar; KTextEdit* mTextBox; - QTimer* mShowTimer; - QLineEdit* m_rsync_txt; - QRadioButton *rsync_rb1; - QRadioButton *rsync_rb2; - QRadioButton *rsync_rb3; + TQTimer* mShowTimer; + TQLineEdit* m_rsync_txt; + TQRadioButton *rsync_rb1; + TQRadioButton *rsync_rb2; + TQRadioButton *rsync_rb3; }; #endif diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index 3c4ae1a..81a5253 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -50,23 +50,23 @@ #include <util.h> #endif -#include <qfile.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qwhatsthis.h> -#include <qiconview.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> +#include <tqiconview.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqtimer.h> #include <kdebug.h> #include <klocale.h> @@ -106,8 +106,8 @@ typedef KGenericFactory<RsyncPlugin> RsyncPluginFactory; K_EXPORT_COMPONENT_FACTORY(librsyncplugin, RsyncPluginFactory("rsyncplugin")) -RsyncPlugin::RsyncPlugin (QObject* parent, const char* name, - const QStringList&) +RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, + const TQStringList&) :KParts::Plugin (parent, name), m_pSyncNow(0), m_pSyncSetup(0) @@ -125,10 +125,10 @@ RsyncPlugin::RsyncPlugin (QObject* parent, const char* name, m_pSyncSetup->setIcon("remotesyncconfig"); m_pSyncNow->setEnabled (false); - connect (m_part, SIGNAL(aboutToOpenURL()), SLOT(slotOpenURL())); + connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); - connect(m_pSyncNow, SIGNAL(activated()), this, SLOT(slotSync())); - connect(m_pSyncSetup, SIGNAL(activated()), this, SLOT(slotSetup())); + connect(m_pSyncNow, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSync())); + connect(m_pSyncSetup, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSetup())); loadSettings(); @@ -221,10 +221,10 @@ close_master: /** creates the unidirectional sync subprocess */ -bool RsyncPlugin::syncUnidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath) { +bool RsyncPlugin::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) { int fd[2]; int rc, flags; - thisFn = QString::null; + thisFn = TQString::null; rc = open_pty_pair(fd); if (rc == -1) { @@ -242,12 +242,12 @@ bool RsyncPlugin::syncUnidirectional(QString synccommand, QString syncflags, int } if (childPid == 0) { // Create the rsync command to run - QString execstring; + TQString execstring; if (parameter_order == 0) { - execstring = synccommand + syncflags + localfolder + QString("/ ") + remotepath; + execstring = synccommand + syncflags + localfolder + TQString("/ ") + remotepath; } else { - execstring = synccommand + syncflags + remotepath + QString("/ ") + localfolder; + execstring = synccommand + syncflags + remotepath + TQString("/ ") + localfolder; } // taken from konsole, see TEPty.C for details @@ -358,10 +358,10 @@ bool RsyncPlugin::syncUnidirectional(QString synccommand, QString syncflags, int /** creates the bidirectional sync subprocess */ -bool RsyncPlugin::syncBidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath) { +bool RsyncPlugin::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) { int fd[2]; int rc, flags; - thisFn = QString::null; + thisFn = TQString::null; // Check for and remove the trailing slash in localfolder if (localfolder.endsWith("/")) { @@ -384,8 +384,8 @@ bool RsyncPlugin::syncBidirectional(QString synccommand, QString syncflags, int } if (childPid == 0) { // Create the rsync command to run - QString execstring; - execstring = synccommand + syncflags + localfolder + QString(" ") + remotepath; + TQString execstring; + execstring = synccommand + syncflags + localfolder + TQString(" ") + remotepath; // taken from konsole, see TEPty.C for details // note: if we're running on socket pairs, @@ -498,7 +498,7 @@ writes one chunk of data to stdin of child process void RsyncPlugin::writeChild(const char *buf, KIO::fileoffset_t len) { if (outBufPos >= 0 && outBuf) { #if 0 - QString debug; + TQString debug; debug.setLatin1(outBuf,outBufLen); if (len > 0) myDebug( << "write request while old one is pending, throwing away input (" << outBufLen << "," << outBufPos << "," << debug.left(10) << "...)" << endl); #endif @@ -513,7 +513,7 @@ void RsyncPlugin::writeChild(const char *buf, KIO::fileoffset_t len) { manages initial communication setup including password queries */ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { - QString buf; + TQString buf; buf.setLatin1(buffer,len); int pos; // Strip trailing whitespace @@ -526,7 +526,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { qApp->processEvents(); } pos++; - QString str = buf.left(pos); + TQString str = buf.left(pos); buf = buf.mid(pos); if (str == "\n") continue; @@ -544,7 +544,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { m_progressDialog->setAutoClose(true); m_progressDialog->progressBar()->setTotalSteps(2); m_progressDialog->progressBar()->setValue(1); - connect (m_progressDialog, SIGNAL(cancelClicked()), SLOT(slotRsyncCancelled())); + connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotRsyncCancelled())); m_progressDialog->show(); m_progressDialogExists = true; } @@ -557,25 +557,25 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } else if (!connectionPassword.isEmpty()) { myDebug( << "sending cpass" << endl); connectionAuth.password = connectionPassword+"\n"; - connectionPassword = QString::null; + connectionPassword = TQString::null; writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } else { myDebug( << "sending mpass" << endl); connectionAuth.prompt = thisFn+buf; - connectionAuth.password = QString::null; // don't prefill - QCString thispass; - if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + QString("\n") + i18n("Please input") + QString(" ") + QString(buf), NULL) != 1) { + connectionAuth.password = TQString::null; // 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); return -1; } else { - connectionAuth.password = QString(thispass); + connectionAuth.password = TQString(thispass); } connectionAuth.password += "\n"; myDebug( << "sending pass" << endl); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } - thisFn = QString::null; + thisFn = TQString::null; return 0; } else if (buf.endsWith("?")) { @@ -585,7 +585,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } else { writeChild("no\n",3); } - thisFn = QString::null; + thisFn = TQString::null; return 0; } @@ -598,8 +598,8 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { else { if (str.contains(", to-check=")) { // Parse the to-check output - QString tocheck_out_cur; - QString tocheck_out_tot; + 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("/")); @@ -620,8 +620,8 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { /** manages initial communication setup including password queries */ -int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, QString localfolder, QString remotepath) { - QString buf; +int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath) { + TQString buf; buf.setLatin1(buffer,len); int pos; // Strip trailing whitespace @@ -634,7 +634,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, qApp->processEvents(); } pos++; - QString str = buf.left(pos); + TQString str = buf.left(pos); buf = buf.mid(pos); if (str == "\n") continue; @@ -651,7 +651,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, m_progressDialog->progressBar()->setFormat("%v / %m"); m_progressDialog->progressBar()->setTotalSteps(0); m_progressDialog->setAutoClose(true); - connect (m_progressDialog, SIGNAL(cancelClicked()), SLOT(slotUnisonCancelled())); + connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotUnisonCancelled())); m_progressDialog->show(); m_progressDialogExists = true; } @@ -664,25 +664,25 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } else if (!connectionPassword.isEmpty()) { myDebug( << "sending cpass" << endl); connectionAuth.password = connectionPassword+"\n"; - connectionPassword = QString::null; + connectionPassword = TQString::null; writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } else { myDebug( << "sending mpass" << endl); connectionAuth.prompt = thisFn+buf; - connectionAuth.password = QString::null; // don't prefill - QCString thispass; - if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + QString("\n") + i18n("Please input") + QString(" ") + QString(buf), NULL) != 1) { + connectionAuth.password = TQString::null; // don't prefill + TQCString thispass; + if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + TQString("\n") + i18n("Please input") + TQString(" ") + TQString(buf), NULL) != 1) { slotUnisonCancelled(); return -1; } else { - connectionAuth.password = QString(thispass); + connectionAuth.password = TQString(thispass); } connectionAuth.password += "\n"; myDebug( << "sending pass" << endl); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } - thisFn = QString::null; + thisFn = TQString::null; return 0; } else if (buf.endsWith("?") || buf.endsWith("? []")) { @@ -703,7 +703,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, writeChild("no\n",3); } } - thisFn = QString::null; + thisFn = TQString::null; buf = ""; return 0; } @@ -715,13 +715,13 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, currentPos = m_progressDialog->progressBar()->progress(); m_progressDialog->progressBar()->setProgress(++currentPos); } - QString file_name; + TQString file_name; file_name = buf; file_name.replace("[]", ""); - file_name.replace(QString("changed "), ""); + file_name.replace(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, QMessageBox::Warning, QString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + QString("</b><p>") + i18n("Local") + QString(": ") + localfolder + QString("/") + file_name + QString("<br>") + i18n("Remote") + QString(": ") + remotepath + QString("/") + file_name + QString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + QString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), QStringList(), QString::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, NULL, 1); if (rc == KDialogBase::Yes) { writeChild(">\n",3); } @@ -794,11 +794,11 @@ void RsyncPlugin::saveSettings() KConfig cfg ("rsyncrc", false, false); cfg.setGroup ("General"); - QString longstring = QString(""); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end();) { + TQString longstring = TQString(""); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end();) { longstring = longstring + (*i); i++; - longstring = longstring + QString(";"); + longstring = longstring + TQString(";"); } cfg.writeEntry("LocalFolders", longstring); @@ -818,13 +818,13 @@ void RsyncPlugin::loadSettings() m_bSettingsLoaded = true; } -QString RsyncPlugin::findLocalFolderByName(QString folderurl) +TQString RsyncPlugin::findLocalFolderByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; return (*i); i++; @@ -837,13 +837,13 @@ QString RsyncPlugin::findLocalFolderByName(QString folderurl) return NULL; } -QString RsyncPlugin::findSyncMethodByName(QString folderurl) +TQString RsyncPlugin::findSyncMethodByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; return (*i); @@ -856,13 +856,13 @@ QString RsyncPlugin::findSyncMethodByName(QString folderurl) return NULL; } -QString RsyncPlugin::findLoginSyncEnabledByName(QString folderurl) +TQString RsyncPlugin::findLoginSyncEnabledByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; i++; @@ -875,13 +875,13 @@ QString RsyncPlugin::findLoginSyncEnabledByName(QString folderurl) return NULL; } -QString RsyncPlugin::findLogoutSyncEnabledByName(QString folderurl) +TQString RsyncPlugin::findLogoutSyncEnabledByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; i++; @@ -894,13 +894,13 @@ QString RsyncPlugin::findLogoutSyncEnabledByName(QString folderurl) return NULL; } -QString RsyncPlugin::findTimedSyncEnabledByName(QString folderurl) +TQString RsyncPlugin::findTimedSyncEnabledByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; i++; @@ -913,13 +913,13 @@ QString RsyncPlugin::findTimedSyncEnabledByName(QString folderurl) return NULL; } -int RsyncPlugin::deleteLocalFolderByName(QString folderurl) +int RsyncPlugin::deleteLocalFolderByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i=cfgfolderlist.remove(i); i=cfgfolderlist.remove(i); i=cfgfolderlist.remove(i); @@ -933,11 +933,11 @@ int RsyncPlugin::deleteLocalFolderByName(QString folderurl) return 1; } -int RsyncPlugin::addLocalFolderByName(QString folderurl, QString remoteurl, QString syncmethod, QString excludelist, QString sync_on_login, QString sync_on_logout, QString sync_timed_interval) +int RsyncPlugin::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); cfgfolderlist.append(folderurl); cfgfolderlist.append(remoteurl); cfgfolderlist.append(syncmethod); @@ -956,19 +956,19 @@ void RsyncPlugin::slotOpenURL () { // See if this URL is "/", "/dev", or "/proc", and disable sync if so // Also disable sync for non-"file://" URLs - if ((url.directory(true, true) + QString("/") + url.fileName(true)) == "//") { + if ((url.directory(true, true) + TQString("/") + url.fileName(true)) == "//") { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } - else if (((url.directory(true, true) + QString("/") + url.fileName(true)).left(5) == "//dev") || ((url.directory(true, true) + QString("/") + url.fileName(true)).left(4) == "/dev")) { + else if (((url.directory(true, true) + TQString("/") + url.fileName(true)).left(5) == "//dev") || ((url.directory(true, true) + TQString("/") + url.fileName(true)).left(4) == "/dev")) { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } - else if (((url.directory(true, true) + QString("/") + url.fileName(true)).left(6) == "//proc") || ((url.directory(true, true) + QString("/") + url.fileName(true)).left(5) == "/proc")) { + else if (((url.directory(true, true) + TQString("/") + url.fileName(true)).left(6) == "//proc") || ((url.directory(true, true) + TQString("/") + url.fileName(true)).left(5) == "/proc")) { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } - else if (url.protocol() != QString("file")) { + else if (url.protocol() != TQString("file")) { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } @@ -976,7 +976,7 @@ void RsyncPlugin::slotOpenURL () m_pSyncSetup->setEnabled(true); // See if this URL is in the list of rsync-able directories - if (findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true)) != NULL) { + if (findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true)) != NULL) { m_pSyncNow->setEnabled (true); } else { @@ -994,9 +994,9 @@ void RsyncPlugin::slotSetup() m_pSyncSetup->setEnabled (false); // Look up settings - QString localfolder = url.directory(true, true) + QString("/") + url.fileName(true); - QString remotefolder = findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true)); - QString syncmethod = findSyncMethodByName(url.directory(true, true) + QString("/") + url.fileName(true)); + TQString localfolder = url.directory(true, true) + TQString("/") + url.fileName(true); + TQString remotefolder = findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true)); + TQString syncmethod = findSyncMethodByName(url.directory(true, true) + TQString("/") + url.fileName(true)); int syncint; if (syncmethod == NULL) { syncint = 1; @@ -1014,8 +1014,8 @@ void RsyncPlugin::slotSetup() m_configDialog = new RsyncConfigDialog(0, "rsyncConfig", i18n("Remote Folder Synchronization"), i18n("Configuring Remote Folder Synchronization"), localfolder, remotefolder, syncint, true); m_configDialog->show(); - connect (m_configDialog, SIGNAL(okClicked()), SLOT(slotSetupOK())); - connect (m_configDialog, SIGNAL(cancelClicked()), SLOT(slotSetupCancelled())); + connect (m_configDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSetupOK())); + connect (m_configDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotSetupCancelled())); } void RsyncPlugin::slotSetupOK() @@ -1026,11 +1026,11 @@ void RsyncPlugin::slotSetupOK() KURL url = m_part->url(); // Look up settings - QString localfolder = url.directory(true, true) + QString("/") + url.fileName(true); - QString remotefolder = findLocalFolderByName(localfolder); - QString remotefolder_new = m_configDialog->lineEdit()->text().ascii(); + TQString localfolder = url.directory(true, true) + TQString("/") + url.fileName(true); + TQString remotefolder = findLocalFolderByName(localfolder); + TQString remotefolder_new = m_configDialog->lineEdit()->text().ascii(); int syncmethod = m_configDialog->getSyncMode(); - QString syncmethod_new = ""; + TQString syncmethod_new = ""; if (syncmethod == 1) { syncmethod_new = "rsync_upload"; } @@ -1093,19 +1093,19 @@ void RsyncPlugin::slotSync() m_pSyncNow->setEnabled (false); - QString syncmethod = findSyncMethodByName(url.directory(true, true) + QString("/") + url.fileName(true)); + TQString syncmethod = findSyncMethodByName(url.directory(true, true) + TQString("/") + url.fileName(true)); if (syncmethod == NULL) { // Do nothing } else if (syncmethod == "rsync_upload") { // Initiate rsync - syncUnidirectional(QString("rsync"), QString(" -avtzAXE --delete --progress "), 0, url.directory(true, true) + QString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true))); + syncUnidirectional(TQString("rsync"), TQString(" -avtzAXE --delete --progress "), 0, url.directory(true, true) + TQString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true))); } else if (syncmethod == "rsync_download") { - syncUnidirectional(QString("rsync"), QString(" -avtzAXE --delete --progress "), 1, url.directory(true, true) + QString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true))); + syncUnidirectional(TQString("rsync"), TQString(" -avtzAXE --delete --progress "), 1, url.directory(true, true) + TQString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true))); } else if (syncmethod == "rsync_bidirectional") { - syncBidirectional(QString("unison"), QString(" -ui text -auto "), 1, url.directory(true, true) + QString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true))); + syncBidirectional(TQString("unison"), TQString(" -ui text -auto "), 1, url.directory(true, true) + TQString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true))); } m_progressDialogExists = false; diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h index 67af3d5..0adbfc0 100644 --- a/konq-plugins/rsync/rsyncplugin.h +++ b/konq-plugins/rsync/rsyncplugin.h @@ -19,8 +19,8 @@ #ifndef __RSYNC_PLUGIN_H #define __RSYNC_PLUGIN_H -#include <qmap.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqstringlist.h> #include <kurl.h> #include <kprocess.h> @@ -51,27 +51,27 @@ class RsyncPlugin : public KParts::Plugin public: - RsyncPlugin (QObject* parent, const char* name, const QStringList &); + RsyncPlugin (TQObject* parent, const char* name, const TQStringList &); virtual ~RsyncPlugin(); protected: void loadSettings(); void saveSettings(); - QString findLocalFolderByName(QString folderurl); - QString findLoginSyncEnabledByName(QString folderurl); - QString findLogoutSyncEnabledByName(QString folderurl); - QString findTimedSyncEnabledByName(QString folderurl); - int deleteLocalFolderByName(QString folderurl); - int addLocalFolderByName(QString folderurl, QString remoteurl, QString syncmethod, QString excludelist, QString sync_on_login, QString sync_on_logout, QString sync_timed_interval); - QString findSyncMethodByName(QString folderurl); + TQString findLocalFolderByName(TQString folderurl); + TQString findLoginSyncEnabledByName(TQString folderurl); + TQString findLogoutSyncEnabledByName(TQString folderurl); + TQString findTimedSyncEnabledByName(TQString folderurl); + int deleteLocalFolderByName(TQString folderurl); + int addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval); + TQString findSyncMethodByName(TQString folderurl); /** manages initial communication setup including password queries */ int establishConnectionRsync(char *buffer, KIO::fileoffset_t len); /** manages initial communication setup including password queries */ - int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, QString localfolder, QString remotepath); + int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath); /** creates the unidirectional sync subprocess */ - bool syncUnidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath); + bool syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath); /** creates the bidirectional sync subprocess */ - bool syncBidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath); + bool syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath); /** writes one chunk of data to stdin of child process */ void writeChild(const char *buf, KIO::fileoffset_t len); /** AuthInfo object used for logging in */ @@ -100,7 +100,7 @@ private: KProgressBoxDialog* m_progressDialog; RsyncConfigDialog* m_configDialog; - QStringList cfgfolderlist; + TQStringList cfgfolderlist; bool m_progressDialogExists; bool m_bSettingsLoaded; @@ -122,14 +122,14 @@ private: /** // FIXME: just a workaround for konq deficiencies */ bool isStat; /** // FIXME: just a workaround for konq deficiencies */ - QString redirectUser, redirectPass; + TQString redirectUser, redirectPass; /** user name of current connection */ - QString connectionUser; + TQString connectionUser; /** password of current connection */ - QString connectionPassword; + TQString connectionPassword; /** true if this is the first login attempt (== use cached password) */ bool firstLogin; - QString thisFn; + TQString thisFn; }; #endif diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 739a871..b8cd24c 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -45,11 +45,11 @@ #include <kparts/mainwindow.h> #include <kparts/partmanager.h> -#include <qpainter.h> -#include <qpopupmenu.h> -#include <qtimer.h> -#include <qstyle.h> -#include <qwhatsthis.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> +#include <tqstyle.h> +#include <tqwhatsthis.h> #include "searchbar.h" typedef KGenericFactory<SearchBarPlugin> SearchBarPluginFactory; @@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin, SearchBarPluginFactory("searchbarplugin")) -SearchBarPlugin::SearchBarPlugin(QObject *parent, const char *name, - const QStringList &) : +SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, + const TQStringList &) : KParts::Plugin(parent, name), m_searchCombo(0), m_searchMode(UseSearchProvider), @@ -81,15 +81,15 @@ SearchBarPlugin::SearchBarPlugin(QObject *parent, const char *name, 0, 0, actionCollection(), "toolbar_search_bar"); m_searchComboAction->setShortcutConfigurable(false); - connect(m_searchCombo, SIGNAL(activated(const QString &)), - SLOT(startSearch(const QString &))); - connect(m_searchCombo, SIGNAL(iconClicked()), SLOT(showSelectionMenu())); + connect(m_searchCombo, TQT_SIGNAL(activated(const TQString &)), + TQT_SLOT(startSearch(const TQString &))); + connect(m_searchCombo, TQT_SIGNAL(iconClicked()), TQT_SLOT(showSelectionMenu())); - QWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" + TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" "Enter a search term. Click on the icon to change search mode or provider.")); new KAction( i18n( "Focus Searchbar" ), CTRL+Key_S, - this, SLOT(focusSearchbar()), + this, TQT_SLOT(focusSearchbar()), actionCollection(), "focus_search_bar"); configurationChanged(); @@ -100,15 +100,15 @@ SearchBarPlugin::SearchBarPlugin(QObject *parent, const char *name, KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager")); if (partMan) { - connect(partMan, SIGNAL(activePartChanged(KParts::Part*)), - SLOT (partChanged (KParts::Part*))); + connect(partMan, TQT_SIGNAL(activePartChanged(KParts::Part*)), + TQT_SLOT (partChanged (KParts::Part*))); partChanged(partMan->activePart()); } - connect(this, SIGNAL(gsCompleteDelayed()), SLOT(gsStartDelay())); - connect(&m_gsTimer, SIGNAL(timeout()), SLOT(gsMakeCompletionList())); - connect(m_searchCombo->listBox(), SIGNAL(highlighted(const QString&)), SLOT(gsSetCompletedText(const QString&))); - connect(m_searchCombo, SIGNAL(activated(const QString&)), SLOT(gsPutTextInBox(const QString&))); + connect(this, TQT_SIGNAL(gsCompleteDelayed()), TQT_SLOT(gsStartDelay())); + connect(&m_gsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(gsMakeCompletionList())); + connect(m_searchCombo->listBox(), TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(gsSetCompletedText(const TQString&))); + connect(m_searchCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(gsPutTextInBox(const TQString&))); } SearchBarPlugin::~SearchBarPlugin() @@ -123,19 +123,19 @@ SearchBarPlugin::~SearchBarPlugin() m_searchCombo = 0L; } -QChar delimiter() +TQChar delimiter() { KConfig config( "kuriikwsfilterrc", true, false ); config.setGroup( "General" ); return config.readNumEntry( "KeywordDelimiter", ':' ); } -bool SearchBarPlugin::eventFilter(QObject *o, QEvent *e) +bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e) { - if( o==m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress ) + if( o==m_searchCombo->lineEdit() && e->type() == TQEvent::KeyPress ) { - QKeyEvent *k = (QKeyEvent *)e; - QString text = k->text(); + 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) @@ -206,7 +206,7 @@ void SearchBarPlugin::nextSearchEntry() } else { - QStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); it++; if(it==m_searchEngines.end()) { @@ -236,7 +236,7 @@ void SearchBarPlugin::previousSearchEntry() } else { - QStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); if(it==m_searchEngines.begin()) { m_searchMode = FindInThisPage; @@ -250,7 +250,7 @@ void SearchBarPlugin::previousSearchEntry() setIcon(); } -void SearchBarPlugin::startSearch(const QString &_search) +void SearchBarPlugin::startSearch(const TQString &_search) { if(m_urlEnterLock || _search.isEmpty() || !m_part) return; @@ -258,7 +258,7 @@ void SearchBarPlugin::startSearch(const QString &_search) m_gsTimer.stop(); m_searchCombo->listBox()->hide(); - QString search = _search.section('(', 0, 0).stripWhiteSpace(); + TQString search = _search.section('(', 0, 0).stripWhiteSpace(); if(m_searchMode == FindInThisPage) { @@ -270,18 +270,18 @@ void SearchBarPlugin::startSearch(const QString &_search) m_urlEnterLock = true; KService::Ptr service; KURIFilterData data; - QStringList list; + TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); if (service) { - const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); + const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + search ); } if(!service || !KURIFilter::self()->filterURI(data, list)) { - data.setData( QString::fromLatin1( "google" ) + delimiter() + search ); + data.setData( TQString::fromLatin1( "google" ) + delimiter() + search ); KURIFilter::self()->filterURI( data, list ); } @@ -315,7 +315,7 @@ void SearchBarPlugin::startSearch(const QString &_search) void SearchBarPlugin::setIcon() { - QString hinttext; + TQString hinttext; if(m_searchMode == FindInThisPage) { m_searchIcon = SmallIcon("find"); @@ -323,28 +323,28 @@ void SearchBarPlugin::setIcon() } else { - QString providername; + TQString providername; KService::Ptr service; KURIFilterData data; - QStringList list; + TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); if (service) { - const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); + const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + "some keyword" ); } if (service && KURIFilter::self()->filterURI(data, list)) { - QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); + TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if(iconPath.isEmpty()) { m_searchIcon = SmallIcon("enhanced_browsing"); } else { - m_searchIcon = QPixmap(iconPath); + m_searchIcon = TQPixmap(iconPath); } providername = service->name(); } @@ -358,13 +358,13 @@ void SearchBarPlugin::setIcon() static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext); // Create a bit wider icon with arrow - QPixmap arrowmap = QPixmap(m_searchIcon.width()+5,m_searchIcon.height()+5); + TQPixmap arrowmap = TQPixmap(m_searchIcon.width()+5,m_searchIcon.height()+5); arrowmap.fill(m_searchCombo->lineEdit()->backgroundColor()); - QPainter p( &arrowmap ); + TQPainter p( &arrowmap ); p.drawPixmap(0, 2, m_searchIcon); - QStyle::SFlags arrowFlags = QStyle::Style_Default; - m_searchCombo->style().drawPrimitive(QStyle::PE_ArrowDown, &p, QRect(arrowmap.width()-6, - arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, QStyleOption() ); + 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() ); p.end(); m_searchIcon = arrowmap; @@ -376,54 +376,54 @@ void SearchBarPlugin::showSelectionMenu() if(!m_popupMenu) { KService::Ptr service; - QPixmap icon; + TQPixmap icon; KURIFilterData data; - QStringList list; + TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - m_popupMenu = new QPopupMenu(m_searchCombo, "search selection menu"); - m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()), 0, 999); + 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->insertSeparator(); int i=-1; - for (QStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it ) + for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it ) { i++; - service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(*it)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it)); if(!service) { continue; } - const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); + const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + "some keyword" ); if(KURIFilter::self()->filterURI(data, list)) { - QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); + TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if(iconPath.isEmpty()) { icon = SmallIcon("enhanced_browsing"); } else { - icon = QPixmap( iconPath ); + icon = TQPixmap( iconPath ); } m_popupMenu->insertItem(icon, service->name(), i); } } m_popupMenu->insertSeparator(); - m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, SLOT(selectGoogleSuggestMode()), m_popupMenu); - QStringList google_modes; + m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu); + TQStringList google_modes; google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never"); m_googleMenu->setItems(google_modes); m_googleMenu->plug(m_popupMenu); m_popupMenu->insertItem(SmallIcon("enhanced_browsing"), i18n("Select Search Engines..."), - this, SLOT(selectSearchEngines()), 0, 1000); - connect(m_popupMenu, SIGNAL(activated(int)), SLOT(useSearchProvider(int))); + this, TQT_SLOT(selectSearchEngines()), 0, 1000); + connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(useSearchProvider(int))); } m_googleMenu->setCurrentItem(m_googleMode); - m_popupMenu->popup(m_searchCombo->mapToGlobal(QPoint(0, m_searchCombo->height() + 1)), 0); + m_popupMenu->popup(m_searchCombo->mapToGlobal(TQPoint(0, m_searchCombo->height() + 1)), 0); } void SearchBarPlugin::useFindInThisPage() @@ -450,7 +450,7 @@ void SearchBarPlugin::selectSearchEngines() *process << "kcmshell" << "ebrowsing"; - connect(process, SIGNAL(processExited(KProcess *)), SLOT(searchEnginesSelected(KProcess *))); + connect(process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(searchEnginesSelected(KProcess *))); if(!process->start()) { @@ -476,9 +476,9 @@ void SearchBarPlugin::configurationChanged() { KConfig *config = new KConfig("kuriikwsfilterrc"); config->setGroup("General"); - QString engine = config->readEntry("DefaultSearchEngine", "google"); + TQString engine = config->readEntry("DefaultSearchEngine", "google"); - QStringList favoriteEngines; + TQStringList favoriteEngines; favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia"; favoriteEngines = config->readListEntry("FavoriteSearchEngines", favoriteEngines); @@ -486,7 +486,7 @@ void SearchBarPlugin::configurationChanged() m_popupMenu = 0; m_searchEngines.clear(); m_searchEngines << engine; - for (QStringList::ConstIterator it = favoriteEngines.begin(); it != favoriteEngines.end(); ++it ) + for (TQStringList::ConstIterator it = favoriteEngines.begin(); it != favoriteEngines.end(); ++it ) if(*it!=engine) m_searchEngines << *it; @@ -518,7 +518,7 @@ void SearchBarPlugin::partChanged(KParts::Part *newPart) m_part = ::qt_cast<KHTMLPart*>(newPart); //Delay since when destroying tabs part 0 gets activated for a bit, before the proper part - QTimer::singleShot(0, this, SLOT(updateComboVisibility())); + TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility())); } void SearchBarPlugin::updateComboVisibility() @@ -537,24 +537,24 @@ void SearchBarPlugin::updateComboVisibility() void SearchBarPlugin::focusSearchbar() { - QFocusEvent::setReason( QFocusEvent::Shortcut ); + TQFocusEvent::setReason( TQFocusEvent::Shortcut ); m_searchCombo->setFocus(); - QFocusEvent::resetReason(); + TQFocusEvent::resetReason(); } -SearchBarCombo::SearchBarCombo(QWidget *parent, const char *name) : +SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : KHistoryCombo(parent, name), m_pluginActive(true) { - connect(this, SIGNAL(cleared()), SLOT(historyCleared())); + connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared())); } -const QPixmap &SearchBarCombo::icon() const +const TQPixmap &SearchBarCombo::icon() const { return m_icon; } -void SearchBarCombo::setIcon(const QPixmap &icon) +void SearchBarCombo::setIcon(const TQPixmap &icon) { m_icon = icon; @@ -571,7 +571,7 @@ void SearchBarCombo::setIcon(const QPixmap &icon) } } -int SearchBarCombo::findHistoryItem(const QString &searchText) +int SearchBarCombo::findHistoryItem(const TQString &searchText) { for(int i = 0; i < count(); i++) { @@ -584,9 +584,9 @@ int SearchBarCombo::findHistoryItem(const QString &searchText) return -1; } -void SearchBarCombo::mousePressEvent(QMouseEvent *e) +void SearchBarCombo::mousePressEvent(TQMouseEvent *e) { - int x0 = QStyle::visualRect( style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if(e->x() > x0 + 2 && e->x() < lineEdit()->x()) { @@ -649,20 +649,20 @@ void SearchBarPlugin::gsMakeCompletionList() { KIO::TransferJob* tj = KIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false); - connect(tj, SIGNAL(data(KIO::Job*, const QByteArray&)), this, SLOT(gsDataArrived(KIO::Job*, const QByteArray&))); - connect(tj, SIGNAL(result(KIO::Job*)), this, SLOT(gsJobFinished(KIO::Job*))); + connect(tj, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(KIO::Job*, const TQByteArray&))); + connect(tj, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(gsJobFinished(KIO::Job*))); } } -void SearchBarPlugin::gsDataArrived(KIO::Job*, const QByteArray& data) +void SearchBarPlugin::gsDataArrived(KIO::Job*, const TQByteArray& data) { - m_gsData += QString::fromUtf8(data.data()); + m_gsData += TQString::fromUtf8(data.data()); } -static QString reformatNumber(const QString& number) +static TQString reformatNumber(const TQString& number) { static const char suffix[] = { 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' }; - QString s = number.stripWhiteSpace(); + TQString s = number.stripWhiteSpace(); uint c = 0; for (int i = s.length() - 1; i > 0 && s[i] == '0'; --i) ++c; c /= 3; @@ -676,18 +676,18 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job) { if (((KIO::TransferJob*)job)->error() == 0) { - QString temp; + 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.remove('"'); - QStringList compList1 = QStringList::split(',', temp); + 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.remove('"'); temp.remove(','); temp.remove('s'); - QStringList compList2 = QStringList::split("reult", temp); - QStringList finalList; + TQStringList compList2 = TQStringList::split("reult", temp); + TQStringList finalList; for(uint j = 0; j < compList1.count(); j++) { if (m_googleMode!=ForAll || m_currentEngine == "google") @@ -710,9 +710,9 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job) m_gsData = ""; } -void SearchBarPlugin::gsSetCompletedText(const QString& text) +void SearchBarPlugin::gsSetCompletedText(const TQString& text) { - QString currentText; + TQString currentText; if (m_searchCombo->lineEdit()->hasSelectedText()) currentText = m_searchCombo->currentText().left(m_searchCombo->lineEdit()->selectionStart()); else @@ -725,7 +725,7 @@ void SearchBarPlugin::gsSetCompletedText(const QString& text) } } -void SearchBarPlugin::gsPutTextInBox(const QString& text) +void SearchBarPlugin::gsPutTextInBox(const TQString& text) { m_searchCombo->lineEdit()->setText(text.section('(', 0, 0).stripWhiteSpace()); } diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index 25e7ded..2bce26d 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -27,9 +27,9 @@ #include <kparts/plugin.h> #include <kparts/mainwindow.h> -#include <qguardedptr.h> -#include <qpixmap.h> -#include <qstring.h> +#include <tqguardedptr.h> +#include <tqpixmap.h> +#include <tqstring.h> class KHTMLPart; class KProcess; @@ -47,23 +47,23 @@ class SearchBarCombo : public KHistoryCombo /** * Constructor. */ - SearchBarCombo(QWidget *parent, const char *name); + SearchBarCombo(TQWidget *parent, const char *name); /** * Returns the icon currently displayed in the combo box. */ - const QPixmap &icon() const; + const TQPixmap &icon() const; /** * Sets the icon displayed in the combo box. */ - void setIcon(const QPixmap &icon); + void setIcon(const TQPixmap &icon); /** * Finds a history item by its text. * @return The item number, or -1 if the item is not found. */ - int findHistoryItem(const QString &text); + int findHistoryItem(const TQString &text); /** * Sets whether the plugin is active. It can be inactive @@ -85,13 +85,13 @@ class SearchBarCombo : public KHistoryCombo * Captures mouse clicks and emits iconClicked() if the icon * was clicked. */ - virtual void mousePressEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); private slots: void historyCleared(); private: - QPixmap m_icon; + TQPixmap m_icon; bool m_pluginActive; }; @@ -111,19 +111,19 @@ class SearchBarPlugin : public KParts::Plugin /** Possible search modes */ enum SearchModes { FindInThisPage = 0, UseSearchProvider }; - SearchBarPlugin(QObject *parent, const char *name, - const QStringList &); + SearchBarPlugin(TQObject *parent, const char *name, + const TQStringList &); virtual ~SearchBarPlugin(); protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); private slots: /** * Starts a search by putting the query URL from the selected * search provider in the locationbar and calling goURL() */ - void startSearch(const QString &search); + void startSearch(const TQString &search); /** * Sets the icon to indicate which search engine is used. @@ -157,10 +157,10 @@ class SearchBarPlugin : public KParts::Plugin void selectGoogleSuggestMode(); void gsStartDelay(); void gsMakeCompletionList(); - void gsDataArrived(KIO::Job*, const QByteArray& data); + void gsDataArrived(KIO::Job*, const TQByteArray& data); void gsJobFinished(KIO::Job* job); - void gsSetCompletedText(const QString& text); - void gsPutTextInBox(const QString& text); + void gsSetCompletedText(const TQString& text); + void gsPutTextInBox(const TQString& text); signals: @@ -172,22 +172,22 @@ class SearchBarPlugin : public KParts::Plugin void nextSearchEntry(); void previousSearchEntry(); - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; SearchBarCombo *m_searchCombo; KWidgetAction *m_searchComboAction; - QPopupMenu *m_popupMenu; + TQPopupMenu *m_popupMenu; KSelectAction *m_googleMenu; - QPixmap m_searchIcon; + TQPixmap m_searchIcon; SearchModes m_searchMode; - QString m_providerName; + TQString m_providerName; bool m_urlEnterLock; - QString m_currentEngine; - QStringList m_searchEngines; + TQString m_currentEngine; + TQStringList m_searchEngines; // Google Suggest private members - QTimer m_gsTimer; - QString m_gsData; + TQTimer m_gsTimer; + TQString m_gsData; enum GoogleMode {GoogleOnly,ForAll,Never}; GoogleMode m_googleMode; }; diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 64e626d..5e3b0b3 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -24,18 +24,18 @@ #include <kglobal.h> #include <klocale.h> -BookmarkListItem::BookmarkListItem( QListView *parent, const QString & url, const QString & desc, time_t time ) +BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) : KListViewItem( parent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); } -int BookmarkListItem::compare( QListViewItem * i, int col, bool ascending ) const +int BookmarkListItem::compare( TQListViewItem * i, int col, bool ascending ) const { if ( col == 1 ) { - QDateTime them = static_cast<BookmarkListItem *>( i )->date(); + TQDateTime them = static_cast<BookmarkListItem *>( i )->date(); if ( m_dateTime < them ) return -1; else if ( m_dateTime > them ) @@ -43,17 +43,17 @@ int BookmarkListItem::compare( QListViewItem * i, int col, bool ascending ) cons else return 0; } - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); } -QString BookmarkListItem::text( int column ) const +TQString BookmarkListItem::text( int column ) const { if ( column == 0 ) return m_desc; else if ( column == 1 ) return KGlobal::locale()->formatDateTime( m_dateTime ); - return QString::null; + return TQString::null; } KURL BookmarkListItem::url() const @@ -61,12 +61,12 @@ KURL BookmarkListItem::url() const return m_url; } -QDateTime BookmarkListItem::date() const +TQDateTime BookmarkListItem::date() const { return m_dateTime; } -QString BookmarkListItem::desc() const +TQString BookmarkListItem::desc() const { return m_desc; } diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 5e60022..392eab8 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -22,7 +22,7 @@ #ifndef _BOOKMARKLISTITEM_H_ #define _BOOKMARKLISTITEM_H_ -#include <qdatetime.h> +#include <tqdatetime.h> #include <klistview.h> #include <kurl.h> @@ -34,18 +34,18 @@ class QString; class BookmarkListItem: public KListViewItem { public: - BookmarkListItem( QListView *parent, const QString & url, const QString & desc, time_t time ); + BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); KURL url() const; - QDateTime date() const; - QString desc() const; + TQDateTime date() const; + TQString desc() const; protected: - virtual int compare( QListViewItem * i, int col, bool ascending ) const; - virtual QString text( int column ) const; + virtual int compare( TQListViewItem * i, int col, bool ascending ) const; + virtual TQString text( int column ) const; KURL m_url; - QString m_desc; - QDateTime m_dateTime; + TQString m_desc; + TQDateTime m_dateTime; }; #endif diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 1b76c94..612be03 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -24,12 +24,12 @@ #include "tagListItem.h" #include "bookmarkListItem.h" -#include <qlistview.h> -#include <qdom.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qdatetime.h> +#include <tqlistview.h> +#include <tqdom.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqdatetime.h> #include <kdebug.h> #include <kio/job.h> @@ -42,7 +42,7 @@ #include <kconfig.h> #include <kinputdialog.h> -MainWidget::MainWidget( KConfig * config, QWidget * parent ) +MainWidget::MainWidget( KConfig * config, TQWidget * parent ) : MainWidget_base( parent ), m_config( config ) { loadTags(); @@ -53,28 +53,28 @@ MainWidget::MainWidget( KConfig * config, QWidget * parent ) btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) ); btnNew->setIconSet( il->loadIconSet( "bookmark_add", KIcon::Small ) ); - connect( ( QWidget * ) btnRefreshTags, SIGNAL( clicked() ), - this, SLOT( slotGetTags() ) ); + connect( ( TQWidget * ) btnRefreshTags, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotGetTags() ) ); - connect( ( QWidget * ) btnRefreshBookmarks, SIGNAL( clicked() ), - this, SLOT( slotGetBookmarks() ) ); + connect( ( TQWidget * ) btnRefreshBookmarks, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotGetBookmarks() ) ); - connect( ( QWidget * ) btnNew, SIGNAL( clicked() ), - this, SLOT( slotNewBookmark() ) ); + connect( ( TQWidget * ) btnNew, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotNewBookmark() ) ); - connect( lvBookmarks, SIGNAL( executed( QListViewItem * ) ), - this, SLOT( slotBookmarkExecuted( QListViewItem * ) ) ); - connect( lvBookmarks, SIGNAL( mouseButtonClicked ( int, QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotBookmarkClicked( int, QListViewItem *, const QPoint &, int ) ) ); + connect( lvBookmarks, TQT_SIGNAL( executed( TQListViewItem * ) ), + this, TQT_SLOT( slotBookmarkExecuted( TQListViewItem * ) ) ); + connect( lvBookmarks, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotBookmarkClicked( int, TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvTags, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotTagsContextMenu( QListViewItem *, const QPoint &, int ) ) ); + connect( lvTags, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotTagsContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvBookmarks, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotBookmarksContextMenu( QListViewItem *, const QPoint &, int ) ) ); + connect( lvBookmarks, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotBookmarksContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - m_updateTimer = new QTimer( this ); - connect( m_updateTimer, SIGNAL( timeout() ), SLOT( slotGetBookmarks() ) ); + m_updateTimer = new TQTimer( this ); + connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotGetBookmarks() ) ); slotGetTags(); } @@ -94,8 +94,8 @@ void MainWidget::slotGetTags() kdDebug() << k_funcinfo << endl; KIO::StoredTransferJob * job = KIO::storedGet( "http://del.icio.us/api/tags/get" ); - connect( job, SIGNAL( result( KIO::Job * ) ), - this, SLOT( slotFillTags( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( slotFillTags( KIO::Job * ) ) ); } void MainWidget::slotFillTags( KIO::Job * job ) @@ -112,17 +112,17 @@ void MainWidget::slotFillTags( KIO::Job * job ) m_tags.clear(); // fill lvTags with job->data() - QDomDocument doc; + TQDomDocument doc; doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() ); - QDomNodeList tags = doc.elementsByTagName( "tag" ); + TQDomNodeList tags = doc.elementsByTagName( "tag" ); for ( uint i = 0; i < tags.length(); ++i ) { - QDomElement tag = tags.item( i ).toElement(); + TQDomElement tag = tags.item( i ).toElement(); if ( !tag.isNull() ) { TagListItem *item = new TagListItem( lvTags, tag.attribute( "tag" ), tag.attribute( "count" ).toInt() ); m_tags.append( tag.attribute( "tag" ) ); - connect( item, SIGNAL( signalItemChecked( TagListItem * ) ), SLOT( itemToggled() ) ); + connect( item, TQT_SIGNAL( signalItemChecked( TagListItem * ) ), TQT_SLOT( itemToggled() ) ); } } } @@ -135,8 +135,8 @@ void MainWidget::slotGetBookmarks() kdDebug() << k_funcinfo << url.url() << endl; KIO::StoredTransferJob * job = KIO::storedGet( url ); - connect( job, SIGNAL( result( KIO::Job * ) ), - this, SLOT( slotFillBookmarks( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( slotFillBookmarks( KIO::Job * ) ) ); } void MainWidget::slotFillBookmarks( KIO::Job * job ) @@ -152,13 +152,13 @@ void MainWidget::slotFillBookmarks( KIO::Job * job ) lvBookmarks->clear(); // fill lvBookmarks with job->data() - QDomDocument doc; + TQDomDocument doc; doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() ); - QDomNodeList posts = doc.elementsByTagName( "post" ); + TQDomNodeList posts = doc.elementsByTagName( "post" ); for ( uint i = 0; i < posts.length(); ++i ) { - QDomElement post = posts.item( i ).toElement(); + TQDomElement post = posts.item( i ).toElement(); if ( !post.isNull() ) { new BookmarkListItem( lvBookmarks, post.attribute( "href" ), post.attribute( "description" ), @@ -167,11 +167,11 @@ void MainWidget::slotFillBookmarks( KIO::Job * job ) } } -QStringList MainWidget::checkedTags() const +TQStringList MainWidget::checkedTags() const { - QListViewItemIterator it( lvTags, QListViewItemIterator::Visible | QListViewItemIterator::Checked ); + TQListViewItemIterator it( lvTags, TQListViewItemIterator::Visible | TQListViewItemIterator::Checked ); - QStringList tmp; + TQStringList tmp; while ( it.current() ) { @@ -182,7 +182,7 @@ QStringList MainWidget::checkedTags() const return tmp; } -void MainWidget::slotBookmarkExecuted( QListViewItem * item ) +void MainWidget::slotBookmarkExecuted( TQListViewItem * item ) { BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( item ); if ( bookmark ) @@ -192,7 +192,7 @@ void MainWidget::slotBookmarkExecuted( QListViewItem * item ) } } -void MainWidget::slotBookmarkClicked( int button, QListViewItem * item, const QPoint &, int ) +void MainWidget::slotBookmarkClicked( int button, TQListViewItem * item, const TQPoint &, int ) { BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( item ); if ( bookmark && button == Qt::MidButton ) // handle middle click @@ -202,16 +202,16 @@ void MainWidget::slotBookmarkClicked( int button, QListViewItem * item, const QP } } -QStringList MainWidget::tags() const +TQStringList MainWidget::tags() const { return m_tags; } -QStringList MainWidget::bookmarks() const +TQStringList MainWidget::bookmarks() const { - QListViewItemIterator it( lvBookmarks ); + TQListViewItemIterator it( lvBookmarks ); - QStringList tmp; + TQStringList tmp; while ( it.current() ) { @@ -222,30 +222,30 @@ QStringList MainWidget::bookmarks() const return tmp; } -void MainWidget::slotTagsContextMenu( QListViewItem *, const QPoint & pos, int ) +void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int ) { if ( lvTags->childCount() == 0 ) return; - QPopupMenu * tagMenu = new QPopupMenu( this ); + TQPopupMenu * tagMenu = new TQPopupMenu( this ); Q_CHECK_PTR( tagMenu ); - tagMenu->insertItem( i18n( "Check All" ), this, SLOT( slotCheckAllTags() ) ); - tagMenu->insertItem( i18n( "Uncheck All" ), this, SLOT( slotUncheckAllTags() ) ); - tagMenu->insertItem( i18n( "Toggle All" ), this, SLOT( slotToggleTags() ) ); + tagMenu->insertItem( i18n( "Check All" ), this, TQT_SLOT( slotCheckAllTags() ) ); + tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) ); + tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) ); tagMenu->insertSeparator(); tagMenu->insertItem( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ), - i18n( "Rename Tag..." ), this, SLOT( slotRenameTag() ) ); + i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) ); tagMenu->exec( pos ); } void MainWidget::slotCheckAllTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast<QCheckListItem *>( *it ); + TQCheckListItem * item = static_cast<TQCheckListItem *>( *it ); if ( item ) item->setOn( true ); ++it; @@ -254,10 +254,10 @@ void MainWidget::slotCheckAllTags() void MainWidget::slotUncheckAllTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast<QCheckListItem *>( *it ); + TQCheckListItem * item = static_cast<TQCheckListItem *>( *it ); if ( item ) item->setOn( false ); ++it; @@ -266,10 +266,10 @@ void MainWidget::slotUncheckAllTags() void MainWidget::slotToggleTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast<QCheckListItem *>( *it ); + TQCheckListItem * item = static_cast<TQCheckListItem *>( *it ); if ( item ) item->setOn( !item->isOn() ); ++it; @@ -301,8 +301,8 @@ void MainWidget::slotRenameTag() TagListItem * tag = static_cast<TagListItem *>( lvTags->currentItem() ); if ( tag ) { - QString oldName = tag->name(); - QString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) ); + TQString oldName = tag->name(); + TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) ); if ( !newName.isEmpty() ) { KURL url( "http://del.icio.us/api/tags/rename" ); @@ -315,16 +315,16 @@ void MainWidget::slotRenameTag() } } -void MainWidget::slotBookmarksContextMenu( QListViewItem *, const QPoint & pos, int ) +void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos, int ) { if ( lvBookmarks->childCount() == 0 ) return; - QPopupMenu * menu = new QPopupMenu( this ); + TQPopupMenu * menu = new TQPopupMenu( this ); Q_CHECK_PTR( menu ); menu->insertItem( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ), - i18n( "Delete Bookmark" ), this, SLOT( slotDeleteBookmark() ) ); + i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) ); menu->exec( pos ); } diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h index fdaa9ea..59be8d6 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.h +++ b/konq-plugins/sidebar/delicious/mainWidget.h @@ -39,20 +39,20 @@ class MainWidget: public MainWidget_base { Q_OBJECT public: - MainWidget( KConfig * config, QWidget * parent ); + MainWidget( KConfig * config, TQWidget * parent ); ~MainWidget(); /** * @return all the tags user has * (used in the DCOP iface) */ - QStringList tags() const; + TQStringList tags() const; /** * @return all the (currently visible) bookmark (URLs) * (used in the DCOP iface) */ - QStringList bookmarks() const; + TQStringList bookmarks() const; /** * Set the internal URL to @p url @@ -92,22 +92,22 @@ private slots: /** * Handle clicking on a bookmark (KDE mode) */ - void slotBookmarkExecuted( QListViewItem * item ); + void slotBookmarkExecuted( TQListViewItem * item ); /** * Handle middle clicking a bookmark */ - void slotBookmarkClicked( int button, QListViewItem * item, const QPoint & pnt, int col ); + void slotBookmarkClicked( int button, TQListViewItem * item, const TQPoint & pnt, int col ); /** * Popup a tag context menu over @p item and position @pos */ - void slotTagsContextMenu( QListViewItem * item, const QPoint & pos, int col ); + void slotTagsContextMenu( TQListViewItem * item, const TQPoint & pos, int col ); /** * Popup a bookmark context menu over @p item and position @pos */ - void slotBookmarksContextMenu( QListViewItem * item, const QPoint & pos, int col ); + void slotBookmarksContextMenu( TQListViewItem * item, const TQPoint & pos, int col ); /** * Put a checkmark before all tags @@ -154,7 +154,7 @@ private: /** * @return list of checked tags */ - QStringList checkedTags() const; + TQStringList checkedTags() const; /** * Save the tag list to the config file @@ -166,9 +166,9 @@ private: */ void loadTags(); - QTimer *m_updateTimer; + TQTimer *m_updateTimer; KURL m_currentURL; - QStringList m_tags; + TQStringList m_tags; KConfig * m_config; }; diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index cc5759f..3ed6c09 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -21,24 +21,24 @@ #include "plugin.h" -#include <qstring.h> +#include <tqstring.h> #include <kapplication.h> #include <klocale.h> #include <kglobal.h> -KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, QObject *parent, - QWidget *widgetParent, QString &desktopName_, +KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent, + TQWidget *widgetParent, TQString &desktopName_, const char* name ) : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ), DCOPObject( "sidebar-delicious" ) { m_widget = new MainWidget( instance->config(), widgetParent ); - connect( m_widget, SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), - this, SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( m_widget, SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), - this, SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQT_SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQT_SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); } KonqSidebarDelicious::~KonqSidebarDelicious() @@ -46,12 +46,12 @@ KonqSidebarDelicious::~KonqSidebarDelicious() } -void * KonqSidebarDelicious::provides( const QString & ) +void * KonqSidebarDelicious::provides( const TQString & ) { return 0; } -QWidget * KonqSidebarDelicious::getWidget() +TQWidget * KonqSidebarDelicious::getWidget() { return m_widget; } @@ -68,8 +68,8 @@ bool KonqSidebarDelicious::universalMode() extern "C" { - KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, QObject *par, QWidget *widp, - QString &desktopname, const char *name ) + KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, TQObject *par, TQWidget *widp, + TQString &desktopname, const char *name ) { KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); return new KonqSidebarDelicious( instance, par, widp, desktopname, name ); @@ -78,7 +78,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_delicious( QString* fn, QString* /*param*/, QMap<QString,QString> *map ) + KDE_EXPORT bool add_konqsidebar_delicious( TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map ) { map->insert("Type", "Link"); map->insert("Icon", "konqsidebar_delicious"); @@ -90,12 +90,12 @@ extern "C" } } -QStringList KonqSidebarDelicious::tags() const +TQStringList KonqSidebarDelicious::tags() const { return m_widget->tags(); } -QStringList KonqSidebarDelicious::bookmarks() const +TQStringList KonqSidebarDelicious::bookmarks() const { return m_widget->bookmarks(); } diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index cc1479c..34d740f 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -42,18 +42,18 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject Q_OBJECT K_DCOP public: - KonqSidebarDelicious( KInstance * instance, QObject * parent, QWidget * widgetParent, - QString & desktopName_, const char * name = 0 ); + KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent, + TQString & desktopName_, const char * name = 0 ); ~KonqSidebarDelicious(); - virtual void * provides( const QString & ); + virtual void * provides( const TQString & ); /** * @return the main widget */ - virtual QWidget * getWidget(); + virtual TQWidget * getWidget(); k_dcop: - QStringList tags() const; - QStringList bookmarks() const; + TQStringList tags() const; + TQStringList bookmarks() const; void newBookmark(); protected: diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp index fcafca7..e7396a6 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.cpp +++ b/konq-plugins/sidebar/delicious/tagListItem.cpp @@ -21,20 +21,20 @@ #include "tagListItem.h" -TagListItem::TagListItem( QListView * parent, const QString & tagName, int count ) - : QCheckListItem( parent, tagName, QCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) +TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count ) + : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) { } // virtual void TagListItem::stateChange( bool state ) { - QCheckListItem::stateChange( state ); + TQCheckListItem::stateChange( state ); emit signalItemChecked( this ); } // virtual -int TagListItem::compare( QListViewItem * i, int col, bool ascending ) const +int TagListItem::compare( TQListViewItem * i, int col, bool ascending ) const { if ( col == 1 ) { @@ -46,7 +46,7 @@ int TagListItem::compare( QListViewItem * i, int col, bool ascending ) const else return 0; } - return QCheckListItem::compare( i, col, ascending ); + return TQCheckListItem::compare( i, col, ascending ); } int TagListItem::count() const @@ -55,22 +55,22 @@ int TagListItem::count() const } // virtual -QString TagListItem::text( int column ) const +TQString TagListItem::text( int column ) const { if ( column == 0 ) return m_name; else if ( column == 1 ) - return QString::number( m_count ); + return TQString::number( m_count ); else - return QString::null; + return TQString::null; } -QString TagListItem::name() const +TQString TagListItem::name() const { return m_name; } -void TagListItem::setName( const QString & name ) +void TagListItem::setName( const TQString & name ) { m_name = name; } diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h index 40e4c31..fe557de 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.h +++ b/konq-plugins/sidebar/delicious/tagListItem.h @@ -22,28 +22,28 @@ #ifndef _TAGLISTITEM_H_ #define _TAGLISTITEM_H_ -#include <qobject.h> -#include <qlistview.h> +#include <tqobject.h> +#include <tqlistview.h> -class TagListItem: public QObject, public QCheckListItem +class TagListItem: public TQObject, public QCheckListItem { Q_OBJECT public: - TagListItem( QListView * parent, const QString & tagName, int count = 1 ); + TagListItem( TQListView * parent, const TQString & tagName, int count = 1 ); int count() const; - QString name() const; - void setName( const QString & name ); + TQString name() const; + void setName( const TQString & name ); protected: virtual void stateChange( bool state ); - virtual int compare( QListViewItem * i, int col, bool ascending ) const; - virtual QString text( int column ) const; + virtual int compare( TQListViewItem * i, int col, bool ascending ) const; + virtual TQString text( int column ) const; signals: void signalItemChecked( TagListItem * ); private: - QString m_name; + TQString m_name; int m_count; }; diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 76671d5..6c3be21 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(QWidget * parent, const char * name) : - QSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, QWidget * parent, const char * name) : - QSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, QWidget * parent, const char * name) : - QSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -42,28 +42,28 @@ bool L33tSlider::currentlyPressed() const void L33tSlider::setValue(int i) { if (!pressed) - QSlider::setValue(i); + TQSlider::setValue(i); } -void L33tSlider::mousePressEvent(QMouseEvent*e) +void L33tSlider::mousePressEvent(TQMouseEvent*e) { if (e->button()!=RightButton) { pressed=true; - QSlider::mousePressEvent(e); + TQSlider::mousePressEvent(e); } } -void L33tSlider::mouseReleaseEvent(QMouseEvent*e) +void L33tSlider::mouseReleaseEvent(TQMouseEvent*e) { pressed=false; - QSlider::mouseReleaseEvent(e); + TQSlider::mouseReleaseEvent(e); emit userChanged(value()); } -void L33tSlider::wheelEvent(QWheelEvent *e) +void L33tSlider::wheelEvent(TQWheelEvent *e) { - QSlider::wheelEvent(e); + TQSlider::wheelEvent(e); int newValue = value(); if(newValue < minValue()) @@ -75,15 +75,15 @@ void L33tSlider::wheelEvent(QWheelEvent *e) emit userChanged(newValue); } -SliderAction::SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ) +SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ) : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; } -int SliderAction::plug( QWidget *w, int index ) +int SliderAction::plug( TQWidget *w, int index ) { if (!w->inherits("KToolBar")) return -1; @@ -97,11 +97,11 @@ int SliderAction::plug( QWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "KToolBar" )) - connect(toolBar, SIGNAL(moved(KToolBar::BarPosition)), this, SLOT(toolbarMoved(KToolBar::BarPosition))); + connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); emit plugged(); @@ -126,7 +126,7 @@ return; */ } -void SliderAction::unplug( QWidget *w ) +void SliderAction::unplug( TQWidget *w ) { KToolBar *toolBar = (KToolBar *)w; int idx = findContainer( w ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index d05a977..37604eb 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -24,12 +24,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __CONTROLS_H #define __CONTROLS_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kaction.h> #include <ktoolbar.h> -#include <qslider.h> -#include <qstringlist.h> +#include <tqslider.h> +#include <tqstringlist.h> class QComboBox; class QLabel; @@ -42,10 +42,10 @@ class L33tSlider : public QSlider { Q_OBJECT public: - L33tSlider(QWidget * parent, const char * name=0); - L33tSlider(Orientation, QWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, QWidget * parent, const char * name=0); + Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -57,9 +57,9 @@ signals: public slots: virtual void setValue(int); protected: - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); - virtual void wheelEvent(QWheelEvent *e); + virtual void mousePressEvent(TQMouseEvent*); + virtual void mouseReleaseEvent(TQMouseEvent*); + virtual void wheelEvent(TQWheelEvent *e); private: bool pressed; @@ -72,11 +72,11 @@ class SliderAction : public KAction { Q_OBJECT public: - SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ); - virtual int plug( QWidget *w, int index = -1 ); - virtual void unplug( QWidget *w ); - QSlider* slider() const { return m_slider; } + SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ); + virtual int plug( TQWidget *w, int index = -1 ); + virtual void unplug( TQWidget *w ); + TQSlider* slider() const { return m_slider; } signals: void plugged(); @@ -84,9 +84,9 @@ signals: public slots: void toolbarMoved(KToolBar::BarPosition pos); private: - QGuardedPtr<QSlider> m_slider; - QStringList m_items; - const QObject *m_receiver; + TQGuardedPtr<TQSlider> m_slider; + TQStringList m_items; + const TQObject *m_receiver; const char *m_member; }; diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index cdb9486..e4590b6 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -33,9 +33,9 @@ extern "C" #include <kmimetype.h> #include <kstandarddirs.h> #include <kurl.h> -#include <qtimer.h> -#include <qfile.h> -#include <qdir.h> +#include <tqtimer.h> +#include <tqfile.h> +#include <tqdir.h> #include <connect.h> #include <dynamicrequest.h> @@ -71,8 +71,8 @@ public: KURL file; }; -Engine::Engine(QObject *parent) - : QObject(parent) +Engine::Engine(TQObject *parent) + : TQObject(parent) , d(new EnginePrivate) { } diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index 1a5638f..07e46f1 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _ENGINE_H #define _ENGINE_H -#include <qobject.h> +#include <tqobject.h> #include <kmedia2.h> #include <kmediaplayer/player.h> #include <kurl.h> @@ -45,7 +45,7 @@ class Engine : public QObject Q_OBJECT public: - Engine(QObject *parent=0); + Engine(TQObject *parent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index ce8d1af..2de09af 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,7 +27,7 @@ #include <kdemacros.h> #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name): +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); @@ -36,11 +36,11 @@ KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *pa KonqSidebar_MediaPlayer::~KonqSidebar_MediaPlayer(){;} -void* KonqSidebar_MediaPlayer::provides(const QString &) {return 0;} +void* KonqSidebar_MediaPlayer::provides(const TQString &) {return 0;} -void KonqSidebar_MediaPlayer::emitStatusBarText (const QString &) {;} +void KonqSidebar_MediaPlayer::emitStatusBarText (const TQString &) {;} -QWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} +TQWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) { @@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) extern "C" { - KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); @@ -60,7 +60,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_mediaplayer(QString* fn, QString* /*param*/, QMap<QString,QString> *map) + KDE_EXPORT bool add_konqsidebar_mediaplayer(TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map) { map->insert("Type","Link"); map->insert("Icon","konqsidebar_mediaplayer"); diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index c563e20..0e74248 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -28,11 +28,11 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin { Q_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); - virtual void *provides(const QString &); - void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); + void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); protected: virtual void handleURL(const KURL &url); private: diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index c460c3c..ac37e9c 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -24,45 +24,45 @@ #include <kurldrag.h> #include <klocale.h> -#include <qlabel.h> -#include <qwidget.h> -#include <qpushbutton.h> -#include <qlcdnumber.h> -#include <qpopupmenu.h> -#include <qslider.h> -#include <qtooltip.h> - -KSB_MediaWidget::KSB_MediaWidget(QWidget *parent):KSB_MediaWidget_skel(parent) +#include <tqlabel.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqlcdnumber.h> +#include <tqpopupmenu.h> +#include <tqslider.h> +#include <tqtooltip.h> + +KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) { player = new Player(this); empty(); - QFont labelFont = time->font(); + TQFont labelFont = time->font(); labelFont.setPointSize(18); labelFont.setBold(true); time->setFont(labelFont); - connect(Play, SIGNAL(clicked()), player, SLOT(play())); - connect(Pause, SIGNAL(clicked()), player, SLOT(pause())); - connect(Stop, SIGNAL(clicked()), player, SLOT(stop())); + connect(Play, TQT_SIGNAL(clicked()), player, TQT_SLOT(play())); + connect(Pause, TQT_SIGNAL(clicked()), player, TQT_SLOT(pause())); + connect(Stop, TQT_SIGNAL(clicked()), player, TQT_SLOT(stop())); - connect(player, SIGNAL(timeout()), this, SLOT(playerTimeout())); - connect(player, SIGNAL(finished()), this, SLOT(playerFinished())); - connect(player, SIGNAL(playing()), this, SLOT(playing())); - connect(player, SIGNAL(paused()), this, SLOT(paused())); - connect(player, SIGNAL(stopped()), this, SLOT(stopped())); - connect(player, SIGNAL(empty()), this, SLOT(empty())); + connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout())); + connect(player, TQT_SIGNAL(finished()), this, TQT_SLOT(playerFinished())); + connect(player, TQT_SIGNAL(playing()), this, TQT_SLOT(playing())); + connect(player, TQT_SIGNAL(paused()), this, TQT_SLOT(paused())); + connect(player, TQT_SIGNAL(stopped()), this, TQT_SLOT(stopped())); + connect(player, TQT_SIGNAL(empty()), this, TQT_SLOT(empty())); - connect(Position, SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(unsigned long)), player, SLOT(skipTo(unsigned long))); + connect(Position, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(unsigned long)), player, TQT_SLOT(skipTo(unsigned long))); setAcceptDrops(true); pretty=""; needLengthUpdate=false; - QToolTip::add(Play,i18n("Play")); - QToolTip::add(Pause,i18n("Pause")); - QToolTip::add(Stop,i18n("Stop")); + TQToolTip::add(Play,i18n("Play")); + TQToolTip::add(Pause,i18n("Pause")); + TQToolTip::add(Stop,i18n("Stop")); } void KSB_MediaWidget::skipToWrapper(int second) @@ -70,12 +70,12 @@ void KSB_MediaWidget::skipToWrapper(int second) emit skipTo((unsigned long)(second*1000)); } -void KSB_MediaWidget::dragEnterEvent ( QDragEnterEvent * e) +void KSB_MediaWidget::dragEnterEvent ( TQDragEnterEvent * e) { e->accept(KURLDrag::canDecode(e)); } -void KSB_MediaWidget::dropEvent ( QDropEvent * e) +void KSB_MediaWidget::dropEvent ( TQDropEvent * e) { m_kuri_list.clear(); if (KURLDrag::decode(e, m_kuri_list)) @@ -101,7 +101,7 @@ void KSB_MediaWidget::playerTimeout() if (needLengthUpdate) { int counter = player->lengthString().length() - (player->lengthString().find("/")+1); - QString length=player->lengthString().right(counter); + 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 ff2137b..69fa0f2 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.h +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h @@ -25,18 +25,18 @@ class KSB_MediaWidget: public KSB_MediaWidget_skel { Q_OBJECT public: - KSB_MediaWidget(QWidget *parent); + KSB_MediaWidget(TQWidget *parent); ~KSB_MediaWidget(){;} private: class Player *player; - QString pretty; + TQString pretty; bool needLengthUpdate; KURL::List m_kuri_list; protected: - virtual void dragEnterEvent ( QDragEnterEvent * ); - virtual void dropEvent ( QDropEvent * ); + virtual void dragEnterEvent ( TQDragEnterEvent * ); + virtual void dropEvent ( TQDropEvent * ); private slots: void playerTimeout(); diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 360f8e8..741a6b6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -29,14 +29,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "engine.h" #include "player.h" -Player::Player(QObject *parent) - : QObject(parent) +Player::Player(TQObject *parent) + : TQObject(parent) , position(0) , unfinished(false) { mEngine = new Engine; mLooping = false; - connect(&ticker, SIGNAL(timeout()), SLOT(tickerTimeout())); + connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout())); ticker.start(500); stop(); } @@ -134,7 +134,7 @@ void Player::tickerTimeout() } -QString Player::lengthString(long _position) +TQString Player::lengthString(long _position) { if(_position == -1) _position = position; @@ -146,7 +146,7 @@ QString Player::lengthString(long _position) int totSeconds = totSecs % 60; int totMinutes = (totSecs - totSeconds) / 60; - QString result; + TQString result; result.sprintf("%.2d:%.2d/%.2d:%.2d", posMinutes, posSeconds, totMinutes, totSeconds); return result; } diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index 6acf146..c262ab6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PLAYER_H #define PLAYER_H -#include <qobject.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqtimer.h> #include <kurl.h> class Engine; @@ -39,7 +39,7 @@ Q_OBJECT friend class KaboodlePart; public: - Player(QObject *parent = 0); + Player(TQObject *parent = 0); ~Player(); /** @@ -47,7 +47,7 @@ public: * be used in the UI: * CC:CC/LL:LL (mm:ss) **/ - QString lengthString(long _position = -1); + TQString lengthString(long _position = -1); bool looping(void) const { return mLooping; } @@ -166,7 +166,7 @@ protected: private: Engine *mEngine; - QTimer ticker; + TQTimer ticker; long position; bool mLooping; unsigned long mLength; diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 13e1e27..047437e 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -19,16 +19,16 @@ ***************************************************************************/ -#include <qgroupbox.h> -#include <qlayout.h> -#include <qtabwidget.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qmap.h> -#include <qcstring.h> -#include <qdatastream.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqmap.h> +#include <tqcstring.h> +#include <tqdatastream.h> #include <kdebug.h> #include <klocale.h> @@ -44,19 +44,19 @@ #include "configdialog.h" -LinkEntry::LinkEntry(QString name, QString url, QString icon){ +LinkEntry::LinkEntry(TQString name, TQString url, TQString icon){ LinkEntry::name = name; LinkEntry::url = url; LinkEntry::icon = icon; } -ActionListItem::ActionListItem(QListBox *listbox, const QString &action, const QString &text, const QPixmap &pixmap) : QListBoxPixmap(listbox, pixmap) +ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap) : TQListBoxPixmap(listbox, pixmap) { setAction(action); setText(text); } -ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, name) +ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) { topWidgetName = parent->topLevelWidget()->name(); config = new KConfig("metabarrc"); @@ -66,21 +66,21 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, setIcon(SmallIcon("metabar")); ok = new KPushButton(KStdGuiItem::ok(), this); - connect(ok, SIGNAL(clicked()), this, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(cancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - QTabWidget *tab = new QTabWidget(this); + TQTabWidget *tab = new TQTabWidget(this); //general page config->setGroup("General"); - QWidget *general = new QWidget; + TQWidget *general = new QWidget; - QGroupBox *entries_group = new QGroupBox(2, Qt::Horizontal, i18n("Items"), general); - entries_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general); + entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - QLabel *entries_label = new QLabel(i18n("Open with:"), entries_group); + TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group); max_entries = new KIntSpinBox(entries_group); max_entries->setMinValue(1); max_entries->setMaxValue(99); @@ -88,7 +88,7 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, max_entries->setValue(config->readNumEntry("MaxEntries", 3)); entries_label->setBuddy(max_entries); - QLabel *actions_label = new QLabel(i18n("Actions:"), entries_group); + TQLabel *actions_label = new TQLabel(i18n("Actions:"), entries_group); max_actions = new KIntSpinBox(entries_group); max_actions->setMinValue(1); max_actions->setMaxValue(99); @@ -97,62 +97,62 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, actions_label->setBuddy(max_actions); - QGroupBox *appearance_group = new QGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); - appearance_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); + appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - animate = new QCheckBox(i18n("Animate resize"), appearance_group); + animate = new TQCheckBox(i18n("Animate resize"), appearance_group); animate->setChecked(config->readBoolEntry("AnimateResize", false)); - servicemenus = new QCheckBox(i18n("Show service menus"), appearance_group); + servicemenus = new TQCheckBox(i18n("Show service menus"), appearance_group); servicemenus->setChecked(config->readBoolEntry("ShowServicemenus", true)); - showframe = new QCheckBox(i18n("Show frame"), appearance_group); + showframe = new TQCheckBox(i18n("Show frame"), appearance_group); showframe->setChecked(config->readBoolEntry("ShowFrame", true)); - QGroupBox *theme_group = new QGroupBox(2, Qt::Horizontal, i18n("Themes"), general); - theme_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general); + theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); themes = new KComboBox(theme_group); - themes->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); - install_theme->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - connect(install_theme, SIGNAL(clicked()), this, SLOT(installTheme())); + install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme())); loadThemes(); //link page - QWidget *links = new QWidget; + TQWidget *links = new QWidget; link_create = new KPushButton(i18n("New..."), links); - connect(link_create, SIGNAL(clicked()), this, SLOT(createLink())); + connect(link_create, TQT_SIGNAL(clicked()), this, TQT_SLOT(createLink())); link_delete = new KPushButton(i18n("Delete"), links); - connect(link_delete, SIGNAL(clicked()), this, SLOT(deleteLink())); + connect(link_delete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLink())); link_edit = new KPushButton(i18n("Edit..."), links); - connect(link_edit, SIGNAL(clicked()), this, SLOT(editLink())); + connect(link_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editLink())); link_up = new KPushButton(links); link_up->setIconSet(SmallIconSet("up")); link_up->setEnabled(false); - connect(link_up, SIGNAL(clicked()), this, SLOT(moveLinkUp())); + connect(link_up, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkUp())); link_down = new KPushButton(links); link_down->setIconSet(SmallIconSet("down")); link_down->setEnabled(false); - connect(link_down, SIGNAL(clicked()), this, SLOT(moveLinkDown())); + connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); link_list = new KListView(links); - link_list->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSorting(-1); link_list->setItemsMovable(TRUE); link_list->addColumn(i18n("Name")); link_list->addColumn(i18n("Address")); - connect(link_list, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(editLink(QListViewItem*))); - connect(link_list, SIGNAL(selectionChanged()), SLOT(updateArrows())); + connect(link_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(editLink(TQListViewItem*))); + connect(link_list, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateArrows())); - QWidget *actionPage = new QWidget; + TQWidget *actionPage = new QWidget; actionSelector = new KActionSelector(actionPage); loadAvailableActions(); @@ -162,81 +162,81 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, tab->addTab(links, i18n("Links")); //layout - QGridLayout *general_layout = new QGridLayout(general, 2, 2, 5, 5); + TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5); general_layout->addWidget(entries_group, 0, 0); general_layout->addWidget(appearance_group, 0, 1); general_layout->addMultiCellWidget(theme_group, 1, 1, 0, 1); - general_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding), 2, 0); - //general_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding), 0, 2); + general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 2, 0); + //general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 0, 2); - QVBoxLayout *link_button_layout = new QVBoxLayout(0, 0, 5); + TQVBoxLayout *link_button_layout = new TQVBoxLayout(0, 0, 5); link_button_layout->addWidget(link_create); link_button_layout->addWidget(link_edit); link_button_layout->addWidget(link_delete); - link_button_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + link_button_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); link_button_layout->addWidget(link_up); link_button_layout->addWidget(link_down); - QHBoxLayout *link_layout = new QHBoxLayout(links, 5, 5); + TQHBoxLayout *link_layout = new TQHBoxLayout(links, 5, 5); link_layout->addWidget(link_list); link_layout->addLayout(link_button_layout); - QHBoxLayout *action_layout = new QHBoxLayout(actionPage, 5, 5); + TQHBoxLayout *action_layout = new TQHBoxLayout(actionPage, 5, 5); action_layout->addWidget(actionSelector); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 5, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 5, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QVBoxLayout *main_layout = new QVBoxLayout(this, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(this, 5, 5); main_layout->addWidget(tab); main_layout->addLayout(bottom_layout); //load config config->setGroup("General"); - QStringList _links = config->readListEntry("Links"); + TQStringList _links = config->readListEntry("Links"); - for(QStringList::Iterator it = _links.begin(); it != _links.end(); ++it){ + for(TQStringList::Iterator it = _links.begin(); it != _links.end(); ++it){ config->setGroup("Link_" + (*it)); - QString icon_str = config->readEntry("Icon", "folder"); - QPixmap icon(icon_str); + TQString icon_str = config->readEntry("Icon", "folder"); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } - QListViewItem *item = new QListViewItem(link_list, link_list->lastItem(), config->readEntry("Name"), config->readEntry("URL")); + TQListViewItem *item = new TQListViewItem(link_list, link_list->lastItem(), config->readEntry("Name"), config->readEntry("URL")); item->setPixmap(0, icon); linkList.insert(item, new LinkEntry(config->readEntry("Name"), config->readEntry("URL"), icon_str)); } config->setGroup("General"); - QStringList actions = config->readListEntry("Actions"); - for(QStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ + TQStringList actions = config->readListEntry("Actions"); + for(TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ if((*it).startsWith("metabar/")){ if((*it).right((*it).length() - 8) == "share"){ - QString text = i18n("Share"); + TQString text = i18n("Share"); ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network")); - QListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); if(avItem){ delete avItem; } } } else{ - DCOPRef action(kapp->dcopClient()->appId(), QCString(topWidgetName).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(topWidgetName).append("/action/").append((*it).utf8())); - QString text = action.call("plainText()"); - QString icon = iconConfig->readEntry(*it, action.call("icon()")); + TQString text = action.call("plainText()"); + TQString icon = iconConfig->readEntry(*it, action.call("icon()")); - ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), QString(*it), text, SmallIcon(icon)); + ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon)); - QListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); if(avItem){ delete avItem; } @@ -254,17 +254,17 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::accept() { - QStringList groups = config->groupList(); - for(QStringList::Iterator it = groups.begin(); it != groups.end(); ++it){ + TQStringList groups = config->groupList(); + for(TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it){ if((*it).startsWith("Link_")){ config->deleteGroup(*it); } } - QStringList links; - QPtrDictIterator<LinkEntry> it(linkList); + TQStringList links; + TQPtrDictIterator<LinkEntry> it(linkList); - QListViewItem *item = link_list->firstChild(); + TQListViewItem *item = link_list->firstChild(); while(item) { LinkEntry *entry = linkList[item]; config->setGroup("Link_" + entry->name); @@ -277,8 +277,8 @@ void ConfigDialog::accept() item = item->nextSibling(); } - QStringList actions; - QListBox *box = actionSelector->selectedListBox(); + TQStringList actions; + TQListBox *box = actionSelector->selectedListBox(); for(int i = 0; i < box->numRows(); i++){ ActionListItem *item = static_cast<ActionListItem*>(box->item(i)); @@ -301,65 +301,65 @@ void ConfigDialog::accept() config->sync(); - QDialog::accept(); + TQDialog::accept(); } void ConfigDialog::createLink() { - QDialog *main = new QDialog(this); + TQDialog *main = new TQDialog(this); main->setCaption(i18n("Create Link")); main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, SIGNAL(clicked()), main, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, SIGNAL(clicked()), main, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); - QLineEdit *name = new QLineEdit(i18n("New link"), main); - QLineEdit *url = new QLineEdit("file:/", main); + TQLineEdit *name = new TQLineEdit(i18n("New link"), main); + TQLineEdit *url = new TQLineEdit("file:/", main); KIconButton *icon = new KIconButton(main); - icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon("folder"); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 0, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QGridLayout *layout = new QGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); - layout->addWidget(new QLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); - layout->addWidget(new QLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); layout->addWidget(url, 1, 2); - QVBoxLayout *main_layout = new QVBoxLayout(main, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); main_layout->addLayout(layout); - main_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); main->resize(300, main->sizeHint().height()); - if(main->exec() == QDialog::Accepted){ - QString name_str = name->text(); - QString url_str = url->text(); - QString icon_str = icon->icon(); + if(main->exec() == TQDialog::Accepted){ + TQString name_str = name->text(); + TQString url_str = url->text(); + TQString icon_str = icon->icon(); if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small); } - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } - QListViewItem *item = new QListViewItem(link_list, link_list->lastItem(), name_str, url_str); + TQListViewItem *item = new TQListViewItem(link_list, link_list->lastItem(), name_str, url_str); item->setPixmap(0, icon); linkList.insert(item, new LinkEntry(name_str, url_str, icon_str)); @@ -372,7 +372,7 @@ void ConfigDialog::createLink() void ConfigDialog::deleteLink() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ linkList.remove(item); delete item; @@ -382,62 +382,62 @@ void ConfigDialog::deleteLink() void ConfigDialog::editLink() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); editLink(item); } -void ConfigDialog::editLink(QListViewItem *item) +void ConfigDialog::editLink(TQListViewItem *item) { if(item){ - QDialog *main = new QDialog(this); + TQDialog *main = new TQDialog(this); main->setCaption(i18n("Edit Link")); main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, SIGNAL(clicked()), main, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, SIGNAL(clicked()), main, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); - QLineEdit *name = new QLineEdit(linkList[item]->name, main); - QLineEdit *url = new QLineEdit(linkList[item]->url, main); + TQLineEdit *name = new TQLineEdit(linkList[item]->name, main); + TQLineEdit *url = new TQLineEdit(linkList[item]->url, main); KIconButton *icon = new KIconButton(main); - icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon(linkList[item]->icon); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 0, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QGridLayout *layout = new QGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); - layout->addWidget(new QLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); - layout->addWidget(new QLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); layout->addWidget(url, 1, 2); - QVBoxLayout *main_layout = new QVBoxLayout(main, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); main_layout->addLayout(layout); - main_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); main->resize(300, main->sizeHint().height()); - if(main->exec() == QDialog::Accepted){ - QString name_str = name->text(); - QString url_str = url->text(); - QString icon_str = icon->icon(); + if(main->exec() == TQDialog::Accepted){ + TQString name_str = name->text(); + TQString url_str = url->text(); + TQString icon_str = icon->icon(); if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small); } - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -458,21 +458,21 @@ void ConfigDialog::editLink(QListViewItem *item) void ConfigDialog::moveLinkUp() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ if(link_list->itemIndex(item) > 0){ - QListViewItem *after; - QListViewItem *above = item->itemAbove(); + TQListViewItem *after; + TQListViewItem *above = item->itemAbove(); if(above){ after = above->itemAbove(); } - QString name = linkList[item]->name; - QString url = linkList[item]->url; - QString icon_str = linkList[item]->icon; + TQString name = linkList[item]->name; + TQString url = linkList[item]->url; + TQString icon_str = linkList[item]->icon; - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -481,7 +481,7 @@ void ConfigDialog::moveLinkUp() linkList.remove(item); delete item; - QListViewItem *newItem = new QListViewItem(link_list, after, name, url); + TQListViewItem *newItem = new TQListViewItem(link_list, after, name, url); newItem->setPixmap(0, icon); link_list->setSelected(newItem, TRUE); @@ -493,17 +493,17 @@ void ConfigDialog::moveLinkUp() void ConfigDialog::moveLinkDown() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ if(link_list->itemIndex(item) < linkList.count() - 1){ - QListViewItem *after = item->itemBelow(); + TQListViewItem *after = item->itemBelow(); - QString name = linkList[item]->name; - QString url = linkList[item]->url; - QString icon_str = linkList[item]->icon; + TQString name = linkList[item]->name; + TQString url = linkList[item]->url; + TQString icon_str = linkList[item]->icon; - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -512,7 +512,7 @@ void ConfigDialog::moveLinkDown() linkList.remove(item); delete item; - QListViewItem *newItem = new QListViewItem(link_list, after, name, url); + TQListViewItem *newItem = new TQListViewItem(link_list, after, name, url); newItem->setPixmap(0, icon); link_list->setSelected(newItem, TRUE); @@ -524,29 +524,29 @@ void ConfigDialog::moveLinkDown() void ConfigDialog::loadAvailableActions() { - QListBox *box = actionSelector->availableListBox(); + TQListBox *box = actionSelector->availableListBox(); - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if(DCOPClient::mainClient()->call(kapp->dcopClient()->appId(), topWidgetName, "actionMap()", data, replyType, replyData)){ - if(replyType == "QMap<QCString,DCOPRef>"){ - QMap<QCString,DCOPRef> actionMap; + if(replyType == "TQMap<TQCString,DCOPRef>"){ + TQMap<TQCString,DCOPRef> actionMap; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> actionMap; iconConfig->setGroup("Icons"); - QMap<QCString,DCOPRef>::Iterator it; + TQMap<TQCString,DCOPRef>::Iterator it; for(it = actionMap.begin(); it != actionMap.end(); ++it){ DCOPRef action = it.data(); - QString text = action.call("plainText()"); - QCString cname = action.call("name()"); - QString icon = iconConfig->readEntry(QString(cname), action.call("icon()")); + TQString text = action.call("plainText()"); + TQCString cname = action.call("name()"); + TQString icon = iconConfig->readEntry(TQString(cname), action.call("icon()")); - ActionListItem *item = new ActionListItem(box, QString(cname), text, SmallIcon(icon)); + ActionListItem *item = new ActionListItem(box, TQString(cname), text, SmallIcon(icon)); } } } @@ -565,12 +565,12 @@ void ConfigDialog::loadThemes() { themes->clear(); - QString theme = config->readEntry("Theme", "default"); + TQString theme = config->readEntry("Theme", "default"); bool foundTheme = false; - QStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes"); - for(QStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){ - QStringList theme_list = QDir(*it).entryList(QDir::Dirs); + TQStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes"); + for(TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){ + TQStringList theme_list = TQDir(*it).entryList(TQDir::Dirs); theme_list.remove("."); theme_list.remove(".."); @@ -591,10 +591,10 @@ void ConfigDialog::loadThemes() void ConfigDialog::installTheme() { - QString file = KFileDialog::getOpenFileName(); + TQString file = KFileDialog::getOpenFileName(); if(file.isNull() && file.isEmpty()) return; - QString themedir = locateLocal("data", "metabar/themes"); + TQString themedir = locateLocal("data", "metabar/themes"); if(themedir.isNull()) return; KTar archive(file); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 4153054..94f5fee 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -20,26 +20,26 @@ #ifndef _CONFIGDIALOG_H_ #define _CONFIGDIALOG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include <kpushbutton.h> #include <klistview.h> #include <knuminput.h> #include <kconfig.h> -#include <qptrdict.h> -#include <qlistbox.h> +#include <tqptrdict.h> +#include <tqlistbox.h> #include <kactionselector.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcombobox.h> class LinkEntry{ public: - LinkEntry(QString name, QString url, QString icon); + LinkEntry(TQString name, TQString url, TQString icon); ~LinkEntry(){} - QString name; - QString url; - QString icon; + TQString name; + TQString url; + TQString icon; }; class ConfigDialog : public QDialog @@ -47,7 +47,7 @@ class ConfigDialog : public QDialog Q_OBJECT public: - ConfigDialog(QWidget *parent = 0, const char *name = 0); + ConfigDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigDialog(); protected: @@ -65,19 +65,19 @@ class ConfigDialog : public QDialog KIntSpinBox *max_entries; KIntSpinBox *max_actions; - QCheckBox *animate; - QCheckBox *servicemenus; - QCheckBox *showframe; + TQCheckBox *animate; + TQCheckBox *servicemenus; + TQCheckBox *showframe; KListView *link_list; KComboBox *themes; - QCString topWidgetName; + TQCString topWidgetName; KActionSelector *actionSelector; - QPtrDict<LinkEntry> linkList; + TQPtrDict<LinkEntry> linkList; KConfig *config; KConfig *iconConfig; @@ -87,7 +87,7 @@ class ConfigDialog : public QDialog void createLink(); void deleteLink(); void editLink(); - void editLink(QListViewItem *item); + void editLink(TQListViewItem *item); void moveLinkUp(); void moveLinkDown(); void updateArrows(); @@ -101,14 +101,14 @@ class ConfigDialog : public QDialog class ActionListItem : public QListBoxPixmap { public: - ActionListItem(QListBox *listbox, const QString &action, const QString &text, const QPixmap &pixmap); + ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap); ~ActionListItem(){} - const QString action() { return act; } - void setAction(const QString act){ ActionListItem::act = act; } + const TQString action() { return act; } + void setAction(const TQString act){ ActionListItem::act = act; } private: - QString act; + TQString act; }; #endif diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index d6c44c1..6c3982e 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -41,11 +41,11 @@ #include <dcopclient.h> #include <dcopref.h> -#include <qdir.h> -#include <qfile.h> -#include <qrect.h> -#include <qpoint.h> -#include <qbuffer.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqrect.h> +#include <tqpoint.h> +#include <tqbuffer.h> #include <dom_string.h> #include <html_image.h> @@ -92,26 +92,26 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node) DOM::DOMString innerHTML; - QStringList actions = config.readListEntry("Actions"); + TQStringList actions = config.readListEntry("Actions"); int maxActions = config.readNumEntry("MaxActions", 5); int actionCount = 0; - for(QStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ + 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", QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } else{ - DCOPRef action(kapp->dcopClient()->appId(), QCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); if(!action.isNull()){ if(action.call("enabled()")){ - QString text = action.call("plainText()"); - QString icon = iconConfig.readEntry(*it, action.call("icon()")); + TQString text = action.call("plainText()"); + TQString icon = iconConfig.readEntry(*it, action.call("icon()")); - MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } @@ -142,7 +142,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KFileItem *item = m_items.getFirst(); KURL url = item->url(); - QDir dir(url.path()); + TQDir dir(url.path()); dir = dir.canonicalPath(); if(item->isDir() || dir.isRoot()){ @@ -180,11 +180,11 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KTrader::OfferList::ConstIterator it = offers.begin(); for(; it != offers.end(); it++){ - QString nam; + TQString nam; nam.setNum(id); bool hide = id >= max; - MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), QString::null, hide ? QString("hiddenapp") : QString::null, hide); + MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), TQString::null, hide ? TQString("hiddenapp") : TQString::null, hide); runMap.insert(id, *it); id++; @@ -241,21 +241,21 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node) if(!item->isDir()){ const KFileMetaInfo &metaInfo = item->metaInfo(); if(metaInfo.isValid()){ - QStringList groups = metaInfo.supportedGroups(); + TQStringList groups = metaInfo.supportedGroups(); int id = 0; - QString nam; + TQString nam; - for(QStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it){ + for(TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it){ KFileMetaInfoGroup group = metaInfo.group(*it); if(group.isValid()){ nam.setNum(id); innerHTML += "<ul class=\"info\"><a class=\"infotitle\" id=\"info_" + nam + "\" href=\"more://info_" + nam + "\">" + group.translatedName() + "</a></ul>"; - QStringList keys = group.supportedKeys(); + TQStringList keys = group.supportedKeys(); - for(QStringList::ConstIterator it = keys.begin(); it != keys.end(); ++it){ + for(TQStringList::ConstIterator it = keys.begin(); it != keys.end(); ++it){ const KFileMetaInfoItem metaInfoItem = group.item(*it); if(metaInfoItem.isValid()){ @@ -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 += QString().setNum(files); + innerHTML += TQString().setNum(files); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>"; - innerHTML += QString().setNum(dirs); + innerHTML += TQString().setNum(dirs); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Total Entries") + ": </b>"; - innerHTML += QString().setNum(m_items.count()); + innerHTML += TQString().setNum(m_items.count()); innerHTML += "</ul>"; node.setInnerHTML(innerHTML); } @@ -311,7 +311,7 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) KFileItem *item = m_items.getFirst(); KURL url = item->url(); - QDir dir(url.path()); + TQDir dir(url.path()); dir = dir.canonicalPath(); if(item->isDir() || dir.isRoot()){ @@ -336,9 +336,9 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) preview_job = KIO::filePreview(KURL::List(url), m_html->view()->width() - 30); - connect(preview_job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), this, SLOT(slotSetPreview(const KFileItem*, const QPixmap&))); - connect(preview_job, SIGNAL(failed(const KFileItem *)), this, SLOT(slotPreviewFailed(const KFileItem *))); - connect(preview_job, SIGNAL(result(KIO::Job *)), this, SLOT(slotJobFinished(KIO::Job *))); + connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&))); + connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *))); + connect(preview_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *))); } m_functions->show("preview"); @@ -354,22 +354,22 @@ void DefaultPlugin::loadBookmarks(DOM::HTMLElement node) m_functions->hide("bookmarks"); } -void DefaultPlugin::slotSetPreview(const KFileItem *item, const QPixmap &pix) +void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix) { DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = doc.getElementById("preview"); - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - QString src = QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); bool media = item->mimetype().startsWith("video/"); DOM::DOMString innerHTML; - innerHTML += QString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15); + innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15); if(media){ innerHTML += " href=\"preview:///\""; @@ -377,9 +377,9 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const QPixmap &pix) innerHTML +="><img id=\"previewimage\" src=\""; innerHTML += src; innerHTML += "\" width=\""; - innerHTML += QString().setNum(pix.width()); + innerHTML += TQString().setNum(pix.width()); innerHTML += "\" height=\""; - innerHTML += QString().setNum(pix.height()); + innerHTML += TQString().setNum(pix.height()); innerHTML += "\" /></a></ul>"; if(media){ @@ -413,12 +413,12 @@ void DefaultPlugin::slotJobFinished(KIO::Job *job) bool DefaultPlugin::handleRequest(const KURL &url) { - QString protocol = url.protocol(); + TQString protocol = url.protocol(); if(protocol == "exec"){ int id = url.host().toInt(); - QMap<int,KService::Ptr>::Iterator it = runMap.find(id); + TQMap<int,KService::Ptr>::Iterator it = runMap.find(id); if(it != runMap.end()){ KFileItem *item = m_items.getFirst(); @@ -430,21 +430,21 @@ bool DefaultPlugin::handleRequest(const KURL &url) } else if(protocol == "service"){ - QString name = url.url().right(url.url().length() - 10); + TQString name = url.url().right(url.url().length() - 10); services->runAction(name); return true; } else if(protocol == "servicepopup"){ - QString id = url.host(); + TQString id = url.host(); DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById("popup" + id)); if(!node.isNull()){ - QRect rect = node.getRect(); - QPoint p = m_html->view()->mapToGlobal(rect.bottomLeft()); + TQRect rect = node.getRect(); + TQPoint p = m_html->view()->mapToGlobal(rect.bottomLeft()); services->showPopup(id, p); } diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h index 36b0060..319d771 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.h +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h @@ -26,8 +26,8 @@ #include <kio/previewjob.h> -#include <qdict.h> -#include <qmap.h> +#include <tqdict.h> +#include <tqmap.h> class DefaultPlugin : public ProtocolPlugin { @@ -50,13 +50,13 @@ class DefaultPlugin : public ProtocolPlugin void loadBookmarks(DOM::HTMLElement node); private: - QMap<int,KService::Ptr> runMap; + TQMap<int,KService::Ptr> runMap; KIO::PreviewJob *preview_job; ServiceLoader *services; private slots: - void slotSetPreview(const KFileItem*, const QPixmap&); + void slotSetPreview(const KFileItem*, const TQPixmap&); void slotPreviewFailed(const KFileItem *item); void slotJobFinished(KIO::Job *item); }; diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index d4b772b..bbfb9e2 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -32,8 +32,8 @@ #include <dcopref.h> #include <dcopclient.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqregexp.h> +#include <tqfile.h> #include <dom_node.h> #include <html_inline.h> @@ -100,8 +100,8 @@ void HTTPPlugin::loadBookmarks(DOM::HTMLElement node) bool HTTPPlugin::handleRequest(const KURL &url) { if(url.protocol() == "find"){ - QString keyword = url.queryItem("find"); - QString type = url.queryItem("type"); + TQString keyword = url.queryItem("find"); + TQString type = url.queryItem("type"); if(!keyword.isNull() && !keyword.isEmpty()){ KURL url("http://www.google.com/search"); diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 8181a11..6a020f0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -1,5 +1,5 @@ #include <kinstance.h> -#include <qstring.h> +#include <tqstring.h> #include <kimageio.h> #include <klocale.h> @@ -7,7 +7,7 @@ #include "metabar.h" #include "metabar.moc" -Metabar::Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name): +Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); @@ -37,7 +37,7 @@ void Metabar::handlePreview(const KFileItemList &items) extern "C" { - bool add_konqsidebar_metabar(QString* fn, QString* param, QMap<QString,QString> *map) { + bool add_konqsidebar_metabar(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { Q_UNUSED(param); map->insert("Type", "Link"); @@ -52,7 +52,7 @@ extern "C" { extern "C" { - void* create_konqsidebar_metabar(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + void* create_konqsidebar_metabar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new Metabar(instance,par,widp,desktopname,name); } diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index 6d43592..d4bb63f 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -6,7 +6,7 @@ #endif #include <konqsidebarplugin.h> -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> @@ -15,11 +15,11 @@ class Metabar : public KonqSidebarPlugin Q_OBJECT public: - Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name=0); + Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~Metabar(); - virtual QWidget *getWidget(){ return widget; } - virtual void *provides(const QString &) { return 0; } + virtual TQWidget *getWidget(){ return widget; } + virtual void *provides(const TQString &) { return 0; } protected: MetabarWidget *widget; diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index 8c457de..1aaf9e8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -26,16 +26,16 @@ #include <kconfig.h> -#include <qrect.h> +#include <tqrect.h> #define CSS_PRIORITY "important" #define RESIZE_SPEED 5 #define RESIZE_STEP 2 -MetabarFunctions::MetabarFunctions(KHTMLPart *html, QObject *parent, const char* name) : QObject(parent, name), m_html(html) +MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(animate())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); } MetabarFunctions::~MetabarFunctions() @@ -47,8 +47,8 @@ MetabarFunctions::~MetabarFunctions() void MetabarFunctions::handleRequest(const KURL &url) { - QString function = url.host(); - QStringList params = QStringList::split(',', url.filename()); + TQString function = url.host(); + TQStringList params = TQStringList::split(',', url.filename()); if(function == "toggle"){ if(params.size() == 1){ @@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item) } } else{ - style.setProperty("height", QString("%1px").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY); } } } @@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item) } } else{ - style.setProperty("height", QString("%1px").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY); } } } @@ -145,9 +145,9 @@ void MetabarFunctions::adjustSize(DOM::DOMString item) void MetabarFunctions::animate() { - QMap<QString, int>::Iterator it; + TQMap<TQString, int>::Iterator it; for(it = resizeMap.begin(); it != resizeMap.end(); ++it ) { - QString id = it.key(); + TQString id = it.key(); int height = it.data(); int currentHeight = 0; @@ -155,7 +155,7 @@ void MetabarFunctions::animate() DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(id)); DOM::CSSStyleDeclaration style = node.style(); - QString currentHeightString = style.getPropertyValue("height").string(); + TQString currentHeightString = style.getPropertyValue("height").string(); if(currentHeightString.endsWith("px")){ currentHeight = currentHeightString.left(currentHeightString.length() - 2).toInt(); } @@ -176,7 +176,7 @@ void MetabarFunctions::animate() } int change = currentHeight < height ? changeValue : -changeValue; - style.setProperty("height", QString("%1px").arg(currentHeight + change), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY); doc.updateRendering(); } } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index aa5f110..1ccce3c 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -23,8 +23,8 @@ #include <dom_string.h> -#include <qtimer.h> -#include <qmap.h> +#include <tqtimer.h> +#include <tqmap.h> #include <kurl.h> #include <khtml_part.h> @@ -34,7 +34,7 @@ class MetabarFunctions : public QObject Q_OBJECT public: - MetabarFunctions(KHTMLPart *html, QObject *parent = 0, const char* name=0); + MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0); ~MetabarFunctions(); void toggle(DOM::DOMString item); @@ -47,9 +47,9 @@ class MetabarFunctions : public QObject KHTMLPart *m_html; private: - QTimer *timer; + TQTimer *timer; - QMap<QString, int> resizeMap; + TQMap<TQString, int> resizeMap; int getHeight(DOM::HTMLElement &element); private slots: diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 07b010a..bf074e8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -26,14 +26,14 @@ #include "remoteplugin.h" #include "httpplugin.h" -#include <qwidget.h> -#include <qlayout.h> -#include <qdir.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qvaluelist.h> -#include <qurl.h> -#include <qbuffer.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqvaluelist.h> +#include <tqurl.h> +#include <tqbuffer.h> #include <khtmlview.h> #include <kapplication.h> @@ -73,7 +73,7 @@ #define EVENT_TYPE DOM::DOMString("click") #define ACTIVATION 1 -MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent, name) +MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { skip = false; loadComplete = false; @@ -84,9 +84,9 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent config = new KConfig("metabarrc"); dir_watch = new KDirWatch(); - connect(dir_watch, SIGNAL(dirty(const QString&)), this, SLOT(slotUpdateCurrentInfo(const QString&))); - connect(dir_watch, SIGNAL(created(const QString&)), this, SLOT(slotUpdateCurrentInfo(const QString&))); - connect(dir_watch, SIGNAL(deleted(const QString&)), this, SLOT(slotDeleteCurrentInfo(const QString&))); + connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteCurrentInfo(const TQString&))); html = new KHTMLPart(this, "metabarhtmlpart"); html->setJScriptEnabled(true); @@ -94,12 +94,12 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent html->setCaretVisible(false); html->setDNDEnabled(false); html->setJavaEnabled(false); - html->view()->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); html->view()->hide(); - connect(html->browserExtension(), SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); - connect(html, SIGNAL(completed()), this, SLOT(loadCompleted())); - connect(html, SIGNAL(popupMenu(const QString &, const QPoint &)), this, SLOT(slotShowPopup(const QString&, const QPoint &))); + 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); @@ -114,14 +114,14 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent plugins.insert("http", httpPlugin); plugins.insert("https", httpPlugin); - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); layout->addWidget(html->view()); popup = new KPopupMenu(0); - KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, SLOT(slotShowConfig()), html->actionCollection(), "configure"); + KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, SLOT(setTheme()), html->actionCollection(), "reload"); + KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); @@ -197,7 +197,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) currentPlugin->deactivate(); } - QString protocol = currentItems->getFirst()->url().protocol(); + TQString protocol = currentItems->getFirst()->url().protocol(); currentPlugin = plugins[protocol]; if(!currentPlugin){ @@ -208,14 +208,14 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) currentPlugin->setFileItems(*currentItems); } -QString MetabarWidget::getCurrentURL() +TQString MetabarWidget::getCurrentURL() { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("currentURL()"); if (reply.isValid()) { - QString url; - reply.get(url, "QString"); + TQString url; + reply.get(url, "TQString"); if(!url.isNull() && !url.isEmpty()){ return url; @@ -224,21 +224,21 @@ QString MetabarWidget::getCurrentURL() return 0; } -void MetabarWidget::openURL(const QString &url) +void MetabarWidget::openURL(const TQString &url) { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url); } -void MetabarWidget::openTab(const QString &url) +void MetabarWidget::openTab(const TQString &url) { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("newTab", url); } -void MetabarWidget::callAction(const QString &action) +void MetabarWidget::callAction(const TQString &action) { - DCOPRef ref(kapp->dcopClient()->appId(), QString(this->topLevelWidget()->name()).append("/action/").append(action).utf8()); + DCOPRef ref(kapp->dcopClient()->appId(), TQString(this->topLevelWidget()->name()).append("/action/").append(action).utf8()); if(ref.call("enabled()")){ ref.call("activate()"); } @@ -247,7 +247,7 @@ void MetabarWidget::callAction(const QString &action) void MetabarWidget::loadLinks() { config->setGroup("General"); - QStringList links = config->readListEntry("Links"); + TQStringList links = config->readListEntry("Links"); if(links.count() == 0){ functions->hide("links"); @@ -261,7 +261,7 @@ void MetabarWidget::loadLinks() if(!node.isNull()){ DOM::DOMString innerHTML; - for(QStringList::Iterator it = links.begin(); it != links.end(); ++it){ + for(TQStringList::Iterator it = links.begin(); it != links.end(); ++it){ config->setGroup("Link_" + (*it)); addEntry(innerHTML, config->readEntry("Name"), config->readEntry("URL"), config->readEntry("Icon", "folder")); } @@ -282,14 +282,14 @@ void MetabarWidget::loadCompleted() DOM::HTMLElement node = static_cast<DOM::HTMLElement>(i18n_a_list.item(i)); if(!node.isNull()){ if(node.hasAttribute("i18n")){ - QString text = node.innerText().string(); + TQString text = node.innerText().string(); node.setInnerText(DOM::DOMString(i18n(text.utf8().data()))); } if(node.hasAttribute("image")){ - QString icon = node.getAttribute("image").string(); - QString url = getIconPath(icon); - QString style = QString("background-image: url(%1);").arg(url); + TQString icon = node.getAttribute("image").string(); + TQString url = getIconPath(icon); + TQString style = TQString("background-image: url(%1);").arg(url); node.setAttribute("style", style); } @@ -301,22 +301,22 @@ void MetabarWidget::loadCompleted() DOM::HTMLElement node = static_cast<DOM::HTMLElement>(i18n_ul_list.item(i)); if(!node.isNull()){ if(node.hasAttribute("i18n")){ - QString text = node.innerText().string(); + TQString text = node.innerText().string(); node.setInnerText(DOM::DOMString(i18n(text.utf8().data()))); } } } config->setGroup("General"); - QString file = locate("data", QString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default"))); if(file.isNull()){ - file = locate("data", QString("metabar/themes/default/default.css")); + file = locate("data", TQString("metabar/themes/default/default.css")); } - QFile cssfile(file); + TQFile cssfile(file); if(cssfile.open(IO_ReadOnly)){ - QTextStream stream( &cssfile ); - QString tmp = stream.read(); + TQTextStream stream( &cssfile ); + TQString tmp = stream.read(); cssfile.close(); tmp.replace("./", KURL::fromPathOrURL(file).directory(false)); @@ -324,14 +324,14 @@ void MetabarWidget::loadCompleted() } loadComplete = true; - html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? QFrame::StyledPanel : QFrame::NoFrame); + html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? TQFrame::StyledPanel : TQFrame::NoFrame); html->view()->show(); if(currentItems && !currentItems->isEmpty()){ setFileItems(*currentItems, false); } else{ - QString url = getCurrentURL(); + TQString url = getCurrentURL(); KFileItem *item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL(url), true); KFileItemList list; list.append(item); @@ -347,14 +347,14 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg return; } - QString protocol = url.protocol(); + TQString protocol = url.protocol(); if(currentPlugin->handleRequest(url)){ return; } if(protocol == "desktop"){ - QString path = url.path(); + TQString path = url.path(); if(KDesktopFile::isDesktopFile(path)){ KRun::run(new KDesktopFile(path, true), KURL::List()); @@ -362,15 +362,15 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } else if(protocol == "kcmshell"){ - QString module = url.path().remove('/'); + TQString module = url.path().remove('/'); KRun::runCommand("kcmshell " + module); } else if(protocol == "action"){ - QString action = url.url().right(url.url().length() - 9); + TQString action = url.url().right(url.url().length() - 9); if(action.startsWith("metabar/")){ - QString newact = action.right(action.length() - 8); + TQString newact = action.right(action.length() - 8); if(newact == "share"){ slotShowSharingDialog(); @@ -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 += QString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height()); + innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height()); innerHTML += "<object class=\"preview\" type=\""; innerHTML += item->mimetype(); innerHTML += "\" data=\""; innerHTML += item->url().url(); innerHTML += "\" width=\""; - innerHTML += QString().setNum(image.width()); + innerHTML += TQString().setNum(image.width()); innerHTML += "\" height=\""; - innerHTML += QString().setNum(image.height()); + innerHTML += TQString().setNum(image.height()); innerHTML += "\" /></ul>"; node.setInnerHTML(innerHTML); } @@ -409,7 +409,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } else if(protocol == "more"){ - QString name = url.host(); + TQString name = url.host(); DOM::HTMLDocument doc = html->htmlDocument(); DOM::NodeList list = doc.getElementsByName(name); @@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } if(element.id().string().startsWith("hidden")){ - QString style = QString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow")); + TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow")); element.setInnerText( showMore ? i18n("More") : i18n("Less") ); element.setAttribute("style", style); } @@ -466,16 +466,16 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } } -QString MetabarWidget::getIconPath(const QString &name) +TQString MetabarWidget::getIconPath(const TQString &name) { - QPixmap icon = SmallIcon(name); + TQPixmap icon = SmallIcon(name); - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); icon.save(&buffer, "PNG"); - return QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); } void MetabarWidget::slotShowSharingDialog() @@ -489,7 +489,7 @@ void MetabarWidget::slotShowSharingDialog() void MetabarWidget::slotShowConfig() { ConfigDialog *config_dialog = new ConfigDialog(this); - if(config_dialog->exec() == QDialog::Accepted){ + if(config_dialog->exec() == TQDialog::Accepted){ config->reparseConfiguration(); setFileItems(*currentItems, false); @@ -497,18 +497,18 @@ void MetabarWidget::slotShowConfig() setTheme(); - html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? QFrame::StyledPanel : QFrame::NoFrame); + html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? TQFrame::StyledPanel : TQFrame::NoFrame); } delete config_dialog; } -void MetabarWidget::slotShowPopup(const QString &url, const QPoint &point) +void MetabarWidget::slotShowPopup(const TQString &url, const TQPoint &point) { popup->exec(point); } -void MetabarWidget::slotUpdateCurrentInfo(const QString &path) +void MetabarWidget::slotUpdateCurrentInfo(const TQString &path) { if(currentItems){ KFileItem *item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL(path), true); @@ -522,10 +522,10 @@ void MetabarWidget::slotUpdateCurrentInfo(const QString &path) } } -void MetabarWidget::slotDeleteCurrentInfo(const QString&) +void MetabarWidget::slotDeleteCurrentInfo(const TQString&) { if(currentItems && currentItems->count() == 1){ - QString url = getCurrentURL(); + TQString url = getCurrentURL(); KURL currentURL; if(currentItems){ @@ -548,7 +548,7 @@ void MetabarWidget::slotDeleteCurrentInfo(const QString&) } } -void MetabarWidget::addEntry(DOM::DOMString &html, const QString name, const QString url, const QString icon, const QString id, const QString nameatt, bool hidden) +void MetabarWidget::addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id, const TQString nameatt, bool hidden) { html += "<ul"; @@ -584,7 +584,7 @@ void MetabarWidget::setTheme() loadComplete = false; config->setGroup("General"); - QString file = locate("data", QString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default"))); html->openURL(KURL(file)); } diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index abd901d..e88a003 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -30,7 +30,7 @@ #include <kpopupmenu.h> #include <kdirwatch.h> -#include <qmap.h> +#include <tqmap.h> #include "protocolplugin.h" #include "metabarfunctions.h" @@ -40,13 +40,13 @@ class MetabarWidget : public QWidget Q_OBJECT public: - MetabarWidget(QWidget *parent = 0, const char* name=0); + MetabarWidget(TQWidget *parent = 0, const char* name=0); ~MetabarWidget(); void setFileItems(const KFileItemList &items, bool check = true); - static QString getIconPath(const QString &name); - static void addEntry(DOM::DOMString &html, const QString name, const QString url, const QString icon, const QString id = QString::null, const QString nameatt = QString::null, bool hidden = false); + 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); private: KFileItemList *currentItems; @@ -62,26 +62,26 @@ class MetabarWidget : public QWidget KDirWatch *dir_watch; KPopupMenu *popup; - QDict<ProtocolPlugin> plugins; + TQDict<ProtocolPlugin> plugins; bool skip; bool loadComplete; - void callAction(const QString &action); - void openURL(const QString &url); - void openTab(const QString &url); + void callAction(const TQString &action); + void openURL(const TQString &url); + void openTab(const TQString &url); void loadLinks(); - QString getCurrentURL(); + TQString getCurrentURL(); private slots: void loadCompleted(); void slotShowSharingDialog(); void slotShowConfig(); - void slotShowPopup(const QString &url, const QPoint &pos); + void slotShowPopup(const TQString &url, const TQPoint &pos); void handleURLRequest(const KURL &url, const KParts::URLArgs &args); - void slotUpdateCurrentInfo(const QString &path); - void slotDeleteCurrentInfo(const QString &path); + void slotUpdateCurrentInfo(const TQString &path); + void slotDeleteCurrentInfo(const TQString &path); void setTheme(); }; diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index ad8f2e5..99f5b31 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp @@ -20,7 +20,7 @@ #include "protocolplugin.h" -#include <qbuffer.h> +#include <tqbuffer.h> #include <kimageio.h> #include <kmdcodec.h> @@ -32,7 +32,7 @@ ProtocolPlugin* ProtocolPlugin::activePlugin = 0; -ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : QObject(html, name), m_html(html), m_functions(functions) +ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions) { } @@ -59,7 +59,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) DOM::HTMLElement size = doc.getElementById("size"); if(!icon.isNull()){ - QPixmap pix; + TQPixmap pix; if(m_items.count() == 1){ pix = m_items.getFirst()->pixmap(KIcon::SizeLarge); } @@ -67,11 +67,11 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) pix = DesktopIcon("kmultiple", KIcon::SizeLarge); } - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - QString icondata = QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); icon.setSrc(icondata); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 7e3e60d..1b59527 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -20,9 +20,9 @@ #include "serviceloader.h" -#include <qdir.h> -#include <qvaluelist.h> -#include <qptrlist.h> +#include <tqdir.h> +#include <tqvaluelist.h> +#include <tqptrlist.h> #include <dcopclient.h> @@ -37,7 +37,7 @@ #include <kstandarddirs.h> -ServiceLoader::ServiceLoader(QWidget *parent, const char *name) : QObject(parent, name) +ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name) { popups.setAutoDelete(true); } @@ -51,40 +51,40 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int popups.clear(); KURL url = item.url(); - QString mimeType = item.mimetype(); - QString mimeGroup = mimeType.left(mimeType.find('/')); + TQString mimeType = item.mimetype(); + TQString mimeGroup = mimeType.left(mimeType.find('/')); urlList.clear(); urlList.append(url); - QStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); + TQStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); KConfig config("metabarrc", true, false); config.setGroup("General"); int maxActions = config.readNumEntry("MaxActions"); bool matchAll = false; // config.readBoolEntry("MatchAll"); int id = 0; - QString idString; + TQString idString; - for(QStringList::Iterator dit = dirs.begin(); dit != dirs.end(); ++dit){ + for(TQStringList::Iterator dit = dirs.begin(); dit != dirs.end(); ++dit){ idString.setNum(id); - QDir dir(*dit); - QStringList entries = dir.entryList("*.desktop", QDir::Files); + TQDir dir(*dit); + TQStringList entries = dir.entryList("*.desktop", TQDir::Files); - for(QStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit){ + for(TQStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit){ KSimpleConfig cfg( *dit + *eit, true ); cfg.setDesktopGroup(); if(cfg.hasKey("X-KDE-ShowIfRunning" )){ - const QString app = cfg.readEntry( "X-KDE-ShowIfRunning" ); + const TQString app = cfg.readEntry( "X-KDE-ShowIfRunning" ); if(!kapp->dcopClient()->isApplicationRegistered(app.utf8())){ continue; } } if(cfg.hasKey("X-KDE-Protocol")){ - const QString protocol = cfg.readEntry( "X-KDE-Protocol" ); + const TQString protocol = cfg.readEntry( "X-KDE-Protocol" ); if(protocol != url.protocol()){ continue; } @@ -95,18 +95,18 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } if(cfg.hasKey("X-KDE-Require")){ - const QStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); + const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); if (capabilities.contains( "Write" )){ continue; } } if ( cfg.hasKey( "Actions" ) && cfg.hasKey( "ServiceTypes" ) ){ - const QStringList types = cfg.readListEntry( "ServiceTypes" ); - const QStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" ); + const TQStringList types = cfg.readListEntry( "ServiceTypes" ); + const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" ); bool ok = false; - for (QStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){ + for (TQStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){ bool checkTheMimetypes = false; if(matchAll){ @@ -131,7 +131,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int if(checkTheMimetypes){ ok = true; - for(QStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ + for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) || ((*itex) == mimeType)) { @@ -142,8 +142,8 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } } if (ok){ - const QString priority = cfg.readEntry("X-KDE-Priority"); - const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); + const TQString priority = cfg.readEntry("X-KDE-Priority"); + const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" ); bool usePopup = false; KPopupMenu *popup; @@ -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 ? QString::null : QString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); popup = new KPopupMenu(); popups.insert(idString, popup); @@ -163,16 +163,16 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } } - QValueList<KDEDesktopMimeType::Service> list = KDEDesktopMimeType::userDefinedServices( *dit + *eit, url.isLocalFile()); + TQValueList<KDEDesktopMimeType::Service> list = KDEDesktopMimeType::userDefinedServices( *dit + *eit, url.isLocalFile()); - for (QValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ + 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, SLOT(runAction()), popup, idString.utf8()); + KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8()); action->plug(popup); } else{ - MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, QString::null, count < maxActions ? QString::null : QString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, TQString::null, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); count++; } @@ -194,7 +194,7 @@ void ServiceLoader::runAction() } } -void ServiceLoader::runAction(const QString& name) +void ServiceLoader::runAction(const TQString& name) { KDEDesktopMimeType::Service s = services[name]; if(!s.isEmpty()){ @@ -202,7 +202,7 @@ void ServiceLoader::runAction(const QString& name) } } -void ServiceLoader::showPopup(const QString &popup, const QPoint &point) +void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point) { KPopupMenu *p = popups[popup]; if(p){ diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index cd3fa8c..527ea97 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -21,10 +21,10 @@ #ifndef _SERVICELOADER_H_ #define _SERVICELOADER_H_ -#include <qstring.h> -#include <qdict.h> -#include <qmap.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqdict.h> +#include <tqmap.h> +#include <tqwidget.h> #include <kpopupmenu.h> #include <kfileitem.h> @@ -40,16 +40,16 @@ class ServiceLoader : public QObject Q_OBJECT public: - ServiceLoader(QWidget *parent, const char *name = 0); + ServiceLoader(TQWidget *parent, const char *name = 0); ~ServiceLoader(); void loadServices(const KFileItem item, DOM::DOMString &html, int &count); - void runAction(const QString &name); - void showPopup(const QString &popup, const QPoint &point); + void runAction(const TQString &name); + void showPopup(const TQString &popup, const TQPoint &point); private: - QDict<KPopupMenu> popups; - QMap<QString,KDEDesktopMimeType::Service> services; + TQDict<KPopupMenu> popups; + TQMap<TQString,KDEDesktopMimeType::Service> services; KURL::List urlList; private slots: diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index 91bb96d..76853c6 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -58,14 +58,14 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node) if(url.path().endsWith("/")){ list_job = KIO::listDir(url, true, false); - connect(list_job, SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &))); - connect(list_job, SIGNAL(result(KIO::Job *)), this, SLOT(slotJobFinished(KIO::Job *))); + connect(list_job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &))); + connect(list_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *))); m_functions->show("actions"); } else{ - QString path = url.path(); - QString name = url.filename(); + TQString path = url.path(); + TQString name = url.filename(); KService::Ptr service = KService::serviceByStorageId(name); if(service && service->isValid()){ @@ -90,8 +90,8 @@ void SettingsPlugin::loadInformation(DOM::HTMLElement node) m_functions->hide("info"); } else{ - QString path = url.path(); - QString name = url.filename(); + TQString path = url.path(); + TQString name = url.filename(); KService::Ptr service = KService::serviceByStorageId(name); if(service && service->isValid()){ @@ -154,9 +154,9 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list KIO::UDSEntryList::ConstIterator it = list.begin(); KIO::UDSEntryList::ConstIterator it_end = list.end(); for(; it != it_end; ++it){ - QString name; - QString icon; - QString url; + TQString name; + TQString icon; + TQString url; long type; KIO::UDSEntry::ConstIterator atomit = (*it).begin(); diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp index c682ab3..dd038b6 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.cpp +++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp @@ -29,7 +29,7 @@ namespace KSB_News { -ConfigFeeds::ConfigFeeds(QWidget* parent, const char* name) : ConfigFeedsBase(parent, name) +ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name) { } diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h index 555b4f5..127ba27 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.h +++ b/konq-plugins/sidebar/newsticker/configfeeds.h @@ -43,7 +43,7 @@ namespace KSB_News { Q_OBJECT public: - ConfigFeeds(QWidget* parent, const char* name = 0); + ConfigFeeds(TQWidget* parent, const char* name = 0); }; diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index d4c803a..db793bd 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -22,8 +22,8 @@ Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qsizepolicy.h> +#include <tqlayout.h> +#include <tqsizepolicy.h> #include <dcopref.h> #include <kiconloader.h> #include <klocale.h> @@ -37,16 +37,16 @@ namespace KSB_News { - NoRSSWidget::NoRSSWidget(QWidget *parent, const char *name) - : QWidget(parent, name) { + NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QVBoxLayout *topLayout = new QVBoxLayout(this); + TQVBoxLayout *topLayout = new TQVBoxLayout(this); topLayout->addStretch(); KPushButton *btn = new KPushButton(i18n("&Configure"), this); - btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); - connect(btn, SIGNAL(clicked()), this, SLOT(slotBtnClicked())); + btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked())); topLayout->addWidget(btn, 0, Qt::AlignHCenter); topLayout->addStretch(); @@ -71,8 +71,8 @@ namespace KSB_News { // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, SIGNAL(settingsChanged()), this, - SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, + TQT_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } @@ -82,10 +82,10 @@ namespace KSB_News { DCOPRef rss_document("rssservice", "RSSService"); // read list of sources - QStringList m_our_rsssources = SidebarSettings::sources(); + TQStringList m_our_rsssources = SidebarSettings::sources(); // add new sources - QStringList::iterator it; + TQStringList::iterator it; for (it = m_our_rsssources.begin(); it != m_our_rsssources.end(); ++it) { rss_document.call("add", ( *it )); } diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h index cebac3b..91a8c61 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.h +++ b/konq-plugins/sidebar/newsticker/norsswidget.h @@ -31,11 +31,11 @@ class KConfigDialog; namespace KSB_News { - class NoRSSWidget : public QWidget { + class NoRSSWidget : public TQWidget { Q_OBJECT public: - NoRSSWidget(QWidget *parent = 0, const char *name = 0); + NoRSSWidget(TQWidget *parent = 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 8086b35..a5c1261 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -22,9 +22,9 @@ Boston, MA 02110-1301, USA. */ -#include <qlistview.h> -#include <qfontmetrics.h> -#include <qtimer.h> +#include <tqlistview.h> +#include <tqfontmetrics.h> +#include <tqtimer.h> #include <kdebug.h> #include <klistbox.h> #include "nspanel.h" @@ -35,22 +35,22 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - TTListBox::TTListBox(QWidget *parent, const char *name, WFlags f) + TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) : KListBox(parent, name, f), - QToolTip(this) { + TQToolTip(this) { } void TTListBox::clear() { KListBox::clear(); } - void TTListBox::maybeTip(const QPoint &point) { - QListBoxItem *item = itemAt(point); + void TTListBox::maybeTip(const TQPoint &point) { + TQListBoxItem *item = itemAt(point); if (item) { - QString text = item->text(); + TQString text = item->text(); if (!text.isEmpty()) { // Show ToolTip only if necessary - QFontMetrics fm(fontMetrics()); + TQFontMetrics fm(fontMetrics()); int textWidth = fm.width(text); int widgetSpace = visibleWidth(); if ((textWidth > widgetSpace) || (contentsX() > 0)) @@ -61,10 +61,10 @@ namespace KSB_News { - NSPanel::NSPanel(QObject *parent, const char *name, const QString &key, + NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice) - :QObject(parent, name) - ,DCOPObject(QString(QString("sidebar-newsticker-")+key).latin1()) + :TQObject(parent, name) + ,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1()) ,m_listbox() ,m_pixmap() { @@ -72,7 +72,7 @@ namespace KSB_News { m_rssservice = rssservice; m_key = key; - m_rssdocument = m_rssservice->call("document(QString)", m_key); + m_rssdocument = m_rssservice->call("document(TQString)", m_key); m_isValid = false; connectDCOPSignal("rssservice", m_rssdocument.obj(), @@ -87,8 +87,8 @@ namespace KSB_News { // updating of RSS documents m_timeoutinterval = 10 * 60 * 1000; // 10 mins - m_timer = new QTimer(this); - connect(m_timer, SIGNAL(timeout()), this, SLOT(refresh())); + m_timer = new TQTimer(this); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refresh())); m_timer->start(m_timeoutinterval); refresh(); } @@ -103,7 +103,7 @@ namespace KSB_News { } - void NSPanel::setTitle(const QString &tit) { + void NSPanel::setTitle(const TQString &tit) { m_title = tit; } @@ -113,7 +113,7 @@ namespace KSB_News { } - void NSPanel::setPixmap(const QPixmap &pm) { + void NSPanel::setPixmap(const TQPixmap &pm) { m_pixmap = pm; } @@ -123,24 +123,24 @@ namespace KSB_News { } - QPixmap NSPanel::pixmap() { + TQPixmap NSPanel::pixmap() { return m_pixmap; } - QString NSPanel::key() const { + TQString NSPanel::key() const { return m_key; } - QString NSPanel::title() const { + TQString NSPanel::title() const { return m_title; } - QStringList NSPanel::articles() { + TQStringList NSPanel::articles() { return m_articles; } - QStringList NSPanel::articleLinks() { + TQStringList NSPanel::articleLinks() { return m_articlelinks; } @@ -155,7 +155,7 @@ namespace KSB_News { m_articles.clear(); m_articlelinks.clear(); m_count = m_rssdocument.call("count()"); - QString temp = m_rssdocument.call("title()"); + TQString temp = m_rssdocument.call("title()"); m_title = temp; m_isValid = true; for (int idx = 0; idx < m_count; ++idx) { @@ -169,7 +169,7 @@ namespace KSB_News { void NSPanel::emitPixmapUpdated(DCOPRef /*dcopref*/) { if (m_rssdocument.call("pixmapValid()")) { - QPixmap tmp = m_rssdocument.call("pixmap()"); + TQPixmap tmp = m_rssdocument.call("pixmap()"); m_pixmap = tmp; emit pixmapUpdated(this); diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index 0f30152..1f60947 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -25,9 +25,9 @@ #ifndef _konq_sidebar_news_nspanelh_ #define _konq_sidebar_news_nspanelh_ -#include <qstring.h> -#include <qpixmap.h> -#include <qtooltip.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqtooltip.h> #include <dcopref.h> #include <dcopobject.h> #include <kio/job.h> @@ -42,38 +42,38 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - class TTListBox : public KListBox, QToolTip { + class TTListBox : public KListBox, TQToolTip { public: - TTListBox (QWidget *parent = 0, const char *name = 0, WFlags f = 0); + TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); void clear(); protected: - virtual void maybeTip(const QPoint &); + virtual void maybeTip(const TQPoint &); }; - class NSPanel : public QObject, public DCOPObject { + class NSPanel : public TQObject, public DCOPObject { Q_OBJECT K_DCOP public: - NSPanel(QObject *parent, const char *name, const QString &key, + NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice); ~NSPanel(); - void setTitle(const QString &tit); + void setTitle(const TQString &tit); void setListbox(TTListBox *lb); - void setPixmap(const QPixmap &pm); - void setPixmapBuffer(QBuffer *buf); + void setPixmap(const TQPixmap &pm); + void setPixmapBuffer(TQBuffer *buf); void setJob(KIO::Job *kio_job); TTListBox *listbox() const; - QPixmap pixmap(); - QString key() const; - QString title() const; - QStringList articles(); - QStringList articleLinks(); + TQPixmap pixmap(); + TQString key() const; + TQString title() const; + TQStringList articles(); + TQStringList articleLinks(); bool isValid() const; k_dcop: @@ -83,15 +83,15 @@ namespace KSB_News { private: DCOPRef *m_rssservice; DCOPRef m_rssdocument; - QString m_key; - QString m_title; + TQString m_key; + TQString m_title; TTListBox *m_listbox; - QPixmap m_pixmap; + TQPixmap m_pixmap; int m_count; - QStringList m_articles; // TODO: use proper container - QStringList m_articlelinks; // TODO: use proper container + TQStringList m_articles; // TODO: use proper container + TQStringList m_articlelinks; // TODO: use proper container int m_timeoutinterval; - QTimer *m_timer; + TQTimer *m_timer; bool m_isValid; signals: diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 74aa07e..6c7e44b 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -25,14 +25,14 @@ Boston, MA 02110-1301, USA. */ -#include <qpushbutton.h> -#include <qlayout.h> -#include <qscrollview.h> -#include <qptrdict.h> -#include <qsizepolicy.h> -#include <qtooltip.h> -#include <qcursor.h> -#include <qimage.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqscrollview.h> +#include <tqptrdict.h> +#include <tqsizepolicy.h> +#include <tqtooltip.h> +#include <tqcursor.h> +#include <tqimage.h> #include <kdebug.h> #include <kaboutdata.h> #include <kaboutapplication.h> @@ -50,10 +50,10 @@ namespace KSB_News { - NSStackTabWidget::NSStackTabWidget(QWidget *parent, const char *name, - QPixmap appIcon) : QWidget(parent, name) { + NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name, + TQPixmap appIcon) : TQWidget(parent, name) { currentPage = 0; - layout = new QVBoxLayout(this); + layout = new TQVBoxLayout(this); pagesheader.setAutoDelete(TRUE); pages.setAutoDelete(TRUE); @@ -86,19 +86,19 @@ namespace KSB_News { popup = new KPopupMenu(this); popup->insertItem(KStdGuiItem::configure().iconSet(), i18n("&Configure Newsticker..."), this, - SLOT(slotConfigure())); + TQT_SLOT(slotConfigure())); popup->insertItem(SmallIconSet("reload"), i18n("&Reload"), this, - SLOT(slotRefresh())); + TQT_SLOT(slotRefresh())); popup->insertItem(KStdGuiItem::close().iconSet(), - KStdGuiItem::close().text(), this, SLOT(slotClose())); + KStdGuiItem::close().text(), this, TQT_SLOT(slotClose())); popup->insertSeparator(); // help menu helpmenu = new KPopupMenu(this); helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, - SLOT(slotShowAbout())); + TQT_SLOT(slotShowAbout())); helpmenu->insertItem(i18n("&Report Bug..."), this, - SLOT(slotShowBugreport())); + TQT_SLOT(slotShowBugreport())); popup->insertItem(KStdGuiItem::help().iconSet(), KStdGuiItem::help().text(), helpmenu); @@ -109,24 +109,24 @@ namespace KSB_News { } - void NSStackTabWidget::addStackTab(NSPanel *nsp, QWidget *page) { - QPushButton *button = new QPushButton(this); + void NSStackTabWidget::addStackTab(NSPanel *nsp, TQWidget *page) { + TQPushButton *button = new TQPushButton(this); button->setText(KStringHandler::rPixelSqueeze(nsp->title(), button->fontMetrics(), button->width() - 4 )); - button->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, - QSizePolicy::Preferred)); - connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked())); - QToolTip::add(button, nsp->title()); + button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + TQSizePolicy::Preferred)); + connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked())); + TQToolTip::add(button, nsp->title()); // eventFiler for the title button button->installEventFilter(this); - QScrollView *sv = new QScrollView(this); - sv->setResizePolicy(QScrollView::AutoOneFit); + TQScrollView *sv = new TQScrollView(this); + sv->setResizePolicy(TQScrollView::AutoOneFit); sv->addChild(page); - sv->setFrameStyle(QFrame::NoFrame); + sv->setFrameStyle(TQFrame::NoFrame); page->show(); pagesheader.insert(nsp, button); @@ -150,8 +150,8 @@ namespace KSB_News { pagesheader.remove(nsp); if (pages.count() >= 1) { - QPtrDictIterator<QWidget> it(pages); - QWidget *previousPage = currentPage; + TQPtrDictIterator<TQWidget> it(pages); + TQWidget *previousPage = currentPage; currentPage = it.current(); if (currentPage != previousPage) currentPage->show(); @@ -161,7 +161,7 @@ namespace KSB_News { void NSStackTabWidget::updateTitle(NSPanel *nsp) { - QPushButton *pb = (QPushButton *)pagesheader.find(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); if (! pb->pixmap()) pb->setText(nsp->title()); } @@ -169,11 +169,11 @@ namespace KSB_News { void NSStackTabWidget::updatePixmap(NSPanel *nsp) { - QPushButton *pb = (QPushButton *)pagesheader.find(nsp); - QPixmap pixmap = nsp->pixmap(); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); + TQPixmap pixmap = nsp->pixmap(); if ((pixmap.width() > 88) || (pixmap.height() > 31)) { - QImage image = pixmap.convertToImage(); - pixmap.convertFromImage(image.smoothScale(88, 31, QImage::ScaleMin)); + TQImage image = pixmap.convertToImage(); + pixmap.convertFromImage(image.smoothScale(88, 31, TQImage::ScaleMin)); } pb->setPixmap(pixmap); } @@ -182,13 +182,13 @@ namespace KSB_News { void NSStackTabWidget::buttonClicked() { - QPushButton *pb = (QPushButton*)sender(); + TQPushButton *pb = (TQPushButton*)sender(); NSPanel *nsp = NULL; // Which NSPanel belongs to pb - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == pb) nsp = (NSPanel *)it.currentKey(); } @@ -197,7 +197,7 @@ namespace KSB_News { return; // Find current ScrollView - QWidget *sv = pages.find(nsp); + TQWidget *sv = pages.find(nsp); // Change visible page if (currentPage != sv) { @@ -211,22 +211,22 @@ namespace KSB_News { - bool NSStackTabWidget::eventFilter(QObject *obj, QEvent *ev) { - if (ev->type() == QEvent::MouseButtonPress - && ((QMouseEvent *)ev)->button() == QMouseEvent::RightButton) { - m_last_button_rightclicked = (QPushButton *)obj; - popup->exec(QCursor::pos()); + bool NSStackTabWidget::eventFilter(TQObject *obj, TQEvent *ev) { + if (ev->type() == TQEvent::MouseButtonPress + && ((TQMouseEvent *)ev)->button() == TQMouseEvent::RightButton) { + m_last_button_rightclicked = (TQPushButton *)obj; + popup->exec(TQCursor::pos()); return true; - } else if (ev->type() == QEvent::Resize) { - QPushButton *pb = (QPushButton *)obj; + } else if (ev->type() == TQEvent::Resize) { + TQPushButton *pb = (TQPushButton *)obj; - const QPixmap *pm = pb->pixmap(); + const TQPixmap *pm = pb->pixmap(); if ( ! pm ) { // Which NSPanel belongs to pb NSPanel *nsp = NULL; - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == pb) nsp = (NSPanel *)it.currentKey(); } @@ -256,12 +256,12 @@ namespace KSB_News { KDialogBase::Ok, true); ConfigFeeds *conf_widget = new ConfigFeeds(0, "feedcfgdlg"); - m_confdlg->addPage(conf_widget, i18n("RSS Settings"), QString()); + m_confdlg->addPage(conf_widget, i18n("RSS Settings"), TQString()); // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, SIGNAL(settingsChanged()), this, - SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, + TQT_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } @@ -271,7 +271,7 @@ namespace KSB_News { DCOPRef rss_document("rssservice", "RSSService"); // remove old sources and old stack tabs - QStringList::iterator it; + TQStringList::iterator it; for (it = m_our_rsssources.begin(); it != m_our_rsssources.end(); ++it) { rss_document.call("remove", (*it)); } @@ -304,9 +304,9 @@ namespace KSB_News { NSPanel *nsp = NULL; // find appendant NSPanel - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == m_last_button_rightclicked) nsp = (NSPanel *)it.currentKey(); } @@ -322,9 +322,9 @@ namespace KSB_News { void NSStackTabWidget::slotClose() { NSPanel *nsp = NULL; // find appendant NSPanel - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == m_last_button_rightclicked) nsp = (NSPanel *)it.currentKey(); } @@ -350,7 +350,7 @@ namespace KSB_News { } - bool NSStackTabWidget::isRegistered(const QString &key) { + bool NSStackTabWidget::isRegistered(const TQString &key) { m_our_rsssources = SidebarSettings::sources(); if (m_our_rsssources.findIndex(key) == -1) return false; diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 7b84289..fb0da4d 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -28,7 +28,7 @@ #ifndef _NSSTACKTABWIDGET_H_ #define _NSSTACKTABWIDGET_H_ -#include <qptrdict.h> +#include <tqptrdict.h> #include "nspanel.h" @@ -45,21 +45,21 @@ namespace KSB_News { class NewRssSourceDlg; - class NSStackTabWidget : public QWidget { + class NSStackTabWidget : public TQWidget { Q_OBJECT public: - NSStackTabWidget(QWidget *parent = 0, const char *name = 0, - QPixmap appIcon = QPixmap()); - void addStackTab(NSPanel *nsp, QWidget *page); + NSStackTabWidget(TQWidget *parent = 0, const char *name = 0, + TQPixmap appIcon = TQPixmap()); + void addStackTab(NSPanel *nsp, TQWidget *page); void delStackTab(NSPanel *nsp); void updateTitle(NSPanel *nsp); void updatePixmap(NSPanel *nsp); bool isEmpty() const; - bool isRegistered(const QString &key); + bool isRegistered(const TQString &key); protected: - bool eventFilter(QObject *obj, QEvent *ev); + bool eventFilter(TQObject *obj, TQEvent *ev); private slots: void buttonClicked(); @@ -71,17 +71,17 @@ namespace KSB_News { void slotConfigure_okClicked(); private: - QPtrDict<QWidget> pages; - QPtrDict<QWidget> pagesheader; - QVBoxLayout *layout; - QWidget *currentPage; + TQPtrDict<TQWidget> pages; + TQPtrDict<TQWidget> pagesheader; + TQVBoxLayout *layout; + TQWidget *currentPage; KPopupMenu *popup, *helpmenu; KAboutData *m_aboutdata; KAboutApplication *m_about; KBugReport *m_bugreport; - QPushButton *m_last_button_rightclicked; + TQPushButton *m_last_button_rightclicked; KConfigDialog *m_confdlg; - QStringList m_our_rsssources; + TQStringList m_our_rsssources; }; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index f96bcd6..ae9c51b 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -28,9 +28,9 @@ */ #include <dcopclient.h> -#include <qtimer.h> -#include <qbuffer.h> -#include <qwidgetstack.h> +#include <tqtimer.h> +#include <tqbuffer.h> +#include <tqwidgetstack.h> #include <kdebug.h> #include <kapplication.h> #include <klocale.h> @@ -46,9 +46,9 @@ namespace KSB_News { - KonqSidebar_News::KonqSidebar_News(KInstance *inst, QObject *parent, - QWidget *widgetParent, - QString &desktopName, const char* name) + KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, + TQWidget *widgetParent, + TQString &desktopName, const char* name) : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), DCOPObject("sidebar-newsticker") { @@ -56,12 +56,12 @@ namespace KSB_News { // FIXME: as konqueror knows the icon there might be a possibility to // access the already present QPixmap KDesktopFile desktopFile(desktopName, true); - QString iconName = desktopFile.readIcon(); + TQString iconName = desktopFile.readIcon(); KIconLoader iconLoader; m_appIcon = iconLoader.loadIcon(iconName, KIcon::Small); // create all sidebar widgets - widgets = new QWidgetStack(widgetParent, "main_widgetstack"); + widgets = new TQWidgetStack(widgetParent, "main_widgetstack"); newswidget = new NSStackTabWidget(widgets, "feedbrowser_stackchld", m_appIcon); noRSSwidget = new NoRSSWidget(widgets, "nofeed_stackchld"); @@ -82,17 +82,17 @@ namespace KSB_News { } else { m_rssservice = DCOPRef("rssservice", "RSSService"); - QStringList reslist = SidebarSettings::sources(); - QStringList::iterator it; + TQStringList reslist = SidebarSettings::sources(); + TQStringList::iterator it; for (it = reslist.begin(); it != reslist.end(); ++it) { addedRSSSource(*it); } // fetch added and removed RSS sources - connectDCOPSignal("rssservice", m_rssservice.obj(), "added(QString)", - "addedRSSSource(QString)", false); - connectDCOPSignal("rssservice", m_rssservice.obj(), "removed(QString)", - "removedRSSSource(QString)", false); + connectDCOPSignal("rssservice", m_rssservice.obj(), "added(TQString)", + "addedRSSSource(TQString)", false); + connectDCOPSignal("rssservice", m_rssservice.obj(), "removed(TQString)", + "removedRSSSource(TQString)", false); // show special widget if there are no RSS sources available if (newswidget->isEmpty()) { @@ -110,11 +110,11 @@ namespace KSB_News { - void *KonqSidebar_News::provides(const QString &) {return 0;} + void *KonqSidebar_News::provides(const TQString &) {return 0;} - void KonqSidebar_News::emitStatusBarText (const QString &) {;} + void KonqSidebar_News::emitStatusBarText (const TQString &) {;} - QWidget *KonqSidebar_News::getWidget(){return widgets;} + TQWidget *KonqSidebar_News::getWidget(){return widgets;} void KonqSidebar_News::handleURL(const KURL &/*url*/) {;} @@ -122,11 +122,11 @@ namespace KSB_News { ///////// startup of the DCOP servce /////////////////////////////////////// int KonqSidebar_News::checkDcopService() { - QString rdfservice_error; + TQString rdfservice_error; int err = 0; if (! kapp->dcopClient()->isApplicationRegistered("rssservice")) - if (KApplication::startServiceByDesktopName("rssservice", QString(), + if (KApplication::startServiceByDesktopName("rssservice", TQString(), &rdfservice_error) > 0) err = 1; @@ -137,7 +137,7 @@ namespace KSB_News { ///////// helper methods /////////////////////////////////////////////////// - NSPanel *KonqSidebar_News::getNSPanelByKey(QString key) { + NSPanel *KonqSidebar_News::getNSPanelByKey(TQString key) { NSPanel *nsp = NULL, *current_nsp; for (current_nsp = nspanelptrlist.first(); current_nsp; @@ -150,14 +150,14 @@ namespace KSB_News { } - void KonqSidebar_News::addedRSSSource(QString key) { + void KonqSidebar_News::addedRSSSource(TQString key) { kdDebug(90140) << "KonqSidebar_News::addedRSSSource: " << key << endl; // Only add RSS source if we have registered the URI before in // NSStackTabWidget. if (newswidget->isRegistered(key)) { NSPanel *nspanel = new NSPanel(this, - QString(QString("sidebar-newsticker-")+key).latin1(), + TQString(TQString("sidebar-newsticker-")+key).latin1(), key, &m_rssservice); nspanel->setTitle(key); nspanelptrlist.append(nspanel); @@ -166,19 +166,19 @@ namespace KSB_News { if (! nspanel->listbox()) { TTListBox *listbox = new TTListBox(newswidget, "article_lb"); newswidget->addStackTab(nspanel, listbox); - connect(listbox, SIGNAL(executed(QListBoxItem *)), - this, SLOT(slotArticleItemExecuted(QListBoxItem *))); + connect(listbox, TQT_SIGNAL(executed(TQListBoxItem *)), + this, TQT_SLOT(slotArticleItemExecuted(TQListBoxItem *))); listbox->insertItem(i18n("Connecting..." )); nspanel->setListbox(listbox); } // listen to updates - connect(nspanel, SIGNAL(documentUpdated(NSPanel *)), - this, SLOT(updateArticles(NSPanel *))); - connect(nspanel, SIGNAL(documentUpdated(NSPanel *)), - this, SLOT(updateTitle(NSPanel *))); - connect(nspanel, SIGNAL(pixmapUpdated(NSPanel *)), - this, SLOT(updatePixmap(NSPanel *))); + connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), + this, TQT_SLOT(updateArticles(NSPanel *))); + connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), + this, TQT_SLOT(updateTitle(NSPanel *))); + connect(nspanel, TQT_SIGNAL(pixmapUpdated(NSPanel *)), + this, TQT_SLOT(updatePixmap(NSPanel *))); if (widgets->visibleWidget() != newswidget) widgets->raiseWidget(newswidget); @@ -186,7 +186,7 @@ namespace KSB_News { } - void KonqSidebar_News::removedRSSSource(QString key) { + void KonqSidebar_News::removedRSSSource(TQString key) { kdDebug(90140) << "inside KonqSidebar_News::removedSource " << key << endl; if (NSPanel *nsp = getNSPanelByKey(key)) { @@ -202,7 +202,7 @@ namespace KSB_News { ///////////////////////////////////////////////////////////////////// - void KonqSidebar_News::slotArticleItemExecuted(QListBoxItem *item) { + void KonqSidebar_News::slotArticleItemExecuted(TQListBoxItem *item) { if (!item) return; NSPanel *current_nspanel, *nspanel = NULL; @@ -213,7 +213,7 @@ namespace KSB_News { } int subid = nspanel->listbox()->index(item); - QString link = nspanel->articleLinks()[subid]; + TQString link = nspanel->articleLinks()[subid]; emit openURLRequest(KURL(link)); @@ -226,8 +226,8 @@ namespace KSB_News { void KonqSidebar_News::updateArticles(NSPanel *nsp) { nsp->listbox()->clear(); - QStringList articleList = nsp->articles(); - QStringList::iterator it; + TQStringList articleList = nsp->articles(); + TQStringList::iterator it; for (it = articleList.begin(); it != articleList.end(); ++it) nsp->listbox()->insertItem((*it)); } @@ -252,9 +252,9 @@ namespace KSB_News { extern "C" { - KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, QObject *par, - QWidget *widp, - QString &desktopname, + KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, TQObject *par, + TQWidget *widp, + TQString &desktopname, const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_news"); return new KonqSidebar_News(instance, par, widp, desktopname, name); @@ -262,8 +262,8 @@ namespace KSB_News { } extern "C" { - KDE_EXPORT bool add_konq_sidebarnews(QString* fn, QString*, - QMap<QString,QString> *map) { + KDE_EXPORT bool add_konq_sidebarnews(TQString* fn, TQString*, + TQMap<TQString,TQString> *map) { map->insert("Type", "Link"); map->insert("Icon", "konqsidebar_news"); map->insert("Name", i18n("Newsticker")); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index e6da786..d09862f 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -47,30 +47,30 @@ namespace KSB_News { K_DCOP public: - KonqSidebar_News(KInstance *instance, QObject *parent, - QWidget *widgetParent, QString &desktopName_, + KonqSidebar_News(KInstance *instance, TQObject *parent, + TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_News(); - virtual void *provides(const QString &); - void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); + void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); k_dcop: - virtual void addedRSSSource(QString); - virtual void removedRSSSource(QString); + virtual void addedRSSSource(TQString); + virtual void removedRSSSource(TQString); protected: virtual void handleURL(const KURL &url); private: int checkDcopService(); - QWidgetStack *widgets; + TQWidgetStack *widgets; NSStackTabWidget *newswidget; NoRSSWidget *noRSSwidget; - QPtrList<NSPanel> nspanelptrlist; - NSPanel *getNSPanelByKey(QString key); + TQPtrList<NSPanel> nspanelptrlist; + NSPanel *getNSPanelByKey(TQString key); DCOPRef m_rssservice; - QPixmap m_appIcon; + TQPixmap m_appIcon; signals: // see <konqsidebarplugin.h> @@ -78,7 +78,7 @@ namespace KSB_News { const KParts::URLArgs &args = KParts::URLArgs()); private slots: - void slotArticleItemExecuted(QListBoxItem *item); + void slotArticleItemExecuted(TQListBoxItem *item); void updateArticles(NSPanel *nsp); void updateTitle(NSPanel *nsp); void updatePixmap(NSPanel *nsp); diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index b929930..b6ad880 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -20,7 +20,7 @@ #include <sys/utsname.h> -#include <qregexp.h> +#include <tqregexp.h> #include <krun.h> #include <kdebug.h> @@ -47,11 +47,11 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL1(x) QString::fromLatin1(x) +#define QFL1(x) TQString::fromLatin1(x) -UAChangerPlugin::UAChangerPlugin( QObject* parent, const char* name, - const QStringList & ) +UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, + const TQStringList & ) :KParts::Plugin( parent, name ), m_bSettingsLoaded(false), m_part(0L), m_config(0L) { @@ -60,16 +60,16 @@ UAChangerPlugin::UAChangerPlugin( QObject* parent, const char* name, m_pUAMenu = new KActionMenu( i18n("Change Browser &Identification"), "agent", actionCollection(), "changeuseragent" ); m_pUAMenu->setDelayed( false ); - connect( m_pUAMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotAboutToShow() ) ); + connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotAboutToShow() ) ); m_pUAMenu->setEnabled ( false ); if ( parent && parent->inherits( "KHTMLPart" ) ) { m_part = static_cast<KHTMLPart*>(parent); - connect( m_part, SIGNAL(started(KIO::Job*)), this, - SLOT(slotStarted(KIO::Job*)) ); + connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this, + TQT_SLOT(slotStarted(KIO::Job*)) ); } } @@ -98,10 +98,10 @@ void UAChangerPlugin::parseDescFiles() struct utsname utsn; uname( &utsn ); - QStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - QStringList::Iterator it = languageList.find(QFL1("C")); + TQStringList::Iterator it = languageList.find(QFL1("C")); if( it != languageList.end() ) { if( languageList.contains( QFL1("en") ) > 0 ) @@ -116,8 +116,8 @@ void UAChangerPlugin::parseDescFiles() for ( ; it != lastItem; ++it ) { - QString tmp = UA_PTOS("X-KDE-UA-FULL"); - QString tag = UA_PTOS("X-KDE-UA-TAG"); + TQString tmp = UA_PTOS("X-KDE-UA-FULL"); + TQString tag = UA_PTOS("X-KDE-UA-TAG"); if(tag != "IE" && tag != "NN" && tag != "MOZ") tag = "OTHER"; @@ -135,14 +135,14 @@ void UAChangerPlugin::parseDescFiles() continue; // Ignore dups! m_lstIdentity << tmp; - tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE")); + tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE")); if ( tmp.stripWhiteSpace().isEmpty() ) { if(tag == "NN" || tag == "IE" || tag == "MOZ") tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION")); else - tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")); + tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")); } else { @@ -161,7 +161,7 @@ void UAChangerPlugin::parseDescFiles() { if ( m_lstAlias[(*e)] > tmp ) { ualist.insert( e, m_lstAlias.count()-1 ); - tmp = QString::null; + tmp = TQString::null; } ++e; } @@ -184,7 +184,7 @@ void UAChangerPlugin::slotStarted( KIO::Job* ) m_currentURL = m_part->url(); // This plugin works on local files, http[s], and webdav[s]. - QString proto = m_currentURL.protocol(); + TQString proto = m_currentURL.protocol(); if (m_currentURL.isLocalFile() || proto.startsWith("http") || proto.startsWith("webdav")) { @@ -212,12 +212,12 @@ void UAChangerPlugin::slotAboutToShow() m_pUAMenu->popupMenu()->clear(); m_pUAMenu->popupMenu()->insertTitle(i18n("Identify As")); // imho title doesn't need colon.. - QString host = m_currentURL.isLocalFile() ? QFL1("localhost") : m_currentURL.host(); + TQString host = m_currentURL.isLocalFile() ? QFL1("localhost") : m_currentURL.host(); m_currentUserAgent = KProtocolManager::userAgentForHost(host); //kdDebug(90130) << "User Agent: " << m_currentUserAgent << endl; int id = m_pUAMenu->popupMenu()->insertItem( i18n("Default Identification"), this, - SLOT(slotDefault()), 0, ++count ); + TQT_SLOT(slotDefault()), 0, ++count ); if( m_currentUserAgent == KProtocolManager::defaultUserAgent() ) m_pUAMenu->popupMenu()->setItemChecked(id, true); @@ -230,7 +230,7 @@ void UAChangerPlugin::slotAboutToShow() BrowserGroup::ConstIterator e = map.data().begin(); for( ; e != map.data().end(); ++e ) { - int id = browserMenu->insertItem( m_lstAlias[*e], this, SLOT(slotItemSelected(int)), 0, *e ); + int id = browserMenu->insertItem( m_lstAlias[*e], this, TQT_SLOT(slotItemSelected(int)), 0, *e ); if (m_lstIdentity[(*e)] == m_currentUserAgent) browserMenu->setItemChecked(id, true); } @@ -241,16 +241,16 @@ void UAChangerPlugin::slotAboutToShow() /* useless here, imho.. m_pUAMenu->popupMenu()->insertItem( i18n("Reload Identifications"), this, - SLOT(slotReloadDescriptions()), + TQT_SLOT(slotReloadDescriptions()), 0, ++count );*/ m_pUAMenu->popupMenu()->insertItem( i18n("Apply to Entire Site"), this, - SLOT(slotApplyToDomain()), + TQT_SLOT(slotApplyToDomain()), 0, ++count ); m_pUAMenu->popupMenu()->setItemChecked(count, m_bApplyToDomain); m_pUAMenu->popupMenu()->insertItem( i18n("Configure..."), this, - SLOT(slotConfigure())); + TQT_SLOT(slotConfigure())); } @@ -265,7 +265,7 @@ void UAChangerPlugin::slotItemSelected( int id ) { if (m_lstIdentity[id] == m_currentUserAgent) return; - QString host; + TQString host; m_currentUserAgent = m_lstIdentity[id]; host = m_currentURL.isLocalFile() ? QFL1("localhost") : filterHost( m_currentURL.host() ); @@ -285,13 +285,13 @@ void UAChangerPlugin::slotDefault() if( m_currentUserAgent == KProtocolManager::defaultUserAgent() ) return; // don't flicker! // We have no choice but delete all higher domain level settings here since it // affects what will be matched. - QStringList partList = QStringList::split('.', m_currentURL.host(), false); + TQStringList partList = TQStringList::split('.', m_currentURL.host(), false); if ( !partList.isEmpty() ) { partList.remove(partList.begin()); - QStringList domains; + TQStringList domains; // Remove the exact name match... domains << m_currentURL.host (); @@ -308,7 +308,7 @@ void UAChangerPlugin::slotDefault() partList.remove(partList.begin()); } - for (QStringList::Iterator it = domains.begin(); it != domains.end(); it++) + for (TQStringList::Iterator it = domains.begin(); it != domains.end(); it++) { //kdDebug () << "Domain to remove: " << *it << endl; if ( m_config->hasGroup(*it) ) @@ -336,13 +336,13 @@ void UAChangerPlugin::slotDefault() void UAChangerPlugin::updateIOSlaves () { // Inform running http(s) io-slaves about the change... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", QString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) kdWarning() << "UAChangerPlugin::updateIOSlaves: Unable to update running application!" << endl; } -QString UAChangerPlugin::filterHost(const QString &hostname) +TQString UAChangerPlugin::filterHost(const TQString &hostname) { - QRegExp rx; + TQRegExp rx; // Check for IPv4 address rx.setPattern ("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}"); @@ -358,10 +358,10 @@ QString UAChangerPlugin::filterHost(const QString &hostname) return (m_bApplyToDomain ? findTLD(hostname): hostname); } -QString UAChangerPlugin::findTLD (const QString &hostname) +TQString UAChangerPlugin::findTLD (const TQString &hostname) { - QStringList domains; - QStringList partList = QStringList::split('.', hostname, false); + TQStringList domains; + TQStringList partList = TQStringList::split('.', hostname, false); if (partList.count()) partList.remove(partList.begin()); // Remove hostname @@ -392,7 +392,7 @@ QString UAChangerPlugin::findTLD (const QString &hostname) // Catch some TLDs that we miss with the previous check // e.g. com.au, org.uk, mil.co - QCString t = partList[0].lower().utf8(); + TQCString t = partList[0].lower().utf8(); if ((t == "com") || (t == "net") || (t == "org") || (t == "gov") || (t == "edu") || (t == "mil") || (t == "int")) break; diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h index eb70704..7732574 100644 --- a/konq-plugins/uachanger/uachangerplugin.h +++ b/konq-plugins/uachanger/uachangerplugin.h @@ -21,9 +21,9 @@ #ifndef __UACHANGER_PLUGIN_H #define __UACHANGER_PLUGIN_H -#include <qmap.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <kurl.h> #include <klibloader.h> @@ -43,8 +43,8 @@ class UAChangerPlugin : public KParts::Plugin Q_OBJECT public: - UAChangerPlugin( QObject* parent, const char* name, - const QStringList & ); + UAChangerPlugin( TQObject* parent, const char* name, + const TQStringList & ); ~UAChangerPlugin(); protected slots: @@ -60,8 +60,8 @@ protected slots: void slotReloadDescriptions(); protected: - QString findTLD (const QString &hostname); - QString filterHost (const QString &hostname); + TQString findTLD (const TQString &hostname); + TQString filterHost (const TQString &hostname); private: void loadSettings(); @@ -76,14 +76,14 @@ private: KConfig* m_config; KURL m_currentURL; - QString m_currentUserAgent; + TQString m_currentUserAgent; - QStringList m_lstAlias; - QStringList m_lstIdentity; + TQStringList m_lstAlias; + TQStringList m_lstIdentity; - typedef QValueList<int> BrowserGroup; - typedef QMap<QString,BrowserGroup> AliasMap; - typedef QMap<QString,QString> BrowserMap; + typedef TQValueList<int> BrowserGroup; + typedef TQMap<TQString,BrowserGroup> AliasMap; + typedef TQMap<TQString,TQString> BrowserMap; typedef AliasMap::Iterator AliasIterator; typedef AliasMap::ConstIterator AliasConstIterator; diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 69f07cd..f669308 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -44,8 +44,8 @@ static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Pa K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin, PluginValidatorsFactory( &aboutdata ) ) -PluginValidators::PluginValidators( QObject* parent, const char* name, - const QStringList & ) +PluginValidators::PluginValidators( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ), m_configDialog(0), m_part(0) { setInstance(PluginValidatorsFactory::instance()); @@ -56,17 +56,17 @@ PluginValidators::PluginValidators( QObject* parent, const char* name, m_menu->insert( new KAction( i18n( "Validate &HTML" ), "htmlvalidator", 0, - this, SLOT(slotValidateHTML()), + this, TQT_SLOT(slotValidateHTML()), actionCollection(), "validateHTML") ); m_menu->insert( new KAction( i18n( "Validate &CSS" ), "cssvalidator", 0, - this, SLOT(slotValidateCSS()), + this, TQT_SLOT(slotValidateCSS()), actionCollection(), "validateCSS") ); m_menu->insert( new KAction( i18n( "Validate &Links" ), 0, - this, SLOT(slotValidateLinks()), + this, TQT_SLOT(slotValidateLinks()), actionCollection(), "validateLinks") ); m_menu->setEnabled( false ); @@ -75,15 +75,15 @@ PluginValidators::PluginValidators( QObject* parent, const char* name, { m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), "configure", 0, - this, SLOT(slotConfigure()), + this, TQT_SLOT(slotConfigure()), actionCollection(), "configure") ); m_part = static_cast<KHTMLPart *>( parent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); - connect( m_part, SIGNAL(started(KIO::Job*)), this, - SLOT(slotStarted(KIO::Job*)) ); + connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this, + TQT_SLOT(slotStarted(KIO::Job*)) ); } } @@ -143,8 +143,8 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) // The parent is assumed to be a KHTMLPart if ( !parent()->inherits("KHTMLPart") ) { - QString title = i18n( "Cannot Validate Source" ); - QString text = i18n( "You cannot validate anything except web pages with " + TQString title = i18n( "Cannot Validate Source" ); + TQString text = i18n( "You cannot validate anything except web pages with " "this plugin." ); KMessageBox::sorry( 0, text, title ); @@ -157,8 +157,8 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) KURL partUrl = m_part->url(); if ( !partUrl.isValid() ) // Just in case ;) { - QString title = i18n( "Malformed URL" ); - QString text = i18n( "The URL you entered is not valid, please " + TQString title = i18n( "Malformed URL" ); + TQString text = i18n( "The URL you entered is not valid, please " "correct it and try again." ); KMessageBox::sorry( 0, text, title ); return; @@ -167,8 +167,8 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) if (partUrl.isLocalFile()) { if ( validatorUrl.isEmpty() ) { - QString title = i18n( "Upload Not Possible" ); - QString text = i18n( "Validating links is not possible for local " + TQString title = i18n( "Upload Not Possible" ); + TQString text = i18n( "Validating links is not possible for local " "files." ); KMessageBox::sorry( 0, text, title ); return; @@ -188,9 +188,9 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) return; } // Set entered URL as a parameter - QString q = partUrl.url(); + TQString q = partUrl.url(); q = KURL::encode_string( q ); - QString p = "uri="; + TQString p = "uri="; p += q; validatorUrl.setQuery( p ); } diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h index 448e77f..2363ddb 100644 --- a/konq-plugins/validators/plugin_validators.h +++ b/konq-plugins/validators/plugin_validators.h @@ -33,7 +33,7 @@ #include <klibloader.h> #include "validatorsdialog.h" -#include <qguardedptr.h> +#include <tqguardedptr.h> class KAction; class KURL; @@ -42,8 +42,8 @@ class PluginValidators : public KParts::Plugin { Q_OBJECT public: - PluginValidators( QObject* parent, const char* name, - const QStringList & ); + PluginValidators( TQObject* parent, const char* name, + const TQStringList & ); virtual ~PluginValidators(); public slots: @@ -57,7 +57,7 @@ private slots: private: KActionMenu *m_menu; - QGuardedPtr<ValidatorsDialog> m_configDialog; // | + TQGuardedPtr<ValidatorsDialog> m_configDialog; // | // +-> Order dependency. KHTMLPart* m_part; // | diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp index 0c524e2..864de55 100644 --- a/konq-plugins/validators/validatorsdialog.cpp +++ b/konq-plugins/validators/validatorsdialog.cpp @@ -17,11 +17,11 @@ Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qvbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqcombobox.h> #include <kconfig.h> #include <klocale.h> @@ -29,57 +29,57 @@ #include "validatorsdialog.h" #include "validatorsdialog.moc" -ValidatorsDialog::ValidatorsDialog(QWidget *parent, const char *name ) +ValidatorsDialog::ValidatorsDialog(TQWidget *parent, const char *name ) : KDialogBase( parent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) { setCaption(i18n("Configure Validating Servers")); setMinimumWidth(300); - QVBox *page = makeVBoxMainWidget (); + TQVBox *page = makeVBoxMainWidget (); - QGroupBox *tgroup = new QGroupBox( i18n("HTML/XML Validator"), page ); - QVBoxLayout *vlay = new QVBoxLayout( tgroup, spacingHint() ); + TQGroupBox *tgroup = new TQGroupBox( i18n("HTML/XML Validator"), page ); + TQVBoxLayout *vlay = new TQVBoxLayout( tgroup, spacingHint() ); vlay->addSpacing( fontMetrics().lineSpacing()); - vlay->addWidget(new QLabel( i18n("URL:"), tgroup)); + vlay->addWidget(new TQLabel( i18n("URL:"), tgroup)); - m_WWWValidatorCB = new QComboBox(true, tgroup); + m_WWWValidatorCB = new TQComboBox(true, tgroup); m_WWWValidatorCB->setDuplicatesEnabled(false); vlay->addWidget( m_WWWValidatorCB ); - vlay->addWidget(new QLabel( i18n("Upload:"), tgroup)); + vlay->addWidget(new TQLabel( i18n("Upload:"), tgroup)); - m_WWWValidatorUploadCB = new QComboBox(true, tgroup); + m_WWWValidatorUploadCB = new TQComboBox(true, tgroup); m_WWWValidatorUploadCB->setDuplicatesEnabled(false); vlay->addWidget( m_WWWValidatorUploadCB ); /// - QGroupBox *group2= new QGroupBox( i18n("CSS Validator"), page ); - QVBoxLayout *vlay2 = new QVBoxLayout( group2, spacingHint() ); + TQGroupBox *group2= new TQGroupBox( i18n("CSS Validator"), page ); + TQVBoxLayout *vlay2 = new TQVBoxLayout( group2, spacingHint() ); vlay2->addSpacing( fontMetrics().lineSpacing()); - vlay2->addWidget(new QLabel( i18n("URL:"), group2)); + vlay2->addWidget(new TQLabel( i18n("URL:"), group2)); - m_CSSValidatorCB = new QComboBox(true, group2); + m_CSSValidatorCB = new TQComboBox(true, group2); m_CSSValidatorCB->setDuplicatesEnabled(false); vlay2->addWidget( m_CSSValidatorCB ); - vlay2->addWidget(new QLabel( i18n("Upload:"), group2)); + vlay2->addWidget(new TQLabel( i18n("Upload:"), group2)); - m_CSSValidatorUploadCB = new QComboBox(true, group2); + m_CSSValidatorUploadCB = new TQComboBox(true, group2); m_CSSValidatorUploadCB->setDuplicatesEnabled(false); vlay2->addWidget( m_CSSValidatorUploadCB ); /// - QGroupBox *group3= new QGroupBox( i18n("Link Validator"), page ); - QVBoxLayout *vlay3 = new QVBoxLayout( group3, spacingHint() ); + TQGroupBox *group3= new TQGroupBox( i18n("Link Validator"), page ); + TQVBoxLayout *vlay3 = new TQVBoxLayout( group3, spacingHint() ); vlay3->addSpacing( fontMetrics().lineSpacing()); - vlay3->addWidget(new QLabel( i18n("URL:"), group3)); + vlay3->addWidget(new TQLabel( i18n("URL:"), group3)); - m_linkValidatorCB = new QComboBox(true, group3); + m_linkValidatorCB = new TQComboBox(true, group3); m_linkValidatorCB->setDuplicatesEnabled(false); vlay3->addWidget( m_linkValidatorCB ); @@ -129,7 +129,7 @@ void ValidatorsDialog::load() void ValidatorsDialog::save() { - QStringList strList; + TQStringList strList; for (int i = 0; i < m_WWWValidatorCB->count(); i++) { strList.append(m_WWWValidatorCB->text(i)); } diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h index 79684f5..4fe9714 100644 --- a/konq-plugins/validators/validatorsdialog.h +++ b/konq-plugins/validators/validatorsdialog.h @@ -20,7 +20,7 @@ #ifndef __validatorsdialog_h #define __validatorsdialog_h -#include <qcombobox.h> +#include <tqcombobox.h> #include <kconfig.h> #include <kdialogbase.h> @@ -30,14 +30,14 @@ class ValidatorsDialog : public KDialogBase Q_OBJECT public: - ValidatorsDialog(QWidget *parent=0, const char *name=0 ); + ValidatorsDialog(TQWidget *parent=0, const char *name=0 ); ~ValidatorsDialog(); - const QString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} - const QString getCSSValidatorUrl() const {return m_CSSValidatorCB->currentText();} - const QString getWWWValidatorUploadUrl() const {return m_WWWValidatorUploadCB->currentText();} - const QString getCSSValidatorUploadUrl() const {return m_CSSValidatorUploadCB->currentText();} - const QString getLinkValidatorUrl() const {return m_linkValidatorCB->currentText();} + const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} + const TQString getCSSValidatorUrl() const {return m_CSSValidatorCB->currentText();} + const TQString getWWWValidatorUploadUrl() const {return m_WWWValidatorUploadCB->currentText();} + const TQString getCSSValidatorUploadUrl() const {return m_CSSValidatorUploadCB->currentText();} + const TQString getLinkValidatorUrl() const {return m_linkValidatorCB->currentText();} protected slots: void slotOk(); @@ -47,11 +47,11 @@ class ValidatorsDialog : public KDialogBase void load(); void save(); - QComboBox *m_WWWValidatorCB; - QComboBox *m_WWWValidatorUploadCB; - QComboBox *m_CSSValidatorCB; - QComboBox *m_CSSValidatorUploadCB; - QComboBox *m_linkValidatorCB; + TQComboBox *m_WWWValidatorCB; + TQComboBox *m_WWWValidatorUploadCB; + TQComboBox *m_CSSValidatorCB; + TQComboBox *m_CSSValidatorUploadCB; + TQComboBox *m_linkValidatorCB; KConfig *m_config; }; diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 71390c2..a28da2c 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -19,7 +19,7 @@ */ #include "archivedialog.h" -#include <qwidget.h> +#include <tqwidget.h> #include <khtml_part.h> #include "archiveviewbase.h" #include <kinstance.h> @@ -35,21 +35,21 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kactivelabel.h> -#include <qstylesheet.h> -#include <qiodevice.h> +#include <tqstylesheet.h> +#include <tqiodevice.h> #include <klistview.h> #include <kio/job.h> #include <kapplication.h> #include <kurllabel.h> #include <kprogress.h> #include <kstringhandler.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #undef DEBUG_WAR #define CONTENT_TYPE "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" -ArchiveDialog::ArchiveDialog(QWidget *parent, const QString &filename, +ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename, KHTMLPart *part) : KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ), @@ -59,8 +59,8 @@ ArchiveDialog::ArchiveDialog(QWidget *parent, const QString &filename, setMainWidget(m_widget); setWFlags(getWFlags() | WDestructiveClose); - m_widget->urlLabel->setText(QString("<a href=\"")+m_url.url()+"\">"+KStringHandler::csqueeze( m_url.url(), 80 )+"</a>"); - m_widget->targetLabel->setText(QString("<a href=\"")+filename+"\">"+KStringHandler::csqueeze( filename, 80 )+"</a>"); + m_widget->urlLabel->setText(TQString("<a href=\"")+m_url.url()+"\">"+KStringHandler::csqueeze( m_url.url(), 80 )+"</a>"); + m_widget->targetLabel->setText(TQString("<a href=\"")+filename+"\">"+KStringHandler::csqueeze( filename, 80 )+"</a>"); if(part->document().ownerDocument().isNull()) m_document = part->document(); @@ -83,12 +83,12 @@ void ArchiveDialog::archive() kdDebug(90110) << "Web Archive opened " << endl; #endif - m_linkDict.insert(QString("index.html"), QString("")); + m_linkDict.insert(TQString("index.html"), TQString("")); saveFile("index.html"); } else { - const QString title = i18n( "Unable to Open Web-Archive" ); - const QString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName()); + 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()); KMessageBox::sorry( 0L, text, title ); } } @@ -100,15 +100,15 @@ ArchiveDialog::~ArchiveDialog() /* Store the HTMLized DOM-Tree to a temporary file and add it to the Tar-Ball */ -void ArchiveDialog::saveFile( const QString&) +void ArchiveDialog::saveFile( const TQString&) { KTempFile tmpFile; if (!(tmpFile.status())) { - QString temp; + TQString temp; m_state=Retrieving; - QTextStream *tempStream = new QTextStream(&temp, IO_ReadOnly); + TQTextStream *tempStream = new TQTextStream(&temp, IO_ReadOnly); saveToArchive(tempStream); @@ -122,8 +122,8 @@ void ArchiveDialog::saveFile( const QString&) downloadNext(); } else { - const QString title = i18n( "Could Not Open Temporary File" ); - const QString text = i18n( "Could not open a temporary file" ); + const TQString title = i18n( "Could Not Open Temporary File" ); + const TQString text = i18n( "Could not open a temporary file" ); KMessageBox::sorry( 0, text, title ); } } @@ -131,8 +131,8 @@ void ArchiveDialog::saveFile( const QString&) void ArchiveDialog::setSavingState() { KTempFile tmpFile; - QTextStream* textStream = tmpFile.textStream(); - textStream->setEncoding(QTextStream::UnicodeUTF8); + TQTextStream* textStream = tmpFile.textStream(); + textStream->setEncoding(TQTextStream::UnicodeUTF8); m_widget->progressBar->setProgress(m_widget->progressBar->totalSteps()); @@ -141,10 +141,10 @@ void ArchiveDialog::setSavingState() tmpFile.close(); - QString fileName="index.html"; - QFile file(tmpFile.name()); + TQString fileName="index.html"; + TQFile file(tmpFile.name()); file.open(IO_ReadOnly); - m_tarBall->writeFile(fileName, QString::null, QString::null, file.size(), file.readAll()); + m_tarBall->writeFile(fileName, TQString::null, TQString::null, file.size(), file.readAll()); #ifdef DEBUG_WAR kdDebug(90110) << "HTML-file written: " << fileName << endl; #endif @@ -164,7 +164,7 @@ void ArchiveDialog::setSavingState() /* Recursively travers the DOM-Tree */ -void ArchiveDialog::saveToArchive(QTextStream* _textStream) +void ArchiveDialog::saveToArchive(TQTextStream* _textStream) { if (!_textStream) return; @@ -182,7 +182,7 @@ void ArchiveDialog::saveToArchive(QTextStream* _textStream) } } -static bool hasAttribute(const DOM::Node &pNode, const QString &attrName, const QString &attrValue) +static bool hasAttribute(const DOM::Node &pNode, const TQString &attrName, const TQString &attrValue) { const DOM::Element element = (const DOM::Element) pNode; DOM::Attr attr; @@ -197,7 +197,7 @@ static bool hasAttribute(const DOM::Node &pNode, const QString &attrName, const return false; } -static bool hasChildNode(const DOM::Node &pNode, const QString &nodeName) +static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName) { DOM::Node child; try @@ -222,12 +222,12 @@ static bool hasChildNode(const DOM::Node &pNode, const QString &nodeName) /* Transform DOM-Tree to HTML */ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& baseURL, - QTextStream* _textStream, int indent) + TQTextStream* _textStream, int indent) { - const QString nodeNameOrig(pNode.nodeName().string()); - const QString nodeName(pNode.nodeName().string().upper()); - QString text; - QString strIndent; + const TQString nodeNameOrig(pNode.nodeName().string()); + const TQString nodeName(pNode.nodeName().string().upper()); + TQString text; + TQString strIndent; strIndent.fill(' ', indent); const DOM::Element element = (const DOM::Element) pNode; DOM::Node child; @@ -253,8 +253,8 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas text = strIndent; } text += "<" + nodeNameOrig; - QString attributes; - QString attrNameOrig, attrName, attrValue; + TQString attributes; + TQString attrNameOrig, attrName, attrValue; DOM::Attr attr; DOM::NamedNodeMap attrs = element.attributes(); unsigned long lmap = attrs.length(); @@ -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(QRegExp("\\s"), "")); + attrValue = handleLink(baseURL, attrValue.replace(TQRegExp("\\s"), "")); } /* * ## Make recursion level configurable @@ -313,18 +313,18 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas } } } else { - const QString& nodeValue(pNode.nodeValue().string()); + const TQString& nodeValue(pNode.nodeValue().string()); if (!(nodeValue.isEmpty())) { // Don't escape < > in JS or CSS - QString parentNodeName = pNode.parentNode().nodeName().string().upper(); + TQString parentNodeName = pNode.parentNode().nodeName().string().upper(); if (parentNodeName == "STYLE") { text = analyzeInternalCSS(baseURL, pNode.nodeValue().string()); } else if (m_bPreserveWS) { - text = QStyleSheet::escape(pNode.nodeValue().string()); + text = TQStyleSheet::escape(pNode.nodeValue().string()); } else if (parentNodeName == "SCRIPT") { text = pNode.nodeValue().string(); } else { - text = strIndent + QStyleSheet::escape(pNode.nodeValue().string()); + text = strIndent + TQStyleSheet::escape(pNode.nodeValue().string()); } } } @@ -392,11 +392,11 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas /* Extract the URL, download it's content and return an unique name for the link */ -QString ArchiveDialog::handleLink(const KURL& _url, const QString& _link) +TQString ArchiveDialog::handleLink(const KURL& _url, const TQString& _link) { KURL url(getAbsoluteURL(_url, _link)); - QString tarFileName; + TQString tarFileName; if (kapp->authorizeURLAction("redirect", _url, url)) { if (m_state==Retrieving) @@ -422,7 +422,7 @@ void ArchiveDialog::downloadNext() #ifdef DEBUG_WAR kdDebug(90110) << "URL : " << url.url() << endl; #endif - QString tarFileName; + TQString tarFileName; // Only download file once if (m_downloadedURLDict.contains(url.url())) { @@ -440,15 +440,15 @@ void ArchiveDialog::downloadNext() delete m_tmpFile; m_tmpFile=new KTempFile(); m_tmpFile->close(); - QFile::remove(m_tmpFile->name()); + TQFile::remove(m_tmpFile->name()); kdDebug(90110) << "downloading: " << url.url() << " to: " << m_tmpFile->name() << endl; KURL dsturl; dsturl.setPath(m_tmpFile->name()); KIO::Job *job=KIO::file_copy(url, dsturl, -1, false, false, false); job->addMetaData("cache", "cache"); // Use entry from cache if available. - connect(job, SIGNAL(result( KIO::Job *)), this, SLOT(finishedDownloadingURL( KIO::Job *)) ); + connect(job, TQT_SIGNAL(result( KIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( KIO::Job *)) ); - m_currentLVI=new QListViewItem(m_widget->listView, url.prettyURL()); + m_currentLVI=new TQListViewItem(m_widget->listView, url.prettyURL()); m_widget->listView->insertItem( m_currentLVI ); m_currentLVI->setText(1,i18n("Downloading")); } @@ -461,7 +461,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job ) { if ( job->error() ) { -// QString s=job->errorString(); +// TQString s=job->errorString(); m_currentLVI->setText(1,i18n("Error")); } else @@ -472,12 +472,12 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job ) KURL url=m_urlsToDownload[m_iterator]; - QString tarFileName = getUniqueFileName(url.fileName()); + TQString tarFileName = getUniqueFileName(url.fileName()); // Add file to Tar-Ball - QFile file(m_tmpFile->name()); + TQFile file(m_tmpFile->name()); file.open(IO_ReadOnly); - m_tarBall->writeFile(tarFileName, QString::null, QString::null, file.size(), file.readAll()); + m_tarBall->writeFile(tarFileName, TQString::null, TQString::null, file.size(), file.readAll()); file.close(); m_tmpFile->unlink(); delete m_tmpFile; @@ -486,7 +486,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job ) // Add URL to downloaded URLs m_downloadedURLDict.insert(url.url(), tarFileName); - m_linkDict.insert(tarFileName, QString("")); + m_linkDict.insert(tarFileName, TQString("")); m_iterator++; downloadNext(); @@ -494,7 +494,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job ) /* Create an absolute URL for download */ -KURL ArchiveDialog::getAbsoluteURL(const KURL& _url, const QString& _link) +KURL ArchiveDialog::getAbsoluteURL(const KURL& _url, const TQString& _link) { // Does all the magic for me return KURL(_url, _link); @@ -502,31 +502,31 @@ KURL ArchiveDialog::getAbsoluteURL(const KURL& _url, const QString& _link) /* Adds an id to a fileName to make it unique relative to the Tar-Ball */ -QString ArchiveDialog::getUniqueFileName(const QString& fileName) +TQString ArchiveDialog::getUniqueFileName(const TQString& fileName) { // Name clash -> add unique id static int id=2; - QString uniqueFileName(fileName); + TQString uniqueFileName(fileName); #ifdef DEBUG_WAR kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl; #endif while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName)) - uniqueFileName = QString::number(id++) + fileName; + uniqueFileName = TQString::number(id++) + fileName; return uniqueFileName; } /* Search for Images in CSS, extract them and adjust CSS */ -QString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const QString& string) +TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& string) { #ifdef DEBUG_WAR kdDebug () << "analyzeInternalCSS" << endl; #endif - QString str(string); + TQString str(string); int pos = 0; int startUrl = 0; int endUrl = 0; @@ -543,7 +543,7 @@ QString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const QString& strin endUrl = pos; if (str[pos-1]=='"' || str[pos-1]=='\'') // CSS 'feature' endUrl--; - QString url = str.mid(startUrl, endUrl-startUrl); + TQString url = str.mid(startUrl, endUrl-startUrl); #ifdef DEBUG_WAR kdDebug () << "url: " << url << endl; diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h index 1dc5ff8..fd007b6 100644 --- a/konq-plugins/webarchiver/archivedialog.h +++ b/konq-plugins/webarchiver/archivedialog.h @@ -27,9 +27,9 @@ #include <ktempfile.h> #include <kio/job.h> -#include <qstring.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqvaluelist.h> class QWidget; class KHTMLPart; @@ -43,7 +43,7 @@ class ArchiveDialog : public KDialogBase { Q_OBJECT public: - ArchiveDialog(QWidget *parent, const QString &targetFilename, KHTMLPart *part); + ArchiveDialog(TQWidget *parent, const TQString &targetFilename, KHTMLPart *part); ~ArchiveDialog(); void archive(); @@ -52,27 +52,27 @@ public slots: void finishedDownloadingURL( KIO::Job *job ); void setSavingState(); protected: - void saveFile( const QString& fileName); - void saveToArchive(QTextStream* _textStream); + void saveFile( const TQString& fileName); + void saveToArchive(TQTextStream* _textStream); void saveArchiveRecursive(const DOM::Node &node, const KURL& baseURL, - QTextStream* _textStream, int ident); - QString handleLink(const KURL& _url, const QString & _link); - KURL getAbsoluteURL(const KURL& _url, const QString& _link); - QString getUniqueFileName(const QString& fileName); - QString stringToHTML(const QString& string); - QString analyzeInternalCSS(const KURL& _url, const QString& string); + TQTextStream* _textStream, int ident); + TQString handleLink(const KURL& _url, const TQString & _link); + KURL getAbsoluteURL(const KURL& _url, const TQString& _link); + TQString getUniqueFileName(const TQString& fileName); + TQString stringToHTML(const TQString& string); + TQString analyzeInternalCSS(const KURL& _url, const TQString& string); void downloadNext(); ArchiveViewBase *m_widget; - QMap<QString, QString> m_downloadedURLDict; - QMap<QString, QString> m_linkDict; + TQMap<TQString, TQString> m_downloadedURLDict; + TQMap<TQString, TQString> m_linkDict; KTar* m_tarBall; bool m_bPreserveWS; - QListViewItem *m_currentLVI; + TQListViewItem *m_currentLVI; unsigned int m_iterator; enum State { Retrieving=0, Downloading, Saving }; State m_state; - QValueList <KURL>m_urlsToDownload; + TQValueList <KURL>m_urlsToDownload; KTempFile *m_tmpFile; KURL m_url; DOM::Document m_document; diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index 81dc9ba..c76f56c 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -29,8 +29,8 @@ //#define DEBUG_WAR -#include <qdir.h> -#include <qfile.h> +#include <tqdir.h> +#include <tqfile.h> #include <kaction.h> #include <kinstance.h> @@ -50,13 +50,13 @@ typedef KGenericFactory<PluginWebArchiver> PluginWebArchiverFactory; K_EXPORT_COMPONENT_FACTORY( libwebarchiverplugin, PluginWebArchiverFactory( "webarchiver" ) ) -PluginWebArchiver::PluginWebArchiver( QObject* parent, const char* name, - const QStringList & ) +PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ) { (void) new KAction( i18n("Archive &Web Page..."), "webarchiver", 0, - this, SLOT(slotSaveToArchive()), + this, TQT_SLOT(slotSaveToArchive()), actionCollection(), "archivepage" ); } @@ -71,7 +71,7 @@ void PluginWebArchiver::slotSaveToArchive() return; KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); - QString archiveName = QString::fromUtf8(part->htmlDocument().title().string().utf8()); + TQString archiveName = TQString::fromUtf8(part->htmlDocument().title().string().utf8()); if (archiveName.isEmpty()) archiveName = i18n("Untitled"); @@ -83,7 +83,7 @@ void PluginWebArchiver::slotSaveToArchive() archiveName.replace( "?", ""); archiveName.replace( ":", ""); archiveName.replace( "/", ""); - archiveName = archiveName.replace( QRegExp("\\s+"), "_"); + archiveName = archiveName.replace( TQRegExp("\\s+"), "_"); archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ; @@ -93,16 +93,16 @@ void PluginWebArchiver::slotSaveToArchive() if (url.isEmpty()) { return; } if (!(url.isValid())) { - const QString title = i18n( "Invalid URL" ); - const QString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL()); + const TQString title = i18n( "Invalid URL" ); + const TQString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL()); KMessageBox::sorry(part->widget(), text, title ); return; } - const QFile file(url.path()); + const TQFile file(url.path()); if (file.exists()) { - const QString title = i18n( "File Exists" ); - const QString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL()); + const TQString title = i18n( "File Exists" ); + const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL()); if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) { return; } diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h index 2353fe1..530e15b 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.h +++ b/konq-plugins/webarchiver/plugin_webarchiver.h @@ -30,8 +30,8 @@ class PluginWebArchiver : public KParts::Plugin Q_OBJECT public: - PluginWebArchiver( QObject* parent, const char* name, - const QStringList & ); + PluginWebArchiver( TQObject* parent, const char* name, + const TQStringList & ); virtual ~PluginWebArchiver(); public slots: diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp index cba7f18..1ffd242 100644 --- a/konq-plugins/webarchiver/webarchivecreator.cpp +++ b/konq-plugins/webarchiver/webarchivecreator.cpp @@ -21,9 +21,9 @@ #include <time.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqpainter.h> #include <kapplication.h> #include <khtml_part.h> @@ -48,12 +48,12 @@ WebArchiveCreator::~WebArchiveCreator() delete m_html; } -bool WebArchiveCreator::create(const QString &path, int width, int height, QImage &img) +bool WebArchiveCreator::create(const TQString &path, int width, int height, TQImage &img) { if (!m_html) { m_html = new KHTMLPart; - connect(m_html, SIGNAL(completed()), SLOT(slotCompleted())); + connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted())); m_html->setJScriptEnabled(false); m_html->setJavaEnabled(false); m_html->setPluginsEnabled(false); @@ -70,8 +70,8 @@ bool WebArchiveCreator::create(const QString &path, int width, int height, QImag killTimers(); // render the HTML page on a bigger pixmap and use smoothScale, - // looks better than directly scaling with the QPainter (malte) - QPixmap pix; + // looks better than directly scaling with the TQPainter (malte) + TQPixmap pix; if (width > 400 || height > 600) { if (height * 3 > width * 4) @@ -82,14 +82,14 @@ bool WebArchiveCreator::create(const QString &path, int width, int height, QImag else pix.resize(400, 600); // light-grey background, in case loadind the page failed - pix.fill( QColor( 245, 245, 245 ) ); + pix.fill( TQColor( 245, 245, 245 ) ); int borderX = pix.width() / width, borderY = pix.height() / height; - QRect rc(borderX, borderY, pix.width() - borderX * 2, pix.height() - borderY * + TQRect rc(borderX, borderY, pix.width() - borderX * 2, pix.height() - borderY * 2); - QPainter p; + TQPainter p; p.begin(&pix); m_html->paint(&p, rc); p.end(); @@ -98,7 +98,7 @@ bool WebArchiveCreator::create(const QString &path, int width, int height, QImag return true; } -void WebArchiveCreator::timerEvent(QTimerEvent *) +void WebArchiveCreator::timerEvent(TQTimerEvent *) { m_html->closeURL(); m_completed = true; diff --git a/konq-plugins/webarchiver/webarchivecreator.h b/konq-plugins/webarchiver/webarchivecreator.h index eae653b..8806390 100644 --- a/konq-plugins/webarchiver/webarchivecreator.h +++ b/konq-plugins/webarchiver/webarchivecreator.h @@ -26,17 +26,17 @@ class KHTMLPart; -class WebArchiveCreator : public QObject, public ThumbCreator +class WebArchiveCreator : public TQObject, public ThumbCreator { Q_OBJECT public: WebArchiveCreator(); virtual ~WebArchiveCreator(); - virtual bool create(const QString &path, int width, int height, QImage &img); + virtual bool create(const TQString &path, int width, int height, TQImage &img); virtual Flags flags() const; protected: - virtual void timerEvent(QTimerEvent *); + virtual void timerEvent(TQTimerEvent *); private slots: void slotCompleted(); diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index 801b18c..4ac8e9c 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -26,7 +26,7 @@ #include <klistviewsearchline.h> #include <klocale.h> -#include <qsplitter.h> +#include <tqsplitter.h> #include "ksig.h" #include "siglistviewitem.h" @@ -36,7 +36,7 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -KSig::KSig(QWidget *parent, const char *name) : KMainWindow(parent, name), +KSig::KSig(TQWidget *parent, const char *name) : KMainWindow(parent, name), changed(false) { setupActions(); @@ -63,23 +63,23 @@ KSig::~KSig() void KSig::setupActions() { - KStdAction::openNew(this, SLOT(add()), actionCollection()); - new KAction(i18n("Remove"), "editdelete", 0, this, SLOT(remove()), actionCollection(), "remove"); - KStdAction::save(this, SLOT(save()), actionCollection()); - KStdAction::quit(this, SLOT(quit()), actionCollection()); - - KStdAction::cut(kapp, SLOT(cut()), actionCollection()); - KStdAction::copy(kapp, SLOT(copy()), actionCollection()); - KStdAction::paste(kapp, SLOT(paste()), actionCollection()); - new KAction(i18n("C&lear"), "editclear", 0, kapp, SLOT(clear()), actionCollection(), "clear"); - - new KAction(i18n("Edit Standard Header"), 0, 0, this, SLOT(editHeader()), actionCollection(), "editHeader"); - new KAction(i18n("Edit Standard Footer"), 0, 0, this, SLOT(editFooter()), actionCollection(), "editFooter"); + 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"); } void KSig::setupLayout() { - splitter = new QSplitter(Qt::Vertical, this); + splitter = new TQSplitter(Qt::Vertical, this); setCentralWidget(splitter); @@ -96,9 +96,9 @@ void KSig::setupLayout() statusBar()->show(); updateListLock = false; - connect(sigEdit, SIGNAL(textChanged()), this, SLOT(updateList())); - connect(sigList, SIGNAL(selectionChanged()), this, SLOT(updateEdit())); - connect(sigEdit, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(updateStatus(int,int))); + 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))); } void KSig::setupSearchLine() @@ -132,7 +132,7 @@ void KSig::readConfig() { KConfigGroupSaver saver(config, "Settings"); if(splitter) { - QValueList<int> sizes; + TQValueList<int> sizes; sizes.append(config->readNumEntry("ListSize", -1)); sizes.append(config->readNumEntry("EditSize", -1)); @@ -152,7 +152,7 @@ void KSig::writeConfig() { KConfigGroupSaver saver(config, "Settings"); if(splitter) { - QValueList<int> sizes = splitter->sizes(); + TQValueList<int> sizes = splitter->sizes(); config->writeEntry("ListSize", sizes[0]); config->writeEntry("EditSize", sizes[1]); @@ -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?"),QString::null,KStdGuiItem::save(),KStdGuiItem::discard()); + int saveChanges = KMessageBox::questionYesNoCancel(this, i18n("Do you want to save your changes before exiting?"),TQString::null,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(QString::null, true, true)); + setCaption(kapp->makeStdCaption(TQString::null, true, true)); else - setCaption(kapp->makeStdCaption(QString::null, true, false)); + setCaption(kapp->makeStdCaption(TQString::null, true, false)); } void KSig::editHeader() @@ -222,7 +222,7 @@ void KSig::editHeader() t->setLabel(i18n("Standard signature header:")); t->setText(header); - connect(t, SIGNAL(textUpdated(const QString &)), this, SLOT(setHeader(const QString &))); + connect(t, TQT_SIGNAL(textUpdated(const TQString &)), 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, SIGNAL(textUpdated(const QString &)), this, SLOT(setFooter(const QString &))); + connect(t, TQT_SIGNAL(textUpdated(const TQString &)), this, TQT_SLOT(setFooter(const TQString &))); t->exec(); } diff --git a/ksig/ksig.h b/ksig/ksig.h index 0598f10..7729ffa 100644 --- a/ksig/ksig.h +++ b/ksig/ksig.h @@ -30,7 +30,7 @@ class KSig : public KMainWindow Q_OBJECT public: - KSig(QWidget *parent = 0, const char *name = 0); + KSig(TQWidget *parent = 0, const char *name = 0); virtual ~KSig(); private: @@ -54,18 +54,18 @@ private slots: void editHeader(); void editFooter(); - void setHeader(const QString &text) { header = text; writeConfig(); } - void setFooter(const QString &text) { footer = text; writeConfig(); } + void setHeader(const TQString &text) { header = text; writeConfig(); } + void setFooter(const TQString &text) { footer = text; writeConfig(); } void updateList(); void updateEdit(); void updateStatus(int line, int column); private: - QString header; - QString footer; + TQString header; + TQString footer; - QSplitter *splitter; + TQSplitter *splitter; SigListView *sigList; KTextEdit *sigEdit; bool updateListLock; diff --git a/ksig/main.cpp b/ksig/main.cpp index 0017f00..96aae13 100644 --- a/ksig/main.cpp +++ b/ksig/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) KApplication a(false, false); SigGenerator generator; - QTextStream output(stdout, IO_WriteOnly); + TQTextStream output(stdout, IO_WriteOnly); if(args->isSet("random")) output << generator.random(); else if(args->isSet("daily")) diff --git a/ksig/siggenerator.cpp b/ksig/siggenerator.cpp index b232cb3..abd2430 100644 --- a/ksig/siggenerator.cpp +++ b/ksig/siggenerator.cpp @@ -23,13 +23,13 @@ #include <kconfig.h> #include <kdebug.h> -#include <qfile.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqdatetime.h> SigGenerator::SigGenerator() { - QString dir = KGlobal::dirs()->saveLocation("appdata"); - QFile file(dir + "sigs.sigml"); + TQString dir = KGlobal::dirs()->saveLocation("appdata"); + TQFile file(dir + "sigs.sigml"); if(file.open(IO_ReadOnly) && doc.setContent(&file)) { signatures = doc.elementsByTagName("signature"); @@ -50,33 +50,33 @@ SigGenerator::~SigGenerator() } -QString SigGenerator::random() const +TQString SigGenerator::random() const { if(signatures.count() <= 0) - return(QString::null); + return(TQString::null); int i = KApplication::random() % signatures.count(); - QString text; + TQString text; SigListViewItem::nodeToText(signatures.item(i), text); return attachStandard(text); } -QString SigGenerator::daily() const +TQString SigGenerator::daily() const { if(signatures.count() <= 0) - return(QString::null); + return(TQString::null); - QDate date; + TQDate date; int i = date.dayOfYear() % signatures.count(); - QString text; + TQString text; SigListViewItem::nodeToText(signatures.item(i), text); return attachStandard(text); } -QString SigGenerator::attachStandard(const QString &text) const +TQString SigGenerator::attachStandard(const TQString &text) const { - QString s = text; + TQString s = text; if(!header.isEmpty()) s = header + "\n" + s; diff --git a/ksig/siggenerator.h b/ksig/siggenerator.h index a2c429d..a5cb707 100644 --- a/ksig/siggenerator.h +++ b/ksig/siggenerator.h @@ -18,8 +18,8 @@ #ifndef SIGGENERATOR_H #define SIGGENERATOR_H -#include <qstring.h> -#include <qdom.h> +#include <tqstring.h> +#include <tqdom.h> class SigGenerator { @@ -27,17 +27,17 @@ public: SigGenerator(); ~SigGenerator(); - QString random() const; - QString daily() const; + TQString random() const; + TQString daily() const; private: - QString attachStandard(const QString &text) const; + TQString attachStandard(const TQString &text) const; - QDomDocument doc; - QDomNodeList signatures; - QString header; - QString footer; + TQDomDocument doc; + TQDomNodeList signatures; + TQString header; + TQString footer; }; #endif diff --git a/ksig/siglistview.cpp b/ksig/siglistview.cpp index d212478..4bbc693 100644 --- a/ksig/siglistview.cpp +++ b/ksig/siglistview.cpp @@ -29,7 +29,7 @@ SigListView *SigListView::listView = 0; // public members //////////////////////////////////////////////////////////////////////////////// -SigListView *SigListView::instance(QWidget *parent, const char *name) +SigListView *SigListView::instance(TQWidget *parent, const char *name) { if(!listView) listView = new SigListView(parent, name); @@ -41,7 +41,7 @@ void SigListView::load() if(file.open(IO_ReadOnly) && doc.setContent(&file)) { // find the root element - QDomNodeList topLevelElements = doc.childNodes(); + TQDomNodeList topLevelElements = doc.childNodes(); uint i = 0; while(topLevelElements.item(i).toElement().tagName() != "SigML" && i < topLevelElements.count()) i++; @@ -55,7 +55,7 @@ void SigListView::load() doc.appendChild(rootElement); } - QDomNodeList signatures = doc.elementsByTagName("signature"); + TQDomNodeList signatures = doc.elementsByTagName("signature"); for(i = 0; i < signatures.count(); i++) (void) new SigListViewItem(this, doc, signatures.item(i).toElement()); @@ -70,7 +70,7 @@ void SigListView::load() void SigListView::save() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while(it.current()) { SigListViewItem *item = dynamic_cast<SigListViewItem *>(it.current()); if(item) @@ -79,7 +79,7 @@ void SigListView::save() } if(file.open(IO_WriteOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); stream << doc; file.close(); } @@ -87,7 +87,7 @@ void SigListView::save() SigListViewItem *SigListView::createItem() { - QDomElement element = doc.createElement("signature"); + TQDomElement element = doc.createElement("signature"); rootElement.appendChild(element); SigListViewItem *item = new SigListViewItem(this, doc, element); @@ -108,11 +108,11 @@ const SigListViewItem *SigListView::currentItem() const // protected members //////////////////////////////////////////////////////////////////////////////// -SigListView::SigListView(QWidget *parent, const char *name) : KListView(parent, name) +SigListView::SigListView(TQWidget *parent, const char *name) : KListView(parent, name) { addColumn(i18n("Signatures")); - QString dir = KGlobal::dirs()->saveLocation("appdata"); + TQString dir = KGlobal::dirs()->saveLocation("appdata"); if(!dir.isNull()) file.setName(dir + "sigs.sigml"); load(); diff --git a/ksig/siglistview.h b/ksig/siglistview.h index 553d86c..9e03c5e 100644 --- a/ksig/siglistview.h +++ b/ksig/siglistview.h @@ -21,8 +21,8 @@ #include <klistview.h> #include <kdebug.h> -#include <qfile.h> -#include <qdom.h> +#include <tqfile.h> +#include <tqdom.h> class SigListViewItem; @@ -38,7 +38,7 @@ class SigListView : public KListView { Q_OBJECT public: - static SigListView *instance(QWidget *parent = 0, const char *name = 0); + static SigListView *instance(TQWidget *parent = 0, const char *name = 0); void load(); void save(); @@ -57,15 +57,15 @@ public slots: void clear() {} protected: - SigListView(QWidget *parent = 0, const char *name = 0); + SigListView(TQWidget *parent = 0, const char *name = 0); virtual ~SigListView(); private: static SigListView *listView; - QFile file; - QDomDocument doc; - QDomElement rootElement; + TQFile file; + TQDomDocument doc; + TQDomElement rootElement; }; #endif diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp index 6744f87..0442c2e 100644 --- a/ksig/siglistviewitem.cpp +++ b/ksig/siglistviewitem.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kdebug.h> -#include <qregexp.h> +#include <tqregexp.h> //////////////////////////////////////////////////////////////////////////////// // public members @@ -32,12 +32,12 @@ SigListViewItem::~SigListViewItem() element.parentNode().removeChild(element); } -QString SigListViewItem::text() const +TQString SigListViewItem::text() const { return(elementText); } -void SigListViewItem::setText(const QString &t) +void SigListViewItem::setText(const TQString &t) { if(t != elementText) { elementText = t; @@ -54,9 +54,9 @@ void SigListViewItem::refreshText() KListViewItem::setText(0, emptySigString); } -void SigListViewItem::nodeToText(const QDomNode &n, QString &s) +void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) { - QDomNodeList children = n.childNodes(); + TQDomNodeList children = n.childNodes(); for(uint i = 0; i < children.count(); i++) { if(children.item(i).isText()) @@ -74,14 +74,14 @@ void SigListViewItem::nodeToText(const QDomNode &n, QString &s) // private members //////////////////////////////////////////////////////////////////////////////// -SigListViewItem::SigListViewItem(QListView *parent, QDomDocument document, QDomElement signatureElement) : KListViewItem(parent) +SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement) : KListViewItem(parent) { emptySigString = i18n("<empty signature>"); doc = document; element = signatureElement; nodeToText(element, elementText); - elementText.replace(QRegExp("\n$"), ""); + elementText.replace(TQRegExp("\n$"), ""); dirty = false; refreshText(); @@ -90,16 +90,16 @@ SigListViewItem::SigListViewItem(QListView *parent, QDomDocument document, QDomE void SigListViewItem::render() { if(dirty) { - QDomNodeList children = element.childNodes(); + TQDomNodeList children = element.childNodes(); while(!element.firstChild().isNull()) element.removeChild(element.firstChild()); // create new children - QStringList lines = QStringList::split("\n", elementText, true); + TQStringList lines = TQStringList::split("\n", elementText, true); - for(QStringList::Iterator it = lines.begin(); it != lines.end(); it++) { - QDomElement p = doc.createElement("p"); + for(TQStringList::Iterator it = lines.begin(); it != lines.end(); it++) { + TQDomElement p = doc.createElement("p"); element.appendChild(p); p.appendChild(doc.createTextNode(*it)); } diff --git a/ksig/siglistviewitem.h b/ksig/siglistviewitem.h index f3a6814..2b51edd 100644 --- a/ksig/siglistviewitem.h +++ b/ksig/siglistviewitem.h @@ -20,18 +20,18 @@ #include "siglistview.h" -#include <qdom.h> +#include <tqdom.h> class SigListViewItem : public KListViewItem { friend class SigListView; public: virtual ~SigListViewItem(); - void setText(const QString &t); - QString text() const; + void setText(const TQString &t); + TQString text() const; void refreshText(); - static void nodeToText(const QDomNode &n, QString &s); + static void nodeToText(const TQDomNode &n, TQString &s); private: /** @@ -39,18 +39,18 @@ private: * created using SigListView::createItem(). This is accessible to * SigListView because SigListView is a friend class. */ - SigListViewItem(QListView *parent, QDomDocument document, QDomElement signatureElement); + SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement); /** * Renders the data back to the DOM element. */ void render(); - QString emptySigString; + TQString emptySigString; - QDomDocument doc; - QDomElement element; - QString elementText; + TQDomDocument doc; + TQDomElement element; + TQString elementText; bool dirty; }; diff --git a/ksig/standardtext.cpp b/ksig/standardtext.cpp index 7c21e67..3800eef 100644 --- a/ksig/standardtext.cpp +++ b/ksig/standardtext.cpp @@ -16,11 +16,11 @@ #include <ktextedit.h> -#include <qlabel.h> +#include <tqlabel.h> #include "standardtext.h" -StandardText::StandardText(QWidget *parent, const char *name, bool modal, WFlags fl) : StandardTextBase(parent, name, modal, fl) +StandardText::StandardText(TQWidget *parent, const char *name, bool modal, WFlags fl) : StandardTextBase(parent, name, modal, fl) { } @@ -30,19 +30,19 @@ StandardText::~StandardText() } -void StandardText::setLabel(const QString &text) +void StandardText::setLabel(const TQString &text) { label->setText(text); } -void StandardText::setText(const QString &text) +void StandardText::setText(const TQString &text) { textEdit->setText(text); } void StandardText::done(int r) { - if(r == QDialog::Accepted) + if(r == TQDialog::Accepted) emit textUpdated(textEdit->text()); StandardTextBase::done(r); diff --git a/ksig/standardtext.h b/ksig/standardtext.h index dfa8b8c..3ad2120 100644 --- a/ksig/standardtext.h +++ b/ksig/standardtext.h @@ -23,14 +23,14 @@ class StandardText : public StandardTextBase { Q_OBJECT public: - StandardText(QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); + StandardText(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); virtual ~StandardText(); - void setLabel(const QString &text); - void setText(const QString &text); + void setLabel(const TQString &text); + void setText(const TQString &text); signals: - void textUpdated(const QString &); + void textUpdated(const TQString &); private slots: virtual void done(int r); diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp index 3eac84d..72b6d9d 100644 --- a/noatun-plugins/alarm/kminutespinbox.cpp +++ b/noatun-plugins/alarm/kminutespinbox.cpp @@ -23,19 +23,19 @@ #include "kminutespinbox.h" -KMinuteSpinBox::KMinuteSpinBox(int _step, QWidget *_parent, const char *_name) - : QSpinBox(0, 59, _step, _parent, _name) +KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name) + : TQSpinBox(0, 59, _step, _parent, _name) { setButtonSymbols(PlusMinus); setWrapping(true); } -QString KMinuteSpinBox::mapValueToText(int v) +TQString KMinuteSpinBox::mapValueToText(int v) { if(v < 10) - return QString("0%1").arg(v); + return TQString("0%1").arg(v); else - return QString::number(v); + return TQString::number(v); } #include "kminutespinbox.moc" diff --git a/noatun-plugins/alarm/kminutespinbox.h b/noatun-plugins/alarm/kminutespinbox.h index 14e2c4f..701caad 100644 --- a/noatun-plugins/alarm/kminutespinbox.h +++ b/noatun-plugins/alarm/kminutespinbox.h @@ -24,15 +24,15 @@ #ifndef KMINUTESPINBOX_H #define KMINUTESPINBOX_H -#include <qspinbox.h> +#include <tqspinbox.h> class KMinuteSpinBox : public QSpinBox { Q_OBJECT public: - KMinuteSpinBox(int _step = 1, QWidget *_parent = 0, const char *_name = 0); + KMinuteSpinBox(int _step = 1, TQWidget *_parent = 0, const char *_name = 0); protected: - virtual QString mapValueToText(int v); + virtual TQString mapValueToText(int v); }; #endif diff --git a/noatun-plugins/alarm/kpercentspinbox.cpp b/noatun-plugins/alarm/kpercentspinbox.cpp index 32b5820..3b16c97 100644 --- a/noatun-plugins/alarm/kpercentspinbox.cpp +++ b/noatun-plugins/alarm/kpercentspinbox.cpp @@ -16,20 +16,20 @@ #include "kpercentspinbox.h" -KPercentSpinBox::KPercentSpinBox(int _step, QWidget *_parent, const char *_name) - : QSpinBox(0, 100, _step, _parent, _name) +KPercentSpinBox::KPercentSpinBox(int _step, TQWidget *_parent, const char *_name) + : TQSpinBox(0, 100, _step, _parent, _name) { setButtonSymbols(PlusMinus); } -QString KPercentSpinBox::mapValueToText(int v) +TQString KPercentSpinBox::mapValueToText(int v) { - return QString::number(v)+'%'; + return TQString::number(v)+'%'; } #if 0 int KPercentSpinBox::mapTextToValue(bool *ok) { - QString mapText= text(); + TQString mapText= text(); // mapText.truncate(mapText.length()-1); return mapText.toInt(ok); diff --git a/noatun-plugins/alarm/kpercentspinbox.h b/noatun-plugins/alarm/kpercentspinbox.h index abcdd49..7f1a3a2 100644 --- a/noatun-plugins/alarm/kpercentspinbox.h +++ b/noatun-plugins/alarm/kpercentspinbox.h @@ -17,16 +17,16 @@ #ifndef KPERCENT_SPINBOX_H #define KPERCENT_SPINBOX_H -#include <qspinbox.h> +#include <tqspinbox.h> class KPercentSpinBox : public QSpinBox { Q_OBJECT public: - KPercentSpinBox (int _step=1, QWidget *_parent=0, const char *name=0); + KPercentSpinBox (int _step=1, TQWidget *_parent=0, const char *name=0); protected: - virtual QString mapValueToText(int v); + virtual TQString mapValueToText(int v); // virtual int mapTextToValue(bool *ok); }; diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index 648d3e3..58c478c 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -20,17 +20,17 @@ #include <noatun/app.h> #include <klocale.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qspinbox.h> -#include <qtimer.h> -#include <qdatetime.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqspinbox.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqwhatsthis.h> #include <kiconloader.h> #include <kconfig.h> @@ -47,7 +47,7 @@ extern "C" Plugin *create_plugin() Wakeup *Wakeup::wakeme = 0; -Wakeup::Wakeup() : QObject(), Plugin() +Wakeup::Wakeup() : TQObject(), Plugin() { wakeme = this; @@ -56,8 +56,8 @@ Wakeup::Wakeup() : QObject(), Plugin() update(); - QTimer *timer=new QTimer(this); - connect (timer,SIGNAL(timeout()),SLOT(slotCheckTime())); + TQTimer *timer=new TQTimer(this); + connect (timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotCheckTime())); timer->start(60000,false); } @@ -100,11 +100,11 @@ void Wakeup::update() void Wakeup::slotCheckTime() { - QTime t; - QDate d; + TQTime t; + TQDate d; - t=QTime::currentTime(); - d=QDate::currentDate(); + t=TQTime::currentTime(); + d=TQDate::currentDate(); if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return; @@ -125,8 +125,8 @@ void Wakeup::PlayerAct() if (!napp->player()->isPlaying() && modeAlarm!=2) napp->player()->play(); // timer for volume (up/down) according to prefs :-) - volTimer = new QTimer (this); - connect (volTimer,SIGNAL(timeout()), SLOT(slotVolumeChange())); + volTimer = new TQTimer (this); + connect (volTimer,TQT_SIGNAL(timeout()), TQT_SLOT(slotVolumeChange())); volTimer->start(1000,false); // updates volume every seconds @@ -165,52 +165,52 @@ void Wakeup::slotVolumeChange() /////////////////////////////////////////////////////////////////// // Prefs CModule /////////////////////////////////////////////////////////////////// -WakeupPrefs::WakeupPrefs( QObject *parent ) : +WakeupPrefs::WakeupPrefs( TQObject *parent ) : CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent ) { - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QGridLayout *grid = new QGridLayout (layout,8,4); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout (layout,8,4); - monday=new QCheckBox(i18n("Monday"),this); - tuesday=new QCheckBox(i18n("Tuesday"),this); - wednesday=new QCheckBox(i18n("Wednesday"),this); - thursday=new QCheckBox(i18n("Thursday"),this); - friday=new QCheckBox(i18n("Friday"),this); - saturday=new QCheckBox(i18n("Saturday"),this); - sunday=new QCheckBox(i18n("Sunday"),this); - hour1 = new QSpinBox(0, 23, 1, this , "Hour1"); - hour1->setButtonSymbols(QSpinBox::PlusMinus); + monday=new TQCheckBox(i18n("Monday"),this); + tuesday=new TQCheckBox(i18n("Tuesday"),this); + wednesday=new TQCheckBox(i18n("Wednesday"),this); + thursday=new TQCheckBox(i18n("Thursday"),this); + friday=new TQCheckBox(i18n("Friday"),this); + saturday=new TQCheckBox(i18n("Saturday"),this); + sunday=new TQCheckBox(i18n("Sunday"),this); + hour1 = new TQSpinBox(0, 23, 1, this , "Hour1"); + hour1->setButtonSymbols(TQSpinBox::PlusMinus); minute1 = new KMinuteSpinBox(1, this , "Minute1"); - hour2 = new QSpinBox(0, 23, 1, this, "Hour2"); - hour2->setButtonSymbols(QSpinBox::PlusMinus); + hour2 = new TQSpinBox(0, 23, 1, this, "Hour2"); + hour2->setButtonSymbols(TQSpinBox::PlusMinus); minute2 = new KMinuteSpinBox(1, this, "Minute2"); - hour3 = new QSpinBox(0, 23, 1, this, "Hour3"); - hour3->setButtonSymbols(QSpinBox::PlusMinus); + hour3 = new TQSpinBox(0, 23, 1, this, "Hour3"); + hour3->setButtonSymbols(TQSpinBox::PlusMinus); minute3 = new KMinuteSpinBox(1, this, "Minute3"); - hour4 = new QSpinBox(0, 23, 1, this, "Hour4"); - hour4->setButtonSymbols(QSpinBox::PlusMinus); + hour4 = new TQSpinBox(0, 23, 1, this, "Hour4"); + hour4->setButtonSymbols(TQSpinBox::PlusMinus); minute4 = new KMinuteSpinBox(1, this, "Minute4"); - hour5 = new QSpinBox(0, 23, 1, this, "Hour5"); - hour5->setButtonSymbols(QSpinBox::PlusMinus); + hour5 = new TQSpinBox(0, 23, 1, this, "Hour5"); + hour5->setButtonSymbols(TQSpinBox::PlusMinus); minute5 = new KMinuteSpinBox(1, this, "Minute5"); - hour6 = new QSpinBox(0, 23, 1, this, "Hour6"); - hour6->setButtonSymbols(QSpinBox::PlusMinus); + hour6 = new TQSpinBox(0, 23, 1, this, "Hour6"); + hour6->setButtonSymbols(TQSpinBox::PlusMinus); minute6 = new KMinuteSpinBox(1, this, "Minute6"); - hour7 = new QSpinBox(0, 23, 1, this, "Hour7"); - hour7->setButtonSymbols(QSpinBox::PlusMinus); + hour7 = new TQSpinBox(0, 23, 1, this, "Hour7"); + hour7->setButtonSymbols(TQSpinBox::PlusMinus); minute7 = new KMinuteSpinBox(1, this, "Minute7"); - QLabel *selectday = new QLabel (i18n("Select days:"),this); - QLabel *choosehour = new QLabel (i18n("Hour"),this); - QLabel *choosemin = new QLabel (i18n("Minute"),this); + 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); - applyall = new QPushButton (this,"applyall"); + applyall = new TQPushButton (this,"applyall"); applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) ); - applyall->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, - QSizePolicy::Fixed, + applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + TQSizePolicy::Fixed, applyall->sizePolicy().hasHeightForWidth()) ); grid->addWidget (applyall,1,3,Qt::AlignLeft); @@ -237,28 +237,28 @@ WakeupPrefs::WakeupPrefs( QObject *parent ) : grid->addWidget (minute7,7,2,Qt::AlignLeft); grid->setColStretch (0,3); - QButtonGroup *modeGroup = new QButtonGroup (3, Qt::Vertical, i18n ("Volume Control"),this); - alarmmode = new QRadioButton (i18n("No change to volume, just starts the player"),modeGroup); - nightmode = new QRadioButton (i18n("The volume decreases slowly and finally stops the player"),modeGroup); - morningmode = new QRadioButton (i18n("The player starts and the volume increases to the chosen value"),modeGroup); + TQButtonGroup *modeGroup = new TQButtonGroup (3, Qt::Vertical, i18n ("Volume Control"),this); + alarmmode = new TQRadioButton (i18n("No change to volume, just starts the player"),modeGroup); + nightmode = new TQRadioButton (i18n("The volume decreases slowly and finally stops the player"),modeGroup); + morningmode = new TQRadioButton (i18n("The player starts and the volume increases to the chosen value"),modeGroup); modeGroup->setExclusive(true); morningmode->setChecked(true); - volFrame = new QFrame (this); - QLabel *volEndLabel = new QLabel (i18n("Volume increases to:"), volFrame); + volFrame = new TQFrame (this); + TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame); volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue"); layout->addWidget(modeGroup); layout->addWidget(volFrame); layout->addStretch(); - QHBoxLayout *volLayout = new QHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); volLayout->addWidget(volEndLabel); volLayout->addWidget(volEndValue); volLayout->addStretch(); - connect (morningmode,SIGNAL(stateChanged(int)),SLOT(slotViewFrame(int))); - connect (applyall,SIGNAL(clicked()),SLOT(slotApplyAll())); + connect (morningmode,TQT_SIGNAL(stateChanged(int)),TQT_SLOT(slotViewFrame(int))); + connect (applyall,TQT_SIGNAL(clicked()),TQT_SLOT(slotApplyAll())); load(); } @@ -310,7 +310,7 @@ void WakeupPrefs::save() config->writeEntry("Minute6",minute6->text()); config->writeEntry("Hour7",hour7->text()); config->writeEntry("Minute7",minute7->text()); - QString val(volEndValue->text()); + TQString val(volEndValue->text()); config->writeEntry("VolumeEnd",val); if (nightmode->isChecked()) config->writeEntry("ModeAlarm",2); @@ -349,7 +349,7 @@ void WakeupPrefs::load() hour7->setValue(KGlobal::config()->readNumEntry("Hour7",7)); minute7->setValue(KGlobal::config()->readNumEntry("Minute7",0)); - QString volend(KGlobal::config()->readEntry("VolumeEnd","80%")); + TQString volend(KGlobal::config()->readEntry("VolumeEnd","80%")); volend.truncate(volend.length()-1); volEndValue->setValue(volend.toInt()); diff --git a/noatun-plugins/alarm/wakeup.h b/noatun-plugins/alarm/wakeup.h index e2992a8..65dc644 100644 --- a/noatun-plugins/alarm/wakeup.h +++ b/noatun-plugins/alarm/wakeup.h @@ -20,16 +20,16 @@ #include <noatun/pref.h> #include <noatun/plugin.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qpushbutton.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqpushbutton.h> class QSpinBox; class QCheckBox; class KMinuteSpinBox; class KPercentSpinBox; -class Wakeup : public QObject, public Plugin +class Wakeup : public TQObject, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -46,12 +46,12 @@ public slots: void slotCheckTime(); private: - QStringList *day_list; -// QString songlist; + TQStringList *day_list; +// TQString songlist; int hour[7]; int minute[7]; bool days[7]; - QTimer *volTimer; + TQTimer *volTimer; int volEndVal; int modeAlarm; }; @@ -62,7 +62,7 @@ class WakeupPrefs : public CModule Q_OBJECT public: - WakeupPrefs( QObject *parent ); + WakeupPrefs( TQObject *parent ); virtual void save(); virtual void load(); public slots: @@ -70,13 +70,13 @@ public slots: void slotApplyAll(); private: - QCheckBox *monday; - QCheckBox *tuesday; - QCheckBox *wednesday; - QCheckBox *thursday; - QCheckBox *friday; - QCheckBox *saturday; - QCheckBox *sunday; + TQCheckBox *monday; + TQCheckBox *tuesday; + TQCheckBox *wednesday; + TQCheckBox *thursday; + TQCheckBox *friday; + TQCheckBox *saturday; + TQCheckBox *sunday; KMinuteSpinBox *minute1; KMinuteSpinBox *minute2; KMinuteSpinBox *minute3; @@ -84,20 +84,20 @@ private: KMinuteSpinBox *minute5; KMinuteSpinBox *minute6; KMinuteSpinBox *minute7; - QSpinBox *hour1; - QSpinBox *hour2; - QSpinBox *hour3; - QSpinBox *hour4; - QSpinBox *hour5; - QSpinBox *hour6; - QSpinBox *hour7; + TQSpinBox *hour1; + TQSpinBox *hour2; + TQSpinBox *hour3; + TQSpinBox *hour4; + TQSpinBox *hour5; + TQSpinBox *hour6; + TQSpinBox *hour7; KPercentSpinBox *volEndValue; - QRadioButton *alarmmode; - QRadioButton *morningmode; - QRadioButton *nightmode; - QFrame *volFrame; - QPushButton *applyall; + TQRadioButton *alarmmode; + TQRadioButton *morningmode; + TQRadioButton *nightmode; + TQFrame *volFrame; + TQPushButton *applyall; }; #endif // WAKEUP_H diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 07c5cfd..6fd02f8 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -24,12 +24,12 @@ #include <kglobal.h> #include <kconfig.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include "configmodule.h" -AlsaPlayerConfigModule::AlsaPlayerConfigModule(QObject * parent) +AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) : CModule ( @@ -39,9 +39,9 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(QObject * parent) parent ) { - scroll_ = new QCheckBox(i18n("Scroll song title"), this); + scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - QVBoxLayout * layout = new QVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(scroll_); diff --git a/noatun-plugins/alsaplayer/configmodule.h b/noatun-plugins/alsaplayer/configmodule.h index 2104fdf..701a699 100644 --- a/noatun-plugins/alsaplayer/configmodule.h +++ b/noatun-plugins/alsaplayer/configmodule.h @@ -33,7 +33,7 @@ class AlsaPlayerConfigModule : public CModule public: - AlsaPlayerConfigModule(QObject *); + AlsaPlayerConfigModule(TQObject *); signals: @@ -46,7 +46,7 @@ class AlsaPlayerConfigModule : public CModule private: - QCheckBox * scroll_; + TQCheckBox * scroll_; }; #endif // ALSAPLAYER_CONFIG_MODULE_H diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index 6ffac8c..606b461 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -20,18 +20,18 @@ * */ -#include <qtimer.h> +#include <tqtimer.h> #include <noatun/app.h> #include <noatun/player.h> #include "seeker.h" -Seeker::Seeker(QWidget * parent, const char * name) +Seeker::Seeker(TQWidget * parent, const char * name) : L33tSlider(0, 1000, 10, 0, Horizontal, parent, name) { - connect(this, SIGNAL(userChanged(int)), SLOT(slotValueChanged(int))); + connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); } Seeker::~Seeker() @@ -52,7 +52,7 @@ void Seeker::slotTimeout() setValue((int)napp->player()->getTime() / 1000 ); } -void Seeker::wheelEvent(QWheelEvent *) +void Seeker::wheelEvent(TQWheelEvent *) { // ignore } diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h index ec5504e..d17a760 100644 --- a/noatun-plugins/alsaplayer/seeker.h +++ b/noatun-plugins/alsaplayer/seeker.h @@ -31,7 +31,7 @@ class Seeker : public L33tSlider public: - Seeker(QWidget * parent, const char * name = 0); + Seeker(TQWidget * parent, const char * name = 0); virtual ~Seeker(); protected slots: @@ -41,7 +41,7 @@ class Seeker : public L33tSlider protected: - void wheelEvent(QWheelEvent *); + void wheelEvent(TQWheelEvent *); private: }; diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 1071736..f329c4f 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -28,11 +28,11 @@ #include <noatun/effects.h> #include <noatun/engine.h> -#include <qtoolbutton.h> -#include <qdragobject.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qframe.h> +#include <tqtoolbutton.h> +#include <tqdragobject.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqframe.h> #include <kstatusbar.h> #include <kpopupmenu.h> @@ -60,92 +60,92 @@ AlsaPlayer::AlsaPlayer() connect ( playlistButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(toggleListView()) + TQT_SLOT(toggleListView()) ); connect ( previousButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(back()) + TQT_SLOT(back()) ); connect ( nextButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(forward()) + TQT_SLOT(forward()) ); connect ( stopButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(stop()) + TQT_SLOT(stop()) ); connect ( playButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(playpause()) + TQT_SLOT(playpause()) ); - connect(napp, SIGNAL(hideYourself()), SLOT(hide())); - connect(napp, SIGNAL(showYourself()), SLOT(show())); + connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); + connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(slotPlayListShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(slotPlayListHidden())); - connect(napp->player(), SIGNAL(playing()), SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(slotPlayListShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(slotPlayListHidden())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused())); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); - connect(napp->player(), SIGNAL(changed()), SLOT(slotTrackChanged())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(slotTrackChanged())); connect ( napp->player(), - SIGNAL(volumeChanged(int)), - SLOT(slotVolumeChanged(int)) + TQT_SIGNAL(volumeChanged(int)), + TQT_SLOT(slotVolumeChanged(int)) ); connect ( new AlsaPlayerConfigModule(this), - SIGNAL(saved()), - SLOT(slotConfigChanged()) + TQT_SIGNAL(saved()), + TQT_SLOT(slotConfigChanged()) ); connect ( volumeSlider, - SIGNAL(valueChanged(int)), + TQT_SIGNAL(valueChanged(int)), napp->player(), - SLOT(setVolume(int)) + TQT_SLOT(setVolume(int)) ); connect ( forwardButton, - SIGNAL(clicked()), - SLOT(slotForward()) + TQT_SIGNAL(clicked()), + TQT_SLOT(slotForward()) ); connect ( pauseButton, - SIGNAL(clicked()), - SLOT(slotPause()) + TQT_SIGNAL(clicked()), + TQT_SLOT(slotPause()) ); - connect(speedSlider, SIGNAL(valueChanged(int)), SLOT(slotSetSpeed(int))); + connect(speedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetSpeed(int))); menuButton->setPopup(NoatunStdAction::ContextMenu::contextMenu()); @@ -165,17 +165,17 @@ AlsaPlayer::~AlsaPlayer() // Empty. } -void AlsaPlayer::closeEvent(QCloseEvent *) +void AlsaPlayer::closeEvent(TQCloseEvent *) { unload(); } -void AlsaPlayer::dragEnterEvent(QDragEnterEvent *event) +void AlsaPlayer::dragEnterEvent(TQDragEnterEvent *event) { event->accept(KURLDrag::canDecode(event)); } -void AlsaPlayer::dropEvent(QDropEvent *event) +void AlsaPlayer::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -185,9 +185,9 @@ void AlsaPlayer::dropEvent(QDropEvent *event) } } -void AlsaPlayer::setTitleText(const QString & s) +void AlsaPlayer::setTitleText(const TQString & s) { - QString titleText + TQString titleText (s.isNull() ? napp->player()->current().title() : s); if (titleLabel->text() != titleText) @@ -196,7 +196,7 @@ void AlsaPlayer::setTitleText(const QString & s) void AlsaPlayer::slotPlaying() { - setTitleText(QString::null); + setTitleText(TQString::null); playButton->setOn(true); stopButton->setEnabled(true); @@ -212,22 +212,22 @@ void AlsaPlayer::slotStopped() void AlsaPlayer::slotPaused() { - setTitleText(QString::null); + setTitleText(TQString::null); stopButton->setEnabled(true); playButton->setOn(false); } -bool AlsaPlayer::eventFilter(QObject *o, QEvent *e) +bool AlsaPlayer::eventFilter(TQObject *o, TQEvent *e) { switch (e->type()) { - case QEvent::MouseButtonPress: - mousePressEvent(static_cast<QMouseEvent *>(e)); + case TQEvent::MouseButtonPress: + mousePressEvent(static_cast<TQMouseEvent *>(e)); break; - case QEvent::Wheel: - wheelEvent(static_cast<QWheelEvent*>(e)); + case TQEvent::Wheel: + wheelEvent(static_cast<TQWheelEvent*>(e)); return true; break; @@ -235,7 +235,7 @@ bool AlsaPlayer::eventFilter(QObject *o, QEvent *e) break; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void AlsaPlayer::slotPlayListShown() @@ -248,7 +248,7 @@ void AlsaPlayer::slotPlayListHidden() playlistButton->setOn(false); } -void AlsaPlayer::mousePressEvent(QMouseEvent * e) +void AlsaPlayer::mousePressEvent(TQMouseEvent * e) { if (e->button() == RightButton) { @@ -256,10 +256,10 @@ void AlsaPlayer::mousePressEvent(QMouseEvent * e) return; } - return QWidget::mousePressEvent(e); + return TQWidget::mousePressEvent(e); } -void AlsaPlayer::wheelEvent(QWheelEvent * e) +void AlsaPlayer::wheelEvent(TQWheelEvent * e) { int newVolume = napp->player()->volume() + (e->delta() / 120); napp->player()->setVolume(newVolume); @@ -272,7 +272,7 @@ void AlsaPlayer::slotConfigChanged() void AlsaPlayer::slotVolumeChanged(int i) { - QString text("%1%"); + TQString text("%1%"); volumeLabel->setText(text.arg(i)); volumeSlider->setValue(i); } @@ -284,9 +284,9 @@ void AlsaPlayer::slotTimeout() if (!napp->player()->current()) return; - setTitleText(QString::null); + setTitleText(TQString::null); - QString lengthText(napp->player()->lengthString()); + TQString lengthText(napp->player()->lengthString()); if (timeLabel->text() != lengthText) timeLabel->setText(lengthText); @@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed) speed_ = newSpeed; pauseButton->setEnabled(0 != speed_); - speedLabel->setText(QString("%1%").arg(speed_)); + speedLabel->setText(TQString("%1%").arg(speed_)); Arts::PlayObject playobject(napp->player()->engine()->playObject()); Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject); diff --git a/noatun-plugins/alsaplayer/userinterface.h b/noatun-plugins/alsaplayer/userinterface.h index 2a97b86..210f16b 100644 --- a/noatun-plugins/alsaplayer/userinterface.h +++ b/noatun-plugins/alsaplayer/userinterface.h @@ -43,7 +43,7 @@ class AlsaPlayer : public APMainWindow, public UserInterface AlsaPlayer(); virtual ~AlsaPlayer(); - void load(const QString & url); + void load(const TQString & url); protected slots: @@ -70,13 +70,13 @@ class AlsaPlayer : public APMainWindow, public UserInterface protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void dragEnterEvent (QDragEnterEvent *); - virtual void dropEvent (QDropEvent *); - virtual void closeEvent (QCloseEvent *); - virtual bool eventFilter (QObject *, QEvent *); - virtual void wheelEvent (QWheelEvent *); - virtual void setTitleText (const QString &); + virtual void mousePressEvent (TQMouseEvent *); + virtual void dragEnterEvent (TQDragEnterEvent *); + virtual void dropEvent (TQDropEvent *); + virtual void closeEvent (TQCloseEvent *); + virtual bool eventFilter (TQObject *, TQEvent *); + virtual void wheelEvent (TQWheelEvent *); + virtual void setTitleText (const TQString &); void loadConfig(); diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp index 0b2e178..3624e0b 100644 --- a/noatun-plugins/charlatan/configmodule.cpp +++ b/noatun-plugins/charlatan/configmodule.cpp @@ -24,12 +24,12 @@ #include <kglobal.h> #include <kconfig.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include "configmodule.h" #include "configmodule.moc" -CharlatanConfigModule::CharlatanConfigModule(QObject * parent) +CharlatanConfigModule::CharlatanConfigModule(TQObject * parent) : CModule ( @@ -39,9 +39,9 @@ CharlatanConfigModule::CharlatanConfigModule(QObject * parent) parent ) { - scroll_ = new QCheckBox(i18n("Scroll song title"), this); + scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - QVBoxLayout * layout = new QVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(scroll_); diff --git a/noatun-plugins/charlatan/configmodule.h b/noatun-plugins/charlatan/configmodule.h index 92b0bf7..b4631da 100644 --- a/noatun-plugins/charlatan/configmodule.h +++ b/noatun-plugins/charlatan/configmodule.h @@ -33,7 +33,7 @@ class CharlatanConfigModule : public CModule public: - CharlatanConfigModule(QObject *); + CharlatanConfigModule(TQObject *); signals: @@ -46,7 +46,7 @@ class CharlatanConfigModule : public CModule private: - QCheckBox * scroll_; + TQCheckBox * scroll_; }; #endif // CHARLATAN_CONFIG_MODULE_H diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp index 4c07411..c5ca084 100644 --- a/noatun-plugins/charlatan/seeker.cpp +++ b/noatun-plugins/charlatan/seeker.cpp @@ -20,25 +20,25 @@ * */ -#include <qtimer.h> +#include <tqtimer.h> #include <noatun/app.h> #include <noatun/player.h> #include "seeker.h" #include "seeker.moc" -Seeker::Seeker(QWidget * parent) - : QSlider(0, 60, 10, 0, Horizontal, parent), +Seeker::Seeker(TQWidget * parent) + : TQSlider(0, 60, 10, 0, Horizontal, parent), adjusting_(false) { - delayedUpdateTimer_ = new QTimer(this); + delayedUpdateTimer_ = new TQTimer(this); - connect(this, SIGNAL(sliderPressed()), SLOT(slotSliderPressed())); - connect(this, SIGNAL(sliderReleased()), SLOT(slotSliderReleased())); - connect(this, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int))); + connect(this, TQT_SIGNAL(sliderPressed()), TQT_SLOT(slotSliderPressed())); + connect(this, TQT_SIGNAL(sliderReleased()), TQT_SLOT(slotSliderReleased())); + connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); - connect(delayedUpdateTimer_, SIGNAL(timeout()), SLOT(slotDelayedUpdate())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(delayedUpdateTimer_, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedUpdate())); } Seeker::~Seeker() @@ -73,7 +73,7 @@ Seeker::slotSliderReleased() } void -Seeker::wheelEvent(QWheelEvent *) +Seeker::wheelEvent(TQWheelEvent *) { // Ignore. } diff --git a/noatun-plugins/charlatan/seeker.h b/noatun-plugins/charlatan/seeker.h index ff7af93..c5e6cff 100644 --- a/noatun-plugins/charlatan/seeker.h +++ b/noatun-plugins/charlatan/seeker.h @@ -23,7 +23,7 @@ #ifndef SEEKER_H #define SEEKER_H -#include <qslider.h> +#include <tqslider.h> class QTimer; @@ -33,7 +33,7 @@ class Seeker : public QSlider public: - Seeker(QWidget * parent); + Seeker(TQWidget * parent); virtual ~Seeker(); protected slots: @@ -46,7 +46,7 @@ class Seeker : public QSlider protected: - void wheelEvent(QWheelEvent *); + void wheelEvent(TQWheelEvent *); private: diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index e15a686..b9bb4c1 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -27,12 +27,12 @@ #include <noatun/controls.h> #include <noatun/effects.h> -#include <qaccel.h> -#include <qtoolbutton.h> -#include <qdragobject.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qframe.h> +#include <tqaccel.h> +#include <tqtoolbutton.h> +#include <tqdragobject.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqframe.h> #include <kurldrag.h> #include <kstatusbar.h> #include <kglobal.h> @@ -64,43 +64,43 @@ Charlatan::Charlatan() { setAcceptDrops(true); - showingVolumeTimer_ = new QTimer(this); + showingVolumeTimer_ = new TQTimer(this); connect ( showingVolumeTimer_, - SIGNAL(timeout()), - SLOT(slotStopShowingVolume()) + TQT_SIGNAL(timeout()), + TQT_SLOT(slotStopShowingVolume()) ); - playListToggleButton_ = new QToolButton(this); - previousButton_ = new QToolButton(this); - nextButton_ = new QToolButton(this); - stopButton_ = new QToolButton(this); - restartButton_ = new QToolButton(this); - playButton_ = new QToolButton(this); + playListToggleButton_ = new TQToolButton(this); + previousButton_ = new TQToolButton(this); + nextButton_ = new TQToolButton(this); + stopButton_ = new TQToolButton(this); + restartButton_ = new TQToolButton(this); + playButton_ = new TQToolButton(this); seekSlider_ = new Seeker(this); - positionLabel_ = new QLabel(this); + positionLabel_ = new TQLabel(this); titleLabel_ = new ScrollingLabel(i18n("No File Loaded"), this); - playListToggleButton_ ->setPixmap(QPixmap((const char **)px_playlist)); - previousButton_ ->setPixmap(QPixmap((const char **)px_previous)); - nextButton_ ->setPixmap(QPixmap((const char **)px_next)); - stopButton_ ->setPixmap(QPixmap((const char **)px_stop)); - restartButton_ ->setPixmap(QPixmap((const char **)px_restart)); - playButton_ ->setPixmap(QPixmap((const char **)px_play1)); + playListToggleButton_ ->setPixmap(TQPixmap((const char **)px_playlist)); + previousButton_ ->setPixmap(TQPixmap((const char **)px_previous)); + nextButton_ ->setPixmap(TQPixmap((const char **)px_next)); + stopButton_ ->setPixmap(TQPixmap((const char **)px_stop)); + restartButton_ ->setPixmap(TQPixmap((const char **)px_restart)); + playButton_ ->setPixmap(TQPixmap((const char **)px_play1)); playListToggleButton_ ->setToggleButton(true); - QVBoxLayout * mainLayout = new QVBoxLayout(this); + TQVBoxLayout * mainLayout = new TQVBoxLayout(this); mainLayout->addWidget(titleLabel_); mainLayout->addSpacing(2); - QHBoxLayout * positionLayout = new QHBoxLayout(mainLayout); + TQHBoxLayout * positionLayout = new TQHBoxLayout(mainLayout); positionLayout->addWidget(seekSlider_); positionLayout->addSpacing(2); @@ -108,7 +108,7 @@ Charlatan::Charlatan() mainLayout->addSpacing(2); - QHBoxLayout * buttonLayout = new QHBoxLayout(mainLayout); + TQHBoxLayout * buttonLayout = new TQHBoxLayout(mainLayout); buttonLayout->addWidget(playListToggleButton_); buttonLayout->addWidget(previousButton_); @@ -130,68 +130,68 @@ Charlatan::Charlatan() connect ( playListToggleButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(toggleListView()) + TQT_SLOT(toggleListView()) ); connect ( previousButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(back()) + TQT_SLOT(back()) ); connect ( nextButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(forward()) + TQT_SLOT(forward()) ); connect ( stopButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(stop()) + TQT_SLOT(stop()) ); - connect(restartButton_, SIGNAL(clicked()), SLOT(slotRestart())); + connect(restartButton_, TQT_SIGNAL(clicked()), TQT_SLOT(slotRestart())); connect ( playButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(playpause()) + TQT_SLOT(playpause()) ); - connect(napp, SIGNAL(hideYourself()), SLOT(hide())); - connect(napp, SIGNAL(showYourself()), SLOT(show())); + connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); + connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(slotPlayListShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(slotPlayListHidden())); - connect(napp->player(), SIGNAL(playing()), SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(slotPlayListShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(slotPlayListHidden())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused())); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); connect ( napp->player(), - SIGNAL(volumeChanged(int)), - SLOT(slotVolumeChanged(int)) + TQT_SIGNAL(volumeChanged(int)), + TQT_SLOT(slotVolumeChanged(int)) ); connect ( new CharlatanConfigModule(this), - SIGNAL(saved()), - SLOT(slotConfigChanged()) + TQT_SIGNAL(saved()), + TQT_SLOT(slotConfigChanged()) ); setCaption(i18n("Noatun")); @@ -201,10 +201,10 @@ Charlatan::Charlatan() loadConfig(); - // Using QAccel, because I don't want any strings associated or + // Using TQAccel, because I don't want any strings associated or // configurability. - QAccel * a = new QAccel(this, "Accelerators"); + TQAccel * a = new TQAccel(this, "Accelerators"); int accelPlay = a->insertItem(Key_Space); int accelNext = a->insertItem(Key_H); @@ -213,12 +213,12 @@ Charlatan::Charlatan() int accelRstt = a->insertItem(Key_Return); int accelQuit = a->insertItem(Key_Q); - a->connectItem(accelPlay, napp->player(), SLOT(playpause())); - a->connectItem(accelNext, napp->player(), SLOT(forward())); - a->connectItem(accelPrev, napp->player(), SLOT(back())); - a->connectItem(accelStop, napp->player(), SLOT(stop())); - a->connectItem(accelRstt, this, SLOT(slotRestart())); - a->connectItem(accelQuit, napp, SLOT(quit())); + a->connectItem(accelPlay, napp->player(), TQT_SLOT(playpause())); + a->connectItem(accelNext, napp->player(), TQT_SLOT(forward())); + a->connectItem(accelPrev, napp->player(), TQT_SLOT(back())); + a->connectItem(accelStop, napp->player(), TQT_SLOT(stop())); + a->connectItem(accelRstt, this, TQT_SLOT(slotRestart())); + a->connectItem(accelQuit, napp, TQT_SLOT(quit())); show(); @@ -230,17 +230,17 @@ Charlatan::~Charlatan() // Empty. } -void Charlatan::closeEvent(QCloseEvent *) +void Charlatan::closeEvent(TQCloseEvent *) { unload(); } -void Charlatan::dragEnterEvent(QDragEnterEvent *event) +void Charlatan::dragEnterEvent(TQDragEnterEvent *event) { event->accept(KURLDrag::canDecode(event)); } -void Charlatan::dropEvent(QDropEvent *event) +void Charlatan::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -251,9 +251,9 @@ void Charlatan::dropEvent(QDropEvent *event) } -void Charlatan::setTitleText(const QString & s) +void Charlatan::setTitleText(const TQString & s) { - QString titleText; + TQString titleText; if (!s.isNull()) { @@ -295,7 +295,7 @@ void Charlatan::slotPlaying() playButton_->setOn(true); stopButton_->setEnabled(true); - playButton_->setPixmap(QPixmap((const char **)px_pause)); + playButton_->setPixmap(TQPixmap((const char **)px_pause)); } void Charlatan::slotStopped() @@ -304,7 +304,7 @@ void Charlatan::slotStopped() stopButton_->setEnabled(false); playButton_->setOn(false); - playButton_->setPixmap(QPixmap((const char **)px_play1)); + playButton_->setPixmap(TQPixmap((const char **)px_play1)); } void Charlatan::slotPaused() @@ -313,15 +313,15 @@ void Charlatan::slotPaused() stopButton_->setEnabled(true); playButton_->setOn(false); - playButton_->setPixmap(QPixmap((const char **)px_play1)); + playButton_->setPixmap(TQPixmap((const char **)px_play1)); } -bool Charlatan::eventFilter(QObject *o, QEvent *e) +bool Charlatan::eventFilter(TQObject *o, TQEvent *e) { switch (e->type()) { - case QEvent::Wheel: - wheelEvent(static_cast<QWheelEvent*>(e)); + case TQEvent::Wheel: + wheelEvent(static_cast<TQWheelEvent*>(e)); return true; break; @@ -329,7 +329,7 @@ bool Charlatan::eventFilter(QObject *o, QEvent *e) break; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void Charlatan::slotPlayListShown() @@ -342,7 +342,7 @@ void Charlatan::slotPlayListHidden() playListToggleButton_->setOn(false); } -void Charlatan::mousePressEvent(QMouseEvent * e) +void Charlatan::mousePressEvent(TQMouseEvent * e) { if (e->button() == RightButton) { @@ -350,10 +350,10 @@ void Charlatan::mousePressEvent(QMouseEvent * e) return; } - return QWidget::mousePressEvent(e); + return TQWidget::mousePressEvent(e); } -void Charlatan::wheelEvent(QWheelEvent * e) +void Charlatan::wheelEvent(TQWheelEvent * e) { int newVolume = napp->player()->volume() + (e->delta() / 120) * 4; napp->player()->setVolume(newVolume); @@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged() void Charlatan::slotVolumeChanged(int i) { - QString message(i18n("Volume: %1").arg(i)); + TQString message(i18n("Volume: %1").arg(i)); showingVolumeTimer_->start(2000, true); titleLabel_->setText(message); @@ -386,7 +386,7 @@ void Charlatan::slotTimeout() setTitleText(); - QString lengthText(napp->player()->lengthString()); + TQString lengthText(napp->player()->lengthString()); if (positionLabel_->text() != lengthText) positionLabel_->setText(lengthText); diff --git a/noatun-plugins/charlatan/userinterface.h b/noatun-plugins/charlatan/userinterface.h index c6a4e06..05882d7 100644 --- a/noatun-plugins/charlatan/userinterface.h +++ b/noatun-plugins/charlatan/userinterface.h @@ -35,7 +35,7 @@ class QLabel; * @author Rik Hemsley <rik@kde.org> * @version 1.0 */ -class Charlatan : public QWidget, public UserInterface +class Charlatan : public TQWidget, public UserInterface { Q_OBJECT @@ -44,7 +44,7 @@ class Charlatan : public QWidget, public UserInterface Charlatan(); virtual ~Charlatan(); - void load(const QString & url); + void load(const TQString & url); protected slots: @@ -67,24 +67,24 @@ class Charlatan : public QWidget, public UserInterface protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void dragEnterEvent (QDragEnterEvent *); - virtual void dropEvent (QDropEvent *); - virtual void closeEvent (QCloseEvent *); - virtual bool eventFilter (QObject *, QEvent *); - virtual void wheelEvent (QWheelEvent *); - virtual void setTitleText (const QString & = QString::null); + virtual void mousePressEvent (TQMouseEvent *); + virtual void dragEnterEvent (TQDragEnterEvent *); + virtual void dropEvent (TQDropEvent *); + virtual void closeEvent (TQCloseEvent *); + virtual bool eventFilter (TQObject *, TQEvent *); + virtual void wheelEvent (TQWheelEvent *); + virtual void setTitleText (const TQString & = TQString::null); void loadConfig(); private: - QToolButton * previousButton_; - QToolButton * stopButton_; - QToolButton * playButton_; - QToolButton * nextButton_; - QToolButton * playListToggleButton_; - QToolButton * restartButton_; + TQToolButton * previousButton_; + TQToolButton * stopButton_; + TQToolButton * playButton_; + TQToolButton * nextButton_; + TQToolButton * playListToggleButton_; + TQToolButton * restartButton_; Seeker * seekSlider_; ScrollingLabel * titleLabel_; diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index 4faf221..5de4104 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -16,9 +16,9 @@ ***************************************************************************/ // include files for QT -#include <qdir.h> -#include <qprinter.h> -#include <qpainter.h> +#include <tqdir.h> +#include <tqprinter.h> +#include <tqpainter.h> // include files for KDE #include <kiconloader.h> @@ -62,17 +62,17 @@ Dub::Dub(DubPlaylist* plist) , shuffle_recursive(this) { connect( view->dirOperator(), - SIGNAL(fileSelected(const KFileItem*)), + TQT_SIGNAL(fileSelected(const KFileItem*)), this, - SLOT(fileSelected(const KFileItem*)) ); + TQT_SLOT(fileSelected(const KFileItem*)) ); connect( dubconfig.prefs->mediaDirectory, - SIGNAL( urlSelected (const QString &) ), + TQT_SIGNAL( urlSelected (const TQString &) ), this, - SLOT( mediaHomeSelected (const QString &) ) ); + TQT_SLOT( mediaHomeSelected (const TQString &) ) ); connect( this, - SIGNAL(setMediaHome(KURL)), + TQT_SIGNAL(setMediaHome(KURL)), view, - SLOT(setDir(KURL)) ); + TQT_SLOT(setDir(KURL)) ); configure_sequencing(); emit setMediaHome(dubconfig.mediaDirectory); } @@ -84,7 +84,7 @@ void Dub::fileSelected(const KFileItem * file) { playlist.setCurrent(file, true); } -void Dub::mediaHomeSelected(const QString& url) { +void Dub::mediaHomeSelected(const TQString& url) { kdDebug(90010) << "media home selected:" << endl; emit setMediaHome( KURL(url) ); } @@ -148,7 +148,7 @@ void Dub::Sequencer::set_file(KFileItem** file, KFileItem* val) { kdDebug(90010) << "set_file to " << val->url() << endl; } -KFileItem* Dub::Linear_Seq::first(QPtrList<KFileItem> & items) +KFileItem* Dub::Linear_Seq::first(TQPtrList<KFileItem> & items) { // find first file KFileItem* firstFile = 0; @@ -161,7 +161,7 @@ KFileItem* Dub::Linear_Seq::first(QPtrList<KFileItem> & items) return firstFile; } -KFileItem* Dub::Linear_Seq::last(QPtrList<KFileItem> & items) +KFileItem* Dub::Linear_Seq::last(TQPtrList<KFileItem> & items) { // find last file KFileItem* lastFile = 0; @@ -174,7 +174,7 @@ KFileItem* Dub::Linear_Seq::last(QPtrList<KFileItem> & items) return lastFile; } -bool Dub::Linear_Seq::find(QPtrList<KFileItem> & items, KFileItem* a_file) +bool Dub::Linear_Seq::find(TQPtrList<KFileItem> & items, KFileItem* a_file) { // find file for (KFileItem *file=items.first(); file; file=items.next() ) @@ -185,7 +185,7 @@ bool Dub::Linear_Seq::find(QPtrList<KFileItem> & items, KFileItem* a_file) return false; } -KFileItem* Dub::Linear_Seq::next(QPtrList<KFileItem> & items, +KFileItem* Dub::Linear_Seq::next(TQPtrList<KFileItem> & items, KFileItem** active_file) { KFileItem* ret = 0; @@ -211,7 +211,7 @@ KFileItem* Dub::Linear_Seq::next(QPtrList<KFileItem> & items, return ret; } -KFileItem* Dub::Linear_Seq::prev(QPtrList<KFileItem> & items, +KFileItem* Dub::Linear_Seq::prev(TQPtrList<KFileItem> & items, KFileItem** active_file) { KFileItem* ret = 0; @@ -274,16 +274,16 @@ void Dub::Linear_OneDir::prev() } } -Dub::Dir_Node::Dir_Node(QString d, bool forward) +Dub::Dir_Node::Dir_Node(TQString d, bool forward) : dir(d), past_begin(false) { kdDebug(90010) << "cons dir node " << d << endl; // process entry list, form a list of subdirs and normal files file_items.setAutoDelete(true); - QDir dir_obj(dir); + TQDir dir_obj(dir); QFileInfoList* entries = const_cast<QFileInfoList*>(dir_obj.entryInfoList()); - for ( QFileInfo *file = entries->first(); file; file = entries->next() ) { + for ( TQFileInfo *file = entries->first(); file; file = entries->next() ) { if (file->isDir() && file->absFilePath().length()>d.length()) { kdDebug(90010) << "dub: dir " << file->absFilePath() << endl; subdirs.append(file->absFilePath()); @@ -330,7 +330,7 @@ Dub::Recursive_Seq::Recursive_Seq() void Dub::Recursive_Seq::init(const KURL & root) { - QString new_root = canonical_path(root.path()); + TQString new_root = canonical_path(root.path()); if (recursion_root != new_root) { // change recursion stack recursion_root = new_root; @@ -341,16 +341,16 @@ void Dub::Recursive_Seq::init(const KURL & root) } // get canonical path, we need this -QString Dub::Recursive_Seq::canonical_path(QString dir) +TQString Dub::Recursive_Seq::canonical_path(TQString dir) { // kdDebug(90010) << "canonical_path " << dir << endl; //assert(dir.isLocalFile()); - QDir path(dir); + TQDir path(dir); return path.canonicalPath(); } // check if dir is contained in the stack -bool Dub::Recursive_Seq::check_dir(QString dir) +bool Dub::Recursive_Seq::check_dir(TQString dir) { kdDebug(90010) << "check_dir " << dir << endl; bool found = false; @@ -362,10 +362,10 @@ bool Dub::Recursive_Seq::check_dir(QString dir) return found; } -bool Dub::Recursive_Seq::push_dir(QString dir, bool forward) +bool Dub::Recursive_Seq::push_dir(TQString dir, bool forward) { kdDebug(90010) << "push_dir " << dir << ", forward?" << forward << endl; - QString cpath = canonical_path(dir); + TQString cpath = canonical_path(dir); if (check_dir(cpath)) // is it in stack? return false; // avoid infinite recursion else { @@ -434,7 +434,7 @@ void Dub::Recursive_Seq::next_preorder() pop_preorder(true); // pop if subtrees done } else { - QString subdir = *top->current_subdir; // we have a subdir + TQString subdir = *top->current_subdir; // we have a subdir push_dir(subdir, true); // push directory w/ forward iterators } } @@ -450,7 +450,7 @@ void Dub::Recursive_Seq::prev_preorder() pop_preorder(false); } else { - QString subdir = *top->current_subdir; + TQString subdir = *top->current_subdir; kdDebug(90010) << "we have children, pushing now " << subdir << endl; push_dir(subdir, false); // push directory w/ backward iterators } @@ -478,7 +478,7 @@ void Dub::Linear_Recursive::next() { assert(!play_stack.isEmpty()); Dir_Node* top = top_dir(); - QString dir = top->dir; + TQString dir = top->dir; top->current_file = top->file_items.next(); kdDebug(90010) << "dub current dir: " << dir << endl; kdDebug(90010) << "dub current file: " << top->current_file << endl; @@ -505,7 +505,7 @@ void Dub::Linear_Recursive::prev() { assert(!play_stack.isEmpty()); Dir_Node* top = top_dir(); - QString dir = top->dir; + TQString dir = top->dir; top->current_file = top->file_items.prev(); kdDebug(90010) << "dub current dir: " << dir << endl; kdDebug(90010) << "dub current file: " << top->current_file << endl; @@ -528,7 +528,7 @@ void Dub::Linear_Recursive::prev() } } -void Dub::Shuffle_OneDir::init(const QString& dir) +void Dub::Shuffle_OneDir::init(const TQString& dir) { if (shuffle_dir != dir) { kdDebug(90010) << "shuffle/onedir init" << endl; @@ -537,7 +537,7 @@ void Dub::Shuffle_OneDir::init(const QString& dir) // make a deep copy items.clear(); - QPtrList<KFileItem> & view_items = dub.view->items(); // + TQPtrList<KFileItem> & view_items = dub.view->items(); // for (KFileItem *file=view_items.first(); file; file=view_items.next() ) if (file->isFile()) // add only files items.append(new KFileItem(*file)); diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h index 5317f86..da220e8 100644 --- a/noatun-plugins/dub/dub/dub.h +++ b/noatun-plugins/dub/dub/dub.h @@ -55,7 +55,7 @@ public: public slots: /** A file selected */ void fileSelected(const KFileItem*); - void mediaHomeSelected(const QString& url); + void mediaHomeSelected(const TQString& url); signals: void setMediaHome(KURL); @@ -106,11 +106,11 @@ private: // linear sequencing subsystem struct Linear_Seq : public Sequencer { Linear_Seq(Dub* d) : Sequencer(d) {} - KFileItem* first(QPtrList<KFileItem> & items); - KFileItem* last(QPtrList<KFileItem> & items); - KFileItem* next(QPtrList<KFileItem> & items, KFileItem** active_file); - KFileItem* prev(QPtrList<KFileItem> & items, KFileItem** active_file); - bool find(QPtrList<KFileItem> & items, KFileItem* a_file); + KFileItem* first(TQPtrList<KFileItem> & items); + 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); }; // sequencer that traverses current directory in view order @@ -127,11 +127,11 @@ private: // directory node for recursive play struct Dir_Node { - Dir_Node(QString dir, bool forward = true); - QString dir; - QStringList subdirs; - QStringList::iterator current_subdir; - QPtrList<KFileItem> file_items; + Dir_Node(TQString dir, bool forward = true); + TQString dir; + TQStringList subdirs; + TQStringList::iterator current_subdir; + TQPtrList<KFileItem> file_items; KFileItem* current_file; void init_traversal(bool forward); bool past_begin; // stupid iterators @@ -141,11 +141,11 @@ private: struct Recursive_Seq { Recursive_Seq(); void init(const KURL & root); - QString canonical_path(QString dir); - bool check_dir(QString dir); + TQString canonical_path(TQString dir); + bool check_dir(TQString dir); Dir_Node* top_dir() { return play_stack.getLast(); } Dir_Node* bottom_dir() { return play_stack.getFirst(); } - bool push_dir(QString dir, bool forward = true); + bool push_dir(TQString dir, bool forward = true); bool pop_dir(); bool advance(bool forward = true); void pop_preorder(bool forward = true); @@ -153,8 +153,8 @@ private: void prev_preorder(); void print_stack(); - QString recursion_root; - QPtrList<Dir_Node> play_stack; + TQString recursion_root; + TQPtrList<Dir_Node> play_stack; }; // sequencer to make a preorder walk of the directory tree @@ -175,7 +175,7 @@ private: items.setAutoDelete(true); } virtual ~Shuffle_OneDir() {}; - void init(const QString& dir); + void init(const TQString& dir); KFileItem* first(); void next(); void prev(); @@ -184,7 +184,7 @@ private: int play_index; std::vector<int> play_order; KURL shuffle_dir; - QPtrList<KFileItem> items; + TQPtrList<KFileItem> items; }; Shuffle_OneDir shuffle_onedir; @@ -198,7 +198,7 @@ private: void next(); void prev(); - QString shuffle_root; + TQString shuffle_root; }; Shuffle_Recursive shuffle_recursive; diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index 7097940..4908382 100644 --- a/noatun-plugins/dub/dub/dubapp.cpp +++ b/noatun-plugins/dub/dub/dubapp.cpp @@ -12,9 +12,9 @@ // // include files for QT -#include <qdir.h> -#include <qprinter.h> -#include <qpainter.h> +#include <tqdir.h> +#include <tqprinter.h> +#include <tqpainter.h> // include files for KDE #include <kiconloader.h> @@ -34,7 +34,7 @@ #define ID_STATUS_MSG 1 -DubApp::DubApp(QWidget* parent, const char* name) +DubApp::DubApp(TQWidget* parent, const char* name) : KMainWindow(parent, name) { kdDebug(90010) << "cons dubapp" << endl; @@ -54,7 +54,7 @@ DubApp::~DubApp() void DubApp::initActions() { - fileClose = KStdAction::close(this, SLOT(close()), actionCollection()); + fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); @@ -83,7 +83,7 @@ void DubApp::initView() // slots -void DubApp::slotStatusMsg(const QString &text) +void DubApp::slotStatusMsg(const TQString &text) { // change status message permanently statusBar()->clear(); @@ -92,7 +92,7 @@ void DubApp::slotStatusMsg(const QString &text) // events -void DubApp::closeEvent(QCloseEvent*) +void DubApp::closeEvent(TQCloseEvent*) { hide(); } diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h index e06a2fe..014d176 100644 --- a/noatun-plugins/dub/dub/dubapp.h +++ b/noatun-plugins/dub/dub/dubapp.h @@ -37,7 +37,7 @@ class DubApp : public KMainWindow public: /** construtor of DubApp, calls all init functions to create the application. */ - DubApp(QWidget* parent, const char* name="Dub Playlist"); + DubApp(TQWidget* parent, const char* name="Dub Playlist"); ~DubApp(); void initActions(); @@ -55,7 +55,7 @@ public: } protected: - virtual void closeEvent(QCloseEvent*e); + virtual void closeEvent(TQCloseEvent*e); private: KConfig *config; @@ -75,7 +75,7 @@ public slots: /** changes the statusbar contents for the standard label permanently, used to indicate current actions. * @param text the text that is displayed in the statusbar */ - void slotStatusMsg(const QString &text); + void slotStatusMsg(const TQString &text); /** get a pointer to view object */ }; diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp index ff1f3dd..581bbf2 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.cpp +++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp @@ -18,19 +18,19 @@ #include <kurlrequester.h> #include <kdebug.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqradiobutton.h> #include "dubconfigmodule.h" -DubConfigModule::DubConfigModule(QObject* parent) +DubConfigModule::DubConfigModule(TQObject* parent) : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", parent) , playMode(oneDir) , playOrder(normal) { - QVBoxLayout *vbox = new QVBoxLayout(this); + TQVBoxLayout *vbox = new TQVBoxLayout(this); vbox->setAutoAdd(true); vbox->setSpacing( 0 ); vbox->setMargin( 0 ); @@ -52,7 +52,7 @@ void DubConfigModule::save(void) mediaDirectory = prefs->mediaDirectory->url(); - QButton* selectedMode = prefs->playMode->selected(); + TQButton* selectedMode = prefs->playMode->selected(); if (selectedMode==prefs->allFiles) playMode = DubConfigModule::allFiles; else @@ -61,7 +61,7 @@ void DubConfigModule::save(void) else playMode = DubConfigModule::oneDir; - QButton* selectedOrder = prefs->playOrder->selected(); + TQButton* selectedOrder = prefs->playOrder->selected(); if (selectedOrder==prefs->shuffle) playOrder = DubConfigModule::shuffle; else diff --git a/noatun-plugins/dub/dub/dubconfigmodule.h b/noatun-plugins/dub/dub/dubconfigmodule.h index cfb662b..1793017 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.h +++ b/noatun-plugins/dub/dub/dubconfigmodule.h @@ -18,7 +18,7 @@ public: enum PlayOrder { normal, shuffle, repeat, single }; enum PlayMode { allFiles, oneDir, recursiveDir }; - DubConfigModule(QObject *parent); + DubConfigModule(TQObject *parent); ~DubConfigModule(); @@ -28,7 +28,7 @@ public: void apply(); /** The directory in which media files are stored */ - QString mediaDirectory; + TQString mediaDirectory; PlayMode playMode; PlayOrder playOrder; diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp index d38eb24..62d2e5c 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.cpp +++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp @@ -37,7 +37,7 @@ DubPlaylistItem::~DubPlaylistItem(){ PlaylistItemData::removeRef(); } -QString DubPlaylistItem::property(const QString &key, const QString &def) const { +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; @@ -47,19 +47,19 @@ QString DubPlaylistItem::property(const QString &key, const QString &def) const return def; } -void DubPlaylistItem::setProperty(const QString &key, const QString &val) { +void DubPlaylistItem::setProperty(const TQString &key, const TQString &val) { // kdDebug(90010) << "set property" << endl; property_map[key] = val; } -void DubPlaylistItem::clearProperty(const QString &key) { +void DubPlaylistItem::clearProperty(const TQString &key) { // kdDebug(90010) << "clear property" << endl; property_map.remove(key); } -QStringList DubPlaylistItem::properties() const { +TQStringList DubPlaylistItem::properties() const { // kdDebug(90010) << "properties" << endl; - QStringList list; + TQStringList list; for (Properties::const_iterator i=property_map.begin(); i!=property_map.end(); i++) { list.append(i.data()); @@ -67,7 +67,7 @@ QStringList DubPlaylistItem::properties() const { return list; } -bool DubPlaylistItem::isProperty(const QString &key) const { +bool DubPlaylistItem::isProperty(const TQString &key) const { // kdDebug(90010) << "is property? " << key << endl; return (property_map.find(key) != property_map.end()); } diff --git a/noatun-plugins/dub/dub/dubplaylistitem.h b/noatun-plugins/dub/dub/dubplaylistitem.h index 6f7a96d..f61daaf 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.h +++ b/noatun-plugins/dub/dub/dubplaylistitem.h @@ -31,11 +31,11 @@ public: DubPlaylistItem(const KFileItem&); virtual ~DubPlaylistItem(); - virtual QString property(const QString &, const QString & = 0) const; - virtual void setProperty(const QString &, const QString &); - virtual void clearProperty(const QString &); - virtual QStringList properties() const; - virtual bool isProperty(const QString &) const; + virtual TQString property(const TQString &, const TQString & = 0) const; + virtual void setProperty(const TQString &, const TQString &); + virtual void clearProperty(const TQString &); + virtual TQStringList properties() const; + virtual bool isProperty(const TQString &) const; virtual KURL url() const; KFileItem& getFileItem() { return fileItem; @@ -45,10 +45,10 @@ public: private: KFileItem fileItem; - typedef QMap<QString,QString> Properties; + typedef TQMap<TQString,TQString> Properties; Properties property_map; -// virtual QString file() const; +// virtual TQString file() const; }; diff --git a/noatun-plugins/dub/dub/dubview.cpp b/noatun-plugins/dub/dub/dubview.cpp index e1e4713..087e92e 100644 --- a/noatun-plugins/dub/dub/dubview.cpp +++ b/noatun-plugins/dub/dub/dubview.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ // include files for Qt -#include <qprinter.h> -#include <qpainter.h> +#include <tqprinter.h> +#include <tqpainter.h> #include <kdebug.h> // application specific includes @@ -26,12 +26,12 @@ #include "dub.h" #include "fileselectorwidget.h" -//DubView::DubView(QWidget *parent, const char *name) : QWidget(parent, name) +//DubView::DubView(TQWidget *parent, const char *name) : TQWidget(parent, name) //{ // setBackgroundMode(PaletteBase); //} -DubView::DubView(QWidget *parent) : FileSelectorWidget(parent) +DubView::DubView(TQWidget *parent) : FileSelectorWidget(parent) { kdDebug(90010) << "dub view cons" << endl; setBackgroundMode(PaletteBase); @@ -41,9 +41,9 @@ DubView::~DubView() { } -void DubView::print(QPrinter *pPrinter) +void DubView::print(TQPrinter *pPrinter) { - QPainter printpainter; + TQPainter printpainter; printpainter.begin(pPrinter); // TODO: add your printing code here @@ -51,9 +51,9 @@ void DubView::print(QPrinter *pPrinter) printpainter.end(); } /** Return item list of view */ -QPtrList<KFileItem>& DubView::items() +TQPtrList<KFileItem>& DubView::items() { - return const_cast<QPtrList<KFileItem>&>( *dirOperator()->view()->items() ); + return const_cast<TQPtrList<KFileItem>&>( *dirOperator()->view()->items() ); } /** Select a file */ diff --git a/noatun-plugins/dub/dub/dubview.h b/noatun-plugins/dub/dub/dubview.h index c768ca6..079b833 100644 --- a/noatun-plugins/dub/dub/dubview.h +++ b/noatun-plugins/dub/dub/dubview.h @@ -23,7 +23,7 @@ #endif // include files for Qt -#include <qwidget.h> +#include <tqwidget.h> #include <fileselectorwidget.h> @@ -33,15 +33,15 @@ class DubView : public FileSelectorWidget Q_OBJECT public: /** Constructor for the main view */ - DubView(QWidget *parent = 0); + DubView(TQWidget *parent = 0); /** Destructor for the main view */ ~DubView(); /** contains the implementation for printing functionality */ - void print(QPrinter *pPrinter); + void print(TQPrinter *pPrinter); /** Return item list of view */ - QPtrList<KFileItem>& items(); + TQPtrList<KFileItem>& items(); /** select a particular file */ void selectFile(KFileItem* file); diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp index 153af20..c030040 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.cpp +++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp @@ -14,12 +14,12 @@ * * ***************************************************************************/ -#include <qlayout.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qstrlist.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqstrlist.h> +#include <tqtooltip.h> #include <kiconloader.h> #include <kurlcombobox.h> @@ -36,79 +36,79 @@ #include "fileselectorwidget.h" -FileSelectorWidget::FileSelectorWidget(QWidget *parent) - : QWidget(parent, "file selector widget") +FileSelectorWidget::FileSelectorWidget(TQWidget *parent) + : TQWidget(parent, "file selector widget") { // widgets and layout - QVBoxLayout* lo = new QVBoxLayout(this); + TQVBoxLayout* lo = new TQVBoxLayout(this); - QHBox *hlow = new QHBox (this); + TQHBox *hlow = new TQHBox (this); lo->addWidget(hlow); - home = new QPushButton( hlow ); + home = new TQPushButton( hlow ); home->setPixmap(SmallIcon("gohome")); - QToolTip::add(home, i18n("Home folder")); - up = new QPushButton( /*i18n("&Up"),*/ hlow ); + TQToolTip::add(home, i18n("Home folder")); + up = new TQPushButton( /*i18n("&Up"),*/ hlow ); up->setPixmap(SmallIcon("up")); - QToolTip::add(up, i18n("Up one level")); - back = new QPushButton( /*i18n("&Back"),*/ hlow ); + TQToolTip::add(up, i18n("Up one level")); + back = new TQPushButton( /*i18n("&Back"),*/ hlow ); back->setPixmap(SmallIcon("back")); - QToolTip::add(back, i18n("Previous folder")); - forward = new QPushButton( /*i18n("&Next"),*/ hlow ); + TQToolTip::add(back, i18n("Previous folder")); + forward = new TQPushButton( /*i18n("&Next"),*/ hlow ); forward->setPixmap(SmallIcon("forward")); - QToolTip::add(forward, i18n("Next folder")); + TQToolTip::add(forward, i18n("Next folder")); // HACK - QWidget* spacer = new QWidget(hlow); + TQWidget* spacer = new TQWidget(hlow); hlow->setStretchFactor(spacer, 1); hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); - dir = new KDirOperator(QString::null, this, "operator"); + dir = new KDirOperator(TQString::null, this, "operator"); dir->setView(KFile::Detail); lo->addWidget(dir); lo->setStretchFactor(dir, 2); - QHBox* filterBox = new QHBox(this); - filterIcon = new QLabel(filterBox); + TQHBox* filterBox = new TQHBox(this); + filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); lo->addWidget(filterBox); // slots and signals - connect( filter, SIGNAL( activated(const QString&) ), SLOT( slotFilterChange(const QString&) ) ); - connect( filter, SIGNAL( returnPressed(const QString&) ),filter, SLOT( addToHistory(const QString&) ) ); + connect( filter, TQT_SIGNAL( activated(const TQString&) ), TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),filter, TQT_SLOT( addToHistory(const TQString&) ) ); - connect( home, SIGNAL( clicked() ), dir, SLOT( home() ) ); - connect( up, SIGNAL( clicked() ), dir, SLOT( cdUp() ) ); - connect( back, SIGNAL( clicked() ), dir, SLOT( back() ) ); - connect( forward, SIGNAL( clicked() ), dir, SLOT( forward() ) ); + connect( home, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( home() ) ); + connect( up, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( cdUp() ) ); + connect( back, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( back() ) ); + connect( forward, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( forward() ) ); - connect( cmbPath, SIGNAL( urlActivated( const KURL& )), - this, SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, SIGNAL( returnPressed( const QString& )), - this, SLOT( cmbPathReturnPressed( const QString& ) )); - connect(dir, SIGNAL(urlEntered(const KURL&)), - this, SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), + this, TQT_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), + this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), + this, TQT_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, SIGNAL(finishedLoading()), - this, SLOT(dirFinishedLoading()) ); + connect(dir, TQT_SIGNAL(finishedLoading()), + this, TQT_SLOT(dirFinishedLoading()) ); - connect(dir, SIGNAL(fileHighlighted(const KFileItem *)), - SLOT(fileHighlighted(const KFileItem *))); - connect(dir, SIGNAL(fileSelected(const KFileItem *)), - SLOT(fileSelected(const KFileItem *))); + connect(dir, TQT_SIGNAL(fileHighlighted(const KFileItem *)), + TQT_SLOT(fileHighlighted(const KFileItem *))); + connect(dir, TQT_SIGNAL(fileSelected(const KFileItem *)), + TQT_SLOT(fileSelected(const KFileItem *))); kdDebug(90010) << "connected stuff!" << endl; } @@ -122,7 +122,7 @@ KURL FileSelectorWidget::currentDirectory() return dirLister()->url(); } -void FileSelectorWidget::slotFilterChange( const QString & nf ) +void FileSelectorWidget::slotFilterChange( const TQString & nf ) { dir->setNameFilter( nf ); dir->rereadDir(); @@ -133,7 +133,7 @@ void FileSelectorWidget::cmbPathActivated( const KURL& u ) dir->setURL( u, true ); } -void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) +void FileSelectorWidget::cmbPathReturnPressed( const TQString& u ) { dir->setFocus(); dir->setURL( KURL(u), true ); @@ -143,7 +143,7 @@ void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) void FileSelectorWidget::dirUrlEntered( const KURL& u ) { cmbPath->removeURL( u ); - QStringList urls = cmbPath->urls(); + TQStringList urls = cmbPath->urls(); urls.prepend( u.url() ); while ( urls.count() >= (uint)cmbPath->maxItems() ) urls.remove( urls.last() ); @@ -162,7 +162,7 @@ void FileSelectorWidget::dirFinishedLoading() } -void FileSelectorWidget::focusInEvent(QFocusEvent*) +void FileSelectorWidget::focusInEvent(TQFocusEvent*) { dir->setFocus(); } diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h index 724173a..e31b721 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.h +++ b/noatun-plugins/dub/dub/fileselectorwidget.h @@ -12,16 +12,16 @@ #ifndef _FILESELECTORWIDGET_H_ #define _FILESELECTORWIDGET_H_ -#include <qlayout.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qstrlist.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqstrlist.h> +#include <tqtooltip.h> #include <klistview.h> -#include <qvbox.h> -#include <qwidget.h> +#include <tqvbox.h> +#include <tqwidget.h> #include <kfile.h> #include <kurlcombobox.h> #include <kurlcompletion.h> @@ -38,7 +38,7 @@ class FileSelectorWidget : public QWidget friend class DubPlayListItem; public: - FileSelectorWidget(QWidget *parent); + FileSelectorWidget(TQWidget *parent); ~FileSelectorWidget(); KDirOperator* dirOperator() {return dir;} @@ -46,12 +46,12 @@ public: KURL currentDirectory(); public slots: - void slotFilterChange(const QString&); + void slotFilterChange(const TQString&); void setDir(KURL); private slots: void cmbPathActivated( const KURL& u ); - void cmbPathReturnPressed( const QString& u ); + void cmbPathReturnPressed( const TQString& u ); void dirUrlEntered( const KURL& u ); void dirFinishedLoading(); void fileHighlighted(const KFileItem *); @@ -59,15 +59,15 @@ private slots: // void setCurrentDocDir(); protected: - void focusInEvent(QFocusEvent*); + void focusInEvent(TQFocusEvent*); private: KURLComboBox *cmbPath; KHistoryCombo * filter; - QLabel* filterIcon; + TQLabel* filterIcon; KDirOperator * dir; - QPushButton *home, *up, *back, *forward, *cfdir; + TQPushButton *home, *up, *back, *forward, *cfdir; }; diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 5c4282a..38fd56e 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -3,12 +3,12 @@ #include <noatun/app.h> #include <math.h> -#include <qpainter.h> -#include <qbitmap.h> +#include <tqpainter.h> +#include <tqbitmap.h> #include <klocale.h> #include <kconfig.h> -#include <qcursor.h> -#include <qtooltip.h> +#include <tqcursor.h> +#include <tqtooltip.h> #include <kwin.h> @@ -21,8 +21,8 @@ extern "C" Plugin *create_plugin() } -View::View(int width, int height, int block, int unblock, QColor front, QColor back, int channel) - : QWidget(0,0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WType_TopLevel), mChannel(channel) +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) { fg = front; bg = back; @@ -33,22 +33,22 @@ View::View(int width, int height, int block, int unblock, QColor front, QColor b KConfig *c = napp->config(); c->setGroup("FFRS"); - QSize size = napp->desktop()->size(); - QRect desktop(0,0, size.width(), size.height()); + TQSize size = napp->desktop()->size(); + TQRect desktop(0,0, size.width(), size.height()); - QPoint at; + TQPoint at; if (channel==0) { - at = QPoint(size.width()-width*4, size.height()-height-32); - QToolTip::add(this, i18n("Left")); + at = TQPoint(size.width()-width*4, size.height()-height-32); + TQToolTip::add(this, i18n("Left")); } else // if (channel==1) { - at = QPoint(size.width()-width*2, size.height()-height-32); - QToolTip::add(this, i18n("Right")); + at = TQPoint(size.width()-width*2, size.height()-height-32); + TQToolTip::add(this, i18n("Right")); } - move(c->readPointEntry("at"+QString::number(mChannel), &at)); + move(c->readPointEntry("at"+TQString::number(mChannel), &at)); // make sure we're on the desktop if ( @@ -60,8 +60,8 @@ View::View(int width, int height, int block, int unblock, QColor front, QColor b } - QBitmap mask(width, height); - QPainter p(&mask); + TQBitmap mask(width, height); + TQPainter p(&mask); // Qt::color0 = transparent // Qt::color1 = opaque @@ -82,24 +82,24 @@ View::~View() { KConfig *c = napp->config(); c->setGroup("FFRS"); - c->writeEntry("at"+QString::number(mChannel), pos()); + c->writeEntry("at"+TQString::number(mChannel), pos()); } -void View::mouseMoveEvent(QMouseEvent *) +void View::mouseMoveEvent(TQMouseEvent *) { if (moving) { - move ( QCursor::pos()-mMousePoint ); + move ( TQCursor::pos()-mMousePoint ); } } -void View::mousePressEvent(QMouseEvent *) +void View::mousePressEvent(TQMouseEvent *) { moving = true; - mMousePoint = mapFromGlobal(QCursor::pos()); + mMousePoint = mapFromGlobal(TQCursor::pos()); } -void View::mouseReleaseEvent(QMouseEvent *) +void View::mouseReleaseEvent(TQMouseEvent *) { moving = false; } @@ -123,19 +123,19 @@ void View::draw(float level) // and draw it (it updates too quickly for it to // need a paintEvent) - QPainter p(this); + TQPainter p(this); p.fillRect(0, 0, w, h-pix, bg); p.fillRect(0, h-pix, w, h - (h-pix), fg); } -FFRS::FFRS() : QObject(), Plugin() +FFRS::FFRS() : TQObject(), Plugin() { dpyleft = dpyright = 0; changed(); prefs = new FFRSPrefs(this); - connect(prefs, SIGNAL(changed()), SLOT(changed())); + connect(prefs, TQT_SIGNAL(changed()), TQT_SLOT(changed())); setSamples(256); @@ -180,53 +180,53 @@ void FFRS::changed() #include <knuminput.h> #include <kcolorbutton.h> -#include <qlayout.h> -#include <qhbox.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqlabel.h> -FFRSPrefs::FFRSPrefs( QObject *parent ) +FFRSPrefs::FFRSPrefs( TQObject *parent ) : CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); - QHBox *box = new QHBox(this); + TQHBox *box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Width:"), box); + new TQLabel(i18n("Width:"), box); mWidth = new KIntNumInput(width(), box); mWidth->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Height:"), box); + new TQLabel(i18n("Height:"), box); mHeight = new KIntNumInput(height(), box); mHeight->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Visible block size:"), box); + new TQLabel(i18n("Visible block size:"), box); mFgblock = new KIntNumInput(fgblock(), box); mFgblock->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Transparent block size:"), box); + new TQLabel(i18n("Transparent block size:"), box); mBgblock = new KIntNumInput(bgblock(), box); mBgblock->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Update interval:"), box); + new TQLabel(i18n("Update interval:"), box); mRate = new KIntNumInput(rate(), box); mRate->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Foreground color:"), box); + new TQLabel(i18n("Foreground color:"), box); mFgcolor = new KColorButton(fgcolor(), box); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Background color:"), box); + new TQLabel(i18n("Background color:"), box); mBgcolor = new KColorButton(bgcolor(), box); layout->addStretch(); @@ -285,19 +285,19 @@ int FFRSPrefs::rate() } -QColor FFRSPrefs::bgcolor() +TQColor FFRSPrefs::bgcolor() { KConfig *c = napp->config(); c->setGroup("FFRS"); - QColor dumbass(0, 64, 0); + TQColor dumbass(0, 64, 0); return c->readColorEntry("bgcolor", &dumbass); } -QColor FFRSPrefs::fgcolor() +TQColor FFRSPrefs::fgcolor() { KConfig *c = napp->config(); c->setGroup("FFRS"); - QColor dumbass(0, 255, 0); + TQColor dumbass(0, 255, 0); return c->readColorEntry("fgcolor", &dumbass); } diff --git a/noatun-plugins/ffrs/ffrs.h b/noatun-plugins/ffrs/ffrs.h index b97c576..a29a1c2 100644 --- a/noatun-plugins/ffrs/ffrs.h +++ b/noatun-plugins/ffrs/ffrs.h @@ -9,26 +9,26 @@ class View : public QWidget { Q_OBJECT public: - View(int width, int height, int block, int unblock, QColor front, QColor back, int channel); + View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel); ~View(); void draw(float intensity); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); private: int units; - QColor fg, bg; + TQColor fg, bg; bool moving; - QPoint mMousePoint; + TQPoint mMousePoint; int mChannel; }; class FFRSPrefs; -class FFRS : public QObject, public Plugin, public StereoScope +class FFRS : public TQObject, public Plugin, public StereoScope { Q_OBJECT @@ -55,7 +55,7 @@ class FFRSPrefs : public CModule Q_OBJECT public: - FFRSPrefs( QObject *parent ); + FFRSPrefs( TQObject *parent ); virtual void save(); int width(); @@ -64,8 +64,8 @@ public: int bgblock(); int rate(); - QColor bgcolor(); - QColor fgcolor(); + TQColor bgcolor(); + TQColor fgcolor(); signals: void changed(); diff --git a/noatun-plugins/luckytag/luckytag.h b/noatun-plugins/luckytag/luckytag.h index 964cd8d..6a4c1c1 100644 --- a/noatun-plugins/luckytag/luckytag.h +++ b/noatun-plugins/luckytag/luckytag.h @@ -22,7 +22,7 @@ #include <noatun/plugin.h> #include <noatun/tags.h> -#include <qobject.h> +#include <tqobject.h> class LuckyTagger : public Tags, public Plugin { diff --git a/noatun-plugins/luckytag/parsedmp3filename.cpp b/noatun-plugins/luckytag/parsedmp3filename.cpp index a3006bd..1c75958 100644 --- a/noatun-plugins/luckytag/parsedmp3filename.cpp +++ b/noatun-plugins/luckytag/parsedmp3filename.cpp @@ -19,17 +19,17 @@ #include "parsedmp3filename.h" -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kurl.h> -ParsedMP3FileName::ParsedMP3FileName(const QString &path) +ParsedMP3FileName::ParsedMP3FileName(const TQString &path) { KURL url = path; - QString fileName = url.fileName(false); - m_directories = QStringList::split("/", url.directory()); + TQString fileName = url.fileName(false); + m_directories = TQStringList::split("/", url.directory()); if (fileName.startsWith("(") && fileName.contains(")")) { @@ -80,9 +80,9 @@ void ParsedMP3FileName::validateArtist() m_album = m_directories.last(); } -QString ParsedMP3FileName::beautifyString(const QString &s) +TQString ParsedMP3FileName::beautifyString(const TQString &s) { - QString temp = s.lower().simplifyWhiteSpace(); + TQString temp = s.lower().simplifyWhiteSpace(); temp[0] = temp[0].upper(); diff --git a/noatun-plugins/luckytag/parsedmp3filename.h b/noatun-plugins/luckytag/parsedmp3filename.h index 5dc2809..7c8b83e 100644 --- a/noatun-plugins/luckytag/parsedmp3filename.h +++ b/noatun-plugins/luckytag/parsedmp3filename.h @@ -20,30 +20,30 @@ #ifndef PARSEDMP3FILENAME_H #define PARSEDMP3FILENAME_H -#include <qstringlist.h> +#include <tqstringlist.h> class ParsedMP3FileName { public: - ParsedMP3FileName(const QString &); + ParsedMP3FileName(const TQString &); ~ParsedMP3FileName() {} - QString title() const { return m_title; } - QString artist() const { return m_artist; } - QString album() const { return m_album; } - QString comment() const { return m_comment; } + TQString title() const { return m_title; } + TQString artist() const { return m_artist; } + TQString album() const { return m_album; } + TQString comment() const { return m_comment; } protected: - QString m_title; - QString m_artist; - QString m_album; - QString m_comment; + TQString m_title; + TQString m_artist; + TQString m_album; + TQString m_comment; private: void validateArtist(); - QString beautifyString(const QString &); + TQString beautifyString(const TQString &); - QStringList m_directories; + TQStringList m_directories; }; #endif diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 2501ebb..efc2d77 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -1,11 +1,11 @@ #include "cmodule.h" #include "lyrics.h" -#include <qlayout.h> -#include <qstringlist.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqstringlist.h> +#include <tqlabel.h> #include <kmessagebox.h> -#include <qvgroupbox.h> -#include <qgrid.h> +#include <tqvgroupbox.h> +#include <tqgrid.h> #include <klistbox.h> #include <klineedit.h> #include <kbuttonbox.h> @@ -44,47 +44,47 @@ const char *const DEFAULT_QUERY = "http://everything2.com/index.pl?node=$(author)," "http://www.letssingit.com/cgi-exe/am.cgi?a=search&p=1&s=$(title)&l=song"; -LyricsCModule::LyricsCModule(QObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) { +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 */ - QVBoxLayout *vlayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QHBoxLayout *hlayout = new QHBoxLayout(vlayout, KDialog::spacingHint()); + TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); vlayout->setStretchFactor( hlayout, 1 ); // Search box - QVBoxLayout *boxlayout = new QVBoxLayout( hlayout, KDialog::spacingHint() ); - boxlayout->addWidget( new QLabel( i18n("Search providers:" ), this ) ); + TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() ); + boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); providersBox = new KListBox( this, "providersBox" ); boxlayout->addWidget(providersBox); boxButtons = new KButtonBox( this, Vertical ); - boxButtons->addButton( i18n( "New Search Provider" ), this, SLOT( newSearch() ) ); - boxButtons->addButton( i18n( "Delete Search Provider" ), this, SLOT( delSearch() ) ); - boxButtons->addButton( i18n( "Move Up" ), this, SLOT( moveUpSearch() ) ); - boxButtons->addButton( i18n( "Move Down" ), this, SLOT( moveDownSearch() ) ); + 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 ); // Edit box - QGroupBox *propBox = new QVGroupBox( i18n("Search Provider Properties" ), this ); - QGrid *editGrid = new QGrid(2, propBox ); + TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this ); + TQGrid *editGrid = new TQGrid(2, propBox ); editGrid->setSpacing( propBox->insideSpacing() ); - new QLabel( i18n( "Name:" ), editGrid ); + new TQLabel( i18n( "Name:" ), editGrid ); nameEdit = new KLineEdit( editGrid ); - new QLabel( i18n( "Query:" ), editGrid ); + new TQLabel( i18n( "Query:" ), editGrid ); queryEdit = new KLineEdit( editGrid ); /* 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.*/ - QLabel *textLabel = new QLabel(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"); + 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 ); /* Signal/slots */ nameEdit->setEnabled( false ); queryEdit->setEnabled( false ); - connect( providersBox, SIGNAL( highlighted( QListBoxItem * ) ), this, SLOT( selected( QListBoxItem * ) ) ); - connect( nameEdit, SIGNAL( textChanged( const QString &) ), this, SLOT( nameChanged( const QString & ) ) ); - connect( queryEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( queryChanged( const QString & ) ) ); + connect( providersBox, TQT_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQT_SLOT( selected( TQListBoxItem * ) ) ); + connect( nameEdit, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( nameChanged( const TQString & ) ) ); + connect( queryEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( queryChanged( const TQString & ) ) ); @@ -93,7 +93,7 @@ LyricsCModule::LyricsCModule(QObject *_parent) : CModule(i18n("Lyrics"), i18n("C save(); } -void LyricsCModule::newSearch(QString name, QString query) { +void LyricsCModule::newSearch(TQString name, TQString query) { kdDebug(90020) << "New search" << endl; SearchProvider s = { name, query }; mProviders.push_back( s ); @@ -105,7 +105,7 @@ void LyricsCModule::newSearch(QString name, QString query) { //X providersBox->setCurrentItem( 0 ); } -void LyricsCModule::selected( QListBoxItem *i ) { +void LyricsCModule::selected( TQListBoxItem *i ) { kdDebug(90020) << "selected" << endl; int index = providersBox->index( i ); if ( index < 0 ) @@ -123,7 +123,7 @@ void LyricsCModule::delSearch() { return; } int index = providersBox->currentItem(); - QValueVector<SearchProvider>::iterator it; + TQValueVector<SearchProvider>::iterator it; for ( it = mProviders.begin(); ( *it ).name != mProviders[ index ].name || ( *it ).url != mProviders[ index ].url; ++it ); mProviders.erase( it ); providersBox->removeItem( index ); @@ -134,8 +134,8 @@ void LyricsCModule::moveUpSearch() { if ( providersBox->currentItem() <= 0 ) return; int index = providersBox->currentItem(); - QString name = mProviders[ index ].name; - QString url = mProviders[ index ].url; + TQString name = mProviders[ index ].name; + TQString url = mProviders[ index ].url; mProviders[ index ].name = mProviders[ index-1 ].name; mProviders[ index ].url = mProviders[ index-1 ].url; mProviders[ index-1 ].name = name; @@ -149,8 +149,8 @@ void LyricsCModule::moveDownSearch() { if ( static_cast<unsigned int>( providersBox->currentItem() ) >= providersBox->count()-1 ) return; int index = providersBox->currentItem(); - QString name = mProviders[ index ].name; - QString url = mProviders[ index ].url; + TQString name = mProviders[ index ].name; + TQString url = mProviders[ index ].url; mProviders[ index ].name = mProviders[ index+1 ].name; mProviders[ index ].url = mProviders[ index+1 ].url; mProviders[ index+1 ].name = name; @@ -160,7 +160,7 @@ void LyricsCModule::moveDownSearch() { providersBox->setSelected( index+1, true ); } -void LyricsCModule::nameChanged( const QString &name ) { +void LyricsCModule::nameChanged( const TQString &name ) { kdDebug(90020) << "name changed" << endl; if ( providersBox->currentItem() < 0 ) return; @@ -169,7 +169,7 @@ void LyricsCModule::nameChanged( const QString &name ) { providersBox->changeItem( name, providersBox->currentItem() ); } -void LyricsCModule::queryChanged( const QString &query ) { +void LyricsCModule::queryChanged( const TQString &query ) { kdDebug(90020) << "query changed" << endl; if ( providersBox->currentItem() < 0 ) return; @@ -180,8 +180,8 @@ void LyricsCModule::queryChanged( const QString &query ) { void LyricsCModule::save() { KConfig *conf = KGlobal::config(); conf->setGroup( "Lyrics" ); - QStringList queryList, nameList; - QValueVector<SearchProvider>::iterator it; + TQStringList queryList, nameList; + TQValueVector<SearchProvider>::iterator it; for ( it = mProviders.begin(); it != mProviders.end(); ++it ) { kdDebug(90020) << "query:" << ( *it ).url << endl; queryList += ( *it ).url; @@ -196,7 +196,7 @@ void LyricsCModule::save() { } void LyricsCModule::reopen() { - QStringList queryList, nameList; + TQStringList queryList, nameList; KConfig *conf = KGlobal::config(); mProviders.clear(); providersBox->clear(); @@ -205,10 +205,10 @@ void LyricsCModule::reopen() { queryList = conf->readListEntry( "queryList" ); nameList = conf->readListEntry( "nameList" ); if ( queryList.count() == 0 && nameList.count() == 0 ) { - queryList = QStringList::split( ",", DEFAULT_QUERY ); - nameList = QStringList::split( ",", DEFAULT_NAME ); + queryList = TQStringList::split( ",", DEFAULT_QUERY ); + nameList = TQStringList::split( ",", DEFAULT_NAME ); } - QStringList::Iterator queryIt, nameIt; + TQStringList::Iterator queryIt, nameIt; for ( queryIt = queryList.begin(), nameIt = nameList.begin(); queryIt != queryList.end() && nameIt != nameList.end(); ++queryIt, ++nameIt ) { kdDebug(90020) << "Read:" << *queryIt << " and " << *nameIt << endl; newSearch( *nameIt, *queryIt ); diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h index dbb2da7..a7fdc08 100644 --- a/noatun-plugins/lyrics/cmodule.h +++ b/noatun-plugins/lyrics/cmodule.h @@ -2,7 +2,7 @@ #define _LYRICSCMODULE_H_ #include <noatun/pref.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <klocale.h> class KLineEdit; @@ -10,30 +10,30 @@ class KListBox; class KButtonBox; struct SearchProvider { - QString name; - QString url; + TQString name; + TQString url; }; class LyricsCModule : public CModule { Q_OBJECT public: - LyricsCModule(QObject *_parent); + LyricsCModule(TQObject *_parent); public slots: virtual void save(void); virtual void reopen(void); - void newSearch(QString name = i18n( "New Search Provider" ), QString query = ""); + void newSearch(TQString name = i18n( "New Search Provider" ), TQString query = ""); void delSearch(); void moveUpSearch(); void moveDownSearch(); - void selected( QListBoxItem *i ); - void nameChanged( const QString &name ); - void queryChanged( const QString &query ); + void selected( TQListBoxItem *i ); + void nameChanged( const TQString &name ); + void queryChanged( const TQString &query ); protected: KListBox *providersBox; KButtonBox *boxButtons; KLineEdit *nameEdit; KLineEdit *queryEdit; - QValueVector<SearchProvider> mProviders; + TQValueVector<SearchProvider> mProviders; }; diff --git a/noatun-plugins/lyrics/historymanager.cpp b/noatun-plugins/lyrics/historymanager.cpp index 1524d7b..629466d 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(QObject *parent) : QObject(parent) { +HistoryManager::HistoryManager(TQObject *parent) : TQObject(parent) { } HistoryManager::~HistoryManager() { diff --git a/noatun-plugins/lyrics/historymanager.h b/noatun-plugins/lyrics/historymanager.h index d2fdb29..910e463 100644 --- a/noatun-plugins/lyrics/historymanager.h +++ b/noatun-plugins/lyrics/historymanager.h @@ -2,13 +2,13 @@ #define _HISTORY_MANAGER_H #include <kurl.h> -#include <qvaluestack.h> -#include <qobject.h> +#include <tqvaluestack.h> +#include <tqobject.h> -class HistoryManager : public QObject { +class HistoryManager : public TQObject { Q_OBJECT public: - HistoryManager(QObject *parent = NULL); + HistoryManager(TQObject *parent = NULL); ~HistoryManager(); KURL back(); KURL forward(); @@ -20,8 +20,8 @@ class HistoryManager : public QObject { signals: void uiChanged(int, bool); protected: - QValueStack<KURL> back_stack; - QValueStack<KURL> forward_stack; + TQValueStack<KURL> back_stack; + TQValueStack<KURL> forward_stack; KURL currentURL; }; diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 611db9c..1c7a05b 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -5,7 +5,7 @@ #include <khtmlview.h> #include <kstdaction.h> #include <kstatusbar.h> -#include <qregexp.h> +#include <tqregexp.h> #include "lyrics.h" #include <noatun/player.h> #include <kdebug.h> @@ -27,25 +27,25 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) { lyrics = this; /* Create default actions */ - (void)KStdAction::close(this, SLOT(close()), actionCollection()); - ( void )KStdAction::goTo( this, SLOT( goTo() ), actionCollection(), "go_web_goTo" ); - //(void)KStdAction::print(this, SLOT(print()), actionCollection()); - //(void)KStdAction::printPreview(this, SLOT(printPreview()), actionCollection()); - //(void)KStdAction::mail(this, SLOT(mail()), actionCollection()); - //(void)KStdAction::find(this, SLOT(find()), actionCollection()); + (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()); follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); - KStdAction::redisplay(this, SLOT(viewLyrics()), actionCollection()); + KStdAction::redisplay(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, SIGNAL(toggled(bool)), this, SLOT(attach(bool))); - back_act = KStdAction::back(this, SLOT(back()), actionCollection()); + connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool))); + back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); back_act->setEnabled(false); - forward_act = KStdAction::forward(this, SLOT(forward()), actionCollection()); + forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection()); forward_act->setEnabled(false); - new KWidgetAction( new QLabel(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, SLOT(viewLyrics()), actionCollection(), "search_provider"); + 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"); /* Add entry to menu */ - menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, SLOT(viewLyrics())); + menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics())); /* Create history manager and htmlpart */ history = new HistoryManager(this); @@ -53,11 +53,11 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) //htmlpart->view()->setMinimumSize(350, 420); /* Connect signals/slots */ - connect( htmlpart->browserExtension(), SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, SLOT(openURLRequest( const KURL &, const KParts::URLArgs & ))); - connect( htmlpart, SIGNAL(started(KIO::Job *)), this, SLOT(loadingURL(KIO::Job *)) ); - connect( htmlpart, SIGNAL(completed()), this, SLOT(loadedURL()) ); - connect( history, SIGNAL(uiChanged(int, bool)), this, SLOT(changeUI(int, bool)) ); - connect( napp->player(), SIGNAL(newSong()), this, SLOT(newSong()) ); + connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & ))); + connect( htmlpart, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(loadingURL(KIO::Job *)) ); + connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) ); + 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 */ statusBar()->insertItem(i18n("Ready"), 0, 1); @@ -79,14 +79,14 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) void Lyrics::goTo() { bool sel = false; - QString url = KLineEditDlg::getText( i18n( "Please enter the URL you want to go to:" ), htmlpart->url().prettyURL(), &sel, this ); + TQString url = KLineEditDlg::getText( i18n( "Please enter the URL you want to go to:" ), htmlpart->url().prettyURL(), &sel, this ); if ( !url.isEmpty() && sel ) go( KURL( url ) ); } -void Lyrics::setProviders( QValueVector<SearchProvider> &sites ) { +void Lyrics::setProviders( TQValueVector<SearchProvider> &sites ) { mSites = sites; - QStringList sitesName; + TQStringList sitesName; for (unsigned int i = 0; i < mSites.size(); ++i) { sitesName += mSites[i].name; } @@ -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."), QString::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::null, "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); @@ -181,21 +181,21 @@ void Lyrics::viewLyrics(int index) return; } //X <small>(if the above information is incorrect, the search may not find the correct music. If that's the case, use a tag editor to fix it. Hint: Use the luckytag plugin from the kdeaddons module to try to guess title, author and album from the song filename)</small><br> - QString url, name; + TQString url, name; if (index < 0) index = site_act->currentItem(); if ( index < 0 ) return; url = mSites[index].url; name = mSites[index].name; - QRegExp props_regexp("\\$\\((\\w+)\\)"); + TQRegExp props_regexp("\\$\\((\\w+)\\)"); int pos = props_regexp.search(url); while (pos >= 0) { - QString property = props_regexp.cap(1); + TQString property = props_regexp.cap(1); url.replace(pos, props_regexp.matchedLength(), napp->player()->current().property(property)); pos = props_regexp.search(url); } - QString title(napp->player()->current().property("title")); + TQString title(napp->player()->current().property("title")); setCaption(i18n("Loading Lyrics for %1").arg(title)); // Check if we have a music playing if (napp->player()->current()) { @@ -213,7 +213,7 @@ void Lyrics::viewLyrics(int index) if (napp->player()->current().property("Lyrics::URL").isEmpty()) { /* Use the query one */ _url = url; - _url.setQuery(_url.query().replace(QRegExp("%20"), "+")); + _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the query url" << endl; attach_act->setChecked(false); site_act->setEnabled(true); @@ -221,7 +221,7 @@ void Lyrics::viewLyrics(int index) htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) ); } else { _url = napp->player()->current().property("Lyrics::URL"); - _url.setQuery(_url.query().replace(QRegExp("%20"), "+")); + _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the stored url" << endl; attach_act->setChecked(true); site_act->setEnabled(false); @@ -232,7 +232,7 @@ void Lyrics::viewLyrics(int index) 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." ), QString::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::null, "Lyrics::usage_info" ); active = true; } } diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h index 9454604..362c7a4 100644 --- a/noatun-plugins/lyrics/lyrics.h +++ b/noatun-plugins/lyrics/lyrics.h @@ -5,7 +5,7 @@ #include <noatun/player.h> #include <noatun/app.h> #include <kmainwindow.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <khtml_part.h> #include <kaction.h> #include "cmodule.h" @@ -19,7 +19,7 @@ public: Lyrics(); ~Lyrics(); void go(const KURL &); - void setProviders( QValueVector<SearchProvider> &sites ); + void setProviders( TQValueVector<SearchProvider> &sites ); public slots: void viewLyrics(int index = -1); @@ -45,7 +45,7 @@ private: KToggleAction *attach_act; KSelectAction *site_act; KHTMLPart *htmlpart; - QValueVector<SearchProvider> mSites; + TQValueVector<SearchProvider> mSites; HistoryManager *history; bool active; diff --git a/noatun-plugins/nexscope/bitmappool.cpp b/noatun-plugins/nexscope/bitmappool.cpp index 0a0ad78..45f35d0 100644 --- a/noatun-plugins/nexscope/bitmappool.cpp +++ b/noatun-plugins/nexscope/bitmappool.cpp @@ -22,7 +22,7 @@ Bitmap *BitmapPool::get(bool clear) { mMutex.lock(); BitmapPool::PoolItem *p=0; - for (QPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) + for (TQPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) { if (!(*i)->used) p=*i; @@ -44,7 +44,7 @@ Bitmap *BitmapPool::get(bool clear) void BitmapPool::release(Bitmap *bitmap) { mMutex.lock(); - for (QPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) + for (TQPtrListIterator<BitmapPool::PoolItem> i(mBitmaps); i.current(); ++i) { if (&((*i)->bitmap)==bitmap) (*i)->used=false; diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index 912d8ea..9a4776e 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -1,7 +1,7 @@ #include <klocale.h> -#include <qheader.h> -#include <qlayout.h> -#include <qdragobject.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqdragobject.h> #include <kfiledialog.h> #include <kstdaction.h> #include <kaction.h> @@ -13,8 +13,8 @@ class CreatorItem : public QListViewItem { public: - CreatorItem(QListView *parent, const QString &title) - : QListViewItem(parent, title) + CreatorItem(TQListView *parent, const TQString &title) + : TQListViewItem(parent, title) {} }; @@ -22,7 +22,7 @@ class TreeItem : public QListViewItem { public: TreeItem(TreeItem *parent, TreeItem *after, CreatorItem *creator) - : QListViewItem(parent, after, creator->text(0)) + : TQListViewItem(parent, after, creator->text(0)) { RendererList *list; if (parent) @@ -42,8 +42,8 @@ public: list->unlock(); } - TreeItem(QListView *parent, TreeItem *after, const QString &title) - : QListViewItem(parent, after, title) + TreeItem(TQListView *parent, TreeItem *after, const TQString &title) + : TQListViewItem(parent, after, title) { mRenderer=nex->rendererList(); setExpandable(true); @@ -72,27 +72,27 @@ Control::Control() : mConfigurator(0) { { KToolBar *tools=toolBar(); - KStdAction::save(this, SLOT(save()), actionCollection())->plug(tools); - KStdAction::saveAs(this, SLOT(saveAs()), actionCollection())->plug(tools); - KStdAction::open(this, SLOT(open()), actionCollection())->plug(tools); + KStdAction::save(this, TQT_SLOT(save()), actionCollection())->plug(tools); + KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection())->plug(tools); + KStdAction::open(this, TQT_SLOT(open()), actionCollection())->plug(tools); } setCaption(i18n("Nex Configuration")); - QSplitter *mainSplitter=new QSplitter(this); + TQSplitter *mainSplitter=new TQSplitter(this); setCentralWidget(mainSplitter); - QSplitter *left=new QSplitter(Qt::Vertical, mainSplitter); + TQSplitter *left=new TQSplitter(Qt::Vertical, mainSplitter); { mTree=new RendererListView(left); mTree->setItemsMovable(true); mTree->setSorting(-1); mTree->setRootIsDecorated(true); - connect(mTree, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - SLOT(dropEvent(QDropEvent*, QListViewItem*, QListViewItem*))); + connect(mTree, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect(mTree, SIGNAL(currentChanged(QListViewItem*)), - SLOT(currentChanged(QListViewItem*))); + connect(mTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), + TQT_SLOT(currentChanged(TQListViewItem*))); mCreatorsList=new RendererListView(left); mCreatorsList->addColumn(i18n("Name")); @@ -100,11 +100,11 @@ Control::Control() : mConfigurator(0) mCreatorsList->setDropVisualizer(false); } - mRight=new QWidget(mainSplitter); - (new QHBoxLayout(mRight))->setAutoAdd(true); + mRight=new TQWidget(mainSplitter); + (new TQHBoxLayout(mRight))->setAutoAdd(true); - QStringList list=nex->renderers(); - for (QStringList::Iterator i=list.begin(); i!=list.end(); ++i) + TQStringList list=nex->renderers(); + for (TQStringList::Iterator i=list.begin(); i!=list.end(); ++i) addCreator(*i); new TreeItem(mTree, 0, i18n("Main")); @@ -144,12 +144,12 @@ void Control::open(const KURL &file) } -void Control::addCreator(const QString &title) +void Control::addCreator(const TQString &title) { new CreatorItem(mCreatorsList, title); } -void Control::dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *pafter) +void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter) { // if ((e->source() == mCreatorsList) && parent) { @@ -163,7 +163,7 @@ void Control::dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *paf } } -void Control::currentChanged(QListViewItem *item) +void Control::currentChanged(TQListViewItem *item) { TreeItem *treeItem=static_cast<TreeItem*>(item); delete mConfigurator; @@ -173,24 +173,24 @@ void Control::currentChanged(QListViewItem *item) } -RendererListView::RendererListView(QWidget *p) : KListView(p) +RendererListView::RendererListView(TQWidget *p) : KListView(p) { addColumn(i18n("Name")); header()->hide(); setDragEnabled(true); setAcceptDrops(true); - setSelectionMode(QListView::Single); + setSelectionMode(TQListView::Single); } -bool RendererListView::acceptDrag(QDropEvent *event) const +bool RendererListView::acceptDrag(TQDropEvent *event) const { - return true; //QCString(event->format()) == "application/x-nex-rendererdrag"; + return true; //TQCString(event->format()) == "application/x-nex-rendererdrag"; } -QDragObject *RendererListView::dragObject() const +TQDragObject *RendererListView::dragObject() const { if (!currentItem()) return 0; - return new QStoredDrag("application/x-nex-rendererdrag", (QWidget*)this); + return new TQStoredDrag("application/x-nex-rendererdrag", (TQWidget*)this); } diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h index 84fd2bf..3fea2ae 100644 --- a/noatun-plugins/nexscope/gui.h +++ b/noatun-plugins/nexscope/gui.h @@ -3,8 +3,8 @@ #include <kmainwindow.h> #include <klistview.h> -#include <qsplitter.h> -#include <qdict.h> +#include <tqsplitter.h> +#include <tqdict.h> #include <dcopobject.h> #include <kurl.h> @@ -17,7 +17,7 @@ Q_OBJECT public: Control(); - void addCreator(const QString &title); + void addCreator(const TQString &title); public slots: void save(const KURL &file); @@ -28,13 +28,13 @@ public slots: void open(const KURL &file); protected slots: - void dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *pafter); - void currentChanged(QListViewItem *item); + void dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter); + void currentChanged(TQListViewItem *item); private: - QWidget *mRight; + TQWidget *mRight; KListView *mTree, *mCreatorsList; - QWidget *mConfigurator; + TQWidget *mConfigurator; KURL mCurrentURL; }; @@ -43,11 +43,11 @@ class RendererListView : public KListView { Q_OBJECT public: - RendererListView(QWidget *p); + RendererListView(TQWidget *p); protected: - virtual bool acceptDrag(QDropEvent *event) const; - virtual QDragObject *dragObject() const; + virtual bool acceptDrag(TQDropEvent *event) const; + virtual TQDragObject *dragObject() const; }; diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index af19409..c152c95 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -8,16 +8,16 @@ #include <kcmdlineargs.h> #include <klocale.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qmultilineedit.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqmultilineedit.h> #include "renderers.h" Mutex runLock; Nex *Nex::sNex=0; -QTime timer; +TQTime timer; Renderer::Renderer() {} Renderer::~Renderer() {} @@ -56,13 +56,13 @@ int Thread::threadRun(void *v) return t->run(); } -NexCheckBox::NexCheckBox(QWidget *parent, - const QString &name, bool *v) - : QCheckBox(name, parent) +NexCheckBox::NexCheckBox(TQWidget *parent, + const TQString &name, bool *v) + : TQCheckBox(name, parent) { value=v; setChecked(*v); - connect(this, SIGNAL(toggled(bool)), SLOT(change(bool))); + connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(change(bool))); } void NexCheckBox::change(bool b) { @@ -71,16 +71,16 @@ void NexCheckBox::change(bool b) -NexColorButton::NexColorButton(QWidget *parent, Pixel *color) +NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) : KColorButton(parent) { c=color; - QColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); + TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); setColor(temp); - connect(this, SIGNAL(changed(const QColor&)), SLOT(change(const QColor&))); + connect(this, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(change(const TQColor&))); } -void NexColorButton::change(const QColor &co) +void NexColorButton::change(const TQColor &co) { *c= COLOR(qRed(co.rgb()), qGreen(co.rgb()), qBlue(co.rgb())); } @@ -313,7 +313,7 @@ Bitmap *RendererList::render(float *pcm[4], Bitmap *source) if (mClearAfter) mFrame->clear(); lock(); - for (QPtrListIterator<Renderer> i(mRendererList); i.current(); ++i) + for (TQPtrListIterator<Renderer> i(mRendererList); i.current(); ++i) { Bitmap *newframe=(*i)->render(pcm, mFrame); @@ -359,14 +359,14 @@ Bitmap *RendererList::render(float *pcm[4], Bitmap *source) return source; } -void RendererList::save(QDomElement &e) +void RendererList::save(TQDomElement &e) { lock(); e.setTagName("List"); - for (QPtrListIterator<Renderer> i(mRendererList); *i; ++i) + for (TQPtrListIterator<Renderer> i(mRendererList); *i; ++i) { - QDomElement item; + TQDomElement item; (*i)->save(item); e.appendChild(item); } @@ -374,14 +374,14 @@ void RendererList::save(QDomElement &e) unlock(); } -void RendererList::load(const QDomElement &e) +void RendererList::load(const TQDomElement &e) { lock(); - for (QDomNode n=e.firstChild(); !n.isNull(); n=n.nextSibling()) + for (TQDomNode n=e.firstChild(); !n.isNull(); n=n.nextSibling()) { if (!n.isElement()) continue; - QDomElement child=n.toElement(); + TQDomElement child=n.toElement(); Renderer *r=0; @@ -401,31 +401,31 @@ void RendererList::load(const QDomElement &e) -QWidget *RendererList::configure(QWidget *parent) +TQWidget *RendererList::configure(TQWidget *parent) { return new RendererListConfigurator(this, parent); } -RendererListConfigurator::RendererListConfigurator(RendererList *l, QWidget *parent) - : QWidget(parent), mList(l) +RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *parent) + : TQWidget(parent), mList(l) { - (new QVBoxLayout(this))->setAutoAdd(true); - mErase=new QCheckBox(i18n("&Erase between frames"), this); - connect(mErase, SIGNAL(toggled(bool)), SLOT(eraseOn(bool))); + (new TQVBoxLayout(this))->setAutoAdd(true); + mErase=new TQCheckBox(i18n("&Erase between frames"), this); + connect(mErase, TQT_SIGNAL(toggled(bool)), TQT_SLOT(eraseOn(bool))); mErase->setChecked(mList->mClearAfter); if (nex->rendererList()==l) { - QCheckBox *mConvolve=new QCheckBox(i18n("&Convolve audio"), this); - connect(mConvolve, SIGNAL(toggled(bool)), SLOT(convolve(bool))); + TQCheckBox *mConvolve=new TQCheckBox(i18n("&Convolve audio"), this); + connect(mConvolve, TQT_SIGNAL(toggled(bool)), TQT_SLOT(convolve(bool))); mConvolve->setChecked(nex->input()->convolve()); } - new QLabel(i18n("Comments"), this); + new TQLabel(i18n("Comments"), this); - mComments=new QMultiLineEdit(this); + mComments=new TQMultiLineEdit(this); mComments->setText(l->mComments); - mComments->setWordWrap(QMultiLineEdit::WidgetWidth); + mComments->setWordWrap(TQMultiLineEdit::WidgetWidth); } RendererListConfigurator::~RendererListConfigurator() @@ -488,7 +488,7 @@ void Nex::go() frame=mBitmapPool->get(true); int frames=0; - QTime start(QTime::currentTime()); + TQTime start(TQTime::currentTime()); while (1) { @@ -506,7 +506,7 @@ void Nex::go() std::cerr << "Deleted" << std::endl; std::cout << "Frames per Second: " - << frames/start.secsTo(QTime::currentTime()) << std::endl; + << frames/start.secsTo(TQTime::currentTime()) << std::endl; return; case OutputSDL::Resize: // setupSize(width, height); @@ -520,7 +520,7 @@ void Nex::go() } -Renderer *Nex::renderer(const QString &name) +Renderer *Nex::renderer(const TQString &name) { CreatorSig **sig=mCreators[name]; if (sig) @@ -529,10 +529,10 @@ Renderer *Nex::renderer(const QString &name) return 0; } -QStringList Nex::renderers() const +TQStringList Nex::renderers() const { - QDictIterator<CreatorSig*> i(mCreators); - QStringList list; + TQDictIterator<CreatorSig*> i(mCreators); + TQStringList list; for (;i.current(); ++i) list += i.currentKey(); diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h index 05c7f81..81fd680 100644 --- a/noatun-plugins/nexscope/nex.h +++ b/noatun-plugins/nexscope/nex.h @@ -1,16 +1,16 @@ #ifndef NEX_H #define NEX_H -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> #include <stdint.h> #include <vector> -#include <qdict.h> +#include <tqdict.h> -#include <qdatetime.h> +#include <tqdatetime.h> #include <iostream> -#include <qdom.h> +#include <tqdom.h> #include "SDL.h" #include "SDL_thread.h" @@ -20,8 +20,8 @@ typedef uint8_t Byte; #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b)) #define COLORSTR(pixel) \ - QString("#%1%2%3").arg(QString::number((pixel>>16) & 8, 16)) \ - .arg(QString::number((pixel>>8) & 8, 16)).arg(QString::number(pixel& 8, 16)) + TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \ + .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16)) #define STRCOLOR(pixel) \ Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \ @@ -76,10 +76,10 @@ class Spacer : public QWidget { Q_OBJECT public: - Spacer(QWidget *parent) : QWidget(parent) + Spacer(TQWidget *parent) : TQWidget(parent) { - setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, - QSizePolicy::MinimumExpanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + TQSizePolicy::MinimumExpanding)); } }; @@ -153,7 +153,7 @@ public: private: struct PoolItem; - QPtrList<BitmapPool::PoolItem> mBitmaps; + TQPtrList<BitmapPool::PoolItem> mBitmaps; Mutex mMutex; }; @@ -198,7 +198,7 @@ private: float fhtTab[(samples-256)*2]; bool ok; - QObject *notifier; + TQObject *notifier; }; class OutputSDL @@ -217,14 +217,14 @@ private: static SDL_Surface *surface; }; -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcolorbutton.h> class NexCheckBox : public QCheckBox { Q_OBJECT public: - NexCheckBox(QWidget *parent, const QString &, bool *v); + NexCheckBox(TQWidget *parent, const TQString &, bool *v); private slots: void change(bool b); @@ -238,10 +238,10 @@ class NexColorButton : public KColorButton { Q_OBJECT public: - NexColorButton(QWidget *parent, Pixel *color); + NexColorButton(TQWidget *parent, Pixel *color); private slots: - void change(const QColor &c); + void change(const TQColor &c); private: Pixel *c; @@ -255,11 +255,11 @@ public: virtual Bitmap *render(float *pcm[4], Bitmap *source) = 0; - virtual QWidget *configure(QWidget*) { return 0; } + virtual TQWidget *configure(TQWidget*) { return 0; } - virtual void save(QDomElement &) {} + virtual void save(TQDomElement &) {} - virtual void load(const QDomElement &) {} + virtual void load(const TQDomElement &) {} }; class QCheckBox; @@ -270,7 +270,7 @@ class RendererListConfigurator : public QWidget { Q_OBJECT public: - RendererListConfigurator(RendererList *l, QWidget *parent); + RendererListConfigurator(RendererList *l, TQWidget *parent); ~RendererListConfigurator(); public slots: @@ -278,8 +278,8 @@ public slots: void convolve(bool state); private: - QCheckBox *mErase; - QMultiLineEdit *mComments; + TQCheckBox *mErase; + TQMultiLineEdit *mComments; RendererList *mList; }; @@ -293,22 +293,22 @@ public: virtual ~RendererList(); virtual Bitmap *render(float *pcm[4], Bitmap *source); - QPtrList<Renderer> &renderers() { return mRendererList; } - const QPtrList<Renderer> &renderers() const { return mRendererList; } + TQPtrList<Renderer> &renderers() { return mRendererList; } + const TQPtrList<Renderer> &renderers() const { return mRendererList; } bool clearAfter() const { return mClearAfter; } void setClearAfter(bool b) { mClearAfter=b; } - virtual QWidget *configure(QWidget *parent); + virtual TQWidget *configure(TQWidget *parent); - virtual void save(QDomElement &e); + virtual void save(TQDomElement &e); - virtual void load(const QDomElement &e); + virtual void load(const TQDomElement &e); private: - QPtrList<Renderer> mRendererList; + TQPtrList<Renderer> mRendererList; volatile bool mClearAfter; - QString mComments; + TQString mComments; Bitmap *mFrame; }; @@ -331,9 +331,9 @@ public: Input *input() { return mInput; } - Renderer *renderer(const QString &name); + Renderer *renderer(const TQString &name); - QStringList renderers() const; + TQStringList renderers() const; public: static Nex *sNex; @@ -343,7 +343,7 @@ private: OutputSDL mOutput; BitmapPool *mBitmapPool; RendererList *mRendererList; - QDict<CreatorSig*> mCreators; + TQDict<CreatorSig*> mCreators; }; #define nex Nex::nex() diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index 8bbc860..e0b3d28 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -18,7 +18,7 @@ Plugin *create_plugin() NexPlugin::NexPlugin() { - connect(&process, SIGNAL(processExited(KProcess *)), this, SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); } NexPlugin::~NexPlugin() diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h index 8f8abb2..d1b0ec8 100644 --- a/noatun-plugins/nexscope/noatunplugin.h +++ b/noatun-plugins/nexscope/noatunplugin.h @@ -4,7 +4,7 @@ #include <kprocess.h> #include <noatun/plugin.h> -class NexPlugin : public QObject, public Plugin +class NexPlugin : public TQObject, public Plugin { Q_OBJECT diff --git a/noatun-plugins/nexscope/regionwidget.cpp b/noatun-plugins/nexscope/regionwidget.cpp index 32e9987..119096b 100644 --- a/noatun-plugins/nexscope/regionwidget.cpp +++ b/noatun-plugins/nexscope/regionwidget.cpp @@ -1,23 +1,23 @@ #include "regionwidget.h" -RegionWidget::RegionWidget(QWidget *parent) +RegionWidget::RegionWidget(TQWidget *parent) { } -RegionWidget::RegionWidget(const QSize &viewsize, QWidget *parent) +RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *parent) { } -RegionWidget::RegionWidget(int x, int y, int w, int h, const QSize &viewsize, - QWidget *parent) +RegionWidget::RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, + TQWidget *parent) { } -RegionWidget::RegionWidget(const QRect ®ion, const QSize &viewsize, - QWidget *parent) +RegionWidget::RegionWidget(const TQRect ®ion, const TQSize &viewsize, + TQWidget *parent) { } @@ -28,9 +28,9 @@ RegionWidget::~RegionWidget() } -QRect RegionWidget::region() const +TQRect RegionWidget::region() const { - return QRect(0,0,0,0); + return TQRect(0,0,0,0); } void RegionWidget::setX(int x) @@ -53,12 +53,12 @@ void RegionWidget::setHeight(int h) } -void RegionWidget::setRegion(const QRect ®ion) +void RegionWidget::setRegion(const TQRect ®ion) { } -void RegionWidget::setViewSize(const QSize &size) +void RegionWidget::setViewSize(const TQSize &size) { } diff --git a/noatun-plugins/nexscope/regionwidget.h b/noatun-plugins/nexscope/regionwidget.h index eeac8b4..38c919a 100644 --- a/noatun-plugins/nexscope/regionwidget.h +++ b/noatun-plugins/nexscope/regionwidget.h @@ -1,7 +1,7 @@ #ifndef REGIONWIDGET_H #define REGIONWIDGET_H -#include <qframe.h> +#include <tqframe.h> /** * show a widget with a field rectangle, and a mini-region inside @@ -13,15 +13,15 @@ class RegionWidget : public QFrame { Q_OBJECT public: - RegionWidget(QWidget *parent); - RegionWidget(const QSize &viewsize, QWidget *parent); - RegionWidget(int x, int y, int w, int h, const QSize &viewsize, - QWidget *parent); - RegionWidget(const QRect ®ion, const QSize &viewsize, QWidget *parent); + RegionWidget(TQWidget *parent); + RegionWidget(const TQSize &viewsize, TQWidget *parent); + RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, + TQWidget *parent); + RegionWidget(const TQRect ®ion, const TQSize &viewsize, TQWidget *parent); ~RegionWidget(); - QRect region() const; + TQRect region() const; public slots: void setX(int x); @@ -29,14 +29,14 @@ public slots: void setWidth(int w); void setHeight(int h); - void setRegion(const QRect ®ion); + void setRegion(const TQRect ®ion); - void setViewSize(const QSize &size); + void setViewSize(const TQSize &size); signals: void changed(); void changed(int x, int y, int w, int h); - void changed(const QRect ®ion); + void changed(const TQRect ®ion); protected: virtual void moved(int x, int y); diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp index 830024b..f5e97c9 100644 --- a/noatun-plugins/nexscope/renderers.cpp +++ b/noatun-plugins/nexscope/renderers.cpp @@ -3,7 +3,7 @@ #include <time.h> #include <math.h> #include <iostream> -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> struct HorizontalPair : public Renderer @@ -15,10 +15,10 @@ struct HorizontalPair : public Renderer pair=true; } - QWidget *configure(QWidget *parent) + TQWidget *configure(TQWidget *parent) { - QWidget *config=new QWidget(parent); - (new QVBoxLayout(config))->setAutoAdd(true); + TQWidget *config=new TQWidget(parent); + (new TQVBoxLayout(config))->setAutoAdd(true); new NexColorButton(config, &color); new NexCheckBox(config, i18n("Horizontal"), &horizontal); @@ -99,7 +99,7 @@ struct HorizontalPair : public Renderer return src; } - virtual void save(QDomElement &e) + virtual void save(TQDomElement &e) { e.setTagName("Waveform"); e.setAttribute("horizontal", (int)horizontal); @@ -108,7 +108,7 @@ struct HorizontalPair : public Renderer e.setAttribute("color", COLORSTR(color)); } - virtual void load(const QDomElement &e) + virtual void load(const TQDomElement &e) { horizontal=(bool)e.attribute("horizontal", 0).toInt(); pair=(bool)e.attribute("pair", 0).toInt(); diff --git a/noatun-plugins/nexscope/renderers.h b/noatun-plugins/nexscope/renderers.h index 3105849..5d75eeb 100644 --- a/noatun-plugins/nexscope/renderers.h +++ b/noatun-plugins/nexscope/renderers.h @@ -1,7 +1,7 @@ #ifndef RENDERERS_H #define RENDERERS_H -#include <qstring.h> +#include <tqstring.h> class Renderer; diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 0b0d086..7027029 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -30,16 +30,16 @@ Plugin *create_plugin() Madness::Madness() : MonoFFTScope(100), Plugin(), mWm(this) { - connect(&mWm, SIGNAL(currentDesktopChanged(int)), SLOT(update())); - connect(&mWm, SIGNAL(windowAdded(WId)), SLOT(update())); - connect(&mWm, SIGNAL(windowRemoved(WId)), SLOT(update())); - connect(&mWm, SIGNAL(strutChanged()), SLOT(update())); + connect(&mWm, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(strutChanged()), TQT_SLOT(update())); } Madness::~Madness() { - QMap<WId, QPoint>::ConstIterator it(mOriginalPositions.begin()); + TQMap<WId, TQPoint>::ConstIterator it(mOriginalPositions.begin()); for (; it != mOriginalPositions.end(); ++it) XMoveWindow(qt_xdisplay(), it.key(), (*it).x(), (*it).y()); @@ -50,11 +50,11 @@ void Madness::update() mWindowList = mWm.windows(); mWorkArea = mWm.workArea(); - QValueList<WId>::ConstIterator it(mWindowList.begin()); + TQValueList<WId>::ConstIterator it(mWindowList.begin()); for (; it != mWindowList.end(); ++it) { - QRect area=KWin::info(*it).frameGeometry; + TQRect area=KWin::info(*it).frameGeometry; if (!mOriginalPositions.contains(*it)) mOriginalPositions.insert(*it, area.topLeft()); } @@ -76,7 +76,7 @@ void Madness::scopeEvent(float *d, int size) // cout << "delta: " << delta << endl; - QValueList<WId>::ConstIterator it(mWindowList.begin()); + TQValueList<WId>::ConstIterator it(mWindowList.begin()); for (; it != mWindowList.end(); ++it) { @@ -92,7 +92,7 @@ void Madness::scopeEvent(float *d, int size) || (mWm.currentDesktop() != i.desktop)) continue; - QRect area=i.frameGeometry; + TQRect area=i.frameGeometry; float lightness=100000.0/(area.width()*area.height()); int x=area.x(); diff --git a/noatun-plugins/noatunmadness/madness.h b/noatun-plugins/noatunmadness/madness.h index b36c468..8076d0a 100644 --- a/noatun-plugins/noatunmadness/madness.h +++ b/noatun-plugins/noatunmadness/madness.h @@ -3,11 +3,11 @@ #include <noatun/plugin.h> #include <string.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqvaluelist.h> #include <kwinmodule.h> -class Madness : public QObject, public MonoFFTScope, public Plugin +class Madness : public TQObject, public MonoFFTScope, public Plugin { Q_OBJECT public: @@ -24,9 +24,9 @@ protected: private: KWinModule mWm; - QValueList<WId> mWindowList; - QRect mWorkArea; - QMap<WId, QPoint> mOriginalPositions; + TQValueList<WId> mWindowList; + TQRect mWorkArea; + TQMap<WId, TQPoint> mOriginalPositions; }; #endif diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp index 60bb272..c9e6fb6 100644 --- a/noatun-plugins/oblique/base.cpp +++ b/noatun-plugins/oblique/base.cpp @@ -7,10 +7,10 @@ #include "kdbt.h" #include "kbuffer.h" -#include <qstringlist.h> -#include <qmap.h> -#include <qfile.h> -#include <qdom.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqfile.h> +#include <tqdom.h> #include <cstdlib> #include <assert.h> @@ -23,24 +23,24 @@ struct Base::Private Private() : db(0, DB_CXX_NO_EXCEPTIONS) { } Db db; typedef KDbt<FileId> Key; - typedef KDbt<QStringList> Data; + typedef KDbt<TQStringList> Data; FileId high; FileId cachedId; - mutable QMap<QString,QString> cachedProperties; + mutable TQMap<TQString,TQString> cachedProperties; - QPtrList<Slice> slices; + TQPtrList<Slice> slices; int sliceHigh; }; -Base::Base(const QString &file) +Base::Base(const TQString &file) { d = new Private; d->cachedId = 0; - QCString filename = QFile::encodeName(file); + TQCString filename = TQFile::encodeName(file); bool create = true; if (d->db.open( @@ -55,7 +55,7 @@ Base::Base(const QString &file) Private::Key key(0); if (d->db.get(0, &key, &data, 0)==0) { - QStringList strs; + TQStringList strs; data.get(strs); mFormatVersion = strs[0].toUInt(0, 16); // TODO @@ -71,7 +71,7 @@ Base::Base(const QString &file) } if (create) { // failure - QFile(filename).remove(); + TQFile(filename).remove(); d->db.open( #if DB_VERSION_MINOR > 0 && DB_VERSION_MAJOR >= 4 NULL, @@ -80,7 +80,7 @@ Base::Base(const QString &file) ); d->high=0; - QStringList strs; + TQStringList strs; strs << "00010002" << "0" << ""; resetFormatVersion(); loadMetaXML(""); @@ -102,8 +102,8 @@ void Base::resetFormatVersion() Base::~Base() { - QStringList strs; - strs << QString::number(mFormatVersion, 16) << QString::number(d->high); + TQStringList strs; + strs << TQString::number(mFormatVersion, 16) << TQString::number(d->high); strs << saveMetaXML(); Private::Data data(strs); @@ -114,10 +114,10 @@ Base::~Base() delete d; } -File Base::add(const QString &file) +File Base::add(const TQString &file) { Private::Key key(++d->high); - QStringList properties; + TQStringList properties; properties << "file" << file; Private::Data data(properties); @@ -180,23 +180,23 @@ File Base::first(FileId first) return File(this, first); } -QString Base::property(FileId id, const QString &property) const +TQString Base::property(FileId id, const TQString &property) const { loadIntoCache(id); - if (!d->cachedProperties.contains(property)) return QString::null; - QMap<QString,QString>::Iterator i = d->cachedProperties.find(property); + if (!d->cachedProperties.contains(property)) return TQString::null; + TQMap<TQString,TQString>::Iterator i = d->cachedProperties.find(property); return i.data(); } -void Base::setProperty(FileId id, const QString &key, const QString &value) +void Base::setProperty(FileId id, const TQString &key, const TQString &value) { loadIntoCache(id); d->cachedProperties.insert(key, value); // reinsert it into the DB - QStringList props; + TQStringList props; for ( - QMap<QString,QString>::Iterator i(d->cachedProperties.begin()); + TQMap<TQString,TQString>::Iterator i(d->cachedProperties.begin()); i != d->cachedProperties.end(); ++i ) { @@ -211,12 +211,12 @@ void Base::setProperty(FileId id, const QString &key, const QString &value) emit modified(File(this, id)); } -QStringList Base::properties(FileId id) const +TQStringList Base::properties(FileId id) const { loadIntoCache(id); - QStringList props; + TQStringList props; for ( - QMap<QString,QString>::Iterator i(d->cachedProperties.begin()); + TQMap<TQString,TQString>::Iterator i(d->cachedProperties.begin()); i != d->cachedProperties.end(); ++i ) { @@ -225,15 +225,15 @@ QStringList Base::properties(FileId id) const return props; } -void Base::clearProperty(FileId id, const QString &key) +void Base::clearProperty(FileId id, const TQString &key) { loadIntoCache(id); d->cachedProperties.remove(key); // reinsert it into the DB - QStringList props; + TQStringList props; for ( - QMap<QString,QString>::Iterator i(d->cachedProperties.begin()); + TQMap<TQString,TQString>::Iterator i(d->cachedProperties.begin()); i != d->cachedProperties.end(); ++i ) { @@ -275,7 +275,7 @@ void Base::loadIntoCache(FileId id) const Private::Data data; unless (d->db.get(0, &key, &data, 0)) { - QStringList props; + TQStringList props; data.get(props); if (props.count() % 2) @@ -284,28 +284,28 @@ void Base::loadIntoCache(FileId id) const return; } - for (QStringList::Iterator i(props.begin()); i != props.end(); ++i) + for (TQStringList::Iterator i(props.begin()); i != props.end(); ++i) { - QString &key = *i; - QString &value = *++i; + TQString &key = *i; + TQString &value = *++i; d->cachedProperties.insert(key, value); } } } -QString Base::saveMetaXML() +TQString Base::saveMetaXML() { - QDomDocument doc; - doc.setContent(QString("<meta />")); - QDomElement doce = doc.documentElement(); + TQDomDocument doc; + doc.setContent(TQString("<meta />")); + TQDomElement doce = doc.documentElement(); - QDomElement e = doc.createElement("slices"); - e.setAttribute("highslice", QString::number(d->sliceHigh)); + TQDomElement e = doc.createElement("slices"); + e.setAttribute("highslice", TQString::number(d->sliceHigh)); doce.appendChild(e); - for (QPtrListIterator<Slice> i(d->slices); *i; ++i) + for (TQPtrListIterator<Slice> i(d->slices); *i; ++i) { - QDomElement slice = doc.createElement("slice"); + TQDomElement slice = doc.createElement("slice"); slice.setAttribute("id", (*i)->id()); slice.setAttribute("name", (*i)->name()); e.appendChild(slice); @@ -319,7 +319,7 @@ void Base::move(FileId oldid, FileId newid) Private::Data data; unless (d->db.get(0, &key, &data, 0)) { - QStringList props; + TQStringList props; data.get(props); d->db.del(0, &key, 0); @@ -332,11 +332,11 @@ void Base::dump() { for (FileId id=1; id <= high(); id++) { - QStringList props = properties(id); + TQStringList props = properties(id); std::cerr << id << '.'; - for (QStringList::Iterator i(props.begin()); i != props.end(); ++i) + for (TQStringList::Iterator i(props.begin()); i != props.end(); ++i) { - QString prop = *i; + TQString prop = *i; std::cerr << ' ' << prop.latin1() << '=' << property(id, prop).latin1(); } std::cerr << std::endl; @@ -349,12 +349,12 @@ void Base::notifyChanged(const File &file) } -QPtrList<Slice> Base::slices() +TQPtrList<Slice> Base::slices() { return d->slices; } -Slice *Base::addSlice(const QString &name) +Slice *Base::addSlice(const TQString &name) { Slice *sl = new Slice(this, d->sliceHigh++, name); d->slices.append(sl); @@ -364,7 +364,7 @@ Slice *Base::addSlice(const QString &name) Slice *Base::defaultSlice() { - for (QPtrListIterator<Slice> i(d->slices); *i; ++i) + for (TQPtrListIterator<Slice> i(d->slices); *i; ++i) { if ((*i)->id() == 0) return *i; } @@ -382,7 +382,7 @@ void Base::removeSlice(Slice *slice) Slice *Base::sliceById(int id) { - for (QPtrListIterator<Slice> i(d->slices); *i; ++i) + for (TQPtrListIterator<Slice> i(d->slices); *i; ++i) { if ((*i)->id() == id) return *i; } @@ -390,35 +390,35 @@ Slice *Base::sliceById(int id) } -void Base::loadMetaXML(const QString &xml) +void Base::loadMetaXML(const TQString &xml) { d->slices.setAutoDelete(true); d->slices.clear(); d->slices.setAutoDelete(false); - QDomDocument doc; + TQDomDocument doc; doc.setContent(xml); - QDomElement doce = doc.documentElement(); + TQDomElement doce = doc.documentElement(); bool loadedId0=false; - for (QDomNode n = doce.firstChild(); !n.isNull(); n = n.nextSibling()) + for (TQDomNode n = doce.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (e.isNull()) continue; if (e.tagName().lower() == "slices") { d->sliceHigh = e.attribute("highslice", "1").toInt(); - for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) + for (TQDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (e.isNull()) continue; if (e.tagName().lower() == "slice") { int id = e.attribute("id").toInt(); if (id==0 && loadedId0) break; loadedId0=true; - QString name = e.attribute("name"); + TQString name = e.attribute("name"); d->slices.append(new Slice(this, id, name)); } } diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h index c9cb8d4..611c5fe 100644 --- a/noatun-plugins/oblique/base.h +++ b/noatun-plugins/oblique/base.h @@ -6,9 +6,9 @@ // ;) #define unless(e) if(!(e)) -#include <qstring.h> -#include <qobject.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqobject.h> +#include <tqptrlist.h> class File; class Slice; @@ -26,10 +26,10 @@ Q_OBJECT unsigned int mFormatVersion; public: - Base(const QString &file); + Base(const TQString &file); ~Base(); - File add(const QString &file); + File add(const TQString &file); File find(FileId id); @@ -45,10 +45,10 @@ public: **/ File first(FileId id=1); - QString property(FileId id, const QString &property) const; - void setProperty(FileId id, const QString &key, const QString &value); - QStringList properties(FileId id) const; - void clearProperty(FileId, const QString &key); + TQString property(FileId id, const TQString &property) const; + void setProperty(FileId id, const TQString &key, const TQString &value); + TQStringList properties(FileId id) const; + void clearProperty(FileId, const TQString &key); /** * same as File::remove @@ -62,8 +62,8 @@ public: void dump(); - QPtrList<Slice> slices(); - Slice *addSlice(const QString &name); + TQPtrList<Slice> slices(); + Slice *addSlice(const TQString &name); Slice *defaultSlice(); Slice *sliceById(int id); @@ -98,8 +98,8 @@ private: * load the xml that lives at the head of the db and contains * potentially lots of structured data **/ - void loadMetaXML(const QString &xml); - QString saveMetaXML(); + void loadMetaXML(const TQString &xml); + TQString saveMetaXML(); }; #endif diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index 93b4069..729ff54 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -14,72 +14,72 @@ #include <kinputdialog.h> #include <kconfig.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qfileinfo.h> -#include <qtooltip.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtabwidget.h> -#include <qheader.h> - -SchemaConfig::SchemaConfig(QWidget *parent, Oblique *oblique) - : QWidget(parent) +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqfileinfo.h> +#include <tqtooltip.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtabwidget.h> +#include <tqheader.h> + +SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) + : TQWidget(parent) { mOblique = oblique; mIgnore = true; mRegexpEditor=0; { - QVBoxLayout *layout = new QVBoxLayout(this, 11, 7); + TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7); layout->setAutoAdd(true); layout->setSpacing(7); } { - QHBox *box = new QHBox(this); + TQHBox *box = new TQHBox(this); box->setSpacing(7); - mSchemaList = new QComboBox(box); + mSchemaList = new TQComboBox(box); connect( - mSchemaList, SIGNAL(activated(const QString&)), - SLOT(selectSchema(const QString&)) + mSchemaList, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(selectSchema(const TQString&)) ); - mAdd = new QPushButton(BarIconSet("filenew"), 0, box); + mAdd = new TQPushButton(BarIconSet("filenew"), 0, box); mAdd->setFixedWidth(mAdd->height()); - QToolTip::add(mAdd, i18n("Create new schema")); - connect(mAdd, SIGNAL(clicked()), SLOT(newSchema())); + TQToolTip::add(mAdd, i18n("Create new schema")); + connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(newSchema())); - mRemove = new QPushButton(BarIconSet("editdelete"), 0, box); + mRemove = new TQPushButton(BarIconSet("editdelete"), 0, box); mRemove->setFixedWidth(mRemove->height()); - QToolTip::add(mRemove, i18n("Remove this schema")); - connect(mRemove, SIGNAL(clicked()), SLOT(removeSchema())); + TQToolTip::add(mRemove, i18n("Remove this schema")); + connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSchema())); - mCopy = new QPushButton(BarIconSet("editcopy"), 0, box); + mCopy = new TQPushButton(BarIconSet("editcopy"), 0, box); mCopy->setFixedWidth(mCopy->height()); - QToolTip::add(mCopy, i18n("Copy this schema")); - connect(mCopy, SIGNAL(clicked()), SLOT(copySchema())); + TQToolTip::add(mCopy, i18n("Copy this schema")); + connect(mCopy, TQT_SIGNAL(clicked()), TQT_SLOT(copySchema())); } { - QHBox *middle = new QHBox(this); + TQHBox *middle = new TQHBox(this); middle->setSpacing(7); mSchemaTree = new KListView(middle); connect( - mSchemaTree, SIGNAL(currentChanged(QListViewItem*)), - SLOT(setCurrent(QListViewItem*)) + mSchemaTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), + TQT_SLOT(setCurrent(TQListViewItem*)) ); connect( - mSchemaTree, SIGNAL(moved(QListViewItem *, QListViewItem *, QListViewItem *)), - SLOT(move(QListViewItem *, QListViewItem *, QListViewItem *)) + mSchemaTree, TQT_SIGNAL(moved(TQListViewItem *, TQListViewItem *, TQListViewItem *)), + TQT_SLOT(move(TQListViewItem *, TQListViewItem *, TQListViewItem *)) ); mSchemaTree->setAcceptDrops(true); @@ -92,79 +92,79 @@ SchemaConfig::SchemaConfig(QWidget *parent, Oblique *oblique) mSchemaTree->addColumn(i18n("Value")); mSchemaTree->addColumn(i18n("Presentation")); - QVBox *buttons = new QVBox(middle); + TQVBox *buttons = new TQVBox(middle); - mAddSibling = new QPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); + mAddSibling = new TQPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); mAddSibling->setFixedWidth(mAddSibling->height()); - connect(mAddSibling, SIGNAL(clicked()), SLOT(addSibling())); - QToolTip::add(mAddSibling, i18n("Create a new item after the selected one")); + connect(mAddSibling, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + TQToolTip::add(mAddSibling, i18n("Create a new item after the selected one")); - mAddChild = new QPushButton(BarIconSet("2rightarrow", KIcon::SizeSmall), "", buttons); + mAddChild = new TQPushButton(BarIconSet("2rightarrow", KIcon::SizeSmall), "", buttons); mAddChild->setFixedWidth(mAddChild->height()); - connect(mAddChild, SIGNAL(clicked()), SLOT(addChild())); - QToolTip::add(mAddChild, i18n("Create a new child item under the selected one")); + connect(mAddChild, TQT_SIGNAL(clicked()), TQT_SLOT(addChild())); + TQToolTip::add(mAddChild, i18n("Create a new child item under the selected one")); - mRemoveSelf = new QPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); + mRemoveSelf = new TQPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); mRemoveSelf->setFixedWidth(mRemoveSelf->height()); - connect(mRemoveSelf, SIGNAL(clicked()), SLOT(removeSelf())); - QToolTip::add(mRemoveSelf, i18n("Remove the selected item")); + connect(mRemoveSelf, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + TQToolTip::add(mRemoveSelf, i18n("Remove the selected item")); - new QWidget(buttons); + new TQWidget(buttons); } { - QVBox *side = new QVBox(this); + TQVBox *side = new TQVBox(this); side->setSpacing(7); // the controllers { - QWidget *topSide = new QWidget(side); - QGridLayout *grid = new QGridLayout(topSide); + TQWidget *topSide = new TQWidget(side); + TQGridLayout *grid = new TQGridLayout(topSide); - QLabel *label; + TQLabel *label; - label = new QLabel(i18n("&Property:"), topSide); + label = new TQLabel(i18n("&Property:"), topSide); mPropertyEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 0, 0); grid->addMultiCellWidget(mPropertyEdit, 0, 0, 1, 2); - connect(mPropertyEdit, SIGNAL(textChanged(const QString&)), SLOT(updateCurrent())); + connect(mPropertyEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); - label = new QLabel(i18n("&Value:"), topSide); + label = new TQLabel(i18n("&Value:"), topSide); mValueEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 1, 0); grid->addMultiCellWidget(mValueEdit, 1, 1, 1, 1); - connect(mValueEdit, SIGNAL(textChanged(const QString&)), SLOT(updateCurrent())); + connect(mValueEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); - QPushButton *editRe = new QPushButton(i18n("&Edit..."), topSide); + TQPushButton *editRe = new TQPushButton(i18n("&Edit..."), topSide); grid->addWidget(editRe, 1, 2); - connect(editRe, SIGNAL(clicked()), SLOT(editValueRegexp())); + connect(editRe, TQT_SIGNAL(clicked()), TQT_SLOT(editValueRegexp())); - label = new QLabel(i18n("Pre&sentation:"), topSide); + label = new TQLabel(i18n("Pre&sentation:"), topSide); mPresentationEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 2, 0); grid->addMultiCellWidget(mPresentationEdit, 2, 2, 1, 2); - connect(mPresentationEdit, SIGNAL(textChanged(const QString&)), SLOT(updateCurrent())); + connect(mPresentationEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); } { - QGroupBox *groupbox = new QGroupBox( + TQGroupBox *groupbox = new TQGroupBox( 3, Qt::Horizontal, i18n("Options"), side ); - mOptionPlayable = new QCheckBox(i18n("Play&able"), groupbox); - QWhatsThis::add(mOptionPlayable, i18n("This branch represents an individual file. If two items' presentation match, two items are created.")); - connect(mOptionPlayable, SIGNAL(toggled(bool)), SLOT(updateCurrent())); + mOptionPlayable = new TQCheckBox(i18n("Play&able"), groupbox); + TQWhatsThis::add(mOptionPlayable, i18n("This branch represents an individual file. If two items' presentation match, two items are created.")); + connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); - mOptionChildrenVisible = new QCheckBox(i18n("&Children visible"), groupbox); - QWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent")); - connect(mOptionChildrenVisible, SIGNAL(toggled(bool)), 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")); + connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); - mOptionAutoOpen = new QCheckBox(i18n("Auto &open"), groupbox); - QWhatsThis::add(mOptionAutoOpen, i18n("This branch is marked as open immediately.")); - connect(mOptionAutoOpen, SIGNAL(toggled(bool)), SLOT(updateCurrent())); + mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); + TQWhatsThis::add(mOptionAutoOpen, i18n("This branch is marked as open immediately.")); + connect(mOptionAutoOpen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); } } @@ -236,10 +236,10 @@ void SchemaConfig::reopen() mQueries.clear(); mSchemaTree->clear(); - QStringList names = oblique()->schemaNames(); - QString firstTitle; + TQStringList names = oblique()->schemaNames(); + TQString firstTitle; - for (QStringList::Iterator i(names.begin()); i != names.end(); ++i) + for (TQStringList::Iterator i(names.begin()); i != names.end(); ++i) { QueryItem qi; qi.title = oblique()->loadSchema(qi.query, *i); @@ -256,10 +256,10 @@ void SchemaConfig::reopen() void SchemaConfig::save() { - for (QMap<QString,QueryItem>::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) + for (TQMap<TQString,QueryItem>::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) { - QString name = i.key(); - name = QFileInfo(name).fileName(); + TQString name = i.key(); + name = TQFileInfo(name).fileName(); if (i.data().changed) { oblique()->saveSchema(i.data().query, name, i.data().title); @@ -269,24 +269,24 @@ void SchemaConfig::save() } -QString SchemaConfig::nameToFilename(const QString &_name) +TQString SchemaConfig::nameToFilename(const TQString &_name) { - QString name = _name; - name = name.replace(QRegExp("[^a-zA-Z0-9]"), "_"); + TQString name = _name; + name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_"); return name; } void SchemaConfig::newSchema() { bool ok; - QString str=KInputDialog::getText( + TQString str=KInputDialog::getText( i18n("Name of Schema"), i18n("Please enter the name of the new schema:"), "", &ok, this ); if (!ok) return; - QString filename = nameToFilename(str); + TQString filename = nameToFilename(str); if (mQueries.contains(nameToFilename(filename))) return; @@ -303,14 +303,14 @@ void SchemaConfig::newSchema() void SchemaConfig::copySchema() { bool ok; - QString str=KInputDialog::getText( + TQString str=KInputDialog::getText( i18n("Name of Schema"), i18n("Please enter the name of the new schema:"), "", &ok, this ); if (!ok) return; - QString filename = nameToFilename(str); + TQString filename = nameToFilename(str); if (mQueries.contains(nameToFilename(filename))) return; @@ -332,7 +332,7 @@ void SchemaConfig::removeSchema() selectSchema(mSchemaList->currentText()); } -void SchemaConfig::selectSchema(const QString &title) +void SchemaConfig::selectSchema(const TQString &title) { mSchemaTree->clear(); mSchemaList->setCurrentText(title); @@ -354,8 +354,8 @@ void SchemaConfig::editValueRegexp() unless (mRegexpEditor) { mRegexpEditor = - KParts::ComponentFactory::createInstanceFromQuery<QDialog>( - "KRegExpEditor/KRegExpEditor", QString::null, this + KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( + "KRegExpEditor/KRegExpEditor", TQString::null, this ); } @@ -367,12 +367,12 @@ void SchemaConfig::editValueRegexp() ); iface->setRegExp(mValueEdit->text()); - if (mRegexpEditor->exec() == QDialog::Accepted) + if (mRegexpEditor->exec() == TQDialog::Accepted) mValueEdit->setText(iface->regExp()); } } -void SchemaConfig::setCurrent(QListViewItem *_item) +void SchemaConfig::setCurrent(TQListViewItem *_item) { if (!_item) return; QueryGroupItem *item = static_cast<QueryGroupItem*>(_item); @@ -398,7 +398,7 @@ void SchemaConfig::updateCurrent() mod->setPropertyName(mPropertyEdit->text()); mod->setPresentation(mPresentationEdit->text()); - mod->setValue(QRegExp(mValueEdit->text())); + mod->setValue(TQRegExp(mValueEdit->text())); mod->setOption(QueryGroup::AutoOpen, mOptionAutoOpen->isChecked()); mod->setOption(QueryGroup::Playable, mOptionPlayable->isChecked()); @@ -406,7 +406,7 @@ void SchemaConfig::updateCurrent() item->redisplay(); } -void SchemaConfig::move(QListViewItem *_item, QListViewItem *, QListViewItem *_afterNow) +void SchemaConfig::move(TQListViewItem *_item, TQListViewItem *, TQListViewItem *_afterNow) { setCurrentModified(); QueryGroupItem *item = static_cast<QueryGroupItem*>(_item); @@ -490,8 +490,8 @@ void SchemaConfig::setCurrentModified() SchemaConfig::QueryItem *SchemaConfig::currentQuery() { - QString title = mSchemaList->currentText(); - for (QMap<QString,QueryItem>::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) + TQString title = mSchemaList->currentText(); + for (TQMap<TQString,QueryItem>::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) { if (i.data().title != title) continue; return &i.data(); @@ -500,37 +500,37 @@ SchemaConfig::QueryItem *SchemaConfig::currentQuery() } -SliceConfig::SliceConfig(QWidget *parent, Oblique *oblique) - : QWidget(parent) +SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) + : TQWidget(parent) { mOblique = oblique; - (new QVBoxLayout(this, 11, 7))->setAutoAdd(true); + (new TQVBoxLayout(this, 11, 7))->setAutoAdd(true); { - QHBox *middle = new QHBox(this); + TQHBox *middle = new TQHBox(this); middle->setSpacing(7); mSliceList = new KListView(middle); - QWhatsThis::add(mSliceList, i18n("The list of slices. A Slice is part of the full collection. This allows you to categorize your playlist. You can add an item to the list by right clicking on it and selecting the Slice you want it in.")); + TQWhatsThis::add(mSliceList, i18n("The list of slices. A Slice is part of the full collection. This allows you to categorize your playlist. You can add an item to the list by right clicking on it and selecting the Slice you want it in.")); mSliceList->addColumn(""); mSliceList->header()->hide(); mSliceList->setSorting(0); mSliceList->setItemsRenameable(true); - QVBox *buttons = new QVBox(middle); + TQVBox *buttons = new TQVBox(middle); - mAdd = new QPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); + mAdd = new TQPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); mAdd->setFixedWidth(mAdd->height()); - connect(mAdd, SIGNAL(clicked()), SLOT(addSibling())); - QToolTip::add(mAdd, i18n("Create a new item")); + connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + TQToolTip::add(mAdd, i18n("Create a new item")); - mRemove = new QPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); + mRemove = new TQPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); mRemove->setFixedWidth(mRemove->height()); - connect(mRemove, SIGNAL(clicked()), SLOT(removeSelf())); - QToolTip::add(mRemove, i18n("Remove the selected item")); + connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + TQToolTip::add(mRemove, i18n("Remove the selected item")); - new QWidget(buttons); + new TQWidget(buttons); } } @@ -557,7 +557,7 @@ public: SliceListItem *SliceConfig::currentItem() { - QListViewItem *c = mSliceList->currentItem(); + TQListViewItem *c = mSliceList->currentItem(); return static_cast<SliceListItem*>(c); } @@ -568,9 +568,9 @@ void SliceConfig::reopen() mRemovedItems.clear(); mAddedItems.clear(); - QPtrList<Slice> slices = oblique()->base()->slices(); + TQPtrList<Slice> slices = oblique()->base()->slices(); - for (QPtrListIterator<Slice> i(slices); *i; ++i) + for (TQPtrListIterator<Slice> i(slices); *i; ++i) { Slice *slice = *i; new SliceListItem(mSliceList, slice); @@ -580,7 +580,7 @@ void SliceConfig::reopen() void SliceConfig::save() { for ( - QValueList<Slice*>::Iterator i(mRemovedItems.begin()); + TQValueList<Slice*>::Iterator i(mRemovedItems.begin()); i != mRemovedItems.end(); ++i ) @@ -590,7 +590,7 @@ void SliceConfig::save() } for ( - QValueList<SliceListItem*>::Iterator i(mAddedItems.begin()); + TQValueList<SliceListItem*>::Iterator i(mAddedItems.begin()); i != mAddedItems.end(); ++i ) @@ -598,7 +598,7 @@ void SliceConfig::save() oblique()->base()->addSlice((*i)->text(0)); } - for (QListViewItem *i = mSliceList->firstChild(); i; i = i->nextSibling()) + for (TQListViewItem *i = mSliceList->firstChild(); i; i = i->nextSibling()) { SliceListItem *si = static_cast<SliceListItem*>(i); @@ -639,8 +639,8 @@ void SliceConfig::removeSelf() Configure::Configure(Oblique *oblique) : CModule(i18n("Oblique"), i18n("Configure Oblique Playlist"), "", oblique) { - (new QVBoxLayout(this))->setAutoAdd(true); - tabs = new QTabWidget(this); + (new TQVBoxLayout(this))->setAutoAdd(true); + tabs = new TQTabWidget(this); tabs->addTab(slice = new SliceConfig(tabs, oblique), i18n("Slices")); tabs->addTab(schema = new SchemaConfig(tabs, oblique), i18n("Schemas")); diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h index f60c6c3..41af7f1 100644 --- a/noatun-plugins/oblique/cmodule.h +++ b/noatun-plugins/oblique/cmodule.h @@ -23,43 +23,43 @@ Q_OBJECT KListView *mSchemaTree; KLineEdit *mPropertyEdit, *mValueEdit, *mPresentationEdit; - QComboBox *mSchemaList; + TQComboBox *mSchemaList; - QCheckBox *mOptionPlayable, *mOptionChildrenVisible, *mOptionAutoOpen; + TQCheckBox *mOptionPlayable, *mOptionChildrenVisible, *mOptionAutoOpen; - QPushButton *mAdd, *mRemove, *mCopy; + TQPushButton *mAdd, *mRemove, *mCopy; - QPushButton *mAddSibling, *mAddChild, *mRemoveSelf; + TQPushButton *mAddSibling, *mAddChild, *mRemoveSelf; - QDialog *mRegexpEditor; + TQDialog *mRegexpEditor; bool mIgnore; struct QueryItem { Query query; - QString title; + TQString title; bool changed; }; - QMap<QString, QueryItem> mQueries; + TQMap<TQString, QueryItem> mQueries; public: - SchemaConfig(QWidget *parent, Oblique *oblique); + SchemaConfig(TQWidget *parent, Oblique *oblique); Oblique *oblique() { return mOblique; } void reopen(); void save(); - static QString nameToFilename(const QString &name); - static QString filenameToName(const QString &filename); + static TQString nameToFilename(const TQString &name); + static TQString filenameToName(const TQString &filename); public slots: void newSchema(); void copySchema(); void removeSchema(); - void selectSchema(const QString &title); + void selectSchema(const TQString &title); void addSibling(); void addChild(); @@ -70,10 +70,10 @@ public slots: private slots: void editValueRegexp(); - void setCurrent(QListViewItem *_item); + void setCurrent(TQListViewItem *_item); void updateCurrent(); - void move(QListViewItem *item, QListViewItem *afterFirst, QListViewItem *afterNow); + void move(TQListViewItem *item, TQListViewItem *afterFirst, TQListViewItem *afterNow); private: QueryItem *currentQuery(); @@ -86,12 +86,12 @@ class SliceConfig : public QWidget Q_OBJECT Oblique *mOblique; KListView *mSliceList; - QPushButton *mAdd, *mRemove; - QValueList<SliceListItem*> mAddedItems; - QValueList<Slice*> mRemovedItems; + TQPushButton *mAdd, *mRemove; + TQValueList<SliceListItem*> mAddedItems; + TQValueList<Slice*> mRemovedItems; public: - SliceConfig(QWidget *parent, Oblique *oblique); + SliceConfig(TQWidget *parent, Oblique *oblique); Oblique *oblique() { return mOblique; } void reopen(); @@ -108,7 +108,7 @@ private slots: class Configure : public CModule { Q_OBJECT - QTabWidget *tabs; + TQTabWidget *tabs; SchemaConfig *schema; SliceConfig *slice; diff --git a/noatun-plugins/oblique/file.cpp b/noatun-plugins/oblique/file.cpp index b478e0f..2946f23 100644 --- a/noatun-plugins/oblique/file.cpp +++ b/noatun-plugins/oblique/file.cpp @@ -38,7 +38,7 @@ File &File::operator=(const File &ref) return *this; } -QString File::file() const +TQString File::file() const { return property("file"); } @@ -68,13 +68,13 @@ static const Map propertyMap[] = { 0, 0 } }; -QString File::property(const QString &property) const +TQString File::property(const TQString &property) const { - QString str = base()->property(id(), property); + TQString str = base()->property(id(), property); if (!str) { - QString mangled = "ob::" + property + "_"; + TQString mangled = "ob::" + property + "_"; str = base()->property(id(), mangled); } @@ -89,10 +89,10 @@ void File::makeCache() for (int i=0; propertyMap[i].kfmi; i++) { - QString kname(propertyMap[i].kfmi); + TQString kname(propertyMap[i].kfmi); if (info.isValid() && kname.length()) { - QString val = info.item(kname).string(false); + TQString val = info.item(kname).string(false); if (val=="---" || !val.stripWhiteSpace().length()) { // grr val = ""; @@ -106,7 +106,7 @@ void File::makeCache() } -void File::setProperty(const QString &key, const QString &value) +void File::setProperty(const TQString &key, const TQString &value) { if (property(key) == value) return; base()->setProperty(id(), key, value); @@ -114,7 +114,7 @@ void File::setProperty(const QString &key, const QString &value) p.data()->modified(); } -void File::clearProperty(const QString &key) +void File::clearProperty(const TQString &key) { if (property(key).isNull()) return; base()->clearProperty(id(), key); @@ -122,9 +122,9 @@ void File::clearProperty(const QString &key) p.data()->modified(); } -QStringList File::properties() const +TQStringList File::properties() const { - QStringList l = base()->properties(id()); + TQStringList l = base()->properties(id()); for (int i=0; propertyMap[i].noatun; i++) { @@ -147,7 +147,7 @@ void File::setPosition(Query *query, const File &after) { setProperty( "Oblique:after_" + query->name() + '_', - QString::number(after.id()) + TQString::number(after.id()) ); } @@ -155,10 +155,10 @@ bool File::getPosition(const Query *query, File *after) const { assert(query); assert(after); - QString name = "Oblique:after_" + query->name() + '_'; + TQString name = "Oblique:after_" + query->name() + '_'; if (name.isEmpty()) return false; - QString val = property(name); + TQString val = property(name); if (val.isEmpty()) return false; *after = File(mBase, val.toUInt()); @@ -175,17 +175,17 @@ void File::remove() void File::addTo(Slice *slice) { - QString slices = property("Oblique:slices_"); - slices += "\n" + QString::number(slice->id(), 16); + TQString slices = property("Oblique:slices_"); + slices += "\n" + TQString::number(slice->id(), 16); setProperty("Oblique:slices_", slices); emit mBase->addedTo(slice, *this); } void File::removeFrom(Slice *slice) { - QString slices = property("Oblique:slices_"); - QStringList sliceList = QStringList::split('\n', slices); - QString sid = QString::number(slice->id(), 16); + TQString slices = property("Oblique:slices_"); + TQStringList sliceList = TQStringList::split('\n', slices); + TQString sid = TQString::number(slice->id(), 16); sliceList.remove(sid); slices = sliceList.join("\n"); @@ -198,9 +198,9 @@ bool File::isIn(const Slice *slice) const int id = slice->id(); if (id==0) return true; - QString slices = property("Oblique:slices_"); - QStringList sliceList = QStringList::split('\n', slices); - for (QStringList::Iterator i(sliceList.begin()); i!= sliceList.end(); ++i) + TQString slices = property("Oblique:slices_"); + TQStringList sliceList = TQStringList::split('\n', slices); + for (TQStringList::Iterator i(sliceList.begin()); i!= sliceList.end(); ++i) { if ((*i).toInt(0, 16) == id) return true; } @@ -209,20 +209,20 @@ bool File::isIn(const Slice *slice) const -Slice::Slice(Base *base, int id, const QString &name) +Slice::Slice(Base *base, int id, const TQString &name) { mId = id; mBase = base; mName = name; } -QString Slice::name() const +TQString Slice::name() const { if (mId == 0) return i18n("Complete Collection"); return mName; } -void Slice::setName(const QString &name) +void Slice::setName(const TQString &name) { if (mId == 0) return; mName = name; diff --git a/noatun-plugins/oblique/file.h b/noatun-plugins/oblique/file.h index 21d3be9..d2a43f0 100644 --- a/noatun-plugins/oblique/file.h +++ b/noatun-plugins/oblique/file.h @@ -42,12 +42,12 @@ public: inline operator bool() const { return mId; } - QString file() const; + TQString file() const; KURL url() const; - QString property(const QString &property) const; - void setProperty(const QString &key, const QString &value); - void clearProperty(const QString &key); - QStringList properties() const; + TQString property(const TQString &property) const; + void setProperty(const TQString &key, const TQString &value); + void clearProperty(const TQString &key); + TQStringList properties() const; inline FileId id() const { return mId; } void setId(FileId id); @@ -87,7 +87,7 @@ public: class Slice { int mId; - QString mName; + TQString mName; Base *mBase; public: @@ -95,10 +95,10 @@ public: * @internal * create a slice based on its data **/ - Slice(Base *base, int id, const QString &name); + Slice(Base *base, int id, const TQString &name); - QString name() const; - void setName(const QString &name); + TQString name() const; + void setName(const TQString &name); /** * remove this slice from the list of slices diff --git a/noatun-plugins/oblique/kbuffer.h b/noatun-plugins/oblique/kbuffer.h index adc62ba..63e626b 100644 --- a/noatun-plugins/oblique/kbuffer.h +++ b/noatun-plugins/oblique/kbuffer.h @@ -5,7 +5,7 @@ #ifndef KBUFFER_H #define KBUFFER_H -#include <qiodevice.h> +#include <tqiodevice.h> #include <vector> #include <queue> @@ -14,7 +14,7 @@ *@author Eray Ozkural (exa) */ -class KBuffer : public QIODevice { +class KBuffer : public TQIODevice { public: KBuffer(); ~KBuffer(); diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp index 9e2ddac..ed57aea 100644 --- a/noatun-plugins/oblique/kdatacollection.cpp +++ b/noatun-plugins/oblique/kdatacollection.cpp @@ -23,46 +23,46 @@ #include <kglobal.h> #include <kstandarddirs.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> KDataCollection::KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ) { init(config, group, entry, datadir, dir); } KDataCollection::KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const TQString &dir ) { init(config, group, entry, "appdata", dir); } KDataCollection::KDataCollection( - KConfig *config, const QString &group, const QString &dir + KConfig *config, const TQString &group, const TQString &dir ) { init(config, group, dir, "appdata", dir); } -KDataCollection::KDataCollection(KConfig *config, const QString &dir) +KDataCollection::KDataCollection(KConfig *config, const TQString &dir) { init(config, "KDataCollection", dir, "appdata", dir); } -KDataCollection::KDataCollection(const QString &dir) +KDataCollection::KDataCollection(const TQString &dir) { init(KGlobal::config(), "KDataCollection", dir, "appdata", dir); } void KDataCollection::init( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ) { mConfig = config; @@ -72,19 +72,19 @@ void KDataCollection::init( mDatadir = datadir; } -QStringList KDataCollection::names() const +TQStringList KDataCollection::names() const { KConfigGroup g(mConfig, mGroup); // these are the entries I have - QStringList n = g.readListEntry(mEntry); - QStringList fs = KGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); - QStringList total; + TQStringList n = g.readListEntry(mEntry); + TQStringList fs = KGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); + TQStringList total; - for (QStringList::Iterator i(fs.begin()); i != fs.end(); ++i) + for (TQStringList::Iterator i(fs.begin()); i != fs.end(); ++i) { - QFileInfo fi(*i); - QString name = fi.fileName(); + TQFileInfo fi(*i); + TQString name = fi.fileName(); if (!n.contains(name)) { total.append(name); @@ -94,28 +94,28 @@ QStringList KDataCollection::names() const return total; } -void KDataCollection::remove(const QString &name) +void KDataCollection::remove(const TQString &name) { KConfigGroup g(mConfig, mGroup); - QString location = file(name); + TQString location = file(name); if (location.isEmpty()) return; if (location == saveFile(name, false)) { - QFile(location).remove(); + TQFile(location).remove(); // is there a system one too? location = file(name, false); if (location.isEmpty()) return; } - QStringList n = g.readListEntry(mEntry); + TQStringList n = g.readListEntry(mEntry); if (n.contains(name)) return; n.append(name); g.writeEntry(mEntry, n); } -QString KDataCollection::file(const QString &name, bool create) +TQString KDataCollection::file(const TQString &name, bool create) { - QString path = ::locate(mDatadir, mDir+"/"+name); + TQString path = ::locate(mDatadir, mDir+"/"+name); if (path.isEmpty() && create) { @@ -124,20 +124,20 @@ QString KDataCollection::file(const QString &name, bool create) return path; } -QString KDataCollection::saveFile(const QString &name, bool create) +TQString KDataCollection::saveFile(const TQString &name, bool create) { if (!KGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name)) { - QString s = KGlobal::dirs()->saveLocation(mDatadir, mDir, create); + TQString s = KGlobal::dirs()->saveLocation(mDatadir, mDir, create); if (s.length() && create) { s += "/" + name; - QFile(s).open(IO_ReadWrite); // create it + TQFile(s).open(IO_ReadWrite); // create it } return s; } - return QString::null; + return TQString::null; } diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h index e8820f3..a737e43 100644 --- a/noatun-plugins/oblique/kdatacollection.h +++ b/noatun-plugins/oblique/kdatacollection.h @@ -20,8 +20,8 @@ #ifndef KDATACOLLECTION_H #define KDATACOLLECTION_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> class KConfig; @@ -36,9 +36,9 @@ class KConfig; * *<pre> * KDataCollection profiles("appname/ui_profiles"); - * QStringList letUserSelectOne = profiles.names(); - * QString fileToOpen = profiles.file(theOneUserSelected); - * QString fileToWriteTo = profiles.saveFile(theOneUserSelected); + * TQStringList letUserSelectOne = profiles.names(); + * TQString fileToOpen = profiles.file(theOneUserSelected); + * TQString fileToWriteTo = profiles.saveFile(theOneUserSelected); *</pre> * * @author Charles Samuels <charles@kde.org> @@ -46,7 +46,7 @@ class KConfig; class KDataCollection { KConfig *mConfig; - QString mGroup, mEntry, mDir; + TQString mGroup, mEntry, mDir; const char *mDatadir; struct Private; @@ -60,8 +60,8 @@ public: * @param datadir is what is passed to locate, this is "appdata" by default **/ KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ); /** @@ -69,8 +69,8 @@ public: * settings, @p dir is the second argument to locate("appdata", ...) **/ KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const TQString &dir ); /** @@ -80,8 +80,8 @@ public: * otherwise the same as the previous function **/ KDataCollection( - KConfig *config, const QString &group, - const QString &dir + KConfig *config, const TQString &group, + const TQString &dir ); /** @@ -91,26 +91,26 @@ public: * * otherwise the same as the previous function **/ - KDataCollection(KConfig *config, const QString &dir); + KDataCollection(KConfig *config, const TQString &dir); /** * constructor. the KConfig is assumed to be KGlobal::config() * * otherwise the same as the previous function **/ - KDataCollection(const QString &dir); + KDataCollection(const TQString &dir); /** * returns a list of existant, non hidden files **/ - QStringList names() const; + TQStringList names() const; /** * deletes the file if it is in KDEHOME, or marks it as hidden if it's a * system file **/ - void remove(const QString &name); + void remove(const TQString &name); /** * @returns the filename for a file named @p name, if @p create @@ -119,7 +119,7 @@ public: * * if you want to modify this file, you should use saveFile instead **/ - QString file(const QString &name, bool create=true); + TQString file(const TQString &name, bool create=true); /** * @returns the filename for a file you can save into. If @p create is @@ -132,12 +132,12 @@ public: * It will not return a file if the Kiosk framework claims that it's * restricted **/ - QString saveFile(const QString &name, bool create=true); + TQString saveFile(const TQString &name, bool create=true); private: void init( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ); }; diff --git a/noatun-plugins/oblique/kdbt.h b/noatun-plugins/oblique/kdbt.h index acaae57..4ecc71a 100644 --- a/noatun-plugins/oblique/kdbt.h +++ b/noatun-plugins/oblique/kdbt.h @@ -7,8 +7,8 @@ #define KDbt_Interface #include <db_cxx.h> -#include <qdatastream.h> -#include <qbuffer.h> +#include <tqdatastream.h> +#include <tqbuffer.h> #include "kbuffer.h" /**A generic wrapper for "database thang" class that abstracts binary streaming operations. @@ -19,8 +19,8 @@ template <typename T> class KDbt : public Dbt { public: /* assume streaming operators on QDataStream - QDataStream & operator>> ( QDataStream& >>, T &); - QDataStream & operator<< ( QDataStream& >>, T &); + TQDataStream & operator>> ( TQDataStream& >>, T &); + TQDataStream & operator<< ( TQDataStream& >>, T &); */ KDbt() { } @@ -34,7 +34,7 @@ public: /** set "thang" to the contents of obj */ void set(const T& obj) { // KBuffer buffer(thang); - QDataStream ds(&thang); + TQDataStream ds(&thang); ds << obj; // std::cerr << "thang size " << thang.size() << endl; // buffer.close(); @@ -44,15 +44,15 @@ public: set_size(thang.size()); } void get(T& obj) { - QByteArray buffer; + TQByteArray buffer; buffer.setRawData((char*)get_data(),get_size()); - QDataStream ds(buffer,IO_ReadWrite); + TQDataStream ds(buffer,IO_ReadWrite); ds >> obj; buffer.resetRawData((char*)get_data(),get_size()); } private: /** Internal data */ -// QByteArray thang; +// TQByteArray thang; KBuffer thang; }; diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index 0556d88..3867f19 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -7,25 +7,25 @@ #include "tree.h" -FileMenu::FileMenu(QWidget *parent, Oblique *oblique, File file) +FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) : KPopupMenu(parent) { if (file) mFiles.append(file); insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, SLOT(removeFromList()) + this, TQT_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, SLOT(properties())); + insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, SLOT(toggleInSlice(Slice *)), + this, TQT_SLOT(toggleInSlice(Slice *)), mFiles, this ))->plug(this); } -static void addTo(QValueList<File> &files, TreeItem *item) +static void addTo(TQValueList<File> &files, TreeItem *item) { File f = item->file(); if (f) files.append(f); @@ -39,27 +39,27 @@ static void addTo(QValueList<File> &files, TreeItem *item) } } -FileMenu::FileMenu(QWidget *parent, Oblique *oblique, TreeItem *items) +FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) : KPopupMenu(parent) { addTo(mFiles, items); insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, SLOT(removeFromList()) + this, TQT_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, SLOT(properties())); + insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, SLOT(toggleInSlice(Slice *)), + this, TQT_SLOT(toggleInSlice(Slice *)), mFiles, this ))->plug(this); } void FileMenu::removeFromList() { - for (QValueList<File>::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) + for (TQValueList<File>::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) { (*i).remove(); } @@ -73,7 +73,7 @@ void FileMenu::properties() void FileMenu::toggleInSlice(Slice *slice) { void (File::*task)(Slice*)=0; - for (QValueList<File>::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) + for (TQValueList<File>::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) { if (!task) { // we check with the first one @@ -90,18 +90,18 @@ void FileMenu::toggleInSlice(Slice *slice) SliceListAction::SliceListAction( - const QString &text, Oblique *oblique, - QObject *reciever, const char *slot, - const QValueList<File> &files, QObject *parent, const char *name + const TQString &text, Oblique *oblique, + TQObject *reciever, const char *slot, + const TQValueList<File> &files, TQObject *parent, const char *name ) : KActionMenu(text, parent, name) { mFiles = files; mOblique = oblique; slicesModified(); if (reciever) - connect(this, SIGNAL(activated(Slice*)), reciever, slot); - connect(popupMenu(), SIGNAL(activated(int)), SLOT(hit(int))); - connect(oblique->base(), SIGNAL(slicesModified()), SLOT(slicesModified())); + connect(this, TQT_SIGNAL(activated(Slice*)), reciever, slot); + connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(hit(int))); + connect(oblique->base(), TQT_SIGNAL(slicesModified()), TQT_SLOT(slicesModified())); } void SliceListAction::slicesModified() @@ -110,12 +110,12 @@ void SliceListAction::slicesModified() KPopupMenu *menu = popupMenu(); menu->clear(); - QPtrList<Slice> slices = mOblique->base()->slices(); + TQPtrList<Slice> slices = mOblique->base()->slices(); int id=1; - for (QPtrListIterator<Slice> i(slices); *i; ++i) + for (TQPtrListIterator<Slice> i(slices); *i; ++i) { Slice *s = *i; if (s->id()==0 && mFiles.count()) @@ -151,16 +151,16 @@ void SliceListAction::hit(int index) SchemaListAction::SchemaListAction( - const QString &text, - QObject *reciever, const char *slot, - QObject *parent, const char *name + const TQString &text, + TQObject *reciever, const char *slot, + TQObject *parent, const char *name ) : KActionMenu(text, parent, name) { mTree = 0; if (reciever) - connect(this, SIGNAL(activated(const QString&)), reciever, slot); - connect(popupMenu(), SIGNAL(aboutToShow()), SLOT(prepare())); - connect(popupMenu(), SIGNAL(activated(int)), SLOT(hit(int))); + connect(this, TQT_SIGNAL(activated(const TQString&)), reciever, slot); + connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(prepare())); + connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(hit(int))); } void SchemaListAction::prepare() @@ -174,12 +174,12 @@ void SchemaListAction::prepare() int id=1; - QStringList names = mTree->oblique()->schemaNames(); + TQStringList names = mTree->oblique()->schemaNames(); - for (QStringList::Iterator i(names.begin()); i != names.end(); ++i) + for (TQStringList::Iterator i(names.begin()); i != names.end(); ++i) { Query q; - QString title = mTree->oblique()->loadSchema(q, *i); + TQString title = mTree->oblique()->loadSchema(q, *i); menu->insertItem(title, id); @@ -197,11 +197,11 @@ void SchemaListAction::hit(int index) -ObliquePropertiesDialog::ObliquePropertiesDialog(const QValueList<File> &files, QWidget *parent) +ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent) : KPropertiesDialog(makeItems(files), parent), mFiles(files) { - connect(this, SIGNAL(propertiesClosed()), SLOT(deleteLater())); - connect(this, SIGNAL(applied()), SLOT(modified())); + connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater())); + connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified())); show(); } @@ -209,17 +209,17 @@ ObliquePropertiesDialog::ObliquePropertiesDialog(const QValueList<File> &files, void ObliquePropertiesDialog::modified() { // TODO reload the file's info - for (QValueList<File>::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) + for (TQValueList<File>::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) { (*i).makeCache(); (*i).base()->notifyChanged(*i); } } -KFileItemList ObliquePropertiesDialog::makeItems(const QValueList<File> &files) +KFileItemList ObliquePropertiesDialog::makeItems(const TQValueList<File> &files) { KFileItemList kl; - for (QValueList<File>::ConstIterator i(files.begin()); i != files.end(); ++i) + for (TQValueList<File>::ConstIterator i(files.begin()); i != files.end(); ++i) { File f = *i; kl.append(new KFileItem(f.url(), f.property("mimetype"), KFileItem::Unknown)); diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h index 793180c..da464dc 100644 --- a/noatun-plugins/oblique/menu.h +++ b/noatun-plugins/oblique/menu.h @@ -17,14 +17,14 @@ class FileMenu : public KPopupMenu { Q_OBJECT - QValueList<File> mFiles; + TQValueList<File> mFiles; public: - FileMenu(QWidget *parent, Oblique *oblique, File file); + FileMenu(TQWidget *parent, Oblique *oblique, File file); /** * @recursively uses everything under @p files **/ - FileMenu(QWidget *parent, Oblique *oblique, TreeItem *files); + FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *files); private slots: void removeFromList(); @@ -35,15 +35,15 @@ private slots: class SliceListAction : public KActionMenu { Q_OBJECT - QMap<int, Slice*> mIndexToSlices; - QValueList<File> mFiles; + TQMap<int, Slice*> mIndexToSlices; + TQValueList<File> mFiles; Oblique *mOblique; public: SliceListAction( - const QString &text, Oblique *oblique, - QObject *reciever, const char *slot, - const QValueList<File> &files = QValueList<File>(), QObject *parent=0, const char *name=0 + const TQString &text, Oblique *oblique, + TQObject *reciever, const char *slot, + const TQValueList<File> &files = TQValueList<File>(), TQObject *parent=0, const char *name=0 ); signals: @@ -58,20 +58,20 @@ private slots: class SchemaListAction : public KActionMenu { Q_OBJECT - QMap<int, QString> mIndexToSchemas; + TQMap<int, TQString> mIndexToSchemas; Tree *mTree; public: SchemaListAction( - const QString &text, - QObject *reciever, const char *slot, - QObject *parent, const char *name + const TQString &text, + TQObject *reciever, const char *slot, + TQObject *parent, const char *name ); void setTree(Tree *tree) { mTree = tree; } signals: - void activated(const QString &); + void activated(const TQString &); private slots: void hit(int index); @@ -82,13 +82,13 @@ private slots: class ObliquePropertiesDialog : public KPropertiesDialog { Q_OBJECT - QValueList<File> mFiles; + TQValueList<File> mFiles; public: - ObliquePropertiesDialog(const QValueList<File> &files, QWidget *parent); + ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent); private: - static KFileItemList makeItems(const QValueList<File> &files); + static KFileItemList makeItems(const TQValueList<File> &files); private slots: void modified(); diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index 97e75be..234833a 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -15,7 +15,7 @@ #include <kio/job.h> #include <kfileitem.h> -#include <qtimer.h> +#include <tqtimer.h> extern "C" Plugin *create_plugin() { @@ -35,15 +35,15 @@ Oblique::Oblique() mBase = new Base(::locate("data", "noatun/")+"/oblique-list"); mView = new View(this); - connect(napp->player(), SIGNAL(loopTypeChange(int)), SLOT(loopTypeChange(int))); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_SLOT(loopTypeChange(int))); mSelector = new SequentialSelector(mView->tree()); new Configure(this); // psst, window's gone, pass it on! - connect(mView, SIGNAL(listHidden()), SIGNAL(listHidden())); - connect(mView, SIGNAL(listShown()), SIGNAL(listShown())); + connect(mView, TQT_SIGNAL(listHidden()), TQT_SIGNAL(listHidden())); + connect(mView, TQT_SIGNAL(listShown()), TQT_SIGNAL(listShown())); loopTypeChange(napp->player()->loopStyle()); } @@ -185,21 +185,21 @@ void Oblique::beginDirectoryAdd(const KURL &url) else { mAdder = new DirectoryAdder(url, this); - connect(mAdder, SIGNAL(done()), SLOT(adderDone())); + connect(mAdder, TQT_SIGNAL(done()), TQT_SLOT(adderDone())); } } Loader::Loader(Tree *tree) - : QObject(tree) + : TQObject(tree) { mTree = tree; mBase = mTree->oblique()->base(); mDeferredLoaderAt=1; - QTimer::singleShot(0, this, SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); } void Loader::loadItemsDeferred() @@ -228,7 +228,7 @@ void Loader::loadItemsDeferred() mDeferredLoaderAt++; } - QTimer::singleShot(0, this, SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); } @@ -265,16 +265,16 @@ void DirectoryAdder::addNextPending() currentJobURL= *pendingIt; listJob = KIO::listDir(currentJobURL, false, false); connect( - listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), - SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)) + listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), + TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)) ); connect( - listJob, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *)) + listJob, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *)) ); connect( - listJob, SIGNAL(redirection(KIO::Job *, const KURL &)), - SLOT(slotRedirection(KIO::Job *, const KURL &)) + listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)), + TQT_SLOT(slotRedirection(KIO::Job *, const KURL &)) ); pendingAddDirectories.remove(pendingIt); lastAddedSubDirectory = pendingAddDirectories.begin(); @@ -293,7 +293,7 @@ void DirectoryAdder::slotResult(KIO::Job *job) void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries) { - QMap<QString,KURL> __list; // temp list to sort entries + TQMap<TQString,KURL> __list; // temp list to sort entries KIO::UDSEntryListConstIterator it = entries.begin(); KIO::UDSEntryListConstIterator end = entries.end(); @@ -309,7 +309,7 @@ void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries) // - copied over from old kdirlister hack <hans_meine@gmx.de> __list.insert(file.url().path(), file.url()); } - QMap<QString,KURL>::Iterator __it; + TQMap<TQString,KURL>::Iterator __it; for( __it = __list.begin(); __it != __list.end(); ++__it ) { oblique()->addFile(__it.data(), false); diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h index 93d1e18..f7e6bc8 100644 --- a/noatun-plugins/oblique/oblique.h +++ b/noatun-plugins/oblique/oblique.h @@ -40,21 +40,21 @@ public: Base *base() { return mBase; } - QStringList schemaNames() const { return mSchemaCollection.names(); } - QString loadSchema(Query &q, const QString &name) + TQStringList schemaNames() const { return mSchemaCollection.names(); } + TQString loadSchema(Query &q, const TQString &name) { - QString t = q.load(mSchemaCollection.file(name)); + TQString t = q.load(mSchemaCollection.file(name)); if (t.length()) q.setName(name); return t; } - void saveSchema(Query &q, const QString &name, const QString &title) + void saveSchema(Query &q, const TQString &name, const TQString &title) { q.save(title, mSchemaCollection.saveFile(name)); } - void removeSchema(const QString &name) + void removeSchema(const TQString &name) { mSchemaCollection.remove(name); } diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index 292ff16..8c85b59 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -8,8 +8,8 @@ #include <klocale.h> -#include <qdom.h> -#include <qfile.h> +#include <tqdom.h> +#include <tqfile.h> QueryGroup::QueryGroup() { @@ -136,23 +136,23 @@ void QueryGroup::setOption(Option option, bool on) bool QueryGroup::matches(const File &file) const { - QString prop = file.property(propertyName()); + TQString prop = file.property(propertyName()); prop = prop.simplifyWhiteSpace(); if (prop.isNull()) prop = ""; - QRegExp re(value()); + TQRegExp re(value()); return re.search(prop) != -1; } -QString QueryGroup::presentation(const File &file) const +TQString QueryGroup::presentation(const File &file) const { // "$(property)" - QString format=presentation(); + TQString format=presentation(); - QRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); + TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); int start=0; while (start != -1) @@ -166,7 +166,7 @@ QString QueryGroup::presentation(const File &file) const // yes, so half the amount of backslashes // count how many there are first - QRegExp counter("([\\\\]+)"); + TQRegExp counter("([\\\\]+)"); counter.search(format, start-1); uint len=counter.cap(1).length()-1; @@ -181,7 +181,7 @@ QString QueryGroup::presentation(const File &file) const if (format[start]=='\\') { // count how many there are first - QRegExp counter("([\\\\]+)"); + TQRegExp counter("([\\\\]+)"); counter.search(format, start); uint len=counter.cap(1).length(); @@ -191,8 +191,8 @@ QString QueryGroup::presentation(const File &file) const } // "sth"foo"sth" - QString cont(find.cap(1)); - QString prefix,suffix,propname; + TQString cont(find.cap(1)); + TQString prefix,suffix,propname; unsigned int i=0; if (cont[i] == '"') { @@ -231,7 +231,7 @@ QString QueryGroup::presentation(const File &file) const i++; - QString propval = file.property(propname); + TQString propval = file.property(propname); // the following code won't be enabled until the presentation is reloaded // at the best times @@ -318,27 +318,27 @@ void Query::clear() mGroupFirst=0; } -QString Query::load(const QString &filename) +TQString Query::load(const TQString &filename) { - QFile file(filename); - unless (file.open(IO_ReadOnly)) return QString::null; + TQFile file(filename); + unless (file.open(IO_ReadOnly)) return TQString::null; - QDomDocument doc; + TQDomDocument doc; doc.setContent(&file); return load(doc.documentElement()); } -QString Query::load(QDomElement element) +TQString Query::load(TQDomElement element) { clear(); if (element.tagName().lower() == "obliqueschema") { - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while (!node.isNull()) { - QDomElement e = node.toElement(); + TQDomElement e = node.toElement(); if (e.tagName().lower() == "group") loadGroup(e); node = node.nextSibling(); @@ -346,20 +346,20 @@ QString Query::load(QDomElement element) } else { - return QString::null; + return TQString::null; } // for internationalization: // Add these if you create new schemas and release them with Oblique (void)I18N_NOOP("Standard"); - QString title = element.attribute("title"); + TQString title = element.attribute("title"); if (element.hasAttribute("standard")) title = i18n(title.utf8()); return title; } -void Query::save(const QString &name, QDomElement &element) +void Query::save(const TQString &name, TQDomElement &element) { element.setTagName("ObliqueSchema"); element.setAttribute("version", "1.0"); @@ -368,22 +368,22 @@ void Query::save(const QString &name, QDomElement &element) saveGroup(element, g); } -void Query::save(const QString &name, const QString &filename) +void Query::save(const TQString &name, const TQString &filename) { - QFile file(filename); + TQFile file(filename); unless (file.open(IO_Truncate|IO_ReadWrite )) return; - QDomDocument doc("ObliqueSchema"); - doc.setContent(QString("<!DOCTYPE ObliqueSchema><ObliqueSchema/>")); - QDomElement e = doc.documentElement(); + TQDomDocument doc("ObliqueSchema"); + doc.setContent(TQString("<!DOCTYPE ObliqueSchema><ObliqueSchema/>")); + TQDomElement e = doc.documentElement(); save(name, e); - QTextStream ts(&file); - ts.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream ts(&file); + ts.setEncoding(TQTextStream::UnicodeUTF8); // scourge elimination - QString data = doc.toString(); - QString old = data; - while (data.replace(QRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) + TQString data = doc.toString(); + TQString old = data; + while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) { old = data; } @@ -438,9 +438,9 @@ void Query::dump() -void Query::loadGroup(QDomElement element, QueryGroup *parent) +void Query::loadGroup(TQDomElement element, QueryGroup *parent) { - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); QueryGroup *group = new QueryGroup; if (parent) @@ -457,7 +457,7 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) while (!node.isNull()) { - QDomElement e = node.toElement(); + TQDomElement e = node.toElement(); if (e.tagName().lower() == "group") { loadGroup(e, group); @@ -468,7 +468,7 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) } else if (e.tagName().lower() == "value") { - group->setValue(QRegExp(e.text())); + group->setValue(TQRegExp(e.text())); } else if (e.tagName().lower() == "presentation") { @@ -476,10 +476,10 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) } else if (e.tagName().lower() == "options") { - QDomNode node = e.firstChild(); + TQDomNode node = e.firstChild(); while (!node.isNull()) { - QDomElement e = node.toElement(); + TQDomElement e = node.toElement(); if (e.tagName().lower() == "disabled") group->setOption(QueryGroup::Disabled, true); @@ -500,14 +500,14 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) } } -void Query::saveGroup(QDomElement &parent, QueryGroup *group) +void Query::saveGroup(TQDomElement &parent, QueryGroup *group) { - QDomDocument doc = parent.ownerDocument(); - QDomElement element = doc.createElement("group"); + TQDomDocument doc = parent.ownerDocument(); + TQDomElement element = doc.createElement("group"); parent.appendChild(element); - QDomElement childe; - QDomText childtext; + TQDomElement childe; + TQDomText childtext; { childe = doc.createElement("property"); element.appendChild(childe); diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h index 60a19ff..d5835d6 100644 --- a/noatun-plugins/oblique/query.h +++ b/noatun-plugins/oblique/query.h @@ -6,8 +6,8 @@ #include "base.h" -#include <qregexp.h> -#include <qstring.h> +#include <tqregexp.h> +#include <tqstring.h> class Query; class QDomElement; @@ -22,9 +22,9 @@ class QueryGroup int mFuzzyness; int mOptions; - QString mPropertyName; - QString mPresentation; - QRegExp mValue; + TQString mPropertyName; + TQString mPresentation; + TQRegExp mValue; public: QueryGroup(); @@ -61,13 +61,13 @@ public: **/ void move(Query *query, QueryGroup *under, QueryGroup *after); - QString propertyName() const { return mPropertyName; } - QRegExp value() const { return mValue; } - QString presentation() const { return mPresentation; } + TQString propertyName() const { return mPropertyName; } + TQRegExp value() const { return mValue; } + TQString presentation() const { return mPresentation; } - void setPropertyName(const QString &v) { mPropertyName = v; } - void setPresentation(const QString &v) { mPresentation = v; } - void setValue(const QRegExp &v) { mValue = v; } + void setPropertyName(const TQString &v) { mPropertyName = v; } + void setPresentation(const TQString &v) { mPresentation = v; } + void setValue(const TQRegExp &v) { mValue = v; } enum Fuzzyness { @@ -90,14 +90,14 @@ public: **/ bool matches(const File &file) const; - QString presentation(const File &file) const; + TQString presentation(const File &file) const; private: /** * apply all the "normalizing" transformations according * to the fuzzyness **/ - QString fuzzify(const QString &str) const; + TQString fuzzify(const TQString &str) const; /** * @returns the previous or parent of this item (slow) **/ @@ -115,7 +115,7 @@ private: class Query { QueryGroup *mGroupFirst; - QString mName; + TQString mName; public: Query(); @@ -135,15 +135,15 @@ public: /** * @returns the name to be used internally **/ - QString name() const { return mName; } - void setName(const QString &name) { mName = name; } + TQString name() const { return mName; } + void setName(const TQString &name) { mName = name; } /** * @returns the name of the query **/ - QString load(const QString &filename); - void save(const QString &name, QDomElement &element); - void save(const QString &name, const QString &filename); + TQString load(const TQString &filename); + void save(const TQString &name, TQDomElement &element); + void save(const TQString &name, const TQString &filename); /** * remove any trace of this from the tree, but don't actually delete it @@ -157,18 +157,18 @@ public: * * Will give it a name in the db if necessary **/ - QString dbname(Base *base); + TQString dbname(Base *base); private: - void loadGroup(QDomElement element, QueryGroup *parent=0); - void saveGroup(QDomElement &parent, QueryGroup *group); + void loadGroup(TQDomElement element, QueryGroup *parent=0); + void saveGroup(TQDomElement &parent, QueryGroup *group); void deepCopy(const QueryGroup *from, QueryGroup *toParent); /** * @returns the name of the query **/ - QString load(QDomElement element); + TQString load(TQDomElement element); }; diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp index 1c17650..f28c333 100644 --- a/noatun-plugins/oblique/selector.cpp +++ b/noatun-plugins/oblique/selector.cpp @@ -14,7 +14,7 @@ Item::Item(const File &file) } -QString Item::property(const QString &key, const QString &def) const +TQString Item::property(const TQString &key, const TQString &def) const { if (key == "url") { @@ -23,27 +23,27 @@ QString Item::property(const QString &key, const QString &def) const return url.url(); } - QString str = mFile.property(key); + TQString str = mFile.property(key); if (str.isNull()) return def; return str; } -void Item::setProperty(const QString &key, const QString &property) +void Item::setProperty(const TQString &key, const TQString &property) { mFile.setProperty(key, property); } -void Item::clearProperty(const QString &key) +void Item::clearProperty(const TQString &key) { mFile.clearProperty(key); } -QStringList Item::properties() const +TQStringList Item::properties() const { return mFile.properties(); } -bool Item::isProperty(const QString &key) const +bool Item::isProperty(const TQString &key) const { return !mFile.property(key).isNull(); } diff --git a/noatun-plugins/oblique/selector.h b/noatun-plugins/oblique/selector.h index 1447dec..6ce57dd 100644 --- a/noatun-plugins/oblique/selector.h +++ b/noatun-plugins/oblique/selector.h @@ -16,12 +16,12 @@ public: File itemFile() const { return mFile; } - virtual QString property(const QString &key, const QString &def=0) const; - virtual void setProperty(const QString &key, const QString &property); - virtual void clearProperty (const QString &key); - virtual QStringList properties() const; + virtual TQString property(const TQString &key, const TQString &def=0) const; + virtual void setProperty(const TQString &key, const TQString &property); + virtual void clearProperty (const TQString &key); + virtual TQStringList properties() const; - virtual bool isProperty(const QString &key) const; + virtual bool isProperty(const TQString &key) const; virtual bool operator==(const PlaylistItemData &d) const; virtual void remove(); diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 4160650..0087b99 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -7,7 +7,7 @@ #include "menu.h" #include "oblique.h" -#include <qpainter.h> +#include <tqpainter.h> #include <iostream> #include <klocale.h> @@ -105,7 +105,7 @@ static void treeItemSort(TreeItem *first) if (at > 1) treeItemSort(set, set+count-manually-1); - // grr, QListView sucks + // grr, TQListView sucks set[0]->moveItem(set[1]); TreeItem *previous = set[0]; @@ -149,7 +149,7 @@ inline static void sortify(T *item) } -TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const QString &p) +TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p) : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) @@ -161,7 +161,7 @@ TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const QStr sortify(parent); } -TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const QString &p) +TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p) : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) @@ -196,7 +196,7 @@ void Tree::deleted(TreeItem *item) } } -static void pad(QString &str) +static void pad(TQString &str) { int len=str.length(); int at = 0; @@ -205,11 +205,11 @@ static void pad(QString &str) static const int paddingsize=12; // not static for reason - const QChar chars[paddingsize] = + const TQChar chars[paddingsize] = { - QChar('0'), QChar('0'), QChar('0'), QChar('0'), - QChar('0'), QChar('0'), QChar('0'), QChar('0'), - QChar('0'), QChar('0'), QChar('0'), QChar('0') + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0'), + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0'), + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0') }; for (int i=0; i < len; i++) @@ -237,10 +237,10 @@ static void pad(QString &str) } } -int TreeItem::compare(QListViewItem *i, int col, bool) const +int TreeItem::compare(TQListViewItem *i, int col, bool) const { - QString text1 = text(col); - QString text2 = i->text(col); + TQString text1 = text(col); + TQString text2 = i->text(col); pad(text1); pad(text2); @@ -253,7 +253,7 @@ Tree *TreeItem::tree() return static_cast<Tree*>(KListViewItem::listView()); } -QString TreeItem::presentation() const +TQString TreeItem::presentation() const { return text(0); } @@ -287,27 +287,27 @@ TreeItem *TreeItem::nextPlayable() return next; } -void TreeItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) +void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { - QFont font = p->font(); + TQFont font = p->font(); if (tree()->current() == this) { font.setUnderline(true); p->setFont(font); } - QColorGroup newcg(cg); + TQColorGroup newcg(cg); if (parent() && parent()->isOpen() && !parent()->mUserOpened) { // slow, but not often used - QColor text = newcg.text(); - QColor bg = newcg.background(); + TQColor text = newcg.text(); + TQColor bg = newcg.background(); int r = text.red() + bg.red(); int g = text.green() + bg.green(); int b = text.blue() + bg.blue(); text.setRgb(r/2,g/2,b/2); - newcg.setColor(QColorGroup::Text, text); + newcg.setColor(TQColorGroup::Text, text); } KListViewItem::paintCell(p, newcg, column, width, align); @@ -346,7 +346,7 @@ void TreeItem::forceAutoExpand() setOpen(true); } -bool TreeItem::hideIfNoMatch(const QString &match) +bool TreeItem::hideIfNoMatch(const TQString &match) { if (!firstChild()) { @@ -372,7 +372,7 @@ bool TreeItem::hideIfNoMatch(const QString &match) if (visible) { - QString empty; + TQString empty; for (TreeItem *ch = firstChild(); ch; ch = ch->nextSibling()) { ch->hideIfNoMatch(empty); @@ -395,7 +395,7 @@ bool TreeItem::hideIfNoMatch(const QString &match) void TreeItem::setup() { - QListViewItem::setup(); + TQListViewItem::setup(); if (mHidden) setHeight(0); } @@ -431,7 +431,7 @@ TreeItem *TreeItem::next() -Tree::Tree(Oblique *oblique, QWidget *parent) +Tree::Tree(Oblique *oblique, TQWidget *parent) : KListView(parent), mOblique(oblique), mAutoExpanding(0) { mCurrent = 0; @@ -449,32 +449,32 @@ Tree::Tree(Oblique *oblique, QWidget *parent) setDropVisualizer(true); setSorting(-1); - ((QWidget*)header())->hide(); + ((TQWidget*)header())->hide(); connect( - this, SIGNAL(moved(QPtrList<QListViewItem>&, QPtrList<QListViewItem>&, QPtrList<QListViewItem>&)), - SLOT(dropped(QPtrList<QListViewItem>&, QPtrList<QListViewItem>&, QPtrList<QListViewItem>&)) + this, TQT_SIGNAL(moved(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)), + TQT_SLOT(dropped(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)) ); connect( - this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - SLOT(contextMenu(KListView*, QListViewItem*, const QPoint&)) + this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(contextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); connect( - this, SIGNAL(executed(QListViewItem*)), - SLOT(play(QListViewItem*)) + this, TQT_SIGNAL(executed(TQListViewItem*)), + TQT_SLOT(play(TQListViewItem*)) ); Base *base = oblique->base(); - connect(base, SIGNAL(added(File)), SLOT(insert(File))); - connect(base, SIGNAL(removed(File)), SLOT(remove(File))); - connect(base, SIGNAL(modified(File)), SLOT(update(File))); + connect(base, TQT_SIGNAL(added(File)), TQT_SLOT(insert(File))); + connect(base, TQT_SIGNAL(removed(File)), TQT_SLOT(remove(File))); + connect(base, TQT_SIGNAL(modified(File)), TQT_SLOT(update(File))); - connect(base, SIGNAL(addedTo(Slice*, File)), SLOT(checkInsert(Slice*, File))); - connect(base, SIGNAL(removedFrom(Slice*, File)), SLOT(checkRemove(Slice*, File))); + connect(base, TQT_SIGNAL(addedTo(Slice*, File)), TQT_SLOT(checkInsert(Slice*, File))); + connect(base, TQT_SIGNAL(removedFrom(Slice*, File)), TQT_SLOT(checkRemove(Slice*, File))); - connect(this, SIGNAL(selected(TreeItem*)), oblique, SLOT(selected(TreeItem*))); + connect(this, TQT_SIGNAL(selected(TreeItem*)), oblique, TQT_SLOT(selected(TreeItem*))); mSlice = oblique->base()->defaultSlice(); @@ -503,10 +503,10 @@ void Tree::clear() KListView::clear(); } -void Tree::movableDropEvent (QListViewItem* parent, QListViewItem* afterme) +void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme) { - QPtrList<QListViewItem> items = selectedItems(true); - for (QPtrList<QListViewItem>::Iterator i(items.begin()); *i; ++i) + TQPtrList<TQListViewItem> items = selectedItems(true); + for (TQPtrList<TQListViewItem>::Iterator i(items.begin()); *i; ++i) { if ((*i)->parent() != parent) return; @@ -516,10 +516,10 @@ void Tree::movableDropEvent (QListViewItem* parent, QListViewItem* afterme) } -void Tree::dropped(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &, QPtrList<QListViewItem> &afterNow) +void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &afterNow) { - QPtrList<QListViewItem>::Iterator itemi = items.begin(); - QPtrList<QListViewItem>::Iterator afteri = afterNow.begin(); + TQPtrList<TQListViewItem>::Iterator itemi = items.begin(); + TQPtrList<TQListViewItem>::Iterator afteri = afterNow.begin(); while (*itemi) { TreeItem *item = static_cast<TreeItem*>(*itemi); @@ -622,21 +622,21 @@ void Tree::setCurrent(TreeItem *cur) // undo the old one TreeItem *old = mCurrent; mCurrent = cur; - QPtrList<TreeItem> oldAutoExpanded = mAutoExpanded; + TQPtrList<TreeItem> oldAutoExpanded = mAutoExpanded; mAutoExpanded.clear(); repaintItem(old); repaintItem(cur); if (cur) cur->autoExpand(); // do an anti-intersection on oldAutoUpdated and the new mAutoExpanded - for (QPtrListIterator<TreeItem> i(mAutoExpanded); *i; ++i) + for (TQPtrListIterator<TreeItem> i(mAutoExpanded); *i; ++i) { oldAutoExpanded.removeRef(*i); } bool user=false; - for (QPtrListIterator<TreeItem> i(oldAutoExpanded); *i; ++i) + for (TQPtrListIterator<TreeItem> i(oldAutoExpanded); *i; ++i) { if ((*i)->userOpened()) { @@ -646,7 +646,7 @@ void Tree::setCurrent(TreeItem *cur) } if (!user) { - for (QPtrListIterator<TreeItem> i(oldAutoExpanded); *i; ++i) + for (TQPtrListIterator<TreeItem> i(oldAutoExpanded); *i; ++i) { (*i)->setOpen(false); } @@ -660,7 +660,7 @@ void Tree::reload() delete mLoader; clear(); mLoader = new Loader(this); - connect(mLoader, SIGNAL(finished()), SLOT(destroyLoader())); + connect(mLoader, TQT_SIGNAL(finished()), TQT_SLOT(destroyLoader())); } void Tree::setSlice(Slice *slice) @@ -670,7 +670,7 @@ void Tree::setSlice(Slice *slice) reload(); } -bool Tree::setSchema(const QString &name) +bool Tree::setSchema(const TQString &name) { mFileOfQuery = name; if (!oblique()->loadSchema(mQuery, name)) @@ -679,7 +679,7 @@ bool Tree::setSchema(const QString &name) return true; } -QDragObject *Tree::dragObject() +TQDragObject *Tree::dragObject() { if (currentItem() && static_cast<TreeItem*>(currentItem())->file()) return KListView::dragObject(); @@ -692,7 +692,7 @@ void Tree::destroyLoader() mLoader = 0; } -void Tree::setLimit(const QString &text) +void Tree::setLimit(const TQString &text) { for (TreeItem *ch = firstChild(); ch; ch = ch->nextSibling()) { @@ -701,7 +701,7 @@ void Tree::setLimit(const QString &text) } -void Tree::contextMenu(KListView*, QListViewItem* i, const QPoint& p) +void Tree::contextMenu(KListView*, TQListViewItem* i, const TQPoint& p) { if (!i) return; delete lastMenu; @@ -709,7 +709,7 @@ void Tree::contextMenu(KListView*, QListViewItem* i, const QPoint& p) lastMenu->popup(p); } -void Tree::play(QListViewItem *_item) +void Tree::play(TQListViewItem *_item) { if (!_item) return; TreeItem *item = static_cast<TreeItem*>(_item); @@ -757,7 +757,7 @@ TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeIte else children = firstChild(); - QString presentation = group->presentation(file); + TQString presentation = group->presentation(file); while (children) { // merging would be done here diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index 0d53732..f059931 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -4,7 +4,7 @@ #ifndef TREE_H #define TREE_H -#include <qwidget.h> +#include <tqwidget.h> #include <klistview.h> #include "base.h" @@ -23,8 +23,8 @@ class TreeItem : public KListViewItem bool mHidden:1; public: - TreeItem(Tree *parent, QueryGroup *group, const File &file, const QString &p=0); - TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const QString &p=0); + 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(); QueryGroup *group() { return mGroup; } @@ -38,7 +38,7 @@ public: TreeItem *nextSibling() { return static_cast<TreeItem*>(KListViewItem::nextSibling()); } // for gdb, which sucks. - QString presentation() const; + TQString presentation() const; File file() { return mFile; } void setFile(File file) { mFile = file; } @@ -56,9 +56,9 @@ public: **/ TreeItem *nextPlayable(); - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); - virtual int compare(QListViewItem * i, int col, bool) const; + virtual int compare(TQListViewItem * i, int col, bool) const; /** * open my parents so that I'm visible, if I'm playing or @@ -67,7 +67,7 @@ public: **/ void autoExpand(); bool userOpened() const { return mUserOpened; } - bool hideIfNoMatch(const QString &match); + bool hideIfNoMatch(const TQString &match); void setHidden(bool on); @@ -92,18 +92,18 @@ Q_OBJECT TreeItem *mCurrent; FileMenu *lastMenu; Slice *mSlice; - QString mFileOfQuery; + TQString mFileOfQuery; friend class TreeItem; int mPlayableItemCount; // used by the friendship - QPtrList<TreeItem> mAutoExpanded; + TQPtrList<TreeItem> mAutoExpanded; unsigned int mAutoExpanding; Loader *mLoader; public: - Tree(Oblique *oblique, QWidget *parent=0); + Tree(Oblique *oblique, TQWidget *parent=0); ~Tree(); TreeItem *firstChild(); TreeItem *find(File item); @@ -111,7 +111,7 @@ public: Query *query() { return &mQuery; } Oblique *oblique() { return mOblique; } Slice *slice() { return mSlice; } - QString fileOfQuery() const { return mFileOfQuery; } + TQString fileOfQuery() const { return mFileOfQuery; } void clear(); @@ -125,11 +125,11 @@ public: bool autoExpanding() const { return mAutoExpanding; } void deleted(TreeItem *item); - bool setSchema(const QString &name); + bool setSchema(const TQString &name); protected: - virtual QDragObject *dragObject(); - void movableDropEvent(QListViewItem* parent, QListViewItem* afterme); + virtual TQDragObject *dragObject(); + void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme); public slots: void insert(TreeItem *replace, File file); @@ -147,15 +147,15 @@ public slots: * or it will not be displayed * (used for Jump) **/ - void setLimit(const QString &text); + void setLimit(const TQString &text); private slots: - void contextMenu(KListView* l, QListViewItem* i, const QPoint& p); - void play(QListViewItem *item); + void contextMenu(KListView* l, TQListViewItem* i, const TQPoint& p); + void play(TQListViewItem *item); void destroyLoader(); - void dropped(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &, QPtrList<QListViewItem> &afterNow); + void dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &afterNow); signals: void selected(TreeItem *); @@ -185,7 +185,7 @@ private: **/ void remove(TreeItem *, const File &file); - void limitHide(TreeItem *i, const QString &text); + void limitHide(TreeItem *i, const TQString &text); void reload(); }; diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 93b79ce..8c7f81d 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -11,21 +11,21 @@ #include <klocale.h> #include <kedittoolbar.h> #include <kfiledialog.h> -#include <qlabel.h> +#include <tqlabel.h> #include <klineeditdlg.h> #include <kmessagebox.h> #include <ktabwidget.h> -#include <qtabbar.h> +#include <tqtabbar.h> class TabWidget : public KTabWidget { public: - TabWidget(QWidget *parent) + TabWidget(TQWidget *parent) : KTabWidget(parent) { } public: - QTabBar *tabBar() const { return KTabWidget::tabBar(); } + TQTabBar *tabBar() const { return KTabWidget::tabBar(); } }; @@ -37,45 +37,45 @@ View::View(Oblique *oblique) mTabs = new TabWidget(this); mTabs->tabBar()->hide(); - connect(mTabs, SIGNAL(currentChanged(QWidget*)), SLOT(currentTabChanged(QWidget*))); + connect(mTabs, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(currentTabChanged(TQWidget*))); setCentralWidget(mTabs); KAction *ac; - ac = new KAction(i18n("Add &Files..."), "queue", 0, this, SLOT(addFiles()), actionCollection(), "add_files"); + ac = new KAction(i18n("Add &Files..."), "queue", 0, 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, SLOT(addDirectory()), actionCollection(), "add_dir"); + ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); -// ac = new KAction(i18n("&Reload"), "reload", 0, oblique, SLOT(reload()), actionCollection(), "reload"); +// ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); // ac->setWhatsThis(i18n("Reread the collection and meta-information from its files.")); ac = new SliceListAction( i18n("&Slices"), oblique, - this, SLOT(use(Slice*)), QValueList<File>(), actionCollection(), "slices" + this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices" ); ac->setWhatsThis(i18n("Select a sub-collection to display")); mSchemaListAction = new SchemaListAction( - i18n("&Schemas"), this, SLOT(setSchema(const QString&)), actionCollection(), "schemas" + i18n("&Schemas"), 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, SLOT(addTab()), + i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()), actionCollection(), "newtab" ); mRemoveTabAction = new KAction( - i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, SLOT(removeTab()), + i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()), actionCollection(), "removecurrenttab" ); { - QLabel *l = new QLabel(i18n("&Jump:"), 0, "kde toolbar widget"); + TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget"); l->setBackgroundMode( Qt::PaletteButton ); l->setAlignment( - (QApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | + (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter | Qt::ShowPrefix ); l->adjustSize(); @@ -84,22 +84,22 @@ View::View(Oblique *oblique) LineEditAction *jumpAction = new LineEditAction(i18n("Jump Bar"), 0, 0, actionCollection(), "jump_text"); jumpAction->setWhatsThis(i18n("Only display items which contain this string")); l->setBuddy(jumpAction->lineEdit()); - connect(jumpAction->lineEdit(), SIGNAL(textChanged(const QString&)), SLOT(jumpTextChanged(const QString&))); + connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&))); } - KStdAction::configureToolbars(this, SLOT(configureToolBars()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); applyMainWindowSettings(KGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); KConfigGroup g(KGlobal::config(), "oblique"); - QStringList tabids = g.readListEntry("tabids"); + TQStringList tabids = g.readListEntry("tabids"); - for (QStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i) + for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i) { - QString t = *i; + TQString t = *i; int sliceid = t.section(':', 0, 0).toInt(); - QString fileOfQuery = t.section(':', 1, 1); + TQString fileOfQuery = t.section(':', 1, 1); Slice *slice = oblique->base()->sliceById(sliceid); if (!slice) @@ -131,14 +131,14 @@ View::View(Oblique *oblique) View::~View() { - QStringList tabids; + TQStringList tabids; for (int i=0; i < mTabs->count(); i++) { Tree *tree = static_cast<Tree*>(mTabs->page(i)); int slice = tree->slice()->id(); - QString query = tree->fileOfQuery(); + TQString query = tree->fileOfQuery(); - QString t = QString("%1:%2").arg(slice).arg(query); + TQString t = TQString("%1:%2").arg(slice).arg(query); tabids.append(t); } @@ -151,7 +151,7 @@ void View::configureToolBars() { saveMainWindowSettings(KGlobal::config(), "Oblique View"); KEditToolbar dlg(actionCollection(), "obliqueui.rc"); - connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(newToolBarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); } @@ -161,7 +161,7 @@ void View::newToolBarConfig() applyMainWindowSettings(KGlobal::config(), "Oblique View"); } -void View::closeEvent(QCloseEvent*) +void View::closeEvent(TQCloseEvent*) { hide(); } @@ -177,7 +177,7 @@ void View::addFiles() void View::addDirectory() { - QString folder = KFileDialog::getExistingDirectory(":mediadir:", this, + TQString folder = KFileDialog::getExistingDirectory(":mediadir:", this, i18n("Select Folder to Add")); if (!folder) @@ -213,20 +213,20 @@ void View::removeTab() mTabs->tabBar()->hide(); } -void View::currentTabChanged(QWidget *w) +void View::currentTabChanged(TQWidget *w) { mRemoveTabAction->setEnabled(w != mTree); mSchemaListAction->setTree(static_cast<Tree*>(w)); } -void View::setSchema(const QString &file) +void View::setSchema(const TQString &file) { Tree *current = static_cast<Tree*>(mTabs->currentPage()); current->setSchema(file); } -void View::jumpTextChanged(const QString &text) +void View::jumpTextChanged(const TQString &text) { Tree *current = static_cast<Tree*>(mTabs->currentPage()); current->setLimit(text); @@ -241,7 +241,7 @@ void View::use(Slice *s) -LineEditAction::LineEditAction(const QString &text, const QObject *reciever, const char *slot, KActionCollection *parent, const char *name) +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) { setAutoSized(true); diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h index 598c0cc..bf216ea 100644 --- a/noatun-plugins/oblique/view.h +++ b/noatun-plugins/oblique/view.h @@ -18,7 +18,7 @@ class View : public KMainWindow Q_OBJECT Oblique *mOblique; Tree *mTree; - QValueList<Tree*> mTrees; + TQValueList<Tree*> mTrees; TabWidget *mTabs; KAction *mRemoveTabAction; SchemaListAction *mSchemaListAction; @@ -44,15 +44,15 @@ signals: private slots: void configureToolBars(); void newToolBarConfig(); - void jumpTextChanged(const QString &text); + void jumpTextChanged(const TQString &text); void use(Slice*); - void currentTabChanged(QWidget *); - void setSchema(const QString &file); + void currentTabChanged(TQWidget *); + void setSchema(const TQString &file); protected: - virtual void showEvent(QShowEvent *) { emit listShown(); } - virtual void hideEvent(QHideEvent *) { emit listHidden(); } - void closeEvent(QCloseEvent*); + virtual void showEvent(TQShowEvent *) { emit listShown(); } + virtual void hideEvent(TQHideEvent *) { emit listHidden(); } + void closeEvent(TQCloseEvent*); }; @@ -60,7 +60,7 @@ class LineEditAction : public KWidgetAction { Q_OBJECT public: - LineEditAction(const QString &text, const QObject *reciever, const char *slot, KActionCollection *parent, const char *name); + LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name); KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); } KLineEdit *lineEdit() { return widget(); } diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index f091c72..b59d6e5 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -17,9 +17,9 @@ #include <noatun/player.h> #include <noatun/engine.h> #include <noatun/noatunarts.h> -#include <qslider.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqslider.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <klocale.h> #include <knuminput.h> @@ -46,10 +46,10 @@ PitchableSpeed::PitchableSpeed() : Plugin(), offsetInput->setRange(-5,15,1,false); offsetInput->setValue(offset); setupSliderRange(); - connect(napp->player(), SIGNAL(changed()), - this, SLOT(newSong())); - connect(preserveFrequencies, SIGNAL(toggled(bool)), - this, SLOT(preserveFrequenciesChanged(bool))); + connect(napp->player(), TQT_SIGNAL(changed()), + this, TQT_SLOT(newSong())); + connect(preserveFrequencies, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(preserveFrequenciesChanged(bool))); //show(); } @@ -93,7 +93,7 @@ void PitchableSpeed::setSpeed() pitchShift.speed(1.f/newSpeed); } - QString percentStr; + TQString percentStr; percentStr.setNum((newSpeed-1.f)*100.f,'f',1); if (newSpeed<=0) percentStr.prepend('+').append(' ').append('%'); currentValEdit->setText(percentStr); @@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow) void PitchableSpeed::init() { pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"), - this, SLOT(toggle(void))); + this, TQT_SLOT(toggle(void))); } void PitchableSpeed::toggle(void) @@ -158,7 +158,7 @@ void PitchableSpeed::toggle(void) raise(); } -void PitchableSpeed::closeEvent(QCloseEvent *) +void PitchableSpeed::closeEvent(TQCloseEvent *) { hide(); } diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.h b/noatun-plugins/pitchablespeed/pitchablespeed.h index d11a7cc..3233817 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.h +++ b/noatun-plugins/pitchablespeed/pitchablespeed.h @@ -34,7 +34,7 @@ public slots: void newSong(); protected: - virtual void closeEvent(QCloseEvent *); + virtual void closeEvent(TQCloseEvent *); void setupSliderRange(); void setSpeed(); diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index 4765eef..5b881fd 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -22,29 +22,29 @@ #include <kglobal.h> #include <kglobalsettings.h> #include <klocale.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qspinbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> #include "cmodule.h" #include "synaescope.h" -SynaePrefs::SynaePrefs(QObject *parent) +SynaePrefs::SynaePrefs(TQObject *parent) : CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", parent) { // kdDebug(66666) << k_funcinfo << endl; - xRes = new QSpinBox(320, 1024, 16, this); - yRes = new QSpinBox(240, 768, 12, this); + xRes = new TQSpinBox(320, 1024, 16, this); + yRes = new TQSpinBox(240, 768, 12, this); - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QHBoxLayout *xResLayout = new QHBoxLayout(0, 0, KDialog::spacingHint()); - QHBoxLayout *yResLayout = new QHBoxLayout(0, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint()); + TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint()); - xResLayout->addWidget(new QLabel(i18n("Display width:"), this)); + xResLayout->addWidget(new TQLabel(i18n("Display width:"), this)); xResLayout->addWidget(xRes); - yResLayout->addWidget(new QLabel(i18n("Display height:"), this)); + yResLayout->addWidget(new TQLabel(i18n("Display height:"), this)); yResLayout->addWidget(yRes); layout->addLayout(xResLayout); @@ -52,8 +52,8 @@ SynaePrefs::SynaePrefs(QObject *parent) layout->addStretch(); changed=false; - connect(xRes, SIGNAL(valueChanged(int)), this, SLOT(slotChanges())); - connect(yRes, SIGNAL(valueChanged(int)), this, SLOT(slotChanges())); + connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); + connect(yRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); } void SynaePrefs::save() diff --git a/noatun-plugins/synaescope/cmodule.h b/noatun-plugins/synaescope/cmodule.h index 0642e2e..f0269bb 100644 --- a/noatun-plugins/synaescope/cmodule.h +++ b/noatun-plugins/synaescope/cmodule.h @@ -29,7 +29,7 @@ class SynaePrefs : public CModule Q_OBJECT public: - SynaePrefs(QObject *parent); + SynaePrefs(TQObject *parent); virtual void save(); virtual void reopen(); @@ -41,8 +41,8 @@ class SynaePrefs : public CModule void slotChanges(); private: - QSpinBox *xRes; - QSpinBox *yRes; + TQSpinBox *xRes; + TQSpinBox *yRes; bool changed; }; diff --git a/noatun-plugins/synaescope/syna.h b/noatun-plugins/synaescope/syna.h index 0b58ae8..07c4e5e 100644 --- a/noatun-plugins/synaescope/syna.h +++ b/noatun-plugins/synaescope/syna.h @@ -21,7 +21,7 @@ #define SYNA_H #include "config.h" -#include <qptrlist.h> +#include <tqptrlist.h> #include "polygon.h" #include <noatun/plugin.h> @@ -241,7 +241,7 @@ protected: void changeState(int transitionSymbol); private: - QPtrList<UIObject> uiObjects; + TQPtrList<UIObject> uiObjects; Button *stateButton, *starsButton, *waveButton, *flameButton, *starButton, *diamondButton; int mouseButtons; diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp index 7e4df1c..16a6a2e 100644 --- a/noatun-plugins/synaescope/synaescope.cpp +++ b/noatun-plugins/synaescope/synaescope.cpp @@ -26,12 +26,12 @@ SynaeScope::SynaeScope() : Plugin(), scopeExePath(0) { kdDebug(66666) << k_funcinfo << endl; restarting=false; - connect(&process, SIGNAL(processExited(KProcess *)), - this, SLOT(processExited(KProcess *))); - connect(&process, SIGNAL(receivedStdout(KProcess *,char *,int)), - this, SLOT(receivedStdout(KProcess *,char *,int))); - connect(&process, SIGNAL(receivedStderr(KProcess *,char *,int)), - this, SLOT(receivedStderr(KProcess *,char *,int))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), + this, TQT_SLOT(receivedStdout(KProcess *,char *,int))); + connect(&process, TQT_SIGNAL(receivedStderr(KProcess *,char *,int)), + this, TQT_SLOT(receivedStderr(KProcess *,char *,int))); } SynaeScope::~SynaeScope() @@ -46,7 +46,7 @@ void SynaeScope::init() mPrefs = new SynaePrefs(this); mPrefs->reopen(); mPrefs->save(); - connect(mPrefs, SIGNAL(configChanged()), this, SLOT(readConfig())); + connect(mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig())); scopeExePath = KStandardDirs::findExe("noatunsynaescope.bin"); if (scopeExePath.isEmpty()) @@ -97,13 +97,13 @@ void SynaeScope::processExited(KProcess *) void SynaeScope::receivedStdout(KProcess *, char *buf, int len) { - QCString debugString(buf,len); + TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; } void SynaeScope::receivedStderr(KProcess *, char *buf, int len) { - QCString debugString(buf,len); + TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; } diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h index 718c2b9..af1b6f5 100644 --- a/noatun-plugins/synaescope/synaescope.h +++ b/noatun-plugins/synaescope/synaescope.h @@ -14,7 +14,7 @@ class SynaePrefs; class KProcess; -class SynaeScope : public QObject, public Plugin +class SynaeScope : public TQObject, public Plugin { Q_OBJECT @@ -33,7 +33,7 @@ private slots: private: KProcess process; - QString scopeExePath; + TQString scopeExePath; bool restarting; SynaePrefs *mPrefs; }; diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp index d02bfb7..2adc1f7 100644 --- a/noatun-plugins/synaescope/ui.cpp +++ b/noatun-plugins/synaescope/ui.cpp @@ -124,7 +124,7 @@ struct NoatunActionButton : public Button if (mouseOver && mouseClick && !passive) { - QCString action; + TQCString action; switch (icon) { case Play: @@ -148,17 +148,17 @@ struct NoatunActionButton : public Button action+="()"; DCOPClient c; c.attach(); - QCString appName("noatun"); + TQCString appName("noatun"); if (c.isApplicationRegistered(appName)) { - c.send(appName, "Noatun", action, QByteArray()); + c.send(appName, "Noatun", action, TQByteArray()); } else { appName.setNum(getppid()); appName.prepend("noatun"); if (c.isApplicationRegistered(appName)) - c.send(appName, "Noatun", action, QByteArray()); + c.send(appName, "Noatun", action, TQByteArray()); } } } diff --git a/noatun-plugins/tippercanoe/syna.h b/noatun-plugins/tippercanoe/syna.h index d4ea60e..0d36e1b 100644 --- a/noatun-plugins/tippercanoe/syna.h +++ b/noatun-plugins/tippercanoe/syna.h @@ -21,7 +21,7 @@ #define SYNA_H #include "config.h" -#include <qptrlist.h> +#include <tqptrlist.h> #include "polygon.h" //************************************** @@ -233,7 +233,7 @@ protected: void changeState(int transitionSymbol); private: - QPtrList<UIObject> uiObjects; + TQPtrList<UIObject> uiObjects; Button *stateButton, *starsButton, *waveButton, *flameButton, *starButton, *diamondButton; int mouseButtons; diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index 8ccf6c3..cf5cbfc 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -13,8 +13,8 @@ #include <kmessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <qframe.h> -#include <qregexp.h> +#include <tqframe.h> +#include <tqregexp.h> #include <noatun/app.h> #include "syna.h" #include "synaescope.h" @@ -26,7 +26,7 @@ extern "C" Plugin *create_plugin() } SynaeScope::SynaeScope() - : QWidget(0, 0, WType_TopLevel | WStyle_DialogBorder | WRepaintNoErase | WMouseNoMask) + : TQWidget(0, 0, WType_TopLevel | WStyle_DialogBorder | WRepaintNoErase | WMouseNoMask) , StereoScope(50) , Plugin() { @@ -45,14 +45,14 @@ SynaeScope::SynaeScope() SynaeScope::~SynaeScope() { - connect(&process, SIGNAL(processExited(KProcess *)), this, SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); napp->pluginMenuRemove(pluginMenuItem); } void SynaeScope::init() { - connect(&process, SIGNAL(receivedStdout(KProcess *, char *, int)), this, SLOT(read(KProcess *, char *, int))); - pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, SLOT(toggle(void))); + 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))); 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) { - QString num = QString::fromLatin1(buf); - num = num.left(num.find(QRegExp("\\s"))); + TQString num = TQString::fromLatin1(buf); + num = num.left(num.find(TQRegExp("\\s"))); id = num.toInt(); embed->embed(id); } diff --git a/noatun-plugins/tippercanoe/synaescope.h b/noatun-plugins/tippercanoe/synaescope.h index da6855b..59daa93 100644 --- a/noatun-plugins/tippercanoe/synaescope.h +++ b/noatun-plugins/tippercanoe/synaescope.h @@ -13,10 +13,10 @@ #include "syna.h" #include <noatun/plugin.h> #include <kprocess.h> -#include <qwidget.h> +#include <tqwidget.h> #include <qxembed.h> -class SynaeScope : public QWidget, public StereoScope, public Plugin +class SynaeScope : public TQWidget, public StereoScope, public Plugin { Q_OBJECT diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp index 58ddd79..c641bc0 100644 --- a/noatun-plugins/tyler/file.cpp +++ b/noatun-plugins/tyler/file.cpp @@ -22,18 +22,18 @@ extern "C" #include <stdlib.h> } -#include <qfile.h> +#include <tqfile.h> #include <kglobal.h> #include <kstandarddirs.h> -static QString getDataPath(void) +static TQString getDataPath(void) { KStandardDirs &dirs = *KGlobal::dirs(); return dirs.findResource("data", "noatun/tylerstates"); } -static QString getSavePath(void) +static TQString getSavePath(void) { KStandardDirs &dirs = *KGlobal::dirs(); return dirs.saveLocation("data", "noatun/") + "tylerstates"; @@ -41,7 +41,7 @@ static QString getSavePath(void) extern "C" void save_effect(t_effect *effect) { - QFile file(getSavePath()); + TQFile file(getSavePath()); if(!file.open(IO_WriteOnly)) return; @@ -54,7 +54,7 @@ int nb_effects=0; extern "C" void load_effects() { - QFile file(getDataPath()); + TQFile file(getDataPath()); if(!file.open(IO_ReadOnly)) exit(1); diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp index 7990ae2..ad00cac 100644 --- a/noatun-plugins/tyler/tyler.cpp +++ b/noatun-plugins/tyler/tyler.cpp @@ -21,7 +21,7 @@ extern "C" Plugin *create_plugin() const int Tyler::bufferSize = 512; Tyler::Tyler() - : QObject() + : TQObject() , StereoScope(25) , Plugin() { @@ -37,7 +37,7 @@ Tyler::~Tyler() void Tyler::init() { process << KStandardDirs::findExe("noatuntyler.bin"); - connect(&process, SIGNAL(processExited(KProcess *)), this, SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. diff --git a/noatun-plugins/tyler/tyler.h b/noatun-plugins/tyler/tyler.h index ff72a80..e919316 100644 --- a/noatun-plugins/tyler/tyler.h +++ b/noatun-plugins/tyler/tyler.h @@ -7,9 +7,9 @@ #include <noatun/conversion.h> #include <noatun/plugin.h> #include <kprocess.h> -#include <qwidget.h> +#include <tqwidget.h> -class Tyler : public QObject, public StereoScope, public Plugin +class Tyler : public TQObject, public StereoScope, public Plugin { Q_OBJECT diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index b95d3ce..0667951 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -34,9 +34,9 @@ #include <kio/job.h> #include <kio/jobclasses.h> -#include <qfile.h> -#include <qstring.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqtimer.h> #include <string> @@ -49,14 +49,14 @@ extern "C" } } -WaveCapture::WaveCapture() : QObject(0,0), Plugin(), +WaveCapture::WaveCapture() : TQObject(0,0), Plugin(), _enabled( false ), _status( STOPPED ), _capture( Arts::DynamicCast( napp->player()->engine()->server()->createObject( "Arts::Effect_WAVECAPTURE" ) ) ), _count( 0 ), _id( 0 ), _filename( "" ), - _timer( new QTimer( this ) ), + _timer( new TQTimer( this ) ), m_job( 0 ) { NOATUNPLUGINC(WaveCapture); @@ -68,12 +68,12 @@ WaveCapture::WaveCapture() : QObject(0,0), Plugin(), newSong(); - connect( _timer, SIGNAL( timeout() ), SLOT( saveAs() ) ); + connect( _timer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAs() ) ); - connect(napp->player(), SIGNAL(changed()), SLOT(newSong())); - connect(napp->player(), SIGNAL(stopped()), SLOT(stopped())); - connect(napp->player(), SIGNAL(playing()), SLOT(playing())); - connect(napp->player(), SIGNAL( paused()), SLOT( paused())); + connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(newSong())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); + connect(napp->player(), TQT_SIGNAL( paused()), TQT_SLOT( paused())); } WaveCapture::~WaveCapture() @@ -83,15 +83,15 @@ WaveCapture::~WaveCapture() { if( PLAYING == _status ) stop(); - QString filename = QFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); - QFile::remove( filename ); + TQString filename = TQFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); + TQFile::remove( filename ); } delete m_job; } void WaveCapture::init() { - pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, SLOT( toggle() ) ); + pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, TQT_SLOT( toggle() ) ); napp->pluginMenu()->setCheckable( true ); } @@ -105,8 +105,8 @@ void WaveCapture::toggle() else { stop(); - QString filename = QFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); - QFile::remove( filename ); + TQString filename = TQFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); + TQFile::remove( filename ); } } napp->pluginMenu()->setItemChecked( pluginMenuItem, _enabled ); @@ -116,8 +116,8 @@ void WaveCapture::newSong() { if( napp->player()->current() ) { - QString title = napp->player()->current().title(); - _capture.filename( std::string( QFile::encodeName( title ) ) ); + TQString title = napp->player()->current().title(); + _capture.filename( std::string( TQFile::encodeName( title ) ) ); } _timer->start( 0, true ); } @@ -132,9 +132,9 @@ void WaveCapture::saveAs() KFileDialog dlg( ":savedir", "*.wav", 0, "filedialog", true ); dlg.setCaption( i18n( "Save Last Wave File As" ) ); dlg.setOperationMode( KFileDialog::Saving ); - dlg.setSelection( QFile::decodeName( filename.c_str() ) + ".wav" ); + dlg.setSelection( TQFile::decodeName( filename.c_str() ) + ".wav" ); - QString filename2 = QFile::decodeName( (Arts::MCOPUtils::createFilePath( filename ) + ".wav").c_str() ); + TQString filename2 = TQFile::decodeName( (Arts::MCOPUtils::createFilePath( filename ) + ".wav").c_str() ); if( dlg.exec() ) { KURL url = dlg.selectedURL(); @@ -142,11 +142,11 @@ void WaveCapture::saveAs() KRecentDocument::add( url ); m_job = KIO::file_move( KURL( filename2 ), url, -1, true ); - connect( m_job, SIGNAL( result( KIO::Job* ) ), SLOT( copyFinished( KIO::Job* ) ) ); + connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( copyFinished( KIO::Job* ) ) ); } else { - QFile::remove( filename2 ); + TQFile::remove( filename2 ); } } } diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h index f5d894f..06adddb 100644 --- a/noatun-plugins/wavecapture/wavecapture.h +++ b/noatun-plugins/wavecapture/wavecapture.h @@ -28,7 +28,7 @@ class QTimer; namespace KIO { class Job; } -class WaveCapture : public QObject, public Plugin +class WaveCapture : public TQObject, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -63,7 +63,7 @@ private: long _id; std::string _filename; - QTimer* _timer; + TQTimer* _timer; KIO::Job* m_job; }; diff --git a/renamedlgplugins/audio/audio_plugin.cpp b/renamedlgplugins/audio/audio_plugin.cpp index f8114bd..44ae9d0 100644 --- a/renamedlgplugins/audio/audio_plugin.cpp +++ b/renamedlgplugins/audio/audio_plugin.cpp @@ -22,12 +22,12 @@ #include <kgenericfactory.h> #include <renamedlgplugin.h> #include <kio/renamedlg.h> -#include <qlabel.h> -#include <qdialog.h> -#include <qwidget.h> -#include <qstringlist.h> +#include <tqlabel.h> +#include <tqdialog.h> +#include <tqwidget.h> +#include <tqstringlist.h> #include <kio/global.h> -#include <qlayout.h> +#include <tqlayout.h> #include <sys/types.h> @@ -35,11 +35,11 @@ class AudioPlugin : public RenameDlgPlugin{ public: - AudioPlugin( QDialog *dialog, const char *name, const QStringList & ); + AudioPlugin( TQDialog *dialog, const char *name, const TQStringList & ); ~AudioPlugin(); - virtual bool initialize( KIO::RenameDlg_Mode /*mod*/, const QString &/*_src*/, const QString &/*_dest*/, - const QString &/*mimeSrc*/, - const QString &/*mimeDest*/, + virtual bool initialize( KIO::RenameDlg_Mode /*mod*/, const TQString &/*_src*/, const TQString &/*_dest*/, + const TQString &/*mimeSrc*/, + const TQString &/*mimeDest*/, KIO::filesize_t /*sizeSrc*/, KIO::filesize_t /*sizeDest*/, time_t /*ctimeSrc*/, @@ -48,30 +48,30 @@ public: time_t /*mtimeDest*/ ); }; -AudioPlugin::AudioPlugin( QDialog *dialog, const char *name, const QStringList &list ) : RenameDlgPlugin( dialog, name, list) { +AudioPlugin::AudioPlugin( TQDialog *dialog, const char *name, const TQStringList &list ) : RenameDlgPlugin( dialog, name, list) { qWarning("loaded" ); } AudioPlugin::~AudioPlugin() { } -bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const QString &_src, const QString &_dest, - const QString &mimeSrc, - const QString &mimeDest, +bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, const TQString &_dest, + const TQString &mimeSrc, + const TQString &mimeDest, KIO::filesize_t /*sizeSrc*/, KIO::filesize_t /*sizeDest*/, time_t /*ctimeSrc*/, time_t /*ctimeDest*/, time_t mtimeSrc, time_t mtimeDest ) { - QGridLayout *lay = new QGridLayout(this, 4, 3, 5); + TQGridLayout *lay = new TQGridLayout(this, 4, 3, 5); if( mode & KIO::M_OVERWRITE ){ - QLabel *label_head = new QLabel(this); - QLabel *label_src = new QLabel(this); - QLabel *label_dst = new QLabel(this); - QLabel *label_ask = new QLabel(this); + TQLabel *label_head = new TQLabel(this); + TQLabel *label_src = new TQLabel(this); + TQLabel *label_dst = new TQLabel(this); + TQLabel *label_ask = new TQLabel(this); - QString sentence1; - QString dest = KURL::fromPathOrURL(_dest).pathOrURL(); + TQString sentence1; + TQString dest = KURL::fromPathOrURL(_dest).pathOrURL(); if (mtimeDest < mtimeSrc) sentence1 = i18n("An older file named '%1' already exists.\n").arg(dest); else if (mtimeDest == mtimeSrc) @@ -100,5 +100,5 @@ bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const QString &_src, con return true; } -typedef KGenericFactory<AudioPlugin, QDialog> AudioPluginFactory; +typedef KGenericFactory<AudioPlugin, TQDialog> AudioPluginFactory; K_EXPORT_COMPONENT_FACTORY( librenaudioplugin, AudioPluginFactory("audiorename_plugin") ) diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp index e9c6f26..b618adb 100644 --- a/renamedlgplugins/audio/audiopreview.cpp +++ b/renamedlgplugins/audio/audiopreview.cpp @@ -21,9 +21,9 @@ #include <klocale.h> #include <kmimetype.h> #include <kurl.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqpixmap.h> #include <kio/netaccess.h> #include <kurllabel.h> #include <kmimetype.h> @@ -33,8 +33,8 @@ #include "audiopreview.h" -AudioPreview::AudioPreview( QWidget *parent, const char *name, const QString &fileName, const QString &mimeType) - : QVBox( parent, name ) +AudioPreview::AudioPreview( TQWidget *parent, const char *name, const TQString &fileName, const TQString &mimeType) + : TQVBox( parent, name ) { m_isTempFile = false; pic = 0; @@ -45,7 +45,7 @@ AudioPreview::AudioPreview( QWidget *parent, const char *name, const QString &fi setSpacing( 0 ); if( url.isValid() && url.isLocalFile() ) { m_localFile = url.path(); - pic = new QLabel(this); + pic = new TQLabel(this); pic->setPixmap(KMimeType::pixmapForURL( url )); pic->adjustSize(); initView( mimeType ); @@ -53,10 +53,10 @@ AudioPreview::AudioPreview( QWidget *parent, const char *name, const QString &fi KURLLabel *label = new KURLLabel( this ); label->setText(i18n("This audio file isn't stored\non the local host.\nClick on this label to load it.\n" ) ); label->setURL( url.prettyURL() ); - connect(label, SIGNAL(leftClickedURL(const QString&)), SLOT(downloadFile(const QString&))); + connect(label, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(downloadFile(const TQString&))); pic = label; } else { - description = new QLabel(this ); + description = new TQLabel(this ); description->setText(i18n("Unable to load audio file") ); } } @@ -69,17 +69,17 @@ AudioPreview::~AudioPreview() delete m_player; } -void AudioPreview::initView( const QString& mimeType ) +void AudioPreview::initView( const TQString& mimeType ) { KURL url = KURL::fromPathOrURL( m_localFile ); - pic->setText( QString::null ); + pic->setText( TQString::null ); pic->setPixmap(KMimeType::pixmapForURL( url )); pic->adjustSize(); KFileMetaInfo info(m_localFile); KMimeType::Ptr mimeptr = KMimeType::mimeType(mimeType); - QString desc; + TQString desc; if (info.isValid()) { if (mimeptr->is("audio/x-mp3") || mimeptr->is("application/ogg")) @@ -106,16 +106,16 @@ void AudioPreview::initView( const QString& mimeType ) int length = info.item("Length").value().toInt(); if (length/60 < 10) desc.append("0"); - desc.append(QString("%1:").arg(length/60, 0, 10)); + desc.append(TQString("%1:").arg(length/60, 0, 10)); if (length%60 < 10) desc.append("0"); - desc.append(QString("%1\n").arg(length%60, 0, 10)); + desc.append(TQString("%1\n").arg(length%60, 0, 10)); } - description = new QLabel(this); + description = new TQLabel(this); description->setText( desc ); description->adjustSize(); - m_player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", QString::null, this ); + m_player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString::null, this ); if ( m_player ) { static_cast<KParts::ReadOnlyPart*>(m_player)->openURL( url ); @@ -123,7 +123,7 @@ void AudioPreview::initView( const QString& mimeType ) } } -void AudioPreview::downloadFile( const QString& url ) +void AudioPreview::downloadFile( const TQString& url ) { if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , topLevelWidget()) ) { diff --git a/renamedlgplugins/audio/audiopreview.h b/renamedlgplugins/audio/audiopreview.h index 635a81b..568c354 100644 --- a/renamedlgplugins/audio/audiopreview.h +++ b/renamedlgplugins/audio/audiopreview.h @@ -20,7 +20,7 @@ #ifndef audiopreview_h #define audiopreview_h -#include <qvbox.h> +#include <tqvbox.h> namespace KMediaPlayer { @@ -33,18 +33,18 @@ class AudioPreview : public QVBox { Q_OBJECT public: - AudioPreview(QWidget *parent, const char *name, const QString &fileName, const QString &mimeType); + AudioPreview(TQWidget *parent, const char *name, const TQString &fileName, const TQString &mimeType); ~AudioPreview(); private slots: - void downloadFile(const QString& url); + void downloadFile(const TQString& url); private: - void initView(const QString& mimeType); + void initView(const TQString& mimeType); - QLabel *pic; - QLabel *description; - QString m_localFile; + TQLabel *pic; + TQLabel *description; + TQString m_localFile; bool m_isTempFile; KMediaPlayer::Player *m_player; diff --git a/renamedlgplugins/images/image_plugin.cpp b/renamedlgplugins/images/image_plugin.cpp index 7c347ea..0bc6567 100644 --- a/renamedlgplugins/images/image_plugin.cpp +++ b/renamedlgplugins/images/image_plugin.cpp @@ -24,12 +24,12 @@ #include <kiconloader.h> #include <renamedlgplugin.h> #include <kio/renamedlg.h> -#include <qlabel.h> -#include <qdialog.h> -#include <qwidget.h> -#include <qstringlist.h> +#include <tqlabel.h> +#include <tqdialog.h> +#include <tqwidget.h> +#include <tqstringlist.h> #include <kio/global.h> -#include <qlayout.h> +#include <tqlayout.h> #include <sys/types.h> @@ -37,10 +37,10 @@ class ImagePlugin : public RenameDlgPlugin{ public: - ImagePlugin( QDialog *dialog, const char *name, const QStringList & ); - virtual bool initialize( KIO::RenameDlg_Mode /*mod*/, const QString &/*_src*/, const QString &/*_dest*/, - const QString &/*mimeSrc*/, - const QString &/*mimeDest*/, + ImagePlugin( TQDialog *dialog, const char *name, const TQStringList & ); + virtual bool initialize( KIO::RenameDlg_Mode /*mod*/, const TQString &/*_src*/, const TQString &/*_dest*/, + const TQString &/*mimeSrc*/, + const TQString &/*mimeDest*/, KIO::filesize_t /*sizeSrc*/, KIO::filesize_t /*sizeDest*/, time_t /*ctimeSrc*/, @@ -49,14 +49,14 @@ public: time_t /*mtimeDest*/ ); }; -ImagePlugin::ImagePlugin( QDialog *dialog, const char *name, const QStringList &list ) +ImagePlugin::ImagePlugin( TQDialog *dialog, const char *name, const TQStringList &list ) : RenameDlgPlugin( dialog, name, list) { } -bool ImagePlugin::initialize( KIO::RenameDlg_Mode mode, const QString &_src, const QString &_dest, - const QString &/*mimeSrc*/, - const QString &/*mimeDest*/, +bool ImagePlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, const TQString &_dest, + const TQString &/*mimeSrc*/, + const TQString &/*mimeDest*/, KIO::filesize_t /*sizeSrc*/, KIO::filesize_t /*sizeDest*/, time_t /*ctimeSrc*/, @@ -64,10 +64,10 @@ bool ImagePlugin::initialize( KIO::RenameDlg_Mode mode, const QString &_src, con time_t /*mtimeSrc*/, time_t /*mtimeDest*/ ) { - QGridLayout *lay = new QGridLayout(this, 2, 3, 5 ); + TQGridLayout *lay = new TQGridLayout(this, 2, 3, 5 ); if( mode & KIO::M_OVERWRITE ) { - QLabel *label = new QLabel(this ); + 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 ); @@ -81,5 +81,5 @@ bool ImagePlugin::initialize( KIO::RenameDlg_Mode mode, const QString &_src, con return true; } -typedef KGenericFactory<ImagePlugin, QDialog> ImagePluginFactory; +typedef KGenericFactory<ImagePlugin, TQDialog> ImagePluginFactory; K_EXPORT_COMPONENT_FACTORY( librenimageplugin, ImagePluginFactory("imagerename_plugin") ) diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp index cb890c5..706787c 100644 --- a/renamedlgplugins/images/imagevisualizer.cpp +++ b/renamedlgplugins/images/imagevisualizer.cpp @@ -21,58 +21,58 @@ #include <klocale.h> #include <kurl.h> #include <kurllabel.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qimage.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqimage.h> #include <kio/netaccess.h> #include "imagevisualizer.h" -ImageVisualizer::ImageVisualizer( QWidget *parent, const char *name, const QString &fileName ) - : QVBox( parent, name ) +ImageVisualizer::ImageVisualizer( TQWidget *parent, const char *name, const TQString &fileName ) + : TQVBox( parent, name ) { pic = 0; description = 0; KURL url=KURL::fromPathOrURL( fileName ); setSpacing( 0 ); if( url.isValid() && url.isLocalFile() ) { - pic = new QLabel(this ); - description = new QLabel( this ); + pic = new TQLabel(this ); + description = new TQLabel( this ); loadImage( url.path() ); } else if( !url.isLocalFile() ) { KURLLabel *label = new KURLLabel( this ); label->setText(i18n("This picture isn't stored\non the local host.\nClick on this label to load it.\n" ) ); label->setURL( url.prettyURL() ); - connect(label, SIGNAL(leftClickedURL(const QString&)), SLOT(downloadImage(const QString&))); + connect(label, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(downloadImage(const TQString&))); pic = label; - description = new QLabel(this); + description = new TQLabel(this); description->adjustSize( ); } else { - description = new QLabel(this ); + description = new TQLabel(this ); description->setText(i18n("Unable to load image") ); } } -void ImageVisualizer::loadImage( const QString& path ) +void ImageVisualizer::loadImage( const TQString& path ) { - QImage img(path); - QPixmap pixmap(img.smoothScale(180,200, QImage::ScaleMin) ); - pic->setText( QString::null ); + TQImage img(path); + TQPixmap pixmap(img.smoothScale(180,200, TQImage::ScaleMin) ); + pic->setText( TQString::null ); pic->setPixmap(pixmap ); pic->adjustSize(); - QString desc; + 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() )); description->setText(desc ); description->adjustSize(); } -void ImageVisualizer::downloadImage(const QString& url) +void ImageVisualizer::downloadImage(const TQString& url) { - QString tmpFile; + TQString tmpFile; if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , topLevelWidget()) ) { loadImage( tmpFile ); diff --git a/renamedlgplugins/images/imagevisualizer.h b/renamedlgplugins/images/imagevisualizer.h index 391fad2..4130a03 100644 --- a/renamedlgplugins/images/imagevisualizer.h +++ b/renamedlgplugins/images/imagevisualizer.h @@ -20,7 +20,7 @@ #ifndef imagevisualizer_h #define imagevisualizer_h -#include <qvbox.h> +#include <tqvbox.h> class QPixmap; class QLabel; @@ -28,17 +28,17 @@ class ImageVisualizer : public QVBox { Q_OBJECT public: - ImageVisualizer(QWidget *parent, const char *name, const QString &fileName ); + ImageVisualizer(TQWidget *parent, const char *name, const TQString &fileName ); private: - void loadImage( const QString& path ); + void loadImage( const TQString& path ); private slots: - void downloadImage( const QString& url ); + void downloadImage( const TQString& url ); private: - QLabel *pic; - QLabel *description; + TQLabel *pic; + TQLabel *description; }; #endif |