summaryrefslogtreecommitdiffstats
path: root/tdemdi
diff options
context:
space:
mode:
Diffstat (limited to 'tdemdi')
-rw-r--r--tdemdi/tdemdi/guiclient.cpp32
-rw-r--r--tdemdi/tdemdi/guiclient.h18
-rw-r--r--tdemdi/tdemdi/toolviewaccessor_p.h2
-rw-r--r--tdemdi/tdemdidocumentviewtabwidget.h2
-rw-r--r--tdemdi/tdemdiguiclient.cpp38
-rw-r--r--tdemdi/tdemdiguiclient.h22
-rw-r--r--tdemdi/tdemdimainfrm.cpp10
-rw-r--r--tdemdi/tdemditaskbar.cpp4
-rw-r--r--tdemdi/tdemditaskbar.h2
-rw-r--r--tdemdi/tdemditoolviewaccessor_p.h2
-rw-r--r--tdemdi/test/mainwidget.cpp2
-rw-r--r--tdemdi/test/mainwidget.h2
12 files changed, 68 insertions, 68 deletions
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<KAction> addList;
+ TQPtrList<TDEAction> addList;
if (m_toolViewActions.count()<3)
{
for (uint i=0;i<m_toolViewActions.count();i++)
@@ -138,14 +138,14 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* 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");
- 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<KDockWidget*>(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<KAction*>(a));
+ m_toolViewActions.remove(static_cast<TDEAction*>(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 <tdemdi/global.h>
-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<KMDI::MainWindow> m_mdiMainFrm;
- TQPtrList<KAction> m_toolViewActions;
- TQPtrList<KAction> m_documentViewActions;
+ TQPtrList<TDEAction> m_toolViewActions;
+ TQPtrList<TDEAction> 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<KDockWidget> widgetContainer;
TQWidget *widget;
- TQGuardedPtr<KAction> action;
+ TQGuardedPtr<TDEAction> action;
};
}
diff --git a/tdemdi/tdemdidocumentviewtabwidget.h b/tdemdi/tdemdidocumentviewtabwidget.h
index 668ef5b87..8b8025cbf 100644
--- a/tdemdi/tdemdidocumentviewtabwidget.h
+++ b/tdemdi/tdemdidocumentviewtabwidget.h
@@ -13,7 +13,7 @@
#include <ktabwidget.h>
#include <tdemdidefines.h>
-class KPopupMenu;
+class TDEPopupMenu;
//KDE4: Add a d pointer
/**
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 51c693f6e..449157b7a 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/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, 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() );
@@ -224,10 +224,10 @@ void KMDIGUIClient::setupActions()
// m_toolBars = builder.toolBars();
- // m_toolViewActions.append(new KAction( "TESTKMDIGUICLIENT", TQString::null, 0,
+ // m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString::null, 0,
// this, TQT_SLOT(blah()),actionCollection(),"nothing"));
- TQPtrList<KAction> addList;
+ TQPtrList<TDEAction> 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::null*/sc, tqt_dynamic_cast<KDockWidget*>( 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<KAction*>( a ) );
- /* if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<KAction*>(a));*/
+ m_toolViewActions.remove( static_cast<TDEAction*>( a ) );
+ /* if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<TDEAction*>(a));*/
setupActions();
}
diff --git a/tdemdi/tdemdiguiclient.h b/tdemdi/tdemdiguiclient.h
index ba899a2a0..22f9e51f0 100644
--- a/tdemdi/tdemdiguiclient.h
+++ b/tdemdi/tdemdiguiclient.h
@@ -25,8 +25,8 @@
#include <kaction.h>
#include "tdemdidefines.h"
-class KMainWindow;
-class KToolBar;
+class TDEMainWindow;
+class TDEToolBar;
class KMdiToolViewAccessor;
class KMdiMainFrm;
class KDockWidget;
@@ -104,26 +104,26 @@ private:
KMdi::MdiMode m_mdiMode;
TQGuardedPtr<KMdiMainFrm> m_mdiMainFrm;
- TQPtrList<KAction> m_toolViewActions;
- TQPtrList<KAction> m_documentViewActions;
+ TQPtrList<TDEAction> m_toolViewActions;
+ TQPtrList<TDEAction> 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/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 05bb7a4ca..6f14c09bd 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -132,7 +132,7 @@ public:
KMdiFocusList *focusList;
int m_styleIDEAlMode;
int m_toolviewStyle;
- KAction *closeWindowAction;
+ TDEAction *closeWindowAction;
};
//============ constructor ============//
@@ -217,7 +217,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
- d->closeWindowAction = new KAction(i18n("&Close"), KStdAccel::close(),
+ d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(),
TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
// the MDI view taskbar
@@ -1196,10 +1196,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();
@@ -1222,7 +1222,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/tdemdi/tdemditaskbar.cpp b/tdemdi/tdemditaskbar.cpp
index 98e479f1e..3dcb901ab 100644
--- a/tdemdi/tdemditaskbar.cpp
+++ b/tdemdi/tdemditaskbar.cpp
@@ -145,7 +145,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 )
@@ -388,7 +388,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/tdemdi/tdemditaskbar.h b/tdemdi/tdemditaskbar.h
index ec968a75d..9c853e7cf 100644
--- a/tdemdi/tdemditaskbar.h
+++ b/tdemdi/tdemditaskbar.h
@@ -126,7 +126,7 @@ class KMdiTaskBarPrivate;
* KMdiTaskBarButtons can be added or removed dynamically.<br>
* The button sizes are adjusted dynamically, as well.
*/
-class KMDI_EXPORT KMdiTaskBar : public KToolBar
+class KMDI_EXPORT KMdiTaskBar : public TDEToolBar
{
Q_OBJECT
public:
diff --git a/tdemdi/tdemditoolviewaccessor_p.h b/tdemdi/tdemditoolviewaccessor_p.h
index 81e770e85..c3812792f 100644
--- a/tdemdi/tdemditoolviewaccessor_p.h
+++ b/tdemdi/tdemditoolviewaccessor_p.h
@@ -42,7 +42,7 @@ public:
}
TQGuardedPtr<KDockWidget> widgetContainer;
TQWidget* widget;
- TQGuardedPtr<KAction> action;
+ TQGuardedPtr<TDEAction> action;
};
diff --git a/tdemdi/test/mainwidget.cpp b/tdemdi/test/mainwidget.cpp
index fd166ee95..a95af3d2f 100644
--- a/tdemdi/test/mainwidget.cpp
+++ b/tdemdi/test/mainwidget.cpp
@@ -107,7 +107,7 @@ void MainWidget::resizeEvent( TQResizeEvent *pRSE)
setSysButtonsAtMenuPosition();
}
-RestartWidget::RestartWidget():KMainWindow()
+RestartWidget::RestartWidget():TDEMainWindow()
{
mdimode=KMdi::ChildframeMode;
TQVBoxLayout* bl = new TQVBoxLayout(this);
diff --git a/tdemdi/test/mainwidget.h b/tdemdi/test/mainwidget.h
index 74ec7a654..7de1f9570 100644
--- a/tdemdi/test/mainwidget.h
+++ b/tdemdi/test/mainwidget.h
@@ -48,7 +48,7 @@ private:
* This allows me to test KMdiMainFrm::read/writeDockConfig by
* closing and restarting the MainWidget via checkbox click.
*/
-class RestartWidget : public KMainWindow
+class RestartWidget : public TDEMainWindow
{
Q_OBJECT
// methods
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 18:01:13 +0000