Replaced various '#define' with actual strings - part 4

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 9f67f75a70919376d8cd380ac1c076c25c4e7ec8)

6 files changed, 11 insertions, 11 deletions

diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index 116b75a5..4f2ad88c 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -397,7 +397,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 
     TQToolBox *tb;
     if ( o->parent() && o->parent()->parent() &&
-     (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) )
+     (tb = ::tqt_cast<TQToolBox*>(o->parent()->parent()->parent())) )
     name = tb->itemLabel( tb->indexOf((TQWidget*)o) );
 
 
@@ -449,8 +449,8 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
         insertObject( obj, item );
     }
     delete l2;
-      } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) {
-            if ( !::tqqt_cast<TQScrollView*>(it.current()) )
+      } else if ( ::tqt_cast<TQToolBox*>(it.current()->parent()) ) {
+            if ( !::tqt_cast<TQScrollView*>(it.current()) )
             continue;
             TQToolBox *tb = (TQToolBox*)it.current()->parent();
             for ( int i = tb->count() - 1; i >= 0; --i )
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index 29cac0e0..8a4da33b 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -639,7 +639,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	}
 	delete tmpl;
     } else
-    if ( ::tqqt_cast<TQToolBox*>(obj) ) {
+    if ( ::tqt_cast<TQToolBox*>(obj) ) {
         TQToolBox* tb = (TQToolBox*)obj;
         for ( int i = 0; i < tb->count(); ++i ) {
             TQWidget *w = tb->item( i );
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index a3482bcb..b1bf1f83 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -1395,7 +1395,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
     if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things
 	return true;
 
-    if ( o->inherits( "TQTabBar" ) || ::tqqt_cast<TQToolBox*>(o->parent()) )
+    if ( o->inherits( "TQTabBar" ) || ::tqt_cast<TQToolBox*>(o->parent()) )
 	return true;
     else if ( o->inherits( "TQSizeGrip" ) )
 	return true;
@@ -1475,7 +1475,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 
     if ( o->inherits( "TQPushButton" ) || o->inherits("TQRadioButton") || o->inherits( "TQCheckBox" ) || o->inherits( "TQToolButton" ) )
 	MetaDataBase::setPropertyChanged( o, "text", true );
-    else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) {
+    else if (::tqt_cast<TQToolButton*>(o) && ::tqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) {
         MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE );
         MetaDataBase::setPropertyChanged( o, "textLabel", TRUE );
         MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE );
@@ -1498,7 +1498,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	    t->verticalHeader()->setLabel( i, TQString::number( i + 1 ) );
 	}
 #endif
-    } else if ( ::tqqt_cast<TQToolBox*>(o) ) {
+    } else if ( ::tqt_cast<TQToolBox*>(o) ) {
         MetaDataBase::setPropertyChanged( o, "currentIndex", true );
         MetaDataBase::setPropertyChanged( o, "itemName", true );
         MetaDataBase::setPropertyChanged( o, "itemLabel", true );
diff --git a/kommander/editor/widgetinterface.h b/kommander/editor/widgetinterface.h
index 3eed33d7..2958b10c 100644
--- a/kommander/editor/widgetinterface.h
+++ b/kommander/editor/widgetinterface.h
@@ -24,6 +24,6 @@
 #include <tqwidgetinterface_p.h>
 
 #define WidgetInterface TQWidgetFactoryInterface
-#define IID_Widget IID_TQWidgetFactory
+#define IID_Widget IID_QWidgetFactory
 
 #endif
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 59a5d37c..15960b40 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -1177,7 +1177,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 			// 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());
-			if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
+			if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) )
 			{
 				TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
 				TQObjectList *list = pNewWidget->queryList( "TQWidget" );
@@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 				{ // for each found object...
 					TQWidget * widg = ( TQWidget* ) obj;
 					++it;
-					if ( !::tqqt_cast<TQPopupMenu*>( widg ) )
+					if ( !::tqt_cast<TQPopupMenu*>( widg ) )
 					{
 						widg->installEventFilter( this );
 					}
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index aa8f9069..6c11c26b 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -1302,7 +1302,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
 		// find the oldest ancestor of the current dockwidget that can be undocked
 		while ( !pW->isTopLevel() )
 		{
-			if ( ::tqqt_cast<KDockWidget*>( pW ) ||  pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
+			if ( ::tqt_cast<KDockWidget*>( pW ) ||  pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
 			{
 				undockCandidate = static_cast<KDockWidget*>( pW );
 				if ( undockCandidate->enableDocking() != KDockWidget::DockNone )