diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-12 10:29:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-13 10:03:03 +0900 |
| commit | 57dd4fe2e34651a0f6b833ca0848fbc46ea3ce1a (patch) | |
| tree | 841c260c2ec0a13a9808067d718120328674583e | |
| parent | a9f6e5c5b26c07d5e96cd5e84e1dd95c973cd3ab (diff) | |
| download | tdegraphics-57dd4fe2e34651a0f6b833ca0848fbc46ea3ce1a.tar.gz tdegraphics-57dd4fe2e34651a0f6b833ca0848fbc46ea3ce1a.zip | |
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 340ffa901b7295a075a0b850f3bc9c97bf5cf11c)
| -rw-r--r-- | kpovmodeler/pmdockwidget.cpp | 4 | ||||
| -rw-r--r-- | ksvg/plugin/backends/agg/AggCanvasFactory.h | 2 | ||||
| -rw-r--r-- | ksvg/plugin/backends/libart/LibartCanvasFactory.h | 2 | ||||
| -rw-r--r-- | kuickshow/src/kuickshow.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 7c0775ef..e37b00b7 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -1310,7 +1310,7 @@ void PMDockManager::activate() obj->show(); } } - if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show(); + if ( !main->inherits("TQDialog") ) main->show(); } bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) @@ -2468,7 +2468,7 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize) #ifndef NO_KDE2 kdDebug()<<"PMDockArea::resize"<<endl; #endif - TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false); + TQObjectList *list=queryList("TQWidget",0,false); TQObjectListIt it( *list ); // iterate over the buttons TQObject *obj; diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h index e0785460..185c7a98 100644 --- a/ksvg/plugin/backends/agg/AggCanvasFactory.h +++ b/ksvg/plugin/backends/agg/AggCanvasFactory.h @@ -35,7 +35,7 @@ public: AggCanvasFactory(); virtual ~AggCanvasFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList()); }; }; diff --git a/ksvg/plugin/backends/libart/LibartCanvasFactory.h b/ksvg/plugin/backends/libart/LibartCanvasFactory.h index 6afd958d..f13d43c1 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasFactory.h +++ b/ksvg/plugin/backends/libart/LibartCanvasFactory.h @@ -35,7 +35,7 @@ public: LibartCanvasFactory(); virtual ~LibartCanvasFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList()); }; } diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index f6260aae..a67cfc79 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -1306,7 +1306,7 @@ void KuickShow::slotReplayEvent() // ### WORKAROUND for TQIconView bug in TQt <= 3.0.3 at least if ( fileWidget && fileWidget->view() ) { TQWidget *widget = fileWidget->view()->widget(); - if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) || widget->child(0, TQICONVIEW_OBJECT_NAME_STRING ) ){ + if ( widget->inherits( "TQIconView" ) || widget->child(0, "TQIconView" ) ){ fileWidget->setSorting( fileWidget->sorting() ); } } @@ -1320,7 +1320,7 @@ void KuickShow::replayAdvance(DelayedRepeatEvent *event) // rely on sorting to be correct before the TQIconView has been show()n. if ( fileWidget && fileWidget->view() ) { TQWidget *widget = fileWidget->view()->widget(); - if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) || widget->child(0, TQICONVIEW_OBJECT_NAME_STRING ) ){ + if ( widget->inherits( "TQIconView" ) || widget->child(0, "TQIconView" ) ){ fileWidget->setSorting( fileWidget->sorting() ); } } |