From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kolourpaint/kpcolor.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kolourpaint/kpcolor.h') diff --git a/kolourpaint/kpcolor.h b/kolourpaint/kpcolor.h index 255d645f..ece77e57 100644 --- a/kolourpaint/kpcolor.h +++ b/kolourpaint/kpcolor.h @@ -36,13 +36,13 @@ class TQDataStream; // -// kpColor is an object-oriented abstraction of QRgb, with the additional +// kpColor is an object-oriented abstraction of TQRgb, with the additional // restriction of following the KolourPaint convention of only supporting // totally transparent and totally opaque colors. It also provides better // error handling, reporting (noisy kdError()'s) and recovery. // -// In general, you should pass around kpColor objects instead of QRgb -// and TQColor. Only convert an opaque kpColor to a TQColor (using toQColor()) +// In general, you should pass around kpColor objects instead of TQRgb +// and TQColor. Only convert an opaque kpColor to a TQColor (using toTQColor()) // if you need to draw something onscreen. Constructing a kpColor object // from TQColor is probably wrong since onscreen representations of color // are not guaranteed to be faithful (due to TQColor color allocation). @@ -52,7 +52,7 @@ class kpColor public: kpColor (); kpColor (int red, int green, int blue, bool isTransparent = false); - kpColor (const QRgb &rgba); + kpColor (const TQRgb &rgba); kpColor (const kpColor &rhs); friend TQDataStream &operator<< (TQDataStream &stream, const kpColor &color); friend TQDataStream &operator>> (TQDataStream &stream, kpColor &color); @@ -81,17 +81,17 @@ public: // Cast operators will most likely result in careless conversions so // use explicit functions instead: - QRgb toQRgb () const; + TQRgb toTQRgb () const; // (only valid if isOpaque()) // (const TQColor & return results in fewer color reallocations) - const TQColor &toQColor () const; + const TQColor &toTQColor () const; - TQColor maskColor () const; + TQColor tqmaskColor () const; private: bool m_rgbaIsValid; - QRgb m_rgba; + TQRgb m_rgba; mutable bool m_colorCacheIsValid; mutable TQColor m_colorCache; -- cgit v1.2.1