diff options
Diffstat (limited to 'kexi/main')
-rw-r--r-- | kexi/main/kexifinddialog.cpp | 22 | ||||
-rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 192 | ||||
-rw-r--r-- | kexi/main/keximainwindowimpl_p.h | 8 | ||||
-rw-r--r-- | kexi/main/kexinamedialog.cpp | 4 | ||||
-rw-r--r-- | kexi/main/kexinamewidget.cpp | 16 | ||||
-rw-r--r-- | kexi/main/kexistatusbar.cpp | 10 | ||||
-rw-r--r-- | kexi/main/printing/kexisimpleprintingpagesetup.cpp | 52 | ||||
-rw-r--r-- | kexi/main/printing/kexisimpleprintpreviewwindow.cpp | 20 | ||||
-rw-r--r-- | kexi/main/startup/KexiConnSelector.cpp | 30 | ||||
-rw-r--r-- | kexi/main/startup/KexiNewProjectWizard.cpp | 32 | ||||
-rw-r--r-- | kexi/main/startup/KexiProjectSelector.cpp | 14 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartup.cpp | 20 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupDialog.cpp | 42 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupDialogTemplatesPage.cpp | 4 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupFileDialog_win.cpp | 72 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartup_p.cpp | 8 |
16 files changed, 273 insertions, 273 deletions
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 3365268a..6f8d36e6 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -53,7 +53,7 @@ class KexiFindDialog::Private { if (!action) return; - TQObject::connect(parent, member, action, TQT_SLOT(activate())); + TQObject::connect(parent, member, action, TQ_SLOT(activate())); if (action->shortcut().isNull()) return; TQAccel *accel = new TQAccel(parent); // we want to handle dialog-wide shortcut as well @@ -90,13 +90,13 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent ) delete a; m_btnClose->setText(KStdGuiItem::close().text()); m_btnClose->setIconSet(KStdGuiItem::close().iconSet()); - connect(m_btnFind, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findNext())); - connect(m_btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked())); - connect(m_btnReplace, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceNext())); - connect(m_btnReplaceAll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceAll())); + connect(m_btnFind, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findNext())); + connect(m_btnClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseClicked())); + connect(m_btnReplace, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(replaceNext())); + connect(m_btnReplaceAll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(replaceAll())); // clear message after the text is changed - connect(m_textToFind, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage())); - connect(m_textToReplace, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage())); + connect(m_textToFind, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(updateMessage())); + connect(m_textToReplace, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(updateMessage())); d->replaceMode = true; //to force updating by setReplaceMode() setReplaceMode(false); @@ -117,10 +117,10 @@ void KexiFindDialog::setActions( TDEAction *findnext, TDEAction *findprev, d->replaceAction = replace; d->replaceallAction = replaceall; d->accels.clear(); - d->setActionAndAccel(d->findnextAction, this, TQT_SIGNAL(findNext())); - d->setActionAndAccel(d->findprevAction, this, TQT_SIGNAL(findPrevious())); - d->setActionAndAccel(d->replaceAction, this, TQT_SIGNAL(replaceNext())); - d->setActionAndAccel(d->replaceallAction, this, TQT_SIGNAL(replaceAll())); + d->setActionAndAccel(d->findnextAction, this, TQ_SIGNAL(findNext())); + d->setActionAndAccel(d->findprevAction, this, TQ_SIGNAL(findPrevious())); + d->setActionAndAccel(d->replaceAction, this, TQ_SIGNAL(replaceNext())); + d->setActionAndAccel(d->replaceallAction, this, TQ_SIGNAL(replaceAll())); } TQStringList KexiFindDialog::lookInColumnNames() const 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; } diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index d1eac9f5..3843f1da 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -336,10 +336,10 @@ void updatePropEditorDockWidthInfo() { m_findDialog = new KexiFindDialog(wnd); m_findDialog->setActions( action_edit_findnext, action_edit_findprev, action_edit_replace, action_edit_replace_all ); -/* connect(m_findDialog, TQT_SIGNAL(findNext()), action_edit_findnext, TQT_SLOT(activate())); - connect(m_findDialog, TQT_SIGNAL(find()), wnd, TQT_SLOT(slotEditFindNext())); - connect(m_findDialog, TQT_SIGNAL(replace()), wnd, TQT_SLOT(slotEditReplaceNext())); - connect(m_findDialog, TQT_SIGNAL(replaceAll()), wnd, TQT_SLOT(slotEditReplaceAll()));*/ +/* connect(m_findDialog, TQ_SIGNAL(findNext()), action_edit_findnext, TQ_SLOT(activate())); + connect(m_findDialog, TQ_SIGNAL(find()), wnd, TQ_SLOT(slotEditFindNext())); + connect(m_findDialog, TQ_SIGNAL(replace()), wnd, TQ_SLOT(slotEditReplaceNext())); + connect(m_findDialog, TQ_SIGNAL(replaceAll()), wnd, TQ_SLOT(slotEditReplaceAll()));*/ } return m_findDialog; } diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp index f3e1acec..86ad6da7 100644 --- a/kexi/main/kexinamedialog.cpp +++ b/kexi/main/kexinamedialog.cpp @@ -64,11 +64,11 @@ void KexiNameDialog::init() lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1); // m_widget->captionLineEdit()->selectAll(); // m_widget->captionLineEdit()->setFocus(); - connect(m_widget,TQT_SIGNAL(messageChanged()),this, TQT_SLOT(updateSize())); + connect(m_widget,TQ_SIGNAL(messageChanged()),this, TQ_SLOT(updateSize())); updateSize(); enableButtonOK( true ); slotTextChanged(); - connect(m_widget, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(m_widget, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); } void KexiNameDialog::updateSize() diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index bf38c28a..fe1babeb 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -94,14 +94,14 @@ void KexiNameWidget::init( m_nameWarning = i18n("Please enter the name."); m_captionWarning = i18n("Please enter the caption."); - connect(le_caption, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotCaptionTxtChanged(const TQString&))); - connect(le_name, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotNameTxtChanged(const TQString&))); - connect(le_caption, TQT_SIGNAL(returnPressed()), - this,TQT_SIGNAL(returnPressed())); - connect(le_name, TQT_SIGNAL(returnPressed()), - this,TQT_SIGNAL(returnPressed())); + connect(le_caption, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotCaptionTxtChanged(const TQString&))); + connect(le_name, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotNameTxtChanged(const TQString&))); + connect(le_caption, TQ_SIGNAL(returnPressed()), + this,TQ_SIGNAL(returnPressed())); + connect(le_name, TQ_SIGNAL(returnPressed()), + this,TQ_SIGNAL(returnPressed())); } KexiNameWidget::~KexiNameWidget() diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 2dbf58fe..0316da78 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -54,8 +54,8 @@ KexitStatusBar::KexitStatusBar(TQWidget *parent, const char *name) setReadOnlyFlag(false); // @todo -// connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), -// this, TQT_SLOT(activePartChanged(KParts::Part*))); +// connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), +// this, TQ_SLOT(activePartChanged(KParts::Part*))); /// @todo remove parts from the map on PartRemoved() ? } @@ -77,8 +77,8 @@ void KexitStatusBar::activePartChanged(KParts::Part *part) // @todo if (part && part->widget()) { if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { - connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( setStatus( const TQString & ) ) ); + connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQ_SLOT( setStatus( const TQString & ) ) ); # if TDE_VERSION < TDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); @@ -86,7 +86,7 @@ void KexitStatusBar::activePartChanged(KParts::Part *part) # endif } else if ((m_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) { - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); cursorPositionChanged(); } else { diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index ecf21be9..83db3bbd 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -55,8 +55,8 @@ KexiSimplePrintingCommand::KexiSimplePrintingCommand( , m_previewWindow(0) , m_printPreviewNeedsReloading(false) { - connect(this, TQT_SIGNAL(showPageSetupRequested(KexiPart::Item*)), - m_mainWin, TQT_SLOT(showPageSetupForItem(KexiPart::Item*))); + connect(this, TQ_SIGNAL(showPageSetupRequested(KexiPart::Item*)), + m_mainWin, TQ_SLOT(showPageSetupForItem(KexiPart::Item*))); } KexiSimplePrintingCommand::~KexiSimplePrintingCommand() @@ -261,8 +261,8 @@ bool KexiSimplePrintingCommand::showPrintPreview(const KexiSimplePrintingSetting *m_previewEngine, tableOrQuery.captionOrName(), 0, TQt::WStyle_Customize|TQt::WStyle_NormalBorder|TQt::WStyle_Title| TQt::WStyle_SysMenu|TQt::WStyle_MinMax|TQt::WStyle_ContextHelp); - connect(m_previewWindow, TQT_SIGNAL(printRequested()), this, TQT_SLOT(print())); - connect(m_previewWindow, TQT_SIGNAL(pageSetupRequested()), this, TQT_SLOT(slotShowPageSetupRequested())); + connect(m_previewWindow, TQ_SIGNAL(printRequested()), this, TQ_SLOT(print())); + connect(m_previewWindow, TQ_SIGNAL(pageSetupRequested()), this, TQ_SLOT(slotShowPageSetupRequested())); m_previewWindow->show(); KDialog::centerOnScreen(m_previewWindow); m_printPreviewNeedsReloading = false; @@ -337,17 +337,17 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(TDEIcon::Small) ); m_contents->printButton->setText( KStdGuiItem::print().text() ); - connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print())); + connect(m_contents->printButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(print())); m_contents->printPreviewButton->setIconSet( SmallIconSet("document-print-preview") ); m_contents->printPreviewButton->setText( i18n("Print Previe&w...") ); - connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview())); + connect(m_contents->printPreviewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(printPreview())); m_contents->iconLabel->setFixedWidth(32+6); m_contents->iconLabel->setPixmap( DesktopIcon("text-x-generic", 32) ); TQWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text.")); - connect(m_contents->headerTitleFontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeTitleFont())); + connect(m_contents->headerTitleFontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeTitleFont())); if (m_item) { m_origCaptionLabelText = m_contents->captionLabel->text(); @@ -358,18 +358,18 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi } m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) ); } - connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTitleTextChanged(const TQString&))); + connect(m_contents->headerTitleLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTitleTextChanged(const TQString&))); m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont ); TQWhatsThis::add(m_contents->openDataLink, i18n("Shows data for table or query associated with this page setup.")); TQToolTip::add(m_contents->openDataLink, i18n("Shows data for table or query associated with this page setup.")); - connect(m_contents->openDataLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotOpenData())); + connect(m_contents->openDataLink, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(slotOpenData())); TQWhatsThis::add(m_contents->saveSetupLink, i18n("Saves settings for this setup as default.")); - connect(m_contents->saveSetupLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotSaveSetup())); + connect(m_contents->saveSetupLink, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(slotSaveSetup())); #if !KDE_IS_VERSION(3,5,1) && !defined(TQ_WS_WIN) //a fix for problems with focusable KUrlLabel on KDElibs<=3.5.0 m_contents->openDataLink->setFocusPolicy(NoFocus); @@ -388,15 +388,15 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi updatePageLayoutAndUnitInfo(); TQWhatsThis::add(m_contents->changePageSizeAndMarginsButton, i18n("Changes page size and margins.")); - connect(m_contents->changePageSizeAndMarginsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangePageSizeAndMargins())); + connect(m_contents->changePageSizeAndMarginsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangePageSizeAndMargins())); - connect(m_contents->addPageNumbersCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAddPageNumbersCheckboxToggled(bool))); - connect(m_contents->addDateTimeCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAddDateTimeCheckboxToggled(bool))); - connect(m_contents->addTableBordersCheckbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAddTableBordersCheckboxToggled(bool))); + connect(m_contents->addPageNumbersCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAddPageNumbersCheckboxToggled(bool))); + connect(m_contents->addDateTimeCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAddDateTimeCheckboxToggled(bool))); + connect(m_contents->addTableBordersCheckbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAddTableBordersCheckboxToggled(bool))); if (!ok) { // no data! @@ -414,16 +414,16 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_printPreviewNeedsReloading = false; /* if (printPreview) - TQTimer::singleShot(50, this, TQT_SLOT(printPreview())); + TQTimer::singleShot(50, this, TQ_SLOT(printPreview())); else if (print) - TQTimer::singleShot(50, this, TQT_SLOT(print()));*/ - connect(this, TQT_SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&, + TQTimer::singleShot(50, this, TQ_SLOT(print()));*/ + connect(this, TQ_SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&, const TQString&)), - m_mainWin, TQT_SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&, + m_mainWin, TQ_SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&, const TQString&))); - connect(this, TQT_SIGNAL(printPreviewForItemRequested(KexiPart::Item*, + connect(this, TQ_SIGNAL(printPreviewForItemRequested(KexiPart::Item*, const KexiSimplePrintingSettings&,const TQString&,bool)), - m_mainWin, TQT_SLOT(printPreviewForItem(KexiPart::Item*, + m_mainWin, TQ_SLOT(printPreviewForItem(KexiPart::Item*, const KexiSimplePrintingSettings&,const TQString&,bool))); } diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 11cf1114..eb415262 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -169,28 +169,28 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( lyr->addWidget(m_toolbar); id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) ); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrintClicked())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrintClicked())); static_cast<KPushButton*>(m_toolbar->getWidget(id))->setAccel(TQt::CTRL|TQt::Key_P); m_toolbar->insertSeparator(); id = m_toolbar->insertWidget(-1, 0, new KPushButton(i18n("Page Set&up..."), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPageSetup())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPageSetup())); m_toolbar->insertSeparator(); #ifndef KEXI_NO_UNFINISHED //! @todo unfinished id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-in"), i18n("Zoom In"), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomInClicked())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomInClicked())); m_toolbar->insertSeparator(); id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-out"), i18n("Zoom Out"), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOutClicked())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomOutClicked())); m_toolbar->insertSeparator(); #endif id = m_toolbar->insertWidget(-1, 0, new KPushButton(KStdGuiItem::close(), m_toolbar)); - m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + m_toolbar->addConnection(id, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); m_toolbar->alignItemRight(id); m_scrollView = new KexiSimplePrintPreviewScrollView(this); @@ -214,29 +214,29 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( m_navToolbar->setIconText(TDEToolBar::IconTextRight); m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-first"), i18n("First Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFirstClicked())); + m_navToolbar->addConnection(m_idFirst, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFirstClicked())); m_navToolbar->insertSeparator(); m_idPrevious = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-previous"), i18n("Previous Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idPrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPreviousClicked())); + m_navToolbar->addConnection(m_idPrevious, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPreviousClicked())); m_navToolbar->insertSeparator(); m_idPageNumberLabel = m_navToolbar->insertWidget( -1, 0, new TQLabel(m_navToolbar)); m_navToolbar->insertSeparator(); m_idNext = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-next"), i18n("Next Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idNext, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked())); + m_navToolbar->addConnection(m_idNext, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNextClicked())); m_navToolbar->insertSeparator(); m_idLast = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-last"), i18n("Last Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idLast, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLastClicked())); + m_navToolbar->addConnection(m_idLast, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLastClicked())); m_navToolbar->insertSeparator(); resize(width(), kapp->desktop()->height()*4/5); //! @todo progress bar... - TQTimer::singleShot(50, this, TQT_SLOT(initLater())); + TQTimer::singleShot(50, this, TQ_SLOT(initLater())); } void KexiSimplePrintPreviewWindow::initLater() diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 25305e1a..360b7031 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -119,7 +119,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, // TQLabel* lbl = new TQLabel(i18n("<b>Select existing Kexi project to open:</b>"), openExistingWidget); // openExistingWidgetLyr->addWidget( lbl ); d->prjTypeSelector = new KexiPrjTypeSelector( d->openExistingWidget ); - connect(d->prjTypeSelector->buttonGroup,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotPrjTypeSelected(int))); + connect(d->prjTypeSelector->buttonGroup,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotPrjTypeSelected(int))); openExistingWidgetLyr->addWidget( d->prjTypeSelector ); openExistingWidgetLyr->addSpacing( KDialogBase::spacingHint() ); TQFrame* line = new TQFrame( d->openExistingWidget, "line" ); @@ -136,28 +136,28 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, m_fileDlg = 0; // addWidget(m_file); -// connect(m_file->btn_advanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(showAdvancedConn())); +// connect(m_file->btn_advanced,TQ_SIGNAL(clicked()),this,TQ_SLOT(showAdvancedConn())); m_remote = new KexiConnSelectorBase(d->stack, "conn_sel"); m_remote->icon->setPixmap( DesktopIcon("network") ); m_remote->icon->setFixedSize( m_remote->icon->pixmap()->size() ); // m_remote->btn_back->setIconSet( SmallIconSet("1uparrow") ); - connect(m_remote->btn_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteAddBtnClicked())); - connect(m_remote->btn_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteEditBtnClicked())); - connect(m_remote->btn_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteRemoveBtnClicked())); + connect(m_remote->btn_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteAddBtnClicked())); + connect(m_remote->btn_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteEditBtnClicked())); + connect(m_remote->btn_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteRemoveBtnClicked())); TQToolTip::add(m_remote->btn_add, i18n("Add a new database connection")); TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); d->stack->addWidget(m_remote); if (m_remote->layout()) m_remote->layout()->setMargin(0); -// connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn())); - connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); - connect(m_remote->list,TQT_SIGNAL(returnPressed(TQListViewItem*)), - this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); - connect(m_remote->list,TQT_SIGNAL(selectionChanged()), - this,TQT_SLOT(slotConnectionSelectionChanged())); +// connect(m_remote->btn_back,TQ_SIGNAL(clicked()),this,TQ_SLOT(showSimpleConn())); + connect(m_remote->list,TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQ_SIGNAL(returnPressed(TQListViewItem*)), + this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQ_SIGNAL(selectionChanged()), + this,TQ_SLOT(slotConnectionSelectionChanged())); } KexiConnSelectorWidget::~KexiConnSelectorWidget() @@ -167,7 +167,7 @@ KexiConnSelectorWidget::~KexiConnSelectorWidget() /*void KexiConnSelectorWidget::disconnectShowSimpleConnButton() { - m_remote->btn_back->disconnect(this,TQT_SLOT(showSimpleConn())); + m_remote->btn_back->disconnect(this,TQ_SLOT(showSimpleConn())); }*/ void KexiConnSelectorWidget::showAdvancedConn() @@ -228,9 +228,9 @@ void KexiConnSelectorWidget::showSimpleConn() for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { if (w->isDialog()) { //#ifndef TQ_WS_WIN - connect(m_fileDlg,TQT_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); + connect(m_fileDlg,TQ_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQ_SLOT(reject())); //#endif -// connect(m_fileDlg,TQT_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); +// connect(m_fileDlg,TQ_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQ_SLOT(reject())); break; } } diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 2b1f4026..e97532b3 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -123,9 +123,9 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, // d->chk_server_txt = i18n("Always &use database server for creating new projects.") // +"\n"+txt_dns; - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(executed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(selectionChanged( TQListViewItem*)),this,TQ_SLOT(slotLvTypesSelected(TQListViewItem*))); // static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); // static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1); @@ -167,26 +167,26 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_conn_sel->m_fileDlg->setMode( KexiStartupFileDialog::SavingFileBasedDB ); // m_conn_sel->m_fileDlg->setMode( KFile::LocalOnly | KFile::File ); // m_conn_sel->m_fileDlg->setOperationMode( KFileDialog::Saving ); -////js connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(rejected()),this,TQT_SLOT(reject())); -// connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(fileHighlighted(const TQString&)),this,TQT_SLOT(slotFileHighlighted(const TQString&))); - connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); +////js connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(rejected()),this,TQ_SLOT(reject())); +// connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(fileHighlighted(const TQString&)),this,TQ_SLOT(slotFileHighlighted(const TQString&))); + connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept())); m_conn_sel->showAdvancedConn(); - connect(m_conn_sel,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,TQT_SLOT(next())); + connect(m_conn_sel,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQ_SLOT(next())); addPage(m_conn_sel_widget, i18n("Select Project's Location")); //page: server db name m_server_db_name = new KexiServerDBNamePage(this, "KexiServerDBNamePage"); d->server_db_name_dblist_lbl_txt = i18n("Existing project databases on <b>%1</b> database server:"); - connect(m_server_db_name->le_caption, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotServerDBCaptionTxtChanged(const TQString&))); - connect(m_server_db_name->le_dbname, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotServerDBNameTxtChanged(const TQString&))); - connect(m_server_db_name->le_caption, TQT_SIGNAL(returnPressed()), - this,TQT_SLOT(accept())); - connect(m_server_db_name->le_dbname, TQT_SIGNAL(returnPressed()), - this,TQT_SLOT(accept())); + connect(m_server_db_name->le_caption, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotServerDBCaptionTxtChanged(const TQString&))); + connect(m_server_db_name->le_dbname, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotServerDBNameTxtChanged(const TQString&))); + connect(m_server_db_name->le_caption, TQ_SIGNAL(returnPressed()), + this,TQ_SLOT(accept())); + connect(m_server_db_name->le_dbname, TQ_SIGNAL(returnPressed()), + this,TQ_SLOT(accept())); m_server_db_name->le_caption->setText(i18n("New database")); m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(this, "id_val")); m_project_selector = new KexiProjectSelectorWidget( diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index 8f7682a4..b31a7e49 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -121,9 +121,9 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget( //show projects setProjectSet( m_prj_set ); - connect(list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(list,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(list,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotItemSelected())); + connect(list,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotItemSelected())); } /*! @@ -267,10 +267,10 @@ void KexiProjectSelectorDialog::init(KexiProjectSet* prj_set, bool showProjectNa setIcon(*m_sel->icon()); m_sel->setFocus(); - connect(m_sel,TQT_SIGNAL(projectExecuted(KexiProjectData*)), - this,TQT_SLOT(slotProjectExecuted(KexiProjectData*))); - connect(m_sel,TQT_SIGNAL(selectionChanged(KexiProjectData*)), - this,TQT_SLOT(slotProjectSelectionChanged(KexiProjectData*))); + connect(m_sel,TQ_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQ_SLOT(slotProjectExecuted(KexiProjectData*))); + connect(m_sel,TQ_SIGNAL(selectionChanged(KexiProjectData*)), + this,TQ_SLOT(slotProjectSelectionChanged(KexiProjectData*))); } KexiProjectData* KexiProjectSelectorDialog::selectedProjectData() const diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index f47d7da1..6e668b6c 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -162,8 +162,8 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD setPrompt( msg ); if (showDetailsButton) { - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(slotShowConnectionDetails()) ); + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(slotShowConnectionDetails()) ); setButtonText(KDialogBase::User1, i18n("&Details")+ " >>"); } setButtonOK(KGuiItem(i18n("&Open"), "document-open")); @@ -388,8 +388,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (cdata.password.isEmpty()) { delete d->passwordDialog; d->passwordDialog = new KexiDBPasswordDialog(0, cdata, true); -// connect( d->passwordDialog, TQT_SIGNAL(user1Clicked()), -// this, TQT_SLOT(slotShowConnectionDetails()) ); +// connect( d->passwordDialog, TQ_SIGNAL(user1Clicked()), +// this, TQ_SLOT(slotShowConnectionDetails()) ); const int ret = d->passwordDialog->exec(); if (d->passwordDialog->showConnectionDetailsRequested() || ret == TQDialog::Accepted) { // if ( ret == TQDialog::Accepted ) { @@ -485,8 +485,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) } d->connDialog = new KexiDBConnectionDialog( *m_projectData, d->shortcutFile->fileName()); - connect(d->connDialog, TQT_SIGNAL(saveChanges()), - this, TQT_SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQ_SIGNAL(saveChanges()), + this, TQ_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { //get (possibly changed) prj data @@ -522,8 +522,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!d->connDialog) { d->connDialog = new KexiDBConnectionDialog( cdata, d->connShortcutFile->fileName()); - connect(d->connDialog, TQT_SIGNAL(saveChanges()), - this, TQT_SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQ_SIGNAL(saveChanges()), + this, TQ_SLOT(slotSaveShortcutFileChanges())); } const int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { @@ -565,8 +565,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) //let's show connection details, user asked for that in the "password dialog" if (d->passwordDialog && d->passwordDialog->showConnectionDetailsRequested()) { d->connDialog = new KexiDBConnectionDialog(*m_projectData); -// connect(d->connDialog->tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), -// this, TQT_SLOT(slotSaveShortcutFileChanges())); +// connect(d->connDialog->tabWidget->mainWidget, TQ_SIGNAL(saveChanges()), +// this, TQ_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index c738d192..de382d2f 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -194,7 +194,7 @@ KexiStartupDialog::KexiStartupDialog( #endif if (!d->singlePage) { - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*))); d->templatesWidget->setFocus(); } showPage(0); @@ -304,7 +304,7 @@ void KexiStartupDialog::setupPageTemplates() d->templatesWidget_IconListBox->installEventFilter(this); } lyr->addWidget(d->templatesWidget); - connect(d->templatesWidget, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); + connect(d->templatesWidget, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*))); if (d->dialogOptions & CheckBoxDoNotShowAgain) { d->chkDoNotShow = new TQCheckBox(i18n("Don't show me this dialog again"), d->pageTemplates, "chkDoNotShow"); @@ -348,21 +348,21 @@ void KexiStartupDialog::setupPageTemplates() d->viewTemplates = new KexiStartupDialogTemplatesPage( templPageFrame ); tmplyr->addWidget( d->viewTemplates ); - connect(d->viewTemplates,TQT_SIGNAL(selected(const TQString&)), - this,TQT_SLOT(templateSelected(const TQString&))); -/* connect(d->viewTemplates->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)), - this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewTemplates->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)), - this,TQT_SLOT(templateItemSelected(TQIconViewItem*)));*/ + connect(d->viewTemplates,TQ_SIGNAL(selected(const TQString&)), + this,TQ_SLOT(templateSelected(const TQString&))); +/* connect(d->viewTemplates->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)), + this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewTemplates->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)), + this,TQ_SLOT(templateItemSelected(TQIconViewItem*)));*/ /*later templPageFrame = d->templatesWidget->addPage ( i18n("Personal Databases"), i18n("New Personal Database Project Templates"), DesktopIcon("folder_home") ); tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); d->viewPersonalTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "personal_page" ); tmplyr->addWidget( d->viewPersonalTempl ); - connect(d->viewPersonalTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewPersonalTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewPersonalTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*))); */ //- page "business db" @@ -374,9 +374,9 @@ void KexiStartupDialog::setupPageTemplates() tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); d->viewBusinessTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "business_page" ); tmplyr->addWidget( d->viewBusinessTempl ); - connect(d->viewBusinessTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewBusinessTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewBusinessTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*))); */ #endif //DB_TEMPLATES @@ -559,11 +559,11 @@ void KexiStartupDialog::setupPageOpenExisting() d->openExistingConnWidget->showAdvancedConn(); } d->openExistingFileDlg = d->openExistingConnWidget->m_fileDlg; - connect(d->openExistingFileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); - connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,TQT_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); - connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), - this,TQT_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); + connect(d->openExistingFileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept())); + connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQ_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); + connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), + this,TQ_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); } void KexiStartupDialog::connectionItemForOpenExistingExecuted(ConnectionDataLVItem *item) @@ -632,8 +632,8 @@ void KexiStartupDialog::setupPageOpenRecent() TQVBoxLayout *lyr = new TQVBoxLayout( d->pageOpenRecent, 0, KDialogBase::spacingHint() ); lyr->addWidget( d->prj_selector = new KexiProjectSelectorWidget( d->pageOpenRecent, "prj_selector", d->recentProjects ) ); - connect(d->prj_selector,TQT_SIGNAL(projectExecuted(KexiProjectData*)), - this,TQT_SLOT(recentProjectItemExecuted(KexiProjectData*))); + connect(d->prj_selector,TQ_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQ_SLOT(recentProjectItemExecuted(KexiProjectData*))); #endif } diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index d99ad4ae..d0440730 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -78,7 +78,7 @@ KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * paren setColumnWidthMode(0, Maximum); setResizeMode(LastColumn); setItemMargin(6); - connect(this,TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*))); + connect(this,TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*))); } KexiStartupDialogTemplatesPage::~KexiStartupDialogTemplatesPage() @@ -104,7 +104,7 @@ void KexiStartupDialogTemplatesPage::populate() // info = new KTextBrowser(this,"info"); // setResizeMode(templates,KeepSize); // setResizeMode(info,KeepSize); -// connect(templates,TQT_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQT_SLOT(itemClicked(TQIconViewItem*))); +// connect(templates,TQ_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQ_SLOT(itemClicked(TQIconViewItem*))); } /* diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 9708b037..0db50981 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -93,8 +93,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //(js) d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); //(js) d->okButton->setDefault( true ); //(js) d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); -//(js) connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); -//(js) connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); +//(js) connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() )); +//(js) connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() )); //(js) d->customWidget = widget; //(js) d->autoSelectExtCheckBox = 0; // delayed loading //TODO d->autoSelectExtChecked = false; @@ -167,14 +167,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT(urlEntered(const KURL&))); - connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); - connect(ops, TQT_SIGNAL(finishedLoading()), - TQT_SLOT(slotLoadingFinished())); + connect(ops, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT(urlEntered(const KURL&))); + connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQ_SIGNAL(finishedLoading()), + TQ_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -208,13 +208,13 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f "edit or select a bookmark.<p>" "These bookmarks are specific to the file dialog, but otherwise operate " "like bookmarks elsewhere in TDE.</qt>")); - connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - TQT_SLOT( enterURL( const TQString& ))); + connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + TQ_SLOT( enterURL( const TQString& ))); TDEToggleAction *showSidebarAction = new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); - connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleSpeedbar( bool )) ); TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " @@ -241,8 +241,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - ops, TQT_SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + ops, TQ_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); */ /* @@ -264,16 +264,16 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f d->pathCombo->setCompletionObject( ops->dirCompletionObject(), false ); - connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL(textChanged( const TQString& )), - TQT_SLOT( pathComboChanged( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( dirCompletion( const TQString& ))); - connect( d->pathCombo, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), - d->pathCombo, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); + connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL(textChanged( const TQString& )), + TQ_SLOT( pathComboChanged( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( dirCompletion( const TQString& ))); + connect( d->pathCombo, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), + d->pathCombo, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); TQString whatsThisText; @@ -293,14 +293,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f // locationEdit->setAutoDeleteCompletionObject( true ); locationEdit->setCompletionObject( ops->completionObject(), false ); - connect( locationEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotOk())); - connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( locationActivated( const TQString& ) )); - connect( locationEdit, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( fileCompletion( const TQString& ))); - connect( locationEdit, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), - locationEdit, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); + connect( locationEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotOk())); + connect(locationEdit, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( fileCompletion( const TQString& ))); + connect( locationEdit, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), + locationEdit, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); // the Filter label/edit whatsThisText = i18n("<qt>This is the filter to apply to the file list. " @@ -316,12 +316,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); + connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); + connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index f9b535c8..bb3a9d56 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -65,9 +65,9 @@ tristate SQLite2ToSQLite3Migration::run() m_process = new TDEProcess(this, "process"); *m_process << ksqlite2to3_app << m_filePath; m_process->setWorkingDirectory( fi.dir(true).absPath() ); - connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(processExited(TDEProcess*)) ); if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) return false; @@ -76,7 +76,7 @@ tristate SQLite2ToSQLite3Migration::run() .arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3") ); m_dlg->setModal(true); - connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); + connect(m_dlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); m_dlg->setMinimumDuration(1000); m_dlg->setAutoClose(true); m_dlg->progressBar()->setTotalSteps(100); |