From 59fc4fe49b40fc9fd4ea6407dc95ec20371a44b1 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 10 Feb 2006 09:10:01 +0000 Subject: [PATCH] Remove V3.1.0 release notes --- src/SALOME_INSTALL.pro | 2 ++ src/globals.h | 8 ++++++++ src/icons.cxx | 16 ++++++++-------- src/main.cxx | 8 +++----- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/SALOME_INSTALL.pro b/src/SALOME_INSTALL.pro index 3e07b54..b6ed673 100644 --- 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 1a7c369..160f26e 100644 --- a/src/globals.h +++ b/src/globals.h @@ -15,6 +15,14 @@ #include #include +#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 3d1ac9b..04409e1 100644 --- 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 e828213..3e1697f 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -12,8 +12,6 @@ #include #include -#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, -- 2.39.2