diff options
Diffstat (limited to 'lib/kopainter/koColor.cc')
| -rw-r--r-- | lib/kopainter/koColor.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/kopainter/koColor.cc b/lib/kopainter/koColor.cc index e808ca8b1..813aee8dc 100644 --- a/lib/kopainter/koColor.cc +++ b/lib/kopainter/koColor.cc @@ -89,7 +89,7 @@ KoColor::KoColor(int c, int m, int y, int k) cmykChanged(); } -KoColor::KoColor(const QColor &c) +KoColor::KoColor(const TQColor &c) { mR = c.red(); mG = c.green(); @@ -98,7 +98,7 @@ KoColor::KoColor(const QColor &c) rgbChanged(); } -KoColor::KoColor(const QString &name) +KoColor::KoColor(const TQString &name) { setNamedColor(name); } @@ -231,9 +231,9 @@ void KoColor::cmyk(int *C, int *M, int *Y, int *K) const *K = mK; } -QString KoColor::name() const +TQString KoColor::name() const { - QString s; + TQString s; switch(mNative) { case csRGB: @@ -254,11 +254,11 @@ QString KoColor::name() const return s; } -QColor KoColor::color() const +TQColor KoColor::color() const { if(!mRGBvalid) calcRGB(); - return QColor(mR, mG, mB); + return TQColor(mR, mG, mB); } void KoColor::setRGB(int R, int G, int B) @@ -298,7 +298,7 @@ void KoColor::setCMYK(int C, int M, int Y, int K) cmykChanged(); } -void KoColor::setNamedColor(const QString &name) +void KoColor::setNamedColor(const TQString &name) { switch(name[0]) { @@ -340,7 +340,7 @@ void KoColor::setNamedColor(const QString &name) } } -void KoColor::setColor(const QColor &c) +void KoColor::setColor(const TQColor &c) { mR = c.red(); mG = c.green(); @@ -621,13 +621,13 @@ void KoColor::CMYKtoLAB(int C, int M, int Y, int K, int *L, int *a, int *b) RGBtoLAB(R, G, B, L, a, b); } -int KoColor::hex2int(QChar c) +int KoColor::hex2int(TQChar c) { if(c.isDigit()) return c.digitValue(); - else if('A' <= c && c <= 'F') + else if('A' <= (int)c && (int)c <= 'F') return c - 'A' + 10; - else if('a' <= c && c <= 'f') + else if('a' <= (int)c && (int)c <= 'f') return c - 'a' + 10; else return 0; |
