various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

cmake/KatieConfig.cmake

@@ -1,14 +1,24 @@
 # - Config file for the Katie package
 #
-# It defines the following variables:
+# It defines relevant to other projects variables:
 #
+#  KATIE_FOUND                  - wheather the project is found
 #  KATIE_DEFINITIONS            - all preprocessor definitions
 #  KATIE_INCLUDES               - all headers directories
 #  KATIE_LIBRARIES              - all component libraries
+#  KATIE_<COMPONENT>_FOUND      - wheather component is found
 #  KATIE_<COMPONENT>_INCLUDES   - component headers directories for e.g. QtCore
 #  KATIE_<COMPONENT>_LIBRARIES  - component libraries to link against e.g. QtCore
 #  KATIE_<TOOL>                 - path to tool e.g. moc
+#  KATIE_<DATA>_PATH            - path to different data type files e.g. translations
+#  KATIE_MKSPECS_DIR
 #
+# As well as some that are unilkely to be needed outside the project:
+#
+#  KATIE_TOOLS_SUFFIX           - tools suffix used when the project was build
+#  KATIE_COMPONENTS             - components that were build
+#  KATIE_TOOLS                  - tools that were build
+#  KATIE_MKSPECS                - path to mkspecs which are relevant to the project only
 
 set(KATIE_FOUND TRUE)
 

src/core/tools/qlist.cpp

@@ -147,7 +147,8 @@ QListData::Data *QListData::detach(int alloc)
  */
 void QListData::freeData(Data *data)
 {
-    free(data);
+    if(data != &shared_null)
+        free(data);
 }
 
 /*!

src/core/tools/qstring.cpp

@@ -1105,7 +1105,8 @@ QString::QString(const QChar ch)
 
 void QString::freeData(Data *d)
 {
-    free(d);
+    if(d != &shared_null && d != &shared_empty)
+        free(d);
 }
 
 /*!

src/gui/effects/qgraphicseffect.h

@@ -107,7 +107,7 @@ protected:
     QRectF sourceBoundingRect(Qt::CoordinateSystem system = Qt::LogicalCoordinates) const;
     void drawSource(QPainter *painter);
     QPixmap sourcePixmap(Qt::CoordinateSystem system = Qt::LogicalCoordinates,
-                         QPoint *offset = 0,
+                         QPoint *offset = Q_NULLPTR,
                          PixmapPadMode mode = PadToEffectiveBoundingRect) const;
 
 private:

src/gui/graphicsview/qgraphicswidget.h

@@ -84,7 +84,7 @@ class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLay
     Q_PROPERTY(bool autoFillBackground READ autoFillBackground WRITE setAutoFillBackground)
     Q_PROPERTY(QGraphicsLayout* layout READ layout WRITE setLayout NOTIFY layoutChanged)
 public:
-    QGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
+    QGraphicsWidget(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = 0);
     ~QGraphicsWidget();
     QGraphicsLayout *layout() const;
     void setLayout(QGraphicsLayout *layout);

src/gui/graphicsview/qgraphicswidget_p.h

@@ -73,8 +73,8 @@ class QGraphicsWidgetPrivate : public QGraphicsItemPrivate
     Q_DECLARE_PUBLIC(QGraphicsWidget)
 public:
     QGraphicsWidgetPrivate()
-        : margins(0),
+        : margins(Q_NULLPTR),
-          layout(0),
+          layout(Q_NULLPTR),
           inheritedPaletteResolveMask(0),
           inheritedFontResolveMask(0),
           polished(0),
@@ -83,10 +83,10 @@ public:
           autoFillBackground(0),
           refCountInvokeRelayout(0),
           focusPolicy(Qt::NoFocus),
-          focusNext(0),
+          focusNext(Q_NULLPTR),
-          focusPrev(0),
+          focusPrev(Q_NULLPTR),
           windowFlags(0),
-          windowData(0),
+          windowData(Q_NULLPTR),
           setWindowFrameMargins(false),
           windowFrameMargins(0)
     { }
@@ -187,7 +187,7 @@ public:
     quint32 inSetGeometry : 1;
     quint32 inSetPos : 1;
     quint32 autoFillBackground : 1;
-    quint32 refCountInvokeRelayout : 16;
+    quint32 refCountInvokeRelayout : 18;
 
     // Focus
     Qt::FocusPolicy focusPolicy;

src/gui/image/qicon.h

@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
 
 class QIconPrivate;
 class QIconEngine;
-class QIconEngine;
 
 class Q_GUI_EXPORT QIcon
 {

src/gui/widgets/qabstractspinbox.h

@@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE
 #ifndef QT_NO_SPINBOX
 
 class QLineEdit;
-
 class QAbstractSpinBoxPrivate;
 class QStyleOptionSpinBox;
 

src/gui/widgets/qcheckbox.h

@@ -59,8 +59,8 @@ class Q_GUI_EXPORT QCheckBox : public QAbstractButton
     Q_PROPERTY(bool tristate READ isTristate WRITE setTristate)
 
 public:
-    explicit QCheckBox(QWidget *parent=0);
+    explicit QCheckBox(QWidget *parent = Q_NULLPTR);
-    explicit QCheckBox(const QString &text, QWidget *parent=0);
+    explicit QCheckBox(const QString &text, QWidget *parent = Q_NULLPTR);
 
 
     QSize sizeHint() const;

src/gui/widgets/qfocusframe.h

@@ -56,7 +56,7 @@ class Q_GUI_EXPORT QFocusFrame : public QWidget
 {
     Q_OBJECT
 public:
-    QFocusFrame(QWidget *parent=0);
+    QFocusFrame(QWidget *parent = Q_NULLPTR);
     ~QFocusFrame();
 
     void setWidget(QWidget *widget);

src/gui/widgets/qradiobutton.h

@@ -57,8 +57,8 @@ class Q_GUI_EXPORT QRadioButton : public QAbstractButton
     Q_OBJECT
 
 public:
-    explicit QRadioButton(QWidget *parent=0);
+    explicit QRadioButton(QWidget *parent = Q_NULLPTR);
-    explicit QRadioButton(const QString &text, QWidget *parent=0);
+    explicit QRadioButton(const QString &text, QWidget *parent = Q_NULLPTR);
 
     QSize sizeHint() const;
     QSize minimumSizeHint() const;

src/gui/widgets/qrubberband.h

@@ -60,7 +60,7 @@ class Q_GUI_EXPORT QRubberBand : public QWidget
 
 public:
     enum Shape { Line, Rectangle };
-    explicit QRubberBand(Shape, QWidget * =0);
+    explicit QRubberBand(Shape, QWidget *parent = Q_NULLPTR);
     ~QRubberBand();
 
     Shape shape() const;

src/gui/widgets/qscrollbar.h

@@ -42,7 +42,6 @@
 #ifndef QSCROLLBAR_H
 #define QSCROLLBAR_H
 
-#include <QtGui/qwidget.h>
 #include <QtGui/qabstractslider.h>
 
 QT_BEGIN_HEADER
@@ -59,8 +58,8 @@ class Q_GUI_EXPORT QScrollBar : public QAbstractSlider
 {
     Q_OBJECT
 public:
-    explicit QScrollBar(QWidget *parent=0);
+    explicit QScrollBar(QWidget *parent = Q_NULLPTR);
-    explicit QScrollBar(Qt::Orientation, QWidget *parent=0);
+    explicit QScrollBar(Qt::Orientation, QWidget *parent = Q_NULLPTR);
     ~QScrollBar();
 
     QSize sizeHint() const;

src/gui/widgets/qtoolbararealayout_p.h

@@ -96,7 +96,7 @@ class QStyleOptionToolBar;
 class QToolBarAreaLayoutItem
 {
 public:
-    QToolBarAreaLayoutItem(QLayoutItem *item = 0)
+    QToolBarAreaLayoutItem(QLayoutItem *item = Q_NULLPTR)
         : widgetItem(item), pos(0), size(-1), preferredSize(-1), gap(false) {}
 
     bool skip() const;