HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2543:979fe974d5e4

Clean up static variables a bit...

Miikka Heikkinen -

r2543:979fe974d5e4

parent child

Context file:

r2543:979fe974d5e4

Collapse all files

src/axis/chartaxiselement.cpp +1 -1

                 StaticLabelFormatMatcherDeleter() {}
                 ~StaticLabelFormatMatcherDeleter() { delete labelFormatMatcher; }
             };
-            StaticLabelFormatMatcherDeleter staticLabelFormatMatcherDeleter;
+            static StaticLabelFormatMatcherDeleter staticLabelFormatMatcherDeleter;
             ChartAxisElement::ChartAxisElement(QAbstractAxis *axis, QGraphicsItem *item, bool intervalAxis)
                 : ChartElement(item),

src/chartpresenter.cpp +8 -24

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            static QGraphicsTextItem *dummyTextItem = 0;
-            static const char *truncateMatchString = "&#?[0-9a-zA-Z]*;$";
-            static QRegExp *truncateMatcher = 0;
-            class StaticDummyTextDeleter
-            public:
-                StaticDummyTextDeleter() {}
-                ~StaticDummyTextDeleter()
-                    delete dummyTextItem;
-                    delete truncateMatcher;
-            };
-            StaticDummyTextDeleter staticDummyTextDeleter;
             ChartPresenter::ChartPresenter(QChart *chart, QChart::ChartType type)
                 : QObject(chart),
                   m_chart(chart),
             QRectF ChartPresenter::textBoundingRect(const QFont &font, const QString &text, qreal angle)
             {
-                if (!dummyTextItem)
+                static QGraphicsTextItem dummyTextItem;
-                    dummyTextItem = new QGraphicsTextItem;
-                dummyTextItem->setFont(font);
+                dummyTextItem.setFont(font);
-                dummyTextItem->setHtml(text);
+                dummyTextItem.setHtml(text);
-                QRectF boundingRect = dummyTextItem->boundingRect();
+                QRectF boundingRect = dummyTextItem.boundingRect();
                 // Take rotation into account
                 if (angle) {
                     // It can be assumed that almost any amount of string manipulation is faster
                     // than calculating one bounding rectangle, so first prepare a list of truncated strings
                     // to try.
-                    if (!truncateMatcher)
+                    static const char *truncateMatchString = "&#?[0-9a-zA-Z]*;$";
-                        truncateMatcher = new QRegExp(truncateMatchString);
+                    static QRegExp truncateMatcher(truncateMatchString);
                     QVector<QString> testStrings(text.length());
                     int count(0);
                     static QLatin1Char closeTag('>');
                         if (lastChar == closeTag)
                             chopIndex = truncatedString.lastIndexOf(openTag);
                         else if (lastChar == semiColon)
-                            chopIndex = truncateMatcher->indexIn(truncatedString, 0);
+                            chopIndex = truncateMatcher.indexIn(truncatedString, 0);
                         if (chopIndex != -1)
                             chopCount = truncatedString.length() - chopIndex;

src/qchart.cpp +10 -13

             // so that default theme initialization will always set these properly.
             QPen &QChartPrivate::defaultPen()
             {
-                static QPen *defaultPen = 0;
+                static QPen defaultPen(QColor(1, 2, 0), 0.93247536);
-                if (!defaultPen)
+                return defaultPen;
-                    defaultPen = new QPen(QColor(1, 2, 0), 0.93247536);
-                return *defaultPen;
             }
             QBrush &QChartPrivate::defaultBrush()
             {
-                static QBrush *defaultBrush = 0;
+                static QBrush defaultBrush(QColor(1, 2, 0), Qt::Dense7Pattern);
-                if (!defaultBrush)
+                return defaultBrush;
-                    defaultBrush = new QBrush(QColor(1, 2, 0), Qt::Dense7Pattern);
-                return *defaultBrush;
             }
             QFont &QChartPrivate::defaultFont()
             {
-                static QFont *defaultFont = 0;
+                static bool defaultFontInitialized(false);
-                if (!defaultFont) {
+                static QFont defaultFont;
-                    defaultFont = new QFont();
+                if (!defaultFontInitialized) {
-                    defaultFont->setPointSizeF(8.34563465);
+                    defaultFont.setPointSizeF(8.34563465);
+                    defaultFontInitialized = true;
                 }
-                return *defaultFont;
+                return defaultFont;
             }
             void QChartPrivate::init()

General Comments 0

Write
Preview

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

No TODOs yet

	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