From deac2ca49faed824fe83066080714eb6d653615b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- tdemdi/tdemdi/guiclient.cpp | 32 ++++++++++++++++---------------- tdemdi/tdemdi/guiclient.h | 18 +++++++++--------- tdemdi/tdemdi/toolviewaccessor_p.h | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'tdemdi/tdemdi') diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp index 2d1e6a68a..536508992 100644 --- a/tdemdi/tdemdi/guiclient.cpp +++ b/tdemdi/tdemdi/guiclient.cpp @@ -76,21 +76,21 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) if (actionCollection()->kaccel()==0) actionCollection()->setWidget(mdiMainFrm); - m_toolMenu=new KActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu"); + m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu"); - m_gotoToolDockMenu=new KActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu"); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()), + m_gotoToolDockMenu=new TDEActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu"); + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()), actionCollection(),"tdemdi_activate_top")); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()), actionCollection(),"tdemdi_activate_left")); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()), actionCollection(),"tdemdi_activate_right")); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()), actionCollection(),"tdemdi_activate_bottom")); - m_gotoToolDockMenu->insert(new KActionSeparator(actionCollection(),"tdemdi_goto_menu_separator")); - m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator")); + m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()), actionCollection(),"tdemdi_prev_toolview")); - m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()), actionCollection(),"tdemdi_next_toolview")); actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -115,7 +115,7 @@ void GUIClient::setupActions() unplugActionList( actionListName ); - TQPtrList addList; + TQPtrList addList; if (m_toolViewActions.count()<3) { for (uint i=0;iwrappedWidget()->name(); // try to read the action shortcut - KShortcut sc; + TDEShortcut sc; TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); - sc = KShortcut( cfg->readEntry( aname, "" ) ); + sc = TDEShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); - KAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()), + TDEAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()), /*TQString::null*/sc,tqt_dynamic_cast(mtva->wrapperWidget()), m_mdiMainFrm,actionCollection(), aname.latin1() ); @@ -162,7 +162,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) void GUIClient::actionDeleted(TQObject* a) { - m_toolViewActions.remove(static_cast(a)); + m_toolViewActions.remove(static_cast(a)); setupActions(); } @@ -173,9 +173,9 @@ void GUIClient::clientAdded( KXMLGUIClient *client ) setupActions(); } -ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut,KDockWidget *dw, KMDI::MainWindow *mdiMainFrm, +ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut,KDockWidget *dw, KMDI::MainWindow *mdiMainFrm, TQObject* parent, const char* name ) - : KToggleAction(text,cut,parent,name) + : TDEToggleAction(text,cut,parent,name) , m_dw(dw) , m_mdiMainFrm(mdiMainFrm) { diff --git a/tdemdi/tdemdi/guiclient.h b/tdemdi/tdemdi/guiclient.h index 4d1609ce6..5c8822a0a 100644 --- a/tdemdi/tdemdi/guiclient.h +++ b/tdemdi/tdemdi/guiclient.h @@ -28,8 +28,8 @@ #include -class KMainWindow; -class KToolBar; +class TDEMainWindow; +class TDEToolBar; namespace KMDI { class MainWindow; @@ -67,21 +67,21 @@ class GUIClient : public TQObject, public KXMLGUIClient GUIClientPrivate *d; TQGuardedPtr m_mdiMainFrm; - TQPtrList m_toolViewActions; - TQPtrList m_documentViewActions; + TQPtrList m_toolViewActions; + TQPtrList m_documentViewActions; - KActionMenu *m_docMenu; - KActionMenu *m_toolMenu; + TDEActionMenu *m_docMenu; + TDEActionMenu *m_toolMenu; - KActionMenu *m_gotoToolDockMenu; + TDEActionMenu *m_gotoToolDockMenu; }; -class ToggleToolViewAction:public KToggleAction +class ToggleToolViewAction:public TDEToggleAction { Q_OBJECT public: - ToggleToolViewAction ( const TQString& text, const KShortcut& cut = KShortcut(), + ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw=0,KMDI::MainWindow *mdiMainFrm=0, TQObject* parent = 0, const char* name = 0 ); virtual ~ToggleToolViewAction(); diff --git a/tdemdi/tdemdi/toolviewaccessor_p.h b/tdemdi/tdemdi/toolviewaccessor_p.h index 71ffb286a..db2eb9dc8 100644 --- a/tdemdi/tdemdi/toolviewaccessor_p.h +++ b/tdemdi/tdemdi/toolviewaccessor_p.h @@ -48,7 +48,7 @@ class ToolViewAccessorPrivate TQGuardedPtr widgetContainer; TQWidget *widget; - TQGuardedPtr action; + TQGuardedPtr action; }; } -- cgit v1.2.1