diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:54 -0600 |
| commit | 4066d7fb18b31353b86afa9fc1d94d492008e733 (patch) | |
| tree | 4b4b8888abd5cd6523601b770b188927d259d8e6 /displayconfig | |
| parent | 3a80ef8a0d25cc90b92b41dccd698b5d7ec9dc13 (diff) | |
| download | tde-guidance-4066d7fb18b31353b86afa9fc1d94d492008e733.tar.gz tde-guidance-4066d7fb18b31353b86afa9fc1d94d492008e733.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'displayconfig')
| -rwxr-xr-x | displayconfig/displayconfig.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/displayconfig/displayconfig.py b/displayconfig/displayconfig.py index c486a40..ac8c8ce 100755 --- a/displayconfig/displayconfig.py +++ b/displayconfig/displayconfig.py @@ -394,7 +394,7 @@ class DisplayApp(programbase): ######################################################################## def __init__(self,parent=None,name=None): global standalone,isroot,kapp - KGlobal.locale().insertCatalogue("guidance") + TDEGlobal.locale().insertCatalogue("guidance") if standalone: KDialogBase.__init__(self,KJanusWidget.Tabbed,"Display Configuration",\ @@ -418,10 +418,10 @@ class DisplayApp(programbase): # much smaller to fit on low resolution screens. self.compact_mode = kapp.desktop().height()<=600 - KGlobal.iconLoader().addAppDir("guidance") + TDEGlobal.iconLoader().addAppDir("guidance") global imagedir - imagedir = unicode(KGlobal.dirs().findDirs("data","guidance/pics/displayconfig")[0]) + imagedir = unicode(TDEGlobal.dirs().findDirs("data","guidance/pics/displayconfig")[0]) self.imagedir = imagedir @@ -437,7 +437,7 @@ class DisplayApp(programbase): self.xf86server = xf86misc.XF86Server() self.xconfigpath = self._findXorgConfig() - SetDataFileDir(unicode(KGlobal.dirs().findResourceDir("data","guidance/pcitable")) + "guidance/") + SetDataFileDir(unicode(TDEGlobal.dirs().findResourceDir("data","guidance/pcitable")) + "guidance/") self.xsetup = XSetup(self.xconfigpath) self.updatingGUI = True @@ -982,7 +982,7 @@ class DisplayApp(programbase): if testserver is not None: # Start the timed popup on the :9 display. - #servertestpy = str(KGlobal.dirs().findResource("data","guidance/servertestdialog.py")) + #servertestpy = str(TDEGlobal.dirs().findResource("data","guidance/servertestdialog.py")) servertestpy = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),"servertestdialog.py") pythonexe = unicode(KStandardDirs.findExe("python")) |