| -rw-r--r-- | libopie/colordialog.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libopie/colordialog.cpp b/libopie/colordialog.cpp index 684d6ea..35f15d6 100644 --- a/libopie/colordialog.cpp +++ b/libopie/colordialog.cpp @@ -59,2 +59,7 @@ static inline void rgb2hsv( QRgb rgb, int&h, int&s, int&v ) +/* + * avoid clashes with the original Qt + */ +namespace { + class QColorPicker : public QFrame @@ -609,2 +614,4 @@ void QColorShower::setHsv( int h, int s, int v ) +} + class OColorDialogPrivate : public QObject @@ -615,3 +622,3 @@ public: QRgb currentColor() const { return cs->currentColor(); } - void setCurrentColor( QRgb rgb ); + void setCurrentColor( const QRgb& rgb ); @@ -639,3 +646,3 @@ void OColorDialogPrivate::newHsv( int h, int s, int v ) //sets all widgets to display rgb -void OColorDialogPrivate::setCurrentColor( QRgb rgb ) +void OColorDialogPrivate::setCurrentColor( const QRgb& rgb ) { @@ -728,3 +735,3 @@ OColorDialog::OColorDialog(QWidget* parent, const char* name, bool modal) : -QColor OColorDialog::getColor( QColor initial, QWidget *parent, +QColor OColorDialog::getColor( const QColor& initial, QWidget *parent, const char *name ) @@ -765,3 +772,3 @@ QColor OColorDialog::getColor( QColor initial, QWidget *parent, -QRgb OColorDialog::getRgba( QRgb initial, bool *ok, +QRgb OColorDialog::getRgba( const QRgb& initial, bool *ok, QWidget *parent, const char* name ) @@ -821,3 +828,3 @@ OColorDialog::~OColorDialog() -void OColorDialog::setColor( QColor c ) +void OColorDialog::setColor( const QColor& c ) { |