HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r609:a1ef8de9fe8d

We have so many stupid warnings that "treat warnings as errors" flag is needed...

Jani Honkonen -

r609:a1ef8de9fe8d

parent child

Context file:

r609:a1ef8de9fe8d

src/barchart/bar.cpp +2 -2

              Bar::Bar(QString category, QGraphicsItem *parent)
                  : QGraphicsObject(parent),
-                 mCategory(category),
                  mXpos(0),
                  mYpos(0),
                  mWidth(0),
-                 mHeight(0)
+                 mHeight(0),
+                 mCategory(category)
              {
                  setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                  setAcceptHoverEvents(true);

src/barchart/barpresenterbase.cpp +3 -3

              BarPresenterBase::BarPresenterBase(QBarSeries *series, QChart *parent) :
                  ChartItem(parent),
+                 mHeight(0),
+                 mWidth(0),
                  mLayoutSet(false),
                  mSeries(series),
-                 mChart(parent),
-                 mWidth(0),
-                 mHeight(0)
+                 mChart(parent)
              {
                  connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
              //    connect(series,SIGNAL(enableSeparators(bool)),this,SLOT(enableSeparators(bool)));

src/barchart/qbarseries.cpp +2 -2

              {
                  m_model = NULL;
                  m_mapCategories = -1;
-                 m_mapBarBottom - 1;
-                 m_mapBarTop - 1;
+                 m_mapBarBottom = -1;
+                 m_mapBarTop = -1;
              }
              /*!

src/chartdataset.cpp +1 -1

                      }
                      case QSeries::SeriesTypePie: {
-                         QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
+                         //QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                          // TODO: domain stuff
                          break;
                      }

src/qchartglobal.h +2 0

              #include <stdarg.h>
              #include <QDebug>
+             /*
              static QDebug chartDebug(int numargs,...)
-             {
                     va_list valist;
                     va_end(valist);
                     return qDebug()<<QString().append(function).append("(").append(file).append(":%1)").arg(line);
-             }
+             */
              #endif

src/src.pro +2 0

                  $$CHART_BUILD_HEADER_DIR \
                  $$CHART_BUILD_LIB_DIR
+             # treat warnings as errors
+             QMAKE_CXXFLAGS += -Werror

src/xychart/qxyseries.cpp +4 -3

              {
                  Q_ASSERT(m_x.size() == m_y.size());
-                 if (m_model)
+                 if (m_model) {
                      if (m_mapOrientation == Qt::Vertical)
                          // data is in a column, so return the number of items in single column
                          return m_model->rowCount();
                      else
                          // data is in a row, so return the number of items in single row
-                         m_model->columnCount();
-                 else
+                         return m_model->columnCount();
+                 }
-                     // model is not specified, return the number of points in the series internal data store
-                     return m_x.size();
              }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages