Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 39ae18201b
commit 58229b7f2f

@ -69,7 +69,7 @@ class KcontrolModuleApp(programbase):
# The appdir needs to be explicitly otherwise we won't be able to
# load our icons and images.
KGlobal.iconLoader().addAppDir("kcontrol_module")
TDEGlobal.iconLoader().addAppDir("kcontrol_module")
if standalone:
toplayout = QVBoxLayout( self.plainPage(), 0, KDialog.spacingHint() )

@ -223,13 +223,13 @@ class KdeApp(KMainWindow):
def optionsConfigureToolbars(self):
# use the standard toolbar editor
self.saveMainWindowSettings(KGlobal.config())
self.saveMainWindowSettings(TDEGlobal.config())
def newToolbarConfig(self):
# this slot is called when user clicks "Ok" or "Apply" in the toolbar editor.
# recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
self.createGUI()
self.applyMainWindowSettings(KGlobal.config())
self.applyMainWindowSettings(TDEGlobal.config())
def changeStatusbar(self,text):
# display the text on the statusbar

@ -988,7 +988,7 @@ static KCModule* return_instance( QWidget *parent, const char *name ) {
//pyize->releaseLock ();
// take care of any translation info
KGlobal::locale()->insertCatalogue(script);
TDEGlobal::locale()->insertCatalogue(script);
// Return the pointer to our new KCModule
return kcmodule;

Loading…
Cancel
Save