summaryrefslogtreecommitdiffstats
path: root/languages/python
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /languages/python
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'languages/python')
-rw-r--r--languages/python/pydoc.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp
index ef4111bb..1c07b404 100644
--- a/languages/python/pydoc.cpp
+++ b/languages/python/pydoc.cpp
@@ -19,7 +19,7 @@ using namespace KIO;
PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app)
: SlaveBase("pydoc", pool, app), key()
{
- python = KGlobal::dirs()->findExe("python");
+ python = TDEGlobal::dirs()->findExe("python");
script = locate("data", "kio_pydoc/kde_pydoc.py");
}
@@ -33,11 +33,11 @@ void PydocProtocol::get(const KURL& url)
mimeType("text/html");
key = url.path();
- TQString cmd = KProcess::quote(python);
+ TQString cmd = TDEProcess::quote(python);
cmd += " ";
- cmd += KProcess::quote(script);
+ cmd += TDEProcess::quote(script);
cmd += " -w ";
- cmd += KProcess::quote(key);
+ cmd += TDEProcess::quote(key);
FILE *fd = popen(cmd.local8Bit().data(), "r");
char buffer[4096];
@@ -97,7 +97,7 @@ extern "C" {
int kdemain(int argc, char **argv)
{
TDEInstance instance( "kio_pydoc" );
- KGlobal::locale()->setMainCatalogue("tdevelop");
+ TDEGlobal::locale()->setMainCatalogue("tdevelop");
if (argc != 4) {
fprintf(stderr, "Usage: kio_pydoc protocol domain-socket1 domain-socket2\n");