From 1f3d25d934c43c42b7f8a959e935dfb36bfd3c25 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 11 Apr 2014 16:50:14 +0530 Subject: [PATCH] Port the progress indicator extension to PyQt5 --- .../gui2/progress_indicator/QProgressIndicator.cpp | 8 ++++---- src/calibre/gui2/progress_indicator/QProgressIndicator.h | 2 +- .../gui2/progress_indicator/QProgressIndicator.sip | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp b/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp index 90ff986447..2ac4a23a50 100644 --- a/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp +++ b/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp @@ -1,12 +1,12 @@ #include "QProgressIndicator.h" #include -#include +#include #include -#include -#include +#include +#include #include -#include +#include QProgressIndicator::QProgressIndicator(QWidget* parent, int size) : QWidget(parent), diff --git a/src/calibre/gui2/progress_indicator/QProgressIndicator.h b/src/calibre/gui2/progress_indicator/QProgressIndicator.h index 359d84e22a..33a5a82d87 100644 --- a/src/calibre/gui2/progress_indicator/QProgressIndicator.h +++ b/src/calibre/gui2/progress_indicator/QProgressIndicator.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include /*! diff --git a/src/calibre/gui2/progress_indicator/QProgressIndicator.sip b/src/calibre/gui2/progress_indicator/QProgressIndicator.sip index a4caa35020..a659891d03 100644 --- a/src/calibre/gui2/progress_indicator/QProgressIndicator.sip +++ b/src/calibre/gui2/progress_indicator/QProgressIndicator.sip @@ -3,8 +3,7 @@ %Module(name=progress_indicator, version=1) -%Import QtCore/QtCoremod.sip -%Import QtGui/QtGuimod.sip +%Import QtWidgets/QtWidgetsmod.sip %ModuleHeaderCode int load_style(QString &path, QString &name);