[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun
From:       Thomas Häber <thomas () haeber ! de>
Date:       2006-09-23 3:19:54
Message-ID: 1158981594.991435.7305.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 587522 by haeber:

changed depreciated QMIN and QMAX macros to qMin() and qMax() (with help of the \
English Breakfast Network)

 M  +1 -1      library/scrollinglabel.cpp  
 M  +2 -2      modules/infrared/infrared.cpp  
 M  +2 -2      modules/keyz/keyz.cpp  
 M  +1 -1      modules/winskin/waInfo.cpp  


--- trunk/KDE/kdemultimedia/noatun/library/scrollinglabel.cpp #587521:587522
@@ -116,7 +116,7 @@
 
 	setFixedHeight(h);
 
-	d->scrollSize = QMAX(0, w - width());
+	d->scrollSize = qMax(0, w - width());
 
 	d->buf.resize(w, h);
 	d->buf.fill(colorGroup().background());
--- trunk/KDE/kdemultimedia/noatun/modules/infrared/infrared.cpp #587521:587522
@@ -93,11 +93,11 @@
 		break;
 
 	case IRPrefs::SeekBackward:  // - 3 seconds
-		napp->player()->skipTo( QMAX(0, napp->player()->getTime() - 3000) );
+		napp->player()->skipTo( qMax(0, napp->player()->getTime() - 3000) );
 		break;
 
 	case IRPrefs::SeekForward:  // + 3 seconds
-		napp->player()->skipTo( QMIN(napp->player()->getLength(),
+		napp->player()->skipTo( qMin(napp->player()->getLength(),
 		                             napp->player()->getTime() + 3000) );
 		break;
 	case IRPrefs::ShowPlaylist:
--- trunk/KDE/kdemultimedia/noatun/modules/keyz/keyz.cpp #587521:587522
@@ -116,12 +116,12 @@
 
 void Keyz::slotForward()
 {
-    napp->player()->skipTo( QMIN(napp->player()->getLength(), \
napp->player()->getTime() + 3000) ); // + 3 seconds +    napp->player()->skipTo( \
qMin(napp->player()->getLength(), napp->player()->getTime() + 3000) ); // + 3 seconds \
}  
 void Keyz::slotBackward()
 {
-    napp->player()->skipTo( QMAX( 0, napp->player()->getTime() - 3000 )); // - 3 \
seconds +    napp->player()->skipTo( qMax( 0, napp->player()->getTime() - 3000 )); // \
- 3 seconds  }
 
 void Keyz::slotNextSection()
--- trunk/KDE/kdemultimedia/noatun/modules/winskin/waInfo.cpp #587521:587522
@@ -129,7 +129,7 @@
 
     QSize size = sizeHint();
 
-    completePixmap->resize(QMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
+    completePixmap->resize(qMax(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
 
     for (i = 0; i < n; i++) {
 	WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0);


[prev in list] [next in list] [prev in thread] [next in thread]