Merge relevant changes from V8_0_0_BR branch

[modules/hexablock.git] / src / HEXABLOCKGUI / HEXABLOCKGUI_Resource.hxx

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
index 5f790dab70d9e62b4dc5705d8d19938cef5f59f0..79f8e3355ba22e2cde6b836031a0346d5fc767dd 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
@@ -20,15 +20,15 @@
 #ifndef _HEXABLOCKGUI_RESOURCE_HXX_
 #define _HEXABLOCKGUI_RESOURCE_HXX_
 
-#include "HEXABLOCKGUI_Export.hxx"
+#include <QColor>
+#include <QFont>
+#include <QString>
 
-#include <QtGui>
+#include "HEXABLOCKGUI_Export.hxx"
 
 class HEXABLOCKGUI;
 class SUIT_ResourceMgr;
 
-
-
 class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource 
 {
   public:
@@ -38,25 +38,24 @@ class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource
     virtual void preferencesChanged();
 
   protected:
-    int     integerValue( const QString& name, const int    def = 0          ) const;
-    double  doubleValue ( const QString& name, const double def = 0          ) const;
-    bool    booleanValue( const QString& name, const bool   def = false      ) const;
-    QFont   fontValue   ( const QString& name, const QFont  def = QFont()    ) const;
-    QColor  colorValue  ( const QString& name, const QColor def = QColor()   ) const;
-    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c       ) const;
-    QColor  colorValue  ( const QString& name, const int h, const int s, const int v) const;
-    QString stringValue ( const QString& name, const QString def = QString() ) const;
-
-    void setValue( const QString& name, const int     val );
-    void setValue( const QString& name, const double  val );
-    void setValue( const QString& name, const bool    val );
-    void setValue( const QString& name, const QFont   val );
-    void setValue( const QString& name, const QColor  val );
-    void setValue( const QString& name, const QString val );
+    int     integerValue( const QString& name, const int     def = 0          ) const;
+    double  doubleValue ( const QString& name, const double  def = 0          ) const;
+    bool    booleanValue( const QString& name, const bool    def = false      ) const;
+    QFont   fontValue   ( const QString& name, const QFont&  def = QFont()    ) const;
+    QColor  colorValue  ( const QString& name, const QColor& def = QColor()   ) const;
+    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c        ) const;
+    QColor  colorValue  ( const QString& name, const int h, const int s, const int v ) const;
+    QString stringValue ( const QString& name, const QString& def = QString() ) const;
+
+    void setValue( const QString& name, const int      val );
+    void setValue( const QString& name, const double   val );
+    void setValue( const QString& name, const bool     val );
+    void setValue( const QString& name, const QFont&   val );
+    void setValue( const QString& name, const QColor&  val );
+    void setValue( const QString& name, const QString& val );
 
   protected:
     SUIT_ResourceMgr* _resource;
-
 };