From 514358771bf47c5031c84ebaf24d8488a547c4c2 Mon Sep 17 00:00:00 2001 From: cignoni Date: Thu, 5 Nov 2009 22:32:26 +0000 Subject: [PATCH] celeaned up names of static class for converting qtcolor to color4b --- wrap/qt/col_qt_convert.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/wrap/qt/col_qt_convert.h b/wrap/qt/col_qt_convert.h index c42daea5..7e130d55 100644 --- a/wrap/qt/col_qt_convert.h +++ b/wrap/qt/col_qt_convert.h @@ -9,16 +9,14 @@ namespace vcg class ColorConverter { public: - template - static vcg::Color4 convertQColorToColor4(const QColor& col) + inline static vcg::Color4b ToColor4b(const QColor& col) { - return vcg::Color4(T(col.red()),T(col.green()),T(col.blue()),T(col.alpha())); + return vcg::Color4b(col.red(),col.green(),col.blue(),col.alpha()); } - template - static QColor convertColor4ToQColor(const vcg::Color4& col) + inline static QColor ToQColor(const vcg::Color4b& col) { - return QColor(int(col.X()),int(col.Y()),int(col.Z()),int(col.W())); + return QColor(col[0],col[1],col[2],col[3]); } }; }