From 4bff0b57c61dcee5074d6dc0c02d7f61eeb7202d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 29 Dec 2023 16:35:31 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 671d0469ada4df2d833d41d065793a06f4d87a65) --- src/ktechlab.cpp | 118 +++++++++++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'src/ktechlab.cpp') diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index 46e5935..f4153eb 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -72,7 +72,7 @@ KTechlab::KTechlab() m_pToolBarOverlayLabel = 0l; m_pUpdateCaptionsTimer = new TQTimer( this ); - connect( m_pUpdateCaptionsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateCaptions()) ); + connect( m_pUpdateCaptionsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateCaptions()) ); setMinimumSize( 400, 400 ); @@ -233,7 +233,7 @@ void KTechlab::addWindow( ViewContainer * vc ) if ( vc && !m_viewContainerList.contains(vc) ) { m_viewContainerList << vc; - connect( vc, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(slotViewContainerDestroyed(TQObject* )) ); + connect( vc, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(slotViewContainerDestroyed(TQObject* )) ); } m_viewContainerList.remove((ViewContainer*)0); @@ -310,7 +310,7 @@ void KTechlab::overlayToolBarScreenshot() m_pToolBarOverlayLabel->setPixmap( shot ); m_pToolBarOverlayLabel->show(); - TQTimer::singleShot( 100, this, TQT_SLOT( hideToolBarOverlay() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( hideToolBarOverlay() ) ); } @@ -363,11 +363,11 @@ void KTechlab::removeGUIClients() void KTechlab::setupTabWidget() { m_pViewContainerTabWidget = new KTabWidget(centralWidget()); - connect( tabWidget(), TQT_SIGNAL(currentChanged(TQWidget* )), this, TQT_SLOT(slotViewContainerActivated(TQWidget* )) ); - connect( tabWidget(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), this, TQT_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) ); - connect( tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget* )), this, TQT_SLOT(slotTabDragInitiate(TQWidget* )) ); - connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQDropEvent* )), this, TQT_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) ); - connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), this, TQT_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) ); + connect( tabWidget(), TQ_SIGNAL(currentChanged(TQWidget* )), this, TQ_SLOT(slotViewContainerActivated(TQWidget* )) ); + connect( tabWidget(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), this, TQ_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) ); + connect( tabWidget(), TQ_SIGNAL(initiateDrag(TQWidget* )), this, TQ_SLOT(slotTabDragInitiate(TQWidget* )) ); + connect( tabWidget(), TQ_SIGNAL(receivedDropEvent(TQDropEvent* )), this, TQ_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) ); + connect( tabWidget(), TQ_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), this, TQ_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) ); TDEConfig *config = kapp->config(); config->setGroup("UI"); @@ -387,12 +387,12 @@ void KTechlab::setupTabWidget() but->setIconSet(SmallIcon("tab_remove")); but->adjustSize(); but->hide(); - connect( but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotViewContainerClose()) ); + connect( but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotViewContainerClose()) ); tabWidget()->setCornerWidget(but, TopRight); } // tabWidget()->setTabReorderingEnabled(true); -// connect(tabWidget(), TQT_SIGNAL(movedTab(int, int)), this, TQT_SLOT(tabMoved(int, int))); - connect(tabWidget(), TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), this, TQT_SLOT(slotTabContext(TQWidget*,const TQPoint &))); +// connect(tabWidget(), TQ_SIGNAL(movedTab(int, int)), this, TQ_SLOT(tabMoved(int, int))); + connect(tabWidget(), TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), this, TQ_SLOT(slotTabContext(TQWidget*,const TQPoint &))); //END Tab bar stuff } @@ -415,67 +415,67 @@ void KTechlab::setupActions() { TDEActionCollection *ac = actionCollection(); - KStdAction::openNew( this, TQT_SLOT(slotFileNew()), ac ); - KStdAction::open( this, TQT_SLOT(slotFileOpen()), ac ); - KStdAction::save( this, TQT_SLOT(slotFileSave()), ac ); - KStdAction::saveAs( this, TQT_SLOT(slotFileSaveAs()), ac ); - KStdAction::close( this, TQT_SLOT(slotViewClose()), ac ); - KStdAction::print( this, TQT_SLOT(slotFilePrint()), ac ); - KStdAction::quit( this, TQT_SLOT(slotFileQuit()), ac ); - KStdAction::undo( this, TQT_SLOT(slotEditUndo()), ac ); - KStdAction::redo( this, TQT_SLOT(slotEditRedo()), ac ); - KStdAction::cut( this, TQT_SLOT(slotEditCut()), ac ); - KStdAction::copy( this, TQT_SLOT(slotEditCopy()), ac ); - KStdAction::paste( this, TQT_SLOT(slotEditPaste()), ac ); - KStdAction::keyBindings( this, TQT_SLOT(slotOptionsConfigureKeys()), ac ); - KStdAction::configureToolbars( this, TQT_SLOT(slotOptionsConfigureToolbars()), ac ); - KStdAction::preferences( this, TQT_SLOT(slotOptionsPreferences()), ac ); + KStdAction::openNew( this, TQ_SLOT(slotFileNew()), ac ); + KStdAction::open( this, TQ_SLOT(slotFileOpen()), ac ); + KStdAction::save( this, TQ_SLOT(slotFileSave()), ac ); + KStdAction::saveAs( this, TQ_SLOT(slotFileSaveAs()), ac ); + KStdAction::close( this, TQ_SLOT(slotViewClose()), ac ); + KStdAction::print( this, TQ_SLOT(slotFilePrint()), ac ); + KStdAction::quit( this, TQ_SLOT(slotFileQuit()), ac ); + KStdAction::undo( this, TQ_SLOT(slotEditUndo()), ac ); + KStdAction::redo( this, TQ_SLOT(slotEditRedo()), ac ); + KStdAction::cut( this, TQ_SLOT(slotEditCut()), ac ); + KStdAction::copy( this, TQ_SLOT(slotEditCopy()), ac ); + KStdAction::paste( this, TQ_SLOT(slotEditPaste()), ac ); + KStdAction::keyBindings( this, TQ_SLOT(slotOptionsConfigureKeys()), ac ); + KStdAction::configureToolbars( this, TQ_SLOT(slotOptionsConfigureToolbars()), ac ); + KStdAction::preferences( this, TQ_SLOT(slotOptionsPreferences()), ac ); //BEGIN New file popup - TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT(slotFileNew()), ac, "newfile_popup" ); + TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT(slotFileNew()), ac, "newfile_popup" ); p->popupMenu()->insertTitle( i18n("New File") ); - (new TDEAction( i18n("Assembly"), "text-x-src", 0, this, TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() ); - (new TDEAction( i18n("C source"), "text-x-csrc", 0, this, TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() ); - (new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, this, TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() ); - (new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, this, TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("Assembly"), "text-x-src", 0, this, TQ_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("C source"), "text-x-csrc", 0, this, TQ_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, this, TQ_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, this, TQ_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() ); #ifdef MECHANICS - (new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, this, TQT_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, this, TQ_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() ); #endif - (new TDEAction( "Microbe", "ktechlab_microbe", 0, this, TQT_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() ); + (new TDEAction( "Microbe", "ktechlab_microbe", 0, this, TQ_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() ); //END New File popup -// m_recentFiles = KStdAction::openRecent( this, TQT_SLOT(load(const KURL&)), ac ); - m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), this, TQT_SLOT(load(const KURL &)), ac, "file_open_recent" ); - m_statusbarAction = KStdAction::showStatusbar( this, TQT_SLOT(slotOptionsShowStatusbar()), ac ); +// m_recentFiles = KStdAction::openRecent( this, TQ_SLOT(load(const KURL&)), ac ); + m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), this, TQ_SLOT(load(const KURL &)), ac, "file_open_recent" ); + m_statusbarAction = KStdAction::showStatusbar( this, TQ_SLOT(slotOptionsShowStatusbar()), ac ); //BEGIN Project Actions ProjectManager *pm = ProjectManager::self(this); - new TDEAction( i18n("New Project.."), "window-new", 0, pm, TQT_SLOT(slotNewProject()), ac, "project_new" ); - new TDEAction( i18n("Open Project..."), "project_open", 0, pm, TQT_SLOT(slotOpenProject()), ac, "project_open" ); -// m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); - m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); - new TDEAction( i18n("Export to Makefile..."), "fileexport", 0, pm, TQT_SLOT(slotExportToMakefile()), ac, "project_export_makefile" ); - new TDEAction( i18n("Create Subproject..."), 0, 0, pm, TQT_SLOT(slotCreateSubproject()), ac, "project_create_subproject" ); - new TDEAction( i18n("Add Existing File..."), "document-open", 0, pm, TQT_SLOT(slotAddFile()), ac, "project_add_existing_file" ); - new TDEAction( i18n("Add Current File..."), "fileimport", 0, pm, TQT_SLOT(slotAddCurrentFile()), ac, "project_add_current_file" ); -// new TDEAction( i18n("Project Options"), "configure", 0, pm, TQT_SLOT(slotProjectOptions()), ac, "project_options" ); - new TDEAction( i18n("Close Project"), "window-close", 0, pm, TQT_SLOT(slotCloseProject()), ac, "project_close" ); - new TDEAction( i18n("Remove from Project"), "edit-delete", 0, pm, TQT_SLOT(slotRemoveSelected()), ac, "project_remove_selected" ); - new TDEAction( i18n("Insert Existing File..."), "document-open", 0, pm, TQT_SLOT(slotSubprojectAddExistingFile()), ac, "subproject_add_existing_file" ); - new TDEAction( i18n("Insert Current File..."), "fileimport", 0, pm, TQT_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" ); - new TDEAction( i18n("Linker Options..."), "configure", 0, pm, TQT_SLOT(slotSubprojectLinkerOptions()), ac, "project_item_linker_options" ); - new TDEAction( i18n("Build..."), "launch", 0, pm, TQT_SLOT(slotItemBuild()), ac, "project_item_build" ); - new TDEAction( i18n("Upload..."), "convert_to_pic", 0, pm, TQT_SLOT(slotItemUpload()), ac, "project_item_upload" ); - new TDEAction( i18n("Processing Options..."), "configure", 0, pm, TQT_SLOT(slotItemProcessingOptions()), ac, "project_item_processing_options" ); + new TDEAction( i18n("New Project.."), "window-new", 0, pm, TQ_SLOT(slotNewProject()), ac, "project_new" ); + new TDEAction( i18n("Open Project..."), "project_open", 0, pm, TQ_SLOT(slotOpenProject()), ac, "project_open" ); +// m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); + m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), ProjectManager::self(), TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); + new TDEAction( i18n("Export to Makefile..."), "fileexport", 0, pm, TQ_SLOT(slotExportToMakefile()), ac, "project_export_makefile" ); + new TDEAction( i18n("Create Subproject..."), 0, 0, pm, TQ_SLOT(slotCreateSubproject()), ac, "project_create_subproject" ); + new TDEAction( i18n("Add Existing File..."), "document-open", 0, pm, TQ_SLOT(slotAddFile()), ac, "project_add_existing_file" ); + new TDEAction( i18n("Add Current File..."), "fileimport", 0, pm, TQ_SLOT(slotAddCurrentFile()), ac, "project_add_current_file" ); +// new TDEAction( i18n("Project Options"), "configure", 0, pm, TQ_SLOT(slotProjectOptions()), ac, "project_options" ); + new TDEAction( i18n("Close Project"), "window-close", 0, pm, TQ_SLOT(slotCloseProject()), ac, "project_close" ); + new TDEAction( i18n("Remove from Project"), "edit-delete", 0, pm, TQ_SLOT(slotRemoveSelected()), ac, "project_remove_selected" ); + new TDEAction( i18n("Insert Existing File..."), "document-open", 0, pm, TQ_SLOT(slotSubprojectAddExistingFile()), ac, "subproject_add_existing_file" ); + new TDEAction( i18n("Insert Current File..."), "fileimport", 0, pm, TQ_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" ); + new TDEAction( i18n("Linker Options..."), "configure", 0, pm, TQ_SLOT(slotSubprojectLinkerOptions()), ac, "project_item_linker_options" ); + new TDEAction( i18n("Build..."), "launch", 0, pm, TQ_SLOT(slotItemBuild()), ac, "project_item_build" ); + new TDEAction( i18n("Upload..."), "convert_to_pic", 0, pm, TQ_SLOT(slotItemUpload()), ac, "project_item_upload" ); + new TDEAction( i18n("Processing Options..."), "configure", 0, pm, TQ_SLOT(slotItemProcessingOptions()), ac, "project_item_processing_options" ); //END Project Actions - new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, this, TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" ); - new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, this, TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" ); + new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, this, TQ_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" ); + new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, this, TQ_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" ); TDEToggleAction * ta = new TDEToggleAction( i18n("Run Simulation"), "media-playback-start", TQt::Key_F10, 0, 0, ac, "simulation_run" ); ta->setChecked(true); - connect( ta, TQT_SIGNAL(toggled(bool )), Simulator::self(), TQT_SLOT(slotSetSimulating(bool )) ); + connect( ta, TQ_SIGNAL(toggled(bool )), Simulator::self(), TQ_SLOT(slotSetSimulating(bool )) ); #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) ta->setCheckedState( KGuiItem( i18n("Pause Simulation"), "media-playback-pause", 0 ) ); @@ -563,7 +563,7 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e ) dropMenu.insertSeparator(); dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "process-stop", TDEIcon::Small ), i18n("C&ancel"), 2 ); - connect( &dropMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDragContextActivated(int)) ); + connect( &dropMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDragContextActivated(int)) ); // dropMenu.exec(e->pos() + widget->pos() ); dropMenu.exec( TQCursor::pos() ); } @@ -776,7 +776,7 @@ void KTechlab::slotOptionsPreferences() // User edited the configuration - update your local copies of the // configuration data - connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateConfiguration()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotUpdateConfiguration()) ); dialog->show(); } @@ -834,7 +834,7 @@ void KTechlab::slotTabContext( TQWidget* widget,const TQPoint & pos ) } } - connect( tabMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT(slotTabContextActivated(int)) ); + connect( tabMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT(slotTabContextActivated(int)) ); tabMenu->exec(pos); delete tabMenu; -- cgit v1.2.1