From 216f19d52ce9e920349da9247afc2c8e85df2c56 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 14 May 2018 10:20:34 +0200
Subject: Reduce boilerplate code for FaviconManager

Remove private implementation for FaviconManager
Make FaviconManager non QObject since there no reason
to do so.

Change-Id: I8e341f9bd2dbc6f3fa977693383bbbf7349ab0b0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/favicon_manager_p.h | 106 -------------------------------------------
 1 file changed, 106 deletions(-)
 delete mode 100644 src/core/favicon_manager_p.h

(limited to 'src/core/favicon_manager_p.h')

diff --git a/src/core/favicon_manager_p.h b/src/core/favicon_manager_p.h
deleted file mode 100644
index e2a49dbc7..000000000
--- a/src/core/favicon_manager_p.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine 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 FAVICON_MANAGER_P_H
-#define FAVICON_MANAGER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qtwebenginecoreglobal_p.h"
-
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <vector>
-
-#include "base/memory/weak_ptr.h"
-
-QT_FORWARD_DECLARE_CLASS(QUrl)
-
-class GURL;
-class SkBitmap;
-
-namespace gfx {
-    class Size;
-}
-
-namespace content {
-    class WebContents;
-}
-
-namespace QtWebEngineCore {
-
-class FaviconManager;
-class WebContentsAdapterClient;
-
-class FaviconManagerPrivate {
-public:
-    FaviconManagerPrivate(content::WebContents *, WebContentsAdapterClient *);
-    ~FaviconManagerPrivate();
-
-    int downloadIcon(const QUrl &);
-
-    void iconDownloadFinished(int, int, const GURL &, const std::vector<SkBitmap> &, const std::vector<gfx::Size> &);
-    void storeIcon(int, const QIcon &);
-    void downloadPendingRequests();
-    void propagateIcon(const QUrl &) const;
-
-    content::WebContents *m_webContents;
-    WebContentsAdapterClient *m_viewClient;
-    base::WeakPtrFactory<FaviconManagerPrivate> m_weakFactory;
-
-    QMap<QUrl, QIcon> m_icons;
-    QMap<int, QUrl> m_inProgressRequests;
-    QMap<int, QUrl> m_pendingRequests;
-
-    Q_DECLARE_PUBLIC(FaviconManager)
-    FaviconManager *q_ptr;
-};
-
-} // namespace QtWebEngineCore
-
-#endif // FAVICON_MANAGER_P_H
-- 
cgit v1.2.3