From e5c4347deaf8b35481178a3e8af00ea1c60e184e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:21:29 -0600 Subject: Additional kde to tde renaming --- kspread/Makefile.am | 10 +++---- kspread/kspread_view.h | 2 +- kspread/plugins/scripting/Makefile.am | 2 +- kspread/plugins/scripting/kspreadcore/Makefile.am | 2 +- .../scripting/scripts/scripteditor/ScriptEditor.py | 32 +++++++++++----------- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kspread') diff --git a/kspread/Makefile.am b/kspread/Makefile.am index 29d44045..63bc28ac 100644 --- a/kspread/Makefile.am +++ b/kspread/Makefile.am @@ -28,23 +28,23 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \ kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \ kspread_generalProperty.cpp kspread_propertyEditor.cpp -libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \ dialogs/libdialogs.la tests/libtests.la \ $(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell -libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkspreadpart_la_LIBADD = libkspreadcommon.la libkspreadpart_la_SOURCES = kspread_factory_init.cc METASOURCES = AUTO -## The kdeinit loadable module and the executable -kdeinit_LTLIBRARIES = kspread.la +## The tdeinit loadable module and the executable +tdeinit_LTLIBRARIES = kspread.la bin_PROGRAMS = kspread_la_SOURCES = main.cc -kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kspread_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kspread.desktop diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h index 72763800..2dfecfa5 100644 --- a/kspread/kspread_view.h +++ b/kspread/kspread_view.h @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am index ee1573d5..dc1e7ff2 100644 --- a/kspread/plugins/scripting/Makefile.am +++ b/kspread/plugins/scripting/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = scripting.h kspreadscripting_la_METASOURCES = AUTO -kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kspreadscripting_la_LIBADD = $(top_builddir)/kspread/libkspreadcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la kde_services_DATA = kspreadscripting.desktop diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am index 2e74c258..86bcded9 100644 --- a/kspread/plugins/scripting/kspreadcore/Makefile.am +++ b/kspread/plugins/scripting/kspreadcore/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = krosskspreadcore.la krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp -krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui +krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui krosskspreadcore_la_LIBADD = \ $(LIB_QT) \ $(LIB_KDECORE) \ diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index 7afde8b9..e3d6237c 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -651,13 +651,13 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'import qt, tdecore, dcop, dcopext', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("klipper") ]', 'd = dcopext.DCOPApp(apps[0], dcopclient)', 'result,typename,data = d.appclient.call(apps[0],"klipper","getClipboardContents()","")', 'ds = qt.QDataStream(data, qt.IO_ReadOnly)', - 'print "Clipboard content:\\n%s" % kdecore.dcop_next(ds, TQSTRING_OBJECT_NAME_STRING)', + 'print "Clipboard content:\\n%s" % tdecore.dcop_next(ds, TQSTRING_OBJECT_NAME_STRING)', ) class AmarokCollectionInfos: @@ -668,17 +668,17 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', + 'import qt, tdecore, dcop, dcopext', '', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("amarok") ]', 'app = apps[0]', 'd = dcopext.DCOPApp(app, dcopclient)', '', 'def dataToList(data, types = []):', - ' import qt, kdecore', + ' import qt, tdecore', ' ds = qt.QDataStream(data, qt.IO_ReadOnly)', - ' return [ kdecore.dcop_next(ds, t) for t in types ]', + ' return [ tdecore.dcop_next(ds, t) for t in types ]', '', 'for funcname in ["totalAlbums","totalArtists","totalCompilations","totalGenres","totalTracks"]:', ' result,replytype,replydata = d.appclient.call("amarok", "collection", "%s()" % funcname,"")', @@ -693,9 +693,9 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', + 'import qt, tdecore, dcop, dcopext', '', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("kopete") ]', 'app = apps[0]', 'd = dcopext.DCOPApp(app, dcopclient)', @@ -704,7 +704,7 @@ class Samples: 'if not state: raise "Failed to call the kopete contacts-function"', '', 'ds = qt.QDataStream(rdata.data(), qt.IO_ReadOnly)', - 'sl = kdecore.dcop_next (ds, TQSTRINGLIST_OBJECT_NAME_STRING)', + 'sl = tdecore.dcop_next (ds, TQSTRINGLIST_OBJECT_NAME_STRING)', 'print "contacts=%s" % [ str(s) for s in sl ]', ) @@ -716,22 +716,22 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', + 'import qt, tdecore, dcop, dcopext', '', 'def dataToList(data, types = []):', - ' import qt, kdecore', + ' import qt, tdecore', ' ds = qt.QDataStream(data, qt.IO_ReadOnly)', - ' return [ kdecore.dcop_next(ds, t) for t in types ]', + ' return [ tdecore.dcop_next(ds, t) for t in types ]', 'def listToData(listdict):', - ' import qt, kdecore', + ' import qt, tdecore', ' ba= qt.QByteArray()', ' ds = qt.QDataStream(ba, qt.IO_WriteOnly)', ' for (typename,value) in listdict:', - ' kdecore.dcop_add (ds, value, typename)', + ' tdecore.dcop_add (ds, value, typename)', ' return ba', '', '# Get the KWord DCOP client.', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("kword") ]', 'if len(apps) < 1: raise "No KWord instance is running. Please start KWord before!"', 'appname = apps[0]', -- cgit v1.2.1