Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 12c7c0971e
commit 083a07ada0

@ -150,7 +150,7 @@ def main():
global kapp global kapp
about_data = AboutData() about_data = AboutData()
KCmdLineArgs.init(sys.argv,about_data) KCmdLineArgs.init(sys.argv,about_data)
kapp = KApplication() kapp = TDEApplication()
myapp = KcontrolModuleApp() myapp = KcontrolModuleApp()
myapp.exec_loop() myapp.exec_loop()
@ -158,7 +158,7 @@ def main():
# Factory function for KControl # Factory function for KControl
def create_kcontrol_module(parent,name): def create_kcontrol_module(parent,name):
global kapp global kapp
kapp = KApplication.kApplication() kapp = TDEApplication.kApplication()
return KcontrolModuleApp(parent, name) return KcontrolModuleApp(parent, name)
############################################################################ ############################################################################

@ -250,7 +250,7 @@ def main():
aboutdata.addAuthor("AUTHOR", None, "your@email.com") aboutdata.addAuthor("AUTHOR", None, "your@email.com")
KCmdLineArgs.init(sys.argv,aboutdata) KCmdLineArgs.init(sys.argv,aboutdata)
KCmdLineArgs.addCmdLineOptions(options) KCmdLineArgs.addCmdLineOptions(options)
kapp = KApplication() kapp = TDEApplication()
# register ourselves as a dcop client # register ourselves as a dcop client
kapp.dcopClient().registerAs(kapp.name(), False) kapp.dcopClient().registerAs(kapp.name(), False)

@ -41,7 +41,7 @@ def main():
aboutdata.addAuthor("AUTHOR", None, "your@email.com") aboutdata.addAuthor("AUTHOR", None, "your@email.com")
KCmdLineArgs.init(sys.argv,aboutdata) KCmdLineArgs.init(sys.argv,aboutdata)
#KCmdLineArgs.addCmdLineOptions(options) #KCmdLineArgs.addCmdLineOptions(options)
kapp = KApplication() kapp = TDEApplication()
dialog = KDEUtilityDialog() dialog = KDEUtilityDialog()
kapp.setMainWidget(dialog) kapp.setMainWidget(dialog)

Loading…
Cancel
Save