summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 16:16:59 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 16:16:59 -0600
commit3979d62a07c552544833195d20d371e11cc4b69f (patch)
tree27e7f64a91037df9b9db79c6fd3e7a6e5a09bf4f
parent2d5b7ef7c2e7c5dc982b66ab3f4210a5cf605c73 (diff)
downloadtde-guidance-3979d62a07c552544833195d20d371e11cc4b69f.tar.gz
tde-guidance-3979d62a07c552544833195d20d371e11cc4b69f.zip
Fix FTBFS resulting from KCModule rename
-rw-r--r--wineconfig/kcm_wineconfig.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/wineconfig/kcm_wineconfig.cpp b/wineconfig/kcm_wineconfig.cpp
index bdaf708..d91dd3c 100644
--- a/wineconfig/kcm_wineconfig.cpp
+++ b/wineconfig/kcm_wineconfig.cpp
@@ -9,7 +9,7 @@
// pythonize.h must be included first.
#include <pythonize.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kglobal.h>
#include <klocale.h>
#include <klibloader.h>
@@ -34,7 +34,7 @@ static TDECModule *report_error(char *msg) {
}
static TDECModule* return_instance( QWidget *parent, const char *name ) {
- TDECModule* kcmodule;
+ TDECModule* tdecmodule;
PyObject *pyTDECModuleTuple;
PyObject *pyTDECModule;
Pythonize *pyize; // Pythonize object to manage the Python interpreter.
@@ -129,8 +129,8 @@ static TDECModule* return_instance( QWidget *parent, const char *name ) {
// convert the TDECModule PyObject to a real C++ TDECModule *.
isErr = 0;
pyTDECModule = PyTuple_GET_ITEM(pyTDECModuleTuple,1);
- kcmodule = (TDECModule *)PyLong_AsVoidPtr(pyTDECModule);
- if(!kcmodule) {
+ tdecmodule = (TDECModule *)PyLong_AsVoidPtr(pyTDECModule);
+ if(!tdecmodule) {
return report_error ("***failed sip conversion to C++ pointer\n");
}
pyize->decref(pyTDECModuleTuple);
@@ -145,7 +145,7 @@ static TDECModule* return_instance( QWidget *parent, const char *name ) {
TDEGlobal::locale()->insertCatalogue(script);
// Return the pointer to our new TDECModule
- return kcmodule;
+ return tdecmodule;
}
extern "C" {