diff options
Diffstat (limited to 'kexi/main/keximainwindowimpl.cpp')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 192 |
1 files changed, 96 insertions, 96 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 7a82eb1e..c6f64d12 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -259,15 +259,15 @@ KexiMainWindowImpl::KexiMainWindowImpl() TDEGlobal::iconLoader()->addAppDir("koffice"); //get informed - connect(&Kexi::partManager(),TQT_SIGNAL(partLoaded(KexiPart::Part*)),this,TQT_SLOT(slotPartLoaded(KexiPart::Part*))); - connect( m_pMdi, TQT_SIGNAL(nowMaximized(bool)), this, TQT_SLOT(slotCaptionForCurrentMDIChild(bool)) ); - connect( m_pMdi, TQT_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, TQT_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*))); -// connect( this, TQT_SIGNAL(lastChildFrmClosed()), this, TQT_SLOT(slotLastChildFrmClosed())); - connect( this, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastChildViewClosed())); + connect(&Kexi::partManager(),TQ_SIGNAL(partLoaded(KexiPart::Part*)),this,TQ_SLOT(slotPartLoaded(KexiPart::Part*))); + connect( m_pMdi, TQ_SIGNAL(nowMaximized(bool)), this, TQ_SLOT(slotCaptionForCurrentMDIChild(bool)) ); + connect( m_pMdi, TQ_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, TQ_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*))); +// connect( this, TQ_SIGNAL(lastChildFrmClosed()), this, TQ_SLOT(slotLastChildFrmClosed())); + connect( this, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastChildViewClosed())); - connect( this, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*))); - connect( this, TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), - this, TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); + connect( this, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(slotChildViewIsDetachedNow(TQWidget*))); + connect( this, TQ_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), + this, TQ_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); //if (!userMode()) { @@ -349,7 +349,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() // if (!userMode()) { invalidateActions(); - d->timer.singleShot(0,this,TQT_SLOT(slotLastActions())); + d->timer.singleShot(0,this,TQ_SLOT(slotLastActions())); // } setTabWidgetVisibility(KMdi::AlwaysShowTabs); @@ -367,7 +367,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() // when initially the main window is empty TQToolTip::add(closeButton, i18n("Close the current tab page in Kexi tab interface", "Close the current tab")); - TQObject::connect( closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeActiveView() ) ); + TQObject::connect( closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeActiveView() ) ); } #ifdef KEXI_ADD_CUSTOM_KEXIMAINWINDOWIMPL @@ -406,7 +406,7 @@ void KexiMainWindowImpl::setWindowMenu(TQPopupMenu *menu) menuBar()->insertItem(txt, m_pWindowMenu, id, count-3); } m_pWindowMenu->setCheckable(true); - TQObject::connect( m_pWindowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()) ); + TQObject::connect( m_pWindowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillWindowMenu()) ); } void KexiMainWindowImpl::fillWindowMenu() @@ -521,77 +521,77 @@ void KexiMainWindowImpl::initActions() // setupGUI(TDEMainWindow::Keys|TDEMainWindow::StatusBar|TDEMainWindow::Save|TDEMainWindow::Create); // d->actionMapper = new TQSignalMapper(this, "act_map"); -// connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &))); +// connect(d->actionMapper, TQ_SIGNAL(mapped(const TQString &)), this, TQ_SLOT(slotAction(const TQString &))); // PROJECT MENU TDEAction *action = new TDEAction(i18n("&New..."), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), - this, TQT_SLOT(slotProjectNew()), actionCollection(), "project_new"); + this, TQ_SLOT(slotProjectNew()), actionCollection(), "project_new"); action->setToolTip(i18n("Create a new project")); action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected.")); - action = KStdAction::open( this, TQT_SLOT( slotProjectOpen() ), actionCollection(), "project_open" ); + action = KStdAction::open( this, TQ_SLOT( slotProjectOpen() ), actionCollection(), "project_open" ); action->setToolTip(i18n("Open an existing project")); action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected.")); #ifdef HAVE_TDENEWSTUFF action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0), - this, TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); + this, TQ_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); action->setToolTip(i18n("Download example databases from the Internet")); action->setWhatsThis(i18n("Downloads example databases from the Internet.")); #endif -// d->action_open_recent = KStdAction::openRecent( this, TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); +// d->action_open_recent = KStdAction::openRecent( this, TQ_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); //#ifdef KEXI_SHOW_UNIMPLEMENTED #ifndef KEXI_NO_UNFINISHED d->action_open_recent = new TDEActionMenu(i18n("Open Recent"), actionCollection(), "project_open_recent"); - connect(d->action_open_recent->popupMenu(),TQT_SIGNAL(activated(int)), - this,TQT_SLOT(slotProjectOpenRecent(int))); - connect(d->action_open_recent->popupMenu(), TQT_SIGNAL(aboutToShow()), - this,TQT_SLOT(slotProjectOpenRecentAboutToShow())); + connect(d->action_open_recent->popupMenu(),TQ_SIGNAL(activated(int)), + this,TQ_SLOT(slotProjectOpenRecent(int))); + connect(d->action_open_recent->popupMenu(), TQ_SIGNAL(aboutToShow()), + this,TQ_SLOT(slotProjectOpenRecentAboutToShow())); //moved down d->action_open_recent_projects_title_id = // d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Opened Databases")); //moved down d->action_open_recent_connections_title_id = // d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Connected Database Servers")); // d->action_open_recent->popupMenu()->insertSeparator(); // d->action_open_recent_more_id = d->action_open_recent->popupMenu() -// ->insertItem(i18n("&More Projects..."), this, TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000); +// ->insertItem(i18n("&More Projects..."), this, TQ_SLOT(slotProjectOpenRecentMore()), 0, 1000); #else d->action_open_recent = d->dummy_action; #endif d->action_save = KStdAction::save( - this, TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); + this, TQ_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); // d->action_save = new TDEAction(i18n("&Save"), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save), -// this, TQT_SLOT(slotProjectSave()), actionCollection(), "project_save"); +// this, TQ_SLOT(slotProjectSave()), actionCollection(), "project_save"); d->action_save->setToolTip(i18n("Save object changes")); d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window.")); #ifdef KEXI_SHOW_UNIMPLEMENTED d->action_save_as = new TDEAction(i18n("Save &As..."), "document-save-as", 0, - this, TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); + this, TQ_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); d->action_save_as->setToolTip(i18n("Save object as")); d->action_save_as->setWhatsThis( i18n("Saves object changes from currently selected window under a new name (within the same project).")); d->action_project_properties = new TDEAction(i18n("Project Properties"), "application-vnd.tde.info", 0, - this, TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); + this, TQ_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); #else d->action_save_as = d->dummy_action; d->action_project_properties = d->dummy_action; #endif d->action_close = new TDEAction(i18n("&Close Project"), "window-close", 0, - this, TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" ); + this, TQ_SLOT(slotProjectClose()), actionCollection(), "project_close" ); d->action_close->setToolTip(i18n("Close the current project")); d->action_close->setWhatsThis(i18n("Closes the current project.")); - KStdAction::quit( this, TQT_SLOT(slotProjectQuit()), actionCollection(), "quit"); + KStdAction::quit( this, TQ_SLOT(slotProjectQuit()), actionCollection(), "quit"); #ifdef KEXI_SHOW_UNIMPLEMENTED d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, - this, TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); + this, TQ_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); d->action_project_relations->setToolTip(i18n("Project relationships")); d->action_project_relations->setWhatsThis(i18n("Shows project relationships.")); @@ -600,13 +600,13 @@ void KexiMainWindowImpl::initActions() #endif d->action_tools_data_migration = new TDEAction( i18n("&Import Database..."), "database_import", 0, - this, TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); + this, TQ_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); d->action_tools_data_migration->setToolTip(i18n("Import entire database as a Kexi project")); d->action_tools_data_migration->setWhatsThis(i18n("Imports entire database as a Kexi project.")); d->action_tools_compact_database = new TDEAction( i18n("&Compact Database..."), "", 0, - this, TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); + this, TQ_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); d->action_tools_compact_database->setToolTip(i18n("Compact the current database project")); d->action_tools_compact_database->setWhatsThis( i18n("Compacts the current database project, so it will take less space and work faster.")); @@ -617,7 +617,7 @@ void KexiMainWindowImpl::initActions() d->action_project_import_data_table = new TDEAction( i18n("Import->Table Data From File...", "Table Data From &File..."), "table"/*! @todo: change to "file_import" or so*/, - 0, this, TQT_SLOT(slotProjectImportDataTable()), actionCollection(), + 0, this, TQ_SLOT(slotProjectImportDataTable()), actionCollection(), "project_import_data_table"); d->action_project_import_data_table->setToolTip(i18n("Import table data from a file")); d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file.")); @@ -626,7 +626,7 @@ void KexiMainWindowImpl::initActions() d->action_project_export_data_table = new TDEAction(i18n("Export->Table or Query Data to File...", "Table or Query Data to &File..."), "table"/*! @todo: change to "file_export" or so*/, - 0, this, TQT_SLOT(slotProjectExportDataTable()), actionCollection(), + 0, this, TQ_SLOT(slotProjectExportDataTable()), actionCollection(), "project_export_data_table"); d->action_project_export_data_table->setToolTip( i18n("Export data from the active table or query data to a file")); @@ -634,17 +634,17 @@ void KexiMainWindowImpl::initActions() i18n("Exports data from the active table or query data to a file.")); //TODO new TDEAction(i18n("From File..."), "document-open", 0, -//TODO this, TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); +//TODO this, TQ_SLOT(slotImportFile()), actionCollection(), "project_import_file"); //TODO new TDEAction(i18n("From Server..."), "server", 0, -//TODO this, TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); +//TODO this, TQ_SLOT(slotImportServer()), actionCollection(), "project_import_server"); - d->action_project_print = KStdAction::print(this, TQT_SLOT(slotProjectPrint()), + d->action_project_print = KStdAction::print(this, TQ_SLOT(slotProjectPrint()), actionCollection(), "project_print" ); d->action_project_print->setToolTip(i18n("Print data from the active table or query")); d->action_project_print->setWhatsThis(i18n("Prints data from the active table or query.")); d->action_project_print_preview = KStdAction::printPreview( - this, TQT_SLOT(slotProjectPrintPreview()), + this, TQ_SLOT(slotProjectPrintPreview()), actionCollection(), "project_print_preview" ); d->action_project_print_preview->setToolTip( i18n("Show print preview for the active table or query")); @@ -652,7 +652,7 @@ void KexiMainWindowImpl::initActions() i18n("Shows print preview for the active table or query.")); d->action_project_print_setup = new TDEAction(i18n("Page Set&up..."), - "", 0, this, TQT_SLOT(slotProjectPageSetup()), actionCollection(), + "", 0, this, TQ_SLOT(slotProjectPageSetup()), actionCollection(), "project_print_setup"); d->action_project_print_setup->setToolTip( i18n("Show page setup for printing the active table or query")); @@ -669,7 +669,7 @@ void KexiMainWindowImpl::initActions() else { d->action_edit_paste_special_data_table = new TDEAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."), - "table", 0, this, TQT_SLOT(slotEditPasteSpecialDataTable()), + "table", 0, this, TQ_SLOT(slotEditPasteSpecialDataTable()), actionCollection(), "edit_paste_special_data_table"); d->action_edit_paste_special_data_table->setToolTip( i18n("Paste clipboard data as a table")); @@ -680,7 +680,7 @@ void KexiMainWindowImpl::initActions() d->action_edit_copy_special_data_table = new TDEAction(i18n("Copy Special->Table or Query Data...", "Table or Query as Data Table..."), - "table", 0, this, TQT_SLOT(slotEditCopySpecialDataTable()), + "table", 0, this, TQ_SLOT(slotEditCopySpecialDataTable()), actionCollection(), "edit_copy_special_data_table"); d->action_edit_copy_special_data_table->setToolTip( i18n("Copy selected table or query data to clipboard")); @@ -700,18 +700,18 @@ void KexiMainWindowImpl::initActions() #endif d->action_edit_find = KStdAction::find( - this, TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" ); + this, TQ_SLOT(slotEditFind()), actionCollection(), "edit_find" ); // d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = KStdAction::findNext( - this, TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); + this, TQ_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); d->action_edit_findprev = KStdAction::findPrev( - this, TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); + this, TQ_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); d->action_edit_replace = 0; //! @todo d->action_edit_replace = KStdAction::replace( -//! this, TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); +//! this, TQ_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; //! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, -//! this, TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); +//! this, TQ_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); d->action_edit_select_all = createSharedAction( KStdAction::SelectAll, "edit_select_all"); @@ -745,7 +745,7 @@ void KexiMainWindowImpl::initActions() //VIEW MENU if (!userMode()) { d->action_view_data_mode = new TDERadioAction(i18n("&Data View"), "state_data", TQt::Key_F6, - this, TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); + this, TQ_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode ); d->action_view_data_mode->setExclusiveGroup("view_mode"); d->action_view_data_mode->setToolTip(i18n("Switch to data view")); @@ -756,7 +756,7 @@ void KexiMainWindowImpl::initActions() if (!userMode()) { d->action_view_design_mode = new TDERadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7, - this, TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); + this, TQ_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode ); d->action_view_design_mode->setExclusiveGroup("view_mode"); d->action_view_design_mode->setToolTip(i18n("Switch to design view")); @@ -767,7 +767,7 @@ void KexiMainWindowImpl::initActions() if (!userMode()) { d->action_view_text_mode = new TDERadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8, - this, TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); + this, TQ_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode ); d->action_view_text_mode->setExclusiveGroup("view_mode"); d->action_view_text_mode->setToolTip(i18n("Switch to text view")); @@ -778,7 +778,7 @@ void KexiMainWindowImpl::initActions() if (d->isProjectNavigatorVisible) { d->action_view_nav = new TDEAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1, - this, TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); + this, TQ_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); d->action_view_nav->setToolTip(i18n("Go to project navigator panel")); d->action_view_nav->setWhatsThis(i18n("Goes to project navigator panel.")); } @@ -786,13 +786,13 @@ void KexiMainWindowImpl::initActions() d->action_view_nav = 0; d->action_view_mainarea = new TDEAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2, - this, TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); + this, TQ_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); d->action_view_mainarea->setToolTip(i18n("Go to main area")); d->action_view_mainarea->setWhatsThis(i18n("Goes to main area.")); if (!userMode()) { d->action_view_propeditor = new TDEAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3, - this, TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); + this, TQ_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); d->action_view_propeditor->setToolTip(i18n("Go to property editor panel")); d->action_view_propeditor->setWhatsThis(i18n("Goes to property editor panel.")); } @@ -863,7 +863,7 @@ void KexiMainWindowImpl::initActions() #else TQt::ALT+TQt::Key_Right, #endif - this, TQT_SLOT(activateNextWin()), actionCollection(), "window_next"); + this, TQ_SLOT(activateNextWin()), actionCollection(), "window_next"); d->action_window_next->setToolTip( i18n("Next window") ); d->action_window_next->setWhatsThis(i18n("Switches to the next window.")); @@ -873,17 +873,17 @@ void KexiMainWindowImpl::initActions() #else TQt::ALT+TQt::Key_Left, #endif - this, TQT_SLOT(activatePrevWin()), actionCollection(), "window_previous"); + this, TQ_SLOT(activatePrevWin()), actionCollection(), "window_previous"); d->action_window_previous->setToolTip( i18n("Previous window") ); d->action_window_previous->setWhatsThis(i18n("Switches to the previous window.")); //SETTINGS MENU setStandardToolBarMenuEnabled( true ); - action = KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + action = KStdAction::keyBindings(this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure shortcut keys.")); #ifdef KEXI_SHOW_UNIMPLEMENTED - action = KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + action = KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure toolbars.")); d->action_show_other = new TDEActionMenu(i18n("Other"), @@ -923,31 +923,31 @@ void KexiMainWindowImpl::initActions() #endif #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_configure = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection()); + d->action_configure = KStdAction::preferences(this, TQ_SLOT(slotShowSettings()), actionCollection()); action->setWhatsThis(i18n("Lets you configure Kexi.")); #endif //HELP MENU #if 0//js: todo reenable later - KStdAction::tipOfDay( this, TQT_SLOT( slotTipOfTheDayAction() ), actionCollection() ) + KStdAction::tipOfDay( this, TQ_SLOT( slotTipOfTheDayAction() ), actionCollection() ) ->setWhatsThis(i18n("This shows useful tips on the use of this application.")); #endif #if 0 //we don't have a time for updating info text for each new version new TDEAction(i18n("Important Information"), "messagebox_info", 0, - this, TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); + this, TQ_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); #endif //TODO: UNCOMMENT TO REMOVE MDI MODES SETTING m_pMdiModeMenu->hide(); #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS new TDEAction(i18n("Give Feedback..."), "messagebox_info", 0, - this, TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); + this, TQ_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); #endif #endif // TDEAction *actionSettings = new TDEAction(i18n("Configure Kexi..."), "configure", 0, // actionCollection(), "kexi_settings"); // actionSettings->setWhatsThis(i18n("Lets you configure Kexi.")); -// connect(actionSettings, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowSettings())); +// connect(actionSettings, TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowSettings())); // -- add a few missing tooltips (usable especially in Form's "Assign action" dialog) if ((action = actionCollection()->action("window_close"))) @@ -1138,7 +1138,7 @@ void KexiMainWindowImpl::invalidateSharedActions() // unused, I think void KexiMainWindowImpl::invalidateSharedActionsLater() { - TQTimer::singleShot(1, this, TQT_SLOT(invalidateSharedActions())); + TQTimer::singleShot(1, this, TQ_SLOT(invalidateSharedActions())); } void KexiMainWindowImpl::invalidateProjectWideActions() @@ -1345,7 +1345,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) // d->disableErrorMessages = true; enableMessages( false ); - TQTimer::singleShot(1, this, TQT_SLOT(slotAutoOpenObjectsLater())); + TQTimer::singleShot(1, this, TQ_SLOT(slotAutoOpenObjectsLater())); return true; } @@ -1725,29 +1725,29 @@ void KexiMainWindowImpl::initNavigator() d->navToolWindow = addToolWindow(d->nav, KDockWidget::DockLeft, getMainDockWidget(), 20/*, lv, 35, "2"*/); // d->navToolWindow->hide(); - connect(d->nav,TQT_SIGNAL(openItem(KexiPart::Item*,int)),this,TQT_SLOT(openObject(KexiPart::Item*,int))); - connect(d->nav,TQT_SIGNAL(openOrActivateItem(KexiPart::Item*,int)), - this,TQT_SLOT(openObjectFromNavigator(KexiPart::Item*,int))); - connect(d->nav,TQT_SIGNAL(newItem( KexiPart::Info* )), - this,TQT_SLOT(newObject(KexiPart::Info*))); - connect(d->nav,TQT_SIGNAL(removeItem(KexiPart::Item*)), - this,TQT_SLOT(removeObject(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(renameItem(KexiPart::Item*,const TQString&, bool&)), - this,TQT_SLOT(renameObject(KexiPart::Item*,const TQString&, bool&))); - connect(d->nav,TQT_SIGNAL(executeItem(KexiPart::Item*)), - this,TQT_SLOT(executeItem(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(exportItemAsDataTable(KexiPart::Item*)), - this,TQT_SLOT(exportItemAsDataTable(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(printItem( KexiPart::Item* )), - this,TQT_SLOT(printItem(KexiPart::Item*))); - connect(d->nav,TQT_SIGNAL(pageSetupForItem( KexiPart::Item*)), - this,TQT_SLOT(showPageSetupForItem(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(openItem(KexiPart::Item*,int)),this,TQ_SLOT(openObject(KexiPart::Item*,int))); + connect(d->nav,TQ_SIGNAL(openOrActivateItem(KexiPart::Item*,int)), + this,TQ_SLOT(openObjectFromNavigator(KexiPart::Item*,int))); + connect(d->nav,TQ_SIGNAL(newItem( KexiPart::Info* )), + this,TQ_SLOT(newObject(KexiPart::Info*))); + connect(d->nav,TQ_SIGNAL(removeItem(KexiPart::Item*)), + this,TQ_SLOT(removeObject(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(renameItem(KexiPart::Item*,const TQString&, bool&)), + this,TQ_SLOT(renameObject(KexiPart::Item*,const TQString&, bool&))); + connect(d->nav,TQ_SIGNAL(executeItem(KexiPart::Item*)), + this,TQ_SLOT(executeItem(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(exportItemAsDataTable(KexiPart::Item*)), + this,TQ_SLOT(exportItemAsDataTable(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(printItem( KexiPart::Item* )), + this,TQ_SLOT(printItem(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(pageSetupForItem( KexiPart::Item*)), + this,TQ_SLOT(showPageSetupForItem(KexiPart::Item*))); if (d->prj) {//connect to the project - connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), - d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), + d->nav, TQ_SLOT(slotRemoveItem(const KexiPart::Item&))); } - connect(d->nav,TQT_SIGNAL(selectionChanged(KexiPart::Item*)), - this,TQT_SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*))); + connect(d->nav,TQ_SIGNAL(selectionChanged(KexiPart::Item*)), + this,TQ_SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*))); // d->restoreNavigatorWidth(); } @@ -1759,7 +1759,7 @@ void KexiMainWindowImpl::initNavigator() "dontShowWarningsRelatedToPluginsLoading"); } } - connect(d->prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), d->nav, TQT_SLOT(addItem(KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)), d->nav, TQ_SLOT(addItem(KexiPart::Item&))); d->nav->setFocus(); if (d->forceShowProjectNavigatorOnCreation) { @@ -1858,8 +1858,8 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p) { if (!p) return; - connect(p, TQT_SIGNAL(newObjectRequest(KexiPart::Info*)), - this, TQT_SLOT(newObject(KexiPart::Info*))); + connect(p, TQ_SIGNAL(newObjectRequest(KexiPart::Info*)), + this, TQ_SLOT(newObject(KexiPart::Info*))); p->createGUIClients(this); } @@ -2224,12 +2224,12 @@ void KexiMainWindowImpl::registerChild(KexiDialogBase *dlg) { kdDebug() << "KexiMainWindowImpl::registerChild()" << endl; - connect(dlg, TQT_SIGNAL(activated(KMdiChildView *)), - this, TQT_SLOT(activeWindowChanged(KMdiChildView *))); - connect(dlg, TQT_SIGNAL(dirtyChanged(KexiDialogBase*)), - this, TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*))); + connect(dlg, TQ_SIGNAL(activated(KMdiChildView *)), + this, TQ_SLOT(activeWindowChanged(KMdiChildView *))); + connect(dlg, TQ_SIGNAL(dirtyChanged(KexiDialogBase*)), + this, TQ_SLOT(slotDirtyFlagChanged(KexiDialogBase*))); -// connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQT_SLOT(childClosed(KMdiChildView *))); +// connect(dlg, TQ_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQ_SLOT(childClosed(KMdiChildView *))); if(dlg->id() != -1) { d->insertDialog(dlg); } @@ -2523,7 +2523,7 @@ void KexiMainWindowImpl::slotConfigureToolbars() { KEditToolbar edit(factory()); -// connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); +// connect(&edit,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); (void) edit.exec(); } @@ -2579,12 +2579,12 @@ KexiMainWindowImpl::createKexiProject(KexiProjectData* new_data) { d->prj = new KexiProject( new_data, this ); // d->prj = ::createKexiProject(new_data); -//provided by KexiMessageHandler connect(d->prj, TQT_SIGNAL(error(const TQString&,KexiDB::Object*)), this, TQT_SLOT(showErrorMessage(const TQString&,KexiDB::Object*))); -//provided by KexiMessageHandler connect(d->prj, TQT_SIGNAL(error(const TQString&,const TQString&)), this, TQT_SLOT(showErrorMessage(const TQString&,const TQString&))); - connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), this, TQT_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&))); +//provided by KexiMessageHandler connect(d->prj, TQ_SIGNAL(error(const TQString&,KexiDB::Object*)), this, TQ_SLOT(showErrorMessage(const TQString&,KexiDB::Object*))); +//provided by KexiMessageHandler connect(d->prj, TQ_SIGNAL(error(const TQString&,const TQString&)), this, TQ_SLOT(showErrorMessage(const TQString&,const TQString&))); + connect(d->prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), this, TQ_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&))); if (d->nav) - connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&))); + connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQ_SLOT(slotRemoveItem(const KexiPart::Item&))); } KexiProjectData* @@ -4394,7 +4394,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio return false; if (action == PreviewItem || action == PrintItem) { TQTimer::singleShot(0,printingDialog->selectedView(), - (action == PreviewItem) ? TQT_SLOT(printPreview()) : TQT_SLOT(print())); + (action == PreviewItem) ? TQ_SLOT(printPreview()) : TQ_SLOT(print())); } return true; } |