kstyles: adjust to recent Katie changes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/kstyles/oxygen/oxygenstyle.cpp b/kstyles/oxygen/oxygenstyle.cpp
index 1f0f29e..f20f7f6 100644 (file)
--- a/kstyles/oxygen/oxygenstyle.cpp
+++ b/kstyles/oxygen/oxygenstyle.cpp
@@ -7502,7 +7502,11 @@ namespace Oxygen
     }
 
     //____________________________________________________________________
+#ifndef QT_KATIE
     QIcon Style::standardIconImplementation(
+#else
+    QIcon Style::standardIcon(
+#endif
         StandardPixmap standardIcon,
         const QStyleOption *option,
         const QWidget *widget ) const
@@ -7730,7 +7734,11 @@ namespace Oxygen
             }
 
             default:
+#ifndef QT_KATIE
             return QCommonStyle::standardIconImplementation( standardIcon, option, widget );
+#else
+            return QCommonStyle::standardIcon( standardIcon, option, widget );
+#endif
         }
     }
 

diff --git a/kstyles/oxygen/oxygenstyle.h b/kstyles/oxygen/oxygenstyle.h
index 0d9ce74..60587df 100644 (file)
--- a/kstyles/oxygen/oxygenstyle.h
+++ b/kstyles/oxygen/oxygenstyle.h
@@ -197,13 +197,21 @@ namespace Oxygen
         void globalPaletteChanged( void );
 
         //! copied from kstyle
+#ifndef QT_KATIE
         int layoutSpacingImplementation(
+#else
+        virtual int layoutSpacing(
+#endif
             QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation,
             const QStyleOption* option, const QWidget* widget ) const
         { return pixelMetric(PM_DefaultLayoutSpacing, option, widget); }
 
         //! standard icons
+#ifndef QT_KATIE
         virtual QIcon standardIconImplementation(
+#else
+        virtual QIcon standardIcon(
+#endif
             StandardPixmap standardIcon,
             const QStyleOption *option,
             const QWidget *widget) const;