From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kcontrol/background/bgdialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kcontrol/background/bgdialog.cpp') diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 53b095be1..2905d7ac7 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -69,8 +69,8 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) : BGDialog_UI(parent, "BGDialog") { - m_pGlobals = new KGlobalBackgroundSettings(_config); - m_pDirs = KGlobal::dirs(); + m_pGlobals = new TDEGlobalBackgroundSettings(_config); + m_pDirs = TDEGlobal::dirs(); m_multidesktop = _multidesktop; m_previewUpdates = true; @@ -246,7 +246,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) if (m_wallpaperPos == KBackgroundSettings::NoWallpaper) m_wallpaperPos = KBackgroundSettings::Centred; // Default - if (KGlobal::dirs()->isRestrictedResource("wallpaper")) + if (TDEGlobal::dirs()->isRestrictedResource("wallpaper")) { m_urlWallpaperButton->hide(); m_buttonSetupWallpapers->hide(); @@ -407,7 +407,7 @@ void BGDialog::slotIdentifyScreens() { TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM)); - TQFont identifyFont(KGlobalSettings::generalFont()); + TQFont identifyFont(TDEGlobalSettings::generalFont()); identifyFont.setPixelSize(100); screenLabel->setFont(identifyFont); @@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff() //FIXME set this to a server when we get one //should really be in a .rc file but could be either //kcmshellrc or kcontrolrc - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("KNewStuff"); config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" ); config->writeEntry( "StandardResource", "wallpaper" ); -- cgit v1.2.1