Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 8 insertions, 8 deletions

diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index 59fddb06..6b9a819f 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -253,7 +253,7 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev)
 			tmpy = contentsY();
 
 		// we look for the max widget right() (or bottom()), which would be the limit for form resizing (not to hide widgets)
-		TQObjectList *list = m_widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, true, false /* not recursive*/);
+		TQObjectList *list = m_widget->queryList("TQWidget", 0, true, false /* not recursive*/);
 		for(TQObject *o = list->first(); o; o = list->next())
 		{
 			TQWidget *w = (TQWidget*)o;
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index cbd48e84..f36dfe47 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -101,7 +101,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
 
 bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e )
 {
-	if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) {
 		if (d->lyr->view)
 			d->lyr->view->setFocus();
 //		if (KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index f054f084..c1405c1d 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -2476,7 +2476,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
 		}
 		d->recentCellWithToolTip = TQPoint(-1,-1);
 	}
-/*	else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
+/*	else if (e->type()==TQEvent::FocusOut && o->inherits("TQWidget")) {
 		//hp==true if currently focused widget is a child of this table view
 		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget());
 		if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index d93b13ff..92f53c60 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -55,11 +55,11 @@ bool KexiGradientWidget::isValidChildWidget( TQObject* child ) {
 	if ( wgt == 0L )
 		return false;
 
-	if ( wgt->inherits( TQSCROLLVIEW_OBJECT_NAME_STRING ) )
+	if ( wgt->inherits( "TQScrollView" ) )
 		return false;
-	if ( wgt->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+	if ( wgt->inherits( "TQComboBox" ) )
 		return false;
-	if ( wgt->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+	if ( wgt->inherits( "TQLineEdit" ) )
 		return false;
 	if ( wgt->inherits( "KexiDBForm" ) )
 		return false;
@@ -68,7 +68,7 @@ bool KexiGradientWidget::isValidChildWidget( TQObject* child ) {
 }
 
 void KexiGradientWidget::buildChildrenList( WidgetList& list, TQWidget* p ) {
-	TQObjectList* objects = p->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false );
+	TQObjectList* objects = p->queryList( "TQWidget", 0, false, false );
 
 	for ( TQObjectList::Iterator it = objects->begin(); it != objects->end(); ++it ) {
 		if ( isValidChildWidget( ( *it ) ) == false )
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 18d1b09c..6579fc42 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -71,7 +71,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
  , m_isInsertingEnabled(true)
  , d( new KexiRecordNavigatorPrivate() )
 {
-	if (parent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING))
+	if (parent->inherits("TQScrollView"))
 		setParentView( dynamic_cast<TQScrollView*>(parent) );
 	setFrameStyle(TQFrame::NoFrame);
 	d->lyr = new TQHBoxLayout(this,0,0,"nav_lyr");