summaryrefslogtreecommitdiffstats
path: root/kspread
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-19 23:57:47 -0600
committerTimothy Pearson <[email protected]>2013-01-19 23:57:47 -0600
commit6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch)
tree7e66b929b5455837f22ea54ed91fc9af6f64f7bf /kspread
parent68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff)
downloadkoffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz
koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kspread')
-rwxr-xr-xkspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py8
-rw-r--r--kspread/tests/test_formula.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index c6da1fe2..4356c90d 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -652,7 +652,7 @@ class Samples:
def getCode(self):
return (
'import qt, tdecore, dcop, dcopext',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.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()","")',
@@ -670,7 +670,7 @@ class Samples:
return (
'import qt, tdecore, dcop, dcopext',
'',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.dcopClient()',
'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("amarok") ]',
'app = apps[0]',
'd = dcopext.DCOPApp(app, dcopclient)',
@@ -695,7 +695,7 @@ class Samples:
return (
'import qt, tdecore, dcop, dcopext',
'',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.dcopClient()',
'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("kopete") ]',
'app = apps[0]',
'd = dcopext.DCOPApp(app, dcopclient)',
@@ -731,7 +731,7 @@ class Samples:
' return ba',
'',
'# Get the KWord DCOP client.',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.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]',
diff --git a/kspread/tests/test_formula.cc b/kspread/tests/test_formula.cc
index 2d992085..45538e79 100644
--- a/kspread/tests/test_formula.cc
+++ b/kspread/tests/test_formula.cc
@@ -52,7 +52,7 @@ int main( int argc, char** argv )
{
// Initialize command line args
TDECmdLineArgs::init(argc, argv, "formulatest", "formulatest", "unit test", "0.1", true);
- KApplication app(false, false);
+ TDEApplication app(false, false);
run( new FormulaParserTester() );
run( new FormulaEvalTester() );