From 707310036113d2d0ae9da1cc7f85d0e642bf9686 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 12 Jul 2023 11:09:49 +0900 Subject: Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3. Signed-off-by: Michele Calgaro (cherry picked from commit 36c049e135b0cec7cf97b41888860186813df5f0) --- tdeparts/factory.h | 2 +- tdeparts/partmanager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tdeparts') diff --git a/tdeparts/factory.h b/tdeparts/factory.h index 28b8cc7ad..a9c5692c2 100644 --- a/tdeparts/factory.h +++ b/tdeparts/factory.h @@ -119,7 +119,7 @@ protected: /** * Reimplemented from KLibFactory. Calls createPart() */ - virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList() ); /** This 'enum' along with the structure below is NOT part of the public API. * It's going to disappear in KDE 4.0 and is likely to change inbetween. diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp index 777d6a77b..5ba9c8b41 100644 --- a/tdeparts/partmanager.cpp +++ b/tdeparts/partmanager.cpp @@ -208,7 +208,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) ) return false; - if ( d->m_bIgnoreScrollBars && w->inherits( TQSCROLLBAR_OBJECT_NAME_STRING ) ) + if ( d->m_bIgnoreScrollBars && w->inherits( "TQScrollBar" ) ) return false; if ( mev ) // mouse press or mouse double-click event -- cgit v1.2.1