Hello community, here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2015-03-16 09:35:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old) and /work/SRC/openSUSE:Factory/.kxmlgui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui" Changes: -------- --- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2015-02-16 17:32:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2015-03-16 09:35:06.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 7 16:59:00 UTC 2015 - [email protected] + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php + +------------------------------------------------------------------- Old: ---- kxmlgui-5.7.0.tar.xz New: ---- kxmlgui-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmlgui.spec ++++++ --- /var/tmp/diff_new_pack.5KnWc9/_old 2015-03-16 09:35:07.000000000 +0100 +++ /var/tmp/diff_new_pack.5KnWc9/_new 2015-03-16 09:35:07.000000000 +0100 @@ -17,14 +17,14 @@ %define lname libKF5XmlGui5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: kxmlgui Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: attica-qt5-devel >= %{kf5_version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kconfigwidgets-devel >= %{kf5_version} ++++++ kxmlgui-5.7.0.tar.xz -> kxmlgui-5.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/CMakeLists.txt new/kxmlgui-5.8.0/CMakeLists.txt --- old/kxmlgui-5.7.0/CMakeLists.txt 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/CMakeLists.txt 2015-03-07 15:53:00.000000000 +0100 @@ -3,7 +3,7 @@ project(KXmlGui) # ECM setup -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM 1.8.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -16,8 +16,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.7.0") # handled by release scripts -set(KF5_DEP_VERSION "5.7.0") # handled by release scripts +set(KF5_VERSION "5.8.0") # handled by release scripts +set(KF5_DEP_VERSION "5.8.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KXMLGUI @@ -65,6 +65,7 @@ ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5XmlGuiConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5XmlGuiConfig.cmake" + PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/KF5XmlGuiConfig.cmake.in new/kxmlgui-5.8.0/KF5XmlGuiConfig.cmake.in --- old/kxmlgui-5.7.0/KF5XmlGuiConfig.cmake.in 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/KF5XmlGuiConfig.cmake.in 2015-03-07 15:53:00.000000000 +0100 @@ -1,6 +1,6 @@ @PACKAGE_INIT@ -set(XMLGUI_DBUS_INTERFACES_DIR "${PACKAGE_PREFIX_DIR}/@DBUS_INTERFACES_INSTALL_DIR@") +set(XMLGUI_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@") find_dependency(KF5Config "@KF5_DEP_VERSION@") find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/autotests/icons/oxygen/index.theme new/kxmlgui-5.8.0/autotests/icons/oxygen/index.theme --- old/kxmlgui-5.7.0/autotests/icons/oxygen/index.theme 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/autotests/icons/oxygen/index.theme 2015-03-07 15:53:00.000000000 +0100 @@ -48,6 +48,7 @@ Comment=Oxygen Team Comment[ar]=فريق أوكسجين +Comment[ast]=L'equipu d'Oxygen Comment[bs]=Oxygen tim Comment[ca]=Equip de l'Oxygen Comment[ca@valencia]=Equip de l'Oxygen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/autotests/kmainwindow_unittest.cpp new/kxmlgui-5.8.0/autotests/kmainwindow_unittest.cpp --- old/kxmlgui-5.7.0/autotests/kmainwindow_unittest.cpp 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/autotests/kmainwindow_unittest.cpp 2015-03-07 15:53:00.000000000 +0100 @@ -107,7 +107,7 @@ m_queryClosedCalled(false) { } - /*reimp*/ bool queryClose() + bool queryClose() Q_DECL_OVERRIDE { m_queryClosedCalled = true; return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/autotests/ktoolbar_unittest.cpp new/kxmlgui-5.8.0/autotests/ktoolbar_unittest.cpp --- old/kxmlgui-5.7.0/autotests/ktoolbar_unittest.cpp 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/autotests/ktoolbar_unittest.cpp 2015-03-07 15:53:00.000000000 +0100 @@ -74,7 +74,7 @@ void signalAppearanceChanged(); protected: - bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private: void changeGlobalIconSizeSetting(int, int); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/po/pt_BR/kxmlgui5.po new/kxmlgui-5.8.0/po/pt_BR/kxmlgui5.po --- old/kxmlgui-5.7.0/po/pt_BR/kxmlgui5.po 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/po/pt_BR/kxmlgui5.po 2015-03-07 15:53:00.000000000 +0100 @@ -1,5 +1,5 @@ # Translation of kxmlgui5.po to Brazilian Portuguese -# Copyright (C) 2002-2014 This_file_is_part_of_KDE +# Copyright (C) 2002-2015 This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # # Lisiane Sztoltz <[email protected]>, 2002, 2003, 2004. @@ -7,7 +7,7 @@ # Henrique Pinto <[email protected]>, 2003. # Marcus Gama <[email protected]>, 2006. # Diniz Bortolotto <[email protected]>, 2007, 2008. -# André Marcelo Alvarenga <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# André Marcelo Alvarenga <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Luiz Fernando Ranghetti <[email protected]>, 2008, 2009, 2010, 2012. # Fernando Boaglio <[email protected]>, 2009. # Doutor Zero <[email protected]>, 2007, 2009. @@ -18,7 +18,7 @@ "Project-Id-Version: kxmlgui5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2015-01-23 08:23+0000\n" -"PO-Revision-Date: 2014-07-29 11:00-0300\n" +"PO-Revision-Date: 2015-02-14 16:55-0200\n" "Last-Translator: André Marcelo Alvarenga <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -283,17 +283,17 @@ "advance for your support.</html>" msgstr "" "<html>O KDE está e sempre estará disponível gratuitamente, mas seu " -"desenvolvimento não é gratuito.<br /><br />Para suportar o seu " -"desenvolvimento, a comunidade do KDE formou a KDE e.V., uma organização sem " +"desenvolvimento não é gratuito.<br /><br />Para apoiar o seu " +"desenvolvimento, a comunidade KDE formou a KDE e.V., uma organização sem " "fins lucrativos fundada na Alemanha. A KDE e.V. representa o projeto KDE em " -"questões jurídicas e financeiras. Veja em <a href=\"%1\">%1</a> para mais " -"informações sobre a KDE e.V.<br /><br />O KDE se beneficia de muitos tipos " +"questões jurídicas e financeiras. Acesse <a href=\"%1\">%1</a> para mais " +"informações sobre a KDE e.V.<br /><br />O KDE se beneficia de vários tipos " "de contribuições, incluindo a financeira. Nós usamos o dinheiro para " -"reembolsar membros e outras pessoas devido aos gastos com o projeto. Parte " -"do dinheiro é usado para dar assistência jurídica e organizar conferências e " -"reuniões. <br /> <br />Você pode ajudar o KDE através de uma doação " -"financeira, usando uma das maneiras descritas em <a href=\"%2\">%2</a>.<br /" -"><br />Obrigado pela sua ajuda.</html>" +"reembolsar membros e outras pessoas, pelos gastos que tiveram com o projeto. " +"Parte do dinheiro é usado para dar assistência jurídica e organizar " +"conferências e reuniões. <br /> <br />Você pode ajudar o KDE com uma " +"contribuição financeira, usando uma das formas descritas em <a href=\"%2\">" +"%2</a>.<br /><br />Obrigado pela sua ajuda.</html>" #: kaboutkdedialog_p.cpp:134 msgctxt "About KDE" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kaboutapplicationpersonlistdelegate_p.h new/kxmlgui-5.8.0/src/kaboutapplicationpersonlistdelegate_p.h --- old/kxmlgui-5.7.0/src/kaboutapplicationpersonlistdelegate_p.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kaboutapplicationpersonlistdelegate_p.h 2015-03-07 15:53:00.000000000 +0100 @@ -35,15 +35,15 @@ ~KAboutApplicationPersonListDelegate() {} - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QList< QWidget *> createItemWidgets(const QModelIndex &index) const; + QList< QWidget *> createItemWidgets(const QModelIndex &index) const Q_DECL_OVERRIDE; void updateItemWidgets(const QList<QWidget *> widgets, const QStyleOptionViewItem &option, - const QPersistentModelIndex &index) const; + const QPersistentModelIndex &index) const Q_DECL_OVERRIDE; private Q_SLOTS: void launchUrl(QAction *action) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kaboutapplicationpersonlistview_p.h new/kxmlgui-5.8.0/src/kaboutapplicationpersonlistview_p.h --- old/kxmlgui-5.7.0/src/kaboutapplicationpersonlistview_p.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kaboutapplicationpersonlistview_p.h 2015-03-07 15:53:00.000000000 +0100 @@ -29,7 +29,7 @@ KAboutApplicationPersonListView(QWidget *parent = 0); protected: - void wheelEvent(QWheelEvent *e); + void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kaboutapplicationpersonmodel_p.h new/kxmlgui-5.8.0/src/kaboutapplicationpersonmodel_p.h --- old/kxmlgui-5.7.0/src/kaboutapplicationpersonmodel_p.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kaboutapplicationpersonmodel_p.h 2015-03-07 15:53:00.000000000 +0100 @@ -53,14 +53,14 @@ const QString &providerUrl = QString(), QObject *parent = 0); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE { Q_UNUSED(parent) return 1; } - QVariant data(const QModelIndex &index, int role) const; + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; bool hasAvatarPixmaps() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kactioncollection.h new/kxmlgui-5.8.0/src/kactioncollection.h --- old/kxmlgui-5.7.0/src/kactioncollection.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kactioncollection.h 2015-03-07 15:53:00.000000000 +0100 @@ -291,7 +291,7 @@ protected: /// Overridden to perform connections when someone wants to know whether an action was highlighted or triggered - virtual void connectNotify(const QMetaMethod &signal); + void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; protected Q_SLOTS: virtual void slotActionTriggered(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kactionconflictdetector.cpp new/kxmlgui-5.8.0/src/kactionconflictdetector.cpp --- old/kxmlgui-5.7.0/src/kactionconflictdetector.cpp 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kactionconflictdetector.cpp 2015-03-07 15:53:00.000000000 +0100 @@ -39,7 +39,7 @@ { } - bool eventFilter(QObject *watched, QEvent *event) + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE { if (qobject_cast<QAction *>(watched) && (event->type() == QEvent::Shortcut)) { QShortcutEvent *se = static_cast<QShortcutEvent *>(event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kbugreport.h new/kxmlgui-5.8.0/src/kbugreport.h --- old/kxmlgui-5.7.0/src/kbugreport.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kbugreport.h 2015-03-07 15:53:00.000000000 +0100 @@ -70,7 +70,7 @@ /** * OK has been clicked */ - virtual void accept(); + void accept() Q_DECL_OVERRIDE; private: /** @@ -107,7 +107,7 @@ */ bool sendBugReport(); - virtual void closeEvent(QCloseEvent *e); + void closeEvent(QCloseEvent *e) Q_DECL_OVERRIDE; private: friend class KBugReportPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kcheckaccelerators.h new/kxmlgui-5.8.0/src/kcheckaccelerators.h --- old/kxmlgui-5.7.0/src/kcheckaccelerators.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kcheckaccelerators.h 2015-03-07 15:53:00.000000000 +0100 @@ -85,7 +85,7 @@ /** * Re-implemented to filter the parent's events. */ - bool eventFilter(QObject *, QEvent *e); + bool eventFilter(QObject *, QEvent *e) Q_DECL_OVERRIDE; private: void checkAccelerators(bool automatic); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kedittoolbar.h new/kxmlgui-5.8.0/src/kedittoolbar.h --- old/kxmlgui-5.7.0/src/kedittoolbar.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kedittoolbar.h 2015-03-07 15:53:00.000000000 +0100 @@ -155,8 +155,8 @@ QT_MOC_COMPAT void newToolbarConfig(); protected: - virtual void showEvent(QShowEvent *event); - virtual void hideEvent(QHideEvent *event); + void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; private: friend class KEditToolBarPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kgesturemap_p.h new/kxmlgui-5.8.0/src/kgesturemap_p.h --- old/kxmlgui-5.7.0/src/kgesturemap_p.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kgesturemap_p.h 2015-03-07 15:53:00.000000000 +0100 @@ -37,7 +37,7 @@ public: static KGestureMap *self(); - virtual bool eventFilter(QObject *obj, QEvent *e); + bool eventFilter(QObject *obj, QEvent *e) Q_DECL_OVERRIDE; void setShapeGesture(QAction *kact, const KShapeGesture &gesture); void setRockerGesture(QAction *kact, const KRockerGesture &gesture); void setDefaultShapeGesture(QAction *kact, const KShapeGesture &gesture); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kmainwindow.cpp new/kxmlgui-5.8.0/src/kmainwindow.cpp --- old/kxmlgui-5.7.0/src/kmainwindow.cpp 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kmainwindow.cpp 2015-03-07 15:53:00.000000000 +0100 @@ -85,7 +85,7 @@ public: DockResizeListener(KMainWindow *win); virtual ~DockResizeListener(); - virtual bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private: KMainWindow *m_win; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kmainwindow.h new/kxmlgui-5.8.0/src/kmainwindow.h --- old/kxmlgui-5.7.0/src/kmainwindow.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kmainwindow.h 2015-03-07 15:53:00.000000000 +0100 @@ -461,7 +461,7 @@ * if needed, once all constructor code for the main window has run. * Also reimplemented to catch when a QDockWidget is added or removed. */ - virtual bool event(QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; /** * Reimplemented to autosave settings and call queryClose(). @@ -470,7 +470,7 @@ * If you do it anyway, ensure to call the base implementation to keep * the feature of auto-saving window settings working. */ - virtual void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE; /** Called before the window is closed, either by the user or indirectly by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kmenumenuhandler_p.h new/kxmlgui-5.8.0/src/kmenumenuhandler_p.h --- old/kxmlgui-5.7.0/src/kmenumenuhandler_p.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kmenumenuhandler_p.h 2015-03-07 15:53:00.000000000 +0100 @@ -44,7 +44,7 @@ KMenuMenuHandler(KXMLGUIBuilder *b); ~KMenuMenuHandler() {} void insertMenu(QMenu *menu); - bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private Q_SLOTS: void slotSetShortcut(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kshortcutsdialog.h new/kxmlgui-5.8.0/src/kshortcutsdialog.h --- old/kxmlgui-5.7.0/src/kshortcutsdialog.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kshortcutsdialog.h 2015-03-07 15:53:00.000000000 +0100 @@ -107,7 +107,7 @@ bool configure(bool saveSettings = true); /** @see QWidget::sizeHint() */ - virtual QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; /** * Pops up a modal dialog for configuring key settings. The new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kshortcutsdialog_p.h new/kxmlgui-5.8.0/src/kshortcutsdialog_p.h --- old/kxmlgui-5.7.0/src/kshortcutsdialog_p.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kshortcutsdialog_p.h 2015-03-07 15:53:00.000000000 +0100 @@ -100,7 +100,7 @@ public: KShortcutsEditorDelegate(QTreeWidget *parent, bool allowLetterShortcuts); //reimplemented to have some extra height - virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; /** * Set a list of action collections to check against for conflicting @@ -115,7 +115,7 @@ public Q_SLOTS: void hiddenBySearchLine(QTreeWidgetItem *, bool); protected: - virtual bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; private: mutable QPersistentModelIndex m_editingIndex; bool m_allowLetterShortcuts; @@ -160,7 +160,7 @@ TabConnectedWidget(QWidget *parent) : QWidget(parent) {} protected: - void paintEvent(QPaintEvent *pe); + void paintEvent(QPaintEvent *pe) Q_DECL_OVERRIDE; }; /** @@ -291,8 +291,8 @@ //! Commit the changes. void commit(); - virtual QVariant data(int column, int role = Qt::DisplayRole) const; - virtual bool operator<(const QTreeWidgetItem &other) const; + QVariant data(int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + bool operator<(const QTreeWidgetItem &other) const Q_DECL_OVERRIDE; QKeySequence keySequence(uint column) const; void setKeySequence(uint column, const QKeySequence &seq); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/ktoggletoolbaraction.h new/kxmlgui-5.8.0/src/ktoggletoolbaraction.h --- old/kxmlgui-5.7.0/src/ktoggletoolbaraction.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/ktoggletoolbaraction.h 2015-03-07 15:53:00.000000000 +0100 @@ -82,10 +82,10 @@ /** * Reimplemented from @see QObject. */ - virtual bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private Q_SLOTS: - virtual void slotToggled(bool checked); + void slotToggled(bool checked) Q_DECL_OVERRIDE; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/ktoolbar.h new/kxmlgui-5.8.0/src/ktoolbar.h --- old/kxmlgui-5.7.0/src/ktoolbar.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/ktoolbar.h 2015-03-07 15:53:00.000000000 +0100 @@ -205,7 +205,7 @@ /** * Reimplemented to support context menu activation on disabled tool buttons. */ - bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; /** * Returns whether the toolbars are currently editable (drag & drop of actions). @@ -240,17 +240,17 @@ virtual void slotMovableChanged(bool movable); protected: - virtual void contextMenuEvent(QContextMenuEvent *); - virtual void actionEvent(QActionEvent *); + void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *) Q_DECL_OVERRIDE; // Draggable toolbar configuration - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dragMoveEvent(QDragMoveEvent *); - virtual void dragLeaveEvent(QDragLeaveEvent *); - virtual void dropEvent(QDropEvent *); - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); + void dragEnterEvent(QDragEnterEvent *) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *) Q_DECL_OVERRIDE; + void dragLeaveEvent(QDragLeaveEvent *) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/src/kxmlguiwindow.h new/kxmlgui-5.8.0/src/kxmlguiwindow.h --- old/kxmlgui-5.7.0/src/kxmlguiwindow.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/src/kxmlguiwindow.h 2015-03-07 15:53:00.000000000 +0100 @@ -284,7 +284,7 @@ void setupToolbarMenuActions(); // KDE5 TODO: change it to "using KXMLGUIBuilder::finalizeGUI;" - virtual void finalizeGUI(KXMLGUIClient *client); + void finalizeGUI(KXMLGUIClient *client) Q_DECL_OVERRIDE; /** * @internal @@ -330,7 +330,7 @@ * if needed, once all constructor code for the main window has run. * Also reimplemented to catch when a QDockWidget is added or removed. */ - virtual bool event(QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; protected Q_SLOTS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.7.0/tests/krulertest.h new/kxmlgui-5.8.0/tests/krulertest.h --- old/kxmlgui-5.7.0/tests/krulertest.h 2015-02-08 16:27:36.000000000 +0100 +++ new/kxmlgui-5.8.0/tests/krulertest.h 2015-03-07 15:53:00.000000000 +0100 @@ -29,10 +29,10 @@ void newHeight(int); protected: - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void resizeEvent(QResizeEvent *); + void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; private: bool mouseButtonDown; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
