summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/util/qgridlayoutengine.cpp (renamed from src/widgets/graphicsview/qgridlayoutengine.cpp)12
-rw-r--r--src/gui/util/qgridlayoutengine_p.h (renamed from src/widgets/graphicsview/qgridlayoutengine_p.h)26
-rw-r--r--src/gui/util/util.pri2
-rw-r--r--src/widgets/graphicsview/graphicsview.pri2
-rw-r--r--src/widgets/graphicsview/qgraphicsgridlayout.cpp6
-rw-r--r--src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h2
-rw-r--r--src/widgets/graphicsview/qgraphicslinearlayout.cpp6
7 files changed, 29 insertions, 27 deletions
diff --git a/src/widgets/graphicsview/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp
index 2fabf98cf8..bcc689c985 100644
--- a/src/widgets/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/util/qgridlayoutengine.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
-** This file is part of the QtWidgets module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@@ -136,7 +136,7 @@ void QGridLayoutBox::normalize()
Q_ASSERT((q_minimumDescent < 0.0) == (q_minimumAscent < 0.0));
}
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void QGridLayoutBox::dump(int indent) const
{
qDebug("%*sBox (%g <= %g <= %g [%g/%g])", indent, "", q_minimumSize, q_preferredSize,
@@ -460,7 +460,7 @@ void QGridLayoutRowData::stealBox(int start, int end, int which, qreal *position
}
}
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void QGridLayoutRowData::dump(int indent) const
{
qDebug("%*sData", indent, "");
@@ -709,7 +709,7 @@ QSizeF QGridLayoutItem::effectiveMaxSize(const QSizeF &constraint) const
return size;
}
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void QGridLayoutItem::dump(int indent) const
{
qDebug("%*s (%d, %d) %d x %d", indent, "", firstRow(), firstColumn(), //###
@@ -736,7 +736,7 @@ void QGridLayoutRowInfo::insertOrRemoveRows(int row, int delta)
insertOrRemoveItems(boxes, row, delta);
}
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void QGridLayoutRowInfo::dump(int indent) const
{
qDebug("%*sInfo (count: %d)", indent, "", count);
@@ -1155,7 +1155,7 @@ Qt::LayoutDirection QGridLayoutEngine::visualDirection() const
return m_visualDirection;
}
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void QGridLayoutEngine::dump(int indent) const
{
qDebug("%*sEngine", indent, "");
diff --git a/src/widgets/graphicsview/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index e864294a4a..7f5bfcfaee 100644
--- a/src/widgets/graphicsview/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
-** This file is part of the QtWidgets module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@@ -58,12 +58,14 @@
#include "qlist.h"
#include "qmap.h"
#include "qpair.h"
-#include "qvector.h"
+#include <QtCore/qvector.h>
#include <QtCore/qsize.h>
#include <QtCore/qrect.h>
#include <float.h>
-#include <QtGui/private/qlayoutpolicy_p.h>
-#include <QtGui/private/qabstractlayoutstyleinfo_p.h>
+#include "qlayoutpolicy_p.h"
+#include "qabstractlayoutstyleinfo_p.h"
+
+// #define QGRIDLAYOUTENGINE_DEBUG
QT_BEGIN_NAMESPACE
@@ -138,7 +140,7 @@ public:
};
-class QGridLayoutBox
+class Q_GUI_EXPORT QGridLayoutBox
{
public:
inline QGridLayoutBox()
@@ -149,7 +151,7 @@ public:
void combine(const QGridLayoutBox &other);
void normalize();
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void dump(int indent = 0) const;
#endif
// This code could use the union-struct-array trick, but a compiler
@@ -239,7 +241,7 @@ public:
QGridLayoutBox totalBox(int start, int end) const;
void stealBox(int start, int end, int which, qreal *positions, qreal *sizes);
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void dump(int indent = 0) const;
#endif
@@ -258,7 +260,7 @@ public:
void insertOrRemoveRows(int row, int delta);
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void dump(int indent = 0) const;
#endif
@@ -270,7 +272,7 @@ public:
};
-class QGridLayoutItem
+class Q_GUI_EXPORT QGridLayoutItem
{
public:
QGridLayoutItem(int row, int column, int rowSpan = 1, int columnSpan = 1,
@@ -321,7 +323,7 @@ public:
void insertOrRemoveRows(int row, int delta, Qt::Orientation orientation = Qt::Vertical);
QSizeF effectiveMaxSize(const QSizeF &constraint) const;
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void dump(int indent = 0) const;
#endif
@@ -333,7 +335,7 @@ private:
};
-class QGridLayoutEngine
+class Q_GUI_EXPORT QGridLayoutEngine
{
public:
QGridLayoutEngine(Qt::Alignment defaultAlignment = Qt::Alignment(0));
@@ -397,7 +399,7 @@ public:
void transpose();
void setVisualDirection(Qt::LayoutDirection direction);
Qt::LayoutDirection visualDirection() const;
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void dump(int indent = 0) const;
#endif
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index 96027dd954..79c83599b9 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -4,11 +4,13 @@ HEADERS += \
util/qdesktopservices.h \
util/qhexstring_p.h \
util/qvalidator.h \
+ util/qgridlayoutengine_p.h \
util/qabstractlayoutstyleinfo_p.h \
util/qlayoutpolicy_p.h
SOURCES += \
util/qdesktopservices.cpp \
util/qvalidator.cpp \
+ util/qgridlayoutengine.cpp \
util/qabstractlayoutstyleinfo.cpp \
util/qlayoutpolicy.cpp
diff --git a/src/widgets/graphicsview/graphicsview.pri b/src/widgets/graphicsview/graphicsview.pri
index f8cbe18493..b81f736ef4 100644
--- a/src/widgets/graphicsview/graphicsview.pri
+++ b/src/widgets/graphicsview/graphicsview.pri
@@ -23,7 +23,6 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \
graphicsview/qgraphicsview_p.h \
graphicsview/qgraphicswidget.h \
graphicsview/qgraphicswidget_p.h \
- graphicsview/qgridlayoutengine_p.h \
graphicsview/qgraphicslayoutstyleinfo_p.h \
graphicsview/qgraphicsgridlayoutengine_p.h \
graphicsview/qgraph_p.h \
@@ -49,7 +48,6 @@ SOURCES += graphicsview/qgraphicsgridlayout.cpp \
graphicsview/qgraphicsview.cpp \
graphicsview/qgraphicswidget.cpp \
graphicsview/qgraphicswidget_p.cpp \
- graphicsview/qgridlayoutengine.cpp \
graphicsview/qgraphicslayoutstyleinfo.cpp \
graphicsview/qgraphicsgridlayoutengine.cpp \
graphicsview/qsimplex_p.cpp \
diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
index 59f3d891f2..0ecb4af6bd 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
@@ -106,7 +106,7 @@ public:
mutable QGraphicsLayoutStyleInfo *m_styleInfo;
QGraphicsGridLayoutEngine engine;
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void dump(int indent) const;
#endif
};
@@ -631,7 +631,7 @@ void QGraphicsGridLayout::invalidate()
QGraphicsLayout::invalidate();
}
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
void QGraphicsGridLayoutPrivate::dump(int indent) const
{
if (qt_graphicsLayoutDebug()) {
@@ -656,7 +656,7 @@ void QGraphicsGridLayout::setGeometry(const QRectF &rect)
qSwap(left, right);
effectiveRect.adjust(+left, +top, -right, -bottom);
d->engine.setGeometries(effectiveRect, d->styleInfo());
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
if (qt_graphicsLayoutDebug()) {
static int counter = 0;
qDebug("==== BEGIN DUMP OF QGraphicsGridLayout (%d)====", counter++);
diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
index 3d34f99977..1e987e30d2 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
+++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
@@ -42,7 +42,7 @@
#ifndef QGRAPHICSGRIDLAYOUTENGINE_P_H
#define QGRAPHICSGRIDLAYOUTENGINE_P_H
-#include "qgridlayoutengine_p.h"
+#include <QtGui/private/qgridlayoutengine_p.h>
#include <QtWidgets/qsizepolicy.h>
#include <QtWidgets/qstyle.h>
diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.cpp b/src/widgets/graphicsview/qgraphicslinearlayout.cpp
index f506148ea3..5c438e0495 100644
--- a/src/widgets/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicslinearlayout.cpp
@@ -511,7 +511,7 @@ void QGraphicsLinearLayout::setGeometry(const QRectF &rect)
if (visualDir == Qt::RightToLeft)
qSwap(left, right);
effectiveRect.adjust(+left, +top, -right, -bottom);
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
if (qt_graphicsLayoutDebug()) {
static int counter = 0;
qDebug() << counter++ << "QGraphicsLinearLayout::setGeometry - " << rect;
@@ -519,7 +519,7 @@ void QGraphicsLinearLayout::setGeometry(const QRectF &rect)
}
#endif
d->engine.setGeometries(effectiveRect, d->styleInfo());
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
if (qt_graphicsLayoutDebug()) {
qDebug() << "post dump";
dump(1);
@@ -556,7 +556,7 @@ void QGraphicsLinearLayout::invalidate()
*/
void QGraphicsLinearLayout::dump(int indent) const
{
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
if (qt_graphicsLayoutDebug()) {
Q_D(const QGraphicsLinearLayout);
qDebug("%*s%s layout", indent, "",
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 03:29:00 +0000