Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2017-08-24 18:06:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksane" Thu Aug 24 18:06:09 2017 rev:84 rq:518154 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2017-07-25 11:33:59.658586291 +0200 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2017-08-24 18:06:11.463882935 +0200 @@ -1,0 +2,22 @@ +Tue Aug 22 15:46:45 UTC 2017 - [email protected] + +- Fix -lang requires + +------------------------------------------------------------------- +Fri Aug 11 22:46:23 UTC 2017 - [email protected] + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Use Q_DECL_OVERRIDE + +------------------------------------------------------------------- +Sat Aug 5 18:19:28 UTC 2017 - [email protected] + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- libksane-17.04.3.tar.xz New: ---- libksane-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.RbWTPW/_old 2017-08-24 18:06:12.351757927 +0200 +++ /var/tmp/diff_new_pack.RbWTPW/_new 2017-08-24 18:06:12.355757364 +0200 @@ -1,7 +1,7 @@ # # spec file for package libksane # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang %define _so 5 %define lname libKF5Sane Name: libksane -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: KDE scanning library License: GPL-2.0+ @@ -48,6 +49,32 @@ The KDE scanner library provides an API and widgets for using scanners and other imaging devices supported by SANE. +%package devel +Summary: Development files for the KDE scanning library +Group: Development/Libraries/KDE +Requires: %{lname}%{_so} = %{version} +Requires: kwallet-devel +Requires: kwidgetsaddons-devel +Requires: pkgconfig +Requires: sane-backends-devel +Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Obsoletes: libksane-kf5-devel < %{version} +Provides: libksane-kf5-devel = %{version} + +%description devel +This package contains a library to add scan support to KDE +applications. + +%package -n %{lname}%{_so} +Summary: KDE scan library +Group: System/Libraries +Recommends: %{name}-lang +Provides: %{name} = %{version} + +%description -n %{lname}%{_so} +The KDE scanner library provides an API and widgets for using +scanners and other imaging devices supported by SANE. + %if %{with lang} %lang_package %endif @@ -65,16 +92,6 @@ %find_lang %{name} --with-man --all-name %endif -%package -n %{lname}%{_so} -Summary: KDE scan library -Group: System/Libraries -Recommends: %{name}-lang -Provides: %{name} = %{version} - -%description -n %{lname}%{_so} -The KDE scanner library provides an API and widgets for using -scanners and other imaging devices supported by SANE. - %post -n %{lname}%{_so} -p /sbin/ldconfig %postun -n %{lname}%{_so} -p /sbin/ldconfig @@ -86,28 +103,13 @@ %{_kf5_iconsdir}/hicolor/*/actions/color.png %{_kf5_iconsdir}/hicolor/*/actions/gray-scale.png -%package devel -Summary: Development files for the KDE scanning library -Group: Development/Libraries/KDE -Requires: %{lname}%{_so} = %{version} -Requires: kwallet-devel -Requires: kwidgetsaddons-devel -Requires: pkgconfig -Requires: sane-backends-devel -Requires: pkgconfig(Qt5Widgets) >= 5.2.0 -Obsoletes: libksane-kf5-devel < %{version} -Provides: libksane-kf5-devel = %{version} - -%description devel -This package contains a library to add scan support to KDE -applications. - %files devel %defattr(-,root,root) -%{_kf5_prefix}/include/KF5/KSane/ -%{_kf5_prefix}/include/KF5/ksane_version.h +%doc COPYING* +%{_kf5_cmakedir}/KF5Sane/ +%{_kf5_includedir}/KSane/ +%{_kf5_includedir}/ksane_version.h %{_kf5_libdir}/%{lname}.so -%{_kf5_libdir}/cmake/KF5Sane/ %if %{with lang} %files lang -f %{name}.lang ++++++ libksane-17.04.3.tar.xz -> libksane-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/po/bg/libksane.po new/libksane-17.08.0/po/bg/libksane.po --- old/libksane-17.04.3/po/bg/libksane.po 2017-07-11 02:19:08.000000000 +0200 +++ new/libksane-17.08.0/po/bg/libksane.po 2017-08-11 02:33:45.000000000 +0200 @@ -1,4 +1,3 @@ -# translation of libksane.po to Bulgarian # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/po/ia/libksane.po new/libksane-17.08.0/po/ia/libksane.po --- old/libksane-17.04.3/po/ia/libksane.po 2017-07-11 02:19:08.000000000 +0200 +++ new/libksane-17.08.0/po/ia/libksane.po 2017-08-11 02:33:46.000000000 +0200 @@ -1,21 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Giovanni Sora <[email protected]>, 2013. +# Giovanni Sora <[email protected]>, 2013, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:15+0100\n" -"PO-Revision-Date: 2013-02-07 10:33+0100\n" -"Last-Translator: Giovanni Sora <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2017-04-16 20:37+0100\n" +"Last-Translator: giovanni <[email protected]>\n" +"Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 2.0\n" #: ../ksanetwain/ktwain_widget.cpp:50 #, kde-format @@ -306,13 +306,13 @@ #, kde-format msgctxt "@title:window" msgid "General Error" -msgstr "" +msgstr "Error general" #: ksanewidget_p.cpp:1161 #, kde-format msgctxt "@title:window" msgid "Information" -msgstr "" +msgstr "Information" #: options/ksaneoptcombo.cpp:145 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/po/tr/libksane.po new/libksane-17.08.0/po/tr/libksane.po --- old/libksane-17.04.3/po/tr/libksane.po 2017-07-11 02:19:08.000000000 +0200 +++ new/libksane-17.08.0/po/tr/libksane.po 2017-08-11 02:33:46.000000000 +0200 @@ -177,8 +177,8 @@ msgstr "" "<html>SANE (Scanner Access Now Easy - Tarayıcı Erişimi Artık Kolay) sistemi " "hiçbir aygıt bulamadı.<br>Tarayıcının takılı ve açık olduğunu veya<br>sistem " -"tarayıcı yapılandırmasını denetleyin.<br>SANE hakkında ayrıntılı bilgi için <" -"a href='http://www.sane-project.org/'>SANE anasayfasına</a> bakın.</html>" +"tarayıcı yapılandırmasını denetleyin.<br>SANE hakkında ayrıntılı bilgi için " +"<a href='http://www.sane-project.org/'>SANE anasayfasına</a> bakın.</html>" #: ksanedevicedialog.cpp:86 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/po/zh_CN/libksane.po new/libksane-17.08.0/po/zh_CN/libksane.po --- old/libksane-17.04.3/po/zh_CN/libksane.po 2017-07-11 02:19:08.000000000 +0200 +++ new/libksane-17.08.0/po/zh_CN/libksane.po 2017-08-11 02:33:46.000000000 +0200 @@ -1,17 +1,9 @@ -# translation of libksane.po to 简体中文 -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Ni Hui <[email protected]>, 2007, 2008, 2009, 2012. -# FengChao <[email protected]>, 2011. -# Weng Xuetian <[email protected]>, 2015. -# Guo Yunhe <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:15+0100\n" -"PO-Revision-Date: 2017-05-20 05:04-0400\n" +"PO-Revision-Date: 2017-08-05 09:35-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -492,71 +484,3 @@ #, kde-format msgid "Gamma" msgstr "伽玛" - -#~ msgid "%1 usec" -#~ msgid_plural "%1 usec" -#~ msgstr[0] "%1 微秒" - -#~ msgctxt "Parameter and Unit" -#~ msgid "%1 usec" -#~ msgid_plural "%1 usec" -#~ msgstr[0] "%1 微秒" - -#~ msgctxt "SpinBox parameter unit" -#~ msgid " usec" -#~ msgid_plural " usecs" -#~ msgstr[0] " 微秒" - -#~ msgctxt "Double numbers. SpinBox parameter unit" -#~ msgid " usec" -#~ msgstr " 微秒" - -#~ msgid "The image format is not (yet?) supported by libksane." -#~ msgstr "libksane (还?)不支持此图像格式。" - -#~ msgid "The lamp is warming up." -#~ msgstr "灯正在变暖。" - -#, fuzzy -#~ msgctxt "Parameter and Unit" -#~ msgid "%1 mm" -#~ msgstr "%1 毫米" - -#, fuzzy -#~ msgctxt "Parameter and Unit" -#~ msgid "%1 DPI" -#~ msgstr "%1 DPI" - -#, fuzzy -#~ msgctxt "Parameter and Unit" -#~ msgid "%1 %" -#~ msgstr "%1 %" - -#, fuzzy -#~ msgctxt "Double numbers. SpinBox parameter unit" -#~ msgid " mm" -#~ msgstr " 毫米" - -#, fuzzy -#~ msgctxt "Double numbers. SpinBox parameter unit" -#~ msgid " DPI" -#~ msgstr " DPI" - -#, fuzzy -#~ msgctxt "Double numbers. SpinBox parameter unit" -#~ msgid " %" -#~ msgstr " %" - -#, fuzzy -#~ msgid "Other Options" -#~ msgstr "基本选项" - -#, fuzzy -#~ msgctxt "Parameter and Unit" -#~ msgid "%1 Pixels" -#~ msgstr "%1 像素" - -#, fuzzy -#~ msgctxt "Parameter and Unit" -#~ msgid "%1 Bits" -#~ msgstr "%1 比特" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/ksanefinddevicesthread.h new/libksane-17.08.0/src/ksanefinddevicesthread.h --- old/libksane-17.04.3/src/ksanefinddevicesthread.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/ksanefinddevicesthread.h 2017-06-02 07:39:28.000000000 +0200 @@ -44,7 +44,7 @@ public: static FindSaneDevicesThread *getInstance(); ~FindSaneDevicesThread(); - void run(); + void run() Q_DECL_OVERRIDE; const QList<KSaneWidget::DeviceInfo> devicesList() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/ksanepreviewthread.h new/libksane-17.08.0/src/ksanepreviewthread.h --- old/libksane-17.04.3/src/ksanepreviewthread.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/ksanepreviewthread.h 2017-06-02 07:39:28.000000000 +0200 @@ -55,7 +55,7 @@ } ReadStatus; KSanePreviewThread(SANE_Handle handle, QImage *img); - void run(); + void run() Q_DECL_OVERRIDE; void setPreviewInverted(bool); void cancelScan(); int scanProgress(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/ksanescanthread.h new/libksane-17.08.0/src/ksanescanthread.h --- old/libksane-17.04.3/src/ksanescanthread.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/ksanescanthread.h 2017-06-02 07:39:28.000000000 +0200 @@ -55,7 +55,7 @@ } ReadStatus; KSaneScanThread(SANE_Handle handle, QByteArray *data); - void run(); + void run() Q_DECL_OVERRIDE; void setImageInverted(bool); void cancelScan(); int scanProgress(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/ksaneviewer.h new/libksane-17.08.0/src/ksaneviewer.h --- old/libksane-17.04.3/src/ksaneviewer.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/ksaneviewer.h 2017-06-02 07:39:28.000000000 +0200 @@ -47,7 +47,7 @@ * \param area this parameter determine the area of the reduced sized image. */ void findSelections(float area = 10000.0); - virtual QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; public Q_SLOTS: @@ -96,11 +96,11 @@ void newSelection(float tl_x, float tl_y, float br_x, float br_y); protected: - void wheelEvent(QWheelEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void drawBackground(QPainter *painter, const QRectF &rect); + void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void drawBackground(QPainter *painter, const QRectF &rect) Q_DECL_OVERRIDE; private: void updateSelVisibility(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/options/ksaneoptbutton.h new/libksane-17.08.0/src/options/ksaneoptbutton.h --- old/libksane-17.04.3/src/options/ksaneoptbutton.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/options/ksaneoptbutton.h 2017-06-02 07:39:28.000000000 +0200 @@ -42,9 +42,9 @@ public: KSaneOptButton(const SANE_Handle handle, const int index); - void createWidget(QWidget *parent); + void createWidget(QWidget *parent) Q_DECL_OVERRIDE; - bool hasGui(); + bool hasGui() Q_DECL_OVERRIDE; private Q_SLOTS: void buttonClicked(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/options/ksaneoptcheckbox.h new/libksane-17.08.0/src/options/ksaneoptcheckbox.h --- old/libksane-17.04.3/src/options/ksaneoptcheckbox.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/options/ksaneoptcheckbox.h 2017-06-02 07:39:28.000000000 +0200 @@ -42,15 +42,15 @@ public: KSaneOptCheckBox(const SANE_Handle handle, const int index); - void createWidget(QWidget *parent); + void createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void readValue(); + void readValue() Q_DECL_OVERRIDE; - bool getValue(float &val); - bool setValue(float val); - bool getValue(QString &val); - bool setValue(const QString &val); - bool hasGui(); + bool getValue(float &val) Q_DECL_OVERRIDE; + bool setValue(float val) Q_DECL_OVERRIDE; + bool getValue(QString &val) Q_DECL_OVERRIDE; + bool setValue(const QString &val) Q_DECL_OVERRIDE; + bool hasGui() Q_DECL_OVERRIDE; private Q_SLOTS: void checkboxChanged(bool toggled); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/options/ksaneoptcombo.h new/libksane-17.08.0/src/options/ksaneoptcombo.h --- old/libksane-17.04.3/src/options/ksaneoptcombo.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/options/ksaneoptcombo.h 2017-06-02 07:39:28.000000000 +0200 @@ -42,17 +42,17 @@ public: KSaneOptCombo(const SANE_Handle handle, const int index); - void createWidget(QWidget *parent); + void createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void readValue(); - void readOption(); + void readValue() Q_DECL_OVERRIDE; + void readOption() Q_DECL_OVERRIDE; - bool getMinValue(float &max); - bool getValue(float &val); - bool setValue(float val); - bool getValue(QString &val); - bool setValue(const QString &val); - bool hasGui(); + bool getMinValue(float &max) Q_DECL_OVERRIDE; + bool getValue(float &val) Q_DECL_OVERRIDE; + bool setValue(float val) Q_DECL_OVERRIDE; + bool getValue(QString &val) Q_DECL_OVERRIDE; + bool setValue(const QString &val) Q_DECL_OVERRIDE; + bool hasGui() Q_DECL_OVERRIDE; private Q_SLOTS: void comboboxChangedIndex(int val); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/options/ksaneoptentry.h new/libksane-17.08.0/src/options/ksaneoptentry.h --- old/libksane-17.04.3/src/options/ksaneoptentry.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/options/ksaneoptentry.h 2017-06-02 07:39:28.000000000 +0200 @@ -42,15 +42,15 @@ public: KSaneOptEntry(const SANE_Handle handle, const int index); - void createWidget(QWidget *parent); + void createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void readValue(); + void readValue() Q_DECL_OVERRIDE; - bool getValue(float &val); - bool setValue(float val); - bool getValue(QString &val); - bool setValue(const QString &val); - bool hasGui(); + bool getValue(float &val) Q_DECL_OVERRIDE; + bool setValue(float val) Q_DECL_OVERRIDE; + bool getValue(QString &val) Q_DECL_OVERRIDE; + bool setValue(const QString &val) Q_DECL_OVERRIDE; + bool hasGui() Q_DECL_OVERRIDE; private Q_SLOTS: void entryChanged(const QString &text); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/options/ksaneoptfslider.h new/libksane-17.08.0/src/options/ksaneoptfslider.h --- old/libksane-17.04.3/src/options/ksaneoptfslider.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/options/ksaneoptfslider.h 2017-06-02 07:39:28.000000000 +0200 @@ -42,18 +42,18 @@ public: KSaneOptFSlider(const SANE_Handle handle, const int index); - void createWidget(QWidget *parent); + void createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void readValue(); - void readOption(); + void readValue() Q_DECL_OVERRIDE; + void readOption() Q_DECL_OVERRIDE; - bool getMinValue(float &max); - bool getMaxValue(float &max); - bool getValue(float &val); - bool setValue(float val); - bool getValue(QString &val); - bool setValue(const QString &val); - bool hasGui(); + bool getMinValue(float &max) Q_DECL_OVERRIDE; + bool getMaxValue(float &max) Q_DECL_OVERRIDE; + bool getValue(float &val) Q_DECL_OVERRIDE; + bool setValue(float val) Q_DECL_OVERRIDE; + bool getValue(QString &val) Q_DECL_OVERRIDE; + bool setValue(const QString &val) Q_DECL_OVERRIDE; + bool hasGui() Q_DECL_OVERRIDE; Q_SIGNALS: void fValueRead(float); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/options/ksaneoptgamma.h new/libksane-17.08.0/src/options/ksaneoptgamma.h --- old/libksane-17.04.3/src/options/ksaneoptgamma.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/options/ksaneoptgamma.h 2017-06-02 07:39:28.000000000 +0200 @@ -42,15 +42,15 @@ public: KSaneOptGamma(const SANE_Handle handle, const int index); - void createWidget(QWidget *parent); + void createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void readValue(); + void readValue() Q_DECL_OVERRIDE; - bool getValue(float &val); - bool setValue(float val); - bool getValue(QString &val); - bool setValue(const QString &val); - bool hasGui(); + bool getValue(float &val) Q_DECL_OVERRIDE; + bool setValue(float val) Q_DECL_OVERRIDE; + bool getValue(QString &val) Q_DECL_OVERRIDE; + bool setValue(const QString &val) Q_DECL_OVERRIDE; + bool hasGui() Q_DECL_OVERRIDE; private Q_SLOTS: void gammaTableChanged(const QVector<int> &gam_tbl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/options/ksaneoptslider.h new/libksane-17.08.0/src/options/ksaneoptslider.h --- old/libksane-17.04.3/src/options/ksaneoptslider.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/options/ksaneoptslider.h 2017-06-02 07:39:28.000000000 +0200 @@ -42,18 +42,18 @@ public: KSaneOptSlider(const SANE_Handle handle, const int index); - void createWidget(QWidget *parent); + void createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void readValue(); - void readOption(); + void readValue() Q_DECL_OVERRIDE; + void readOption() Q_DECL_OVERRIDE; - bool getMinValue(float &max); - bool getMaxValue(float &max); - bool getValue(float &val); - bool setValue(float val); - bool getValue(QString &val); - bool setValue(const QString &val); - bool hasGui(); + bool getMinValue(float &max) Q_DECL_OVERRIDE; + bool getMaxValue(float &max) Q_DECL_OVERRIDE; + bool getValue(float &val) Q_DECL_OVERRIDE; + bool setValue(float val) Q_DECL_OVERRIDE; + bool getValue(QString &val) Q_DECL_OVERRIDE; + bool setValue(const QString &val) Q_DECL_OVERRIDE; + bool hasGui() Q_DECL_OVERRIDE; Q_SIGNALS: void fValueRead(float); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/selectionitem.h new/libksane-17.08.0/src/selectionitem.h --- old/libksane-17.04.3/src/selectionitem.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/selectionitem.h 2017-06-02 07:39:28.000000000 +0200 @@ -67,8 +67,8 @@ public: // Graphics Item methods - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + QRectF boundingRect() const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; private: struct Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/splittercollapser.h new/libksane-17.08.0/src/splittercollapser.h --- old/libksane-17.04.3/src/splittercollapser.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/splittercollapser.h 2017-06-02 07:39:28.000000000 +0200 @@ -44,7 +44,7 @@ SplitterCollapser(QSplitter *, QWidget *widget); ~SplitterCollapser(); - virtual QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; public Q_SLOTS: void slotCollapse(); @@ -52,9 +52,9 @@ void slotSetCollapsed(bool collapsed); protected: - virtual bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; private: SplitterCollapserPrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-17.04.3/src/widgets/gammadisp.h new/libksane-17.08.0/src/widgets/gammadisp.h --- old/libksane-17.04.3/src/widgets/gammadisp.h 2017-03-16 12:12:13.000000000 +0100 +++ new/libksane-17.08.0/src/widgets/gammadisp.h 2017-06-02 07:39:28.000000000 +0200 @@ -54,15 +54,15 @@ GammaDisp(QWidget *parent, QVector<int> *tbl); ~GammaDisp() {} - QSize sizeHint() const; - QSize minimumSizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const Q_DECL_OVERRIDE; void setColor(const QColor &color); protected: - void paintEvent(QPaintEvent *); - void resizeEvent(QResizeEvent *); + void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; private:
