From d4902e2df2002dfdca01f9551da8c07cbf61adc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Thu, 23 Jan 2014 00:43:21 +0100 Subject: [PATCH] Remove icon sizes from Plasma::Theme They've moved into Units --- src/plasma/theme.cpp | 30 ------------------------------ src/plasma/theme.h | 14 -------------- 2 files changed, 44 deletions(-) diff --git a/src/plasma/theme.cpp b/src/plasma/theme.cpp index 2a40e6d9d..cb006cc4f 100644 --- a/src/plasma/theme.cpp +++ b/src/plasma/theme.cpp @@ -540,36 +540,6 @@ int Theme::defaultIconSize() const return d->defaultIconSize; } -int Theme::smallIconSize() const -{ - return KIconLoader::SizeSmall; -} - -int Theme::smallMediumIconSize() const -{ - return KIconLoader::SizeSmallMedium; -} - -int Theme::mediumIconSize() const -{ - return KIconLoader::SizeMedium; -} - -int Theme::largeIconSize() const -{ - return KIconLoader::SizeLarge; -} - -int Theme::hugeIconSize() const -{ - return KIconLoader::SizeHuge; -} - -int Theme::enormousIconSize() const -{ - return KIconLoader::SizeEnormous; -} - QSizeF Theme::mSize(const QFont &font) const { return QFontMetrics(font).boundingRect("M").size(); diff --git a/src/plasma/theme.h b/src/plasma/theme.h index 95c8ad970..8b89cb770 100644 --- a/src/plasma/theme.h +++ b/src/plasma/theme.h @@ -81,13 +81,6 @@ class PLASMA_EXPORT Theme : public QObject Q_PROPERTY(QColor viewHoverColor READ viewHoverColor NOTIFY themeChanged) Q_PROPERTY(QColor viewFocusColor READ viewFocusColor NOTIFY themeChanged) - // icon sizes - Q_PROPERTY(int smallIconSize READ smallIconSize CONSTANT) - Q_PROPERTY(int smallMediumIconSize READ smallMediumIconSize CONSTANT) - Q_PROPERTY(int mediumIconSize READ mediumIconSize CONSTANT) - Q_PROPERTY(int largeIconSize READ largeIconSize CONSTANT) - Q_PROPERTY(int hugeIconSize READ hugeIconSize CONSTANT) - Q_PROPERTY(int enormousIconSize READ enormousIconSize CONSTANT) Q_PROPERTY(int defaultIconSize READ defaultIconSize NOTIFY defaultIconSizeChanged) // layout hints @@ -360,12 +353,6 @@ class PLASMA_EXPORT Theme : public QObject QColor viewHoverColor() const; QColor viewFocusColor() const; - int smallIconSize() const; - int smallMediumIconSize() const; - int mediumIconSize() const; - int largeIconSize() const; - int hugeIconSize() const; - int enormousIconSize() const; int defaultIconSize() const; int smallSpacing() const; @@ -373,7 +360,6 @@ class PLASMA_EXPORT Theme : public QObject Q_INVOKABLE QSizeF mSize(const QFont &font = QApplication::font()) const; - Q_SIGNALS: /** * Emitted when the user changes the theme. Stylesheet usage, colors, etc. should