diff --git a/cmake/KatieConfig.cmake b/cmake/KatieConfig.cmake index 5cf692801..e1775101d 100644 --- a/cmake/KatieConfig.cmake +++ b/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__FOUND - wheather component is found # KATIE__INCLUDES - component headers directories for e.g. QtCore # KATIE__LIBRARIES - component libraries to link against e.g. QtCore # KATIE_ - path to tool e.g. moc +# KATIE__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) diff --git a/src/core/tools/qlist.cpp b/src/core/tools/qlist.cpp index 19f8d6024..73fe9979d 100644 --- a/src/core/tools/qlist.cpp +++ b/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); } /*! diff --git a/src/core/tools/qstring.cpp b/src/core/tools/qstring.cpp index 220b93caf..66b26e156 100644 --- a/src/core/tools/qstring.cpp +++ b/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); } /*! diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h index dae34eaa5..d961673fc 100644 --- a/src/gui/effects/qgraphicseffect.h +++ b/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: diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h index 43524e46a..12812d200 100644 --- a/src/gui/graphicsview/qgraphicswidget.h +++ b/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); diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h index 7441dcaca..a9a0bd81b 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.h +++ b/src/gui/graphicsview/qgraphicswidget_p.h @@ -73,8 +73,8 @@ class QGraphicsWidgetPrivate : public QGraphicsItemPrivate Q_DECLARE_PUBLIC(QGraphicsWidget) public: QGraphicsWidgetPrivate() - : margins(0), - layout(0), + : margins(Q_NULLPTR), + layout(Q_NULLPTR), inheritedPaletteResolveMask(0), inheritedFontResolveMask(0), polished(0), @@ -83,10 +83,10 @@ public: autoFillBackground(0), refCountInvokeRelayout(0), focusPolicy(Qt::NoFocus), - focusNext(0), - focusPrev(0), + focusNext(Q_NULLPTR), + 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; diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index f5f2223e4..bd93c4489 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE class QIconPrivate; class QIconEngine; -class QIconEngine; class Q_GUI_EXPORT QIcon { diff --git a/src/gui/widgets/qabstractspinbox.h b/src/gui/widgets/qabstractspinbox.h index 20707fdf9..0ae2ecc67 100644 --- a/src/gui/widgets/qabstractspinbox.h +++ b/src/gui/widgets/qabstractspinbox.h @@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_SPINBOX class QLineEdit; - class QAbstractSpinBoxPrivate; class QStyleOptionSpinBox; diff --git a/src/gui/widgets/qcheckbox.h b/src/gui/widgets/qcheckbox.h index 908238ee6..2a2bc31e7 100644 --- a/src/gui/widgets/qcheckbox.h +++ b/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(const QString &text, QWidget *parent=0); + explicit QCheckBox(QWidget *parent = Q_NULLPTR); + explicit QCheckBox(const QString &text, QWidget *parent = Q_NULLPTR); QSize sizeHint() const; diff --git a/src/gui/widgets/qfocusframe.h b/src/gui/widgets/qfocusframe.h index b2bde9d10..841189d2e 100644 --- a/src/gui/widgets/qfocusframe.h +++ b/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); diff --git a/src/gui/widgets/qradiobutton.h b/src/gui/widgets/qradiobutton.h index 4669b84b8..340fbd19c 100644 --- a/src/gui/widgets/qradiobutton.h +++ b/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(const QString &text, QWidget *parent=0); + explicit QRadioButton(QWidget *parent = Q_NULLPTR); + explicit QRadioButton(const QString &text, QWidget *parent = Q_NULLPTR); QSize sizeHint() const; QSize minimumSizeHint() const; diff --git a/src/gui/widgets/qrubberband.h b/src/gui/widgets/qrubberband.h index 575bf7bae..e54579dea 100644 --- a/src/gui/widgets/qrubberband.h +++ b/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; diff --git a/src/gui/widgets/qscrollbar.h b/src/gui/widgets/qscrollbar.h index cb332cd8a..e911b7e74 100644 --- a/src/gui/widgets/qscrollbar.h +++ b/src/gui/widgets/qscrollbar.h @@ -42,7 +42,6 @@ #ifndef QSCROLLBAR_H #define QSCROLLBAR_H -#include #include QT_BEGIN_HEADER @@ -59,8 +58,8 @@ class Q_GUI_EXPORT QScrollBar : public QAbstractSlider { Q_OBJECT public: - explicit QScrollBar(QWidget *parent=0); - explicit QScrollBar(Qt::Orientation, QWidget *parent=0); + explicit QScrollBar(QWidget *parent = Q_NULLPTR); + explicit QScrollBar(Qt::Orientation, QWidget *parent = Q_NULLPTR); ~QScrollBar(); QSize sizeHint() const; diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/gui/widgets/qtoolbararealayout_p.h index ffea64228..9629ba6aa 100644 --- a/src/gui/widgets/qtoolbararealayout_p.h +++ b/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;