From 9771f17f8cc5252b12ec5f3edf47ff9bffdf997f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:16:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp | 12 +++---- lib/compatibility/tdemdi/qextmdi/kdockwidget.h | 8 ++--- .../tdemdi/qextmdi/tdemdidocumentviewtabwidget.h | 2 +- .../tdemdi/qextmdi/tdemdiguiclient.cpp | 38 +++++++++++----------- lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h | 22 ++++++------- lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp | 10 +++--- lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp | 4 +-- lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h | 2 +- .../tdemdi/qextmdi/tdemditoolviewaccessor_p.h | 2 +- .../tdemdi/qextmdi/tdemultitabbar.cpp | 2 +- 10 files changed, 51 insertions(+), 51 deletions(-) (limited to 'lib/compatibility/tdemdi/qextmdi') diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index b0f12173..64f5848f 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -91,7 +91,7 @@ static const char* const not_close_xpm[]={ "#####"}; /** - * A special kind of KMainWindow that is able to have dockwidget child widgets. + * A special kind of TDEMainWindow that is able to have dockwidget child widgets. * * The main widget should be a dockwidget where other dockwidgets can be docked to * the left, right, top, bottom or to the middle. @@ -100,7 +100,7 @@ static const char* const not_close_xpm[]={ * @author Max Judin. */ KDockMainWindow::KDockMainWindow( TQWidget* parent, const char *name, WFlags f) -:KMainWindow( parent, name, f ) +:TDEMainWindow( parent, name, f ) { TQString new_name = TQString(name) + TQString("_DockManager"); dockManager = new KDockManager( this, new_name.latin1() ); @@ -126,7 +126,7 @@ void KDockMainWindow::setView( TQWidget *view ) } #ifndef NO_KDE2 - KMainWindow::setCentralWidget(view); + TDEMainWindow::setCentralWidget(view); #else TQMainWindow::setCentralWidget(view); #endif @@ -1634,7 +1634,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) menuData->setAutoDelete( true ); #ifndef NO_KDE2 - menu = new KPopupMenu(); + menu = new TDEPopupMenu(); #else menu = new TQPopupMenu(); #endif @@ -3264,10 +3264,10 @@ void KDockManager::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } void KDockMainWindow::virtual_hook( int id, void* data ) -{ KMainWindow::virtual_hook( id, data ); } +{ TDEMainWindow::virtual_hook( id, data ); } void KDockArea::virtual_hook( int, void* ) -{ /*KMainWindow::virtual_hook( id, data );*/ } +{ /*TDEMainWindow::virtual_hook( id, data );*/ } #ifndef NO_INCLUDE_MOCFILES // for TQt-only projects, because tmake doesn't take this name diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h index 5b355867..69e5f7dc 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h @@ -36,7 +36,7 @@ - KDockTabGroup - minor helper class - KDockWidget - IMPORTANT CLASS: the one and only dockwidget class - KDockManager - helper class - - KDockMainWindow - IMPORTANT CLASS: a special KMainWindow that can have dockwidgets + - KDockMainWindow - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets - KDockArea - like KDockMainWindow but inherits just TQWidget IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition! @@ -82,7 +82,7 @@ class TQHBoxLayout; class TQPixmap; #ifndef NO_KDE2 -class KToolBar; +class TDEToolBar; class TDEConfig; #else class TQToolBar; @@ -1264,7 +1264,7 @@ private: }; /** - * A special kind of KMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set). + * A special kind of TDEMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set). * * The main widget should be a KDockWidget where other KDockWidget can be docked to * the left, right, top, bottom or to the middle. @@ -1306,7 +1306,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class TDEUI_EXPORT KDockMainWindow : public KMainWindow +class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow { Q_OBJECT diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h index 4678f0f8..abf853be 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h @@ -13,7 +13,7 @@ #include #include -class KPopupMenu; +class TDEPopupMenu; //KDE4: Add a d pointer /** diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index bef9fb12..4c9930be 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -57,9 +57,9 @@ using namespace KMDIPrivate; -ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const KShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm, +ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm, TQObject* parent, const char* name ) - : KToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm ) + : TDEToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm ) { if ( m_dw ) { @@ -136,10 +136,10 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c 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" ); if ( showMDIModeAction ) { - m_mdiModeAction = new KSelectAction( i18n( "MDI Mode" ), 0, actionCollection() ); + m_mdiModeAction = new TDESelectAction( i18n( "MDI Mode" ), 0, actionCollection() ); TQStringList modes; modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" ); m_mdiModeAction->setItems( modes ); @@ -151,19 +151,19 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); - 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, TQT_TQOBJECT(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, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ), actionCollection(), "tdemdi_activate_top" ) ); - m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ), actionCollection(), "tdemdi_activate_left" ) ); - m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ), actionCollection(), "tdemdi_activate_right" ) ); - m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(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() ); @@ -224,10 +224,10 @@ void KMDIGUIClient::setupActions() // m_toolBars = builder.toolBars(); - // m_toolViewActions.append(new KAction( "TESTKMDIGUICLIENT", TQString(), 0, + // m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString(), 0, // this, TQT_SLOT(blah()),actionCollection(),"nothing")); - TQPtrList addList; + TQPtrList addList; if ( m_toolViewActions.count() < 3 ) for ( uint i = 0;i < m_toolViewActions.count();i++ ) addList.append( m_toolViewActions.at( i ) ); @@ -250,14 +250,14 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) TQString aname = TQString( "tdemdi_toolview_" ) + mtva->wrappedWidget() ->name(); // try to read the action shortcut - KShortcut sc; + TDEShortcut sc; TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup( "Shortcuts" ); // if ( cfg->hasKey( aname ) ) - 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()*/sc, dynamic_cast( mtva->wrapperWidget() ), m_mdiMainFrm, actionCollection(), aname.latin1() ); #if KDE_IS_VERSION(3,2,90) @@ -275,8 +275,8 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) void KMDIGUIClient::actionDeleted( TQObject* a ) { - m_toolViewActions.remove( static_cast( a ) ); - /* if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast(a));*/ + m_toolViewActions.remove( static_cast( a ) ); + /* if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast(a));*/ setupActions(); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h index 46cc8ad2..98c606ce 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h @@ -25,8 +25,8 @@ #include #include "tdemdidefines.h" -class KMainWindow; -class KToolBar; +class TDEMainWindow; +class TDEToolBar; class KMdiToolViewAccessor; class KMdiMainFrm; class KDockWidget; @@ -105,27 +105,27 @@ private: KMdi::MdiMode m_mdiMode; TQGuardedPtr m_mdiMainFrm; - TQPtrList m_toolViewActions; - TQPtrList m_documentViewActions; + TQPtrList m_toolViewActions; + TQPtrList m_documentViewActions; - KActionMenu *m_docMenu; - KActionMenu *m_toolMenu; - KSelectAction *m_mdiModeAction; + TDEActionMenu *m_docMenu; + TDEActionMenu *m_toolMenu; + TDESelectAction *m_mdiModeAction; - KActionMenu *m_gotoToolDockMenu; + TDEActionMenu *m_gotoToolDockMenu; }; /** - * A KToggleAction specifically for toggling the showing + * A TDEToggleAction specifically for toggling the showing * or the hiding of a KMDI tool view */ -class KMDI_EXPORT ToggleToolViewAction: public KToggleAction +class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction { Q_OBJECT public: - ToggleToolViewAction( const TQString& text, const KShortcut& cut = KShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0, + ToggleToolViewAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0, TQObject* parent = 0, const char* name = 0 ); virtual ~ToggleToolViewAction(); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp index de17b7f1..1aa659a5 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp @@ -131,7 +131,7 @@ public: KMdiFocusList *focusList; int m_styleIDEAlMode; int m_toolviewStyle; - KAction *closeWindowAction; + TDEAction *closeWindowAction; }; //============ constructor ============// @@ -216,7 +216,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" ); - d->closeWindowAction = new KAction(i18n("&Close"), + d->closeWindowAction = new TDEAction(i18n("&Close"), #ifdef TQ_WS_WIN CTRL|Key_F4, #else @@ -1200,10 +1200,10 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) { if ( switching() ) { - KAction * a = actionCollection() ->action( "view_last_window" ) ; + TDEAction * a = actionCollection() ->action( "view_last_window" ) ; if ( a ) { - const KShortcut cut( a->shortcut() ); + const TDEShortcut cut( a->shortcut() ); const KKeySequence& seq = cut.seq( 0 ); const KKey& key = seq.key( 0 ); int modFlags = key.modFlags(); @@ -1226,7 +1226,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) } else { - kdDebug(760) << "KAction( \"view_last_window\") not found." << endl; + kdDebug(760) << "TDEAction( \"view_last_window\") not found." << endl; } } } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp index 3c61dab2..6de04e4c 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp @@ -141,7 +141,7 @@ TQString KMdiTaskBarButton::actualText() const //#################################################################### KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ) - : KToolBar( parent, "KMdiTaskBar", /*honor_style*/ false, /*readConfig*/ true ) + : TDEToolBar( parent, "KMdiTaskBar", /*honor_style*/ false, /*readConfig*/ true ) , m_pCurrentFocusedWindow( 0 ) , m_pStretchSpace( 0 ) , m_layoutIsPending( false ) @@ -384,7 +384,7 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse ) layoutTaskBar( rse->size().width() ); } } - KToolBar::resizeEvent( rse ); + TDEToolBar::resizeEvent( rse ); } // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h index 50b77d9b..9d0267bb 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h @@ -127,7 +127,7 @@ class KMdiTaskBarPrivate; * KMdiTaskBarButtons can be added or removed dynamically.
* The button sizes are adjusted dynamically, as well. */ -class KMDI_EXPORT KMdiTaskBar : public KToolBar +class KMDI_EXPORT KMdiTaskBar : public TDEToolBar { Q_OBJECT diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h index 81e770e8..c3812792 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h @@ -42,7 +42,7 @@ public: } TQGuardedPtr widgetContainer; TQWidget* widget; - TQGuardedPtr action; + TQGuardedPtr action; }; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp index 511e50a0..131a252e 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp @@ -871,7 +871,7 @@ KMultiTabBar::~KMultiTabBar() { /*int KMultiTabBar::insertButton(TQPixmap pic,int id ,const TQString&) { - (new KToolbarButton(pic,id,m_internal))->show(); + (new TDEToolbarButton(pic,id,m_internal))->show(); return 0; }*/ -- cgit v1.2.1