Minor changes (IW version info)

diff --git a/src/SALOME_INSTALL.pro b/src/SALOME_INSTALL.pro
index 3e07b5416b24c021124c8b09c22e85ba83cbcaec..b6ed67368944eeef4b55d1a6b0537818df48e5e8 100644 (file)
--- a/src/SALOME_INSTALL.pro
+++ b/src/SALOME_INSTALL.pro
@@ -25,3 +25,5 @@ SOURCES               += InstallWizard.cpp
 SOURCES                += icons.cxx
 TARGET         = ../bin/SALOME_InstallWizard
 unix:LIBS       += -lqt-mt -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama
+unix:QMAKE_CFLAGS   += -Wno-deprecated
+unix:QMAKE_CXXFLAGS += -Wno-deprecated

diff --git a/src/globals.h b/src/globals.h
index 1a7c36941ce47450c498833811285942d7975779..160f26eed5e250f59a9d12a101cf8940ec2fab4b 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -15,6 +15,14 @@
 #include <qglobal.h>
 #include <iostream>
 
+#define __IW_VERSION_MAJOR__ 1
+#define __IW_VERSION_MINOR__ 0
+#define __IW_VERSION_PATCH__ 0
+
+#define __IW_VERSION__ (__IW_VERSION_MAJOR__*10000 + \
+                        __IW_VERSION_MINOR__*100   + \
+                        __IW_VERSION_PATCH__)
+
 #ifdef QT_DEBUG
 
 #define ___MESSAGE___( x ) std::cout << x << std::endl;

diff --git a/src/icons.cxx b/src/icons.cxx
index 3d1ac9bd35928455cf2ed8fc0ee6c8be8dee4646..04409e187bba546e524b8679171f4ceb013e5c0e 100644 (file)
--- a/src/icons.cxx
+++ b/src/icons.cxx
@@ -29788,15 +29788,15 @@ static const char* const image_icon[] = {
 "................",
 "................",
 "................",
-"................",
-"........#.....ab",
-".cccccdefedag#.h",
-"....g#defiagjkaa",
-".....hjaaajb....",
+"........f.......",
+".......###....aa",
+".cccccdefedag#.#",
+"....g#defiagjka.",
+"......jaaaj.....",
 "........k.......",
-".......hk.......",
-".......c#g......",
-"......lllll.....",
+".......hkg......",
+"......hc#gg.....",
+"................",
 "................",
 "................",
 "................"};

diff --git a/src/main.cxx b/src/main.cxx
index e828213558a23c3756e3b589989752a186fd5ce1..3e1697f5e74ead131ce98f371adea9cc66d80115 100644 (file)
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -12,8 +12,6 @@
 #include <qfile.h>
 #include <qmessagebox.h>
 
-#define __IW_VERSION__ 0x010000
-
 // ================================================================
 /*!
  *  MessageOutput
@@ -56,9 +54,9 @@ int main( int argc, char **argv )
     QString a = QString( argv[i] );
     if ( a == "--version" || a == "-v" ) {
       printf("SALOME Installation Wizard version %d.%d.%d ",
-            ( __IW_VERSION__ >> 16 ) & 0xFF,
-            ( __IW_VERSION__ >>  8 ) & 0xFF,
-            ( __IW_VERSION__       ) & 0xFF );
+            ( __IW_VERSION__ / 10000 ),
+            ( __IW_VERSION__ / 100 % 100 ),
+            ( __IW_VERSION__ % 100 ) );
       printf("(Qt version %d.%d.%d)\n",
             ( QT_VERSION >> 16 ) & 0xFF,
             ( QT_VERSION >> 8  ) & 0xFF,