diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:03:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:03:33 -0600 |
| commit | 48e3133af032d731c7ba5bb98bbb3b23433e981f (patch) | |
| tree | 56737d072f8109c74319ddcc23e87670acba6860 | |
| parent | 91de85901bde4c10196c4be34604043e622bec46 (diff) | |
| download | pytdeextensions-48e3133af032d731c7ba5bb98bbb3b23433e981f.tar.gz pytdeextensions-48e3133af032d731c7ba5bb98bbb3b23433e981f.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rwxr-xr-x | app_templates/kcontrol_module/src/kcontrol_module.py | 6 | ||||
| -rwxr-xr-x | app_templates/kdeapp/src/kdeapp.py | 4 | ||||
| -rwxr-xr-x | app_templates/kdeutility/src/kdeutility.py | 4 | ||||
| -rw-r--r-- | src/kdedistutils.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app_templates/kcontrol_module/src/kcontrol_module.py b/app_templates/kcontrol_module/src/kcontrol_module.py index 75c9ade..a33e43e 100755 --- a/app_templates/kcontrol_module/src/kcontrol_module.py +++ b/app_templates/kcontrol_module/src/kcontrol_module.py @@ -30,8 +30,8 @@ version = "0.1" def AboutData(): global version,description - about_data = KAboutData("kcontrol_module", "kcontrol_module", version, \ - description, KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None,\ + about_data = TDEAboutData("kcontrol_module", "kcontrol_module", version, \ + description, TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None,\ about_data.addAuthor("AUTHOR", None, "[email protected]") return about_data @@ -137,7 +137,7 @@ class KcontrolModuleApp(programbase): pass def aboutData(self): - # Return the KAboutData object which we created during initialisation. + # Return the TDEAboutData object which we created during initialisation. return self.aboutdata def buttons(self): diff --git a/app_templates/kdeapp/src/kdeapp.py b/app_templates/kdeapp/src/kdeapp.py index 48a0783..12c30bd 100755 --- a/app_templates/kdeapp/src/kdeapp.py +++ b/app_templates/kdeapp/src/kdeapp.py @@ -245,8 +245,8 @@ options = [ ("+[URL]", "Document to open", "") ] def main(): global kapp,version,description,options - aboutdata = KAboutData("kdeapp", "KdeApp", version, description, \ - KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "[email protected]") + aboutdata = TDEAboutData("kdeapp", "KdeApp", version, description, \ + TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "[email protected]") aboutdata.addAuthor("AUTHOR", None, "[email protected]") TDECmdLineArgs.init(sys.argv,aboutdata) TDECmdLineArgs.addCmdLineOptions(options) diff --git a/app_templates/kdeutility/src/kdeutility.py b/app_templates/kdeutility/src/kdeutility.py index cda1bd8..73a6833 100755 --- a/app_templates/kdeutility/src/kdeutility.py +++ b/app_templates/kdeutility/src/kdeutility.py @@ -36,8 +36,8 @@ options = [] # No command line options. def main(): global kapp,version,description,options - aboutdata = KAboutData("kdeutility", "KdeUtility", version, description, \ - KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "[email protected]") + aboutdata = TDEAboutData("kdeutility", "KdeUtility", version, description, \ + TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "[email protected]") aboutdata.addAuthor("AUTHOR", None, "[email protected]") TDECmdLineArgs.init(sys.argv,aboutdata) #TDECmdLineArgs.addCmdLineOptions(options) diff --git a/src/kdedistutils.py b/src/kdedistutils.py index 64f274c..5abc663 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -1836,7 +1836,7 @@ PyObject* call_function(PyObject *callable, PyObject *args) { extern "C" { int kdemain( int argc, char **argv) { PyObject *pModule, *pName, *pDict; - KInstance slave(MODULE_NAME); + TDEInstance slave(MODULE_NAME); Py_SetProgramName(argv[0]); Py_Initialize(); |