diff options
Diffstat (limited to 'kexi/main/keximainwindowimpl.cpp')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 795ddd537..a14ebfbb9 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -693,21 +693,21 @@ void KexiMainWindowImpl::initActions() d->action_edit_redo->setWhatsThis(i18n("Reverts the most recent undo action.")); #if 0 //old - d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); + d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = createSharedAction( KStdAction::FindNext, "edit_findnext"); d->action_edit_findprev = createSharedAction( KStdAction::FindPrev, "edit_findprevious"); -//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_tqreplace"); +//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_replace"); #endif - d->action_edit_tqfind = KStdAction::find( - TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_tqfind" ); -// d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); + d->action_edit_find = KStdAction::find( + TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" ); +// d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); d->action_edit_findprev = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); - d->action_edit_tqreplace = 0; -//! @todo d->action_edit_tqreplace = KStdAction::tqreplace( + d->action_edit_replace = 0; +//! @todo d->action_edit_replace = KStdAction::replace( //! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; //! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0, @@ -1005,7 +1005,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_edititem", Kexi::PartItemActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType); - acat->addAction("edit_tqfind", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_find", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_findnext", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, @@ -1014,7 +1014,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_findprevious", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); - acat->addAction("edit_tqreplace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_replace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_paste_special_data_table", Kexi::GlobalActionCategory); @@ -2323,7 +2323,7 @@ void KexiMainWindowImpl::updateCustomPropertyPanelTabs( curDialogPart->setupCustomPropertyPanelTabs(d->propEditorTabWidget, this); //restore current page number for this part - if (d->recentlySelectedPropertyPanelPages.tqcontains( curDialogPart )) { + if (d->recentlySelectedPropertyPanelPages.contains( curDialogPart )) { d->propEditorTabWidget->setCurrentPage( d->recentlySelectedPropertyPanelPages[ curDialogPart ] ); @@ -3297,7 +3297,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar d->removeDialog(dlg_id); //don't remove -KMDI will do that //also remove from 'print setup dialogs' cache, if needed int printedObjectID = 0; - if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(dlg_id)) + if (d->pageSetupDialogItemID2dataItemID_map.contains(dlg_id)) printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ dlg_id ]; d->pageSetupDialogs.take(printedObjectID); @@ -3798,7 +3798,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) //also close 'print setup' dialog for this item, if any tristate res; // int printedObjectID = 0; -// if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(item->identifier())) +// if (d->pageSetupDialogItemID2dataItemID_map.contains(item->identifier())) // printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ item->identifier() ]; KexiDialogBase * pageSetupDlg = d->pageSetupDialogs[ item->identifier() ]; const bool oldInsideCloseDialog = d->insideCloseDialog; @@ -4245,7 +4245,7 @@ tristate KexiMainWindowImpl::showProjectMigrationWizard( TQString destinationDatabaseName( args["destinationDatabaseName"] ); TQString fileName, destinationConnectionShortcut, dbName; if (!destinationDatabaseName.isEmpty()) { - if (args.tqcontains("destinationConnectionShortcut")) { + if (args.contains("destinationConnectionShortcut")) { // server-based destinationConnectionShortcut = args["destinationConnectionShortcut"]; } @@ -4542,7 +4542,7 @@ void KexiMainWindowImpl::slotEditFind(bool next) KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface(); if (!iface) return; - tristate res = iface->tqfind( + tristate res = iface->find( d->findDialog()->valueToFind(), d->findDialog()->options(), next); if (~res) return; |