summaryrefslogtreecommitdiffstats
path: root/tdemdi
diff options
context:
space:
mode:
Diffstat (limited to 'tdemdi')
-rw-r--r--tdemdi/tdemdi/dockcontainer.cpp2
-rw-r--r--tdemdi/tdemdi/guiclient.cpp4
-rw-r--r--tdemdi/tdemdi/mainwindow.cpp6
-rw-r--r--tdemdi/tdemdi/tabwidget.cpp4
-rw-r--r--tdemdi/tdemdichildfrm.cpp8
-rw-r--r--tdemdi/tdemdichildview.cpp4
-rw-r--r--tdemdi/tdemdidockcontainer.cpp2
-rw-r--r--tdemdi/tdemdiguiclient.cpp4
-rw-r--r--tdemdi/tdemdimainfrm.cpp12
9 files changed, 23 insertions, 23 deletions
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index 8b2cf86cf..d6ae0f2f2 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -261,7 +261,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
break;
}
m_dockManager=w->dockManager();
- m_dragPanel=TQT_TQOBJECT(hdr->dragPanel());
+ m_dragPanel=hdr->dragPanel();
if (m_dragPanel) m_movingState=WaitingForMoveStart;
delete m_startEvent;
m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event));
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 718e9eeee..e4b29eeed 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -88,9 +88,9 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
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 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()),
+ m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQT_SLOT(prevToolViewInDock()),
actionCollection(),"tdemdi_prev_toolview"));
- m_gotoToolDockMenu->insert(new TDEAction(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,m_mdiMainFrm,TQT_SLOT(nextToolViewInDock()),
actionCollection(),"tdemdi_next_toolview"));
actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 380c7c2aa..24a3c0fdf 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -153,7 +153,7 @@ void MainWindow::setupToolViews ()
KDockWidget *w=mainDock;
if (mainDock->parentDockTabGroup()) {
- w=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()));
+ w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
}
TQPtrList<KDockWidget> leftReparentWidgets;
@@ -162,7 +162,7 @@ void MainWindow::setupToolViews ()
TQPtrList<KDockWidget> topReparentWidgets;
if (mainDock->parentDockTabGroup()) {
- mainDock=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()));
+ mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
}
findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft);
@@ -380,7 +380,7 @@ void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWid
KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw);
if (widget) {
if (widget->parentDockTabGroup()) {
- widget=static_cast<KDockWidget*>(TQT_TQWIDGET(widget->parentDockTabGroup()->parent()));
+ widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent());
}
if (widget) {
diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 19c201800..35ea557a5 100644
--- a/tdemdi/tdemdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -89,7 +89,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
{
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
+ TQObject* pLostChild = ((TQChildEvent*)e)->child();
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
TQObjectList *list = pLostChild->queryList( "TQWidget" );
list->insert(0, pLostChild); // add the lost child to the list too, just to save code
@@ -108,7 +108,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
// if we got a new child and we are attached to the MDI system we
// install ourself as event filter for the new child and its children
// (as we did when we were added to the MDI system).
- TQObject* pNewChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
+ TQObject* pNewChild = ((TQChildEvent*)e)->child();
if ((pNewChild != 0L) && (pNewChild->isWidgetType()))
{
TQWidget* pNewWidget = (TQWidget*)pNewChild;
diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp
index 48fd7c50d..4bb5d2cf9 100644
--- a/tdemdi/tdemdichildfrm.cpp
+++ b/tdemdi/tdemdichildfrm.cpp
@@ -1095,7 +1095,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
break;
case TQEvent::MouseButtonPress:
{
- if ( !hasParent( TQT_TQOBJECT(m_pClient), obj ) )
+ if ( !hasParent( m_pClient, obj ) )
{
bool bIsSecondClick = false;
if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() )
@@ -1154,7 +1154,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
{
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child());
+ TQObject* pLostChild = ( ( TQChildEvent* ) e )->child();
if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ )
{
TQObjectList* list = pLostChild->queryList();
@@ -1176,10 +1176,10 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child we install ourself as event filter for the new
// child and its children (as we did when we got our client).
// XXX see linkChildren() and focus policy stuff
- TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+ TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) )
{
- TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
+ TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild );
TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets
diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp
index d2c273175..158920059 100644
--- a/tdemdi/tdemdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -566,7 +566,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
{
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+ TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
{
TQObjectList * list = pLostChild->queryList( "TQWidget" );
@@ -596,7 +596,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child and we are attached to the MDI system we
// install ourself as event filter for the new child and its children
// (as we did when we were added to the MDI system).
- TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+ TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child();
if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) )
{
TQWidget * pNewWidget = ( TQWidget* ) pNewChild;
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index 1e4c95eaf..2d835522d 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -280,7 +280,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
}
m_dockManager = w->dockManager();
- m_dragPanel = TQT_TQOBJECT(hdr->dragPanel());
+ m_dragPanel = hdr->dragPanel();
if ( m_dragPanel )
m_movingState = WaitingForMoveStart;
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 1623da985..0fa6d92d4 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -161,9 +161,9 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
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 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() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ),
actionCollection(), "tdemdi_prev_toolview" ) );
- m_gotoToolDockMenu->insert( new TDEAction( 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, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ),
actionCollection(), "tdemdi_next_toolview" ) );
actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 105b5b099..c265503ff 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -218,7 +218,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(),
- TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
+ this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
// the MDI view taskbar
createTaskBar();
@@ -1291,7 +1291,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
KDockWidget* dockWindow = 0L; /* pDockW */
KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */
KDockWidget* undockCandidate = 0L; /* pUndockCandidate */
- TQWidget* pW = TQT_TQWIDGET( ( *it ) );
+ TQWidget* pW = static_cast<TQWidget*>( ( *it ) );
// find the oldest ancestor of the current dockwidget that can be undocked
while ( !pW->isTopLevel() )
@@ -1899,7 +1899,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
if ( widget && widget->parentDockTabGroup() )
{
- widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) );
+ widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() );
if ( widget )
{
@@ -1931,7 +1931,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
KDockWidget *mainDock = getMainDockWidget();
KDockWidget *w = mainDock;
if ( mainDock->parentDockTabGroup() )
- w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) );
+ w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
TQPtrList<KDockWidget> leftReparentWidgets;
TQPtrList<KDockWidget> rightReparentWidgets;
@@ -1939,7 +1939,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
TQPtrList<KDockWidget> topReparentWidgets;
if ( mainDock->parentDockTabGroup() )
- mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
+ mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
@@ -2137,7 +2137,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
KDockWidget * mainDock = getMainDockWidget();
if ( mainDock->parentDockTabGroup() )
{
- mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
+ mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
}
if ( widgetNames.count() > 0 )
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 11:12:21 +0000