From a8207be921513da0ccccf41e36e056736c2b8457 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 7 Dec 2023 13:47:28 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 6 Signed-off-by: Michele Calgaro --- src/common/gui/hexword_gui.cpp | 2 +- src/devices/gui/memory_editor.cpp | 2 +- src/devices/pic/gui/pic_memory_editor.cpp | 6 +- src/libgui/console.cpp | 2 +- src/libgui/hex_editor.cpp | 8 +- src/libgui/likeback.cpp | 12 +-- src/libgui/project_manager.cpp | 38 ++++---- src/libgui/text_editor.cpp | 2 +- src/libgui/toplevel.cpp | 110 +++++++++++----------- src/progs/gui/prog_group_ui.cpp | 12 +-- src/progs/icd2/gui/icd2_group_ui.cpp | 2 +- 11 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp index 9a2a8ea..01a5f8d 100644 --- a/src/common/gui/hexword_gui.cpp +++ b/src/common/gui/hexword_gui.cpp @@ -32,7 +32,7 @@ GenericHexWordEditor::GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQW : KLineEdit(parent, "hex_word_editor"), _nbChars(nbChars), _hasBlankValue(hasBlankValue) { setFocusPolicy(TQWidget::ClickFocus); - setValidator(new HexValueValidator(nbChars, TQT_TQOBJECT(this))); + setValidator(new HexValueValidator(nbChars, this)); connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotTextChanged())); setFrame(false); } diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp index 308bcbf..db53341 100644 --- a/src/devices/gui/memory_editor.cpp +++ b/src/devices/gui/memory_editor.cpp @@ -300,7 +300,7 @@ void Device::MemoryTypeEditor::init(bool first) for (uint i=0; iappendSeparator(); diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp index 1da730e..0c9e188 100644 --- a/src/devices/pic/gui/pic_memory_editor.cpp +++ b/src/devices/pic/gui/pic_memory_editor.cpp @@ -38,10 +38,10 @@ Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *parent) { button = new PopupButton(text, parent); TDEActionCollection *ac = 0; - TDEAction *a = new TDEAction(i18n("Go to start"), "go-top", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoStart()), ac); + TDEAction *a = new TDEAction(i18n("Go to start"), "go-top", 0, parent, TQT_SLOT(gotoStart()), ac); actions.append(a); button->appendAction(a); - a = new TDEAction(i18n("Go to end"), "go-bottom", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoEnd()), ac); + a = new TDEAction(i18n("Go to end"), "go-bottom", 0, parent, TQT_SLOT(gotoEnd()), ac); actions.append(a); button->appendAction(a); label = new TQLabel(parent); @@ -317,7 +317,7 @@ void Pic::MemoryUserIdEditor::init(bool first) { MemoryTypeRangeEditor::init(first); _setToChecksum = new TDEToggleAction(i18n("Set to unprotected checksum"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection()); + this, TQT_SLOT(toggleSetToChecksum()), Main::toplevel().actionCollection()); addAction(_setToChecksum); if ( readConfigEntry(BaseGlobalConfig::UserIdSetToChecksum).toBool() && memory().isClear(MemoryRangeType::UserId) ) { _setToChecksum->activate(); diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp index 693b831..58830a8 100644 --- a/src/libgui/console.cpp +++ b/src/libgui/console.cpp @@ -32,7 +32,7 @@ void ConsoleView::showEvent(TQShowEvent *e) top->addWidget(label); return; } else { - TQWidget *pwidget = static_cast(factory->create(TQT_TQOBJECT(this), "konsole"))->widget(); + TQWidget *pwidget = static_cast(factory->create(this, "konsole"))->widget(); pwidget->show(); top->addWidget(pwidget); setFocusProxy(pwidget); diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp index bae5c99..a0f11fb 100644 --- a/src/libgui/hex_editor.cpp +++ b/src/libgui/hex_editor.cpp @@ -30,13 +30,13 @@ //----------------------------------------------------------------------------- HexEditorPart::HexEditorPart(HexEditor *editor) - : KParts::ReadWritePart(TQT_TQOBJECT(editor), "hex_editor_part") + : KParts::ReadWritePart(editor, "hex_editor_part") { setXMLFile("hexeditorpartui.rc"); - (void)KStdAction::save(TQT_TQOBJECT(editor), TQT_SLOT(save()), actionCollection()); - (void)KStdAction::saveAs(TQT_TQOBJECT(editor), TQT_SLOT(saveAs()), actionCollection()); - (void)new TDEToggleAction(i18n("Read Only Mode"), 0, 0, TQT_TQOBJECT(editor), TQT_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock"); + (void)KStdAction::save(editor, TQT_SLOT(save()), actionCollection()); + (void)KStdAction::saveAs(editor, TQT_SLOT(saveAs()), actionCollection()); + (void)new TDEToggleAction(i18n("Read Only Mode"), 0, 0, editor, TQT_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock"); } void HexEditorPart::setReadWrite(bool rw) diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index 4a440b9..02e2fc4 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -131,7 +131,7 @@ void LikeBack::doNotHelpAnymore() { disable(); int result = KMessageBox::questionYesNo( - TQT_TQWIDGET(kapp->activeWindow()), + kapp->activeWindow(), i18n("Are you sure you do not want to participate anymore in the application enhancing program?"), i18n("Do not Help Anymore")); if (result == KMessageBox::No) { @@ -276,7 +276,7 @@ void LikeBack::autoMove() { static TQWidget *lastWindow = 0; - TQWidget *window = TQT_TQWIDGET(kapp->activeWindow()); + TQWidget *window = kapp->activeWindow(); // When a Kicker applet has the focus, like the Commandline TQLineEdit, // the systemtray icon indicates to be the current window and the LikeBack is shown next to the system tray icon. // It's obviously bad ;-) : @@ -322,7 +322,7 @@ void LikeBack::configure() TQString LikeBack::activeWindowPath() { TQStringList windowNames; - TQWidget *window = TQT_TQWIDGET(kapp->activeWindow()); + TQWidget *window = kapp->activeWindow(); while (window) { TQString name = window->name(); if (name == "unnamed") @@ -386,7 +386,7 @@ void LikeBack::askEMail() //TQString namedMailExpString = "[.]*[ \\t]+<" + mailExpString + ">"; //TQRegExp mailExp("^(|" + mailExpString + "|" + namedMailExpString + ")$"); TQRegExp mailExp("^(|" + mailExpString + ")$"); - TQRegExpValidator emailValidator(mailExp, TQT_TQOBJECT(this)); + TQRegExpValidator emailValidator(mailExp, this); disable(); TQString email = KInputDialog::getText( @@ -396,7 +396,7 @@ void LikeBack::askEMail() "

" + i18n("The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case.") + "

" + "

" + i18n("You can change or remove your email address whenever you want. For that, use the little arrow icon at the top-right corner of a window.") + "

" + "

" + i18n("Your email address (keep empty to post comments anonymously):"), - currentEMailAddress, &ok, TQT_TQWIDGET(kapp->activeWindow()), /*name=*/(const char*)0, &emailValidator); + currentEMailAddress, &ok, kapp->activeWindow(), /*name=*/(const char*)0, &emailValidator); enable(); if (ok) @@ -503,7 +503,7 @@ void LikeBack::endFetchingEmailFrom() /** class LikeBackDialog: */ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQString context) - : KDialog(TQT_TQWIDGET(kapp->activeWindow()), "_likeback_feedback_window_") + : KDialog(kapp->activeWindow(), "_likeback_feedback_window_") , m_reason(reason) , m_windowName(windowName) , m_context(context) diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp index bacf98a..fd10d0d 100644 --- a/src/libgui/project_manager.cpp +++ b/src/libgui/project_manager.cpp @@ -38,13 +38,13 @@ ProjectManager::View::View(TQWidget *parent) : ListView(parent, "project_manager"), _project(0), _modified(false) { - connect(TQT_TQOBJECT(this), TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), TQT_SLOT(clicked(int, TQListViewItem *, const TQPoint &, int))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(contextMenu(TQListViewItem *, const TQPoint &, int))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), + connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), TQT_SLOT(renamed(TQListViewItem *, int, const TQString &))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(filesReordered())); + connect(this, TQT_SIGNAL(moved()), TQT_SLOT(filesReordered())); header()->hide(); setSorting(-1); @@ -54,7 +54,7 @@ ProjectManager::View::View(TQWidget *parent) setAcceptDrops(true); setDragEnabled(true); setDropVisualizer(true); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(init()));; + TQTimer::singleShot(0, this, TQT_SLOT(init()));; } ProjectManager::View::~View() @@ -178,8 +178,8 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i RootItem *ri = static_cast(item); if ( _project==0 ) { if ( ri->url().isEmpty() ) { - pop.insertItem("piklab_createproject", i18n("New Project..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(newProject())); - pop.insertItem("piklab_openproject", i18n("Open Project..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(openProject())); + pop.insertItem("piklab_createproject", i18n("New Project..."), &Main::toplevel(), TQT_SLOT(newProject())); + pop.insertItem("piklab_openproject", i18n("Open Project..."), &Main::toplevel(), TQT_SLOT(openProject())); pop.exec(p); } else { pop.insertTitle(i18n("Standalone File")); @@ -188,16 +188,16 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i } } else { pop.insertTitle(i18n("Project")); - pop.insertItem("configure", i18n("Options..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(configureProject())); - pop.insertItem("edit-find", i18n("Find Files..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(runKfind())); + pop.insertItem("configure", i18n("Options..."), &Main::toplevel(), TQT_SLOT(configureProject())); + pop.insertItem("edit-find", i18n("Find Files..."), &Main::toplevel(), TQT_SLOT(runKfind())); pop.insertSeparator(); - pop.insertItem("piklab_compile", i18n("Build Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(buildProject())); - pop.insertItem("trashcan_empty", i18n("Clean Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(cleanBuild())); + pop.insertItem("piklab_compile", i18n("Build Project"), &Main::toplevel(), TQT_SLOT(buildProject())); + pop.insertItem("trashcan_empty", i18n("Clean Project"), &Main::toplevel(), TQT_SLOT(cleanBuild())); pop.insertSeparator(); - pop.insertItem("document-new", i18n("New Source File..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(newSourceFile())); - pop.insertItem("piklab_addfile", i18n("Add Source Files..."), TQT_TQOBJECT(this), TQT_SLOT(insertSourceFiles())); - pop.insertItem("piklab_addfile", i18n("Add Object Files..."), TQT_TQOBJECT(this), TQT_SLOT(insertObjectFiles())); - if ( Main::currentEditor() ) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), TQT_TQOBJECT(this), TQT_SLOT(insertCurrentFile())); + pop.insertItem("document-new", i18n("New Source File..."), &Main::toplevel(), TQT_SLOT(newSourceFile())); + pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQT_SLOT(insertSourceFiles())); + pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQT_SLOT(insertObjectFiles())); + if ( Main::currentEditor() ) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), this, TQT_SLOT(insertCurrentFile())); pop.exec(p); } } else if ( item->rtti()==FileRtti ) { @@ -211,15 +211,15 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i if ( _project==0 ) return; if ( group==LinkerObjectGroup ) { pop.insertTitle(i18n("Objects")); - pop.insertItem("piklab_addfile", i18n("Add Object Files..."), TQT_TQOBJECT(this), TQT_SLOT(insertObjectFiles())); + pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, TQT_SLOT(insertObjectFiles())); pop.exec(p); } else if ( group==SourceGroup || group==HeaderGroup ) { pop.insertTitle(i18n("Sources")); - pop.insertItem("document-new", i18n("New File..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(newSourceFile())); - pop.insertItem("piklab_addfile", i18n("Add Source Files..."), TQT_TQOBJECT(this), TQT_SLOT(insertSourceFiles())); + pop.insertItem("document-new", i18n("New File..."), &Main::toplevel(), TQT_SLOT(newSourceFile())); + pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, TQT_SLOT(insertSourceFiles())); pop.exec(p); } else if ( group==DeviceGroup ) { - pop.insertItem("document-new", i18n("Select Device..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(showDeviceInfo())); + pop.insertItem("document-new", i18n("Select Device..."), &Main::toplevel(), TQT_SLOT(showDeviceInfo())); pop.exec(p); } } diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index 34efcd7..bad8ee0 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -47,7 +47,7 @@ TextEditor::TextEditor(bool withDebugger, TQWidget *parent, const char *name) { KLibFactory *factory = KLibLoader::self()->factory("libkatepart"); if ( factory==0 ) tqFatal("Could not find katepart"); - _document = static_cast(factory->create(TQT_TQOBJECT(this), "kate", "KTextEditor::Document")); + _document = static_cast(factory->create(this, "kate", "KTextEditor::Document")); _oldModified = _document->isModified(); _oldReadOnly = !_document->isReadWrite(); diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index 591f166..9244d20 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -120,7 +120,7 @@ MainWindow::MainWindow() KDockWidget *dock = createDock("project_manager_dock_widget", PURL::icon(PURL::Project), i18n("Project Manager"), DockPosition(KDockWidget::DockLeft, 20)); Main::_projectManager = new ProjectManager::View(dock); - connect(TQT_TQOBJECT(Main::_projectManager), TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); + connect(Main::_projectManager, TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); dock->setWidget(Main::_projectManager); dock = createDock("watch_view_dock_widget", loader.loadIcon("viewmag", TDEIcon::Small), @@ -130,9 +130,9 @@ MainWindow::MainWindow() Main::_editorManager = new EditorManager(_mainDock); _mainDock->setWidget(Main::_editorManager); - connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); - connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(modified(const PURL::Url &)), TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(modified(const PURL::Url &))); - connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &))); + connect(Main::_editorManager, TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); + connect(Main::_editorManager, TQT_SIGNAL(modified(const PURL::Url &)), Main::_projectManager, TQT_SLOT(modified(const PURL::Url &))); + connect(Main::_editorManager, TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &))); dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", TDEIcon::Small), i18n("Compile Log"), DockPosition(KDockWidget::DockBottom, 80)); @@ -158,7 +158,7 @@ MainWindow::MainWindow() dock->setWidget(Main::_consoleView); // managers - Programmer::manager = new Programmer::GuiManager(TQT_TQOBJECT(this)); + Programmer::manager = new Programmer::GuiManager(this); Programmer::manager->setView(_programLog); connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &))); connect(Programmer::manager, TQT_SIGNAL(showProgress(bool)), TQT_SLOT(showProgress(bool))); @@ -170,7 +170,7 @@ MainWindow::MainWindow() connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQT_SLOT(setText(const TQString &))); connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &))); - Main::_compileManager = new Compile::Manager(TQT_TQOBJECT(this)); + Main::_compileManager = new Compile::Manager(this); Main::_compileManager->setView(Main::_compileLog); connect(Main::_compileManager, TQT_SIGNAL(success()), TQT_SLOT(compileSuccess())); connect(Main::_compileManager, TQT_SIGNAL(failure()), TQT_SLOT(compileFailure())); @@ -179,34 +179,34 @@ MainWindow::MainWindow() // actions // file actions - TDEAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newSourceFile()), actionCollection()); + TDEAction *a = KStdAction::openNew(this, TQT_SLOT(newSourceFile()), actionCollection()); a->setText(i18n("&New Source File...")); - (void)new TDEAction(i18n("New hex File..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newHexFile()), + (void)new TDEAction(i18n("New hex File..."), "document-new", 0, this, TQT_SLOT(newHexFile()), actionCollection(), "file_new_hex"); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openFile()), actionCollection()); - TDERecentFilesAction *recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecentFile(const KURL &)), actionCollection()); + KStdAction::open(this, TQT_SLOT(openFile()), actionCollection()); + TDERecentFilesAction *recent = KStdAction::openRecent(this, TQT_SLOT(openRecentFile(const KURL &)), actionCollection()); recent->setMaxItems(20); recent->loadEntries(kapp->config(), "recent-files"); - (void)new TDEAction(i18n("Save All"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(saveAllFiles()), + (void)new TDEAction(i18n("Save All"), 0, 0, Main::_editorManager, TQT_SLOT(saveAllFiles()), actionCollection(), "file_save_all"); - KStdAction::close(TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeCurrentEditor()), actionCollection()); - (void)new TDEAction(i18n("C&lose All"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeAllEditors()), + KStdAction::close(Main::_editorManager, TQT_SLOT(closeCurrentEditor()), actionCollection()); + (void)new TDEAction(i18n("C&lose All"), 0, 0, Main::_editorManager, TQT_SLOT(closeAllEditors()), actionCollection(), "file_close_all"); - (void)new TDEAction(i18n("Close All Others"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeAllOtherEditors()), + (void)new TDEAction(i18n("Close All Others"), 0, 0, Main::_editorManager, TQT_SLOT(closeAllOtherEditors()), actionCollection(), "file_closeother"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); // edit actions // view actions (void)new TDEAction(i18n("Back"), "back", TQt::ALT + TQt::Key_Left, - TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(goBack()), actionCollection(), "history_back"); + Main::_editorManager, TQT_SLOT(goBack()), actionCollection(), "history_back"); (void)new TDEAction(i18n("Forward"), "forward", TQt::ALT + TQt::Key_Right, - TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(goForward()), actionCollection(), "history_forward"); + Main::_editorManager, TQT_SLOT(goForward()), actionCollection(), "history_forward"); (void)new TDEAction(i18n("Switch to..."), 0, TQt::CTRL + TQt::Key_Slash, - TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(switchToEditor()), actionCollection(), "file_switchto"); + Main::_editorManager, TQT_SLOT(switchToEditor()), actionCollection(), "file_switchto"); (void)new TDEAction(i18n("Switch Header/Implementation"), 0, TQt::SHIFT + TQt::Key_F12, - TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(switchHeaderImplementation()), actionCollection(), "view_switch_source"); + Main::_editorManager, TQT_SLOT(switchHeaderImplementation()), actionCollection(), "view_switch_source"); (void)new TDEAction(TQString(), 0, 0, Debugger::manager, TQT_SLOT(toggleBreakpoint()), actionCollection(), "toggle_breakpoint"); (void)new TDEAction(TQString(), 0, 0, @@ -216,7 +216,7 @@ MainWindow::MainWindow() TDEActionMenu *toolViewsMenu = new TDEActionMenu( i18n("Tool Views"), 0, "view_tool_views"); connect(toolViewsMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateToolViewsActions())); actionCollection()->insert(toolViewsMenu); - a = new TDEAction(i18n("&Reset Layout"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout"); + a = new TDEAction(i18n("&Reset Layout"), 0, 0, this, TQT_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout"); toolViewsMenu->insert(a); toolViewsMenu->popupMenu()->insertSeparator(); TQValueList::iterator it; @@ -224,33 +224,33 @@ MainWindow::MainWindow() // project actions (void)new TDEAction(i18n("New Project..."), "piklab_createproject", 0, - TQT_TQOBJECT(this), TQT_SLOT(newProject()), actionCollection(), "project_new"); + this, TQT_SLOT(newProject()), actionCollection(), "project_new"); (void)new TDEAction(i18n("Open Project..."), "piklab_openproject", 0, - TQT_TQOBJECT(this), TQT_SLOT(openProject()), actionCollection(), "project_open"); + this, TQT_SLOT(openProject()), actionCollection(), "project_open"); recent = new TDERecentFilesAction(i18n("Open Recent Project"), 0, - TQT_TQOBJECT(this), TQT_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent"); + this, TQT_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent"); recent->setMaxItems(20); recent->loadEntries(kapp->config(), "recent-projects"); (void)new TDEAction(i18n("Project Options..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(configureProject()), actionCollection(), "project_options"); + this, TQT_SLOT(configureProject()), actionCollection(), "project_options"); (void)new TDEAction(i18n("Close Project"), "window-close", 0, - TQT_TQOBJECT(this), TQT_SLOT(closeProject()), actionCollection(), "project_close"); + this, TQT_SLOT(closeProject()), actionCollection(), "project_close"); (void)new TDEAction(i18n("Add Source File..."), "piklab_addfile", 0, - TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file"); + Main::_projectManager, TQT_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file"); (void)new TDEAction(i18n("Add Object File..."), "piklab_addfile", 0, - TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(insertObjectFiles()), actionCollection(), "project_add_object_file"); + Main::_projectManager, TQT_SLOT(insertObjectFiles()), actionCollection(), "project_add_object_file"); (void)new TDEAction(i18n("Add Current File"), "piklab_addcurrentfile", 0, - TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(insertCurrentFile()), actionCollection(), "project_add_current_file"); + Main::_projectManager, TQT_SLOT(insertCurrentFile()), actionCollection(), "project_add_current_file"); // build actions (void)new TDEAction(i18n("&Build Project"), "piklab_compile", TQt::Key_F8, - TQT_TQOBJECT(this), TQT_SLOT(buildProject()), actionCollection(), "build_build_project"); + this, TQT_SLOT(buildProject()), actionCollection(), "build_build_project"); (void)new TDEAction(i18n("&Compile File"), 0, TQt::SHIFT + TQt::Key_F8, - TQT_TQOBJECT(this), TQT_SLOT(compileFile()), actionCollection(), "build_compile_file"); + this, TQT_SLOT(compileFile()), actionCollection(), "build_compile_file"); (void)new TDEAction(i18n("Clean"), "trashcan_empty", 0, - TQT_TQOBJECT(this), TQT_SLOT(cleanBuild()), actionCollection(), "build_clean"); + this, TQT_SLOT(cleanBuild()), actionCollection(), "build_clean"); (void)new TDEAction(i18n("Stop"), "process-stop", 0, - TQT_TQOBJECT(this), TQT_SLOT(stopBuild()), actionCollection(), "build_stop"); + this, TQT_SLOT(stopBuild()), actionCollection(), "build_stop"); // programmer actions (void)new TDEAction(i18n("&Connect"), "connect_creating", 0, @@ -260,15 +260,15 @@ MainWindow::MainWindow() (void)new TDEAction(i18n("&Disconnect"), "connect_no", 0, Programmer::manager, TQT_SLOT(disconnectDevice()), actionCollection(), "prog_disconnect"); (void)new TDEAction(i18n("&Program"), "piklab_burnchip", TQt::SHIFT + TQt::Key_F5, - TQT_TQOBJECT(this), TQT_SLOT(program()), actionCollection(), "prog_program"); + this, TQT_SLOT(program()), actionCollection(), "prog_program"); (void)new TDEAction(i18n("&Verify"), "piklab_verifychip", TQt::SHIFT + TQt::Key_F6, - TQT_TQOBJECT(this), TQT_SLOT(verify()), actionCollection(), "prog_verify"); + this, TQT_SLOT(verify()), actionCollection(), "prog_verify"); (void)new TDEAction(i18n("&Read"), "piklab_readchip", TQt::SHIFT + TQt::Key_F7, - TQT_TQOBJECT(this), TQT_SLOT(read()), actionCollection(), "prog_read"); + this, TQT_SLOT(read()), actionCollection(), "prog_read"); (void)new TDEAction(i18n("&Erase"), "piklab_erasechip", 0, - TQT_TQOBJECT(this), TQT_SLOT(erase()), actionCollection(), "prog_erase"); + this, TQT_SLOT(erase()), actionCollection(), "prog_erase"); (void)new TDEAction(i18n("&Blank Check"), "piklab_blankcheck", 0, - TQT_TQOBJECT(this), TQT_SLOT(blankCheck()), actionCollection(), "prog_blank_check"); + this, TQT_SLOT(blankCheck()), actionCollection(), "prog_blank_check"); (void)new TDEAction(i18n("&Run"), "launch", TQt::SHIFT + TQt::Key_F9, Programmer::manager, TQT_SLOT(run()), actionCollection(), "prog_run"); (void)new TDEAction(i18n("&Stop"), "piklab_stop", 0, @@ -278,7 +278,7 @@ MainWindow::MainWindow() (void)new TDEAction(i18n("&Advanced..."), 0, 0, Programmer::manager , TQT_SLOT(showAdvancedDialog()), actionCollection(), "prog_advanced"); (void)new TDEAction(i18n("Settings..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(showProgrammerSettings()), actionCollection(), "prog_settings"); + this, TQT_SLOT(showProgrammerSettings()), actionCollection(), "prog_settings"); // debugger actions (void)new TDEAction(i18n("&Start"), "launch", TQt::SHIFT + TQt::Key_F9, @@ -288,9 +288,9 @@ MainWindow::MainWindow() (void)new TDEAction(i18n("&Step"), "piklab_debug_step", 0, Programmer::manager, TQT_SLOT(step()), actionCollection(), "debug_next"); //(void)new TDEAction(i18n("Step &In"), "piklab_debug_stepin", - // 0, TQT_TQOBJECT(this), TQT_SLOT(debugStepIn()), actionCollection(), "debug_step_in"); + // 0, this, TQT_SLOT(debugStepIn()), actionCollection(), "debug_step_in"); //(void)new TDEAction(i18n("Step &Out"), "piklab_debug_stepout", - // 0, TQT_TQOBJECT(this), TQT_SLOT(debugStepOut()), actionCollection(), "debug_step_out"); + // 0, this, TQT_SLOT(debugStepOut()), actionCollection(), "debug_step_out"); (void)new TDEAction(i18n("&Break", "&Halt"), "piklab_debughalt", 0, Programmer::manager, TQT_SLOT(halt()), actionCollection(), "debug_halt"); (void)new TDEAction(i18n("&Disconnect/Stop"), "piklab_stop", 0, @@ -302,28 +302,28 @@ MainWindow::MainWindow() (void)new TDEAction(i18n("Clear All Breakpoints"), "remove", 0, Debugger::manager, TQT_SLOT(clearBreakpoints()), actionCollection(), "debug_clear_breakpoints"); (void)new TDEAction(i18n("Settings..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(showDebuggerSettings()), actionCollection(), "debug_settings"); + this, TQT_SLOT(showDebuggerSettings()), actionCollection(), "debug_settings"); // tools (void)new TDEAction(i18n("&Pikloops..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(runPikloops()), actionCollection(), "tools_pikloops"); + this, TQT_SLOT(runPikloops()), actionCollection(), "tools_pikloops"); (void)new TDEAction(i18n("&Find Files..."), "edit-find", 0, - TQT_TQOBJECT(this), TQT_SLOT(runKfind()), actionCollection(), "tools_kfind"); + this, TQT_SLOT(runKfind()), actionCollection(), "tools_kfind"); (void)new TDEAction(i18n("&Device Information..."), "application-vnd.tde.info", 0, - TQT_TQOBJECT(this), TQT_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information"); + this, TQT_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information"); (void)new TDEAction(i18n("&Config Generator..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(configGenerator()), actionCollection(), "tools_config_generator"); + this, TQT_SLOT(configGenerator()), actionCollection(), "tools_config_generator"); (void)new TDEAction(i18n("&Template Generator..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(templateGenerator()), actionCollection(), "tools_template_generator"); + this, TQT_SLOT(templateGenerator()), actionCollection(), "tools_template_generator"); // settings actions (void)new TDEAction(i18n("Configure Toolchains..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(configureToolchains()), actionCollection(), "options_configure_toolchains"); - (void)KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection()); + this, TQT_SLOT(configureToolchains()), actionCollection(), "options_configure_toolchains"); + (void)KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection()); // help (void)new TDEAction(i18n("Report Bug..."), "likeback_bug", 0, - TQT_TQOBJECT(LikeBack::instance()), TQT_SLOT(iFoundABug()), actionCollection(), "help_report_bug_piklab"); + LikeBack::instance(), TQT_SLOT(iFoundABug()), actionCollection(), "help_report_bug_piklab"); setupGUI(); readDockConfig(); @@ -332,25 +332,25 @@ MainWindow::MainWindow() menuBar()->insertItem(new TQLabel(menuBar())); // #### first widget is put left-most... MenuBarButton *button = new MenuBarButton("likeback_like", menuBar()); TQToolTip::add(button, i18n("I like...")); - connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(LikeBack::instance()), TQT_SLOT(iLike())); + connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iLike())); menuBar()->insertItem(button); button = new MenuBarButton("likeback_dislike", menuBar()); TQToolTip::add(button, i18n("I do not like...")); - connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(LikeBack::instance()), TQT_SLOT(iDoNotLike())); + connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iDoNotLike())); menuBar()->insertItem(button); button = new MenuBarButton("likeback_bug", menuBar()); TQToolTip::add(button, i18n("I found a bug...")); - connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(LikeBack::instance()), TQT_SLOT(iFoundABug())); + connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(iFoundABug())); menuBar()->insertItem(button); button = new MenuBarButton("configure", menuBar()); TQToolTip::add(button, i18n("Configure email...")); - connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(LikeBack::instance()), TQT_SLOT(askEMail())); + connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(askEMail())); menuBar()->insertItem(button); button = new MenuBarButton("help", menuBar()); - connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(LikeBack::instance()), TQT_SLOT(showWhatsThisMessage())); + connect(button, TQT_SIGNAL(clicked()), LikeBack::instance(), TQT_SLOT(showWhatsThisMessage())); menuBar()->insertItem(button); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(initialLoading())); + TQTimer::singleShot(0, this, TQT_SLOT(initialLoading())); } MainWindow::~MainWindow() diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp index ebec9ce..80f8ac3 100644 --- a/src/progs/gui/prog_group_ui.cpp +++ b/src/progs/gui/prog_group_ui.cpp @@ -31,9 +31,9 @@ Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor void Programmer::StandaloneMemoryCalibrationEditor::init(bool first) { Pic::MemoryCalibrationEditor::init(first); - TDEAction *action = new TDEAction(i18n("Read"), "reload", 0, TQT_TQOBJECT(this), TQT_SIGNAL(updateCalibration()), Main::toplevel().actionCollection()); + TDEAction *action = new TDEAction(i18n("Read"), "reload", 0, this, TQT_SIGNAL(updateCalibration()), Main::toplevel().actionCollection()); addAction(action); - action = new TDEAction(i18n("Regenerating..."), 0, 0, TQT_TQOBJECT(this), TQT_SIGNAL(regenerate()), Main::toplevel().actionCollection()); + action = new TDEAction(i18n("Regenerating..."), 0, 0, this, TQT_SIGNAL(regenerate()), Main::toplevel().actionCollection()); addAction(action); } @@ -61,10 +61,10 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c Properties properties = _base.group().properties(); uint row = _programmerContainer->numRows(); if ( properties & HasFirmware ) { - _firmwareContainer = new ButtonContainer(i18n("Firmware"), TQT_TQOBJECT(this), TQT_SLOT(updateFirmware()), _programmerContainer); + _firmwareContainer = new ButtonContainer(i18n("Firmware"), this, TQT_SLOT(updateFirmware()), _programmerContainer); _programmerContainer->addWidget(_firmwareContainer, row,row, 0,1); if ( _base.group().properties() & CanUploadFirmware ) - _firmwareContainer->button().appendAction(i18n("Uploading..."), "piklab_burnchip", TQT_TQOBJECT(this), TQT_SLOT(uploadFirmware())); + _firmwareContainer->button().appendAction(i18n("Uploading..."), "piklab_burnchip", this, TQT_SLOT(uploadFirmware())); TQLabel *label = new TQLabel(i18n("Version:"), _firmwareContainer); _firmwareContainer->addWidget(label, 1,1, 0,0); _firmwareLabel = new TQLabel(_firmwareContainer); @@ -76,13 +76,13 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c } if ( _base.group().canReadVoltages() ) { - _voltagesContainer = new ButtonContainer(i18n("Voltages"), TQT_TQOBJECT(this), TQT_SLOT(updateVoltages()), _programmerContainer); + _voltagesContainer = new ButtonContainer(i18n("Voltages"), this, TQT_SLOT(updateVoltages()), _programmerContainer); _programmerContainer->addWidget(_voltagesContainer, row,row, 0,1); row++; } else _voltagesContainer = 0; if ( properties & HasSelfTest ) { - _selfTestContainer = new ButtonContainer(i18n("Self-test"), TQT_TQOBJECT(this), TQT_SLOT(updateSelfTest()), _programmerContainer); + _selfTestContainer = new ButtonContainer(i18n("Self-test"), this, TQT_SLOT(updateSelfTest()), _programmerContainer); _programmerContainer->addWidget(_selfTestContainer, row,row, 0,1); row++; } else _selfTestContainer = 0; diff --git a/src/progs/icd2/gui/icd2_group_ui.cpp b/src/progs/icd2/gui/icd2_group_ui.cpp index 4fbed5c..82987b4 100644 --- a/src/progs/icd2/gui/icd2_group_ui.cpp +++ b/src/progs/icd2/gui/icd2_group_ui.cpp @@ -26,7 +26,7 @@ Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *parent) row = _programmerContainer->numRows(); if ( base.group().properties() & ::Programmer::Debugger ) { - ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), TQT_TQOBJECT(this), TQT_SLOT(updateDebugExecutive()), _programmerContainer); + ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), this, TQT_SLOT(updateDebugExecutive()), _programmerContainer); _programmerContainer->addWidget(container, row,row, 0,1); label = new TQLabel(i18n("Version:"), container); container->addWidget(label, 1,1, 0,0);