whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the declaration of QFileIconProviderPrivate to it's own file. 

Needed to backport qtbase/46685f755b01288fd53c4483cb97a22c426a57f0
to Qt4.

We can't add new symbols in Qt4 to QFileIconProvider so we will make
the private class a friend of the QFileDialog.

Change-Id: I6bc5a2d127b09f20633e733a79de509c8c186c6c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
bb10
Sérgio Martins 2013-07-17 11:50:00 +01:00 committed by The Qt Project
parent 4dbf574b7a
commit f4a0d6d249
3 changed files with 89 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/itemviews/itemviews.pri
View File

@ -26,6 +26,7 @@ HEADERS += \
itemviews/qtreewidgetitemiterator.h \
itemviews/qdatawidgetmapper.h \
itemviews/qfileiconprovider.h \
itemviews/qfileiconprovider_p.h \
itemviews/qcolumnviewgrip_p.h \
itemviews/qcolumnview.h \
itemviews/qcolumnview_p.h \

32
src/widgets/itemviews/qfileiconprovider.cpp
View File

@ -40,8 +40,8 @@
****************************************************************************/
#include "qfileiconprovider.h"
#include "qfileiconprovider_p.h"
#include <qstyle.h>
#include <qapplication.h>
#include <qdir.h>
#include <qpixmapcache.h>
@ -92,36 +92,6 @@ QT_BEGIN_NAMESPACE
cause a big performance impact over network or removable drives.
*/
class QFileIconProviderPrivate
{
Q_DECLARE_PUBLIC(QFileIconProvider)
public:
QFileIconProviderPrivate();
QIcon getIcon(QStyle::StandardPixmap name) const;
QIcon getIcon(const QFileInfo &fi) const;
QFileIconProvider *q_ptr;
const QString homePath;
QFileIconProvider::Options options;
private:
mutable QIcon file;
mutable QIcon fileLink;
mutable QIcon directory;
mutable QIcon directoryLink;
mutable QIcon harddisk;
mutable QIcon floppy;
mutable QIcon cdrom;
mutable QIcon ram;
mutable QIcon network;
mutable QIcon computer;
mutable QIcon desktop;
mutable QIcon trashcan;
mutable QIcon generic;
mutable QIcon home;
};
QFileIconProviderPrivate::QFileIconProviderPrivate() :
homePath(QDir::home().absolutePath())
{

87
src/widgets/itemviews/qfileiconprovider_p.h Normal file
View File

@ -0,0 +1,87 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtWidgets 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/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 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.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt 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 "qfileiconprovider.h"
#include <QtCore/qstring.h>
#include <QtGui/qicon.h>
#include <QtWidgets/qstyle.h>
QT_BEGIN_NAMESPACE
class QFileInfo;
class QFileIconProviderPrivate
{
Q_DECLARE_PUBLIC(QFileIconProvider)
public:
QFileIconProviderPrivate();
QIcon getIcon(QStyle::StandardPixmap name) const;
QIcon getIcon(const QFileInfo &fi) const;
QFileIconProvider *q_ptr;
const QString homePath;
QFileIconProvider::Options options;
private:
mutable QIcon file;
mutable QIcon fileLink;
mutable QIcon directory;
mutable QIcon directoryLink;
mutable QIcon harddisk;
mutable QIcon floppy;
mutable QIcon cdrom;
mutable QIcon ram;
mutable QIcon network;
mutable QIcon computer;
mutable QIcon desktop;
mutable QIcon trashcan;
mutable QIcon generic;
mutable QIcon home;
};
QT_END_NAMESPACE
#endif // QFILEICONPROVIDER_P_H