Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

1 files changed, 14 insertions, 14 deletions

diff --git a/wineconfig/kcm_wineconfig.cpp b/wineconfig/kcm_wineconfig.cpp
index 7a34a4e..bdaf708 100644
--- a/wineconfig/kcm_wineconfig.cpp
+++ b/wineconfig/kcm_wineconfig.cpp
@@ -28,15 +28,15 @@
 #define LIB_PYTHON "libpython2.5.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;
     
@@ -111,8 +111,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;");
         }
@@ -124,16 +124,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);
     
     // PyKDE can't run the module without this - Pythonize
     // grabs the lock at initialization and we have to give
@@ -144,13 +144,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);
     }
 }