More QT4 work and removed QT3 unused code in objects module.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1294 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 1 insertions, 51 deletions

diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 464f10f85..1eddbe73d 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -30,10 +30,6 @@
 
 #include "class_widget.h"
 #include <qwidget.h>
-#ifndef COMPILE_USE_QT4
-	#include <qobjectlist.h>
-	#include <qwidgetlist.h>
-#endif
 #include "kvi_app.h"
 #include "kvi_frame.h"
 
@@ -182,7 +178,6 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 }
 QWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const QString szClass, const QString szName)
 {
-#ifdef COMPILE_USE_QT4
 	QWidgetList list = g_pApp->topLevelWidgets();
 	if( !list.count() ) return 0;
 	for(int idx=0;idx<list.count();idx++)
@@ -203,39 +198,11 @@ QWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const QString szClass, c
 		}
 	}
 	return 0;
-#else
-	
-	QWidgetList *list = g_pApp->topLevelWidgets();
-	if( !list ) return 0;
-
-	QWidgetListIt it(*list);
-	while( it.current() ) {
-		bool bNameMatch  = false;
-		bool bClassMatch = false;
-		if( szName )
-			bNameMatch = KviQString::equalCI(it.current()->name(), szName);
-		else
-			bNameMatch = true;
-		if( szClass )
-			bClassMatch = KviQString::equalCI(it.current()->className(), szClass);
-		else
-			bClassMatch = true;
-		if( bNameMatch && bClassMatch ) {
-			QWidget *w = it.current();
-			delete list;
-			return w;
-		}
-		++it;
-	}
-	delete list;
-
-	return 0;
-#endif
 }
 
 QWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char *szName, QWidget *childOf)
 {
-#ifdef COMPILE_USE_QT4
+
 	QObjectList list = childOf->queryList(szClass ? szClass : 0, szName ? szName : 0, false, true);
 	if( !list.count() ) return 0;
 	for(int idx=0;idx<list.count();idx++)
@@ -247,23 +214,6 @@ QWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char
 		
 	}
 	return 0;
-#else
-
-	QObjectList *list = childOf->queryList(szClass ? szClass : 0, szName ? szName : 0, false, true);
-	if( !list ) return 0;
-
-	QObjectListIt it(*list);
-	while( it.current() ) {
-		if( it.current()->isWidgetType() ) {
-			QWidget *w = (QWidget *) it.current();
-			delete list;
-			return w;
-		}
-		++it;
-	}
-	delete list;
-	return 0;
-#endif
 }
 
 #include "m_class_wrapper.moc"