From 082eebe6a47c910593f87798bf688149e6ca5534 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Tue, 12 May 2020 14:30:36 +0200
Subject: Remove deprecated QDesktopServices APIs

Change-Id: Ic21ad2938b20c1aa3ae499a921c9cff92f615816
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/gui/util/qdesktopservices.h | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'src/gui/util/qdesktopservices.h')

diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 21705e2757..6e2836e26a 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -42,7 +42,6 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qstandardpaths.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -59,32 +58,6 @@ public:
     static bool openUrl(const QUrl &url);
     static void setUrlHandler(const QString &scheme, QObject *receiver, const char *method);
     static void unsetUrlHandler(const QString &scheme);
-
-#if QT_DEPRECATED_SINCE(5, 0)
-    //Must match QStandardPaths::StandardLocation
-    enum StandardLocation {
-        DesktopLocation,
-        DocumentsLocation,
-        FontsLocation,
-        ApplicationsLocation,
-        MusicLocation,
-        MoviesLocation,
-        PicturesLocation,
-        TempLocation,
-        HomeLocation,
-        DataLocation,
-        CacheLocation
-    };
-
-    QT_DEPRECATED static QString storageLocation(StandardLocation type) {
-        return storageLocationImpl(static_cast<QStandardPaths::StandardLocation>(type));
-    }
-    QT_DEPRECATED static QString displayName(StandardLocation type) {
-        return QStandardPaths::displayName(static_cast<QStandardPaths::StandardLocation>(type));
-    }
-#endif
-private:
-    static QString storageLocationImpl(QStandardPaths::StandardLocation type);
 };
 
 #endif // QT_NO_DESKTOPSERVICES
-- 
cgit v1.2.3