summaryrefslogtreecommitdiff
Unidiff
Diffstat (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
@@ -537,13 +537,13 @@ int QColorDialog::customCount()
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/*!
@@ -552,13 +552,13 @@ QRgb QColorDialog::customColor( int i )
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 )
@@ -1100,12 +1100,14 @@ void QColorShowLabel::mouseMoveEvent( QMouseEvent *e )
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{
@@ -1626,7 +1628,7 @@ void QColorDialog::setSelectedAlpha( int a )
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"