diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/xinerama | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/xinerama')
| -rw-r--r-- | kcontrol/xinerama/kcmxinerama.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index c70330779..607cd8754 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -218,7 +218,7 @@ void KCMXinerama::windowIndicator(int dpy) { TQWidget *KCMXinerama::indicator(int dpy) { TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", (WFlags)WX11BypassWM ); - TQFont fnt = KGlobalSettings::generalFont(); + TQFont fnt = TDEGlobalSettings::generalFont(); fnt.setPixelSize(100); si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); @@ -240,7 +240,7 @@ void KCMXinerama::clearIndicator() { extern "C" { KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) { - KGlobal::locale()->insertCatalogue("kcmxinerama"); + TDEGlobal::locale()->insertCatalogue("kcmxinerama"); return new KCMXinerama(parent, name); } |