[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 419429 by staikos:

put the bools together and add const


 M  +6 -6      kst2dplot.cpp  
 M  +17 -17    kst2dplot.h  


--- trunk/extragear/graphics/kst/kst/kst2dplot.cpp #419428:419429
@@ -7147,27 +7147,27 @@
   _yTicksOutPlot = yes;
 }
 
-bool Kst2DPlot::xTicksInPlot() {
+bool Kst2DPlot::xTicksInPlot() const {
   return _xTicksInPlot;
 }
 
-bool Kst2DPlot::xTicksOutPlot() {
+bool Kst2DPlot::xTicksOutPlot() const {
   return _xTicksOutPlot;  
 }
 
-bool Kst2DPlot::yTicksInPlot() {
+bool Kst2DPlot::yTicksInPlot() const {
   return _yTicksInPlot;  
 }
 
-bool Kst2DPlot::yTicksOutPlot() {
+bool Kst2DPlot::yTicksOutPlot() const {
   return _yTicksOutPlot;
 }
 
-bool Kst2DPlot::suppressTop() {
+bool Kst2DPlot::suppressTop() const {
   return _suppressTop;  
 } 
   
-bool Kst2DPlot::suppressBottom() {
+bool Kst2DPlot::suppressBottom() const {
   return _suppressBottom;  
 }
 
--- trunk/extragear/graphics/kst/kst/kst2dplot.h #419428:419429
@@ -93,7 +93,7 @@
   static bool checkRange(double& min_in, double& max_in);
   static bool checkLRange(double& min_in, double& max_in, bool isLog);
   static void genAxisTickLabel(QString& label, double z, bool isLog);
-  static double timezoneHrs( );
+  static double timezoneHrs();
   
   virtual UpdateType update(int update_counter);
   virtual void save(QTextStream& ts, const QString& indent = QString::null);
@@ -306,13 +306,13 @@
   void setXTicksOutPlot(bool yes);
   void setYTicksInPlot(bool yes);
   void setYTicksOutPlot(bool yes);
-  bool xTicksInPlot();
-  bool xTicksOutPlot();
-  bool yTicksInPlot();
-  bool yTicksOutPlot();
+  bool xTicksInPlot() const;
+  bool xTicksOutPlot() const;
+  bool yTicksInPlot() const;
+  bool yTicksOutPlot() const;
   
-  bool suppressTop(); 
-  bool suppressBottom();
+  bool suppressTop() const;
+  bool suppressBottom() const;
   void setSuppressTop(bool yes);
   void setSuppressBottom(bool yes);
 
@@ -449,6 +449,16 @@
 
   int _draggableLabel : 15; // I think this should be enough
 
+  // tick mark display options
+  bool _xTicksInPlot : 1;
+  bool _xTicksOutPlot : 1;
+  bool _yTicksInPlot : 1;
+  bool _yTicksOutPlot : 1;
+  
+  // suppress labels and axes
+  bool _suppressTop : 1; 
+  bool _suppressBottom : 1;
+
   bool _isXAxisInterpreted, _isYAxisInterpreted;
   KstAxisInterpretation _xAxisInterpretation, _yAxisInterpretation;
   KstAxisDisplay _xAxisDisplay, _yAxisDisplay;
@@ -497,16 +507,6 @@
   int _xMajorTicks;
   int _yMajorTicks;
   
-  // tick mark display options
-  bool _xTicksInPlot;
-  bool _xTicksOutPlot;
-  bool _yTicksInPlot;
-  bool _yTicksOutPlot;
-  
-  // suppress labels and axes
-  bool _suppressTop; 
-  bool _suppressBottom;
-
   QValueStack<QColor> _colorStack;
   
   // for range expressions