diff options
| author | Darrell Anderson <[email protected]> | 2013-11-28 13:30:19 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-11-28 13:30:19 -0600 |
| commit | 90f1f50f00651f7bc9f8acf50556968b4288400d (patch) | |
| tree | 8d5df88cb28a00efd2c8b9f3c6b1ca7e6063ada9 /kcontrol/background | |
| parent | 1c37295608c6d783b2b710f423befbcfb0068bbd (diff) | |
| download | tdebase-90f1f50f00651f7bc9f8acf50556968b4288400d.tar.gz tdebase-90f1f50f00651f7bc9f8acf50556968b4288400d.zip | |
Fix remnant QMIN/QMAX to TQMIN/TQMAX.
Diffstat (limited to 'kcontrol/background')
| -rw-r--r-- | kcontrol/background/bgmonitor.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/background/bgrender.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/background/bgwallpaper.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index b9283360a..c05e70e5f 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -100,7 +100,7 @@ void BGMonitorArrangement::updateArrangement() TQRect expandedOverallGeometry = expandToPreview(overallGeometry); - double scale = QMIN( + double scale = TQMIN( double(width()) / double(expandedOverallGeometry.width()), double(height()) / double(expandedOverallGeometry.height()) ); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 08cb3055f..f6db68f70 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -218,8 +218,8 @@ int KBackgroundRenderer::doBackground(bool quit) int w = m_Background.width(); int h = m_Background.height(); if ((w > m_Size.width()) || (h > m_Size.height())) { - w = QMIN(w, m_Size.width()); - h = QMIN(h, m_Size.height()); + w = TQMIN(w, m_Size.width()); + h = TQMIN(h, m_Size.height()); m_Background = m_Background.copy(0, 0, w, h); } KImageEffect::flatten(m_Background, colorA(), colorB(), 0); @@ -645,7 +645,7 @@ void KBackgroundRenderer::fullWallpaperBlend() for (int y = m_WallpaperRect.top(); y < m_WallpaperRect.bottom(); y += wh) { for (int x = m_WallpaperRect.left(); x < m_WallpaperRect.right(); x += ww) { blend(m_Image, TQRect(x, y, ww, wh), m_Wallpaper, - TQPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor); + TQPoint(-TQMIN(x, 0), -TQMIN(y, 0)), blendFactor); } } } diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index 460c9c56c..5e43caa4d 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -107,7 +107,7 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, dlg->m_spinInterval->setSuffix(i18n(" min")); // Load - dlg->m_spinInterval->setValue(QMAX(1,m_pSettings->wallpaperChangeInterval())); + dlg->m_spinInterval->setValue(TQMAX(1,m_pSettings->wallpaperChangeInterval())); dlg->m_listImages->insertStringList(m_pSettings->wallpaperList()); |