[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1225292 by kuemmel:

enable and remove gcc warnings


 M  +2 -0      cmake/CMakeLists.txt  
 M  +4 -4      src/datasources/ascii/asciisource.cpp  
 M  +1 -1      src/datasources/ascii/asciisourceconfig.h  
 M  +5 -4      src/libkstapp/plotitem.cpp  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1225291:1225292
@@ -156,6 +156,8 @@
 
 if(MSVC)
 	add_definitions(-D_USE_MATH_DEFINES)
+else()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()
 
 if(MSVC_IDE AND kst_edit_cont)
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciisource.cpp #1225291:1225292
@@ -379,11 +379,11 @@
     bufread = readFromFile(file, varBuffer, bufstart, _byteLength - bufstart, MAXBUFREADLEN);
 
 #ifdef KST_DONT_CHECK_INDEX_IN_DEBUG
-    const char* buffer = varBuffer.constData();
-    const char* bufferData = buffer;
+    const char* bufferData = varBuffer.constData();
+    const char* buffer = bufferData;
 #else
-    QVarLengthArray<char, MAXBUFREADLEN + 1>& buffer = varBuffer;
-    const char* bufferData = buffer.data();
+    QVarLengthArray<char, MAXBUFREADLEN + 1>& bufferData = varBuffer;
+    const char* buffer = bufferData.data();
 #endif
 
 
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciisourceconfig.h #1225291:1225292
@@ -78,8 +78,8 @@
     NamedParameter<bool, Key_columnWidthIsConst, Tag_columnWidthIsConst> _columnWidthIsConst;
     NamedParameter<int, Key_dataLine, Tag_dataLine> _dataLine;
     NamedParameter<bool, Key_readFields, Tag_readFields> _readFields;
+    NamedParameter<bool, Key_readUnits, Tag_readUnits> _readUnits;
     NamedParameter<int, Key_fieldsLine, Tag_fieldsLine> _fieldsLine;
-    NamedParameter<bool, Key_readUnits, Tag_readUnits> _readUnits;
     NamedParameter<int, Key_unitsLine, Tag_unitsLine> _unitsLine;
     NamedParameter<bool, Key_useDot, Tag_useDot> _useDot;
 
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #1225291:1225292
@@ -63,6 +63,10 @@
 PlotItem::PlotItem(View *parent)
   : ViewItem(parent), PlotItemInterface(),
   _isInSharedAxisBox(false),
+  _manuallyHideLeftAxisLabel(false),
+  _manuallyHideRightAxisLabel(false),
+  _manuallyHideTopAxisLabel(false),
+  _manuallyHideBottomAxisLabel(false),
   _plotRectsDirty(true),
   _calculatedLeftLabelMargin(0.0),
   _calculatedLeftLabelWidth(0.0),
@@ -96,10 +100,7 @@
   _sharedAxisBoxMenu(0),
   _sharedBox(0),
   _axisLabelsDirty(true),
-  _manuallyHideLeftAxisLabel(false),
-  _manuallyHideRightAxisLabel(false),
-  _manuallyHideTopAxisLabel(false),
-  _manuallyHideBottomAxisLabel(false),
+
   _plotPixmapDirty(true),
   _i_per(0)
 {