From d6262bbb9006191ab7a129c85c00e92cbdc29212 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 9 Dec 2019 00:14:43 +0530 Subject: [PATCH] Remove unused code --- .../progress_indicator/QProgressIndicator.cpp | 19 ------------------- .../progress_indicator/QProgressIndicator.h | 1 - .../progress_indicator/QProgressIndicator.sip | 2 -- 3 files changed, 22 deletions(-) diff --git a/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp b/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp index 8fe33a413c..db6587cab4 100644 --- a/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp +++ b/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp @@ -314,25 +314,6 @@ void set_no_activate_on_click(QWidget *widget) { if (base_style) widget->setStyle(new NoActivateStyle(base_style)); } -class TouchMenuStyle: public QProxyStyle { - private: - int extra_margin; - - public: - TouchMenuStyle(int margin) : extra_margin(margin) {} - QSize sizeFromContents ( ContentsType type, const QStyleOption * option, const QSize & contentsSize, const QWidget * widget = 0 ) const { - QSize ans = QProxyStyle::sizeFromContents(type, option, contentsSize, widget); - if (type == QStyle::CT_MenuItem) { - ans.setHeight(ans.height() + extra_margin); // Make the menu items more easily touchable - } - return ans; - } -}; - -void set_touch_menu_style(QWidget *widget, int margin) { - widget->setStyle(new TouchMenuStyle(margin)); -} - void draw_snake_spinner(QPainter &painter, QRect rect, int angle, const QColor & light, const QColor & dark) { painter.save(); painter.setRenderHint(QPainter::Antialiasing); diff --git a/src/calibre/gui2/progress_indicator/QProgressIndicator.h b/src/calibre/gui2/progress_indicator/QProgressIndicator.h index a383a02aae..657ec154e3 100644 --- a/src/calibre/gui2/progress_indicator/QProgressIndicator.h +++ b/src/calibre/gui2/progress_indicator/QProgressIndicator.h @@ -79,5 +79,4 @@ private: int load_style(QHash icon_map); void set_no_activate_on_click(QWidget *widget); -void set_touch_menu_style(QWidget *widget, int margin=14); void draw_snake_spinner(QPainter &painter, QRect rect, int angle, const QColor & light, const QColor & dark); diff --git a/src/calibre/gui2/progress_indicator/QProgressIndicator.sip b/src/calibre/gui2/progress_indicator/QProgressIndicator.sip index 11e9bdcb7e..7d2f1bd9d3 100644 --- a/src/calibre/gui2/progress_indicator/QProgressIndicator.sip +++ b/src/calibre/gui2/progress_indicator/QProgressIndicator.sip @@ -9,7 +9,6 @@ #include int load_style(QHash icon_map); void set_no_activate_on_click(QWidget *widget); -void set_touch_menu_style(QWidget *widget, int margin); void draw_snake_spinner(QPainter &painter, QRect rect, int angle, const QColor & light, const QColor & dark); %End @@ -58,5 +57,4 @@ protected: int load_style(QHash icon_map); void set_no_activate_on_click(QWidget *widget); -void set_touch_menu_style(QWidget *widget, int margin=20); void draw_snake_spinner(QPainter &painter, QRect rect, int angle, const QColor & light, const QColor & dark);