From eba47f8f0637f451e21348187591e1f1fd58ac74 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 Aug 2010 19:23:46 +0000 Subject: TQt conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1158446 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kolourpaint/kpcolor.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kolourpaint/kpcolor.cpp') diff --git a/kolourpaint/kpcolor.cpp b/kolourpaint/kpcolor.cpp index a9dc000b..1c325d39 100644 --- a/kolourpaint/kpcolor.cpp +++ b/kolourpaint/kpcolor.cpp @@ -31,7 +31,7 @@ #include -#include +#include #include @@ -100,7 +100,7 @@ kpColor::kpColor (const kpColor &rhs) } // friend -QDataStream &operator<< (QDataStream &stream, const kpColor &color) +TQDataStream &operator<< (TQDataStream &stream, const kpColor &color) { stream << int (color.m_rgbaIsValid) << int (color.m_rgba); @@ -108,7 +108,7 @@ QDataStream &operator<< (QDataStream &stream, const kpColor &color) } // friend -QDataStream &operator>> (QDataStream &stream, kpColor &color) +TQDataStream &operator>> (TQDataStream &stream, kpColor &color) { int a, b; stream >> a >> b; @@ -321,7 +321,7 @@ QRgb kpColor::toQRgb () const } // public -const QColor &kpColor::toQColor () const +const TQColor &kpColor::toQColor () const { if (!m_rgbaIsValid) { @@ -340,10 +340,10 @@ const QColor &kpColor::toQColor () const return Qt::black; } - m_colorCache = QColor (m_rgba); + m_colorCache = TQColor (m_rgba); if (!m_colorCache.isValid ()) { - kdError () << "kpColor::toQColor () internal error - could not return valid QColor" + kdError () << "kpColor::toQColor () internal error - could not return valid TQColor" << endl; return Qt::black; } @@ -354,7 +354,7 @@ const QColor &kpColor::toQColor () const } // public -QColor kpColor::maskColor () const +TQColor kpColor::maskColor () const { return isTransparent () ? Qt::color0 : Qt::color1; } -- cgit v1.2.1