mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-24 02:42:48 +00:00
kdeui: remove unused KIcon and K3Icon data pointer members
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
21f81958f2
commit
fe93b26370
3 changed files with 8 additions and 42 deletions
|
@ -44,10 +44,6 @@ public:
|
||||||
KIconLoader::Type type;
|
KIconLoader::Type type;
|
||||||
int threshold;
|
int threshold;
|
||||||
QString path;
|
QString path;
|
||||||
|
|
||||||
private:
|
|
||||||
class KIconPrivate;
|
|
||||||
KIconPrivate * d;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -24,45 +24,26 @@
|
||||||
#include "kiconengine_p.h"
|
#include "kiconengine_p.h"
|
||||||
|
|
||||||
KIcon::KIcon(const QString& iconName, KIconLoader* iconLoader, const QStringList &overlays)
|
KIcon::KIcon(const QString& iconName, KIconLoader* iconLoader, const QStringList &overlays)
|
||||||
: QIcon(new KIconEngine(iconName, iconLoader ? iconLoader : KIconLoader::global(), overlays)),
|
: QIcon(new KIconEngine(iconName, iconLoader ? iconLoader : KIconLoader::global(), overlays))
|
||||||
d(0)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
KIcon::KIcon(const QString& iconName, KIconLoader* iconLoader)
|
KIcon::KIcon(const QString& iconName, KIconLoader* iconLoader)
|
||||||
: QIcon(new KIconEngine(iconName, iconLoader ? iconLoader : KIconLoader::global())),
|
: QIcon(new KIconEngine(iconName, iconLoader ? iconLoader : KIconLoader::global()))
|
||||||
d(0)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
KIcon::KIcon(const QString& iconName)
|
KIcon::KIcon(const QString& iconName)
|
||||||
: QIcon(new KIconEngine(iconName, KIconLoader::global())),
|
: QIcon(new KIconEngine(iconName, KIconLoader::global()))
|
||||||
d(0)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
KIcon::KIcon()
|
|
||||||
: d(0)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
KIcon::KIcon(const QIcon& copy)
|
KIcon::KIcon(const QIcon& copy)
|
||||||
: QIcon(copy),
|
: QIcon(copy)
|
||||||
d(0)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
KIcon::~KIcon()
|
KIcon::KIcon()
|
||||||
|
: QIcon()
|
||||||
{
|
{
|
||||||
//delete d;
|
|
||||||
}
|
|
||||||
|
|
||||||
KIcon& KIcon::operator=( const KIcon &other )
|
|
||||||
{
|
|
||||||
if (this != &other) {
|
|
||||||
// copy d-pointer
|
|
||||||
QIcon::operator=(other);
|
|
||||||
}
|
|
||||||
|
|
||||||
return *this;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
#include <kdeui_export.h>
|
#include <kdeui_export.h>
|
||||||
|
|
||||||
#include <QtGui/QIcon>
|
#include <QtGui/QIcon>
|
||||||
|
#include <QStringList>
|
||||||
|
|
||||||
class KIconLoader;
|
class KIconLoader;
|
||||||
#include <QStringList>
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \short A wrapper around QIcon that provides KDE icon features
|
* \short A wrapper around QIcon that provides KDE icon features
|
||||||
|
@ -76,17 +76,6 @@ public:
|
||||||
* Constructor for a null icon.
|
* Constructor for a null icon.
|
||||||
*/
|
*/
|
||||||
KIcon();
|
KIcon();
|
||||||
|
|
||||||
/**
|
|
||||||
* Destroys the icon.
|
|
||||||
*/
|
|
||||||
~KIcon();
|
|
||||||
|
|
||||||
KIcon& operator=( const KIcon &other );
|
|
||||||
|
|
||||||
private:
|
|
||||||
class Private;
|
|
||||||
Private* const d;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif // KICON_H
|
||||||
|
|
Loading…
Add table
Reference in a new issue