diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 11cb218..23cdf2c 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -48,25 +48,25 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) board = 0; layout = 0; - (void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - (void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); - (void) KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); - (void) KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - (void) KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo"); - (void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); - - (void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger"); - (void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller"); - (void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); - (void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); - (void) new TDEAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up"); - (void) new TDEAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down"); - (void) new TDEAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left"); - (void) new TDEAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right"); + (void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + (void) KStdAction::open(this, TQT_SLOT(open()), actionCollection()); + (void) KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection()); + (void) KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + (void) KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); + (void) new 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"); recentAct = KStdAction::openRecent(0, 0, actionCollection()); - connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &))); + connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), this, TQT_SLOT(openRecent(const KURL &))); recentAct->loadEntries(TDEGlobal::config(), "Designer recent files"); estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); @@ -137,8 +137,8 @@ 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)), TQT_TQOBJECT(this), TQT_SLOT(goChanged(int))); - connect(editor, TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground())); + connect(editor, TQT_SIGNAL(goChecked(int)), this, TQT_SLOT(goChanged(int))); + connect(editor, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(updateBackground())); connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath())); layout->addWidget(editor); @@ -184,7 +184,7 @@ void AtlanticDesigner::openNew() groupsChanged(); updateBackground(); - TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(false); } @@ -198,8 +198,8 @@ ConfigEstate *AtlanticDesigner::newEstate(int i) estate->setChanged(false); estates.insert(i, estate); - connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(changeEstate(Estate *))); - connect(estate, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified())); + connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); + connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); board->addEstateView(estate); @@ -486,8 +486,8 @@ void AtlanticDesigner::openFile(const TQString &filename) estate->setPassMoney(passMoney); estates.append(estate); - connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(changeEstate(Estate *))); - connect(estate, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified())); + connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *))); + connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); i++; } else if (parseMode == Parse_Cards) @@ -545,7 +545,7 @@ void AtlanticDesigner::openFile(const TQString &filename) updateBackground(); updateJumpMenu(); - TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(false); } @@ -895,7 +895,7 @@ void AtlanticDesigner::larger() groupsChanged(); updateBackground(); - TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -934,7 +934,7 @@ void AtlanticDesigner::smaller() updateJumpMenu(); groupsChanged(); updateBackground(); - TQTimer::singleShot(500, TQT_TQOBJECT(this), TQT_SLOT(setPlayerAtBeginning())); + TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning())); doCaption(true); } @@ -957,8 +957,8 @@ void AtlanticDesigner::editGroups() groupEditor = new GroupEditor(&groups, this); groupEditor->show(); - connect(groupEditor, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(modified())); - connect(groupEditor, TQT_SIGNAL(update()), TQT_TQOBJECT(this), TQT_SLOT(groupsChanged())); + connect(groupEditor, TQT_SIGNAL(changed()), this, TQT_SLOT(modified())); + connect(groupEditor, TQT_SIGNAL(update()), this, TQT_SLOT(groupsChanged())); connect(groupEditor, TQT_SIGNAL(update()), editor, TQT_SLOT(groupsChanged())); } else @@ -1019,8 +1019,8 @@ void AtlanticDesigner::info() boardInfoDlg = new BoardInfoDlg(true, &boardInfo, this, "Board Information", false); boardInfoDlg->show(); - connect(boardInfoDlg, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground())); - connect(boardInfoDlg, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(modified())); + connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateBackground())); + connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(modified())); } else boardInfoDlg->raise(); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 55f4a17..b6c2084 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), - TQT_TQOBJECT(this), TQT_SLOT( slotNext() ), + this, TQT_SLOT( slotNext() ), actionCollection(), "make_right" ); (void) new TDEAction ( i18n("Previous Error"), TDEShortcut(ALT+CTRL+Key_Left), - TQT_TQOBJECT(this), TQT_SLOT( slotPrev() ), + this, TQT_SLOT( slotPrev() ), actionCollection(), "make_left" ); (void) new TDEAction ( i18n("Make"), TDEShortcut(ALT+Key_R), - TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), + this, TQT_SLOT( slotValidate() ), actionCollection(), "make_check" ); (void) new TDEAction ( i18n("Configure..."), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), + this, TQT_SLOT( slotConfigure() ), actionCollection(), "make_settings" ); setInstance(new TDEInstance("kate")); @@ -368,7 +368,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcExited(TDEProcess*))); connect(m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); + this, TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int))); TDEConfig c("katemakepluginrc"); diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 856cfbc..f6c173e 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -254,7 +254,7 @@ void KatePluginSnippetsView::readConfig() { lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); } // @@ -262,12 +262,12 @@ void KatePluginSnippetsView::readConfig() { sKey = "DEBUG variable"; sValue = "## < DEBUG >\nout \"
\\$ : \\\"$\\\"\\n
\"\n## \n"; lvi = insertItem(sKey, false); - lSnippets.append( new CSnippet(sKey, sValue, lvi, TQT_TQOBJECT(this)) ); + lSnippets.append( new CSnippet(sKey, sValue, lvi, this) ); sKey = "proc-header"; sValue = "## [created : ,
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index c314075..4ab18da 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -99,7 +99,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow { m_tmp_file=0; m_proc=0; - (void) new TDEAction ( i18n("Validate XML"), 0, TQT_TQOBJECT(this), + (void) new TDEAction ( i18n("Validate XML"), 0, this, TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" ); // TODO?: //(void) new TDEAction ( i18n("Indent XML"), 0, this, diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 91997b6..5dc353a 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -167,7 +167,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) m_picking = false; releaseMouse(); releaseKeyboard(); - TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget *desktop = TQApplication::desktop(); TQPixmap pm = TQPixmap::grabWindow(desktop->winId(), e->globalPos().x(), e->globalPos().y(), 1, 1); TQImage img = pm.convertToImage(); diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index dd6ec3c..93453e0 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -66,7 +66,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const TDEHTMLView* view = 0L; if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("TDEHTMLView")) - view = static_cast(TQT_TQWIDGET(popupmenu->parent())); + view = static_cast(popupmenu->parent()); if (view) m_part = view->part(); diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 8f698f3..f91bfd3 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -101,8 +101,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving* installEventFilter(m_listView); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(slotRefreshNode(const DOM::Node &))); - ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), TQT_TQOBJECT(this), TQT_SLOT(refresh())); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh())); initDOMNodeInfo(); @@ -1015,7 +1015,7 @@ void DOMTreeView::initDOMNodeInfo() connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent())); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); nodeAttributes->setRenameable(0, true); nodeAttributes->setRenameable(1, true); diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index 59628b4..1b59ba3 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -93,7 +93,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) TQT_SLOT(slotHtmlPartChanged(TDEHTMLPart *))); ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(addMessage(int, const TQString &))); + this, TQT_SLOT(addMessage(int, const TQString &))); infopanel_ctx = createInfoPanelAttrContextMenu(); domtree_ctx = createDOMTreeViewContextMenu(); @@ -119,17 +119,17 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd) void DOMTreeWindow::setupActions() { - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection())->setEnabled(false); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false); - KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false); + KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection())->setEnabled(false); + KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false); + KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false); m_commandHistory = new KCommandHistory(actionCollection()); - KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection()); + KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection()); + KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection()); // toggle manipulation dialog TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"), @@ -141,14 +141,14 @@ void DOMTreeWindow::setupActions() // actionCollection(), "custom_action"); // actions for the dom tree list view toolbar - KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); + KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); TDEAction *tree_inc_level = new TDEAction(i18n("Expand"), - "1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()), + "1rightarrow", CTRL+Key_Greater, view(), TQT_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, TQT_TQOBJECT(view()), + "1leftarrow", CTRL+Key_Less, view(), TQT_SLOT(decreaseExpansionDepth()), actionCollection(), "tree_dec_level"); tree_dec_level->setToolTip(i18n("Decrease expansion level")); @@ -156,20 +156,20 @@ void DOMTreeWindow::setupActions() // actions for the dom tree list view context menu del_tree = new TDEAction(i18n("&Delete"), "edit-delete", - Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()), + Key_Delete, view(), TQT_SLOT(deleteNodes()), actionCollection(), "tree_delete"); del_tree->setToolTip(i18n("Delete nodes")); /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."), - "bookmark", TDEShortcut(), TQT_TQOBJECT(view()), + "bookmark", TDEShortcut(), view(), TQT_SLOT(slotAddElementDlg()), actionCollection(), "tree_add_element"); /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."), - "text", TDEShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()), + "text", TDEShortcut(), view(), TQT_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, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()), + Key_Delete, view(), TQT_SLOT(deleteAttributes()), actionCollection(), "attr_delete"); del_attr->setToolTip(i18n("Delete attributes")); diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 35fe9c8..6b98470 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -50,7 +50,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new TDEAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this)); + action = new TDEAction(name, 0, this, TQT_SLOT(new_slot( ) ), this); } KDirMenu::~KDirMenu( ) { delete action; diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 3a8ecd4..aaec725 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, } - m_browse = new TDEAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) ); + m_browse = new TDEAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, continue; } TQString escapedDir = *it; - TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); + TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this); action->plug(this ); actions.append( action ); ++it; diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 397215f..65eba0b 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -94,7 +94,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, configurationChanged(); - KParts::MainWindow *mainWin = static_cast(TQT_TQWIDGET(parent)); + KParts::MainWindow *mainWin = static_cast(parent); //Grab the part manager. Don't know of any other way, and neither does Tronical, so.. KParts::PartManager *partMan = static_cast(mainWin->child(0, "KParts::PartManager")); @@ -413,7 +413,7 @@ void SearchBarPlugin::showSelectionMenu() } m_popupMenu->insertSeparator(); - m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu)); + m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu); TQStringList google_modes; google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never"); m_googleMenu->setItems(google_modes); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index ad20c07..f0945a9 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -34,7 +34,7 @@ KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) { - player = new Player(TQT_TQOBJECT(this)); + player = new Player(this); empty(); TQFont labelFont = time->font(); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 0a3c271..0645745 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -101,7 +101,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted())); connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &))); - functions = new MetabarFunctions(html, TQT_TQOBJECT(this)); + functions = new MetabarFunctions(html, this); currentPlugin = 0; defaultPlugin = new DefaultPlugin(html, functions); @@ -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(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); + TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); + TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQT_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 06a913a..b5186ab 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::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8()); + TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8()); action->plug(popup); } else{ diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index 38d31c1..1b88165 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -63,18 +63,18 @@ KSig::~KSig() void KSig::setupActions() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection()); - new TDEAction(i18n("Remove"), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove"); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); - - KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), actionCollection()); - new TDEAction(i18n("C&lear"), "edit-clear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear"); - - new TDEAction(i18n("Edit Standard Header"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editHeader()), actionCollection(), "editHeader"); - new TDEAction(i18n("Edit Standard Footer"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editFooter()), actionCollection(), "editFooter"); + 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"); } void KSig::setupLayout() @@ -96,9 +96,9 @@ void KSig::setupLayout() statusBar()->show(); updateListLock = false; - connect(sigEdit, TQT_SIGNAL(textChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateList())); - connect(sigList, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateEdit())); - connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), TQT_TQOBJECT(this), TQT_SLOT(updateStatus(int,int))); + connect(sigEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(updateList())); + connect(sigList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateEdit())); + connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), this, TQT_SLOT(updateStatus(int,int))); } void KSig::setupSearchLine() @@ -222,7 +222,7 @@ void KSig::editHeader() t->setLabel(i18n("Standard signature header:")); t->setText(header); - connect(t, TQT_SIGNAL(textUpdated(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(setHeader(const TQString &))); + connect(t, TQT_SIGNAL(textUpdated(const TQString &)), this, TQT_SLOT(setHeader(const TQString &))); t->exec(); } @@ -233,7 +233,7 @@ void KSig::editFooter() t->setLabel(i18n("Standard signature footer:")); t->setText(footer); - connect(t, TQT_SIGNAL(textUpdated(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(setFooter(const TQString &))); + connect(t, TQT_SIGNAL(textUpdated(const TQString &)), this, TQT_SLOT(setFooter(const TQString &))); t->exec(); } diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 4745e1f..1a3820c 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -118,7 +118,7 @@ AlsaPlayer::AlsaPlayer() connect ( - new AlsaPlayerConfigModule(TQT_TQOBJECT(this)), + new AlsaPlayerConfigModule(this), TQT_SIGNAL(saved()), TQT_SLOT(slotConfigChanged()) ); diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index f673fb1..a896cfa 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -189,7 +189,7 @@ Charlatan::Charlatan() connect ( - new CharlatanConfigModule(TQT_TQOBJECT(this)), + new CharlatanConfigModule(this), TQT_SIGNAL(saved()), TQT_SLOT(slotConfigChanged()) ); diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index 4107afd..c964979 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(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 2a955b4..56f64a6 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" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) ); - boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) ); - boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) ); - boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) ); + boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) ); + boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) ); + boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) ); + boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) ); boxButtons->layout(); boxlayout->addWidget( boxButtons ); diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index ad65194..4a552eb 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -27,28 +27,28 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) { lyrics = this; /* Create default actions */ - (void)KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - ( void )KStdAction::goTo( TQT_TQOBJECT(this), TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); - //(void)KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); - //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection()); - //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection()); - //(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); + (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); + //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection()); + //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection()); + //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection()); + //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection()); follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); - KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection()); + KStdAction::redisplay(this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection()); + back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); back_act->setEnabled(false); - forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection()); + forward_act = KStdAction::forward(this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); + site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); /* Add entry to menu */ - menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics())); + menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics())); /* Create history manager and htmlpart */ - history = new HistoryManager(TQT_TQOBJECT(this)); + history = new HistoryManager(this); htmlpart = new TDEHTMLPart(this); //htmlpart->view()->setMinimumSize(350, 420); @@ -73,7 +73,7 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) config->setGroup("Lyrics"); follow_act->setChecked(config->readBoolEntry("follow", true)); /* Create config object */ - new LyricsCModule(TQT_TQOBJECT(this)); + new LyricsCModule(this); } diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index b3bf45f..f7f8448 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -355,7 +355,7 @@ void SchemaConfig::editValueRegexp() { mRegexpEditor = KParts::ComponentFactory::createInstanceFromQuery( - "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) + "KRegExpEditor/KRegExpEditor", TQString(), this ); } diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index 84a46c8..cbf67c3 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -20,8 +20,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) (new SliceListAction( i18n("&Slices"), oblique, - TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)), - mFiles, TQT_TQOBJECT(this) + this, TQT_SLOT(toggleInSlice(Slice *)), + mFiles, this ))->plug(this); } @@ -52,8 +52,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) (new SliceListAction( i18n("&Slices"), oblique, - TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)), - mFiles,TQT_TQOBJECT(this) + this, TQT_SLOT(toggleInSlice(Slice *)), + mFiles,this ))->plug(this); } diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index d2d0a87..32210cd 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -42,9 +42,9 @@ View::View(Oblique *oblique) setCentralWidget(mTabs); TDEAction *ac; - ac = new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); + ac = new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files"); ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection.")); - ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); + ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); // ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); @@ -52,22 +52,22 @@ View::View(Oblique *oblique) ac = new SliceListAction( i18n("&Slices"), oblique, - TQT_TQOBJECT(this), TQT_SLOT(use(Slice*)), TQValueList(), actionCollection(), "slices" + this, TQT_SLOT(use(Slice*)), TQValueList(), actionCollection(), "slices" ); ac->setWhatsThis(i18n("Select a sub-collection to display")); mSchemaListAction = new SchemaListAction( - i18n("&Schemas"), TQT_TQOBJECT(this), TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" + i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" ); mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree.")); ac = new TDEAction( - i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()), + i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()), actionCollection(), "newtab" ); mRemoveTabAction = new TDEAction( - i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()), + i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()), actionCollection(), "removecurrenttab" ); @@ -87,7 +87,7 @@ View::View(Oblique *oblique) connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&))); } - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); applyMainWindowSettings(TDEGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index 54527bf..3b67678 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow) void PitchableSpeed::init() { pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"), - TQT_TQOBJECT(this), TQT_SLOT(toggle(void))); + this, TQT_SLOT(toggle(void))); } void PitchableSpeed::toggle(void) diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index a95658b..aadc8c8 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -55,7 +55,7 @@ SynaeScope::~SynaeScope() void SynaeScope::init() { connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int))); - pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void))); + pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void))); process << TDEStandardDirs::findExe("noatuntippecanoe.bin"); diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp index 3c9b616..06935af 100644 --- a/renamedlgplugins/audio/audiopreview.cpp +++ b/renamedlgplugins/audio/audiopreview.cpp @@ -115,7 +115,7 @@ void AudioPreview::initView( const TQString& mimeType ) description = new TQLabel(this); description->setText( desc ); description->adjustSize(); - m_player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(this) ); + m_player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", TQString(), this ); if ( m_player ) { static_cast(m_player)->openURL( url );