summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:05:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:05:07 -0600
commit083a07ada07dd6a2f0165dcf9533fc10e49439cf (patch)
tree670941987f0cbf713c814364e962888e486f018e
parent12c7c0971ee0c7c1af65ff740daf55559689b0da (diff)
downloadpytdeextensions-083a07ada07dd6a2f0165dcf9533fc10e49439cf.tar.gz
pytdeextensions-083a07ada07dd6a2f0165dcf9533fc10e49439cf.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rwxr-xr-xapp_templates/kcontrol_module/src/kcontrol_module.py4
-rwxr-xr-xapp_templates/kdeapp/src/kdeapp.py2
-rwxr-xr-xapp_templates/kdeutility/src/kdeutility.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/app_templates/kcontrol_module/src/kcontrol_module.py b/app_templates/kcontrol_module/src/kcontrol_module.py
index 643d07a..9dde365 100755
--- a/app_templates/kcontrol_module/src/kcontrol_module.py
+++ b/app_templates/kcontrol_module/src/kcontrol_module.py
@@ -150,7 +150,7 @@ def main():
global kapp
about_data = AboutData()
KCmdLineArgs.init(sys.argv,about_data)
- kapp = KApplication()
+ kapp = TDEApplication()
myapp = KcontrolModuleApp()
myapp.exec_loop()
@@ -158,7 +158,7 @@ def main():
# Factory function for KControl
def create_kcontrol_module(parent,name):
global kapp
- kapp = KApplication.kApplication()
+ kapp = TDEApplication.kApplication()
return KcontrolModuleApp(parent, name)
############################################################################
diff --git a/app_templates/kdeapp/src/kdeapp.py b/app_templates/kdeapp/src/kdeapp.py
index ccf3124..d37400a 100755
--- a/app_templates/kdeapp/src/kdeapp.py
+++ b/app_templates/kdeapp/src/kdeapp.py
@@ -250,7 +250,7 @@ def main():
aboutdata.addAuthor("AUTHOR", None, "your@email.com")
KCmdLineArgs.init(sys.argv,aboutdata)
KCmdLineArgs.addCmdLineOptions(options)
- kapp = KApplication()
+ kapp = TDEApplication()
# register ourselves as a dcop client
kapp.dcopClient().registerAs(kapp.name(), False)
diff --git a/app_templates/kdeutility/src/kdeutility.py b/app_templates/kdeutility/src/kdeutility.py
index 83a997c..c19c5c5 100755
--- a/app_templates/kdeutility/src/kdeutility.py
+++ b/app_templates/kdeutility/src/kdeutility.py
@@ -41,7 +41,7 @@ def main():
aboutdata.addAuthor("AUTHOR", None, "your@email.com")
KCmdLineArgs.init(sys.argv,aboutdata)
#KCmdLineArgs.addCmdLineOptions(options)
- kapp = KApplication()
+ kapp = TDEApplication()
dialog = KDEUtilityDialog()
kapp.setMainWidget(dialog)