Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: adjust to recent Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-11-01 00:55:22 +00:00
parent 6246a67419
commit 10c2e4caed
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kdeui/kernel/kstyle.cpp
View file

@ -444,7 +444,12 @@ QPalette KStyle::standardPalette() const
KSharedConfig::openConfig(d->m_componentData));
}
QIcon KStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
#ifndef QT_KATIE
QIcon KStyle::standardIconImplementation(
#else
QIcon KStyle::standardIcon(
#endif
StandardPixmap standardIcon, const QStyleOption *option,
const QWidget *widget) const
{
switch (standardIcon) {
@ -561,7 +566,11 @@ QIcon KStyle::standardIconImplementation(StandardPixmap standardIcon, const QSty
return KIcon("audio-volume-muted");
default:
#ifndef QT_KATIE
return QStyle::standardIconImplementation(standardIcon, option, widget);
#else
return QStyle::standardIcon(standardIcon, option, widget);
#endif
}
}
@ -2817,7 +2826,13 @@ int KStyle::pixelMetric(PixelMetric metric, const QStyleOption* option, const QW
return QCommonStyle::pixelMetric(metric, option, widget);
}
int KStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const
#ifndef QT_KATIE
int KStyle::layoutSpacingImplementation(
#else
int KStyle::layoutSpacing(
#endif
QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const
{
Q_UNUSED(control1); Q_UNUSED(control2); Q_UNUSED(orientation);

9
kdeui/kernel/kstyle.h
View file

@ -1628,6 +1628,7 @@ public:
const QStyleOption *opt) const;
bool eventFilter(QObject *, QEvent *);
#ifndef QT_KATIE
protected Q_SLOTS:
int layoutSpacingImplementation(QSizePolicy::ControlType control1,
QSizePolicy::ControlType control2, Qt::Orientation orientation,
@ -1635,6 +1636,14 @@ protected Q_SLOTS:
QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
#else
int layoutSpacing(QSizePolicy::ControlType control1,
QSizePolicy::ControlType control2, Qt::Orientation orientation,
const QStyleOption *option, const QWidget *widget) const;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
#endif
//@}
private:
KStylePrivate * const d;