[krusader] krusader/GUI: GUI: made KrStyleProxy a subclass of QProxyStyle and removed all unnecessary overrides
Alexander Bikadorov
null at kde.org
Wed Feb 15 17:17:47 UTC 2017
Git commit 8053be85bbd4feacfd4e38821f6db6711ff7233d by Alexander Bikadorov.
Committed on 14/02/2017 at 15:50.
Pushed by abikadorov into branch 'master'.
GUI: made KrStyleProxy a subclass of QProxyStyle and removed all unnecessary overrides
M +3 -113 krusader/GUI/krstyleproxy.cpp
M +4 -33 krusader/GUI/krstyleproxy.h
https://commits.kde.org/krusader/8053be85bbd4feacfd4e38821f6db6711ff7233d
diff --git a/krusader/GUI/krstyleproxy.cpp b/krusader/GUI/krstyleproxy.cpp
index fdfe404c..880ff6c6 100644
--- a/krusader/GUI/krstyleproxy.cpp
+++ b/krusader/GUI/krstyleproxy.cpp
@@ -35,29 +35,9 @@
#include <QPainter>
// QtWidgets
#include <QStyleOptionViewItem>
-#include <QApplication>
-void KrStyleProxy::drawComplexControl(ComplexControl control, const QStyleOptionComplex * option, QPainter * painter, const QWidget * widget) const
-{
- QApplication::style()->drawComplexControl(control, option, painter, widget);
-}
-
-void KrStyleProxy::drawControl(ControlElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget) const
-{
- QApplication::style()->drawControl(element, option, painter, widget);
-}
-
-void KrStyleProxy::drawItemPixmap(QPainter * painter, const QRect & rectangle, int alignment, const QPixmap & pixmap) const
-{
- QApplication::style()->drawItemPixmap(painter, rectangle, alignment, pixmap);
-}
-
-void KrStyleProxy::drawItemText(QPainter * painter, const QRect & rectangle, int alignment, const QPalette & palette, bool enabled, const QString & text, QPalette::ColorRole textRole) const
-{
- QApplication::style()->drawItemText(painter, rectangle, alignment, palette, enabled, text, textRole);
-}
-
-void KrStyleProxy::drawPrimitive(PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget) const
+void KrStyleProxy::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+ QPainter *painter, const QWidget *widget) const
{
if (element == QStyle::PE_FrameFocusRect) {
if (const QStyleOptionFocusRect *fropt = qstyleoption_cast<const QStyleOptionFocusRect *>(option)) {
@@ -82,95 +62,5 @@ void KrStyleProxy::drawPrimitive(PrimitiveElement element, const QStyleOption *
painter->setPen(oldPen);
}
} else
- QApplication::style()->drawPrimitive(element, option, painter, widget);
-}
-
-QPixmap KrStyleProxy::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap & pixmap, const QStyleOption * option) const
-{
- return QApplication::style()->generatedIconPixmap(iconMode, pixmap, option);
-}
-
-QStyle::SubControl KrStyleProxy::hitTestComplexControl(ComplexControl control, const QStyleOptionComplex * option, const QPoint & position, const QWidget * widget) const
-{
- return QApplication::style()->hitTestComplexControl(control, option, position, widget);
-}
-
-QRect KrStyleProxy::itemPixmapRect(const QRect & rectangle, int alignment, const QPixmap & pixmap) const
-{
- return QApplication::style()->itemPixmapRect(rectangle, alignment, pixmap);
-}
-
-QRect KrStyleProxy::itemTextRect(const QFontMetrics & metrics, const QRect & rectangle, int alignment, bool enabled, const QString & text) const
-{
- return QApplication::style()->itemTextRect(metrics, rectangle, alignment, enabled, text);
-}
-
-int KrStyleProxy::layoutSpacing(QSizePolicy::ControlType ctrl1, QSizePolicy::ControlType ctrl2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const
-{
- return QApplication::style()->layoutSpacing(ctrl1, ctrl2, orientation, option, widget);
-}
-
-int KrStyleProxy::pixelMetric(PixelMetric metric, const QStyleOption * option, const QWidget * widget) const
-{
- return QApplication::style()->pixelMetric(metric, option, widget);
-}
-
-void KrStyleProxy::polish(QWidget * widget)
-{
- QApplication::style()->polish(widget);
-}
-
-void KrStyleProxy::polish(QApplication * application)
-{
- QApplication::style()->polish(application);
-}
-
-void KrStyleProxy::polish(QPalette & palette)
-{
- QApplication::style()->polish(palette);
-}
-
-QSize KrStyleProxy::sizeFromContents(ContentsType type, const QStyleOption * option, const QSize & contentsSize, const QWidget * widget) const
-{
- return QApplication::style()->sizeFromContents(type, option, contentsSize, widget);
-}
-
-QIcon KrStyleProxy::standardIcon(StandardPixmap stdIcon, const QStyleOption *option, const QWidget *widget) const
-{
- return QApplication::style()->standardIcon(stdIcon, option, widget);
-}
-
-QPalette KrStyleProxy::standardPalette() const
-{
- return QApplication::style()->standardPalette();
-}
-
-int KrStyleProxy::styleHint(StyleHint hint, const QStyleOption * option, const QWidget * widget, QStyleHintReturn * returnData) const
-{
- return QApplication::style()->styleHint(hint, option, widget, returnData);
-}
-
-QRect KrStyleProxy::subControlRect(ComplexControl control, const QStyleOptionComplex * option, SubControl subControl, const QWidget * widget) const
-{
- return QApplication::style()->subControlRect(control, option, subControl, widget);
-}
-
-QRect KrStyleProxy::subElementRect(SubElement element, const QStyleOption * option, const QWidget * widget) const
-{
- return QApplication::style()->subElementRect(element, option, widget);
-}
-
-QPixmap KrStyleProxy::standardPixmap(QStyle::StandardPixmap pixmap, const QStyleOption* option, const QWidget*widget) const
-{
- return QApplication::style()->standardPixmap(pixmap, option, widget);
-}
-
-void KrStyleProxy::unpolish(QWidget * widget)
-{
- QApplication::style()->unpolish(widget);
-}
-
-void KrStyleProxy::unpolish(QApplication * application)
-{
- QApplication::style()->unpolish(application);
+ QProxyStyle::drawPrimitive(element, option, painter, widget);
}
diff --git a/krusader/GUI/krstyleproxy.h b/krusader/GUI/krstyleproxy.h
index 56740ceb..cd43a4a0 100644
--- a/krusader/GUI/krstyleproxy.h
+++ b/krusader/GUI/krstyleproxy.h
@@ -32,42 +32,13 @@
#define KRSTYLEPROXY_H
// QtWidgets
-#include <QStyle>
+#include <QProxyStyle>
-class QPainter;
-class QWidget;
-class QStyleOptionComplex;
-
-class KrStyleProxy: public QStyle
+class KrStyleProxy: public QProxyStyle
{
public:
- KrStyleProxy() {}
- virtual void drawComplexControl(ComplexControl control, const QStyleOptionComplex * option, QPainter * painter, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual void drawControl(ControlElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual void drawItemPixmap(QPainter * painter, const QRect & rectangle, int alignment, const QPixmap & pixmap) const Q_DECL_OVERRIDE;
- virtual void drawItemText(QPainter * painter, const QRect & rectangle, int alignment, const QPalette & palette, bool enabled, const QString & text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE;
- virtual void drawPrimitive(PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap & pixmap, const QStyleOption * option) const Q_DECL_OVERRIDE;
- virtual QStyle::SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex * option, const QPoint & position, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual QRect itemPixmapRect(const QRect & rectangle, int alignment, const QPixmap & pixmap) const Q_DECL_OVERRIDE;
- virtual QRect itemTextRect(const QFontMetrics & metrics, const QRect & rectangle, int alignment, bool enabled, const QString & text) const Q_DECL_OVERRIDE;
- virtual int layoutSpacing(QSizePolicy::ControlType ctrl1, QSizePolicy::ControlType ctrl2, Qt::Orientation orientation, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE;
- virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual void polish(QWidget * widget) Q_DECL_OVERRIDE;
- virtual void polish(QApplication * application) Q_DECL_OVERRIDE;
- virtual void polish(QPalette & palette) Q_DECL_OVERRIDE;
- virtual QSize sizeFromContents(ContentsType type, const QStyleOption * option, const QSize & contentsSize, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual QIcon standardIcon(StandardPixmap stdIcon, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE;
- virtual QPalette standardPalette() const Q_DECL_OVERRIDE;
- virtual int styleHint(StyleHint stylehint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE;
- virtual QRect subControlRect(ComplexControl control, const QStyleOptionComplex * option, SubControl subControl, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual QRect subElementRect(SubElement element, const QStyleOption * option, const QWidget * widget = 0) const Q_DECL_OVERRIDE;
- virtual QPixmap standardPixmap(QStyle::StandardPixmap pixmap, const QStyleOption* option, const QWidget*widget = 0) const Q_DECL_OVERRIDE;
- virtual void unpolish(QWidget * widget) Q_DECL_OVERRIDE;
- virtual void unpolish(QApplication * application) Q_DECL_OVERRIDE;
+ void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter,
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
};
-
#endif /* KRSTYLEPROXY_H */
-
-
More information about the kde-doc-english
mailing list