Merge from OCC_development_generic_2006

[modules/gui.git] / src / CAF / CAF_Tools.h

diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index 8af84f9fea1a84d0fc3090c22f79ff65de7e9819..e04d1c9d89f4d9f301268ab426ebd0a790537561 100755 (executable)
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_Tools.h
@@ -26,13 +26,24 @@
 
 #include <SUIT_Tools.h>
 
+#include <qcolor.h>
+
+#include <Quantity_Color.hxx>
+
+#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 class CAF_EXPORT CAF_Tools : public SUIT_Tools
 {
 public:
+  static QString                    toQString( const TCollection_AsciiString& );
   static QString                    toQString( const TCollection_ExtendedString& );
+
   static TCollection_ExtendedString toExtString( const QString& );
+  static TCollection_AsciiString    toAsciiString( const QString& );
+
+  static Quantity_Color             color( const QColor& );
+  static QColor                     color( const Quantity_Color& );
 };
 
 #endif