summaryrefslogtreecommitdiff
path: root/libqtaux
authorzecke <zecke>2004-09-10 11:07:29 (UTC)
committer zecke <zecke>2004-09-10 11:07:29 (UTC)
commit0c2d61cebde30e1a6eea86beb5b28a3600de0f75 (patch) (unidiff)
tree1b1e4b2fc09f92c08254a285d3a89d82b9174cb9 /libqtaux
parent00b7879d0d886b642b1f1102e3a811e67f928df7 (diff)
downloadopie-0c2d61cebde30e1a6eea86beb5b28a3600de0f75.zip
opie-0c2d61cebde30e1a6eea86beb5b28a3600de0f75.tar.gz
opie-0c2d61cebde30e1a6eea86beb5b28a3600de0f75.tar.bz2
No unused parameters, added a newline at the end
Diffstat (limited to 'libqtaux') (more/less context) (ignore whitespace changes)
-rw-r--r--libqtaux/qcolordialog.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/libqtaux/qcolordialog.cpp b/libqtaux/qcolordialog.cpp
index ccef0ad..830fef6 100644
--- a/libqtaux/qcolordialog.cpp
+++ b/libqtaux/qcolordialog.cpp
@@ -531,40 +531,40 @@ int QColorDialog::customCount()
531 return 2*8; 531 return 2*8;
532} 532}
533 533
534/*! 534/*!
535 Returns custom color number \a i as a QRgb. 535 Returns custom color number \a i as a QRgb.
536 */ 536 */
537QRgb QColorDialog::customColor( int i ) 537QRgb QColorDialog::customColor( int i )
538{ 538{
539 initRGB(); 539 initRGB();
540 if ( i < 0 || i >= customCount() ) { 540 if ( i < 0 || i >= customCount() ) {
541#ifdef CHECK_RANGE 541#ifdef CHECK_RANGE
542 qWarning( "QColorDialog::customColor() index %d out of range", i ); 542 qWarning( "QColorDialog::customColor() index %d out of range", i );
543 #endif 543#endif
544 i = 0; 544 i = 0;
545 } 545 }
546 return cusrgb[i]; 546 return cusrgb[i];
547} 547}
548 548
549/*! 549/*!
550 Sets custom color number \a i to the QRgb value \a c. 550 Sets custom color number \a i to the QRgb value \a c.
551*/ 551*/
552void QColorDialog::setCustomColor( int i, QRgb c ) 552void QColorDialog::setCustomColor( int i, QRgb c )
553{ 553{
554 initRGB(); 554 initRGB();
555 if ( i < 0 || i >= customCount() ) { 555 if ( i < 0 || i >= customCount() ) {
556#ifdef CHECK_RANGE 556#ifdef CHECK_RANGE
557 qWarning( "QColorDialog::customColor() index %d out of range", i ); 557 qWarning( "QColorDialog::customColor() index %d out of range", i );
558 #endif 558#endif
559 return; 559 return;
560 } 560 }
561 cusrgb[i] = c; 561 cusrgb[i] = c;
562} 562}
563 563
564static inline void rgb2hsv( QRgb rgb, int&h, int&s, int&v ) 564static inline void rgb2hsv( QRgb rgb, int&h, int&s, int&v )
565{ 565{
566 QColor c; 566 QColor c;
567 c.setRgb( rgb ); 567 c.setRgb( rgb );
568 c.getHsv(h,s,v); 568 c.getHsv(h,s,v);
569} 569}
570 570
@@ -1094,24 +1094,26 @@ void QColorShowLabel::mouseMoveEvent( QMouseEvent *e )
1094 return; 1094 return;
1095 if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) { 1095 if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) {
1096 QColorDrag *drg = new QColorDrag( col, this ); 1096 QColorDrag *drg = new QColorDrag( col, this );
1097 QPixmap pix( 30, 20 ); 1097 QPixmap pix( 30, 20 );
1098 pix.fill( col ); 1098 pix.fill( col );
1099 QPainter p( &pix ); 1099 QPainter p( &pix );
1100 p.drawRect( 0, 0, pix.width(), pix.height() ); 1100 p.drawRect( 0, 0, pix.width(), pix.height() );
1101 p.end(); 1101 p.end();
1102 drg->setPixmap( pix ); 1102 drg->setPixmap( pix );
1103 mousePressed = FALSE; 1103 mousePressed = FALSE;
1104 drg->dragCopy(); 1104 drg->dragCopy();
1105 } 1105 }
1106#else
1107 Q_UNUSED( e )
1106#endif 1108#endif
1107} 1109}
1108 1110
1109#ifndef QT_NO_DRAGANDDROP 1111#ifndef QT_NO_DRAGANDDROP
1110void QColorShowLabel::dragEnterEvent( QDragEnterEvent *e ) 1112void QColorShowLabel::dragEnterEvent( QDragEnterEvent *e )
1111{ 1113{
1112 if ( QColorDrag::canDecode( e ) ) 1114 if ( QColorDrag::canDecode( e ) )
1113 e->accept(); 1115 e->accept();
1114 else 1116 else
1115 e->ignore(); 1117 e->ignore();
1116} 1118}
1117 1119
@@ -1620,13 +1622,13 @@ void QColorDialog::setSelectedAlpha( int a )
1620 1622
1621 1623
1622/*! 1624/*!
1623 Returns the value selected for the alpha channel. 1625 Returns the value selected for the alpha channel.
1624*/ 1626*/
1625 1627
1626int QColorDialog::selectedAlpha() const 1628int QColorDialog::selectedAlpha() const
1627{ 1629{
1628 return d->currentAlpha(); 1630 return d->currentAlpha();
1629} 1631}
1630 1632
1631 1633
1632#include "qcolordialog.moc" \ No newline at end of file 1634#include "qcolordialog.moc"