Use categorized logging instead of quickLayoutDebug()

Pick-to: 5.15
Change-Id: I4db3ebb02a5b541ca8e50e65b9056d398570e331
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

4 files changed, 21 insertions, 19 deletions

diff --git a/src/imports/layouts/qquickgridlayoutengine_p.h b/src/imports/layouts/qquickgridlayoutengine_p.h
index c53be89477..ca3b518ee5 100644
--- a/src/imports/layouts/qquickgridlayoutengine_p.h
+++ b/src/imports/layouts/qquickgridlayoutengine_p.h
@@ -95,7 +95,7 @@ public:
 
     void invalidate()
     {
-        quickLayoutDebug() << "engine::invalidate()";
+        qCDebug(lcQuickLayouts) << "QQuickGridLayoutItem::invalidate()";
         sizeHintCacheDirty = true;
     }
 
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
index 33c27bd928..8d9a6b0165 100644
--- a/src/imports/layouts/qquicklayout.cpp
+++ b/src/imports/layouts/qquicklayout.cpp
@@ -90,6 +90,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcQuickLayouts, "qt.quick.layouts")
+
 QQuickLayoutAttached::QQuickLayoutAttached(QObject *parent)
     : QObject(parent),
       m_minimumWidth(0),
@@ -669,7 +671,7 @@ void QQuickLayoutAttached::invalidateItem()
 {
     if (!m_changesNotificationEnabled)
         return;
-    quickLayoutDebug() << "QQuickLayoutAttached::invalidateItem";
+    qCDebug(lcQuickLayouts) << "QQuickLayoutAttached::invalidateItem";
     if (QQuickLayout *layout = parentLayout()) {
         layout->invalidate(item());
     }
@@ -730,9 +732,11 @@ QQuickLayoutAttached *QQuickLayout::qmlAttachedProperties(QObject *object)
 
 void QQuickLayout::updatePolish()
 {
+    qCDebug(lcQuickLayouts) << "updatePolish() ENTERING" << this;
     m_inUpdatePolish = true;
     rearrange(QSizeF(width(), height()));
     m_inUpdatePolish = false;
+    qCDebug(lcQuickLayouts) << "updatePolish() LEAVING" << this;
 }
 
 void QQuickLayout::componentComplete()
@@ -752,19 +756,20 @@ void QQuickLayout::invalidate(QQuickItem * /*childItem*/)
     m_dirty = true;
 
     if (!qobject_cast<QQuickLayout *>(parentItem())) {
-        quickLayoutDebug() << "QQuickLayout::invalidate(), polish()";
 
         if (m_inUpdatePolish)
             ++m_polishInsideUpdatePolish;
         else
             m_polishInsideUpdatePolish = 0;
 
-        if (m_polishInsideUpdatePolish <= 2)
+        if (m_polishInsideUpdatePolish <= 2) {
             // allow at most two consecutive loops in order to respond to height-for-width
             // (e.g QQuickText changes implicitHeight when its width gets changed)
+            qCDebug(lcQuickLayouts) << "QQuickLayout::invalidate(), polish()";
             polish();
-        else
+        } else {
             qWarning() << "Qt Quick Layouts: Polish loop detected. Aborting after two iterations.";
+        }
     }
 }
 
@@ -809,12 +814,14 @@ void QQuickLayout::itemChange(ItemChange change, const ItemChangeData &value)
         qmlobject_connect(item, QQuickItem, SIGNAL(baselineOffsetChanged(qreal)), this, QQuickLayout, SLOT(invalidateSenderItem()));
         QQuickItemPrivate::get(item)->addItemChangeListener(this, changeTypes);
         d->m_hasItemChangeListeners = true;
+        qCDebug(lcQuickLayouts) << "ChildAdded" << item;
         if (isReady())
             updateLayoutItems();
     } else if (change == ItemChildRemovedChange) {
         QQuickItem *item = value.item;
         qmlobject_disconnect(item, QQuickItem, SIGNAL(baselineOffsetChanged(qreal)), this, QQuickLayout, SLOT(invalidateSenderItem()));
         QQuickItemPrivate::get(item)->removeItemChangeListener(this, changeTypes);
+        qCDebug(lcQuickLayouts) << "ChildRemoved" << item;
         if (isReady())
             updateLayoutItems();
     }
@@ -828,7 +835,7 @@ void QQuickLayout::geometryChanged(const QRectF &newGeometry, const QRectF &oldG
     if (d->m_disableRearrange || !isReady() || !newGeometry.isValid())
         return;
 
-    quickLayoutDebug() << "QQuickStackLayout::geometryChanged" << newGeometry << oldGeometry;
+    qCDebug(lcQuickLayouts) << "QQuickLayout::geometryChanged" << newGeometry << oldGeometry;
     rearrange(newGeometry.size());
 }
 
diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h
index a2594f4274..8f208165e9 100644
--- a/src/imports/layouts/qquicklayout_p.h
+++ b/src/imports/layouts/qquicklayout_p.h
@@ -49,12 +49,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickLayoutAttached;
-
-#if 0 && !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_OUTPUT)
-# define quickLayoutDebug QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).debug
-#else
-# define quickLayoutDebug QT_NO_QDEBUG_MACRO
-#endif
+Q_DECLARE_LOGGING_CATEGORY(lcQuickLayouts)
 
 class QQuickLayoutPrivate;
 class QQuickLayout : public QQuickItem, public QQuickItemChangeListener
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp
index e47eba4164..1657f63fcf 100644
--- a/src/imports/layouts/qquicklinearlayout.cpp
+++ b/src/imports/layouts/qquicklinearlayout.cpp
@@ -315,7 +315,7 @@ QQuickGridLayoutBase::~QQuickGridLayoutBase()
 
 void QQuickGridLayoutBase::componentComplete()
 {
-    quickLayoutDebug() << objectName() << "QQuickGridLayoutBase::componentComplete()" << parent();
+    qCDebug(lcQuickLayouts) << objectName() << "QQuickGridLayoutBase::componentComplete()" << parent();
     QQuickLayout::componentComplete();
     updateLayoutItems();
 
@@ -368,7 +368,7 @@ void QQuickGridLayoutBase::invalidate(QQuickItem *childItem)
         return;
     }
 
-    quickLayoutDebug() << "QQuickGridLayoutBase::invalidate()";
+    qCDebug(lcQuickLayouts) << "QQuickGridLayoutBase::invalidate()";
 
     if (childItem) {
         if (QQuickGridLayoutItem *layoutItem = d->engine.findLayoutItem(childItem))
@@ -412,12 +412,12 @@ void QQuickGridLayoutBase::updateLayoutItems()
         return;
     }
 
-    quickLayoutDebug() << "QQuickGridLayoutBase::updateLayoutItems";
+    qCDebug(lcQuickLayouts) << "QQuickGridLayoutBase::updateLayoutItems()";
     d->engine.deleteItems();
     insertLayoutItems();
 
     invalidate();
-    quickLayoutDebug() << "QQuickGridLayoutBase::updateLayoutItems LEAVING";
+    qCDebug(lcQuickLayouts) << "QQuickGridLayoutBase::updateLayoutItems() LEAVING";
 }
 
 QQuickItem *QQuickGridLayoutBase::itemAt(int index) const
@@ -445,7 +445,7 @@ void QQuickGridLayoutBase::itemDestroyed(QQuickItem *item)
     if (!isReady())
         return;
     Q_D(QQuickGridLayoutBase);
-    quickLayoutDebug() << "QQuickGridLayoutBase::itemDestroyed";
+    qCDebug(lcQuickLayouts) << "QQuickGridLayoutBase::itemDestroyed";
     if (QQuickGridLayoutItem *gridItem = d->engine.findLayoutItem(item)) {
         removeGridItem(gridItem);
         delete gridItem;
@@ -459,7 +459,7 @@ void QQuickGridLayoutBase::itemVisibilityChanged(QQuickItem *item)
 
     if (!isReady())
         return;
-    quickLayoutDebug() << "QQuickGridLayoutBase::itemVisibilityChanged";
+    qCDebug(lcQuickLayouts) << "QQuickGridLayoutBase::itemVisibilityChanged()";
     updateLayoutItems();
 }
 
@@ -480,7 +480,7 @@ void QQuickGridLayoutBase::rearrange(const QSizeF &size)
     }
 
     d->m_rearranging = true;
-    quickLayoutDebug() << objectName() << "QQuickGridLayoutBase::rearrange()" << size;
+    qCDebug(lcQuickLayouts) << objectName() << "QQuickGridLayoutBase::rearrange()" << size;
     Qt::LayoutDirection visualDir = effectiveLayoutDirection();
     d->engine.setVisualDirection(visualDir);