From 09a29d2cb25c48c6ac3d34a1ffd0dff976c5fcc0 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Tue, 26 Jul 2022 21:08:31 +0200
Subject: Remove unused placemacro header

The only file that includes the header doesn't use any of the macros.

Pick-to: 6.2
Task-number: QTBUG-105206
Change-Id: I3e4413050b6b4c948b6a1cd27dac73068ccc6aab
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/location/CMakeLists.txt               |  2 +-
 src/location/places/placemacro.h          | 74 -------------------------------
 src/location/places/qplacesearchrequest.h |  1 -
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 src/location/places/placemacro.h

diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt
index f62fd315..5324583b 100644
--- a/src/location/CMakeLists.txt
+++ b/src/location/CMakeLists.txt
@@ -63,7 +63,7 @@ qt_internal_add_module(Location
         places/qplacesearchsuggestionreply.cpp places/qplaceresult.cpp
         places/qplacematchreply.cpp places/qplacecontent.cpp
         places/qplaceidreply.cpp
-        places/placemacro.h places/qplaceicon.h places/qplaceuser.h
+        places/qplaceicon.h places/qplaceuser.h
         places/qplaceattribute_p.h places/qplacematchrequest.h
         places/qplacecontentreply.h places/qplacereview.h
         places/qplacecategory.h places/qplacesearchrequest.h
diff --git a/src/location/places/placemacro.h b/src/location/places/placemacro.h
deleted file mode 100644
index de80ea25..00000000
--- a/src/location/places/placemacro.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtLocation module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PLACE_MACRO_H
-#define PLACE_MACRO_H
-
-#include <QtCore/QtGlobal>
-
-QT_BEGIN_NAMESPACE
-
-#define Q_DECLARE_D_FUNC(Class) \
-    inline Class##Private *d_func(); \
-    inline const Class##Private *d_func() const;\
-    friend class Class##Private;
-
-#define Q_DECLARE_COPY_CTOR(Class, BaseClass) \
-    Class(const BaseClass &other);
-
-#define Q_IMPLEMENT_D_FUNC(Class) \
-    Class##Private *Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
-    const Class##Private *Class::d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.constData()); }
-
-#define Q_IMPLEMENT_COPY_CTOR(Class, BaseClass) \
-    Class::Class(const BaseClass &other) : BaseClass() { Class##Private::copyIfPossible(d_ptr, other); }
-
-#define Q_DEFINE_PRIVATE_HELPER(Class, BaseClass, ClassType) \
-    BaseClass##Private *clone() const { return new Class##Private(*this); } \
-    static void copyIfPossible(QSharedDataPointer<BaseClass##Private> &d_ptr, const BaseClass &other) \
-    { \
-        if (other.type() == ClassType) \
-            d_ptr = extract_d(other); \
-        else \
-            d_ptr = new Class##Private; \
-    }
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index d2835e72..87e79a11 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -41,7 +41,6 @@
 #define QPLACESEARCHREQUEST_H
 
 #include <QtCore/QSharedDataPointer>
-#include <QtLocation/placemacro.h>
 #include <QtLocation/QPlaceCategory>
 #include <QtLocation/QLocation>
 
-- 
cgit v1.2.1