From: gdd <gdd>
Date: Wed, 11 May 2011 09:26:44 +0000 (+0000)
Subject: Fix the encoding of French translation files
X-Git-Tag: V6_3_0~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1b0736c7e3896d477951fd766406a761ca55bbd0;p=modules%2Fgui.git

Fix the encoding of French translation files
Fix compilation issue and warnings with gcc-4.6
---

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index be27d4238..f88901df6 100755
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <clocale>
 
 /*!
   \class Qtx
diff --git a/src/SVTK/resources/SVTK_msg_fr.ts b/src/SVTK/resources/SVTK_msg_fr.ts
index 5a1ecfcd1..c8c8d6bd8 100755
--- a/src/SVTK/resources/SVTK_msg_fr.ts
+++ b/src/SVTK/resources/SVTK_msg_fr.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="fr_FR">
 <context>
diff --git a/src/SalomeApp/resources/SalomeApp_msg_fr.ts b/src/SalomeApp/resources/SalomeApp_msg_fr.ts
index bd32ec208..3f9cc9cf1 100755
--- a/src/SalomeApp/resources/SalomeApp_msg_fr.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_fr.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="fr_FR">
 <context>
diff --git a/src/Style/Style_Salome.cxx b/src/Style/Style_Salome.cxx
index 7d25eb93e..80284fd03 100644
--- a/src/Style/Style_Salome.cxx
+++ b/src/Style/Style_Salome.cxx
@@ -435,7 +435,6 @@ void Style_Salome::drawComplexControl( ComplexControl cc, const QStyleOptionComp
           Style_Tools::shadowRect( p, aBtnRect, aRad, 0.0, SHADOW, Style_Tools::Right,
                                   aBtnCol.light( BUT_PERCENT_COL ), aBtnCol.dark( BUT_PERCENT_COL ),
                                   aBrdTopCol, aBrdBotCol, antialized, true, aStateOn );
-        State flags = State_None;
         QStyleOptionSpinBox copy;
         PrimitiveElement pe;
         if (spin->subControls & SC_SpinBoxUp) {
@@ -1447,7 +1446,6 @@ void Style_Salome::drawControl( ControlElement ce, const QStyleOption* opt,
           QColor top =    aColor.light( BUT_PERCENT_ON ),
                  bottom = aColor.dark( BUT_PERCENT_ON );
           QColor aBrdTopCol = model()->color( Style_Model::BorderTop );    // Style_Model::border_top_clr
-          QColor aBrdBotCol = model()->color( Style_Model::BorderBottom ); // Style_Model::border_bot_clr
           QRect r = opt->rect;
           QPainterPath path = Style_Tools::roundRect( r, aRad,
                                                       Style_Tools::All );
@@ -1822,7 +1820,6 @@ void Style_Salome::drawPrimitive( PrimitiveElement pe, const QStyleOption* opt,
       gr.setColorAt( 0.0, aBgCol.light( BUT_PERCENT_ON ) );
       gr.setColorAt( 1.0, aBgCol );
       p->fillRect( r, gr );
-      QRect aRect = QRect( r.x(), r.y(), r.width(), r.height() );
       drawHandle( p, r, horiz, false );
       p->restore();
       break;
@@ -1853,8 +1850,6 @@ void Style_Salome::drawPrimitive( PrimitiveElement pe, const QStyleOption* opt,
         if ( tabBar )
           isLast = tabBar->currentIndex() == tabBar->count() -1;
         QColor aColor = opt->palette.color( QPalette::Window );
-        QColor aBrdTopCol = model()->color( Style_Model::TabBorderTop );    // Style_Model::border_tab_top_clr
-        QColor aBrdBotCol = model()->color( Style_Model::TabBorderBottom ); // Style_Model::border_tab_bot_clr
         bool isHover = hasHover() && (opt->state & State_Enabled) &&
                                      (opt->state & State_MouseOver);
         QPainterPath aSelPath = Style_Tools::tabRect( p, aSelRect, (int)tbb->shape,