summaryrefslogtreecommitdiffstats
path: root/tdemdi
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-07-12 11:09:49 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-07-12 11:12:16 +0900
commit36c049e135b0cec7cf97b41888860186813df5f0 (patch)
treeb1f87aff496d5ca1d3ca648817088eefb77c7316 /tdemdi
parent7f7e5585b2aee3db125045d6af2aaed1f8c37af7 (diff)
downloadtdelibs-36c049e135b0cec7cf97b41888860186813df5f0.tar.gz
tdelibs-36c049e135b0cec7cf97b41888860186813df5f0.zip
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdemdi')
-rw-r--r--tdemdi/tdemdi/tabwidget.cpp6
-rw-r--r--tdemdi/tdemdichildfrm.cpp14
-rw-r--r--tdemdi/tdemdichildview.cpp10
-rw-r--r--tdemdi/tdemdifocuslist.cpp2
4 files changed, 16 insertions, 16 deletions
diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 01eb6d889..4e5c2f62b 100644
--- a/tdemdi/tdemdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -91,7 +91,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
// child and its children
TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
- TQObjectList *list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = pLostChild->queryList( "TQWidget" );
list->insert(0, pLostChild); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * o;
@@ -114,7 +114,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
TQWidget* pNewWidget = (TQWidget*)pNewChild;
if (pNewWidget->testWFlags((WFlags)(WType_Dialog | WShowModal)))
return false;
- TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ 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
TQObject * o;
@@ -138,7 +138,7 @@ void TabWidget::childDestroyed()
const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender());
if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
{
- TQObjectList *list = ((TQObject*)(pLostChild))->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");
list->insert(0, pLostChild); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * obj;
diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp
index 4bdc98984..338f73ee4 100644
--- a/tdemdi/tdemdichildfrm.cpp
+++ b/tdemdi/tdemdichildfrm.cpp
@@ -752,7 +752,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
// memorize the focuses in a dictionary because they will get lost during reparenting
TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
pFocPolDict->setAutoDelete( true );
- TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over the buttons
TQObject * obj;
int i = 1;
@@ -833,7 +833,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
m_pClient->setMaximumSize( maxs.width(), maxs.height() );
// remember the focus policies using the dictionary and reset them
- TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject * obj;
TQWidget* firstFocusableChildWidget = 0;
@@ -887,7 +887,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
{
// reset the focus policies for all widgets in the view (take them from the dictionary)
- TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList* list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject* obj;
while ( ( obj = it.current() ) != 0 )
@@ -899,7 +899,7 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
if ( pFocPol != 0 )
widg->setFocusPolicy( *pFocPol );
- if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) )
+ if ( !( widg->inherits( "TQPopupMenu" ) ) )
widg->installEventFilter( this );
}
@@ -936,7 +936,7 @@ TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
pFocPolDict->setAutoDelete( true );
- TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets of child frame
TQObject * obj;
int i = 1;
@@ -1155,7 +1155,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());
- if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ )
+ if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ )
{
TQObjectList* list = pLostChild->queryList();
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
@@ -1180,7 +1180,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
{
TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
- TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ 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
TQObject * obj;
diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp
index cbfdb04d5..b90ed170c 100644
--- a/tdemdi/tdemdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -496,7 +496,7 @@ void KMdiChildView::slot_childDestroyed()
const TQObject * pLostChild = TQT_TQOBJECT_CONST(sender());
if ( pLostChild && ( pLostChild->isWidgetType() ) )
{
- TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject* obj;
@@ -545,7 +545,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
{
if ( obj->isWidgetType() )
{
- TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList * list = queryList( "TQWidget" );
if ( list->find( obj ) != -1 )
m_focusedChildWidget = ( TQWidget* ) obj;
@@ -569,7 +569,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
{
- TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList * list = pLostChild->queryList( "TQWidget" );
list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * o;
@@ -602,7 +602,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
TQWidget * pNewWidget = ( TQWidget* ) pNewChild;
if ( pNewWidget->testWFlags( (WFlags)(WType_Dialog | WShowModal) ) )
return false;
- TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ 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
TQObject * o;
@@ -647,7 +647,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
/** Switches interposing in event loop of all current child widgets off. */
void KMdiChildView::removeEventFilterForAllChildren()
{
- TQObjectList* list = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList* list = queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over all child widgets
TQObject* obj;
while ( ( obj = it.current() ) != 0 )
diff --git a/tdemdi/tdemdifocuslist.cpp b/tdemdi/tdemdifocuslist.cpp
index dc689ae99..63024aa20 100644
--- a/tdemdi/tdemdifocuslist.cpp
+++ b/tdemdi/tdemdifocuslist.cpp
@@ -34,7 +34,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
w->setFocusPolicy( TQ_ClickFocus );
kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl;
connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
- TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *l = w->queryList( "TQWidget" );
TQObjectListIt it( *l );
TQObject *obj;
while ( ( obj = it.current() ) != 0 )