From 90f1f50f00651f7bc9f8acf50556968b4288400d Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 28 Nov 2013 13:30:19 -0600 Subject: Fix remnant QMIN/QMAX to TQMIN/TQMAX. --- kcontrol/background/bgmonitor.cpp | 2 +- kcontrol/background/bgrender.cpp | 6 +++--- kcontrol/background/bgwallpaper.cpp | 2 +- kcontrol/clock/dtime.cpp | 2 +- kcontrol/joystick/joywidget.cpp | 4 ++-- kcontrol/kcontrol/main.cpp | 4 ++-- kcontrol/kcontrol/moduletreeview.cpp | 2 +- kcontrol/tdeio/ksaveioconfig.cpp | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kcontrol') 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()); diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index d469b1ff9..a492c9deb 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -381,7 +381,7 @@ void Kclock::paintEvent( TQPaintEvent * ) TQPointArray pts; TQPoint cp = rect().center(); - int d = QMIN(width(),height()); + int d = TQMIN(width(),height()); TQColor hands = colorGroup().dark(); TQColor shadow = colorGroup().text(); paint.setPen( shadow ); diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index 8e1ff5586..67ea30eeb 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -87,7 +87,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) // calculate the column width we need TQFontMetrics fm(font()); - int colWidth = QMAX(fm.width(PRESSED), fm.width("-32767")) + 10; // -32767 largest string + int colWidth = TQMAX(fm.width(PRESSED), fm.width("-32767")) + 10; // -32767 largest string new TQLabel(i18n("Buttons:"), vboxMid); buttonTbl = new TQTable(0, 1, vboxMid); @@ -282,7 +282,7 @@ void JoyWidget::showDeviceProps(JoyDevice *joy) idle->start(0); // make both tables use the same space for header; this looks nicer - buttonTbl->setLeftMargin(QMAX(buttonTbl->verticalHeader()->width(), + buttonTbl->setLeftMargin(TQMAX(buttonTbl->verticalHeader()->width(), axesTbl->verticalHeader()->width())); axesTbl->setLeftMargin(buttonTbl->verticalHeader()->width()); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 17b8ae8e0..21824d2bf 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -78,9 +78,9 @@ KControlApp::KControlApp() if (fontSize == 0) fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX(); int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), - QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) ); + TQMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) ); int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), - QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) ); + TQMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) ); toplevel->resize(x,y); } diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 501d69349..fd0bda8aa 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList { while (item) { - setOpen(item, parentList-.contains(item)); + setOpen(item, parentList->contains(item)); if (item->childCount() != 0) expandItem(item->firstChild(), parentList); diff --git a/kcontrol/tdeio/ksaveioconfig.cpp b/kcontrol/tdeio/ksaveioconfig.cpp index 8ab676ada..2e1942f72 100644 --- a/kcontrol/tdeio/ksaveioconfig.cpp +++ b/kcontrol/tdeio/ksaveioconfig.cpp @@ -83,7 +83,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout ) { TDEConfig* cfg = config (); cfg->setGroup( TQString() ); - cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); + cfg->writeEntry("ReadTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -91,7 +91,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout ) { TDEConfig* cfg = config (); cfg->setGroup( TQString() ); - cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); + cfg->writeEntry("ConnectTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -99,7 +99,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) { TDEConfig* cfg = config (); cfg->setGroup( TQString() ); - cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); + cfg->writeEntry("ProxyConnectTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -107,7 +107,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout ) { TDEConfig* cfg = config (); cfg->setGroup( TQString() ); - cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); + cfg->writeEntry("ResponseTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } -- cgit v1.2.1