HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/axis/barcategoryaxis/qbarcategoryaxis.h

Make public headers compile with -Wzero-as-null-pointer-constant...

Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I79c74046eaf224235cc80a4323fefd2c083b007f Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Marc Mutz - - Load All Authors

File last commit:

r2871:cf15f38aab8d


                r2871:cf15f38aab8d

Download file

             qbarcategoryaxis.h
        
                    82 lines
            
             | 2.6 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / axis / barcategoryaxis / qbarcategoryaxis.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Updated license headers...

              r2845
            
      /******************************************************************************

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Copyright (C) 2015 The Qt Company Ltd.

      ** Contact: http://www.qt.io/licensing/

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_BEGIN_LICENSE:COMM$

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

      ** and conditions see http://www.qt.io/terms-conditions. For further

      ** information use the contact form at http://www.qt.io/contact-us.

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

      ******************************************************************************/

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
        Jani Honkonen
    
Fix Krazy issues

              r1935
            
      #ifndef QBARCATEGORYAXIS_H

      #define QBARCATEGORYAXIS_H

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QAbstractAxis>

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
        Marek Rosa
    
QBarCategoriesAxis renamed to QBarCategoryAxis

              r1808
            
      class QBarCategoryAxisPrivate;

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      {

          Q_OBJECT

          Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged)

          Q_PROPERTY(QString min READ min WRITE setMin NOTIFY minChanged)

          Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged)

        Tero Ahola
    
Added missing count property to QBarCategoryAxis

              r2249
            
          Q_PROPERTY(int count READ count NOTIFY countChanged)

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      public:

        Marc Mutz
    
Make public headers compile with -Wzero-as-null-pointer-constant...

              r2871
            
          explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR);

        Marek Rosa
    
QBarCategoriesAxis renamed to QBarCategoryAxis

              r1808
            
          ~QBarCategoryAxis();

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      protected:

        Marc Mutz
    
Make public headers compile with -Wzero-as-null-pointer-constant...

              r2871
            
          QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      public:

          AxisType type() const;

          void append(const QStringList &categories);

          void append(const QString &category);

          void remove(const QString &category);

          void insert(int index, const QString &category);

        Marek Rosa
    
Added posibility to replace category in QBarCategoriesAxis

              r1774
            
          void replace(const QString &oldCategory, const QString &newCategory);

        Titta Heikkala
    
Add invokable clear() for QML bar category axis...

              r2691
            
          Q_INVOKABLE void clear();

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
          void setCategories(const QStringList &categories);

          QStringList categories();

          int count() const;

          QString at(int index) const;

          //range handling

        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
          void setMin(const QString &minCategory);

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
          QString min() const;

        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
          void setMax(const QString &maxCategory);

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
          QString max() const;

        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
          void setRange(const QString &minCategory, const QString &maxCategory);

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      Q_SIGNALS:

          void categoriesChanged();

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          void minChanged(const QString &min);

          void maxChanged(const QString &max);

          void rangeChanged(const QString &min, const QString &max);

        Tero Ahola
    
Added missing count property to QBarCategoryAxis

              r2249
            
          void countChanged();

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      private:

        Marek Rosa
    
QBarCategoriesAxis renamed to QBarCategoryAxis

              r1808
            
          Q_DECLARE_PRIVATE(QBarCategoryAxis)

          Q_DISABLE_COPY(QBarCategoryAxis)

        Marek Rosa
    
Renamed barcategory grephics item class which has been previously ommited

              r1918
            
          friend class ChartBarCategoryAxisX;

          friend class ChartBarCategoryAxisY;

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
        Jani Honkonen
    
Fix Krazy issues

              r1935
            
      #endif // QBARCATEGORYAXIS_H

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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

Titta Heikkala Updated license headers...	r2845	/******************************************************************************
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	**
Titta Heikkala Updated license headers...	r2845	** Copyright (C) 2015 The Qt Company Ltd.
		** Contact: http://www.qt.io/licensing/
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	**
Titta Heikkala Updated license headers...	r2845	** $QT_BEGIN_LICENSE:COMM$
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	**
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
		** and conditions see http://www.qt.io/terms-conditions. For further
		** information use the contact form at http://www.qt.io/contact-us.
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
		******************************************************************************/
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
Jani Honkonen Fix Krazy issues	r1935	#ifndef QBARCATEGORYAXIS_H
		#define QBARCATEGORYAXIS_H
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QAbstractAxis>
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
Marek Rosa QBarCategoriesAxis renamed to QBarCategoryAxis	r1808	class QBarCategoryAxisPrivate;
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	{
		Q_OBJECT
		Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged)
		Q_PROPERTY(QString min READ min WRITE setMin NOTIFY minChanged)
		Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged)
Tero Ahola Added missing count property to QBarCategoryAxis	r2249	Q_PROPERTY(int count READ count NOTIFY countChanged)
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
		public:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR);
Marek Rosa QBarCategoriesAxis renamed to QBarCategoryAxis	r1808	~QBarCategoryAxis();
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
		protected:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
		public:
		AxisType type() const;
		void append(const QStringList &categories);
		void append(const QString &category);
		void remove(const QString &category);
		void insert(int index, const QString &category);
Marek Rosa Added posibility to replace category in QBarCategoriesAxis	r1774	void replace(const QString &oldCategory, const QString &newCategory);
Titta Heikkala Add invokable clear() for QML bar category axis...	r2691	Q_INVOKABLE void clear();
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	void setCategories(const QStringList &categories);
		QStringList categories();
		int count() const;
		QString at(int index) const;

		//range handling
Jani Honkonen more coding style fixes for src-folder...	r2104	void setMin(const QString &minCategory);
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	QString min() const;
Jani Honkonen more coding style fixes for src-folder...	r2104	void setMax(const QString &maxCategory);
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	QString max() const;
Jani Honkonen more coding style fixes for src-folder...	r2104	void setRange(const QString &minCategory, const QString &maxCategory);
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
		Q_SIGNALS:
		void categoriesChanged();
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	void minChanged(const QString &min);
		void maxChanged(const QString &max);
		void rangeChanged(const QString &min, const QString &max);
Tero Ahola Added missing count property to QBarCategoryAxis	r2249	void countChanged();
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
		private:
Marek Rosa QBarCategoriesAxis renamed to QBarCategoryAxis	r1808	Q_DECLARE_PRIVATE(QBarCategoryAxis)
		Q_DISABLE_COPY(QBarCategoryAxis)
Marek Rosa Renamed barcategory grephics item class which has been previously ommited	r1918	friend class ChartBarCategoryAxisX;
		friend class ChartBarCategoryAxisY;
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613
Jani Honkonen Fix Krazy issues	r1935	#endif // QBARCATEGORYAXIS_H