HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/legend/qarealegendmarker.h

Fix crash when removing pie series from chart...

Fix crash when removing pie series from chart Connections cleanup in PieChartItem destructor didn't account for the possibility of series already having been destroyed. Changed m_series to QPointer so that it'll notice when series gets destroyed, and also added cleaning of slices to series destructor. Task-number: QTRD-1946 Change-Id: I651347bfcfbe7cd78dd26220a811fea5c8071fce Reviewed-by: Mika Salmela Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2432:53927f716a3d


                r2475:9e35a3a169ed

Download file

             qarealegendmarker.h
        
                    56 lines
            
             | 1.5 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / legend / qarealegendmarker.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
added QAreaLegendMarker

              r2176
            
      /****************************************************************************

      **

        Miikka Heikkinen
    
Fixed the copyright year 2012 -> 2013

              r2432
            
      ** Copyright (C) 2013 Digia Plc

        sauimone
    
added QAreaLegendMarker

              r2176
            
      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

      ** This file is part of the Qt Commercial Charts Add-on.

      **

      ** $QT_BEGIN_LICENSE$

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

      ** accordance with the Qt Commercial License Agreement provided with the

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

      ** a written agreement between you and Digia.

      **

      ** If you have questions regarding the use of this file, please use

      ** contact form at http://qt.digia.com

      ** $QT_END_LICENSE$

      **

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

      #ifndef QAREALEGENDMARKER_H

      #define QAREALEGENDMARKER_H

      #include <QChartGlobal>

      #include <QLegendMarker>

      #include <QAreaSeries>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      class QAreaLegendMarkerPrivate;

      class QTCOMMERCIALCHART_EXPORT QAreaLegendMarker : public QLegendMarker

      {

          Q_OBJECT

      public:

        sauimone
    
optional series parameter to markers function. code style fixes

              r2193
            
          explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = 0);

        sauimone
    
added QAreaLegendMarker

              r2176
            
          virtual ~QAreaLegendMarker();

        sauimone
    
removed peer object solution. Introduced marker type solution

              r2179
            
          virtual LegendMarkerType type() { return LegendMarkerTypeArea; }

          // Related series

        sauimone
    
pure virtual getter for series to QLegendMarker. In some cases user don't need the derived pointer. This removes the need to cast to derived marker type

              r2181
            
          virtual QAreaSeries* series();

        sauimone
    
added QAreaLegendMarker

              r2176
            
      protected:

          QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = 0);

      private:

          Q_DECLARE_PRIVATE(QAreaLegendMarker)

          Q_DISABLE_COPY(QAreaLegendMarker)

      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // QAREALEGENDMARKER_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

sauimone added QAreaLegendMarker	r2176	/****************************************************************************
		**
Miikka Heikkinen Fixed the copyright year 2012 -> 2013	r2432	** Copyright (C) 2013 Digia Plc
sauimone added QAreaLegendMarker	r2176	** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Commercial Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Commercial licenses may use this file in
		** accordance with the Qt Commercial License Agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and Digia.
		**
		** If you have questions regarding the use of this file, please use
		** contact form at http://qt.digia.com
		** $QT_END_LICENSE$
		**
		****************************************************************************/

		#ifndef QAREALEGENDMARKER_H
		#define QAREALEGENDMARKER_H

		#include <QChartGlobal>
		#include <QLegendMarker>
		#include <QAreaSeries>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		class QAreaLegendMarkerPrivate;

		class QTCOMMERCIALCHART_EXPORT QAreaLegendMarker : public QLegendMarker
		{
		Q_OBJECT

		public:
sauimone optional series parameter to markers function. code style fixes	r2193	explicit QAreaLegendMarker(QAreaSeries series, QLegend legend, QObject *parent = 0);
sauimone added QAreaLegendMarker	r2176	virtual ~QAreaLegendMarker();

sauimone removed peer object solution. Introduced marker type solution	r2179	virtual LegendMarkerType type() { return LegendMarkerTypeArea; }

		// Related series
sauimone pure virtual getter for series to QLegendMarker. In some cases user don't need the derived pointer. This removes the need to cast to derived marker type	r2181	virtual QAreaSeries* series();
sauimone added QAreaLegendMarker	r2176
		protected:
		QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = 0);

		private:
		Q_DECLARE_PRIVATE(QAreaLegendMarker)
		Q_DISABLE_COPY(QAreaLegendMarker)

		};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // QAREALEGENDMARKER_H