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>

3 files changed, 6 insertions, 6 deletions

diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp
index 519e4425..f054cbba 100644
--- a/kspread/kspread_view.cpp
+++ b/kspread/kspread_view.cpp
@@ -6007,7 +6007,7 @@ void View::openPopupMenu( const TQPoint & _point )
     {
       d->popupMenuFirstToolId = 10;
       int i = 0;
-      TQValueList<KDataToolInfo> tools = KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", doc()->instance() );
+      TQValueList<KDataToolInfo> tools = KDataToolInfo::query( "TQString", "text/plain", doc()->instance() );
       if ( tools.count() > 0 )
       {
         d->popupMenu->insertSeparator();
@@ -6058,7 +6058,7 @@ void View::slotActivateTool( int _id )
 
   TQString text = activeSheet()->getWordSpelling( selectionInfo() );
 
-  if ( tool->run( entry->command, &text, TQSTRING_OBJECT_NAME_STRING, "text/plain") )
+  if ( tool->run( entry->command, &text, "TQString", "text/plain") )
   {
       doc()->emitBeginOperation(false);
 
diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h
index dd4d456f..8aade302 100644
--- a/kspread/plugins/calculator/main.h
+++ b/kspread/plugins/calculator/main.h
@@ -46,7 +46,7 @@ public:
     ~CalcFactory();
 
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-			     const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+			     const char* classname = "TQObject", const TQStringList &args = TQStringList() );
 
     static TDEInstance* global();
 
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index e23b9c56..22959809 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -658,7 +658,7 @@ class Samples:
 					'd = dcopext.DCOPApp(apps[0], dcopclient)',
 					'result,typename,data = d.appclient.call(apps[0],"klipper","getClipboardContents()","")',
 					'ds = tqt.TQDataStream(data, tqt.IO_ReadOnly)',
-					'print("Clipboard content:\\n%s" % tdecore.dcop_next(ds, TQSTRING_OBJECT_NAME_STRING))',
+					'print("Clipboard content:\\n%s" % tdecore.dcop_next(ds, "TQString"))',
 				)
 
 		class AmarokCollectionInfos:
@@ -708,7 +708,7 @@ class Samples:
 					'if not state: raise Exception("Failed to call the kopete contacts-function")',
 					'',
 					'ds = tqt.TQDataStream(rdata.data(), tqt.IO_ReadOnly)',
-					'sl = tdecore.dcop_next (ds, TQSTRINGLIST_OBJECT_NAME_STRING)',
+					'sl = tdecore.dcop_next (ds, "TQStringList")',
 					'print("contacts=%s" % [ str(s) for s in sl ])',
 				)
 
@@ -759,7 +759,7 @@ class Samples:
 					'',
 					'# Get the selected text.',
 					'(state,rtype,rdata) = d.appclient.call(appname, frameset.obj(), "selectedText()", "")',
-					'print("Selected Text: %s" % dataToList( rdata,[TQSTRING_OBJECT_NAME_STRING] )[0])',
+					'print("Selected Text: %s" % dataToList( rdata,["TQString"] )[0])',
 				)
 
 ####################################################################################