From 91de85901bde4c10196c4be34604043e622bec46 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 21 Jan 2013 18:37:40 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- app_templates/kcontrol_module/src/kcontrol_module.py | 2 +- app_templates/kdeapp/src/kdeapp.py | 6 +++--- app_templates/kdeutility/src/kdeutility.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app_templates/kcontrol_module/src/kcontrol_module.py b/app_templates/kcontrol_module/src/kcontrol_module.py index 9dde365..75c9ade 100755 --- a/app_templates/kcontrol_module/src/kcontrol_module.py +++ b/app_templates/kcontrol_module/src/kcontrol_module.py @@ -149,7 +149,7 @@ class KcontrolModuleApp(programbase): def main(): global kapp about_data = AboutData() - KCmdLineArgs.init(sys.argv,about_data) + TDECmdLineArgs.init(sys.argv,about_data) kapp = TDEApplication() myapp = KcontrolModuleApp() myapp.exec_loop() diff --git a/app_templates/kdeapp/src/kdeapp.py b/app_templates/kdeapp/src/kdeapp.py index d37400a..48a0783 100755 --- a/app_templates/kdeapp/src/kdeapp.py +++ b/app_templates/kdeapp/src/kdeapp.py @@ -248,8 +248,8 @@ def main(): aboutdata = KAboutData("kdeapp", "KdeApp", version, description, \ KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "your@email.com") aboutdata.addAuthor("AUTHOR", None, "your@email.com") - KCmdLineArgs.init(sys.argv,aboutdata) - KCmdLineArgs.addCmdLineOptions(options) + TDECmdLineArgs.init(sys.argv,aboutdata) + TDECmdLineArgs.addCmdLineOptions(options) kapp = TDEApplication() # register ourselves as a dcop client @@ -263,7 +263,7 @@ def main(): n += 1 else: # no session.. just start up normally - args = KCmdLineArgs.parsedArgs() + args = TDECmdLineArgs.parsedArgs() if args.count() == 0: widget = KdeApp() widget.show() diff --git a/app_templates/kdeutility/src/kdeutility.py b/app_templates/kdeutility/src/kdeutility.py index c19c5c5..cda1bd8 100755 --- a/app_templates/kdeutility/src/kdeutility.py +++ b/app_templates/kdeutility/src/kdeutility.py @@ -39,8 +39,8 @@ def main(): aboutdata = KAboutData("kdeutility", "KdeUtility", version, description, \ KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "your@email.com") aboutdata.addAuthor("AUTHOR", None, "your@email.com") - KCmdLineArgs.init(sys.argv,aboutdata) - #KCmdLineArgs.addCmdLineOptions(options) + TDECmdLineArgs.init(sys.argv,aboutdata) + #TDECmdLineArgs.addCmdLineOptions(options) kapp = TDEApplication() dialog = KDEUtilityDialog()