From 83e4ace78c432655f6e969096480caf628377a2a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 11 Jul 2023 21:46:14 +0900 Subject: [PATCH] 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 2c4375efc4964d9d3857bf27472c0e672b384d8e) --- conduits/docconduit/doc-factory.h | 2 +- conduits/knotes/knotes-factory.h | 2 +- conduits/malconduit/mal-factory.h | 2 +- conduits/memofileconduit/memofileconduit.xmi | 32 ++++++++++---------- lib/plugin.h | 2 +- lib/pluginfactory.h | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/conduits/docconduit/doc-factory.h b/conduits/docconduit/doc-factory.h index 1a7d2ba..44a47c4 100644 --- a/conduits/docconduit/doc-factory.h +++ b/conduits/docconduit/doc-factory.h @@ -57,7 +57,7 @@ public: protected: virtual TQObject * createObject(TQObject * parent = 0, const char *name = 0, - const char *classname = TQOBJECT_OBJECT_NAME_STRING, + const char *classname = "TQObject", const TQStringList & args = TQStringList()); private: diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h index 3df3c06..fd3f714 100644 --- a/conduits/knotes/knotes-factory.h +++ b/conduits/knotes/knotes-factory.h @@ -53,7 +53,7 @@ public: protected: virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); private: TDEInstance *fInstance; diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h index 4e0de33..1b45852 100644 --- a/conduits/malconduit/mal-factory.h +++ b/conduits/malconduit/mal-factory.h @@ -51,7 +51,7 @@ public: protected: virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); private: TDEInstance *fInstance; diff --git a/conduits/memofileconduit/memofileconduit.xmi b/conduits/memofileconduit/memofileconduit.xmi index c33d9bd..4aa3e9d 100644 --- a/conduits/memofileconduit/memofileconduit.xmi +++ b/conduits/memofileconduit/memofileconduit.xmi @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -54,8 +54,8 @@ - - + + @@ -79,7 +79,7 @@ - + @@ -93,38 +93,38 @@ - - + + - + - + - + - - + + - + - - + + - + diff --git a/lib/plugin.h b/lib/plugin.h index ddae9fe..37a88ec 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -446,7 +446,7 @@ namespace PluginUtility KDE_EXPORT * protected: * virtual TQObject* createObject( TQObject* parent = 0, * const char* name = 0, -* const char* classname = TQOBJECT_OBJECT_NAME_STRING, +* const char* classname = "TQObject", * const TQStringList &args = TQStringList() ); * * diff --git a/lib/pluginfactory.h b/lib/pluginfactory.h index 1afdf8c..e9be090 100644 --- a/lib/pluginfactory.h +++ b/lib/pluginfactory.h @@ -55,7 +55,7 @@ protected: virtual TQObject *createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, + const char* classname = "TQObject", const TQStringList &args = TQStringList() ) { if (qstrcmp(classname,"ConduitConfigBase")==0)