Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kstyles: adjust to recent Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-11-01 00:55:50 +00:00
parent ecbc98b6d9
commit 6956ac804a
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kstyles/oxygen/oxygenstyle.cpp
View file

@ -7502,7 +7502,11 @@ namespace Oxygen
} }
//____________________________________________________________________ //____________________________________________________________________
#ifndef QT_KATIE
QIcon Style::standardIconImplementation( QIcon Style::standardIconImplementation(
#else
QIcon Style::standardIcon(
#endif
StandardPixmap standardIcon, StandardPixmap standardIcon,
const QStyleOption *option, const QStyleOption *option,
const QWidget *widget ) const const QWidget *widget ) const
@ -7730,7 +7734,11 @@ namespace Oxygen
} }
default: default:
#ifndef QT_KATIE
return QCommonStyle::standardIconImplementation( standardIcon, option, widget ); return QCommonStyle::standardIconImplementation( standardIcon, option, widget );
#else
return QCommonStyle::standardIcon( standardIcon, option, widget );
#endif
} }
} }

8
kstyles/oxygen/oxygenstyle.h
View file

@ -197,13 +197,21 @@ namespace Oxygen
void globalPaletteChanged( void ); void globalPaletteChanged( void );
//! copied from kstyle //! copied from kstyle
#ifndef QT_KATIE
int layoutSpacingImplementation( int layoutSpacingImplementation(
#else
virtual int layoutSpacing(
#endif
QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation,
const QStyleOption* option, const QWidget* widget ) const const QStyleOption* option, const QWidget* widget ) const
{ return pixelMetric(PM_DefaultLayoutSpacing, option, widget); } { return pixelMetric(PM_DefaultLayoutSpacing, option, widget); }
//! standard icons //! standard icons
#ifndef QT_KATIE
virtual QIcon standardIconImplementation( virtual QIcon standardIconImplementation(
#else
virtual QIcon standardIcon(
#endif
StandardPixmap standardIcon, StandardPixmap standardIcon,
const QStyleOption *option, const QStyleOption *option,
const QWidget *widget) const; const QWidget *widget) const;