diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-27 02:13:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-27 02:13:42 -0600 |
commit | 520c05ef06ce203ad32470730f68402bc7719157 (patch) | |
tree | 8d0bb18bbbecb4c837e232848905e5819db84b81 /src/dialogs/qcolordialog.cpp | |
parent | b82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff) | |
download | tqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip |
Automated update from qt3
Diffstat (limited to 'src/dialogs/qcolordialog.cpp')
-rw-r--r-- | src/dialogs/qcolordialog.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index 68838c45..d365e96f 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -448,10 +448,10 @@ static void initRGB() for ( int g = 0; g < 4; g++ ) for ( int r = 0; r < 4; r++ ) for ( int b = 0; b < 3; b++ ) - stdrgb[i++] = qRgb( r*255/3, g*255/3, b*255/2 ); + stdrgb[i++] = tqRgb( r*255/3, g*255/3, b*255/2 ); for ( i = 0; i < 2*8; i++ ) - cusrgb[i] = qRgb(0xff,0xff,0xff); + cusrgb[i] = tqRgb(0xff,0xff,0xff); } /*! @@ -1077,7 +1077,7 @@ void TQColorShowLabel::mouseReleaseEvent( TQMouseEvent * ) TQColorShower::TQColorShower( TQWidget *parent, const char *name ) :TQWidget( parent, name) { - curCol = qRgb( -1, -1, -1 ); + curCol = tqRgb( -1, -1, -1 ); TQColIntValidator *val256 = new TQColIntValidator( 0, 255, this ); TQColIntValidator *val360 = new TQColIntValidator( 0, 360, this ); @@ -1161,9 +1161,9 @@ void TQColorShower::rgbEd() { rgbOriginal = TRUE; if ( alphaEd->isVisible() ) - curCol = qRgba( rEd->val(), gEd->val(), bEd->val(), currentAlpha() ); + curCol = tqRgba( rEd->val(), gEd->val(), bEd->val(), currentAlpha() ); else - curCol = qRgb( rEd->val(), gEd->val(), bEd->val() ); + curCol = tqRgb( rEd->val(), gEd->val(), bEd->val() ); rgb2hsv(currentColor(), hue, sat, val ); @@ -1184,9 +1184,9 @@ void TQColorShower::hsvEd() curCol = TQColor( hue, sat, val, TQColor::Hsv ).rgb(); - rEd->setNum( qRed(currentColor()) ); - gEd->setNum( qGreen(currentColor()) ); - bEd->setNum( qBlue(currentColor()) ); + rEd->setNum( tqRed(currentColor()) ); + gEd->setNum( tqGreen(currentColor()) ); + bEd->setNum( tqBlue(currentColor()) ); showCurrentColor(); emit newCol( currentColor() ); @@ -1203,9 +1203,9 @@ void TQColorShower::setRgb( TQRgb rgb ) sEd->setNum( sat ); vEd->setNum( val ); - rEd->setNum( qRed(currentColor()) ); - gEd->setNum( qGreen(currentColor()) ); - bEd->setNum( qBlue(currentColor()) ); + rEd->setNum( tqRed(currentColor()) ); + gEd->setNum( tqGreen(currentColor()) ); + bEd->setNum( tqBlue(currentColor()) ); showCurrentColor(); } @@ -1220,9 +1220,9 @@ void TQColorShower::setHsv( int h, int s, int v ) sEd->setNum( sat ); vEd->setNum( val ); - rEd->setNum( qRed(currentColor()) ); - gEd->setNum( qGreen(currentColor()) ); - bEd->setNum( qBlue(currentColor()) ); + rEd->setNum( tqRed(currentColor()) ); + gEd->setNum( tqGreen(currentColor()) ); + bEd->setNum( tqBlue(currentColor()) ); showCurrentColor(); } @@ -1303,7 +1303,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : compact = FALSE; // small displays (e.g. PDAs cannot fit the full color dialog, // so just use the color picker. - if ( qApp->desktop()->width() < 480 || qApp->desktop()->height() < 350 ) + if ( tqApp->desktop()->width() < 480 || tqApp->desktop()->height() < 350 ) compact = TRUE; nextCust = 0; @@ -1545,14 +1545,14 @@ TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok, #endif dlg->setColor( initial ); dlg->selectColor( initial ); - dlg->setSelectedAlpha( qAlpha(initial) ); + dlg->setSelectedAlpha( tqAlpha(initial) ); int resultCode = dlg->exec(); TQColor::leaveAllocContext(); TQRgb result = initial; if ( resultCode == TQDialog::Accepted ) { TQRgb c = dlg->color().rgb(); int alpha = dlg->selectedAlpha(); - result = qRgba( qRed(c), qGreen(c), qBlue(c), alpha ); + result = tqRgba( tqRed(c), tqGreen(c), tqBlue(c), alpha ); } if ( ok ) *ok = resultCode == TQDialog::Accepted; |