summaryrefslogtreecommitdiffstats
path: root/kcontrol/background/bgsettings.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcontrol/background/bgsettings.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/background/bgsettings.cpp')
-rw-r--r--kcontrol/background/bgsettings.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 90d028e22..8d3bdac0f 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -751,7 +751,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_BackgroundMode = defBackgroundMode;
s = m_pConfig->readEntry("BackgroundMode", "invalid");
- if (m_BMMap.tqcontains(s)) {
+ if (m_BMMap.contains(s)) {
int mode = m_BMMap[s];
// consistency check
if ( ((mode != Pattern) && (mode != Program)) ||
@@ -763,7 +763,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_BlendMode = defBlendMode;
s = m_pConfig->readEntry("BlendMode", "invalid");
- if (m_BlMMap.tqcontains(s)) {
+ if (m_BlMMap.contains(s)) {
m_BlendMode = m_BlMMap[s];
}
@@ -784,7 +784,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_MultiMode = defMultiMode;
s = m_pConfig->readEntry("MultiWallpaperMode");
- if (m_MMMap.tqcontains(s)) {
+ if (m_MMMap.contains(s)) {
int mode = m_MMMap[s];
m_MultiMode = mode;
}
@@ -799,7 +799,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_WallpaperMode = defWallpaperMode;
m_Wallpaper = m_pConfig->readPathEntry("Wallpaper");
s = m_pConfig->readEntry("WallpaperMode", "invalid");
- if (m_WMMap.tqcontains(s)) {
+ if (m_WMMap.contains(s)) {
int mode = m_WMMap[s];
// consistency check.
if ((mode == NoWallpaper) || !m_Wallpaper.isEmpty() || (m_MultiMode == InOrder || m_MultiMode == Random))
@@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
s += TQString("wm:%1;").arg(m_WallpaperMode);
if (m_WallpaperMode != NoWallpaper)
{
- TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
+ Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
}