Fixes for compilation errors.

[modules/visu.git] / src / VISUGUI / VisuGUI_TableDlg.cxx

diff --git a/src/VISUGUI/VisuGUI_TableDlg.cxx b/src/VISUGUI/VisuGUI_TableDlg.cxx
index 1d211460aca846d4494b43d5ac601823ddebb1a8..24443ef7b6cdb5fa0e6972fd08a10d143b82876c 100644 (file)
--- a/src/VISUGUI/VisuGUI_TableDlg.cxx
+++ b/src/VISUGUI/VisuGUI_TableDlg.cxx
@@ -207,16 +207,16 @@ void VisuGUI_TableDlg::onOK()
              }
              if ( !bEmptyRow ) {  // Skip rows with no data !!!
                // set row title
-               tblIntAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? QString( "" ) : QString( rowTitles[ i ] ) ); 
+               tblIntAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? "" : rowTitles[ i ].latin1() ); 
                // set row unit
-               tblIntAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? QString( "" ) : QString( units[ i ] ) ); 
+               tblIntAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? "" : units[ i ].latin1() ); 
                nRow++;
              }
            }
            if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
              // column titles
              for ( i = 0; i < colTitles.count(); i++ )
-               tblIntAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? QString( "" ) : QString( colTitles[ i ] ) );
+               tblIntAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? "" : colTitles[ i ].latin1() );
            }
          }
          // title
@@ -251,16 +251,16 @@ void VisuGUI_TableDlg::onOK()
              }
              if ( !bEmptyRow ) {  // Skip rows with no data !!!
                // set row title
-               tblRealAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? QString( "" ) : QString( rowTitles[ i ] ) ); 
+               tblRealAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? "" : rowTitles[ i ].latin1() ); 
                // set row unit
-               tblRealAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? QString( "" ) : QString( units[ i ] ) ); 
+               tblRealAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? "" : units[ i ].latin1() );
                nRow++;
              }
            }
            if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
              // column titles
              for ( i = 0; i < colTitles.count(); i++ )
-               tblRealAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? QString( "" ) : QString( colTitles[ i ] ) );
+               tblRealAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? "" : colTitles[ i ].latin1() );
            }
          }
          // title
@@ -302,7 +302,6 @@ void VisuGUI_TableDlg::initDlg()
     // Table of integer
     if ( tblIntAttr && myIntTable ) {
       try {
-       VisuGUI_Table* tbl = myIntTable->getTable();
        // title
        myIntTable->setTableTitle( tblIntAttr->GetTitle().c_str() );
        // nb of rows & cols
@@ -335,7 +334,7 @@ void VisuGUI_TableDlg::initDlg()
        vector<string> rowUnits = tblIntAttr->GetRowUnits();
        if ( rowUnits.size() > 0 ) {
          for ( i = 0; i < nbRows; i++ )
-           strlist.append( rowUnits[i] );
+           strlist.append( rowUnits[i].c_str() );
          myIntTable->setUnits( strlist );
        }
        // data
@@ -358,7 +357,6 @@ void VisuGUI_TableDlg::initDlg()
     // Table of real
     if ( tblRealAttr && myRealTable ) {
       try {
-       VisuGUI_Table* tbl = myRealTable->getTable();
        // title
        myRealTable->setTableTitle( tblRealAttr->GetTitle().c_str() );
        // nb of rows & cols