summaryrefslogtreecommitdiffstats
path: root/kig/scripting
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
commitfccf6d244a4d60c3138afa81266e22ac65adddbc (patch)
treece62ccdaca3fffebeb33ad213dc5cea82ceff580 /kig/scripting
parent273ccce287bccee117bbfff8ca3386d613aec467 (diff)
downloadtdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.tar.gz
tdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kig/scripting')
-rw-r--r--kig/scripting/newscriptwizard.cc8
-rw-r--r--kig/scripting/python_scripter.cc4
2 files changed, 6 insertions, 6 deletions
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index c883a159..a9f83390 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -23,14 +23,14 @@
#include <tqlabel.h>
#include <tqlayout.h>
-//#include <kactionclasses.h>
-//#include <kactioncollection.h>
+//#include <tdeactionclasses.h>
+//#include <tdeactioncollection.h>
// make it still work on old kde 3.1...
-#include <kaction.h>
+#include <tdeaction.h>
//
#include <kapplication.h>
#include <kglobalsettings.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ktextedit.h>
#include <tdetexteditor/clipboardinterface.h>
#include <tdetexteditor/dynwordwrapinterface.h>
diff --git a/kig/scripting/python_scripter.cc b/kig/scripting/python_scripter.cc
index 7e833d5c..81f377ac 100644
--- a/kig/scripting/python_scripter.cc
+++ b/kig/scripting/python_scripter.cc
@@ -539,12 +539,12 @@ void PythonScripter::saveErrors()
object printexcfunc = d->mainnamespace[ "traceback" ].attr( "format_exception" );
- list tracebacklist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
+ list tracebactdelist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
str tracebackstr( "" );
while ( true )
{
try {
- str s = extract<str>( tracebacklist.pop() );
+ str s = extract<str>( tracebactdelist.pop() );
tracebackstr += s;
}
catch( ... )