diff options
Diffstat (limited to 'wineconfig')
| -rw-r--r-- | wineconfig/kcm_wineconfig.cpp | 28 | ||||
| -rwxr-xr-x | wineconfig/wineconfig.py | 18 |
2 files changed, 23 insertions, 23 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); } } diff --git a/wineconfig/wineconfig.py b/wineconfig/wineconfig.py index 3b1cf85..1b6f5ef 100755 --- a/wineconfig/wineconfig.py +++ b/wineconfig/wineconfig.py @@ -55,7 +55,7 @@ isroot = os.getuid()==0 if standalone: programbase = KDialogBase else: - programbase = KCModule + programbase = TDECModule ############################################################################ class WineConfigApp(programbase): @@ -73,12 +73,12 @@ class WineConfigApp(programbase): if args.count() > 0: application = args.arg(0) else: - KCModule.__init__(self,parent,name) - self.setButtons(KCModule.Apply|KCModule.Reset) + TDECModule.__init__(self,parent,name) + self.setButtons(TDECModule.Apply|TDECModule.Reset) self.aboutdata = MakeAboutData() # Create a configuration object. - self.config = KConfig("wineconfigrc") + self.config = TDEConfig("wineconfigrc") # Compact mode means that we have to make the GUI # much smaller to fit on low resolution screens. @@ -356,7 +356,7 @@ class WineConfigApp(programbase): else: programbase.exec_loop(self) - def save(self): # KCModule + def save(self): # TDECModule # Find out what's changed generalchanged = self.generalpage.isChanged() driveschanged = not application and self.drivespage.isChanged() @@ -390,7 +390,7 @@ class WineConfigApp(programbase): def slotClose(self): # KDialogBase KDialogBase.slotClose(self) - def load(self): # KCModule + def load(self): # TDECModule self.__reset() self._sendChangedSignal() @@ -1812,7 +1812,7 @@ class AppearancePage(QWidget): appearance_tab_layout.addItem(bottomspacer) self.selecteditem = None - self.config = KConfig("wineconfigrc",False,False) + self.config = TDEConfig("wineconfigrc",False,False) self.reset() self.clearWState(Qt.WState_Polished) @@ -2111,7 +2111,7 @@ class AppearancePage(QWidget): def GetKdeColorScheme(self): """ Sets the current color scheme settings to those currently set in KDE """ # Create a configuration object. - config = KConfig("kdesktoprc") + config = TDEConfig("kdesktoprc") config.setGroup("General") self.customizableitems["Application Workspace"][0]["AppWorkSpace"][1] =\ @@ -3306,7 +3306,7 @@ class ApplicationsPage(QWidget): def GetKdeDefaultBrowser(self): """ Returns the default browser set in KDE """ # Create a configuration object. - config = KConfig("wineconfigrc") + config = TDEConfig("wineconfigrc") return str(config.lookupData(KEntryKey("General","BrowserApplication")).mValue).strip('!') def setMargin(self,margin): |