diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index 8c2f514..53fb08a 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -963,7 +963,7 @@ void PreferencesDialog::setupGui()
 		lo->addWidget( GeneralOptionsWidget );
 		connect(GeneralOptionsWidget->useTDEwalletCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useTDEwalletToggled(bool)));
 
-		// 		const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( TQCHECKBOX_OBJECT_NAME_STRING );
+		// 		const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( "TQCheckBox" );
 		// 		TQObjectListIt it( *GeneralOptionsWidgetList );
 		//
 		// 		for ( TQObject *child = it.current(); it; ++it)
@@ -6831,7 +6831,7 @@ void PreferencesDialog::showEvent(TQShowEvent* e)
 {
   KDialogBase::showEvent(e);
 
-  TQSplitter* splitter = ((TQSplitter*)child(0, TQSPLITTER_OBJECT_NAME_STRING, true));
+  TQSplitter* splitter = ((TQSplitter*)child(0, "TQSplitter", true));
   TDEListView* listView = ((TDEListView*)child(0, "TDEListView", true));
 
   if (splitter && listView)
diff --git a/src/widgetnotifyhelper.cpp b/src/widgetnotifyhelper.cpp
index 3bd0e3f..602dddf 100644
--- a/src/widgetnotifyhelper.cpp
+++ b/src/widgetnotifyhelper.cpp
@@ -39,7 +39,7 @@ void WidgetNotifyHelper::setupChangedAction(TQWidget *w)
 	TQObject *obj;
 	TQObjectList *list;
 
-	list = w->queryList( TQCOMBOBOX_OBJECT_NAME_STRING );
+	list = w->queryList( "TQComboBox" );
 	for ( obj = list->first(); obj; obj = list->next() )
 	{
 // 		std::cout << "obj found: " << obj->name() << std::endl;
@@ -53,7 +53,7 @@ void WidgetNotifyHelper::setupChangedAction(TQWidget *w)
 		connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed()));
 	}
 
-	list = w->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
+	list = w->queryList( "TQLineEdit" );
 	for ( obj = list->first(); obj; obj = list->next() )
 	{
 // 		std::cout << "obj found: " << obj->name() << std::endl;
@@ -67,21 +67,21 @@ void WidgetNotifyHelper::setupChangedAction(TQWidget *w)
 		connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed()));
 	}
 
-	list = w->queryList( TQSPINBOX_OBJECT_NAME_STRING );
+	list = w->queryList( "TQSpinBox" );
 	for ( obj = list->first(); obj; obj = list->next() )
 	{
 // 		std::cout << "obj found: " << obj->name() << std::endl;
 		connect(obj,TQT_SIGNAL(valueChanged ( int )),w,TQT_SIGNAL(changed()));
 	}
 
-	list = w->queryList( TQCHECKBOX_OBJECT_NAME_STRING );
+	list = w->queryList( "TQCheckBox" );
 	for ( obj = list->first(); obj; obj = list->next() )
 	{
 // 		std::cout << "obj found: " << obj->name() << std::endl;
 		connect(obj,TQT_SIGNAL(stateChanged ( int )),w,TQT_SIGNAL(changed()));
 	}
 
-	list = w->queryList( TQRADIOBUTTON_OBJECT_NAME_STRING );
+	list = w->queryList( "TQRadioButton" );
 	for ( obj = list->first(); obj; obj = list->next() )
 	{
 // 		std::cout << "obj found: " << obj->name() << std::endl;