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>
(cherry picked from commit 20e4a19b0d7cc800d57be50c56d69023adae4046)

3 files changed, 6 insertions, 6 deletions

diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index bede2259a..1c313ba29 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -290,7 +290,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 	}
 
 	{//store menu popups list
-		TQObjectList *l = queryList( TQPOPUPMENU_OBJECT_NAME_STRING );
+		TQObjectList *l = queryList( "TQPopupMenu" );
 		for (TQObjectListIt it( *l ); it.current(); ++it ) {
 			//kdDebug() << "name=" <<it.current()->name() << " cname="<<it.current()->className()<<endl;
 			//KexiMainWindowImpl::eventFilter() will filter our popups:
@@ -3440,7 +3440,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 	}*/
 
 	TQWidget *focus_w = 0;
-	if (obj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+	if (obj->inherits("TQPopupMenu")) {
 		/* Fixes for popup menus behaviour:
 		 For hiding/showing: focus previously (d->focus_before_popup)
 		 focused window, if known, otherwise focus currently focused one.
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index defa2e06e..8f4457371 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -55,7 +55,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 
 	//dirty hack to customize filedialog view:
 	{
-		TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING );
+		TQObjectList *l = queryList( "TQPushButton" );
 		TQObjectListIt it( *l );
 		TQObject *obj;
 		while ( (obj = it.current()) != 0 ) {
@@ -65,7 +65,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 		delete l;
 	}
 	{
-		TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+		TQObjectList *l = queryList("TQWidget");
 		TQObjectListIt it( *l );
 		TQObject *obj;
 		while ( (obj = it.current()) != 0 ) {
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index 1432ac3c6..aac7b271c 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -61,10 +61,10 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase(
 	init(_dirName, filter, parent);
 
 	//find "OK" button
-	TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false );
+	TQObjectList *l = queryList( "TQPushButton", "OK", false );
 	m_okBtn = dynamic_cast<TQPushButton*>(l->first());
 	delete l;
-	l = queryList( TQLINEEDIT_OBJECT_NAME_STRING, "name/filter editor", false );
+	l = queryList( "TQLineEdit", "name/filter editor", false );
 	m_lineEdit = dynamic_cast<TQLineEdit*>(l->first());
 	delete l;