From aea627236e4de24599c3e30617cf264c3c1b7d40 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:02:43 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kexi/main/keximainwindowimpl_p.h | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'kexi/main/keximainwindowimpl_p.h') diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index c775b087..83814f4e 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -73,7 +73,7 @@ public: wasAutoOpen = false; dialogExistedBeforeCloseProject = false; #ifndef KEXI_SHOW_UNIMPLEMENTED - dummy_action = new KActionMenu(TQString(""), TQT_TQOBJECT(wnd)); + dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd)); #endif maximizeFirstOpenedChildFrm = false; #ifdef HAVE_KNEWSTUFF @@ -191,7 +191,7 @@ public: { if (curDialog.isNull()) return; - KRadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ]; + TDERadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ]; if (ra) ra->setChecked(true); // if (!last_checked_mode) @@ -393,7 +393,7 @@ void updatePropEditorDockWidthInfo() { KexiViewBase *view = curDialog->selectedView(); if (!view) return 0; - KAction *action = view->sharedAction(actionName); + TDEAction *action = view->sharedAction(actionName); if (!action || !action->isEnabled()) return 0; return view; @@ -442,24 +442,24 @@ void updatePropEditorDockWidthInfo() { TQString appCaptionPrefix; // actions_for_view_modes; -// KRadioAction *last_checked_mode; + TDEAction *action_view_nav, *action_view_propeditor, *action_view_mainarea; + TDERadioAction *action_view_data_mode, *action_view_design_mode, *action_view_text_mode; + TQIntDict actions_for_view_modes; +// TDERadioAction *last_checked_mode; #ifndef KEXI_NO_CTXT_HELP - KToggleAction *action_show_helper; + TDEToggleAction *action_show_helper; #endif //! data menu - KAction *action_data_save_row; - KAction *action_data_cancel_row_changes; - KAction *action_data_execute; + TDEAction *action_data_save_row; + TDEAction *action_data_cancel_row_changes; + TDEAction *action_data_execute; //! format menu - KAction *action_format_font; + TDEAction *action_format_font; //! tools menu - KAction *action_tools_data_migration, *action_tools_compact_database; - KActionMenu *action_tools_scripts; + TDEAction *action_tools_data_migration, *action_tools_compact_database; + TDEActionMenu *action_tools_scripts; //! window menu - KAction *action_window_next, *action_window_previous; + TDEAction *action_window_next, *action_window_previous; //! settings menu - KAction *action_configure; + TDEAction *action_configure; //! for dock windows KMdiToolViewAccessor* navToolWindow; -- cgit v1.2.1