diff options
| author | Michele Calgaro <[email protected]> | 2024-01-11 10:35:25 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-01-11 10:35:25 +0900 |
| commit | 7e9d8ea45280ad6657796da9536ccf6218111f22 (patch) | |
| tree | 67d57c480b89c5967466e39bf60f7e4f05434f15 | |
| parent | 1ecb90ecaf66e1cc8ddeacad21e71640477d9767 (diff) | |
| download | tdeaddons-7e9d8ea45280ad6657796da9536ccf6218111f22.tar.gz tdeaddons-7e9d8ea45280ad6657796da9536ccf6218111f22.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <[email protected]>
119 files changed, 1069 insertions, 1069 deletions
diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index b29106c..f578092 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -122,11 +122,11 @@ LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, c { KPushButton *more = new KPushButton(i18n("&Add Name"), this); hlayout->addWidget(more); - connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); + connect(more, TQ_SIGNAL(clicked()), this, TQ_SLOT(more())); hlayout->addStretch(); KPushButton *less= new KPushButton(i18n("&Delete Name"), this); hlayout->addWidget(less); - connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); + connect(less, TQ_SIGNAL(clicked()), this, TQ_SLOT(less())); } layout->addStretch(); diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 23cdf2c..4a7ea7b 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -48,29 +48,29 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) board = 0; layout = 0; - (void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - (void) KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - (void) KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection()); - (void) KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - (void) KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); - (void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, TQT_SLOT(info()), actionCollection(), "boardinfo"); - (void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, this, TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); - - (void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, this, TQT_SLOT(larger()), actionCollection(), "larger"); - (void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 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 TDEAction(i18n("&Up"), Key_Up, this, TQT_SLOT(up()), actionCollection(), "up"); - (void) new TDEAction(i18n("&Down"), Key_Down, this, TQT_SLOT(down()), actionCollection(), "down"); - (void) new TDEAction(i18n("&Left"), Key_Left, this, TQT_SLOT(left()), actionCollection(), "left"); - (void) new TDEAction(i18n("&Right"), Key_Right, this, TQT_SLOT(right()), actionCollection(), "right"); + (void) KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + (void) KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + (void) KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection()); + (void) KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + (void) KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + (void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, TQ_SLOT(info()), actionCollection(), "boardinfo"); + (void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, this, TQ_SLOT(editGroups()), actionCollection(), "groupeditor"); + + (void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, this, TQ_SLOT(larger()), actionCollection(), "larger"); + (void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 0, this, TQ_SLOT(smaller()), actionCollection(), "smaller"); + (void) KStdAction::copy(this, TQ_SLOT(copy()), actionCollection()); + (void) KStdAction::paste(this, TQ_SLOT(paste()), actionCollection()); + (void) new TDEAction(i18n("&Up"), Key_Up, this, TQ_SLOT(up()), actionCollection(), "up"); + (void) new TDEAction(i18n("&Down"), Key_Down, this, TQ_SLOT(down()), actionCollection(), "down"); + (void) new TDEAction(i18n("&Left"), Key_Left, this, TQ_SLOT(left()), actionCollection(), "left"); + (void) new TDEAction(i18n("&Right"), Key_Right, this, TQ_SLOT(right()), actionCollection(), "right"); recentAct = KStdAction::openRecent(0, 0, actionCollection()); - connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), this, TQT_SLOT(openRecent(const KURL &))); + connect(recentAct, TQ_SIGNAL(urlSelected(const KURL &)), this, TQ_SLOT(openRecent(const KURL &))); recentAct->loadEntries(TDEGlobal::config(), "Designer recent files"); estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); - connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int))); + connect(estateAct, TQ_SIGNAL(activated(int)), TQ_SLOT(changeEstate(int))); createGUI("atlantikdesignerui.rc"); @@ -137,9 +137,9 @@ void AtlanticDesigner::initBoard() setCentralWidget(board); layout = new TQVBoxLayout(board->centerWidget()); editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor"); - connect(editor, TQT_SIGNAL(goChecked(int)), this, TQT_SLOT(goChanged(int))); - connect(editor, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(updateBackground())); - connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath())); + connect(editor, TQ_SIGNAL(goChecked(int)), this, TQ_SLOT(goChanged(int))); + connect(editor, TQ_SIGNAL(updateBackground()), this, TQ_SLOT(updateBackground())); + connect(editor, TQ_SIGNAL(resized()), board, TQ_SLOT(slotResizeAftermath())); layout->addWidget(editor); editor->setReady(false); @@ -159,7 +159,7 @@ void AtlanticDesigner::initToken() board->addToken(m_player); - connect(m_player, TQT_SIGNAL(changed(Player *)), board, TQT_SLOT(playerChanged(Player *))); + connect(m_player, TQ_SIGNAL(changed(Player *)), board, TQ_SLOT(playerChanged(Player *))); } void AtlanticDesigner::openNew() @@ -184,7 +184,7 @@ void AtlanticDesigner::openNew() groupsChanged(); updateBackground(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning())); doCaption(false); } @@ -198,8 +198,8 @@ ConfigEstate *AtlanticDesigner::newEstate(int i) estate->setChanged(false); estates.insert(i, estate); - connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); - connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); + connect(estate, TQ_SIGNAL(LMBClicked(Estate *)), this, TQ_SLOT(changeEstate(Estate *))); + connect(estate, TQ_SIGNAL(changed()), this, TQ_SLOT(modified())); board->addEstateView(estate); @@ -486,8 +486,8 @@ void AtlanticDesigner::openFile(const TQString &filename) estate->setPassMoney(passMoney); estates.append(estate); - connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); - connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); + connect(estate, TQ_SIGNAL(LMBClicked(Estate *)), this, TQ_SLOT(changeEstate(Estate *))); + connect(estate, TQ_SIGNAL(changed()), this, TQ_SLOT(modified())); i++; } else if (parseMode == Parse_Cards) @@ -545,7 +545,7 @@ void AtlanticDesigner::openFile(const TQString &filename) updateBackground(); updateJumpMenu(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning())); doCaption(false); } @@ -895,7 +895,7 @@ void AtlanticDesigner::larger() groupsChanged(); updateBackground(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -934,7 +934,7 @@ void AtlanticDesigner::smaller() updateJumpMenu(); groupsChanged(); updateBackground(); - TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -957,9 +957,9 @@ void AtlanticDesigner::editGroups() groupEditor = new GroupEditor(&groups, this); groupEditor->show(); - connect(groupEditor, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); - connect(groupEditor, TQT_SIGNAL(update()), this, TQT_SLOT(groupsChanged())); - connect(groupEditor, TQT_SIGNAL(update()), editor, TQT_SLOT(groupsChanged())); + connect(groupEditor, TQ_SIGNAL(changed()), this, TQ_SLOT(modified())); + connect(groupEditor, TQ_SIGNAL(update()), this, TQ_SLOT(groupsChanged())); + connect(groupEditor, TQ_SIGNAL(update()), editor, TQ_SLOT(groupsChanged())); } else groupEditor->raise(); @@ -1019,8 +1019,8 @@ void AtlanticDesigner::info() boardInfoDlg = new BoardInfoDlg(true, &boardInfo, this, "Board Information", false); boardInfoDlg->show(); - connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateBackground())); - connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(modified())); + connect(boardInfoDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(updateBackground())); + connect(boardInfoDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(modified())); } else boardInfoDlg->raise(); diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 3301ba6..1f031fc 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -170,12 +170,12 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ ready = false; locked = false; - connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate())); + connect(this, TQ_SIGNAL(somethingChanged()), this, TQ_SLOT(saveEstate())); layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); nameEdit = new TQLineEdit(this, "Name Edit"); layout->addWidget(nameEdit, 0, 0); - connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged())); + connect(nameEdit, TQ_SIGNAL(returnPressed()), this, TQ_SIGNAL(somethingChanged())); confDlg = 0; @@ -190,12 +190,12 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ typeLayout->addWidget(typeLabel); typeCombo = new KComboBox(false, this, "Type Combo"); typeLayout->addWidget(typeCombo); - connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(somethingChanged())); - connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(updateBackground())); + connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(somethingChanged())); + connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(updateBackground())); 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))); + connect(goCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(somethingChanged())); + connect(goCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(goToggled(bool))); layout->addWidget(goCheck, 5, 0); TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint()); @@ -325,7 +325,7 @@ void EstateEdit::configure() confDlg->slotUpdate(estate); - connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground())); + connect(confDlg, TQ_SIGNAL(updateBackground()), this, TQ_SIGNAL(updateBackground())); layout->addWidget(confDlg, 1, 0); confDlg->show(); @@ -442,7 +442,7 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQW TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); KPushButton *addB = new KPushButton(i18n("&New Stack"), this); - connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack())); + connect(addB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addStack())); layout->addWidget(addB); layout->addStretch(); @@ -454,7 +454,7 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQW cards = new TQComboBox(this); cards->insertStringList(cardNames); layout->addWidget(cards); - connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &))); + connect(cards, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateView(const TQString &))); vlayout->addWidget(new KSeparator(this)); } @@ -547,7 +547,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa _types.append(i18n("Pay for Each Hotel")); typeCombo->insertStringList(_types); hlayout->addWidget(typeCombo); - connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int))); + connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(typeChanged(int))); hlayout->addStretch(); } @@ -589,7 +589,7 @@ void ChooseWidget::typeChanged(int i) value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this); hlayout->addWidget(value); - connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(value, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); value->show(); } @@ -603,7 +603,7 @@ void ChooseWidget::typeChanged(int i) for (curestate = estates->first(); curestate; curestate = estates->next()) estateStrings.append(curestate->name()); estate->insertStringList(estateStrings); - connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int))); + connect(estate, TQ_SIGNAL(activated(int)), this, TQ_SLOT(estateChanged(int))); hlayout->addWidget(estate); estate->show(); @@ -653,31 +653,31 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); addButton = new KPushButton(i18n("&Add Card..."), this); - connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); + connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(add())); hlayout->addWidget(addButton); hlayout->addStretch(); renameButton = new KPushButton(i18n("&Rename..."), this); - connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename())); + connect(renameButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(rename())); hlayout->addWidget(renameButton); hlayout->addStretch(); delButton = new KPushButton(i18n("&Delete"), this); - connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); + connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(del())); hlayout->addWidget(delButton); List = new TDEListBox(this); layout->addWidget(List); - connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int))); + connect(List, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(selected(int))); // it gets very big (and won't shrink) otherwise List->setMaximumHeight(90); hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); moreButton = new KPushButton(i18n("&More Properties"), this); - connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); + connect(moreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(more())); hlayout->addWidget(moreButton); hlayout->addStretch(); lessButton = new KPushButton(i18n("&Fewer Properties"), this); - connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); + connect(lessButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(less())); hlayout->addWidget(lessButton); for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it) @@ -861,7 +861,7 @@ StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *n pricesBox->addWidget(groupLabel, 1, 0); groupCombo = new KComboBox(this, "Group Combo"); groupUpdate(); - connect(groupCombo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(groupChanged(const TQString &))); + connect(groupCombo, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(groupChanged(const TQString &))); pricesBox->addWidget(groupCombo, 1, 1); } diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index 2aca4f4..5f7668a 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -30,12 +30,12 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) groups = new TDEListBox(page); hlayout->addWidget(groups); - connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *))); + connect(groups, TQ_SIGNAL(highlighted(TQListBoxItem *)), this, TQ_SLOT(updateSettings(TQListBoxItem *))); TQStringList newgroups; for (ConfigEstateGroupList::Iterator it = list->begin(); it != list->end(); ++it) newgroups.append((*it).name()); groups->insertStringList(newgroups); - connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); + connect(groups, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint()); colorGroupBox = new TQVGroupBox(i18n("&Colors"), page); @@ -43,13 +43,13 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) (void) new TQLabel(i18n("Foreground:"), colorGroupBox); fgButton = new KColorButton(colorGroupBox, "Foreground Button"); - connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(fgChanged(const TQColor &))); - connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed())); + connect(fgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(fgChanged(const TQColor &))); + connect(fgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SIGNAL(changed())); (void) new TQLabel(i18n("Background:"), colorGroupBox); bgButton = new KColorButton(colorGroupBox, "Background Button"); - connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(bgChanged(const TQColor &))); - connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed())); + connect(bgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(bgChanged(const TQColor &))); + connect(bgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SIGNAL(changed())); pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page); vlayout->addWidget(pricesGroupBox); @@ -60,13 +60,13 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) pricesLayout->addWidget(housePrice = new TQSpinBox(0, 3000, 25, pricesWidget), 0, 1); housePrice->setSpecialValueText(i18n("None")); housePrice->setSuffix(i18n("$")); - connect(housePrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(housePriceChanged(int))); + connect(housePrice, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(housePriceChanged(int))); 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, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(globalPriceChanged(int))); + connect(globalPrice, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(globalPriceChanged(int))); dynamicGroupBox = new TQVGroupBox(i18n("&Dynamic Rent"), page); vlayout->addWidget(dynamicGroupBox); @@ -85,18 +85,18 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) mathLayout->addWidget(rentVarCombo, 0, 1); rentMathEdit = new KLineEdit(mathWidget); - 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 &))); + connect(rentMathEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(rentMathChanged(const TQString &))); + connect(rentVarCombo, TQ_SIGNAL(activated(const TQString &)), rentMathEdit, TQ_SLOT(insert(const TQString &))); mathLayout->addWidget(rentMathEdit, 1, 1); TQHBoxLayout *buttonlayout = new TQHBoxLayout(vlayout, spacingHint()); KPushButton *addB = new KPushButton(i18n("&Add..."), page); buttonlayout->addWidget(addB); - connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); + connect(addB, TQ_SIGNAL(clicked()), this, TQ_SLOT(add())); removeB = new KPushButton(i18n("&Remove"), page); buttonlayout->addWidget(removeB); - connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect(removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove())); selectionChanged(); } diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index a8175d2..24153a4 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePlugi KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) { TDEGlobal::locale()->insertCatalogue("katecppsymbolviewer"); - TDEToggleAction* act = new TDEToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); + TDEToggleAction* act = new TDEToggleAction ( i18n("Hide Symbols"), 0, this, TQ_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); act->setCheckedState(i18n("Show Symbols")); setInstance (new TDEInstance("kate")); @@ -66,14 +66,14 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) m_Active = false; popup = new TQPopupMenu(); - popup->insertItem(i18n("Refresh List"), this, TQT_SLOT(slotRefreshSymbol())); + popup->insertItem(i18n("Refresh List"), this, TQ_SLOT(slotRefreshSymbol())); popup->insertSeparator(); - 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())); + m_macro = popup->insertItem(i18n("Show Macros"), this, TQ_SLOT(toggleShowMacros())); + m_struct = popup->insertItem(i18n("Show Structures"), this, TQ_SLOT(toggleShowStructures())); + m_func = popup->insertItem(i18n("Show Functions"), this, TQ_SLOT(toggleShowFunctions())); popup->insertSeparator(); - popup->insertItem(i18n("List/Tree Mode"), this, TQT_SLOT(slotChangeMode())); - m_sort = popup->insertItem(i18n("Enable sorting"), this, TQT_SLOT(slotEnableSorting())); + popup->insertItem(i18n("List/Tree Mode"), this, TQ_SLOT(slotChangeMode())); + m_sort = popup->insertItem(i18n("Enable sorting"), this, TQ_SLOT(slotEnableSorting())); popup->setItemChecked(m_macro, true); popup->setItemChecked(m_struct, true); @@ -126,11 +126,11 @@ void KatePluginSymbolViewerView::slotInsertSymbol() symbols = new TDEListView(dock); treeMode = 0; - 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 *))); + connect(symbols, TQ_SIGNAL(executed(TQListViewItem *)), this, TQ_SLOT(goToSymbol(TQListViewItem *))); + connect(symbols, TQ_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint&, int))); + connect(win->viewManager(), TQ_SIGNAL(viewChanged()), this, TQ_SLOT(slotDocChanged())); + //connect(symbols, TQ_SIGNAL(resizeEvent(TQResizeEvent *)), this, TQ_SLOT(slotViewChanged(TQResizeEvent *))); m_Active = true; //symbols->addColumn(i18n("Symbols"), symbols->parentWidget()->width()); @@ -280,8 +280,8 @@ Kate::PluginConfigPage* KatePluginSymbolViewer::configPage( { KatePluginSymbolViewerConfigPage* p = new KatePluginSymbolViewerConfigPage(this, w); initConfigPage( p ); - connect( p, TQT_SIGNAL(configPageApplyRequest(KatePluginSymbolViewerConfigPage*)), - TQT_SLOT(applyConfig(KatePluginSymbolViewerConfigPage *)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(KatePluginSymbolViewerConfigPage*)), + TQ_SLOT(applyConfig(KatePluginSymbolViewerConfigPage *)) ); return (Kate::PluginConfigPage*)p; } @@ -323,8 +323,8 @@ KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage( top->add(gb); top->addStretch(1); // throw signal changed - connect(viewReturns, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); - connect(expandTree, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); + connect(viewReturns, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed())); + connect(expandTree, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed())); } KatePluginSymbolViewerConfigPage::~KatePluginSymbolViewerConfigPage() {} diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 7837b33..e7d56c1 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -79,11 +79,11 @@ int InitPluginKateFileListLoader::initKate() Kate::Plugin *pl=application()->pluginManager()->plugin("katefll_plugin"); if (pl) { - connect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); + connect(this,TQ_SIGNAL(updateInit()),pl,TQ_SLOT(updateInit())); updateInit(); - disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); + disconnect(this,TQ_SIGNAL(updateInit()),pl,TQ_SLOT(updateInit())); -/* int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) ); +/* int id = pl->metaObject()->findSlot( TQ_SLOT(updateInit()) ); if ( id != -1 ) { kdDebug()<<"Action slot was found, it will be called now"<<endl; diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index 381c5b1..916e73a 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -75,20 +75,20 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction( i18n("Open File List..."), 0, - this, TQT_SLOT( slotOpenList() ), + this, TQ_SLOT( slotOpenList() ), view->actionCollection(), "file_kfllopen" ); view->recentFiles = new TDERecentFilesAction( i18n("Open Recent"), TDEShortcut::null(), - this, TQT_SLOT(slotOpenList(const KURL&)), view->actionCollection(), + this, TQ_SLOT(slotOpenList(const KURL&)), view->actionCollection(), "file_kfllopenrecent"); view->recentFiles->loadEntries(m_config, "Recent Files"); (void) new TDEAction( i18n("Save File List"), 0, - this, TQT_SLOT( slotSaveList() ), + this, TQ_SLOT( slotSaveList() ), view->actionCollection(), "file_kfllsave" ); (void) new TDEAction( i18n("Save File List As..."), 0, - this, TQT_SLOT( slotSaveListAs() ), + this, TQ_SLOT( slotSaveListAs() ), view->actionCollection(), "file_kfllsaveas" ); view->setInstance (new TDEInstance("kate")); diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 6604461..68076fd 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -133,11 +133,11 @@ KateFileTemplates::KateFileTemplates( TQObject* 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 TDEAction ( i18n("Any File..."), 0, this, - TQT_SLOT( slotAny() ), m_actionCollection, + TQ_SLOT( slotAny() ), m_actionCollection, "file_template_any" ); // recent templates m_acRecentTemplates = new TDERecentFilesAction( i18n("&Use Recent"), 0, this, - TQT_SLOT(slotOpenTemplate(const KURL &)), + TQ_SLOT(slotOpenTemplate(const KURL &)), m_actionCollection, "file_templates_recent" ); m_acRecentTemplates->loadEntries( kapp->config(), "Recent Templates" ); @@ -150,12 +150,12 @@ KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) m_dw->addDir( *it, true ); } - 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&)) ); + connect( m_dw, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(updateTemplateDirs(const TQString&)) ); + connect( m_dw, TQ_SIGNAL(created(const TQString&)), + this, TQ_SLOT(updateTemplateDirs(const TQString&)) ); + connect( m_dw, TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(updateTemplateDirs(const TQString&)) ); m_templates.setAutoDelete( true ); updateTemplateDirs(); @@ -249,7 +249,7 @@ void KateFileTemplates::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction( i18n("&Manage Templates..."), 0, - this, TQT_SLOT(slotEditTemplate()), + this, TQ_SLOT(slotEditTemplate()), view->actionCollection(), "settings_manage_templates" ); (void)new TDEActionMenu( i18n("New From &Template"), "text-x-makefile", @@ -316,10 +316,10 @@ 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, TQT_SLOT(slotOpenTemplate( int )), 0, i ); + m_templates.at( i )->tmplate, this, TQ_SLOT(slotOpenTemplate( int )), 0, i ); else submenus[m_templates.at( i )->group]->insertItem( - m_templates.at( i )->tmplate, this, TQT_SLOT(slotOpenTemplate( int )), 0, i ); + m_templates.at( i )->tmplate, this, TQ_SLOT(slotOpenTemplate( int )), 0, i ); // add whatsthis containing the description and author TQString w ( m_templates.at( i )->description ); @@ -623,7 +623,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo * if ( doc ) { TQPopupMenu *m = new TQPopupMenu( btnHighlight ); - connect( m, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotHlSet( int ) ) ); + connect( m, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotHlSet( int ) ) ); TQDict<TQPopupMenu> submenus; for ( uint n = 0; n < doc->hlModeCount(); n++ ) { @@ -635,7 +635,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo * { TQPopupMenu *sm = new TQPopupMenu(); submenus.insert( text, sm ); - connect( sm, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotHlSet( int ) ) ); + connect( sm, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotHlSet( int ) ) ); m->insertItem( text, sm ); } @@ -699,7 +699,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft btnTmpl = new TQPushButton( page ); glo->addWidget( btnTmpl, 6, 2 ); TQPopupMenu *m = new TQPopupMenu( btnTmpl ); - connect( m, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTmplateSet( int ) ) ); + connect( m, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTmplateSet( int ) ) ); TQDict<TQPopupMenu> submenus; for ( uint i = 0; i < kft->templates().count(); i++ ) @@ -707,7 +707,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft if ( ! submenus[ kft->templates().at( i )->group ] ) { TQPopupMenu *sm = new TQPopupMenu(); - connect( sm, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTmplateSet( int ) ) ); + connect( sm, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTmplateSet( int ) ) ); submenus.insert( kft->templates().at( i )->group, sm ); m->insertItem( kft->templates().at( i )->group, sm ); } @@ -717,8 +717,8 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft } btnTmpl->setPopup( m ); - connect( bgOrigin, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int)) ); - connect( urOrigin, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) ); + connect( bgOrigin, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotStateChanged(int)) ); + connect( urOrigin, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotStateChanged(const TQString&)) ); glo->addMultiCell( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), 7, 7, 1, 2 ); @@ -775,9 +775,9 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft urLocation = new KURLRequester( page ); glo->addWidget( urLocation, 6, 2 ); - 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 &)) ); + connect( bgLocation, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotStateChanged(int)) ); + connect( urLocation, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotStateChanged(const TQString&)) ); + connect( leTemplateFileName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotStateChanged(const TQString &)) ); glo->addMultiCell( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), 7, 7, 1, 2 ); @@ -827,7 +827,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft addPage( page, i18n("Create Template") ); kdDebug()<<"=== Adding summary page at "<<endl; - connect( this, TQT_SIGNAL(selected(const TQString&)), this, TQT_SLOT(slotStateChanged(const TQString&)) ); + connect( this, TQ_SIGNAL(selected(const TQString&)), this, TQ_SLOT(slotStateChanged(const TQString&)) ); } void KateTemplateWizard::slotTmplateSet( int idx ) @@ -1108,26 +1108,26 @@ KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *pare lvTemplates = new TDEListView( this ); lvTemplates->addColumn( i18n("Template") ); lo->addMultiCellWidget( lvTemplates, 1, 1, 1, 6 ); - connect( lvTemplates, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateState()) ); + connect( lvTemplates, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateState()) ); btnNew = new TQPushButton( i18n("New..."), this ); - connect( btnNew, TQT_SIGNAL(clicked()), kft, TQT_SLOT(slotCreateTemplate()) ); + connect( btnNew, TQ_SIGNAL(clicked()), kft, TQ_SLOT(slotCreateTemplate()) ); lo->addWidget( btnNew, 2, 2 ); btnEdit = new TQPushButton( i18n("Edit..."), this ); - connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditTemplate()) ); + connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotEditTemplate()) ); lo->addWidget( btnEdit, 2, 3 ); btnRemove = new TQPushButton( i18n("Remove"), this ); - connect( btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveTemplate()) ); + connect( btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveTemplate()) ); lo->addWidget( btnRemove, 2, 4 ); btnUpload = new TQPushButton( i18n("Upload..."), this ); - connect( btnUpload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpload()) ); + connect( btnUpload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpload()) ); lo->addWidget( btnUpload, 2, 5 ); btnDownload = new TQPushButton( i18n("Download..."), this ); - connect( btnDownload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownload()) ); + connect( btnDownload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownload()) ); lo->addWidget( btnDownload, 2, 6 ); lo->setColStretch( 1, 1 ); diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 45424ab..5b32af4 100644 --- a/kate/helloworld/plugin_katehelloworld.cpp +++ b/kate/helloworld/plugin_katehelloworld.cpp @@ -31,7 +31,7 @@ void KatePluginHelloWorld::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_helloworld" ); view->setInstance (new TDEInstance("kate")); diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index d6fc512..3ab22e4 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -51,7 +51,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this, - TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); + TQ_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); view->setInstance (new TDEInstance("kate")); view->setXMLFile( "plugins/katehtmltools/ui.rc" ); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index cdbe0a2..c83a751 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -84,7 +84,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Command..."), "", 0, this, - TQT_SLOT( slotInsertCommand() ), view->actionCollection(), + TQ_SLOT( slotInsertCommand() ), view->actionCollection(), "edit_insert_command" ); view->setInstance (new TDEInstance("kate")); @@ -148,12 +148,12 @@ void PluginKateInsertCommand::slotInsertCommand() if ( ! sh ) { sh = new KShellProcess; - connect ( sh, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)) ); - connect ( sh, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); - connect ( sh, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ) ; + connect ( sh, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)) ); + connect ( sh, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); + connect ( sh, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ) ; } sh->clearArguments(); @@ -209,7 +209,7 @@ void PluginKateInsertCommand::slotShowWaitDlg() if ( sh->isRunning() ) { wdlg = new WaitDlg( (TQWidget*)kv, i18n( "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd) ); - connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) ); + connect(wdlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotAbort()) ); } if ( sh->isRunning() ) // we may have finished while creating the dialog. wdlg->show(); @@ -254,8 +254,8 @@ Kate::PluginConfigPage* PluginKateInsertCommand::configPage (uint, { InsertCommandConfigPage* p = new InsertCommandConfigPage(this, w); initConfigPage( p ); - connect( p, TQT_SIGNAL(configPageApplyRequest(InsertCommandConfigPage*)), - this, TQT_SLOT(applyConfig(InsertCommandConfigPage*)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(InsertCommandConfigPage*)), + this, TQ_SLOT(applyConfig(InsertCommandConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -299,8 +299,8 @@ CmdPrompt::CmdPrompt(TQWidget* parent, l->setBuddy(cmb_cmd); cmb_cmd->setFocus(); lo->addWidget(cmb_cmd); - connect( cmb_cmd->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT( slotTextChanged(const TQString &))); + connect( cmb_cmd->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT( slotTextChanged(const TQString &))); TQLabel *lwd = new TQLabel( i18n("Choose &working folder:"), page ); lo->addWidget( lwd ); diff --git a/kate/katesort/plugin_sort.cpp b/kate/katesort/plugin_sort.cpp index fa55734..38dd4b1 100644 --- a/kate/katesort/plugin_sort.cpp +++ b/kate/katesort/plugin_sort.cpp @@ -77,7 +77,7 @@ void KatePluginSort::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Sort"), 0, this, - SLOT( slotSort() ), view->actionCollection(), + TQ_SLOT( slotSort() ), view->actionCollection(), "edit_insert_sort" ); view->setInstance (new TDEInstance("kate")); diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index 13af0c7..be8a1ae 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -394,7 +394,7 @@ KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQOb if (oe==0) { oe=new ObjectEntry; oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy); - connect(obj,TQT_SIGNAL(destroyed()),this,TQT_SLOT(removeSender())); + connect(obj,TQ_SIGNAL(destroyed()),this,TQ_SLOT(removeSender())); insert(obj,oe); return oe->obj; } else return oe->obj; diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index 04b5a96..7dd33c4 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -197,8 +197,8 @@ Kate::PluginConfigPage* PluginKateKJSWrapper::configPage (uint id, /* KateKJSWrapperConfigPage* p = new KateKJSWrapperConfigPage(this, w); //init - connect( p, TQT_SIGNAL(configPageApplyRequest(KateKJSWrapperConfigPage*)), - this, TQT_SLOT(applyConfig(KateKJSWrapperConfigPage*)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(KateKJSWrapperConfigPage*)), + this, TQ_SLOT(applyConfig(KateKJSWrapperConfigPage*)) ); return (Kate::PluginConfigPage*);*/ } @@ -260,7 +260,7 @@ PluginKateKJSWrapperView *PluginKateKJSWrapper::getViewObject(Kate::MainWindow * if (!view) { view=new PluginKateKJSWrapperView(); view->win=win; - connect(win,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWindowDestroyed())); + connect(win,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWindowDestroyed())); m_views.insert(win,view); KJS::Interpreter *js = m_part->interpreter(); KJS::ExecState *exec = js->globalExec(); diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index f7cef15..b1fa86a 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -196,8 +196,8 @@ TDEListView (parent, name) PYOTHER); function_root->setPixmap (0, TQPixmap (container_xpm)); setRootIsDecorated (1); - connect (this, TQT_SIGNAL (executed (TQListViewItem *)), this, - TQT_SLOT (nodeSelected (TQListViewItem *))); + connect (this, TQ_SIGNAL (executed (TQListViewItem *)), this, + TQ_SLOT (nodeSelected (TQListViewItem *))); setTooltipColumn (1); setShowToolTips (1); tooltip = new KPBToolTip (this); diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index af71679..2729533 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -34,7 +34,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w) : win (w) { (void) new TDEAction ( i18n("Update Python Browser"), 0, this, - TQT_SLOT( slotUpdatePyBrowser() ), actionCollection(), + TQ_SLOT( slotUpdatePyBrowser() ), actionCollection(), "python_update_pybrowse" ); //set up the menus @@ -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, TQT_SIGNAL(selected(TQString, int)), this, TQT_SLOT(slotSelected(TQString, int))); + connect(kpybrowser, TQ_SIGNAL(selected(TQString, int)), this, TQ_SLOT(slotSelected(TQString, int))); } PluginViewPyBrowse::~PluginViewPyBrowse () diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index b6c2084..d935fa7 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -334,19 +334,19 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, m_proc=0; (void) new TDEAction ( i18n("Next Error"), TDEShortcut(ALT+CTRL+Key_Right), - this, TQT_SLOT( slotNext() ), + this, TQ_SLOT( slotNext() ), actionCollection(), "make_right" ); (void) new TDEAction ( i18n("Previous Error"), TDEShortcut(ALT+CTRL+Key_Left), - this, TQT_SLOT( slotPrev() ), + this, TQ_SLOT( slotPrev() ), actionCollection(), "make_left" ); (void) new TDEAction ( i18n("Make"), TDEShortcut(ALT+Key_R), - this, TQT_SLOT( slotValidate() ), + this, TQ_SLOT( slotValidate() ), actionCollection(), "make_check" ); (void) new TDEAction ( i18n("Configure..."), TDEShortcut(), - this, TQT_SLOT( slotConfigure() ), + this, TQ_SLOT( slotConfigure() ), actionCollection(), "make_settings" ); setInstance(new TDEInstance("kate")); @@ -362,13 +362,13 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, addColumn(i18n("Message"), -1); setAllColumnsShowFocus(true); setResizeMode(TQListView::LastColumn); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotClicked(TQListViewItem *))); m_proc = new TDEProcess(); - connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*))); - connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); + connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcExited(TDEProcess*))); + connect(m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); TDEConfig c("katemakepluginrc"); diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index b077ccf..0be6fce 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -56,7 +56,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); new TDEAction( i18n("Apply Modeline"), 0, - this, TQT_SLOT(applyModeline()), + this, TQ_SLOT(applyModeline()), view->actionCollection(), "edit_apply_modeline" ); view->setInstance (new TDEInstance("kate")); diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index 8e98207..77233a5 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -51,7 +51,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction( i18n("Open .h/.cpp/.c"), Key_F12, - this, TQT_SLOT( slotOpenHeader() ), + this, TQ_SLOT( slotOpenHeader() ), view->actionCollection(), "file_openheader" ); view->setInstance (new TDEInstance("kate")); diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index f6c173e..5249a44 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -35,29 +35,29 @@ KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *do //<make connections> connect ( - lvSnippets, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), - this, TQT_SLOT( slot_lvSnippetsSelectionChanged(TQListViewItem *) ) + lvSnippets, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), + this, TQ_SLOT( slot_lvSnippetsSelectionChanged(TQListViewItem *) ) ); connect ( - lvSnippets, TQT_SIGNAL( doubleClicked (TQListViewItem *) ), - this, TQT_SLOT( slot_lvSnippetsClicked(TQListViewItem *) ) + lvSnippets, TQ_SIGNAL( doubleClicked (TQListViewItem *) ), + this, TQ_SLOT( slot_lvSnippetsClicked(TQListViewItem *) ) ); connect ( - lvSnippets, TQT_SIGNAL( itemRenamed(TQListViewItem *, int, const TQString &) ), - this, TQT_SLOT( slot_lvSnippetsItemRenamed(TQListViewItem *, int, const TQString &) ) + lvSnippets, TQ_SIGNAL( itemRenamed(TQListViewItem *, int, const TQString &) ), + this, TQ_SLOT( slot_lvSnippetsItemRenamed(TQListViewItem *, int, const TQString &) ) ); connect ( - btnNew, TQT_SIGNAL( clicked () ), - this, TQT_SLOT( slot_btnNewClicked() ) + btnNew, TQ_SIGNAL( clicked () ), + this, TQ_SLOT( slot_btnNewClicked() ) ); connect ( - btnSave, TQT_SIGNAL( clicked () ), - this, TQT_SLOT( slot_btnSaveClicked() ) + btnSave, TQ_SIGNAL( clicked () ), + this, TQ_SLOT( slot_btnSaveClicked() ) ); connect ( - btnDelete, TQT_SIGNAL( clicked () ), - this, TQT_SLOT( slot_btnDeleteClicked() ) + btnDelete, TQ_SIGNAL( clicked () ), + this, TQ_SLOT( slot_btnDeleteClicked() ) ); //</make connections> diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index e26524c..2951d1f 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -112,8 +112,8 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) TDEToolBar* toolbar = dynamic_cast<TDEToolBar*> (win->guiFactory()->container("tabbarExtensionToolBar", view)); if (toolbar) { - connect(toolbar, TQT_SIGNAL(orientationChanged(TQt::Orientation)), - view->tabbar, TQT_SLOT(slotMoved(TQt::Orientation))); + connect(toolbar, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + view->tabbar, TQ_SLOT(slotMoved(TQt::Orientation))); } } @@ -147,8 +147,8 @@ Kate::PluginConfigPage* KatePluginTabBarExtension::configPage( { KateTabBarExtensionConfigPage* p = new KateTabBarExtensionConfigPage(this, w); initConfigPage( p ); - connect( p, TQT_SIGNAL(configPageApplyRequest(KateTabBarExtensionConfigPage*)), - TQT_SLOT(applyConfig(KateTabBarExtensionConfigPage*)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(KateTabBarExtensionConfigPage*)), + TQ_SLOT(applyConfig(KateTabBarExtensionConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -181,7 +181,7 @@ KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, setText(pDoc->docName()); - connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setOn(bool))); + connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setOn(bool))); } void KateTabBarButton::setDirty(bool d) @@ -246,7 +246,7 @@ void KateTabBarButton::triggerModified() void KateTabBarButton::setOn(bool on) { - disconnect( TQT_SIGNAL(toggled(bool))); + disconnect( TQ_SIGNAL(toggled(bool))); // kdDebug() << "setOn: " << (int)on << endl; if ((!on) && viewManager->activeView()->document()->documentNumber() == documentNumber()) { @@ -257,7 +257,7 @@ void KateTabBarButton::setOn(bool on) if (on) emit myToggled(this); } - connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setOn(bool))); + connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setOn(bool))); } // END KateTabBarButton @@ -282,13 +282,13 @@ KateTabBarExtension::KateTabBarExtension(Kate::DocumentManager *pDocManager, slotDocumentCreated (pDocManager->document(i)); } - connect(m_win->viewManager(), TQT_SIGNAL(viewChanged()), TQT_SLOT(slotViewChanged())); + connect(m_win->viewManager(), TQ_SIGNAL(viewChanged()), TQ_SLOT(slotViewChanged())); connect(pDocManager, - TQT_SIGNAL(documentCreated(Kate::Document *)), - TQT_SLOT(slotDocumentCreated(Kate::Document *))); + TQ_SIGNAL(documentCreated(Kate::Document *)), + TQ_SLOT(slotDocumentCreated(Kate::Document *))); connect(pDocManager, - TQT_SIGNAL(documentDeleted(uint)), - TQT_SLOT(slotDocumentDeleted(uint))); + TQ_SIGNAL(documentDeleted(uint)), + TQ_SLOT(slotDocumentDeleted(uint))); setSortByName(bSort); setCloseOnMiddleClick(bCloseOnMiddleClick); @@ -346,17 +346,17 @@ void KateTabBarExtension::slotDocumentCreated (Kate::Document *doc) if (!doc) return; KateTabBarButton* tab = new KateTabBarButton(m_win->viewManager(), doc, this); - connect(tab, TQT_SIGNAL(myToggled(KateTabBarButton*)), - TQT_SLOT(slotActivateView(KateTabBarButton*))); - connect(tab, TQT_SIGNAL(middleButtonPressed(KateTabBarButton*)), - TQT_SLOT(slotRequestDocClose(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(tab, TQ_SIGNAL(myToggled(KateTabBarButton*)), + TQ_SLOT(slotActivateView(KateTabBarButton*))); + connect(tab, TQ_SIGNAL(middleButtonPressed(KateTabBarButton*)), + TQ_SLOT(slotRequestDocClose(KateTabBarButton*))); + connect(doc, TQ_SIGNAL(nameChanged(Kate::Document *)), + TQ_SLOT(slotNameChanged(Kate::Document *))); + connect(doc, TQ_SIGNAL(modStateChanged(Kate::Document *)), + TQ_SLOT(slotModChanged(Kate::Document *))); connect(doc, - TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), - TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); + TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), + TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); if(doc->isModified()) tab->triggerModified(); tab->show(); top->addWidget(tab); @@ -489,8 +489,8 @@ KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage( top->add(gb); top->addStretch(1); // throw signal changed - connect(pSortAlpha, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); - connect(pCloseOnMiddleClick, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); + connect(pSortAlpha, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed())); + connect(pCloseOnMiddleClick, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed())); } // END KateTabBarExtensionConfigPage diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 4103df2..f5bb625 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -64,7 +64,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this, - TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); + TQ_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); view->setInstance (new TDEInstance("kate")); view->setXMLFile( "plugins/katetextfilter/ui.rc" ); @@ -283,17 +283,17 @@ void PluginKateTextFilter::runFilter( Kate::View *kv, const TQString &filter ) { m_pFilterShellProcess = new KShellProcess; - connect ( m_pFilterShellProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotFilterCloseStdin (TDEProcess *))); + connect ( m_pFilterShellProcess, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotFilterCloseStdin (TDEProcess *))); - connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotFilterReceivedStdout(TDEProcess*,char*,int)) ); + connect ( m_pFilterShellProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotFilterReceivedStdout(TDEProcess*,char*,int)) ); - connect ( m_pFilterShellProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotFilterReceivedStderr(TDEProcess*,char*,int)) ); + connect ( m_pFilterShellProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotFilterReceivedStderr(TDEProcess*,char*,int)) ); - connect ( m_pFilterShellProcess, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotFilterProcessExited(TDEProcess*) ) ) ; + connect ( m_pFilterShellProcess, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotFilterProcessExited(TDEProcess*) ) ) ; } slipInFilter (*m_pFilterShellProcess, *kv, filter); diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 4ab18da..abad13d 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -100,10 +100,10 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow m_tmp_file=0; m_proc=0; (void) new TDEAction ( i18n("Validate XML"), 0, this, - TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" ); + TQ_SLOT( slotValidate() ), actionCollection(), "xml_check" ); // TODO?: //(void) new TDEAction ( i18n("Indent XML"), 0, this, - // TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" ); + // TQ_SLOT( slotIndent() ), actionCollection(), "xml_indent" ); setInstance(new TDEInstance("kate")); setXMLFile("plugins/katexmlcheck/ui.rc"); @@ -118,7 +118,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow addColumn(i18n("Message"), -1); setAllColumnsShowFocus(true); setResizeMode(TQListView::LastColumn); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotClicked(TQListViewItem *))); /* TODO?: invalidate the listview when document has changed Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView(); @@ -126,17 +126,17 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow kdDebug() << "Warning: no Kate::View" << endl; return; } - connect(kv, TQT_SIGNAL(modifiedChanged()), this, TQT_SLOT(slotUpdate())); + connect(kv, TQ_SIGNAL(modifiedChanged()), this, TQ_SLOT(slotUpdate())); */ m_proc_stderr = ""; m_proc = new TDEProcess(); - connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*))); + connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcExited(TDEProcess*))); // we currently only want errors: - //connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - // this, TQT_SLOT(receivedProcStdout(TDEProcess*, char*, int))); - connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); + //connect(m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + // this, TQ_SLOT(receivedProcStdout(TDEProcess*, char*, int))); + connect(m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); } diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index 7dc1cdf..0bbc029 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -134,10 +134,10 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, cons m_documentManager = ((Kate::Application*)parent)->documentManager(); -// connect( m_documentManager, TQT_SIGNAL(documentCreated()), -// this, TQT_SLOT(slotDocumentCreated()) ); - connect( m_documentManager, TQT_SIGNAL(documentDeleted(uint)), - this, TQT_SLOT(slotDocumentDeleted(uint)) ); +// connect( m_documentManager, TQ_SIGNAL(documentCreated()), +// this, TQ_SLOT(slotDocumentCreated()) ); + connect( m_documentManager, TQ_SIGNAL(documentDeleted(uint)), + this, TQ_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 TDEAction ( i18n("&Insert Element..."), CTRL+Key_Return, this, - TQT_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" ); + TQ_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" ); ( void) new TDEAction ( i18n("&Close Element"), CTRL+Key_Less, this, - TQT_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" ); + TQ_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" ); ( void) new TDEAction ( i18n("Assign Meta &DTD..." ), 0, this, - TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); + TQ_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); view->setInstance( new TDEInstance("kate") ); view->setXMLFile( "plugins/katexmltools/ui.rc" ); @@ -361,9 +361,9 @@ PluginKateXMLTools::stringListToCompletionEntryList( TQStringList list ) */ void PluginKateXMLTools::disconnectSlots( Kate::View *kv ) { - 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 ); + disconnect( kv, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), this, 0 ); + disconnect( kv, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), this, 0 ); + disconnect( kv, TQ_SIGNAL(completionAborted()), this, 0 ); } /** @@ -372,11 +372,11 @@ void PluginKateXMLTools::disconnectSlots( Kate::View *kv ) */ void PluginKateXMLTools::connectSlots( Kate::View *kv ) { - 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()) ); + connect( kv, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*) ), + this, TQ_SLOT(filterInsertString(KTextEditor::CompletionEntry*,TQString*)) ); + connect( kv, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry) ), + this, TQ_SLOT(completionDone(KTextEditor::CompletionEntry)) ); + connect( kv, TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionAborted()) ); } /** @@ -485,9 +485,9 @@ void PluginKateXMLTools::getDTD() TQApplication::setOverrideCursor( KCursor::waitCursor() ); TDEIO::Job *job = TDEIO::get( url ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotFinished(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotFinished(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)) ); } kdDebug()<<"XMLTools::getDTD: Documents: "<<m_docDtds.count()<<", DTDs: "<<m_dtds.count()<<endl; } @@ -529,12 +529,12 @@ void PluginKateXMLTools::slotData( TDEIO::Job *, const TQByteArray &data ) void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ) { m_docDtds.replace( doc->documentNumber(), dtd ); - connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), - this, TQT_SLOT(keyEvent(int,int,const TQString&)) ); + connect( doc, TQ_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), + this, TQ_SLOT(keyEvent(int,int,const TQString&)) ); - disconnect( doc, TQT_SIGNAL(backspacePressed()), this, 0 ); - connect( doc, TQT_SIGNAL(backspacePressed() ), - this, TQT_SLOT(backspacePressed()) ); + disconnect( doc, TQ_SIGNAL(backspacePressed()), this, 0 ); + connect( doc, TQ_SIGNAL(backspacePressed() ), + this, TQ_SLOT(backspacePressed()) ); } /** @@ -782,7 +782,7 @@ void PluginKateXMLTools::completionDone( KTextEditor::CompletionEntry ) if( m_mode == attributes ) { // immediately show attribute values: - TQTimer::singleShot( 10, this, TQT_SLOT(emptyKeyEvent()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(emptyKeyEvent()) ); } } @@ -1122,8 +1122,8 @@ TQString InsertElement::showDialog( TQStringList &completions ) KHistoryCombo *combo = new KHistoryCombo( page, "value" ); combo->setHistoryItems( completions, true ); - connect( combo->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(slotHistoryTextChanged(const TQString &)) ); + connect( combo->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_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" ); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 3064179..0cfcb5e 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -58,7 +58,7 @@ TDEConfigDialogImp::TDEConfigDialogImp( TQWidget *parent, const char *name, TDEC settings = new SettingsImp(0, "General"); addPage(settings, i18n("General"), "package_settings"); - connect(this, TQT_SIGNAL(widgetModified()), settings, TQT_SLOT(updatePreview())); + connect(this, TQ_SIGNAL(widgetModified()), settings, TQ_SLOT(updatePreview())); } SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){ @@ -138,7 +138,7 @@ KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, T updateClock(); loadSettings(); TQTimer *timer=new TQTimer(this); - connect (timer, TQT_SIGNAL (timeout()), this, TQT_SLOT (updateClock())); + connect (timer, TQ_SIGNAL (timeout()), this, TQ_SLOT (updateClock())); timer->start(500,false); } @@ -217,7 +217,7 @@ void KBinaryClock::preferences(){ return; TDEConfigDialogImp *dialog = new TDEConfigDialogImp(this, "settings", prefs, KDialogBase::Swallow); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); dialog->show(); dialog->settings->updatePreview(); } @@ -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, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) ); + connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) ); if (!bImmutable) { @@ -362,7 +362,7 @@ void KBinaryClock::toggleCalendar() return; } _calendar = new DatePicker(this, TQDateTime::currentDateTime().date()); - connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() )); + connect( _calendar, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotCalendarDeleted() )); // some extra spacing is included if aligned on a desktop edge TQPoint c = mapToGlobal(TQPoint(0,0)); @@ -393,7 +393,7 @@ void KBinaryClock::slotCalendarDeleted() _calendar = 0L; // don't reopen the calendar immediately ... _disableCalendar = true; - TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar())); + TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar())); } void KBinaryClock::slotEnableCalendar() diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 5dc353a..4328f8f 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -83,7 +83,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type, m_colourButton->setPixmap(SmallIcon("colorpicker")); m_colourButton->setFixedSize(20, 20); TQToolTip::add(m_colourButton, i18n("Pick a color")); - connect(m_colourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPick())); + connect(m_colourButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPick())); m_historyButton = new SimpleButton(this); m_historyButton->setFixedSize(20, 20); @@ -95,7 +95,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type, m_historyButton->setEnabled(false); } TQToolTip::add(m_historyButton, i18n("History")); - connect(m_historyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHistory())); + connect(m_historyButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotHistory())); } KolourPicker::~KolourPicker() diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index ef09f71..6e099b8 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -39,10 +39,10 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); diff --git a/kicker-applets/ktimemon/confdlg.cpp b/kicker-applets/ktimemon/confdlg.cpp index c2c9493..a186b88 100644 --- a/kicker-applets/ktimemon/confdlg.cpp +++ b/kicker-applets/ktimemon/confdlg.cpp @@ -65,7 +65,7 @@ KConfDialog::KConfDialog(KTimeMon *t) bl->addStretch(); autoScaleBox = new TQCheckBox(i18n("&Automatic"), b); - connect(autoScaleBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle(bool))); + connect(autoScaleBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggle(bool))); pageScaleEdit = new KIntNumInput(intervalEdit, 1000, b); pageScaleEdit->setRange(10, 10000, 10); @@ -117,8 +117,8 @@ KConfDialog::KConfDialog(KTimeMon *t) cb = *cpuColourButtons[j] = new KColorButton(white, page); gl->addWidget(cb, 1, 3*j+2, AlignCenter); - connect(cb, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(updateSampleWidget(const TQColor &))); + connect(cb, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(updateSampleWidget(const TQColor &))); } KColorButton **memColourButtons[4] = { &mkernelCB, &usedCB, &buffersCB, &cachedCB }; @@ -132,8 +132,8 @@ KConfDialog::KConfDialog(KTimeMon *t) cb = *memColourButtons[j] = new KColorButton(white, page); gl->addWidget(cb, 5, 3*j+2, AlignCenter); - connect(cb, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(updateSampleWidget(const TQColor &))); + connect(cb, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(updateSampleWidget(const TQColor &))); } b = new TQGroupBox(i18n("Swap"), page); @@ -145,8 +145,8 @@ KConfDialog::KConfDialog(KTimeMon *t) cb = swapCB = new KColorButton(red, page); gl->addWidget(cb, 9, 2); - connect(cb, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(updateSampleWidget(const TQColor &))); + connect(cb, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(updateSampleWidget(const TQColor &))); l = new TQLabel(i18n("Backgd:"), page); gl->addWidget(l, 9, 4, AlignVCenter | AlignRight); @@ -154,8 +154,8 @@ KConfDialog::KConfDialog(KTimeMon *t) cb = bgCB = new KColorButton(blue, page); gl->addWidget(cb, 9, 5); - connect(cb, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(updateSampleWidget(const TQColor &))); + connect(cb, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(updateSampleWidget(const TQColor &))); //b = new TQGroupBox(i18n("Sample"), page); //gl->addMultiCellWidget(b, 8, 10, 7, 9); @@ -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 ], TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( mouseCommandEnable() ) ); + connect( mouseC[ i ], TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( mouseCommandEnable() ) ); mouseLE[i] = new KURLRequester(b); mouseLE[i]->lineEdit()->setText(t->mouseActionCommand[i]); @@ -209,8 +209,8 @@ KConfDialog::KConfDialog(KTimeMon *t) resize(380, 300); - connect(this, TQT_SIGNAL(applyClicked()), timemon, TQT_SLOT(apply())); - connect(this, TQT_SIGNAL(okClicked()), timemon, TQT_SLOT(apply())); + connect(this, TQ_SIGNAL(applyClicked()), timemon, TQ_SLOT(apply())); + connect(this, TQ_SIGNAL(okClicked()), timemon, TQ_SLOT(apply())); } // Adjust the colours of the sample widget in the configuration dialog. diff --git a/kicker-applets/ktimemon/timemon.cpp b/kicker-applets/ktimemon/timemon.cpp index 3d0d3da..3fe5372 100644 --- a/kicker-applets/ktimemon/timemon.cpp +++ b/kicker-applets/ktimemon/timemon.cpp @@ -230,7 +230,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, vertical = conf->readBoolEntry("Vertical", true); timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); timer->start(interval); sample = new KSample(this, autoScale, pageScale, swapScale, ctxScale); @@ -249,8 +249,8 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, menu->insertSeparator(); menu->insertItem(SmallIcon( "help" ), i18n("Help"), hmenu->menu(), 1); - menu->connectItem(2, this, TQT_SLOT(configure())); - menu->connectItem(4, this, TQT_SLOT(orientation())); + menu->connectItem(2, this, TQ_SLOT(configure())); + menu->connectItem(4, this, TQ_SLOT(orientation())); menu->setCheckable(true); @@ -413,8 +413,8 @@ void KTimeMon::runCommand(int index) bgProcess = new KShellProcess; *bgProcess << mouseActionCommand[index]; - connect(bgProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(commandStderr(TDEProcess *, char *, int))); + connect(bgProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(commandStderr(TDEProcess *, char *, int))); bgProcess->start(TDEProcess::DontCare, TDEProcess::Stderr); } diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 253ba78..08c534f 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -77,15 +77,15 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions, f = _btn->font(); f.setPixelSize(12); _btn->setFont(f); - connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo())); + connect(_btn, TQ_SIGNAL(clicked()), TQ_SLOT(popup_combo())); // setup history combo _input = new KHistoryCombo(this); _input->setFocus(); _input->clearEdit(); watchForFocus(_input->lineEdit()); - connect(_input, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(evaluate(const TQString&))); + connect(_input, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(evaluate(const TQString&))); initContextMenu(); useDegrees(); @@ -112,8 +112,8 @@ void MathApplet::initContextMenu() { mContextMenu = new TDEPopupMenu(this); mContextMenu->setCheckable(true); - mContextMenu->insertItem(i18n("Use &Degrees"), this, TQT_SLOT(useDegrees()), 0, 0, 0); - mContextMenu->insertItem(i18n("Use &Radians"), this, TQT_SLOT(useRadians()), 0, 1, 1); + mContextMenu->insertItem(i18n("Use &Degrees"), this, TQ_SLOT(useDegrees()), 0, 0, 0); + mContextMenu->insertItem(i18n("Use &Radians"), this, TQ_SLOT(useRadians()), 0, 1, 1); setCustomMenu(mContextMenu); } diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index f52ae4b..482c59b 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -32,16 +32,16 @@ AmarokInterface::AmarokInterface() : PlayerInterface() mTimerValue = TIMER_FAST; mAmarokTimer = new TQTimer ( this, "mAmaroKTimer" ); - connect(mAmarokTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); + connect(mAmarokTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) ); kapp->dcopClient()->setNotifications ( true ); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), - TQT_SLOT(appRegistered(const TQCString&)) ); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), + TQ_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(appRemoved(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(appRemoved(const TQCString&))); - TQTimer::singleShot(0, this, TQT_SLOT(myInit())); + TQTimer::singleShot(0, this, TQ_SLOT(myInit())); } AmarokInterface::~AmarokInterface() diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index ce9de9f..67e4b4a 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -32,16 +32,16 @@ JuKInterface::JuKInterface() : PlayerInterface(), mProc(0) mTimerValue = TIMER_FAST; mJuKTimer = new TQTimer ( this, "mJukTimer" ); - connect(mJuKTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); + connect(mJuKTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) ); kapp->dcopClient()->setNotifications ( true ); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), - TQT_SLOT(appRegistered(const TQCString&)) ); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), + TQ_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(appRemoved(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(appRemoved(const TQCString&))); - TQTimer::singleShot(0, this, TQT_SLOT(myInit())); + TQTimer::singleShot(0, this, TQ_SLOT(myInit())); } JuKInterface::~JuKInterface() @@ -86,7 +86,7 @@ void JuKInterface::appRegistered ( const TQCString &appId ) mProc->addArgument("Player"); mProc->addArgument("status()"); - connect(mProc, TQT_SIGNAL(processExited()), TQT_SLOT(jukIsReady())); + connect(mProc, TQ_SIGNAL(processExited()), TQ_SLOT(jukIsReady())); mProc->start(); } } diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index 5b846c9..6f88bbf 100644 --- a/kicker-applets/mediacontrol/kscdInterface.cpp +++ b/kicker-applets/mediacontrol/kscdInterface.cpp @@ -32,16 +32,16 @@ KsCDInterface::KsCDInterface() : PlayerInterface() { mKsCDTimer = new TQTimer(this, "mKsCDTimer"); - connect(mKsCDTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); + connect(mKsCDTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) ); kapp->dcopClient()->setNotifications ( true ); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), - TQT_SLOT(appRegistered(const TQCString&)) ); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), + TQ_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(appRemoved(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(appRemoved(const TQCString&))); - TQTimer::singleShot(0, this, TQT_SLOT(myInit())); + TQTimer::singleShot(0, this, TQ_SLOT(myInit())); } KsCDInterface::~KsCDInterface() diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 31d1076..a55ed06 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -147,15 +147,15 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, // request notification of changes in icon style kapp->addKipcEventMask(KIPC::IconChanged); - connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged())); + connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged())); reparseConfig(); rmbMenu = new TDEPopupMenu(this, "RMBMenu"); rmbMenu->insertTitle(i18n("MediaControl"), 0, 0); rmbMenu->insertItem(SmallIcon("configure"), i18n("Configure MediaControl..."), - this, TQT_SLOT(preferences())); - rmbMenu->insertItem(i18n("About MediaControl"), this, TQT_SLOT(about())); + this, TQ_SLOT(preferences())); + rmbMenu->insertItem(i18n("About MediaControl"), this, TQ_SLOT(about())); } MediaControl::~MediaControl() @@ -275,12 +275,12 @@ void MediaControl::preferences() else { _prefsDialog = new MediaControlConfig ( _configFrontend ); - 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()) ); + connect ( _prefsDialog, TQ_SIGNAL(closing()), + this, TQ_SLOT(slotClosePrefsDialog()) ); + connect ( _prefsDialog, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotPrefsDialogClosing()) ); + connect ( _prefsDialog, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(slotConfigChanged()) ); } } @@ -396,12 +396,12 @@ void MediaControl::reparseConfig() } // this signal gets emitted by a playerInterface when the player's playtime changed - connect(_player, TQT_SIGNAL(newSliderPosition(int,int)), - this, TQT_SLOT(setSliderPosition(int,int))); + connect(_player, TQ_SIGNAL(newSliderPosition(int,int)), + this, TQ_SLOT(setSliderPosition(int,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))); + connect(_player, TQ_SIGNAL(playerStarted()), TQ_SLOT(enableAll())); + connect(_player, TQ_SIGNAL(playerStopped()), TQ_SLOT(disableAll())); + connect(_player, TQ_SIGNAL(playingStatusChanged(int)), TQ_SLOT(slotPlayingStatusChanged(int))); // do we use our icons or the default ones from KDE? if(_configFrontend->useCustomTheme()) @@ -441,17 +441,17 @@ void MediaControl::reparseConfig() slider_tooltip = new MediaControlToolTip(time_slider, _player); - 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))); + connect(prev_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(prev())); + connect(playpause_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(playpause())); + connect(stop_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(stop())); + connect(next_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(next())); + + connect(time_slider, TQ_SIGNAL(sliderPressed()), _player, TQ_SLOT(sliderStartDrag())); + connect(time_slider, TQ_SIGNAL(sliderReleased()), _player, TQ_SLOT(sliderStopDrag())); + connect(time_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(adjustTime(int))); + connect(time_slider, TQ_SIGNAL(volumeUp()), _player, TQ_SLOT(volumeUp())); + connect(time_slider, TQ_SIGNAL(volumeDown()), _player, TQ_SLOT(volumeDown())); + connect(this, TQ_SIGNAL(newJumpToTime(int)), _player, TQ_SLOT(jumpToTime(int))); } // Widget Placement =================================================================== diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 9df7362..a1de847 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -68,12 +68,12 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, c for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) readSkinDir(*it); - 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)) ); + connect(_child->mWheelScrollAmount, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotConfigChanged())); + connect(_child->playerListBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotConfigChanged())); + connect(_child->themeListBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotConfigChanged())); + connect(_child->themeListBox, TQ_SIGNAL(selectionChanged(TQListBoxItem *)), TQ_SLOT(slotChangePreview(TQListBoxItem *))); + connect(_child->mUseThemes, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotConfigChanged()) ); + connect(_child->mUseThemes, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUseThemesToggled(bool)) ); load(); show(); diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp index 0f0e1c6..e6182d2 100644 --- a/kicker-applets/mediacontrol/mpdInterface.cpp +++ b/kicker-applets/mediacontrol/mpdInterface.cpp @@ -39,16 +39,16 @@ MpdInterface::MpdInterface() , slider_timer(0) , reconnect_timer(0) { - connect(&sock, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError(int))); - connect(&sock, TQT_SIGNAL(error(int)), this, TQT_SLOT(stopSliderClock())); + connect(&sock, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError(int))); + connect(&sock, TQ_SIGNAL(error(int)), this, TQ_SLOT(stopSliderClock())); - 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, TQ_SIGNAL(connected()), this, TQ_SLOT(startSliderClock())); + connect(&sock, TQ_SIGNAL(connected()), this, TQ_SLOT(stopReconnectClock())); + connect(&sock, TQ_SIGNAL(connected()), this, TQ_SLOT(connected())); - 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())); + connect(&sock, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(stopSliderClock())); + connect(&sock, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(startReconnectClock())); + connect(&sock, TQ_SIGNAL(connectionClosed()), this, TQ_SIGNAL(playerStopped())); reconnect(); } diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index 61b7b14..fd58bf5 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -31,16 +31,16 @@ NoatunInterface::NoatunInterface() : PlayerInterface() mTimerValue = TIMER_FAST; mNoatunTimer = new TQTimer(this, "mNoatunTimer"); - connect(mNoatunTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider())); + connect(mNoatunTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider())); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), - TQT_SLOT(appRegistered(const TQCString&)) ); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), + TQ_SLOT(appRegistered(const TQCString&)) ); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(appRemoved(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(appRemoved(const TQCString&))); kapp->dcopClient()->setNotifications(true); - TQTimer::singleShot(0, this, TQT_SLOT(myInit())); + TQTimer::singleShot(0, this, TQ_SLOT(myInit())); } NoatunInterface::~NoatunInterface() diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index ef09f71..6e099b8 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -39,10 +39,10 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp index 7d8e236..3dcfb75 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.cpp +++ b/kicker-applets/mediacontrol/xmmsInterface.cpp @@ -36,7 +36,7 @@ XmmsInterface::XmmsInterface() : PlayerInterface() bStartingXMMS = false; xmms_timer = new TQTimer ( this, "xmms_timer" ); - TQObject::connect( xmms_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) ); + TQObject::connect( xmms_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) ); // Better start the timer as late as possible in initialization xmms_timer->start ( timervalue ); @@ -127,7 +127,7 @@ void XmmsInterface::playpause() return; startPlayer("xmms"); bStartingXMMS = true; - TQTimer::singleShot(500, this, TQT_SLOT(playpause())); + TQTimer::singleShot(500, this, TQ_SLOT(playpause())); } else { diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 204faf6..1c75d0c 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -64,10 +64,10 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : m_menu = new TDEPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Adblock")); - m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule())); - m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue())); + m_menu->insertItem(i18n("Configure"), this, TQ_SLOT(showTDECModule())); + m_menu->insertItem(i18n("Show Elements"), this, TQ_SLOT(showDialogue())); - connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(initLabel())); + connect(m_part, TQ_SIGNAL(completed()), this, TQ_SLOT(initLabel())); } AdBlock::~AdBlock() @@ -100,8 +100,8 @@ void AdBlock::initLabel() statusBarEx->addStatusBarItem(m_label, 0, false); - connect(m_label, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(showDialogue())); - connect(m_label, TQT_SIGNAL(rightClickedURL()), this, TQT_SLOT(contextMenu())); + connect(m_label, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(showDialogue())); + connect(m_label, TQ_SIGNAL(rightClickedURL()), this, TQ_SLOT(contextMenu())); } void AdBlock::showDialogue() @@ -119,9 +119,9 @@ void AdBlock::showDialogue() fillBlockableElements(elements); AdBlockDlg *dialogue = new AdBlockDlg(m_part->widget(), elements); - 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() )); + connect(dialogue, TQ_SIGNAL( notEmptyFilter(const TQString&) ), this, TQ_SLOT( addAdFilter(const TQString&) )); + connect(dialogue, TQ_SIGNAL( cancelClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); + connect(dialogue, TQ_SIGNAL( closeClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); dialogue->show(); } @@ -129,8 +129,8 @@ void AdBlock::showTDECModule() { KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget()); dialogue->addModule("tdehtml_filter"); - connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); - connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); + connect(dialogue, TQ_SIGNAL( cancelClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); + connect(dialogue, TQ_SIGNAL( closeClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); dialogue->show(); } diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index 1eab9ac..875ac20 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -67,17 +67,17 @@ AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : m_filter = new TQLineEdit( "", page, "lineedit" ); - connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() )); - connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) ); + connect(this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( validateFilter() )); + connect(m_list, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(updateFilter(TQListViewItem *)) ); m_menu = new TDEPopupMenu(this); - 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())); + m_menu->insertItem(i18n("Filter this item"), this, TQ_SLOT(filterItem())); + m_menu->insertItem(i18n("Filter all items at same path"), this, TQ_SLOT(filterPath())); connect(m_list, - TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), + TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), this, - TQT_SLOT( showContextMenu(TQListViewItem *, const TQPoint &) ) ); + TQ_SLOT( showContextMenu(TQListViewItem *, const TQPoint &) ) ); } void AdBlockDlg::updateFilter(TQListViewItem *selected) diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 93453e0..6aafbec 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const if (isFeedUrl(it)) { kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; - TDEAction *action = new TDEAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); + TDEAction *action = new TDEAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQ_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); addAction( action ); addSeparator(); m_feedURL = it->url().url(); diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 4304c57..a5e26e3 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -63,15 +63,15 @@ KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringLis m_part = dynamic_cast<TDEHTMLPart*>(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in tdehtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) - //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); - TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); + //connect(m_part->view(), TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(addFeedIcon())); + TQTimer::singleShot(0, this, TQ_SLOT(waitPartToLoad())); } void KonqFeedIcon::waitPartToLoad() { - 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(TDEIO::Job *)), this, TQT_SLOT(removeFeedIcon())); + connect(m_part, TQ_SIGNAL(completed()), this, TQ_SLOT(addFeedIcon())); + connect(m_part, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(addFeedIcon())); // to make pages with metarefresh to work + connect(m_part, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(removeFeedIcon())); addFeedIcon(); } @@ -126,19 +126,19 @@ void KonqFeedIcon::contextMenu() m_menu = new TDEPopupMenu(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, TQT_SLOT(addFeeds()) ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQ_SLOT(addFeeds()) ); } else { m_menu->insertTitle(i18n("Add Feeds to Akregator")); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_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, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); + //disconnect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addFeed(int))); m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, TQT_SLOT(addFeeds()), 0, 50000 ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, TQ_SLOT(addFeeds()), 0, 50000 ); } m_menu->popup(TQCursor::pos()); } @@ -166,7 +166,7 @@ void KonqFeedIcon::addFeedIcon() m_statusBarEx->addStatusBarItem(m_feedIcon, 0, true); - connect(m_feedIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); + connect(m_feedIcon, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(contextMenu())); } void KonqFeedIcon::removeFeedIcon() diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 1194f39..cf8f473 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -100,13 +100,13 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis item = itemList.first(); m_name = itemList.first()->name(); action = new TDEAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, - TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); + TQ_SLOT( slotCompressAsDefault() ), actionCollection() ); } else { action = new TDEAction( KMimeType::mimeType( m_conf->readEntry( "LastMimeType", "application/x-txz" ) )->comment(), - 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); + 0, this, TQ_SLOT( slotCompressAsDefault() ), actionCollection() ); } actionMenu->insert( action ); @@ -118,14 +118,14 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis if ( itemList.first()->url().isLocalFile() ) actionMenu->insert( m_addToMenu ); - connect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareCompAsMenu() ) ); - connect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareAddToMenu() ) ); + connect( m_compAsMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareCompAsMenu() ) ); + connect( m_addToMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareAddToMenu() ) ); action = new TDEAction( i18n( "Add to Archive..." ), 0, this, - TQT_SLOT( slotAdd() ), actionCollection() ); + TQ_SLOT( slotAdd() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } @@ -137,7 +137,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis actionMenu = new TDEActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" ); action = new TDEAction( i18n( "Extract Here" ), 0, this, - TQT_SLOT( slotExtractHere() ), actionCollection() ); + TQ_SLOT( slotExtractHere() ), actionCollection() ); actionMenu->insert( action ); // stolen from arkwidget.cpp if ( itemCount == 1 ) @@ -145,22 +145,22 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis TQString targetName = itemList.first()->name(); stripExtension( targetName ); action = new TDEAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, - TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQ_SLOT( slotExtractToSubfolders() ), actionCollection() ); } else { action = new TDEAction( i18n( "Extract to Subfolders" ), 0, this, - TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQ_SLOT( slotExtractToSubfolders() ), actionCollection() ); } actionMenu->insert( action ); action = new TDEAction( i18n( "Extract To..." ), 0 , this, - TQT_SLOT( slotExtractTo() ), actionCollection() ); + TQ_SLOT( slotExtractTo() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } else { - action = new TDEAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); + action = new TDEAction( i18n( "Extract To..." ), "ark", 0, this, TQ_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); addAction( action ); } } @@ -174,8 +174,8 @@ ArkMenu::~ArkMenu() void ArkMenu::slotPrepareCompAsMenu() { - disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareCompAsMenu() ) ); + disconnect( m_compAsMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareCompAsMenu() ) ); TDEAction * action; m_compAsMapper = new TQSignalMapper( this, "compAsMapper" ); @@ -196,13 +196,13 @@ void ArkMenu::slotPrepareCompAsMenu() if ( m_urlList.count() == 1 ) { action = new TDEAction( m_name + (*eit), 0, m_compAsMapper, - TQT_SLOT( map() ), actionCollection() ); + TQ_SLOT( map() ), actionCollection() ); } else { ext = KMimeType::mimeType(*mit)->comment(); action = new TDEAction( ext, 0, m_compAsMapper, - TQT_SLOT( map() ), actionCollection() ); + TQ_SLOT( map() ), actionCollection() ); } m_compAsMenu->insert( action ); @@ -219,13 +219,13 @@ void ArkMenu::slotPrepareCompAsMenu() m_extensionList += newExt; } - connect( m_compAsMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotCompressAs( int ) ) ); + connect( m_compAsMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( slotCompressAs( int ) ) ); } void ArkMenu::slotPrepareAddToMenu() { - disconnect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareAddToMenu() ) ); + disconnect( m_addToMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareAddToMenu() ) ); if ( m_extensionList.isEmpty() ) // is filled in slotPrepareCompAsMenu @@ -246,7 +246,7 @@ void ArkMenu::slotPrepareAddToMenu() if ( (*uit).endsWith(*mit) ) { action = new TDEAction( *uit, 0, m_addToMapper, - TQT_SLOT( map() ), actionCollection() ); + TQ_SLOT( map() ), actionCollection() ); m_addToMenu->insert( action ); m_addToMapper->setMapping( action, counter ); archive.setPath( *uit ); @@ -255,7 +255,7 @@ void ArkMenu::slotPrepareAddToMenu() break; } } - connect( m_addToMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotAddTo( int ) ) ); + connect( m_addToMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( slotAddTo( int ) ) ); } void ArkMenu::compMimeTypes() diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index cd53587..0650424 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -18,11 +18,11 @@ AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList : Plugin( parent, name ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRefresh() ) ); refresher = new TDESelectAction( i18n("&Auto Refresh"), "reload", 0, - this, TQT_SLOT(slotIntervalChanged()), + this, TQ_SLOT(slotIntervalChanged()), actionCollection(), "autorefresh" ); TQStringList sl; sl << i18n("None"); diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index c95dd7e..8d432c9 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -60,104 +60,104 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, actionCollection(), "translatewebpage_nl" ); m_en->insert( new TDEAction( i18n("&Chinese (Simplified)"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_zh") ); m_en->insert( new TDEAction( i18n("Chinese (&Traditional)"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_zhTW") ); m_en->insert( new TDEAction( i18n("&Dutch"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_nl") ); m_en->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_fr") ); m_en->insert( new TDEAction( i18n("&German"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_de") ); m_en->insert( new TDEAction( i18n("&Italian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_it") ); m_en->insert( new TDEAction( i18n("&Japanese"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_ja") ); m_en->insert( new TDEAction( i18n("&Korean"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_ko") ); m_en->insert( new TDEAction( i18n("&Norwegian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_no") ); m_en->insert( new TDEAction( i18n("&Portuguese"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_pt") ); m_en->insert( new TDEAction( i18n("&Russian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_ru") ); m_en->insert( new TDEAction( i18n("&Spanish"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_es") ); m_en->insert( new TDEAction( i18n("T&hai"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_th") ); m_fr->insert( new TDEAction( i18n("&Dutch"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_nl") ); m_fr->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_en") ); m_fr->insert( new TDEAction( i18n("&German"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_de") ); m_fr->insert( new TDEAction( i18n("&Italian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_it") ); m_fr->insert( new TDEAction( i18n("&Portuguese"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_pt") ); m_fr->insert( new TDEAction( i18n("&Spanish"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_es") ); m_de->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "de_en") ); m_de->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "de_fr") ); m_es->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "es_en") ); m_es->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "es_fr") ); m_pt->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "pt_en") ); m_pt->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "pt_fr") ); m_it->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "it_en") ); m_it->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "it_fr") ); m_nl->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "nl_en") ); m_nl->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "nl_fr") ); m_menu->insert( new TDEAction( i18n("&Chinese (Simplified) to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "zh_en") ); m_menu->insert( new TDEAction( i18n("Chinese (&Traditional) to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "zhTW_en") ); m_menu->insert( m_nl ); m_menu->insert( m_en ); @@ -165,14 +165,14 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, m_menu->insert( m_de ); m_menu->insert( m_it ); m_menu->insert( new TDEAction( i18n("&Japanese to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "ja_en") ); m_menu->insert( new TDEAction( i18n("&Korean to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "ko_en") ); m_menu->insert( m_pt ); m_menu->insert( new TDEAction( i18n("&Russian to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "ru_en") ); m_menu->insert( m_es ); m_menu->setEnabled( true ); @@ -181,8 +181,8 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, if ( parent && parent->inherits( "TDEHTMLPart" ) ) { KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent); - connect( part, TQT_SIGNAL(started(TDEIO::Job*)), this, - TQT_SLOT(slotStarted(TDEIO::Job*)) ); + connect( part, TQ_SIGNAL(started(TDEIO::Job*)), this, + TQ_SLOT(slotStarted(TDEIO::Job*)) ); } } diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index 8314e95..a14cff5 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -48,8 +48,8 @@ CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQString m_pCrashesMenu->setDelayed( false ); m_pCrashesMenu->setEnabled( true ); - connect( m_pCrashesMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotAboutToShow() ) ); + connect( m_pCrashesMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotAboutToShow() ) ); } CrashesPlugin::~CrashesPlugin() @@ -62,10 +62,10 @@ void CrashesPlugin::slotAboutToShow() TDECrashBookmarkImporter importer(TDECrashBookmarkImporter::crashBookmarksDir()); - connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), - TQT_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolderCallback() ) ); + connect( &importer, TQ_SIGNAL( endFolder() ), TQ_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, - TQT_SLOT(slotGroupSelected(int)), + TQ_SLOT(slotGroupSelected(int)), 0, crashGroup--); } m_pCrashesMenu->popupMenu()->insertSeparator(); @@ -104,7 +104,7 @@ void CrashesPlugin::slotAboutToShow() } m_pCrashesMenu->popupMenu()->insertItem( str, this, - TQT_SLOT(slotItemSelected(int)), + TQ_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, - TQT_SLOT(slotGroupSelected(int)), + TQ_SLOT(slotGroupSelected(int)), 0, crashGroup--); } } else { m_pCrashesMenu->popupMenu()->insertItem( i18n("No Recovered Crashes"), this, - TQT_SLOT(slotItemSelected(int)), + TQ_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; enable = false; @@ -131,7 +131,7 @@ void CrashesPlugin::slotAboutToShow() } int id =m_pCrashesMenu->popupMenu()->insertItem( i18n("&Clear List of Crashes"), this, - TQT_SLOT(slotClearCrashes()), + TQ_SLOT(slotClearCrashes()), 0, ++count ); m_pCrashesMenu->popupMenu()->setItemEnabled( id, enable); } diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index 5b9a8e7..d70b6cf 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -156,18 +156,18 @@ DirFilterPlugin::DirFilterPlugin (TQObject* 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(), TQT_SIGNAL (aboutToShow()), - TQT_SLOT (slotShowPopup())); - - 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(itemsRefresh(const KFileItemList&)), - TQT_SLOT (slotItemsRefresh(const KFileItemList&))); - connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); + connect (m_pFilterMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowPopup())); + + connect (m_part, TQ_SIGNAL(itemRemoved(const KFileItem*)), + TQ_SLOT( slotItemRemoved (const KFileItem*))); + connect (m_part, TQ_SIGNAL(itemsAdded(const KFileItemList&)), + TQ_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQ_SIGNAL(itemsFilteredByMime(const KFileItemList&)), + TQ_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQ_SIGNAL(itemsRefresh(const KFileItemList&)), + TQ_SLOT (slotItemsRefresh(const KFileItemList&))); + connect (m_part, TQ_SIGNAL(aboutToOpenURL()), TQ_SLOT(slotOpenURL())); // add a searchline filter for konqis icons/list views TQHBox *hbox = new TQHBox(m_part->widget()); @@ -197,8 +197,8 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, if ( m_searchWidget ) { 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&))); + connect(clear, TQ_SIGNAL(activated()), m_searchWidget, TQ_SLOT(clear())); + connect(m_searchWidget, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(searchTextChanged(const TQString&))); } KWidgetAction *filterAction = new KWidgetAction(hbox, i18n("Filter Field"), @@ -210,9 +210,9 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, // Really the broken TQt3 iconview should just be modified to include a hidden list; it would make things *so* much easier! m_refreshTimer = new TQTimer( this ); m_reactivateRefreshTimer = new TQTimer( this ); - connect( m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(activateSearch()) ); + connect( m_refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(activateSearch()) ); m_refreshTimer->start( 200, FALSE ); // 200 millisecond continuous timer - connect( m_reactivateRefreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reactivateRefreshTimer()) ); + connect( m_reactivateRefreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reactivateRefreshTimer()) ); } @@ -302,7 +302,7 @@ void DirFilterPlugin::slotShowPopup() m_pMimeInfo[it.key()].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(it.data().iconName), label, - this, TQT_SLOT(slotItemSelected(int)), 0, ++id); + this, TQ_SLOT(slotItemSelected(int)), 0, ++id); if (it.data().useAsFilter) { @@ -333,7 +333,7 @@ void DirFilterPlugin::slotShowPopup() m_pMimeInfo[(*it)].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(m_pMimeInfo[(*it)].iconName), label, - this, TQT_SLOT(slotItemSelected(int)), 0, ++id); + this, TQ_SLOT(slotItemSelected(int)), 0, ++id); if (m_pMimeInfo[(*it)].useAsFilter) { @@ -345,16 +345,16 @@ void DirFilterPlugin::slotShowPopup() m_pFilterMenu->popupMenu()->insertSeparator (); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Use Multiple Filters"), - this, TQT_SLOT(slotMultipleFilters())); + this, TQ_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, - TQT_SLOT(slotShowCount())); + TQ_SLOT(slotShowCount())); m_pFilterMenu->popupMenu()->setItemChecked (id, SessionManager::self()->showCount); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Reset"), this, - TQT_SLOT(slotReset())); + TQ_SLOT(slotReset())); m_pFilterMenu->popupMenu()->setItemEnabled (id, enableReset); } @@ -481,7 +481,7 @@ void DirFilterPlugin::slotItemRemoved(const KFileItem* item) m_part->setMimeFilter(filters); SessionManager::self()->save(m_part->url(), filters); // Use 1ms delay to avoid possible race conditions - TQTimer::singleShot(1, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1, this, TQ_SLOT(slotTimeout())); } m_pMimeInfo.remove(mimeType); } @@ -547,7 +547,7 @@ void DirFilterPlugin::slotItemsRefresh(const KFileItemList &list) m_part->setMimeFilter(filters); SessionManager::self()->save(m_part->url(), filters); // Use 1ms delay to avoid possible race conditions - TQTimer::singleShot(1, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1, this, TQ_SLOT(slotTimeout())); } MimeInfoIterator del_mit = it; ++it; diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index f91bfd3..362e5c7 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -77,32 +77,32 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving* m_rootListView = m_listView; m_pureCheckBox->setChecked(m_bPure); - connect(m_pureCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPureToggled(bool))); + connect(m_pureCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPureToggled(bool))); m_showAttributesCheckBox->setChecked(m_bShowAttributes); - connect(m_showAttributesCheckBox, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotShowAttributesToggled(bool))); + connect(m_showAttributesCheckBox, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotShowAttributesToggled(bool))); m_highlightHTMLCheckBox->setChecked(m_bHighlightHTML); - connect(m_highlightHTMLCheckBox, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotHighlightHTMLToggled(bool))); + connect(m_highlightHTMLCheckBox, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotHighlightHTMLToggled(bool))); - 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> &))); + connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem *)), this, + TQ_SLOT(slotItemClicked(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(m_listView, TQ_SIGNAL(moved(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)), + TQ_SLOT(slotMovedItems(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &))); // set up message line messageLinePane->hide(); - connect(messageHideBtn, TQT_SIGNAL(clicked()), TQT_SLOT(hideMessageLine())); - connect(messageListBtn, TQT_SIGNAL(clicked()), mainWindow(), TQT_SLOT(showMessageLog())); + connect(messageHideBtn, TQ_SIGNAL(clicked()), TQ_SLOT(hideMessageLine())); + connect(messageListBtn, TQ_SIGNAL(clicked()), mainWindow(), TQ_SLOT(showMessageLog())); installEventFilter(m_listView); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &))); - ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh())); + ManipulationCommand::connect(TQ_SIGNAL(nodeChanged(const DOM::Node &)), this, TQ_SLOT(slotRefreshNode(const DOM::Node &))); + ManipulationCommand::connect(TQ_SIGNAL(structureChanged()), this, TQ_SLOT(refresh())); initDOMNodeInfo(); @@ -126,7 +126,7 @@ void DOMTreeView::setHtmlPart(TDEHTMLPart *_part) parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") ); - TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetHtmlPartDelayed())); } DOMTreeWindow *DOMTreeView::mainWindow() const @@ -436,7 +436,7 @@ void DOMTreeView::slotFindClicked() { if (m_findDialog == 0) { m_findDialog = new KEdFind(this); - connect(m_findDialog, TQT_SIGNAL(search()), this, TQT_SLOT(slotSearch())); + connect(m_findDialog, TQ_SIGNAL(search()), this, TQ_SLOT(slotSearch())); } m_findDialog->show(); } @@ -652,7 +652,7 @@ void DOMTreeView::refresh() m_listView->setUpdatesEnabled(false); slotShowTree(part->document()); - TQTimer::singleShot(0, this, TQT_SLOT(slotRestoreScrollOffset())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestoreScrollOffset())); _refreshed = true; } @@ -805,9 +805,9 @@ void DOMTreeView::disconnectFromTornDownPart() void DOMTreeView::connectToPart() { if (part) { - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, - TQT_SLOT(activateNode(const DOM::Node &))); - connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(refresh())); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, + TQ_SLOT(activateNode(const DOM::Node &))); + connect(part, TQ_SIGNAL(completed()), this, TQ_SLOT(refresh())); // insert a style rule to indicate activated nodes try { @@ -871,7 +871,7 @@ void DOMTreeView::slotAddElementDlg() { ElementEditDialog dlg(this, "ElementEditDialog", true); - connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); + connect(dlg.insBeforeBtn, TQ_SIGNAL(clicked()), &addBefore, TQ_SLOT(slot())); // ### activate when namespaces are supported dlg.elemNamespace->setEnabled(false); @@ -911,7 +911,7 @@ void DOMTreeView::slotAddTextDlg() { TextEditDialog dlg(this, "TextEditDialog", true); - connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); + connect(dlg.insBeforeBtn, TQ_SIGNAL(clicked()), &addBefore, TQ_SLOT(slot())); if (dlg.exec() != TQDialog::Accepted) return; @@ -1003,19 +1003,19 @@ protected: void DOMTreeView::initDOMNodeInfo() { - connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(initializeOptionsFromListItem(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(initializeOptionsFromListItem(TQListViewItem *))); - 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(nodeAttributes, TQ_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), + TQ_SLOT(slotItemRenamed(TQListViewItem *, const TQString &, int))); + connect(nodeAttributes, TQ_SIGNAL(executed(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(slotEditAttribute(TQListViewItem *, const TQPoint &, int))); + connect(nodeAttributes, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int))); - connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent())); + connect(applyContent, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyContent())); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); + ManipulationCommand::connect(TQ_SIGNAL(nodeChanged(const DOM::Node &)), this, TQ_SLOT(initializeOptionsFromNode(const DOM::Node &))); nodeAttributes->setRenameable(0, true); nodeAttributes->setRenameable(1, true); diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index 1b59ba3..e7f6bb0 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -84,16 +84,16 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) // allow the view to change the statusbar and caption #if 0 - 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&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); #endif - connect(view(), TQT_SIGNAL(htmlPartChanged(TDEHTMLPart *)), - TQT_SLOT(slotHtmlPartChanged(TDEHTMLPart *))); + connect(view(), TQ_SIGNAL(htmlPartChanged(TDEHTMLPart *)), + TQ_SLOT(slotHtmlPartChanged(TDEHTMLPart *))); - ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(addMessage(int, const TQString &))); + ManipulationCommand::connect(TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(addMessage(int, const TQString &))); infopanel_ctx = createInfoPanelAttrContextMenu(); domtree_ctx = createDOMTreeViewContextMenu(); @@ -119,57 +119,57 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd) void DOMTreeWindow::setupActions() { - KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + KStdAction::close(this, TQ_SLOT(close()), actionCollection()); - KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection())->setEnabled(false); - KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false); - KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false); + KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection())->setEnabled(false); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection())->setEnabled(false); + KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection())->setEnabled(false); m_commandHistory = new KCommandHistory(actionCollection()); - KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection()); + KStdAction::find(this, TQ_SLOT(slotFind()), actionCollection()); - KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection()); + KStdAction::redisplay(m_view, TQ_SLOT(refresh()), actionCollection()); // toggle manipulation dialog TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"), CTRL+Key_E, actionCollection(), "show_msg_dlg"); - connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog())); + connect(showMsgDlg, TQ_SIGNAL(activated()), TQ_SLOT(showMessageLog())); // TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, -// this, TQT_SLOT(optionsPreferences()), +// this, TQ_SLOT(optionsPreferences()), // actionCollection(), "custom_action"); // actions for the dom tree list view toolbar - KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); + KStdAction::up(view(), TQ_SLOT(moveToParent()), actionCollection(), "tree_up"); TDEAction *tree_inc_level = new TDEAction(i18n("Expand"), "1rightarrow", CTRL+Key_Greater, view(), - TQT_SLOT(increaseExpansionDepth()), actionCollection(), + TQ_SLOT(increaseExpansionDepth()), actionCollection(), "tree_inc_level"); tree_inc_level->setToolTip(i18n("Increase expansion level")); TDEAction *tree_dec_level = new TDEAction(i18n("Collapse"), "1leftarrow", CTRL+Key_Less, view(), - TQT_SLOT(decreaseExpansionDepth()), actionCollection(), + TQ_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 TDEAction(i18n("&Delete"), "edit-delete", - Key_Delete, view(), TQT_SLOT(deleteNodes()), + Key_Delete, view(), TQ_SLOT(deleteNodes()), actionCollection(), "tree_delete"); del_tree->setToolTip(i18n("Delete nodes")); /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."), "bookmark", TDEShortcut(), view(), - TQT_SLOT(slotAddElementDlg()), actionCollection(), + TQ_SLOT(slotAddElementDlg()), actionCollection(), "tree_add_element"); /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."), - "text", TDEShortcut(), view(), TQT_SLOT(slotAddTextDlg()), + "text", TDEShortcut(), view(), TQ_SLOT(slotAddTextDlg()), actionCollection(), "tree_add_text"); // actions for the info panel attribute list context menu del_attr = new TDEAction(i18n("&Delete"), "edit-delete", - Key_Delete, view(), TQT_SLOT(deleteAttributes()), + Key_Delete, view(), TQ_SLOT(deleteAttributes()), actionCollection(), "attr_delete"); del_attr->setToolTip(i18n("Delete attributes")); @@ -292,7 +292,7 @@ void DOMTreeWindow::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } @@ -339,13 +339,13 @@ void DOMTreeWindow::slotHtmlPartChanged(TDEHTMLPart *p) part_manager = p->manager(); - 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 *))); + connect(part_manager, TQ_SIGNAL(activePartChanged(KParts::Part *)), + TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect(part_manager, TQ_SIGNAL(partRemoved(KParts::Part *)), + TQ_SLOT(slotPartRemoved(KParts::Part *))); // set up browser extension connections - connect(p, TQT_SIGNAL(docCreated()), TQT_SLOT(slotClosePart())); + connect(p, TQ_SIGNAL(docCreated()), TQ_SLOT(slotClosePart())); } } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index d0e8862..958c2ca 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -21,7 +21,7 @@ PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, { (void) new TDEAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, - this, TQT_SLOT(slotShowDOMTree()), + this, TQ_SLOT(slotShowDOMTree()), actionCollection(), "viewdomtree" ); } @@ -41,7 +41,7 @@ void PluginDomtreeviewer::slotShowDOMTree() if (TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(parent())) { m_dialog = new DOMTreeWindow(this); - connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( m_dialog, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); m_dialog->view()->setHtmlPart(part); m_dialog->show(); } diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index 7f66842..d550cc0 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -32,7 +32,7 @@ * Use as follows: * \code * SignalReceiver sr; - * sr.connect(some_obj, TQT_SIGNAL(someSignal()), TQT_SLOT(slot())); + * sr.connect(some_obj, TQ_SIGNAL(someSignal()), TQ_SLOT(slot())); * <do something with some_obj> ... * if (sr.receivedSignal()) { // yes, signal was received * } diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 8ad2ed0..fe669cd 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -203,8 +203,8 @@ void FSView::requestUpdate(Inode* i) i->clear(); if (!_sm.scanRunning()) { - TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); - TQTimer::singleShot(100, this, TQT_SLOT(doRedraw())); + TQTimer::singleShot(0, this, TQ_SLOT(doUpdate())); + TQTimer::singleShot(100, this, TQ_SLOT(doRedraw())); /* start new progress chunk */ _progressPhase = 1; @@ -381,8 +381,8 @@ void FSView::addColorItems(TQPopupMenu* popup, int id) _colorID = id; popup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(colorActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(colorActivated(int))); popup->insertItem(i18n("None"), id); popup->insertItem(i18n("Depth"), id+1); @@ -458,7 +458,7 @@ void FSView::doRedraw() redo = true; if (redo) { - TQTimer::singleShot(500, this, TQT_SLOT(doRedraw())); + TQTimer::singleShot(500, this, TQ_SLOT(doRedraw())); redrawCounter++; } } @@ -532,7 +532,7 @@ void FSView::doUpdate() } if (_sm.scanRunning()) - TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); + TQTimer::singleShot(0, this, TQ_SLOT(doUpdate())); else emit completed(_dirsFinished); } diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 4f7b592..86f7f16 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -57,8 +57,8 @@ FSJob::FSJob(FSView* v) : TDEIO::Job(false) { _view = v; - TQObject::connect(v, TQT_SIGNAL(progress(int,int,const TQString&)), - this, TQT_SLOT(progressSlot(int,int,const TQString&))); + TQObject::connect(v, TQ_SIGNAL(progress(int,int,const TQString&)), + this, TQ_SLOT(progressSlot(int,int,const TQString&))); } void FSJob::kill(bool quietly) @@ -129,40 +129,40 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, TDEAction* action; action = new TDEAction( i18n( "&FSView Manual" ), "fsview", - TDEShortcut(), this, TQT_SLOT(showHelp()), + TDEShortcut(), this, TQ_SLOT(showHelp()), actionCollection(), "help_fsview" ); action->setToolTip(i18n("Show FSView manual")); action->setWhatsThis(i18n("Opens the help browser with the " "FSView documentation")); - 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())); + TQObject::connect (_visMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowVisMenu())); + TQObject::connect (_areaMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowAreaMenu())); + TQObject::connect (_depthMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowDepthMenu())); + TQObject::connect (_colorMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowColorMenu())); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), - TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), + TQ_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,TQ_SIGNAL(returnPressed(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQ_SIGNAL(selectionChanged()), + _ext,TQ_SLOT(updateActions())); TQObject::connect(_view, - TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), + TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), _ext, - TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); + TQ_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); - TQObject::connect(_view, TQT_SIGNAL(started()), this, TQT_SLOT(startedSlot())); - TQObject::connect(_view, TQT_SIGNAL(completed(int)), - this, TQT_SLOT(completedSlot(int))); + TQObject::connect(_view, TQ_SIGNAL(started()), this, TQ_SLOT(startedSlot())); + TQObject::connect(_view, TQ_SIGNAL(completed(int)), + this, TQ_SLOT(completedSlot(int))); - TQTimer::singleShot(1, this, TQT_SLOT(showInfo())); + TQTimer::singleShot(1, this, TQ_SLOT(showInfo())); setXMLFile( "fsview_part.rc" ); } @@ -180,17 +180,17 @@ void FSViewPart::slotSettingsChanged(int category) { if (category != TDEApplication::SETTINGS_MOUSE) return; - TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); - TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQ_SIGNAL(clicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQ_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); if (TDEGlobalSettings::singleClick()) - TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQ_SIGNAL(clicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); else - TQObject::connect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQ_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); } void FSViewPart::showInfo() @@ -331,14 +331,14 @@ 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, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); + if (o) connect(o, TQ_SIGNAL(destroyed()), TQ_SLOT(refresh())); } void FSViewBrowserExtension::trash() { KonqOperations::del(_view, KonqOperations::TRASH, _view->selectedUrls()); KonqOperations* o = (KonqOperations*) _view->child("KonqOperations"); - if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); + if (o) connect(o, TQ_SIGNAL(destroyed()), TQ_SLOT(refresh())); } void FSViewBrowserExtension::copySelection( bool move ) diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index 1f6f268..3beb941 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -40,17 +40,17 @@ int main(int argc, char* argv[]) // TreeMap Widget as toplevel window FSView w(new Inode()); - 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,TQ_SIGNAL(clicked(TreeMapItem*)), + &w,TQ_SLOT(selected(TreeMapItem*))); + TQObject::connect(&w,TQ_SIGNAL(returnPressed(TreeMapItem*)), + &w,TQ_SLOT(selected(TreeMapItem*))); TQObject::connect(&w, - TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), - &w,TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); + TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), + &w,TQ_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); w.setPath(path); w.show(); - a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &w, TQT_SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &w, TQ_SLOT( quit() ) ); return a.exec(); } diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index 97041a9..bff8641 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -1768,7 +1768,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( receivers( TQ_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { @@ -2774,8 +2774,8 @@ void TreeMapWidget::addSplitDirectionItems(TQPopupMenu* popup, int id) _splitID = id; popup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(splitActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(splitActivated(int))); popup->insertItem(i18n("Recursive Bisection"), id); popup->insertItem(i18n("Columns"), id+1); @@ -2833,10 +2833,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) TQPopupMenu* bpopup = new TQPopupMenu(); bpopup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); - connect(bpopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); + connect(bpopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); TQPopupMenu* spopup = new TQPopupMenu(); addSplitDirectionItems(spopup, id+100); @@ -2896,8 +2896,8 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) tpopup->setItemChecked(id+7,_attr[f].pos == DrawParams::BottomCenter); tpopup->setItemChecked(id+8,_attr[f].pos == DrawParams::BottomRight); - connect(tpopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); + connect(tpopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); } } @@ -2921,8 +2921,8 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, _selectionID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(selectionActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(selectionActivated(int))); while (i) { TQString name = i->text(0); @@ -2952,8 +2952,8 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, { _fieldStopID = id; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(fieldStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(fieldStopActivated(int))); popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); @@ -3002,8 +3002,8 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, _areaStopID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(areaStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(areaStopActivated(int))); bool foundArea = false; @@ -3067,8 +3067,8 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, _depthStopID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(depthStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(depthStopActivated(int))); bool foundDepth = false; diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index e86dd57..b6be06d 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -191,8 +191,8 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) { m_imageNameReq = new KURLRequester(path + "images.html", page); label->setBuddy( m_imageNameReq ); dvlay->addWidget(m_imageNameReq); - connect( m_imageNameReq, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(imageUrlChanged(const TQString&)) ); + connect( m_imageNameReq, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(imageUrlChanged(const TQString&)) ); TQWhatsThis::add( m_imageNameReq, whatsThis ); const bool recurseSubDir = m_config->readBoolEntry("RecurseSubDirectories", false); @@ -215,8 +215,8 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) { TQWhatsThis::add( m_recursionLevel, whatsThis ); - connect(m_recurseSubDir, TQT_SIGNAL( toggled(bool) ), - m_recursionLevel, TQT_SLOT( setEnabled(bool) ) ); + connect(m_recurseSubDir, TQ_SIGNAL( toggled(bool) ), + m_recursionLevel, TQ_SLOT( setEnabled(bool) ) ); dvlay->addWidget(m_recurseSubDir); dvlay->addWidget(m_recursionLevel); @@ -262,10 +262,10 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) { dvlay->addWidget(m_commentFileReq); TQWhatsThis::add( m_commentFileReq, whatsThis ); - 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))); + connect(m_useCommentFile, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool))); + connect(m_useCommentFile, TQ_SIGNAL(toggled(bool)), + m_commentFileReq, TQ_SLOT(setEnabled(bool))); dvlay->addStretch(1); } @@ -317,8 +317,8 @@ void KIGPDialog::setupThumbnailPage(const TQString& path) { m_colorDepth->setEnabled(colorDepthSet); hlay4->addWidget( m_colorDepth ); - connect(m_colorDepthSet, TQT_SIGNAL( toggled(bool) ), - m_colorDepth, TQT_SLOT( setEnabled(bool) ) ); + connect(m_colorDepthSet, TQ_SIGNAL( toggled(bool) ), + m_colorDepth, TQ_SLOT( setEnabled(bool) ) ); vlay->addStretch(1); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index a4d255c..6d4b6f1 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -52,7 +52,7 @@ KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQ : KParts::Plugin( parent, name ), m_commentMap(0) { new TDEAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, - TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); + TQ_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); } void KImGalleryPlugin::slotExecute() @@ -82,7 +82,7 @@ void KImGalleryPlugin::slotExecute() KURL url(m_configDlg->getImageName()); if ( !url.isEmpty() && url.isValid()) { m_progressDlg = new TQProgressDialog(m_part->widget(), "progressDlg", true ); - TQObject::connect(m_progressDlg, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( slotCancelled() ) ); + TQObject::connect(m_progressDlg, TQ_SIGNAL( cancelled() ), this, TQ_SLOT( slotCancelled() ) ); m_progressDlg->setLabelText( i18n("Creating thumbnails") ); m_progressDlg->setCancelButton(new KPushButton(KStdGuiItem::cancel(),m_progressDlg)); diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index c32d46e..89a6c4b 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -47,11 +47,11 @@ KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) topLayout->add(dialog); topLayout->addStretch(); - 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() ) ); + connect( dialog->m_sbCopy, TQ_SIGNAL(valueChanged(int) ), TQ_SLOT(configChanged() ) ); + connect( dialog->m_sbMove, TQ_SIGNAL(valueChanged(int) ), TQ_SLOT(configChanged() ) ); + connect( dialog->pbCopyClear, TQ_SIGNAL(pressed() ), TQ_SLOT(slotClearCopyCache() ) ); + connect( dialog->pbMoveClear, TQ_SIGNAL(pressed() ), TQ_SLOT(slotClearMoveCache() ) ); + connect( dialog->m_chkShow, TQ_SIGNAL(clicked() ), TQ_SLOT(slotShowToggled() ) ); load(); } diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 6b98470..beba6d0 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -44,13 +44,13 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, { children.setAutoDelete( true ); initIconMap( ); - connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); - connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); + connect( this, TQ_SIGNAL( aboutToShow( ) ), this, TQ_SLOT( slotAboutToShow( ) ) ); + connect( this, TQ_SIGNAL( aboutToHide( ) ), this, TQ_SLOT( slotAboutToHide( ) ) ); children.clear(); // just in case TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new TDEAction(name, 0, this, TQT_SLOT(new_slot( ) ), this); + action = new TDEAction(name, 0, this, TQ_SLOT(new_slot( ) ), this); } KDirMenu::~KDirMenu( ) { delete action; @@ -81,8 +81,8 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { else insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); children.append( submenu ); - connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), - this, TQT_SLOT(slotFileSelected(const TQString &))); + connect(submenu, TQ_SIGNAL(fileChosen(const TQString &)), + this, TQ_SLOT(slotFileSelected(const TQString &))); } void KDirMenu::slotAboutToShow( ) { diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index 9b3c1df..a32736f 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -40,8 +40,8 @@ KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) #ifdef KIMCONTACTS_USE_KABC m_addressBook = TDEABC::StdAddressBook::self( false ); #endif - connect( this, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotItemActivated( int ) ) ); - connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotItemActivated( int ) ) ); + connect( this, TQ_SIGNAL( aboutToShow( ) ), this, TQ_SLOT( slotAboutToShow( ) ) ); } KIMContactMenu::~KIMContactMenu() diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index aaec725..8346a0a 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -55,8 +55,8 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); - connect(m_home, TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_home, TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } u.setPath(TQDir::rootDirPath()); @@ -66,8 +66,8 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); - connect(m_root, TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_root, TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } TQString confDir = TQDir::rootDirPath()+ "etc"; @@ -80,8 +80,8 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, i18n("&System Configuration"), m_etc); dirList << confDir; - connect(m_etc , TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_etc , TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } if ( url.isLocalFile() @@ -97,21 +97,21 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); - connect(m_current, TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_current, TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } if ( imProxy ) { m_contacts = new KIMContactMenu( parent, imProxy ); int item = insertItem( SmallIconSet( "preferences-desktop-personal" ), i18n( "C&ontact" ), m_contacts ); - connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); + connect ( m_contacts, TQ_SIGNAL( contactChosen( const TQString &) ), TQ_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) setItemEnabled( item, false ); } - m_browse = new TDEAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this ); + m_browse = new TDEAction(i18n("&Browse..."), 0, this, TQ_SLOT(slotBrowse()), this ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, continue; } TQString escapedDir = *it; - TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this); + TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, this, TQ_SLOT(slotFastPath()), this); action->plug(this ); actions.append( action ); ++it; diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 6545366..b58acc3 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -42,11 +42,11 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString popup= popupmenu ; meta_copy_mmu = 0L; meta_move_mmu = 0L; - my_action = new TDEAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); + my_action = new TDEAction( "kuick_plugin", 0, this, TQ_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); addAction( my_action ); addSeparator(); //popupmenu->addMerge(); - connect( popup, TQT_SIGNAL(aboutToShow() ), this, TQT_SLOT(slotPrepareMenu( ) ) ); + connect( popup, TQ_SIGNAL(aboutToShow() ), this, TQ_SLOT(slotPrepareMenu( ) ) ); m_imProxy = KIMProxy::instance( kapp->dcopClient() ); } KTestMenu::~KTestMenu( ){ @@ -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, TQT_SIGNAL(fileChosen(const TQString &) ), - TQT_SLOT(slotStartCopyJob(const TQString & )) ); + connect( meta_copy_mmu, TQ_SIGNAL(fileChosen(const TQString &) ), + TQ_SLOT(slotStartCopyJob(const TQString & )) ); - connect( meta_copy_mmu, TQT_SIGNAL( contactChosen( const TQString & ) ), - TQT_SLOT( slotFileTransfer( const TQString & )) ); + connect( meta_copy_mmu, TQ_SIGNAL( contactChosen( const TQString & ) ), + TQ_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, TQT_SIGNAL(fileChosen(const TQString &) ), - TQT_SLOT(slotStartMoveJob(const TQString & )) ); + connect( meta_move_mmu, TQ_SIGNAL(fileChosen(const TQString &) ), + TQ_SLOT(slotStartMoveJob(const TQString & )) ); } break; } diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index b0ce649..1a81aa5 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -50,14 +50,14 @@ KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) kdDebug() << "couldn't get part" << endl; return; } - TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); + TQTimer::singleShot(0, this, TQ_SLOT(waitPartToLoad())); } void KonqMFIcon::waitPartToLoad() { - 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(TDEIO::Job *)), this, TQT_SLOT(removeMFIcon())); + connect(m_part, TQ_SIGNAL(completed()), this, TQ_SLOT(addMFIcon())); + connect(m_part, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(addMFIcon())); // to make pages with metarefresh to work + connect(m_part, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(removeMFIcon())); } @@ -247,7 +247,7 @@ void KonqMFIcon::contextMenu() { delete m_menu; m_menu = new TDEPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Microformats")); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addMF(int))); int id = 0; for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); @@ -258,7 +258,7 @@ void KonqMFIcon::contextMenu() { id++; } m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, TQT_SLOT(addMFs()), 0, 50000 ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, TQ_SLOT(addMFs()), 0, 50000 ); m_menu->popup(TQCursor::pos()); } @@ -285,7 +285,7 @@ void KonqMFIcon::addMFIcon() { m_statusBarEx->addStatusBarItem(m_mfIcon, 0, true); - connect(m_mfIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); + connect(m_mfIcon, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(contextMenu())); } diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 9b5610f..e1e439c 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -51,8 +51,8 @@ MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStr m_pMinitoolsMenu->setDelayed(false); m_pMinitoolsMenu->setEnabled(true); - connect(m_pMinitoolsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotAboutToShow() )); + connect(m_pMinitoolsMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotAboutToShow() )); } MinitoolsPlugin::~MinitoolsPlugin() { @@ -63,10 +63,10 @@ void MinitoolsPlugin::slotAboutToShow() { m_minitoolsList.clear(); KXBELBookmarkImporterImpl importer; - 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() )); + connect(&importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) )); + connect(&importer, TQ_SIGNAL( endFolder() ), + TQ_SLOT( endFolderCallback() )); TQString filename = minitoolsFilename(true); if (!filename.isEmpty() && TQFile::exists(filename)) { importer.setFilename(filename); @@ -102,7 +102,7 @@ void MinitoolsPlugin::slotAboutToShow() { } m_pMinitoolsMenu->popupMenu()->insertItem( str, this, - TQT_SLOT(slotItemSelected(int)), + TQ_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; } @@ -116,7 +116,7 @@ void MinitoolsPlugin::slotAboutToShow() { m_pMinitoolsMenu->popupMenu() ->insertItem(i18n("&Edit Minitools"), - this, TQT_SLOT(slotEditBookmarks()), + this, TQ_SLOT(slotEditBookmarks()), 0, ++count ); } @@ -147,10 +147,10 @@ void MinitoolsPlugin::slotItemSelected(int id) { return; 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 &) )); + connect(this, TQ_SIGNAL( executeScript(const TQString &) ), + m_part, TQ_SLOT( executeScript(const TQString &) )); emit executeScript(script); - disconnect(this, TQT_SIGNAL( executeScript(const TQString &) ), 0, 0); + disconnect(this, TQ_SIGNAL( executeScript(const TQString &) ), 0, 0); } #include "minitoolsplugin.moc" diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 8b646c3..48e3f95 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -70,28 +70,28 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin setInstance(RelLinksFactory::instance()); // ------------- Navigation links -------------- - tdeaction_map["home"] = new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" ); + tdeaction_map["home"] = new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQ_SLOT(goHome()), actionCollection(), "rellinks_top" ); tdeaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") ); - tdeaction_map["up"] = new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); + tdeaction_map["up"] = new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQ_SLOT(goUp()), actionCollection(), "rellinks_up" ); tdeaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") ); bool isRTL = TQApplication::reverseLayout(); - tdeaction_map["begin"] = new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" ); + tdeaction_map["begin"] = new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this, TQ_SLOT(goFirst()), actionCollection(), "rellinks_first" ); tdeaction_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>") ); - tdeaction_map["prev"] = new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); + tdeaction_map["prev"] = new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this, TQ_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); tdeaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") ); - tdeaction_map["next"] = new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" ); + tdeaction_map["next"] = new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this, TQ_SLOT(goNext()), actionCollection(), "rellinks_next" ); tdeaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") ); - tdeaction_map["last"] = new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" ); + tdeaction_map["last"] = new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this, TQ_SLOT(goLast()), actionCollection(), "rellinks_last" ); tdeaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") ); // ------------ special items -------------------------- - tdeaction_map["search"] = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); + tdeaction_map["search"] = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQ_SLOT(goSearch()), actionCollection(), "rellinks_search" ); tdeaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") ); // ------------ Document structure links --------------- @@ -99,39 +99,39 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") ); m_document->setDelayed(false); - tdeaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" ); + tdeaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"), this, TQ_SLOT(goContents()), actionCollection(), "rellinks_toc" ); m_document->insert(tdeaction_map["contents"]); tdeaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") ); tdeactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "document-open", actionCollection(), "rellinks_chapters" ); m_document->insert(tdeactionmenu_map["chapter"]); - connect( tdeactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int))); + connect( tdeactionmenu_map["chapter"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT(goChapter(int))); tdeactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") ); tdeactionmenu_map["chapter"]->setDelayed(false); tdeactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "document-open", actionCollection(), "rellinks_sections" ); m_document->insert(tdeactionmenu_map["section"]); - connect( tdeactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) ); + connect( tdeactionmenu_map["section"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goSection( int ) ) ); tdeactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") ); tdeactionmenu_map["section"]->setDelayed(false); tdeactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "document-open", actionCollection(), "rellinks_subsections" ); m_document->insert(tdeactionmenu_map["subsection"]); - connect( tdeactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) ); + connect( tdeactionmenu_map["subsection"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goSubsection( int ) ) ); tdeactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") ); tdeactionmenu_map["subsection"]->setDelayed(false); tdeactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" ); m_document->insert(tdeactionmenu_map["appendix"]); - connect( tdeactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) ); + connect( tdeactionmenu_map["appendix"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goAppendix( int ) ) ); tdeactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") ); tdeactionmenu_map["appendix"]->setDelayed(false); - tdeaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); + tdeaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQ_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); m_document->insert(tdeaction_map["glossary"]); tdeaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") ); - tdeaction_map["index"] = new TDEAction( i18n("&Index"), "application-vnd.tde.info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" ); + tdeaction_map["index"] = new TDEAction( i18n("&Index"), "application-vnd.tde.info", TDEShortcut("Ctrl+Alt+I"), this, TQ_SLOT(goIndex()), actionCollection(), "rellinks_index" ); m_document->insert(tdeaction_map["index"]); tdeaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") ); @@ -140,35 +140,35 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") ); m_more->setDelayed(false); - tdeaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" ); + tdeaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQ_SLOT(goHelp()), actionCollection(), "rellinks_help" ); m_more->insert(tdeaction_map["help"]); tdeaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") ); - tdeaction_map["author"] = new TDEAction( i18n("&Authors"), "mail-message-new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); + tdeaction_map["author"] = new TDEAction( i18n("&Authors"), "mail-message-new", TDEShortcut("Ctrl+Alt+A"), this, TQ_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); m_more->insert(tdeaction_map["author"]); tdeaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") ); - tdeaction_map["copyright"] = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); + tdeaction_map["copyright"] = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQ_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); m_more->insert(tdeaction_map["copyright"]); tdeaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") ); tdeactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" ); m_more->insert(tdeactionmenu_map["bookmark"]); tdeactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") ); - connect( tdeactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) ); + connect( tdeactionmenu_map["bookmark"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goBookmark( int ) ) ); tdeactionmenu_map["bookmark"]->setDelayed(false); tdeactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" ); m_more->insert(tdeactionmenu_map["alternate"]); tdeactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") ); - connect( tdeactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) ); + connect( tdeactionmenu_map["alternate"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goAlternate( int ) ) ); tdeactionmenu_map["alternate"]->setDelayed(false); // Unclassified menu m_links = new TDEActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" ); tdeactionmenu_map["unclassified"] = m_links; tdeactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") ); - connect( tdeactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) ); + connect( tdeactionmenu_map["unclassified"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goAllElements( int ) ) ); tdeactionmenu_map["unclassified"]->setDelayed(false); // We unactivate all the possible actions @@ -179,15 +179,15 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin if (!m_part) return; - connect( m_part, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( newDocument() ) ); - connect( m_part, TQT_SIGNAL( completed() ), this, TQT_SLOT( loadingFinished() ) ); + connect( m_part, TQ_SIGNAL( docCreated() ), this, TQ_SLOT( newDocument() ) ); + connect( m_part, TQ_SIGNAL( completed() ), this, TQ_SLOT( loadingFinished() ) ); // create polling timer and connect it m_pollTimer = new TQTimer(this, "polling timer"); - connect( m_pollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateToolbar() ) ); + connect( m_pollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateToolbar() ) ); // delay access to our part's members until it has finished its initialisation - TQTimer::singleShot(0, this, TQT_SLOT(delayedSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(delayedSetup())); } /** Destructor */ diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index 7e53571..741dc18 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -88,13 +88,13 @@ RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, m_rSync = new KRsync(parent, name); - connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); + connect (m_part, TQ_SIGNAL(aboutToOpenURL()), TQ_SLOT(slotOpenURL())); - connect(m_pSyncNow, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSync())); - connect(m_pSyncSetup, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSetup())); + connect(m_pSyncNow, TQ_SIGNAL(activated()), this, TQ_SLOT(slotSync())); + connect(m_pSyncSetup, TQ_SIGNAL(activated()), this, TQ_SLOT(slotSetup())); - connect(m_rSync, TQT_SIGNAL(setupDone()), this, TQT_SLOT(slotSetupDone())); - connect(m_rSync, TQT_SIGNAL(transferDone()), this, TQT_SLOT(slotTransferDone())); + connect(m_rSync, TQ_SIGNAL(setupDone()), this, TQ_SLOT(slotSetupDone())); + connect(m_rSync, TQ_SIGNAL(transferDone()), this, TQ_SLOT(slotTransferDone())); m_rSync->loadSettings(); } diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 65eba0b..ab20a38 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -81,15 +81,15 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, 0, 0, actionCollection(), "toolbar_search_bar"); m_searchComboAction->setShortcutConfigurable(false); - connect(m_searchCombo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(startSearch(const TQString &))); - connect(m_searchCombo, TQT_SIGNAL(iconClicked()), TQT_SLOT(showSelectionMenu())); + connect(m_searchCombo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(startSearch(const TQString &))); + connect(m_searchCombo, TQ_SIGNAL(iconClicked()), TQ_SLOT(showSelectionMenu())); TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" "Enter a search term. Click on the icon to change search mode or provider.")); new TDEAction( i18n( "Focus Searchbar" ), CTRL+Key_S, - this, TQT_SLOT(focusSearchbar()), + this, TQ_SLOT(focusSearchbar()), actionCollection(), "focus_search_bar"); configurationChanged(); @@ -100,15 +100,15 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager")); if (partMan) { - connect(partMan, TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_SLOT (partChanged (KParts::Part*))); + connect(partMan, TQ_SIGNAL(activePartChanged(KParts::Part*)), + TQ_SLOT (partChanged (KParts::Part*))); partChanged(partMan->activePart()); } - 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&))); + connect(this, TQ_SIGNAL(gsCompleteDelayed()), TQ_SLOT(gsStartDelay())); + connect(&m_gsTimer, TQ_SIGNAL(timeout()), TQ_SLOT(gsMakeCompletionList())); + connect(m_searchCombo->listBox(), TQ_SIGNAL(highlighted(const TQString&)), TQ_SLOT(gsSetCompletedText(const TQString&))); + connect(m_searchCombo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(gsPutTextInBox(const TQString&))); } SearchBarPlugin::~SearchBarPlugin() @@ -382,7 +382,7 @@ void SearchBarPlugin::showSelectionMenu() list << "kurisearchfilter" << "kuriikwsfilter"; m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu"); - m_popupMenu->insertItem(SmallIcon("edit-find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); + m_popupMenu->insertItem(SmallIcon("edit-find"), i18n("Find in This Page"), this, TQ_SLOT(useFindInThisPage()), 0, 999); m_popupMenu->insertSeparator(); int i=-1; @@ -413,14 +413,14 @@ void SearchBarPlugin::showSelectionMenu() } m_popupMenu->insertSeparator(); - m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu); + m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQ_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, TQT_SLOT(selectSearchEngines()), 0, 1000); - connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(useSearchProvider(int))); + this, TQ_SLOT(selectSearchEngines()), 0, 1000); + connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(useSearchProvider(int))); } m_googleMenu->setCurrentItem(m_googleMode); m_popupMenu->popup(m_searchCombo->mapToGlobal(TQPoint(0, m_searchCombo->height() + 1)), 0); @@ -450,7 +450,7 @@ void SearchBarPlugin::selectSearchEngines() *process << "tdecmshell" << "ebrowsing"; - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(searchEnginesSelected(TDEProcess *))); + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(searchEnginesSelected(TDEProcess *))); if(!process->start()) { @@ -518,7 +518,7 @@ void SearchBarPlugin::partChanged(KParts::Part *newPart) m_part = ::tqt_cast<TDEHTMLPart*>(newPart); //Delay since when destroying tabs part 0 gets activated for a bit, before the proper part - TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility())); + TQTimer::singleShot(0, this, TQ_SLOT(updateComboVisibility())); } void SearchBarPlugin::updateComboVisibility() @@ -546,7 +546,7 @@ SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : KHistoryCombo(parent, name), m_pluginActive(true) { - connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared())); + connect(this, TQ_SIGNAL(cleared()), TQ_SLOT(historyCleared())); } const TQPixmap &SearchBarCombo::icon() const @@ -649,8 +649,8 @@ void SearchBarPlugin::gsMakeCompletionList() { TDEIO::TransferJob* tj = TDEIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false); - connect(tj, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&))); - connect(tj, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(gsJobFinished(TDEIO::Job*))); + connect(tj, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQ_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&))); + connect(tj, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(gsJobFinished(TDEIO::Job*))); } } diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 775d371..28a929f 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -52,28 +52,28 @@ MainWidget::MainWidget( TDEConfig * config, TQWidget * parent ) btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", TDEIcon::Small ) ); btnNew->setIconSet( il->loadIconSet( "bookmark_add", TDEIcon::Small ) ); - connect( ( TQWidget * ) btnRefreshTags, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotGetTags() ) ); + connect( ( TQWidget * ) btnRefreshTags, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotGetTags() ) ); - connect( ( TQWidget * ) btnRefreshBookmarks, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotGetBookmarks() ) ); + connect( ( TQWidget * ) btnRefreshBookmarks, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotGetBookmarks() ) ); - connect( ( TQWidget * ) btnNew, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotNewBookmark() ) ); + connect( ( TQWidget * ) btnNew, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotNewBookmark() ) ); - 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( lvBookmarks, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotBookmarkExecuted( TQListViewItem * ) ) ); + connect( lvBookmarks, TQ_SIGNAL( mouseButtonClicked ( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotBookmarkClicked( int, TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvTags, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( slotTagsContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( lvTags, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotTagsContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvBookmarks, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( slotBookmarksContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( lvBookmarks, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotBookmarksContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); m_updateTimer = new TQTimer( this ); - connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotGetBookmarks() ) ); + connect( m_updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotGetBookmarks() ) ); slotGetTags(); } @@ -93,8 +93,8 @@ void MainWidget::slotGetTags() kdDebug() << k_funcinfo << endl; TDEIO::StoredTransferJob * job = TDEIO::storedGet( "http://del.icio.us/api/tags/get" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotFillTags( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotFillTags( TDEIO::Job * ) ) ); } void MainWidget::slotFillTags( TDEIO::Job * job ) @@ -121,7 +121,7 @@ void MainWidget::slotFillTags( TDEIO::Job * job ) { TagListItem *item = new TagListItem( lvTags, tag.attribute( "tag" ), tag.attribute( "count" ).toInt() ); m_tags.append( tag.attribute( "tag" ) ); - connect( item, TQT_SIGNAL( signalItemChecked( TagListItem * ) ), TQT_SLOT( itemToggled() ) ); + connect( item, TQ_SIGNAL( signalItemChecked( TagListItem * ) ), TQ_SLOT( itemToggled() ) ); } } } @@ -134,8 +134,8 @@ void MainWidget::slotGetBookmarks() kdDebug() << k_funcinfo << url.url() << endl; TDEIO::StoredTransferJob * job = TDEIO::storedGet( url ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotFillBookmarks( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotFillBookmarks( TDEIO::Job * ) ) ); } void MainWidget::slotFillBookmarks( TDEIO::Job * job ) @@ -229,12 +229,12 @@ void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int TQPopupMenu * tagMenu = new TQPopupMenu( this ); TQ_CHECK_PTR( tagMenu ); - 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->insertItem( i18n( "Check All" ), this, TQ_SLOT( slotCheckAllTags() ) ); + tagMenu->insertItem( i18n( "Uncheck All" ), this, TQ_SLOT( slotUncheckAllTags() ) ); + tagMenu->insertItem( i18n( "Toggle All" ), this, TQ_SLOT( slotToggleTags() ) ); tagMenu->insertSeparator(); tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", TDEIcon::Small ), - i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) ); + i18n( "Rename Tag..." ), this, TQ_SLOT( slotRenameTag() ) ); tagMenu->exec( pos ); } @@ -323,7 +323,7 @@ void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos TQ_CHECK_PTR( menu ); menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit-delete", TDEIcon::Small ), - i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) ); + i18n( "Delete Bookmark" ), this, TQ_SLOT( slotDeleteBookmark() ) ); menu->exec( pos ); } diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index f0783f2..5ab5263 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -35,10 +35,10 @@ KonqSidebarDelicious::KonqSidebarDelicious( TDEInstance *instance, TQObject *par { m_widget = new MainWidget( instance->config(), widgetParent ); - 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 & ) ) ); + connect( m_widget, TQ_SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQ_SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); } KonqSidebarDelicious::~KonqSidebarDelicious() diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index eb034ca..6b0dcd0 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -97,11 +97,11 @@ int SliderAction::plug( TQWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "TDEToolBar" )) - connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition))); + connect(toolBar, TQ_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQ_SLOT(toolbarMoved(TDEToolBar::BarPosition))); emit plugged(); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index f0945a9..ab2e807 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -42,19 +42,19 @@ KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) labelFont.setBold(true); time->setFont(labelFont); - 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, 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, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(unsigned long)), player, TQT_SLOT(skipTo(unsigned long))); + connect(Play, TQ_SIGNAL(clicked()), player, TQ_SLOT(play())); + connect(Pause, TQ_SIGNAL(clicked()), player, TQ_SLOT(pause())); + connect(Stop, TQ_SIGNAL(clicked()), player, TQ_SLOT(stop())); + + connect(player, TQ_SIGNAL(timeout()), this, TQ_SLOT(playerTimeout())); + connect(player, TQ_SIGNAL(finished()), this, TQ_SLOT(playerFinished())); + connect(player, TQ_SIGNAL(playing()), this, TQ_SLOT(playing())); + connect(player, TQ_SIGNAL(paused()), this, TQ_SLOT(paused())); + connect(player, TQ_SIGNAL(stopped()), this, TQ_SLOT(stopped())); + connect(player, TQ_SIGNAL(empty()), this, TQ_SLOT(empty())); + + connect(Position, TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(unsigned long)), player, TQ_SLOT(skipTo(unsigned long))); setAcceptDrops(true); pretty=""; diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 26904cf..dffe4ee 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -36,7 +36,7 @@ Player::Player(TQObject *parent) { mEngine = new Engine; mLooping = false; - connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout())); + connect(&ticker, TQ_SIGNAL(timeout()), TQ_SLOT(tickerTimeout())); ticker.start(500); stop(); } diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 35816df..f198b9e 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -66,10 +66,10 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent setIcon(SmallIcon("metabar")); ok = new KPushButton(KStdGuiItem::ok(), this); - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); TQTabWidget *tab = new TQTabWidget(this); @@ -117,7 +117,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme())); + connect(install_theme, TQ_SIGNAL(clicked()), this, TQ_SLOT(installTheme())); loadThemes(); @@ -125,23 +125,23 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQWidget *links = new TQWidget; link_create = new KPushButton(i18n("New..."), links); - connect(link_create, TQT_SIGNAL(clicked()), this, TQT_SLOT(createLink())); + connect(link_create, TQ_SIGNAL(clicked()), this, TQ_SLOT(createLink())); link_delete = new KPushButton(i18n("Delete"), links); - connect(link_delete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLink())); + connect(link_delete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteLink())); link_edit = new KPushButton(i18n("Edit..."), links); - connect(link_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editLink())); + connect(link_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editLink())); link_up = new KPushButton(links); link_up->setIconSet(SmallIconSet("go-up")); link_up->setEnabled(false); - connect(link_up, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkUp())); + connect(link_up, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveLinkUp())); link_down = new KPushButton(links); link_down->setIconSet(SmallIconSet("go-down")); link_down->setEnabled(false); - connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); + connect(link_down, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveLinkDown())); link_list = new TDEListView(links); link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); @@ -149,8 +149,8 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent link_list->setItemsMovable(TRUE); link_list->addColumn(i18n("Name")); link_list->addColumn(i18n("Address")); - connect(link_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(editLink(TQListViewItem*))); - connect(link_list, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateArrows())); + connect(link_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(editLink(TQListViewItem*))); + connect(link_list, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateArrows())); TQWidget *actionPage = new TQWidget; @@ -311,10 +311,10 @@ void ConfigDialog::createLink() main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), main, TQ_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), main, TQ_SLOT(reject())); TQLineEdit *name = new TQLineEdit(i18n("New link"), main); TQLineEdit *url = new TQLineEdit("file:/", main); @@ -394,10 +394,10 @@ void ConfigDialog::editLink(TQListViewItem *item) main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), main, TQ_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), main, TQ_SLOT(reject())); TQLineEdit *name = new TQLineEdit(linkList[item]->name, main); TQLineEdit *url = new TQLineEdit(linkList[item]->url, main); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 3677663..79b1ea7 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -336,9 +336,9 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) preview_job = TDEIO::filePreview(KURL::List(url), m_html->view()->width() - 30); - 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(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *))); + connect(preview_job, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQ_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&))); + connect(preview_job, TQ_SIGNAL(failed(const KFileItem *)), this, TQ_SLOT(slotPreviewFailed(const KFileItem *))); + connect(preview_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobFinished(TDEIO::Job *))); } m_functions->show("preview"); diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index 4f9cfd1..12cf134 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -35,7 +35,7 @@ MetabarFunctions::MetabarFunctions(TDEHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate())); } MetabarFunctions::~MetabarFunctions() diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 0645745..c66fc19 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -84,9 +84,9 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare config = new TDEConfig("metabarrc"); dir_watch = new KDirWatch(); - 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&))); + connect(dir_watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(slotDeleteCurrentInfo(const TQString&))); html = new TDEHTMLPart(this, "metabarhtmlpart"); html->setJScriptEnabled(true); @@ -97,9 +97,9 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); html->view()->hide(); - connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); - 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 &))); + connect(html->browserExtension(), TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQ_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); + connect(html, TQ_SIGNAL(completed()), this, TQ_SLOT(loadCompleted())); + connect(html, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotShowPopup(const TQString&, const TQPoint &))); functions = new MetabarFunctions(html, this); @@ -118,10 +118,10 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare layout->addWidget(html->view()); popup = new TDEPopupMenu(0); - TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); + TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQ_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload"); + TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQ_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index b5186ab..4749f53 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8()); + TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQ_SLOT(runAction()), popup, idString.utf8()); action->plug(popup); } else{ diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index 48b4afc..771668f 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -58,8 +58,8 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node) if(url.path().endsWith("/")){ list_job = TDEIO::listDir(url, true, false); - connect(list_job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); - connect(list_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *))); + connect(list_job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQ_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); + connect(list_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobFinished(TDEIO::Job *))); m_functions->show("actions"); } diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index 86aa12c..a96adeb 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -44,7 +44,7 @@ namespace KSB_News { KPushButton *btn = new KPushButton(i18n("&Configure"), this); btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnClicked())); topLayout->addWidget(btn, 0, TQt::AlignHCenter); topLayout->addStretch(); @@ -69,8 +69,8 @@ namespace KSB_News { // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, - TQT_SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQ_SIGNAL(settingsChanged()), this, + TQ_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index 707ba71..88dbe8c 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -86,7 +86,7 @@ namespace KSB_News { // updating of RSS documents m_timeoutinterval = 10 * 60 * 1000; // 10 mins m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refresh())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refresh())); m_timer->start(m_timeoutinterval); refresh(); } diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 8ee0c78..bd1c35d 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -84,19 +84,19 @@ namespace KSB_News { popup = new TDEPopupMenu(this); popup->insertItem(KStdGuiItem::configure().iconSet(), i18n("&Configure Newsticker..."), this, - TQT_SLOT(slotConfigure())); + TQ_SLOT(slotConfigure())); popup->insertItem(SmallIconSet("reload"), i18n("&Reload"), this, - TQT_SLOT(slotRefresh())); + TQ_SLOT(slotRefresh())); popup->insertItem(KStdGuiItem::close().iconSet(), - KStdGuiItem::close().text(), this, TQT_SLOT(slotClose())); + KStdGuiItem::close().text(), this, TQ_SLOT(slotClose())); popup->insertSeparator(); // help menu helpmenu = new TDEPopupMenu(this); helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, - TQT_SLOT(slotShowAbout())); + TQ_SLOT(slotShowAbout())); helpmenu->insertItem(i18n("&Report Bug..."), this, - TQT_SLOT(slotShowBugreport())); + TQ_SLOT(slotShowBugreport())); popup->insertItem(KStdGuiItem::help().iconSet(), KStdGuiItem::help().text(), helpmenu); @@ -115,7 +115,7 @@ namespace KSB_News { button->width() - 4 )); button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonClicked())); TQToolTip::add(button, nsp->title()); // eventFiler for the title button @@ -258,8 +258,8 @@ namespace KSB_News { // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, - TQT_SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQ_SIGNAL(settingsChanged()), this, + TQ_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 6faaba5..f2c33fe 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -164,19 +164,19 @@ namespace KSB_News { if (! nspanel->listbox()) { TTListBox *listbox = new TTListBox(newswidget, "article_lb"); newswidget->addStackTab(nspanel, listbox); - connect(listbox, TQT_SIGNAL(executed(TQListBoxItem *)), - this, TQT_SLOT(slotArticleItemExecuted(TQListBoxItem *))); + connect(listbox, TQ_SIGNAL(executed(TQListBoxItem *)), + this, TQ_SLOT(slotArticleItemExecuted(TQListBoxItem *))); listbox->insertItem(i18n("Connecting..." )); nspanel->setListbox(listbox); } // listen to updates - 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 *))); + connect(nspanel, TQ_SIGNAL(documentUpdated(NSPanel *)), + this, TQ_SLOT(updateArticles(NSPanel *))); + connect(nspanel, TQ_SIGNAL(documentUpdated(NSPanel *)), + this, TQ_SLOT(updateTitle(NSPanel *))); + connect(nspanel, TQ_SIGNAL(pixmapUpdated(NSPanel *)), + this, TQ_SLOT(updatePixmap(NSPanel *))); if (widgets->visibleWidget() != newswidget) widgets->raiseWidget(newswidget); diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index b83e759..58dc041 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -57,40 +57,40 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, action = new TDEToggleAction( i18n("Java&Script"), 0, - this, TQT_SLOT(toggleJavascript()), + this, TQ_SLOT(toggleJavascript()), actionCollection(), "javascript" ); menu->insert( action ); action = new TDEToggleAction( i18n("&Java"), 0, - this, TQT_SLOT(toggleJava()), + this, TQ_SLOT(toggleJava()), actionCollection(), "java" ); menu->insert( action ); action = new TDEToggleAction( i18n("&Cookies"), 0, - this, TQT_SLOT(toggleCookies()), + this, TQ_SLOT(toggleCookies()), actionCollection(), "cookies" ); menu->insert( action ); action = new TDEToggleAction( i18n("&Plugins"), 0, - this, TQT_SLOT(togglePlugins()), + this, TQ_SLOT(togglePlugins()), actionCollection(), "plugins" ); menu->insert( action ); action = new TDEToggleAction( i18n("Autoload &Images"), 0, - this, TQT_SLOT(toggleImageLoading()), + this, TQ_SLOT(toggleImageLoading()), actionCollection(), "imageloading" ); menu->insert( action ); menu->insert( new TDEActionSeparator(actionCollection()) ); action = new TDEToggleAction( i18n("Enable Pro&xy"), 0, - this, TQT_SLOT(toggleProxy()), + this, TQ_SLOT(toggleProxy()), actionCollection(), "useproxy" ); action->setCheckedState(i18n("Disable Pro&xy")); menu->insert( action ); action = new TDEToggleAction( i18n("Enable Cac&he"), 0, - this, TQT_SLOT(toggleCache()), + this, TQ_SLOT(toggleCache()), actionCollection(), "usecache" ); action->setCheckedState(i18n("Disable Cac&he")); menu->insert( action ); @@ -104,11 +104,11 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, policies += i18n( "&Use Cache if Possible" ); policies += i18n( "&Offline Browsing Mode" ); sAction->setItems( policies ); - connect( sAction, TQT_SIGNAL( activated( int ) ), TQT_SLOT( cachePolicyChanged(int) ) ); + connect( sAction, TQ_SIGNAL( activated( int ) ), TQ_SLOT( cachePolicyChanged(int) ) ); menu->insert( sAction ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( showPopup() )); } SettingsPlugin::~SettingsPlugin() diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index 5cc89c6..2edeb8d 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -60,16 +60,16 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, m_pUAMenu = new TDEActionMenu( i18n("Change Browser &Identification"), "agent", actionCollection(), "changeuseragent" ); m_pUAMenu->setDelayed( false ); - connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotAboutToShow() ) ); + connect( m_pUAMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotAboutToShow() ) ); m_pUAMenu->setEnabled ( false ); if ( parent && parent->inherits( "TDEHTMLPart" ) ) { m_part = static_cast<TDEHTMLPart*>(parent); - connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this, - TQT_SLOT(slotStarted(TDEIO::Job*)) ); + connect( m_part, TQ_SIGNAL(started(TDEIO::Job*)), this, + TQ_SLOT(slotStarted(TDEIO::Job*)) ); } } @@ -217,7 +217,7 @@ void UAChangerPlugin::slotAboutToShow() //kdDebug(90130) << "User Agent: " << m_currentUserAgent << endl; int id = m_pUAMenu->popupMenu()->insertItem( i18n("Default Identification"), this, - TQT_SLOT(slotDefault()), 0, ++count ); + TQ_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, TQT_SLOT(slotItemSelected(int)), 0, *e ); + int id = browserMenu->insertItem( m_lstAlias[*e], this, TQ_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, - TQT_SLOT(slotReloadDescriptions()), + TQ_SLOT(slotReloadDescriptions()), 0, ++count );*/ m_pUAMenu->popupMenu()->insertItem( i18n("Apply to Entire Site"), this, - TQT_SLOT(slotApplyToDomain()), + TQ_SLOT(slotApplyToDomain()), 0, ++count ); m_pUAMenu->popupMenu()->setItemChecked(count, m_bApplyToDomain); m_pUAMenu->popupMenu()->insertItem( i18n("Configure..."), this, - TQT_SLOT(slotConfigure())); + TQ_SLOT(slotConfigure())); } diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 2ba435a..04a46b9 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -56,17 +56,17 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, m_menu->insert( new TDEAction( i18n( "Validate &HTML" ), "htmlvalidator", 0, - this, TQT_SLOT(slotValidateHTML()), + this, TQ_SLOT(slotValidateHTML()), actionCollection(), "validateHTML") ); m_menu->insert( new TDEAction( i18n( "Validate &CSS" ), "cssvalidator", 0, - this, TQT_SLOT(slotValidateCSS()), + this, TQ_SLOT(slotValidateCSS()), actionCollection(), "validateCSS") ); m_menu->insert( new TDEAction( i18n( "Validate &Links" ), 0, - this, TQT_SLOT(slotValidateLinks()), + this, TQ_SLOT(slotValidateLinks()), actionCollection(), "validateLinks") ); m_menu->setEnabled( false ); @@ -75,15 +75,15 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, { m_menu->insert( new TDEAction( i18n( "C&onfigure Validator..." ), "configure", 0, - this, TQT_SLOT(slotConfigure()), + this, TQ_SLOT(slotConfigure()), actionCollection(), "configure") ); m_part = static_cast<TDEHTMLPart *>( parent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); - connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this, - TQT_SLOT(slotStarted(TDEIO::Job*)) ); + connect( m_part, TQ_SIGNAL(started(TDEIO::Job*)), this, + TQ_SLOT(slotStarted(TDEIO::Job*)) ); } } diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 3af1d50..8ca6951 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -446,7 +446,7 @@ void ArchiveDialog::downloadNext() dsturl.setPath(m_tmpFile->name()); TDEIO::Job *job=TDEIO::file_copy(url, dsturl, -1, false, false, false); job->addMetaData("cache", "cache"); // Use entry from cache if available. - connect(job, TQT_SIGNAL(result( TDEIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( TDEIO::Job *)) ); + connect(job, TQ_SIGNAL(result( TDEIO::Job *)), this, TQ_SLOT(finishedDownloadingURL( TDEIO::Job *)) ); m_currentLVI=new TQListViewItem(m_widget->listView, url.prettyURL()); m_widget->listView->insertItem( m_currentLVI ); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index eaeaadc..eee557c 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -56,7 +56,7 @@ PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name, { (void) new TDEAction( i18n("Archive &Web Page..."), "webarchiver", 0, - this, TQT_SLOT(slotSaveToArchive()), + this, TQ_SLOT(slotSaveToArchive()), actionCollection(), "archivepage" ); } diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp index bbc3859..5b47072 100644 --- a/konq-plugins/webarchiver/webarchivecreator.cpp +++ b/konq-plugins/webarchiver/webarchivecreator.cpp @@ -53,7 +53,7 @@ bool WebArchiveCreator::create(const TQString &path, int width, int height, TQIm if (!m_html) { m_html = new TDEHTMLPart; - connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted())); + connect(m_html, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted())); m_html->setJScriptEnabled(false); m_html->setJavaEnabled(false); m_html->setPluginsEnabled(false); diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index 1b88165..9ca08a5 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -63,18 +63,18 @@ KSig::~KSig() void KSig::setupActions() { - KStdAction::openNew(this, TQT_SLOT(add()), actionCollection()); - new TDEAction(i18n("Remove"), "edit-delete", 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 TDEAction(i18n("C&lear"), "edit-clear", 0, kapp, TQT_SLOT(clear()), actionCollection(), "clear"); - - new TDEAction(i18n("Edit Standard Header"), 0, 0, this, TQT_SLOT(editHeader()), actionCollection(), "editHeader"); - new TDEAction(i18n("Edit Standard Footer"), 0, 0, this, TQT_SLOT(editFooter()), actionCollection(), "editFooter"); + KStdAction::openNew(this, TQ_SLOT(add()), actionCollection()); + new TDEAction(i18n("Remove"), "edit-delete", 0, this, TQ_SLOT(remove()), actionCollection(), "remove"); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(quit()), actionCollection()); + + KStdAction::cut(kapp, TQ_SLOT(cut()), actionCollection()); + KStdAction::copy(kapp, TQ_SLOT(copy()), actionCollection()); + KStdAction::paste(kapp, TQ_SLOT(paste()), actionCollection()); + new TDEAction(i18n("C&lear"), "edit-clear", 0, kapp, TQ_SLOT(clear()), actionCollection(), "clear"); + + new TDEAction(i18n("Edit Standard Header"), 0, 0, this, TQ_SLOT(editHeader()), actionCollection(), "editHeader"); + new TDEAction(i18n("Edit Standard Footer"), 0, 0, this, TQ_SLOT(editFooter()), actionCollection(), "editFooter"); } void KSig::setupLayout() @@ -96,9 +96,9 @@ void KSig::setupLayout() statusBar()->show(); updateListLock = false; - connect(sigEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(updateList())); - connect(sigList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateEdit())); - connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), this, TQT_SLOT(updateStatus(int,int))); + connect(sigEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(updateList())); + connect(sigList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateEdit())); + connect(sigEdit, TQ_SIGNAL(cursorPositionChanged(int,int)), this, TQ_SLOT(updateStatus(int,int))); } void KSig::setupSearchLine() @@ -222,7 +222,7 @@ void KSig::editHeader() t->setLabel(i18n("Standard signature header:")); t->setText(header); - connect(t, TQT_SIGNAL(textUpdated(const TQString &)), this, TQT_SLOT(setHeader(const TQString &))); + connect(t, TQ_SIGNAL(textUpdated(const TQString &)), this, TQ_SLOT(setHeader(const TQString &))); t->exec(); } @@ -233,7 +233,7 @@ void KSig::editFooter() t->setLabel(i18n("Standard signature footer:")); t->setText(footer); - connect(t, TQT_SIGNAL(textUpdated(const TQString &)), this, TQT_SLOT(setFooter(const TQString &))); + connect(t, TQ_SIGNAL(textUpdated(const TQString &)), this, TQ_SLOT(setFooter(const TQString &))); t->exec(); } diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index b9f38d1..504ad77 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -60,7 +60,7 @@ Wakeup::Wakeup() : TQObject(), Plugin() update(); TQTimer *timer=new TQTimer(this); - connect (timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotCheckTime())); + connect (timer,TQ_SIGNAL(timeout()),TQ_SLOT(slotCheckTime())); timer->start(60000,false); } @@ -129,7 +129,7 @@ void Wakeup::PlayerAct() // timer for volume (up/down) according to prefs :-) volTimer = new TQTimer (this); - connect (volTimer,TQT_SIGNAL(timeout()), TQT_SLOT(slotVolumeChange())); + connect (volTimer,TQ_SIGNAL(timeout()), TQ_SLOT(slotVolumeChange())); volTimer->start(1000,false); // updates volume every seconds @@ -260,8 +260,8 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) : volLayout->addWidget(volEndValue); volLayout->addStretch(); - connect (morningmode,TQT_SIGNAL(stateChanged(int)),TQT_SLOT(slotViewFrame(int))); - connect (applyall,TQT_SIGNAL(clicked()),TQT_SLOT(slotApplyAll())); + connect (morningmode,TQ_SIGNAL(stateChanged(int)),TQ_SLOT(slotViewFrame(int))); + connect (applyall,TQ_SIGNAL(clicked()),TQ_SLOT(slotApplyAll())); load(); } diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index b440b2b..1ddd894 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -29,9 +29,9 @@ Seeker::Seeker(TQWidget * parent, const char * name) : L33tSlider(0, 1000, 10, 0,TQt::Horizontal, parent, name) { - connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotValueChanged(int))); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } Seeker::~Seeker() diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 1a3820c..7d1e840 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -60,92 +60,92 @@ AlsaPlayer::AlsaPlayer() connect ( playlistButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(toggleListView()) + TQ_SLOT(toggleListView()) ); connect ( previousButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(back()) + TQ_SLOT(back()) ); connect ( nextButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(forward()) + TQ_SLOT(forward()) ); connect ( stopButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(stop()) + TQ_SLOT(stop()) ); connect ( playButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(playpause()) + TQ_SLOT(playpause()) ); - connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); - connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); + connect(napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide())); + connect(napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show())); - 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(), TQ_SIGNAL(playlistShown()), TQ_SLOT(slotPlayListShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(slotPlayListHidden())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused())); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(slotTrackChanged())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(changed()), TQ_SLOT(slotTrackChanged())); connect ( napp->player(), - TQT_SIGNAL(volumeChanged(int)), - TQT_SLOT(slotVolumeChanged(int)) + TQ_SIGNAL(volumeChanged(int)), + TQ_SLOT(slotVolumeChanged(int)) ); connect ( new AlsaPlayerConfigModule(this), - TQT_SIGNAL(saved()), - TQT_SLOT(slotConfigChanged()) + TQ_SIGNAL(saved()), + TQ_SLOT(slotConfigChanged()) ); connect ( volumeSlider, - TQT_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)), napp->player(), - TQT_SLOT(setVolume(int)) + TQ_SLOT(setVolume(int)) ); connect ( forwardButton, - TQT_SIGNAL(clicked()), - TQT_SLOT(slotForward()) + TQ_SIGNAL(clicked()), + TQ_SLOT(slotForward()) ); connect ( pauseButton, - TQT_SIGNAL(clicked()), - TQT_SLOT(slotPause()) + TQ_SIGNAL(clicked()), + TQ_SLOT(slotPause()) ); - connect(speedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetSpeed(int))); + connect(speedSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotSetSpeed(int))); menuButton->setPopup(NoatunStdAction::ContextMenu::contextMenu()); diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp index 8e639d8..c740c53 100644 --- a/noatun-plugins/charlatan/seeker.cpp +++ b/noatun-plugins/charlatan/seeker.cpp @@ -33,12 +33,12 @@ Seeker::Seeker(TQWidget * parent) { delayedUpdateTimer_ = new TQTimer(this); - 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(this, TQ_SIGNAL(sliderPressed()), TQ_SLOT(slotSliderPressed())); + connect(this, TQ_SIGNAL(sliderReleased()), TQ_SLOT(slotSliderReleased())); + connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); - connect(delayedUpdateTimer_, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedUpdate())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); + connect(delayedUpdateTimer_, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedUpdate())); } Seeker::~Seeker() diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index a896cfa..c62c344 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -69,8 +69,8 @@ Charlatan::Charlatan() connect ( showingVolumeTimer_, - TQT_SIGNAL(timeout()), - TQT_SLOT(slotStopShowingVolume()) + TQ_SIGNAL(timeout()), + TQ_SLOT(slotStopShowingVolume()) ); playListToggleButton_ = new TQToolButton(this); @@ -130,68 +130,68 @@ Charlatan::Charlatan() connect ( playListToggleButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(toggleListView()) + TQ_SLOT(toggleListView()) ); connect ( previousButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(back()) + TQ_SLOT(back()) ); connect ( nextButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(forward()) + TQ_SLOT(forward()) ); connect ( stopButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(stop()) + TQ_SLOT(stop()) ); - connect(restartButton_, TQT_SIGNAL(clicked()), TQT_SLOT(slotRestart())); + connect(restartButton_, TQ_SIGNAL(clicked()), TQ_SLOT(slotRestart())); connect ( playButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(playpause()) + TQ_SLOT(playpause()) ); - connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); - connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); + connect(napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide())); + connect(napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show())); - 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(), TQ_SIGNAL(playlistShown()), TQ_SLOT(slotPlayListShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(slotPlayListHidden())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused())); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); connect ( napp->player(), - TQT_SIGNAL(volumeChanged(int)), - TQT_SLOT(slotVolumeChanged(int)) + TQ_SIGNAL(volumeChanged(int)), + TQ_SLOT(slotVolumeChanged(int)) ); connect ( new CharlatanConfigModule(this), - TQT_SIGNAL(saved()), - TQT_SLOT(slotConfigChanged()) + TQ_SIGNAL(saved()), + TQ_SLOT(slotConfigChanged()) ); setCaption(i18n("Noatun")); @@ -213,12 +213,12 @@ Charlatan::Charlatan() int accelRstt = a->insertItem(Key_Return); int accelQuit = a->insertItem(Key_Q); - 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())); + a->connectItem(accelPlay, napp->player(), TQ_SLOT(playpause())); + a->connectItem(accelNext, napp->player(), TQ_SLOT(forward())); + a->connectItem(accelPrev, napp->player(), TQ_SLOT(back())); + a->connectItem(accelStop, napp->player(), TQ_SLOT(stop())); + a->connectItem(accelRstt, this, TQ_SLOT(slotRestart())); + a->connectItem(accelQuit, napp, TQ_SLOT(quit())); show(); diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index cb67a1b..b5ff637 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -62,17 +62,17 @@ Dub::Dub(DubPlaylist* plist) , shuffle_recursive(this) { connect( view->dirOperator(), - TQT_SIGNAL(fileSelected(const KFileItem*)), + TQ_SIGNAL(fileSelected(const KFileItem*)), this, - TQT_SLOT(fileSelected(const KFileItem*)) ); + TQ_SLOT(fileSelected(const KFileItem*)) ); connect( dubconfig.prefs->mediaDirectory, - TQT_SIGNAL( urlSelected (const TQString &) ), + TQ_SIGNAL( urlSelected (const TQString &) ), this, - TQT_SLOT( mediaHomeSelected (const TQString &) ) ); + TQ_SLOT( mediaHomeSelected (const TQString &) ) ); connect( this, - TQT_SIGNAL(setMediaHome(KURL)), + TQ_SIGNAL(setMediaHome(KURL)), view, - TQT_SLOT(setDir(KURL)) ); + TQ_SLOT(setDir(KURL)) ); configure_sequencing(); emit setMediaHome(dubconfig.mediaDirectory); } diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index c964979..3520fa9 100644 --- a/noatun-plugins/dub/dub/dubapp.cpp +++ b/noatun-plugins/dub/dub/dubapp.cpp @@ -54,7 +54,7 @@ DubApp::~DubApp() void DubApp::initActions() { - fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(close()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp index 4a62ecb..136a994 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.cpp +++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp @@ -86,29 +86,29 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent) // slots and signals - 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( filter, TQ_SIGNAL( activated(const TQString&) ), TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ),filter, TQ_SLOT( addToHistory(const TQString&) ) ); - 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( home, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( home() ) ); + connect( up, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( cdUp() ) ); + connect( back, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( back() ) ); + connect( forward, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( forward() ) ); - 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( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQ_SIGNAL(urlEntered(const KURL&)), + this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, TQT_SIGNAL(finishedLoading()), - this, TQT_SLOT(dirFinishedLoading()) ); + connect(dir, TQ_SIGNAL(finishedLoading()), + this, TQ_SLOT(dirFinishedLoading()) ); - connect(dir, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(dir, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); + connect(dir, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(dir, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); kdDebug(90010) << "connected stuff!" << endl; } diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index ae2a243..065069a 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -138,7 +138,7 @@ FFRS::FFRS() : TQObject(), Plugin() dpyleft = dpyright = 0; changed(); prefs = new FFRSPrefs(this); - connect(prefs, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(prefs, TQ_SIGNAL(changed()), TQ_SLOT(changed())); setSamples(256); diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 56f64a6..6ebe81f 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -58,10 +58,10 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" boxlayout->addWidget(providersBox); boxButtons = new KButtonBox( this,TQt::Vertical ); - boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) ); - boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) ); - boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) ); - boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) ); + boxButtons->addButton( i18n( "New Search Provider" ), this, TQ_SLOT( newSearch() ) ); + boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQ_SLOT( delSearch() ) ); + boxButtons->addButton( i18n( "Move Up" ), this, TQ_SLOT( moveUpSearch() ) ); + boxButtons->addButton( i18n( "Move Down" ), this, TQ_SLOT( moveDownSearch() ) ); boxButtons->layout(); boxlayout->addWidget( boxButtons ); @@ -82,9 +82,9 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" /* Signal/slots */ nameEdit->setEnabled( false ); queryEdit->setEnabled( false ); - 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 & ) ) ); + connect( providersBox, TQ_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQ_SLOT( selected( TQListBoxItem * ) ) ); + connect( nameEdit, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( nameChanged( const TQString & ) ) ); + connect( queryEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( queryChanged( const TQString & ) ) ); diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 4a552eb..353bef4 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -27,25 +27,25 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) { lyrics = this; /* Create default actions */ - (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); - //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection()); - //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection()); - //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection()); + (void)KStdAction::close(this, TQ_SLOT(close()), actionCollection()); + ( void )KStdAction::goTo( this, TQ_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); + //(void)KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + //(void)KStdAction::printPreview(this, TQ_SLOT(printPreview()), actionCollection()); + //(void)KStdAction::mail(this, TQ_SLOT(mail()), actionCollection()); + //(void)KStdAction::find(this, TQ_SLOT(find()), actionCollection()); follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); - KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection()); + KStdAction::redisplay(this, TQ_SLOT(viewLyrics()), actionCollection()); attach_act = new TDEToggleAction(i18n("&Link URL to File"), "attach", TDEShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); - connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool))); - back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); + connect(attach_act, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(attach(bool))); + back_act = KStdAction::back(this, TQ_SLOT(back()), actionCollection()); back_act->setEnabled(false); - forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection()); + forward_act = KStdAction::forward(this, TQ_SLOT(forward()), actionCollection()); forward_act->setEnabled(false); new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "tde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); - site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); + site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQ_SLOT(viewLyrics()), actionCollection(), "search_provider"); /* Add entry to menu */ - menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics())); + menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQ_SLOT(viewLyrics())); /* Create history manager and htmlpart */ history = new HistoryManager(this); @@ -53,11 +53,11 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) //htmlpart->view()->setMinimumSize(350, 420); /* Connect signals/slots */ - 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(TDEIO::Job *)), this, TQT_SLOT(loadingURL(TDEIO::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()) ); + connect( htmlpart->browserExtension(), TQ_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & ))); + connect( htmlpart, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(loadingURL(TDEIO::Job *)) ); + connect( htmlpart, TQ_SIGNAL(completed()), this, TQ_SLOT(loadedURL()) ); + connect( history, TQ_SIGNAL(uiChanged(int, bool)), this, TQ_SLOT(changeUI(int, bool)) ); + connect( napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong()) ); /* Status bar */ statusBar()->insertItem(i18n("Ready"), 0, 1); diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index ca371a6..b71cf03 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -72,9 +72,9 @@ Control::Control() : mConfigurator(0) { { TDEToolBar *tools=toolBar(); - 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); + KStdAction::save(this, TQ_SLOT(save()), actionCollection())->plug(tools); + KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection())->plug(tools); + KStdAction::open(this, TQ_SLOT(open()), actionCollection())->plug(tools); } @@ -88,11 +88,11 @@ Control::Control() : mConfigurator(0) mTree->setSorting(-1); mTree->setRootIsDecorated(true); - connect(mTree, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(mTree, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQ_SLOT(dropEvent(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect(mTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(currentChanged(TQListViewItem*))); + connect(mTree, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(currentChanged(TQListViewItem*))); mCreatorsList=new RendererListView(left); mCreatorsList->addColumn(i18n("Name")); diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index b8ba470..87f4cc9 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -62,7 +62,7 @@ NexCheckBox::NexCheckBox(TQWidget *parent, { value=v; setChecked(*v); - connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(change(bool))); + connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(change(bool))); } void NexCheckBox::change(bool b) { @@ -77,7 +77,7 @@ NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) c=color; TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); setColor(temp); - connect(this, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(change(const TQColor&))); + connect(this, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(change(const TQColor&))); } void NexColorButton::change(const TQColor &co) @@ -411,13 +411,13 @@ RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *pa { (new TQVBoxLayout(this))->setAutoAdd(true); mErase=new TQCheckBox(i18n("&Erase between frames"), this); - connect(mErase, TQT_SIGNAL(toggled(bool)), TQT_SLOT(eraseOn(bool))); + connect(mErase, TQ_SIGNAL(toggled(bool)), TQ_SLOT(eraseOn(bool))); mErase->setChecked(mList->mClearAfter); if (nex->rendererList()==l) { TQCheckBox *mConvolve=new TQCheckBox(i18n("&Convolve audio"), this); - connect(mConvolve, TQT_SIGNAL(toggled(bool)), TQT_SLOT(convolve(bool))); + connect(mConvolve, TQ_SIGNAL(toggled(bool)), TQ_SLOT(convolve(bool))); mConvolve->setChecked(nex->input()->convolve()); } diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index cb5f9c6..fe4d569 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -18,7 +18,7 @@ extern "C" NexPlugin::NexPlugin() { - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); } NexPlugin::~NexPlugin() diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 07a3581..99780bd 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -30,10 +30,10 @@ extern "C" Madness::Madness() : MonoFFTScope(100), Plugin(), mWm(this) { - 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())); + connect(&mWm, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(update())); + connect(&mWm, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(update())); + connect(&mWm, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(update())); + connect(&mWm, TQ_SIGNAL(strutChanged()), TQ_SLOT(update())); } diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index f7f8448..3a9d05a 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -47,24 +47,24 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) box->setSpacing(7); mSchemaList = new TQComboBox(box); connect( - mSchemaList, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(selectSchema(const TQString&)) + mSchemaList, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(selectSchema(const TQString&)) ); mAdd = new TQPushButton(BarIconSet("document-new"), 0, box); mAdd->setFixedWidth(mAdd->height()); TQToolTip::add(mAdd, i18n("Create new schema")); - connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(newSchema())); + connect(mAdd, TQ_SIGNAL(clicked()), TQ_SLOT(newSchema())); mRemove = new TQPushButton(BarIconSet("edit-delete"), 0, box); mRemove->setFixedWidth(mRemove->height()); TQToolTip::add(mRemove, i18n("Remove this schema")); - connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSchema())); + connect(mRemove, TQ_SIGNAL(clicked()), TQ_SLOT(removeSchema())); mCopy = new TQPushButton(BarIconSet("edit-copy"), 0, box); mCopy->setFixedWidth(mCopy->height()); TQToolTip::add(mCopy, i18n("Copy this schema")); - connect(mCopy, TQT_SIGNAL(clicked()), TQT_SLOT(copySchema())); + connect(mCopy, TQ_SIGNAL(clicked()), TQ_SLOT(copySchema())); } @@ -74,12 +74,12 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) mSchemaTree = new TDEListView(middle); connect( - mSchemaTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(setCurrent(TQListViewItem*)) + mSchemaTree, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(setCurrent(TQListViewItem*)) ); connect( - mSchemaTree, TQT_SIGNAL(moved(TQListViewItem *, TQListViewItem *, TQListViewItem *)), - TQT_SLOT(move(TQListViewItem *, TQListViewItem *, TQListViewItem *)) + mSchemaTree, TQ_SIGNAL(moved(TQListViewItem *, TQListViewItem *, TQListViewItem *)), + TQ_SLOT(move(TQListViewItem *, TQListViewItem *, TQListViewItem *)) ); mSchemaTree->setAcceptDrops(true); @@ -96,17 +96,17 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) mAddSibling = new TQPushButton(BarIconSet("1rightarrow", TDEIcon::SizeSmall), "",buttons); mAddSibling->setFixedWidth(mAddSibling->height()); - connect(mAddSibling, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + connect(mAddSibling, TQ_SIGNAL(clicked()), TQ_SLOT(addSibling())); TQToolTip::add(mAddSibling, i18n("Create a new item after the selected one")); mAddChild = new TQPushButton(BarIconSet("2rightarrow", TDEIcon::SizeSmall), "", buttons); mAddChild->setFixedWidth(mAddChild->height()); - connect(mAddChild, TQT_SIGNAL(clicked()), TQT_SLOT(addChild())); + connect(mAddChild, TQ_SIGNAL(clicked()), TQ_SLOT(addChild())); TQToolTip::add(mAddChild, i18n("Create a new child item under the selected one")); mRemoveSelf = new TQPushButton(BarIconSet("document-new", TDEIcon::SizeSmall), "", buttons); mRemoveSelf->setFixedWidth(mRemoveSelf->height()); - connect(mRemoveSelf, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + connect(mRemoveSelf, TQ_SIGNAL(clicked()), TQ_SLOT(removeSelf())); TQToolTip::add(mRemoveSelf, i18n("Remove the selected item")); new TQWidget(buttons); @@ -128,25 +128,25 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) label->setBuddy(mPropertyEdit); grid->addWidget(label, 0, 0); grid->addMultiCellWidget(mPropertyEdit, 0, 0, 1, 2); - connect(mPropertyEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); + connect(mPropertyEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCurrent())); 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, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); + connect(mValueEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCurrent())); TQPushButton *editRe = new TQPushButton(i18n("&Edit..."), topSide); grid->addWidget(editRe, 1, 2); - connect(editRe, TQT_SIGNAL(clicked()), TQT_SLOT(editValueRegexp())); + connect(editRe, TQ_SIGNAL(clicked()), TQ_SLOT(editValueRegexp())); 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, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); + connect(mPresentationEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCurrent())); } { @@ -156,15 +156,15 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) 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())); + connect(mOptionPlayable, TQ_SIGNAL(toggled(bool)), TQ_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())); + connect(mOptionChildrenVisible, TQ_SIGNAL(toggled(bool)), TQ_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())); + connect(mOptionAutoOpen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCurrent())); } } @@ -522,12 +522,12 @@ SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) mAdd = new TQPushButton(BarIconSet("1rightarrow", TDEIcon::SizeSmall), "",buttons); mAdd->setFixedWidth(mAdd->height()); - connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + connect(mAdd, TQ_SIGNAL(clicked()), TQ_SLOT(addSibling())); TQToolTip::add(mAdd, i18n("Create a new item")); mRemove = new TQPushButton(BarIconSet("document-new", TDEIcon::SizeSmall), "", buttons); mRemove->setFixedWidth(mRemove->height()); - connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + connect(mRemove, TQ_SIGNAL(clicked()), TQ_SLOT(removeSelf())); TQToolTip::add(mRemove, i18n("Remove the selected item")); new TQWidget(buttons); diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index cbf67c3..8dfd965 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -14,13 +14,13 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) mFiles.append(file); insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, TQT_SLOT(removeFromList()) + this, TQ_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); + insertItem(i18n("&Properties"), this, TQ_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(toggleInSlice(Slice *)), + this, TQ_SLOT(toggleInSlice(Slice *)), mFiles, this ))->plug(this); } @@ -46,13 +46,13 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, TQT_SLOT(removeFromList()) + this, TQ_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); + insertItem(i18n("&Properties"), this, TQ_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(toggleInSlice(Slice *)), + this, TQ_SLOT(toggleInSlice(Slice *)), mFiles,this ))->plug(this); } @@ -99,9 +99,9 @@ SliceListAction::SliceListAction( mOblique = oblique; slicesModified(); if (reciever) - 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())); + connect(this, TQ_SIGNAL(activated(Slice*)), reciever, slot); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(hit(int))); + connect(oblique->base(), TQ_SIGNAL(slicesModified()), TQ_SLOT(slicesModified())); } void SliceListAction::slicesModified() @@ -158,9 +158,9 @@ SchemaListAction::SchemaListAction( { mTree = 0; if (reciever) - 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))); + connect(this, TQ_SIGNAL(activated(const TQString&)), reciever, slot); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(prepare())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(hit(int))); } void SchemaListAction::prepare() @@ -200,8 +200,8 @@ void SchemaListAction::hit(int index) ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent) : KPropertiesDialog(makeItems(files), parent), mFiles(files) { - connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater())); - connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified())); + connect(this, TQ_SIGNAL(propertiesClosed()), TQ_SLOT(deleteLater())); + connect(this, TQ_SIGNAL(applied()), TQ_SLOT(modified())); show(); } diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index a74ce3b..8365468 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -37,15 +37,15 @@ Oblique::Oblique() mBase = new Base(::locate("data", "noatun/")+"/oblique-list"); mView = new View(this); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_SLOT(loopTypeChange(int))); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), TQ_SLOT(loopTypeChange(int))); mSelector = new SequentialSelector(mView->tree()); new Configure(this); // psst, window's gone, pass it on! - connect(mView, TQT_SIGNAL(listHidden()), TQT_SIGNAL(listHidden())); - connect(mView, TQT_SIGNAL(listShown()), TQT_SIGNAL(listShown())); + connect(mView, TQ_SIGNAL(listHidden()), TQ_SIGNAL(listHidden())); + connect(mView, TQ_SIGNAL(listShown()), TQ_SIGNAL(listShown())); loopTypeChange(napp->player()->loopStyle()); } @@ -187,7 +187,7 @@ void Oblique::beginDirectoryAdd(const KURL &url) else { mAdder = new DirectoryAdder(url, this); - connect(mAdder, TQT_SIGNAL(done()), TQT_SLOT(adderDone())); + connect(mAdder, TQ_SIGNAL(done()), TQ_SLOT(adderDone())); } } @@ -201,7 +201,7 @@ Loader::Loader(Tree *tree) mDeferredLoaderAt=1; - TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQ_SLOT(loadItemsDeferred())); } void Loader::loadItemsDeferred() @@ -230,7 +230,7 @@ void Loader::loadItemsDeferred() mDeferredLoaderAt++; } - TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQ_SLOT(loadItemsDeferred())); } @@ -267,16 +267,16 @@ void DirectoryAdder::addNextPending() currentJobURL= *pendingIt; listJob = TDEIO::listDir(currentJobURL, false, false); connect( - listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) + listJob, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) ); connect( - listJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotResult(TDEIO::Job *)) + listJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotResult(TDEIO::Job *)) ); connect( - listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), - TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) + listJob, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) ); pendingAddDirectories.remove(pendingIt); lastAddedSubDirectory = pendingAddDirectories.begin(); diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index f86f624..af8feec 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -453,28 +453,28 @@ Tree::Tree(Oblique *oblique, TQWidget *parent) connect( - this, TQT_SIGNAL(moved(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)), - TQT_SLOT(dropped(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)) + this, TQ_SIGNAL(moved(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)), + TQ_SLOT(dropped(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)) ); connect( - this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) + this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( - this, TQT_SIGNAL(executed(TQListViewItem*)), - TQT_SLOT(play(TQListViewItem*)) + this, TQ_SIGNAL(executed(TQListViewItem*)), + TQ_SLOT(play(TQListViewItem*)) ); Base *base = oblique->base(); - 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, TQ_SIGNAL(added(File)), TQ_SLOT(insert(File))); + connect(base, TQ_SIGNAL(removed(File)), TQ_SLOT(remove(File))); + connect(base, TQ_SIGNAL(modified(File)), TQ_SLOT(update(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(base, TQ_SIGNAL(addedTo(Slice*, File)), TQ_SLOT(checkInsert(Slice*, File))); + connect(base, TQ_SIGNAL(removedFrom(Slice*, File)), TQ_SLOT(checkRemove(Slice*, File))); - connect(this, TQT_SIGNAL(selected(TreeItem*)), oblique, TQT_SLOT(selected(TreeItem*))); + connect(this, TQ_SIGNAL(selected(TreeItem*)), oblique, TQ_SLOT(selected(TreeItem*))); mSlice = oblique->base()->defaultSlice(); @@ -660,7 +660,7 @@ void Tree::reload() delete mLoader; clear(); mLoader = new Loader(this); - connect(mLoader, TQT_SIGNAL(finished()), TQT_SLOT(destroyLoader())); + connect(mLoader, TQ_SIGNAL(finished()), TQ_SLOT(destroyLoader())); } void Tree::setSlice(Slice *slice) diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 32210cd..53be59e 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -37,37 +37,37 @@ View::View(Oblique *oblique) mTabs = new TabWidget(this); mTabs->tabBar()->hide(); - connect(mTabs, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(currentTabChanged(TQWidget*))); + connect(mTabs, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(currentTabChanged(TQWidget*))); setCentralWidget(mTabs); TDEAction *ac; - ac = new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files"); + ac = new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQ_SLOT(addFiles()), actionCollection(), "add_files"); ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection.")); - ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); + ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQ_SLOT(addDirectory()), actionCollection(), "add_dir"); -// ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); +// ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQ_SLOT(reload()), actionCollection(), "reload"); // ac->setWhatsThis(i18n("Reread the collection and meta-information from its files.")); ac = new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices" + this, TQ_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices" ); ac->setWhatsThis(i18n("Select a sub-collection to display")); mSchemaListAction = new SchemaListAction( - i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" + i18n("&Schemas"), this, TQ_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" ); mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree.")); ac = new TDEAction( - i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()), + i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQ_SLOT(addTab()), actionCollection(), "newtab" ); mRemoveTabAction = new TDEAction( - i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()), + i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQ_SLOT(removeTab()), actionCollection(), "removecurrenttab" ); @@ -84,10 +84,10 @@ 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(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&))); + connect(jumpAction->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(jumpTextChanged(const TQString&))); } - KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection()); applyMainWindowSettings(TDEGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); @@ -151,7 +151,7 @@ void View::configureToolBars() { saveMainWindowSettings(TDEGlobal::config(), "Oblique View"); KEditToolbar dlg(actionCollection(), "obliqueui.rc"); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig())); dlg.exec(); } diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index 3b67678..2135d8e 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -46,10 +46,10 @@ PitchableSpeed::PitchableSpeed() : Plugin(), offsetInput->setRange(-5,15,1,false); offsetInput->setValue(offset); setupSliderRange(); - connect(napp->player(), TQT_SIGNAL(changed()), - this, TQT_SLOT(newSong())); - connect(preserveFrequencies, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(preserveFrequenciesChanged(bool))); + connect(napp->player(), TQ_SIGNAL(changed()), + this, TQ_SLOT(newSong())); + connect(preserveFrequencies, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(preserveFrequenciesChanged(bool))); //show(); } @@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow) void PitchableSpeed::init() { pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"), - this, TQT_SLOT(toggle(void))); + this, TQ_SLOT(toggle(void))); } void PitchableSpeed::toggle(void) diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index d32bb17..bf6209b 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -52,8 +52,8 @@ SynaePrefs::SynaePrefs(TQObject *parent) layout->addStretch(); changed=false; - connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); - connect(yRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); + connect(xRes, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanges())); + connect(yRes, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanges())); } void SynaePrefs::save() diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp index 1249953..3d143dd 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, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(processExited(TDEProcess *))); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), - this, TQT_SLOT(receivedStdout(TDEProcess *,char *,int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), - this, TQT_SLOT(receivedStderr(TDEProcess *,char *,int))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this, TQ_SLOT(receivedStdout(TDEProcess *,char *,int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this, TQ_SLOT(receivedStderr(TDEProcess *,char *,int))); } SynaeScope::~SynaeScope() @@ -46,7 +46,7 @@ void SynaeScope::init() mPrefs = new SynaePrefs(this); mPrefs->reopen(); mPrefs->save(); - connect(mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig())); + connect(mPrefs, TQ_SIGNAL(configChanged()), this, TQ_SLOT(readConfig())); scopeExePath = TDEStandardDirs::findExe("noatunsynaescope.bin"); if (scopeExePath.isEmpty()) diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index aadc8c8..5e20dd6 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -48,14 +48,14 @@ SynaeScope::SynaeScope() SynaeScope::~SynaeScope() { - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); napp->pluginMenuRemove(pluginMenuItem); } void SynaeScope::init() { - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int))); - pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(read(TDEProcess *, char *, int))); + pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQ_SLOT(toggle(void))); process << TDEStandardDirs::findExe("noatuntippecanoe.bin"); diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp index d7690bb..5eb7073 100644 --- a/noatun-plugins/tyler/tyler.cpp +++ b/noatun-plugins/tyler/tyler.cpp @@ -40,7 +40,7 @@ Tyler::~Tyler() void Tyler::init() { process << TDEStandardDirs::findExe("noatuntyler.bin"); - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index 8178ba1..41118ec 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -68,12 +68,12 @@ WaveCapture::WaveCapture() : TQObject(0,0), Plugin(), newSong(); - connect( _timer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAs() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), TQ_SLOT( saveAs() ) ); - 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())); + connect(napp->player(), TQ_SIGNAL(changed()), TQ_SLOT(newSong())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(playing())); + connect(napp->player(), TQ_SIGNAL( paused()), TQ_SLOT( paused())); } WaveCapture::~WaveCapture() @@ -91,7 +91,7 @@ WaveCapture::~WaveCapture() void WaveCapture::init() { - pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, TQT_SLOT( toggle() ) ); + pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, TQ_SLOT( toggle() ) ); napp->pluginMenu()->setCheckable( true ); } @@ -142,7 +142,7 @@ void WaveCapture::saveAs() TDERecentDocument::add( url ); m_job = TDEIO::file_move( KURL( filename2 ), url, -1, true ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( copyFinished( TDEIO::Job* ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( copyFinished( TDEIO::Job* ) ) ); } else { diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp index 06935af..2b5a911 100644 --- a/renamedlgplugins/audio/audiopreview.cpp +++ b/renamedlgplugins/audio/audiopreview.cpp @@ -53,7 +53,7 @@ AudioPreview::AudioPreview( TQWidget *parent, const char *name, const TQString & 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, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(downloadFile(const TQString&))); + connect(label, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(downloadFile(const TQString&))); pic = label; } else { description = new TQLabel(this ); diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp index 9cbca24..078dd7e 100644 --- a/renamedlgplugins/images/imagevisualizer.cpp +++ b/renamedlgplugins/images/imagevisualizer.cpp @@ -45,7 +45,7 @@ ImageVisualizer::ImageVisualizer( TQWidget *parent, const char *name, const TQSt 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, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(downloadImage(const TQString&))); + connect(label, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(downloadImage(const TQString&))); pic = label; description = new TQLabel(this); description->adjustSize( ); diff --git a/tdefile-plugins/lnk/lnkforward.cpp b/tdefile-plugins/lnk/lnkforward.cpp index 5cf72df..4cd82f6 100644 --- a/tdefile-plugins/lnk/lnkforward.cpp +++ b/tdefile-plugins/lnk/lnkforward.cpp @@ -109,8 +109,8 @@ int LNKForwarder::run(TDECmdLineArgs *args) kdDebug(7034) << "running:" << path << endl; KRun * run = new KRun(path); - TQObject::connect(run, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedQuit())); - TQObject::connect(run, TQT_SIGNAL(error()), this, TQT_SLOT(delayedQuit())); + TQObject::connect(run, TQ_SIGNAL(finished()), this, TQ_SLOT(delayedQuit())); + TQObject::connect(run, TQ_SIGNAL(error()), this, TQ_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 TDEProcessRunner, if that was the case. - TQTimer::singleShot(2000, this, TQT_SLOT(deref())); + TQTimer::singleShot(2000, this, TQ_SLOT(deref())); } //-------------------------------------------------------------------------------- |