From d73067a430fed5d8a01b7775c5ed5aa0689b92d3 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 4 May 2019 16:47:40 +0000 Subject: [PATCH] fix compiler warning Signed-off-by: Ivailo Monev --- src/designer/shared/previewmanager.cpp | 36 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/designer/shared/previewmanager.cpp b/src/designer/shared/previewmanager.cpp index 06e34f221..b65b3ae1e 100644 --- a/src/designer/shared/previewmanager.cpp +++ b/src/designer/shared/previewmanager.cpp @@ -75,6 +75,8 @@ QT_BEGIN_NAMESPACE +namespace qdesigner_internal { + static inline int compare(const qdesigner_internal::PreviewConfiguration &pc1, const qdesigner_internal::PreviewConfiguration &pc2) { int rc = pc1.style().compare(pc2.style()); @@ -86,26 +88,22 @@ static inline int compare(const qdesigner_internal::PreviewConfiguration &pc1, c return pc1.deviceSkin().compare(pc2.deviceSkin()); } -namespace { - // ------ PreviewData (data associated with a preview window) - struct PreviewData { - PreviewData(const QPointer &widget, const QDesignerFormWindowInterface *formWindow, const qdesigner_internal::PreviewConfiguration &pc); - QPointer m_widget; - const QDesignerFormWindowInterface *m_formWindow; - qdesigner_internal::PreviewConfiguration m_configuration; - }; - - PreviewData::PreviewData(const QPointer& widget, - const QDesignerFormWindowInterface *formWindow, - const qdesigner_internal::PreviewConfiguration &pc) : - m_widget(widget), - m_formWindow(formWindow), - m_configuration(pc) - { - } -} +// ------ PreviewData (data associated with a preview window) +struct PreviewData { + PreviewData(const QPointer &widget, const QDesignerFormWindowInterface *formWindow, const qdesigner_internal::PreviewConfiguration &pc); + QPointer m_widget; + const QDesignerFormWindowInterface *m_formWindow; + qdesigner_internal::PreviewConfiguration m_configuration; +}; -namespace qdesigner_internal { +PreviewData::PreviewData(const QPointer& widget, + const QDesignerFormWindowInterface *formWindow, + const qdesigner_internal::PreviewConfiguration &pc) : + m_widget(widget), + m_formWindow(formWindow), + m_configuration(pc) +{ +} /* In designer, we have the situation that laid-out maincontainers have * a geometry set (which might differ from their sizeHint()). The QGraphicsItem -- 2.11.0