diff options
| author | Michele Calgaro <[email protected]> | 2023-07-11 21:42:08 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-07-13 09:04:02 +0900 |
| commit | 462dc85dcb12aab8e19797dadf48799656708a54 (patch) | |
| tree | 901511cb5d29b2a094b1149d0621add8cb15c0e9 /kspread/plugins | |
| parent | 75cc9de8f47db776021b5e8153c930d9af2108b6 (diff) | |
| download | koffice-462dc85dcb12aab8e19797dadf48799656708a54.tar.gz koffice-462dc85dcb12aab8e19797dadf48799656708a54.zip | |
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 20e4a19b0d7cc800d57be50c56d69023adae4046)
Diffstat (limited to 'kspread/plugins')
| -rw-r--r-- | kspread/plugins/calculator/main.h | 2 | ||||
| -rwxr-xr-x | kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py | 6 |
2 files changed, 4 insertions, 4 deletions
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])', ) #################################################################################### |