Method rgbSet() modified.

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index de0b55f3cfbdc6fb2e09586a5e0bf0407adb2c96..ae3cb9d02692fab9e276c94f6958317461e18980 100755 (executable)
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -502,11 +502,11 @@ int Qtx::rgbSet( const int r, const int g, const int b )
        Name: rgbSet [static public]
        Desc: Unpack the specified integer RGB set into the color.
 */
-void Qtx::rgbSet( const int rgb, QColor& c )
+QColor Qtx::rgbSet( const int rgb )
 {
   int r, g, b;
   rgbSet( rgb, r, g, b );
-  c = QColor( r, g, b );
+  return QColor( r, g, b );
 }
 
 /*!

diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h
index 0d5cb3a40e7a1b60e1fd1a3e3c7899551f29d897..976893f5f1d84bcdfbfd58706ab1227c3b814800 100755 (executable)
--- a/src/Qtx/Qtx.h
+++ b/src/Qtx/Qtx.h
@@ -46,6 +46,7 @@
 #define INCLUDE_MENUITEM_DEF
 #endif
 
+#include <qcolor.h>
 #include <qnamespace.h>
 
 #ifndef QT_VERSION
@@ -129,7 +130,7 @@ public:
   static int     rgbSet( const QColor& );
   static int     rgbSet( const int, const int, const int );
 
-  static void    rgbSet( const int, QColor& );
+  static QColor  rgbSet( const int );
   static void    rgbSet( const int, int&, int&, int& );
 
   static QColor  scaleColor( const int, const int, const int );

diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 02b3a1c656fb589da663b666a31e1df226875f74..c659c7b19401c08b343bbc67b7179a7da70eff02 100644 (file)
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -1086,7 +1086,7 @@ bool QtxResourceMgr::value( const QString& sect, const QString& name, QColor& cV
   {
     int pack = val.toInt( &res );
     if ( res )
-      Qtx::rgbSet( pack, cVal );
+      cVal = Qtx::rgbSet( pack );
   }
 
   return res;