summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:18:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:18:25 -0600
commit84fba9037b6e998250f30968b0d9c79a6af4637a (patch)
tree0baefd17473cdfe4aeeffe5b471ee1c50c67462a /src
parent58229b7f2f011bb94adadea107eff15e929ccb3c (diff)
downloadpytdeextensions-84fba9037b6e998250f30968b0d9c79a6af4637a.tar.gz
pytdeextensions-84fba9037b6e998250f30968b0d9c79a6af4637a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/kdedistutils.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index c9749c0..7af6a21 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -886,15 +886,15 @@ class BuildKControlModule(Command):
#define LIB_PYTHON "libpython%(python_version)s.so"
#define debug 1
-static KCModule *report_error(char *msg) {
+static TDECModule *report_error(char *msg) {
if (debug) printf ("error: %%s\n", msg);
return NULL;
}
-static KCModule* return_instance( QWidget *parent, const char *name ) {
- KCModule* kcmodule;
- PyObject *pyKCModuleTuple;
- PyObject *pyKCModule;
+static TDECModule* return_instance( QWidget *parent, const char *name ) {
+ TDECModule* kcmodule;
+ PyObject *pyTDECModuleTuple;
+ PyObject *pyTDECModule;
Pythonize *pyize; // Pythonize object to manage the Python interpreter.
int isErr;
@@ -957,8 +957,8 @@ static KCModule* return_instance( QWidget *parent, const char *name ) {
PyObject *args = Py_BuildValue ("NN", pyParent, pyName);
if(pyName && pyParent && args) {
// run the factory function
- pyKCModuleTuple = pyize->runFunction(kcmFactory, args);
- if(!pyKCModuleTuple) {
+ pyTDECModuleTuple = pyize->runFunction(kcmFactory, args);
+ if(!pyTDECModuleTuple) {
PyErr_Print();
return report_error ("*** runFunction failure\n;");
}
@@ -970,16 +970,16 @@ static KCModule* return_instance( QWidget *parent, const char *name ) {
pyize->decref(kcmFactory);
// Stop this from getting garbage collected.
- Py_INCREF(PyTuple_GET_ITEM(pyKCModuleTuple,0));
+ Py_INCREF(PyTuple_GET_ITEM(pyTDECModuleTuple,0));
- // convert the KCModule PyObject to a real C++ KCModule *.
+ // convert the TDECModule PyObject to a real C++ TDECModule *.
isErr = 0;
- pyKCModule = PyTuple_GET_ITEM(pyKCModuleTuple,1);
- kcmodule = (KCModule *)PyLong_AsVoidPtr(pyKCModule);
+ pyTDECModule = PyTuple_GET_ITEM(pyTDECModuleTuple,1);
+ kcmodule = (TDECModule *)PyLong_AsVoidPtr(pyTDECModule);
if(!kcmodule) {
return report_error ("***failed sip conversion to C++ pointer\n");
}
- pyize->decref(pyKCModuleTuple);
+ pyize->decref(pyTDECModuleTuple);
// PyTDE can't run the module without this - Pythonize
// grabs the lock at initialization and we have to give
@@ -990,13 +990,13 @@ static KCModule* return_instance( QWidget *parent, const char *name ) {
// take care of any translation info
TDEGlobal::locale()->insertCatalogue(script);
- // Return the pointer to our new KCModule
+ // Return the pointer to our new TDECModule
return kcmodule;
}
extern "C" {
// Factory function that kcontrol will call.
- KCModule* CPP_FACTORY(QWidget *parent, const char *name) {
+ TDECModule* CPP_FACTORY(QWidget *parent, const char *name) {
return return_instance(parent, name);
}
}