get rid of QFileIconProviderPrivate

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 16358c3..17e148d 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -358,7 +358,6 @@ set(GUI_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qtreewidgetitemiterator_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qdatawidgetmapper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qfileiconprovider.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qfileiconprovider_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qcolumnviewgrip_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qcolumnview.h 
     ${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qcolumnview_p.h

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index a334451..31e0312 100644 (file)
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -49,7 +49,6 @@
 #include "qdebug.h"
 #include "qapplication.h"
 #include "qstylepainter.h"
-#include "qfileiconprovider_p.h"
 #include "qcoreapplication_p.h"
 #include "ui_qfiledialog.h"
 

diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp
index 1f175e1..5e03f2d 100644 (file)
--- a/src/gui/itemviews/qfileiconprovider.cpp
+++ b/src/gui/itemviews/qfileiconprovider.cpp
@@ -32,7 +32,6 @@
 ****************************************************************************/
 
 #include "qfileiconprovider.h"
-#include "qfileiconprovider_p.h"
 
 #ifndef QT_NO_FILEICONPROVIDER
 
@@ -41,6 +40,7 @@
 #include "qdir.h"
 #include "qpixmapcache.h"
 #include "qguiplatformplugin.h"
+#include "qstyle.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -61,12 +61,7 @@ QT_BEGIN_NAMESPACE
   \value File
 */
 
-QFileIconProviderPrivate::QFileIconProviderPrivate() :
-    homePath(QDir::home().absolutePath())
-{
-}
-
-QIcon QFileIconProviderPrivate::getIcon(QStyle::StandardPixmap name) const
+static QIcon getFileIcon(QStyle::StandardPixmap name)
 {
     switch (name) {
         case QStyle::SP_FileIcon:
@@ -93,7 +88,6 @@ QIcon QFileIconProviderPrivate::getIcon(QStyle::StandardPixmap name) const
 */
 
 QFileIconProvider::QFileIconProvider()
-    : d_ptr(new QFileIconProviderPrivate)
 {
 }
 
@@ -104,7 +98,6 @@ QFileIconProvider::QFileIconProvider()
 
 QFileIconProvider::~QFileIconProvider()
 {
-    delete d_ptr;
 }
 
 /*!
@@ -113,22 +106,21 @@ QFileIconProvider::~QFileIconProvider()
 
 QIcon QFileIconProvider::icon(IconType type) const
 {
-    Q_D(const QFileIconProvider);
     switch (type) {
         case Computer:
-            return d->getIcon(QStyle::SP_ComputerIcon);
+            return getFileIcon(QStyle::SP_ComputerIcon);
         case Desktop:
-            return d->getIcon(QStyle::SP_DesktopIcon);
+            return getFileIcon(QStyle::SP_DesktopIcon);
         case Trashcan:
-            return d->getIcon(QStyle::SP_TrashIcon);
+            return getFileIcon(QStyle::SP_TrashIcon);
         case Network:
-            return d->getIcon(QStyle::SP_DriveNetIcon);
+            return getFileIcon(QStyle::SP_DriveNetIcon);
         case Drive:
-            return d->getIcon(QStyle::SP_DriveHDIcon);
+            return getFileIcon(QStyle::SP_DriveHDIcon);
         case Folder:
-            return d->getIcon(QStyle::SP_DirIcon);
+            return getFileIcon(QStyle::SP_DirIcon);
         case File:
-            return d->getIcon(QStyle::SP_FileIcon);
+            return getFileIcon(QStyle::SP_FileIcon);
         default:
             break;
     };
@@ -141,27 +133,27 @@ QIcon QFileIconProvider::icon(IconType type) const
 
 QIcon QFileIconProvider::icon(const QFileInfo &info) const
 {
-    Q_D(const QFileIconProvider);
-
     QIcon platformIcon = qt_guiPlatformPlugin()->fileSystemIcon(info);
     if (!platformIcon.isNull())
         return platformIcon;
 
     if (info.isRoot()) {
-        return d->getIcon(QStyle::SP_DriveHDIcon);
+        return getFileIcon(QStyle::SP_DriveHDIcon);
     } else if (info.isFile()) {
         if (info.isSymLink()) {
-            return d->getIcon(QStyle::SP_FileLinkIcon);
+            return getFileIcon(QStyle::SP_FileLinkIcon);
         } else {
-            return d->getIcon(QStyle::SP_FileIcon);
+            return getFileIcon(QStyle::SP_FileIcon);
         }
     } else if (info.isDir()) {
+        static QString homePath = QDir::home().absolutePath();
+
         if (info.isSymLink()) {
-            return d->getIcon(QStyle::SP_DirLinkIcon);
-        } else if (info.absoluteFilePath() == d->homePath) {
-            return d->getIcon(QStyle::SP_DirHomeIcon);
+            return getFileIcon(QStyle::SP_DirLinkIcon);
+        } else if (info.absoluteFilePath() == homePath) {
+            return getFileIcon(QStyle::SP_DirHomeIcon);
         } else {
-            return d->getIcon(QStyle::SP_DirIcon);
+            return getFileIcon(QStyle::SP_DirIcon);
         }
     }
     return QIcon();
@@ -197,9 +189,3 @@ QString QFileIconProvider::type(const QFileInfo &info) const
 QT_END_NAMESPACE
 
 #endif
-
-
-
-
-
-

diff --git a/src/gui/itemviews/qfileiconprovider.h b/src/gui/itemviews/qfileiconprovider.h
index e5a4e7b..8a0f09c 100644 (file)
--- a/src/gui/itemviews/qfileiconprovider.h
+++ b/src/gui/itemviews/qfileiconprovider.h
@@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_FILEICONPROVIDER
 
-class QFileIconProviderPrivate;
-
 class Q_GUI_EXPORT QFileIconProvider
 {
 public:
@@ -54,11 +52,6 @@ public:
     virtual QIcon icon(IconType type) const;
     virtual QIcon icon(const QFileInfo &info) const;
     virtual QString type(const QFileInfo &info) const;
-
-private:
-    Q_DECLARE_PRIVATE(QFileIconProvider)
-    Q_DISABLE_COPY(QFileIconProvider)
-    QFileIconProviderPrivate* d_ptr;
 };
 
 #endif // QT_NO_FILEICONPROVIDER

diff --git a/src/gui/itemviews/qfileiconprovider_p.h b/src/gui/itemviews/qfileiconprovider_p.h
deleted file mode 100644 (file)
index 68fbbaf..0000000
--- a/src/gui/itemviews/qfileiconprovider_p.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2020 Ivailo Monev
-**
-** This file is part of the QtGui module of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFILEICONPROVIDER_P_H
-#define QFILEICONPROVIDER_P_H
-
-#include <QtCore/qstring.h>
-#include <QtGui/qicon.h>
-#include <QtGui/qstyle.h>
-
-QT_BEGIN_NAMESPACE
-
-class QFileIconProviderPrivate
-{
-public:
-    QFileIconProviderPrivate();
-    QIcon getIcon(QStyle::StandardPixmap name) const;
-    const QString homePath;
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QFILEICONPROVIDER_P_H