summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:18:36 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:18:36 -0600
commit6050d68cac9300b7f88913e0dcdd30b8b4acc55b (patch)
treef2effaeb8dddf7c54e69c3f41a952706f13b3477
parent7fd8a4bedf2cc2df7cd570611f052fbb19f450c8 (diff)
downloaddesktop-effects-tde-6050d68cac9300b7f88913e0dcdd30b8b4acc55b.tar.gz
desktop-effects-tde-6050d68cac9300b7f88913e0dcdd30b8b4acc55b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rwxr-xr-xDesktopEffects/DesktopEffectsKDE.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/DesktopEffects/DesktopEffectsKDE.py b/DesktopEffects/DesktopEffectsKDE.py
index 832e45f..cc45b07 100755
--- a/DesktopEffects/DesktopEffectsKDE.py
+++ b/DesktopEffects/DesktopEffectsKDE.py
@@ -72,12 +72,12 @@ class DesktopEffectsKDE(DesktopEffectsDialog, DesktopEffectsCommon):
# set the translations & icons
# Apply
self.applyButton.setText(__("tdelibs","&Apply"))
- self.applyButton.setIconSet(KGlobal.iconLoader().loadIconSet("apply",
+ self.applyButton.setIconSet(TDEGlobal.iconLoader().loadIconSet("apply",
KIcon.NoGroup, KIcon.SizeSmall))
# Close
self.cancelButton.setText(__("tdelibs","&Cancel"))
- self.cancelButton.setIconSet(KGlobal.iconLoader().loadIconSet("cancel",
+ self.cancelButton.setIconSet(TDEGlobal.iconLoader().loadIconSet("cancel",
KIcon.NoGroup, KIcon.SizeSmall))
# check the state
@@ -98,7 +98,7 @@ class DesktopEffectsKDE(DesktopEffectsDialog, DesktopEffectsCommon):
self.warningText.show()
self.warningIcon.show()
self.packageText.setText(_("The Compiz engine is installed in your system."))
- self.installButton.setIconSet(KGlobal.iconLoader().loadIconSet("remove",KIcon.NoGroup,KIcon.SizeSmall))
+ self.installButton.setIconSet(TDEGlobal.iconLoader().loadIconSet("remove",KIcon.NoGroup,KIcon.SizeSmall))
# remove, not install
self.rm = True
else:
@@ -110,7 +110,7 @@ class DesktopEffectsKDE(DesktopEffectsDialog, DesktopEffectsCommon):
# install, not remove
self.rm = False
#self.effectsBox.setDisabled(True)
- self.installButton.setIconSet(KGlobal.iconLoader().loadIconSet("add",KIcon.NoGroup,KIcon.SizeSmall))
+ self.installButton.setIconSet(TDEGlobal.iconLoader().loadIconSet("add",KIcon.NoGroup,KIcon.SizeSmall))
def checkInstalled(self):
progress = OpProgress()