diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-11 21:46:14 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-11 21:46:14 +0900 |
commit | 2c4375efc4964d9d3857bf27472c0e672b384d8e (patch) | |
tree | a5bf489d713eeb0c5463b86b0fccf96e015c458f | |
parent | adc41d0e4d2c77dfd0ed5ab48935a2ad82d53c82 (diff) | |
download | kpilot-2c4375efc4964d9d3857bf27472c0e672b384d8e.tar.gz kpilot-2c4375efc4964d9d3857bf27472c0e672b384d8e.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>
-rw-r--r-- | conduits/docconduit/doc-factory.h | 2 | ||||
-rw-r--r-- | conduits/knotes/knotes-factory.h | 2 | ||||
-rw-r--r-- | conduits/malconduit/mal-factory.h | 2 | ||||
-rw-r--r-- | conduits/memofileconduit/memofileconduit.xmi | 32 | ||||
-rw-r--r-- | lib/plugin.h | 2 | ||||
-rw-r--r-- | 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 @@ <UML:Operation visibility="protected" xmi.id="28" type="void" name="process" /> <UML:Operation visibility="private" xmi.id="43" type="bool" name="readConfig" /> <UML:Operation visibility="private" xmi.id="44" type="void" name="getAppInfo" /> - <UML:Operation visibility="private" xmi.id="45" type=TQSTRING_OBJECT_NAME_STRING name="getCategoryName" > + <UML:Operation visibility="private" xmi.id="45" type="TQString" name="getCategoryName" > <UML:Parameter visibility="public" xmi.id="46" value="" type="int" name="category" /> </UML:Operation> <UML:Operation visibility="private" xmi.id="47" type="bool" name="initializeFromPilot" /> @@ -43,7 +43,7 @@ <UML:Operation visibility="private" xmi.id="50" type="bool" name="initializeFromFilesystem" /> <UML:Operation visibility="private" xmi.id="51" type="bool" name="initializeMemofileList" /> <UML:Operation visibility="private" xmi.id="52" type="bool" name="checkDirectory" > - <UML:Parameter visibility="public" xmi.id="53" value="" type=TQSTRING_OBJECT_NAME_STRING name="dir" /> + <UML:Parameter visibility="public" xmi.id="53" value="" type="TQString" name="dir" /> </UML:Operation> <UML:Operation visibility="private" xmi.id="54" type="bool" name="ensureFilesystemReady" /> <UML:Operation visibility="private" xmi.id="55" type="bool" name="copyHHToPC" /> @@ -54,8 +54,8 @@ <UML:Parameter visibility="public" xmi.id="60" value="" type="const QString&" name="fileName" /> <UML:Parameter visibility="public" xmi.id="61" value="" type="Memofile*" name="theMemo" /> </UML:Operation> - <UML:Attribute visibility="private" xmi.id="29" value="" type=TQSTRING_OBJECT_NAME_STRING name="_DEFAULT_MEMODIR" /> - <UML:Attribute visibility="private" xmi.id="30" value="" type=TQSTRING_OBJECT_NAME_STRING name="_memo_directory" /> + <UML:Attribute visibility="private" xmi.id="29" value="" type="TQString" name="_DEFAULT_MEMODIR" /> + <UML:Attribute visibility="private" xmi.id="30" value="" type="TQString" name="_memo_directory" /> <UML:Attribute visibility="private" xmi.id="31" value="" type="bool" name="_sync_private" /> <UML:Attribute visibility="private" xmi.id="32" value="" type="QPtrList< PilotMemo >" name="fMemoList" /> <UML:Attribute visibility="private" xmi.id="33" value="" type="struct MemoAppInfo" name="fMemoAppInfo" /> @@ -79,7 +79,7 @@ <UML:Class visibility="public" xmi.id="63" name="Memofiles" > <UML:Operation visibility="public" xmi.id="80" type="Memofiles" name="Memofiles" > <UML:Parameter visibility="public" xmi.id="81" value="" type="QMap" name="categories" /> - <UML:Parameter visibility="public" xmi.id="82" value="" type=TQSTRING_OBJECT_NAME_STRING name="baseDirectory" /> + <UML:Parameter visibility="public" xmi.id="82" value="" type="TQString" name="baseDirectory" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="87" type="void" name="load" > <UML:Parameter visibility="public" xmi.id="88" value="" type="bool" name="loadAll" /> @@ -93,38 +93,38 @@ <UML:Operation visibility="private" xmi.id="97" type="void" name="ensureDirectoryReady" /> <UML:Operation visibility="public" xmi.id="98" type="void" name="loadIds" /> <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="find" > - <UML:Parameter visibility="public" xmi.id="100" value="" type=TQSTRING_OBJECT_NAME_STRING name="category" /> - <UML:Parameter visibility="public" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" /> + <UML:Parameter visibility="public" xmi.id="100" value="" type="TQString" name="category" /> + <UML:Parameter visibility="public" xmi.id="101" value="" type="TQString" name="filename" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="102" type="void" name="addModified" > <UML:Parameter visibility="public" xmi.id="103" value="" type="PilotMemo *" name="memo" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="104" type="QPtrList<Memofile>" name="getModified" /> <UML:Attribute visibility="private" xmi.id="83" value="" type="QMap" name="_categories" /> - <UML:Attribute visibility="private" xmi.id="85" value="" type=TQSTRING_OBJECT_NAME_STRING name="_baseDirectory" /> + <UML:Attribute visibility="private" xmi.id="85" value="" type="TQString" name="_baseDirectory" /> <UML:Attribute visibility="private" xmi.id="93" value="" type="QPtrList<Memofile>" name="_memofiles" /> </UML:Class> <UML:Class visibility="public" xmi.id="64" name="Memofile" > <UML:Operation visibility="public" xmi.id="65" type="" name="Memofile" > <UML:Parameter visibility="public" xmi.id="66" value="" type="PilotMemo*" name="memo" /> - <UML:Parameter visibility="public" xmi.id="67" value="" type=TQSTRING_OBJECT_NAME_STRING name="categoryName" /> + <UML:Parameter visibility="public" xmi.id="67" value="" type="TQString" name="categoryName" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="68" type="" name="Memofile" > <UML:Parameter visibility="public" xmi.id="69" value="" type="recordid_t" name="id" /> <UML:Parameter visibility="public" xmi.id="70" value="" type="int" name="category" /> - <UML:Parameter visibility="public" xmi.id="71" value="" type=TQSTRING_OBJECT_NAME_STRING name="categoryName" /> + <UML:Parameter visibility="public" xmi.id="71" value="" type="TQString" name="categoryName" /> <UML:Parameter visibility="public" xmi.id="72" value="" type="uint" name="lastModifiedTime" /> - <UML:Parameter visibility="public" xmi.id="73" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" /> - <UML:Parameter visibility="public" xmi.id="74" value="" type=TQSTRING_OBJECT_NAME_STRING name="text" /> + <UML:Parameter visibility="public" xmi.id="73" value="" type="TQString" name="filename" /> + <UML:Parameter visibility="public" xmi.id="74" value="" type="TQString" name="text" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="75" type="uint" name="lastModified" /> - <UML:Operation visibility="public" xmi.id="76" type=TQSTRING_OBJECT_NAME_STRING name="filename" /> + <UML:Operation visibility="public" xmi.id="76" type="TQString" name="filename" /> <UML:Attribute visibility="private" xmi.id="77" value="" type="uint" name="_lastModified" /> - <UML:Attribute visibility="private" xmi.id="78" value="" type=TQSTRING_OBJECT_NAME_STRING name="_categoryName" /> - <UML:Attribute visibility="private" xmi.id="79" value="" type=TQSTRING_OBJECT_NAME_STRING name="_filename" /> + <UML:Attribute visibility="private" xmi.id="78" value="" type="TQString" name="_categoryName" /> + <UML:Attribute visibility="private" xmi.id="79" value="" type="TQString" name="_filename" /> </UML:Class> <UML:DataType stereotype="3" visibility="public" xmi.id="84" name="QMap" /> - <UML:DataType stereotype="3" visibility="public" xmi.id="86" name=TQSTRING_OBJECT_NAME_STRING /> + <UML:DataType stereotype="3" visibility="public" xmi.id="86" name="TQString" /> <UML:DataType stereotype="3" visibility="public" xmi.id="94" name="QPtrList<Memofile>" /> <UML:Association visibility="public" xmi.id="36" > <UML:Association.connection> 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() ); * </pre> * 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) |