Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2015-03-16 09:34:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old) and /work/SRC/openSUSE:Factory/.kbookmarks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks" Changes: -------- --- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2015-02-16 17:30:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new/kbookmarks.changes 2015-03-16 09:34:29.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 7 16:58:58 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: ---- kbookmarks-5.7.0.tar.xz New: ---- kbookmarks-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.heDtxw/_old 2015-03-16 09:34:30.000000000 +0100 +++ /var/tmp/diff_new_pack.heDtxw/_new 2015-03-16 09:34:30.000000000 +0100 @@ -17,13 +17,13 @@ %define lname libKF5Bookmarks5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: kbookmarks Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: kconfigwidgets-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} ++++++ kbookmarks-5.7.0.tar.xz -> kbookmarks-5.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/CMakeLists.txt new/kbookmarks-5.8.0/CMakeLists.txt --- old/kbookmarks-5.7.0/CMakeLists.txt 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/CMakeLists.txt 2015-03-07 15:37:53.000000000 +0100 @@ -2,7 +2,7 @@ project(KBookmarks) -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}) @@ -18,8 +18,8 @@ include(ECMPoQmTools) -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 KBOOKMARKS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/po/bs/kbookmarks5_qt.po new/kbookmarks-5.8.0/po/bs/kbookmarks5_qt.po --- old/kbookmarks-5.7.0/po/bs/kbookmarks5_qt.po 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/po/bs/kbookmarks5_qt.po 2015-03-07 15:37:53.000000000 +0100 @@ -1,114 +1,75 @@ -# translation of kio4.po to bosanski -# Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Marko Rosic <[email protected]>, 2003. -# Chusslove Illich <[email protected]>, 2004, 2005, 2006, 2008, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2010. -# KDE 4 <[email protected]>, 2011. msgid "" msgstr "" -"Project-Id-Version: kio4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-03-28 02:03+0000\n" -"PO-Revision-Date: 2013-12-30 16:55+0000\n" -"Last-Translator: memsud <[email protected]>\n" -"Language-Team: bosanski <[email protected]>\n" +"Project-Id-Version: kde5\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2015-02-24 19:44+0100\n" +"Last-Translator: Samir Ribić <[email protected]>\n" +"Language-Team: Bosnian\n" "Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Launchpad (build 16877)\n" -"X-Launchpad-Export-Date: 2013-12-31 05:22+0000\n" -"X-Associated-UI-Catalogs: desktop_kdebase kdelibs4\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Environment: kde\n" -"X-Qt-Contexts: true\n" #: kbookmark.cpp:307 -#, fuzzy -#| msgid "--- separator ---" msgctxt "KBookmark|Bookmark separator" msgid "--- separator ---" msgstr "--- razdvajač ---" #: kbookmarkcontextmenu.cpp:62 -#, fuzzy -#| msgid "Add Bookmark Here" msgctxt "KBookmarkContextMenu|" msgid "Add Bookmark Here" msgstr "Dodaj obilježivač ovdje" #: kbookmarkcontextmenu.cpp:68 -#, fuzzy -#| msgid "Open Folder in Bookmark Editor" msgctxt "KBookmarkContextMenu|" msgid "Open Folder in Bookmark Editor" msgstr "Otvori direktorij u uređivaču obilježivača" #: kbookmarkcontextmenu.cpp:71 -#, fuzzy -#| msgid "Delete Folder" msgctxt "KBookmarkContextMenu|" msgid "Delete Folder" msgstr "Obriši direktorij" #: kbookmarkcontextmenu.cpp:76 -#, fuzzy -#| msgid "Properties" msgctxt "KBookmarkContextMenu|" msgid "Properties" msgstr "Svojstva" #: kbookmarkcontextmenu.cpp:81 -#, fuzzy -#| msgid "Copy Link Address" msgctxt "KBookmarkContextMenu|" msgid "Copy Link Address" -msgstr "Kopiraj adresu linka" +msgstr "Kopiraj adresu veze" #: kbookmarkcontextmenu.cpp:84 -#, fuzzy -#| msgid "Delete Bookmark" msgctxt "KBookmarkContextMenu|" msgid "Delete Bookmark" -msgstr "Obriši Zabilješku" +msgstr "Obriši obilježivač" #: kbookmarkcontextmenu.cpp:90 -#, fuzzy -#| msgid "Open Folder in Tabs" msgctxt "KBookmarkContextMenu|" msgid "Open Folder in Tabs" msgstr "Otvori direktorij u karticama" #: kbookmarkcontextmenu.cpp:116 -#, fuzzy -#| msgid "Cannot add bookmark with empty URL." msgctxt "KBookmarkContextMenu|" msgid "Cannot add bookmark with empty URL." msgstr "Ne može se dodati obilježivač sa praznim URL‑om." #: kbookmarkcontextmenu.cpp:146 -#, fuzzy -#| msgid "Bookmark Folder Deletion" msgctxt "KBookmarkContextMenu|" msgid "Bookmark Folder Deletion" msgstr "Uklanjanje direktorija obilježivača" #: kbookmarkcontextmenu.cpp:147 -#, fuzzy -#| msgid "Bookmark Deletion" msgctxt "KBookmarkContextMenu|" msgid "Bookmark Deletion" msgstr "Uklanjanje obilježivača" #: kbookmarkcontextmenu.cpp:148 -#, fuzzy, qt-format -#| msgid "" -#| "Are you sure you wish to remove the bookmark folder\n" -#| "\"%1\"?" +#, qt-format msgctxt "KBookmarkContextMenu|" msgid "" "Are you sure you wish to remove the bookmark folder\n" @@ -118,10 +79,7 @@ "<filename>%1</filename>?" #: kbookmarkcontextmenu.cpp:149 -#, fuzzy, qt-format -#| msgid "" -#| "Are you sure you wish to remove the bookmark\n" -#| "\"%1\"?" +#, qt-format msgctxt "KBookmarkContextMenu|" msgid "" "Are you sure you wish to remove the bookmark\n" @@ -131,132 +89,87 @@ "„%1“?" #: kbookmarkdialog.cpp:70 -#, fuzzy -#| msgid "Name:" msgctxt "KBookmarkDialog|@label:textbox" msgid "Name:" msgstr "Ime:" #: kbookmarkdialog.cpp:75 -#, fuzzy -#| msgid "Location:" msgctxt "KBookmarkDialog|@label:textbox" msgid "Location:" msgstr "Lokacija:" #: kbookmarkdialog.cpp:80 -#, fuzzy -#| msgctxt "@label:textbox" -#| msgid "Comment:" msgctxt "KBookmarkDialog|@label:textbox" msgid "Comment:" msgstr "Komentar:" #: kbookmarkdialog.cpp:191 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Update" msgctxt "KBookmarkDialog|@action:button" msgid "Update" msgstr "Ažuriraj" #: kbookmarkdialog.cpp:192 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Bookmark Properties" msgctxt "KBookmarkDialog|@title:window" msgid "Bookmark Properties" msgstr "Svojstva obilježivača" #: kbookmarkdialog.cpp:223 kbookmarkdialog.cpp:261 kbookmarkdialog.cpp:295 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "&New Folder..." msgctxt "KBookmarkDialog|@action:button" msgid "&New Folder..." -msgstr "&Novi direktorij..." +msgstr "&Novi Direktorij..." #: kbookmarkdialog.cpp:227 kbookmarkdialog.cpp:265 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Add" msgctxt "KBookmarkDialog|@action:button" msgid "Add" msgstr "Dodaj" #: kbookmarkdialog.cpp:228 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Add Bookmark" msgctxt "KBookmarkDialog|@title:window" msgid "Add Bookmark" -msgstr "Dodavanje obilježivača" +msgstr "Dodaj zabilješku" #: kbookmarkdialog.cpp:266 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Add Bookmarks" msgctxt "KBookmarkDialog|@title:window" msgid "Add Bookmarks" msgstr "Dodavanje obilježivača" #: kbookmarkdialog.cpp:299 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Select Folder" msgctxt "KBookmarkDialog|@title:window" msgid "Select Folder" msgstr "Izbor direktorija" #: kbookmarkdialog.cpp:327 -#, fuzzy -#| msgctxt "folder name" -#| msgid "New Folder" msgctxt "KBookmarkDialog|@title:window" msgid "New Folder" -msgstr "Novi Direktorij" +msgstr "Novi direktorij" #: kbookmarkdialog.cpp:362 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Create New Bookmark Folder" msgctxt "KBookmarkDialog|@title:window" msgid "Create New Bookmark Folder" msgstr "Napravi novi direktorij zabilješki" #: kbookmarkdialog.cpp:363 -#, fuzzy, qt-format -#| msgctxt "@title:window" -#| msgid "Create New Bookmark Folder in %1" +#, qt-format msgctxt "KBookmarkDialog|@title:window" msgid "Create New Bookmark Folder in %1" msgstr "Novi direktorij za obilježivače u %1" #: kbookmarkdialog.cpp:365 -#, fuzzy -#| msgctxt "@label:textbox" -#| msgid "New folder:" msgctxt "KBookmarkDialog|@label:textbox" msgid "New folder:" msgstr "Novi direktorij:" #: kbookmarkdialog.cpp:386 -#, fuzzy -#| msgid "Bookmarks" msgctxt "KBookmarkDialog|name of the container of all browser bookmarks" msgid "Bookmarks" msgstr "Zabilješke" #: kbookmarkimporter_ns.cpp:115 -#, fuzzy -#| msgid "*.html|HTML Files (*.html)" msgctxt "KNSBookmarkImporterImpl|" msgid "HTML Files (*.html)" -msgstr "*.html|HTML datoteke (*.html)" +msgstr "HTML datoteke" #: kbookmarkimporter_ns.cpp:119 -#, fuzzy -#| msgid "*.html|HTML Files (*.html)" msgctxt "KNSBookmarkImporterImpl|" msgid "*.html|HTML Files (*.html)" msgstr "*.html|HTML datoteke (*.html)" @@ -266,47 +179,35 @@ msgctxt "KNSBookmarkImporterImpl|" msgid "" "Could not find %1. Netscape is probably not installed. Aborting the export." -msgstr "" +msgstr "Ne mogu naći %1. Netscape vjerovatno nije instaliran. Prekidam izvoz." #: kbookmarkimporter_ns.cpp:137 msgctxt "KNSBookmarkImporterImpl|" msgid "Netscape not found" -msgstr "" +msgstr "Netscape nije nađen" #: kbookmarkimporter_ns.cpp:158 -#, fuzzy -#| msgid "<!-- This file was generated by Konqueror -->" msgctxt "KNSBookmarkImporterImpl|" msgid "<!-- This file was generated by Konqueror -->" msgstr "<!-- Ovu datoteku je napravio Konqueror -->" #: kbookmarkimporter_ns.cpp:161 kbookmarkimporter_ns.cpp:162 -#, fuzzy -#| msgid "Bookmarks" msgctxt "KNSBookmarkImporterImpl|" msgid "Bookmarks" msgstr "Zabilješke" #: kbookmarkimporter_opera.cpp:119 -#, fuzzy -#| msgid "*.adr|Opera Bookmark Files (*.adr)" msgctxt "KOperaBookmarkImporterImpl|" msgid "Opera Bookmark Files (*.adr)" msgstr "*.adr|Operini obilježivači (*.adr)" #: kbookmarkimporter_opera.cpp:122 -#, fuzzy -#| msgid "*.adr|Opera Bookmark Files (*.adr)" msgctxt "KOperaBookmarkImporterImpl|" msgid "*.adr|Opera Bookmark Files (*.adr)" msgstr "*.adr|Operini obilježivači (*.adr)" #: kbookmarkmanager.cpp:442 -#, fuzzy, qt-format -#| msgid "" -#| "Unable to save bookmarks in %1. Reported error was: %2. This error " -#| "message will only be shown once. The cause of the error needs to be fixed " -#| "as quickly as possible, which is most likely a full hard drive." +#, qt-format msgctxt "KBookmarkManager|" msgid "" "Unable to save bookmarks in %1. Reported error was: %2. This error message " @@ -318,78 +219,56 @@ "greške, a to je najvjerovatnije pun disk." #: kbookmarkmenu.cpp:260 -#, fuzzy -#| msgid "Open Folder in Tabs" msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Otvori direktorij u karticama" #: kbookmarkmenu.cpp:264 -#, fuzzy -#| msgid "Open all bookmarks in this folder as a new tab." msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Otvori sve obilježivače u ovom direktoriju kao novu karticu." #: kbookmarkmenu.cpp:279 -#, fuzzy -#| msgid "Bookmark Tabs as Folder..." msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Obilježi kartice kao direktorij..." #: kbookmarkmenu.cpp:283 -#, fuzzy -#| msgid "Add a folder of bookmarks for all open tabs." msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Dodaj direktorij obilježivača za sve otvorene kartice." #: kbookmarkmenu.cpp:320 -#, fuzzy -#| msgid "Edit your bookmark collection in a separate window" msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Uredite svoju zbirku obilježivača u posebnom prozoru" #: kbookmarkmenu.cpp:331 -#, fuzzy -#| msgid "New Bookmark Folder..." msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Novi direktorij obilježivača..." #: kbookmarkmenu.cpp:333 -#, fuzzy -#| msgid "Create a new bookmark folder in this menu" msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" msgstr "Napravi novi direktorij obilježivača u ovom meniju" #: konqbookmarkmenu.cpp:59 konqbookmarkmenu.cpp:72 -#, fuzzy -#| msgid "Hide in toolbar" msgctxt "KonqBookmarkContextMenu|" msgid "Hide in toolbar" msgstr "Sakrij u traci alatki" #: konqbookmarkmenu.cpp:59 konqbookmarkmenu.cpp:72 -#, fuzzy -#| msgid "Show in toolbar" msgctxt "KonqBookmarkContextMenu|" msgid "Show in toolbar" msgstr "Prikaži u traci alatki" #: konqbookmarkmenu.cpp:66 -#, fuzzy -#| msgid "Open in New Window" msgctxt "KonqBookmarkContextMenu|" msgid "Open in New Window" msgstr "Otvori u novom prozoru" #: konqbookmarkmenu.cpp:67 -#, fuzzy -#| msgid "Open in New Tab" msgctxt "KonqBookmarkContextMenu|" msgid "Open in New Tab" msgstr "Otvori u novoj kartici" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/po/fr/kbookmarks5_qt.po new/kbookmarks-5.8.0/po/fr/kbookmarks5_qt.po --- old/kbookmarks-5.7.0/po/fr/kbookmarks5_qt.po 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/po/fr/kbookmarks5_qt.po 2015-03-07 15:37:53.000000000 +0100 @@ -21,10 +21,10 @@ "PO-Revision-Date: 2014-08-31 17:40+0200\n" "Last-Translator: Sebastien Renard <[email protected]>\n" "Language-Team: French <[email protected]>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkdialog.h new/kbookmarks-5.8.0/src/kbookmarkdialog.h --- old/kbookmarks-5.7.0/src/kbookmarkdialog.h 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkdialog.h 2015-03-07 15:37:53.000000000 +0100 @@ -70,7 +70,7 @@ ~KBookmarkDialog(); protected: - void accept(); + void accept() Q_DECL_OVERRIDE; protected Q_SLOTS: void newFolderButton(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkimporter.h new/kbookmarks-5.8.0/src/kbookmarkimporter.h --- old/kbookmarks-5.7.0/src/kbookmarkimporter.h 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkimporter.h 2015-03-07 15:37:53.000000000 +0100 @@ -88,15 +88,15 @@ Q_OBJECT public: KXBELBookmarkImporterImpl() {} - virtual void parse(); - virtual QString findDefaultLocation(bool = false) const + void parse() Q_DECL_OVERRIDE; + QString findDefaultLocation(bool = false) const Q_DECL_OVERRIDE { return QString(); } protected: - virtual void visit(const KBookmark &); - virtual void visitEnter(const KBookmarkGroup &); - virtual void visitLeave(const KBookmarkGroup &); + void visit(const KBookmark &) Q_DECL_OVERRIDE; + void visitEnter(const KBookmarkGroup &) Q_DECL_OVERRIDE; + void visitLeave(const KBookmarkGroup &) Q_DECL_OVERRIDE; private: class KXBELBookmarkImporterImplPrivate *d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkimporter_ie.cpp new/kbookmarks-5.8.0/src/kbookmarkimporter_ie.cpp --- old/kbookmarks-5.7.0/src/kbookmarkimporter_ie.cpp 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkimporter_ie.cpp 2015-03-07 15:37:53.000000000 +0100 @@ -167,9 +167,9 @@ traverse(grp); } private: - virtual void visit(const KBookmark &); - virtual void visitEnter(const KBookmarkGroup &); - virtual void visitLeave(const KBookmarkGroup &); + void visit(const KBookmark &) Q_DECL_OVERRIDE; + void visitEnter(const KBookmarkGroup &) Q_DECL_OVERRIDE; + void visitLeave(const KBookmarkGroup &) Q_DECL_OVERRIDE; private: QDir m_currentDir; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkimporter_ie.h new/kbookmarks-5.8.0/src/kbookmarkimporter_ie.h --- old/kbookmarks-5.7.0/src/kbookmarkimporter_ie.h 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkimporter_ie.h 2015-03-07 15:37:53.000000000 +0100 @@ -30,8 +30,8 @@ { public: KIEBookmarkImporterImpl() { } - virtual void parse(); - virtual QString findDefaultLocation(bool forSaving = false) const; + void parse() Q_DECL_OVERRIDE; + QString findDefaultLocation(bool forSaving = false) const Q_DECL_OVERRIDE; private: class KIEBookmarkImporterImplPrivate *d; }; @@ -45,7 +45,7 @@ ; } virtual ~KIEBookmarkExporterImpl() {} - virtual void write(const KBookmarkGroup &); + void write(const KBookmarkGroup &) Q_DECL_OVERRIDE; private: class KIEBookmarkExporterImplPrivate *d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkimporter_ns.h new/kbookmarks-5.8.0/src/kbookmarkimporter_ns.h --- old/kbookmarks-5.7.0/src/kbookmarkimporter_ns.h 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkimporter_ns.h 2015-03-07 15:37:53.000000000 +0100 @@ -36,8 +36,8 @@ { m_utf8 = utf8; } - virtual void parse(); - virtual QString findDefaultLocation(bool forSaving = false) const; + void parse() Q_DECL_OVERRIDE; + QString findDefaultLocation(bool forSaving = false) const Q_DECL_OVERRIDE; private: bool m_utf8; class KNSBookmarkImporterImplPrivate *d; @@ -67,7 +67,7 @@ ; } virtual ~KNSBookmarkExporterImpl() {} - virtual void write(const KBookmarkGroup &parent); + void write(const KBookmarkGroup &parent) Q_DECL_OVERRIDE; void setUtf8(bool); protected: QString folderAsString(const KBookmarkGroup &parent) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkimporter_opera.cpp new/kbookmarks-5.8.0/src/kbookmarkimporter_opera.cpp --- old/kbookmarks-5.7.0/src/kbookmarkimporter_opera.cpp 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkimporter_opera.cpp 2015-03-07 15:37:53.000000000 +0100 @@ -134,9 +134,9 @@ return m_string; } private: - virtual void visit(const KBookmark &); - virtual void visitEnter(const KBookmarkGroup &); - virtual void visitLeave(const KBookmarkGroup &); + void visit(const KBookmark &) Q_DECL_OVERRIDE; + void visitEnter(const KBookmarkGroup &) Q_DECL_OVERRIDE; + void visitLeave(const KBookmarkGroup &) Q_DECL_OVERRIDE; private: QString m_string; QTextStream m_out; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkimporter_opera.h new/kbookmarks-5.8.0/src/kbookmarkimporter_opera.h --- old/kbookmarks-5.7.0/src/kbookmarkimporter_opera.h 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkimporter_opera.h 2015-03-07 15:37:53.000000000 +0100 @@ -32,8 +32,8 @@ Q_OBJECT // For QObject::tr public: KOperaBookmarkImporterImpl() { } - virtual void parse(); - virtual QString findDefaultLocation(bool forSaving = false) const; + void parse() Q_DECL_OVERRIDE; + QString findDefaultLocation(bool forSaving = false) const Q_DECL_OVERRIDE; private: class KOperaBookmarkImporterImplPrivate *d; }; @@ -47,7 +47,7 @@ ; } virtual ~KOperaBookmarkExporterImpl() {} - virtual void write(const KBookmarkGroup &parent); + void write(const KBookmarkGroup &parent) Q_DECL_OVERRIDE; private: class KOperaBookmarkExporterImplPrivate *d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkmanager.cpp new/kbookmarks-5.8.0/src/kbookmarkmanager.cpp --- old/kbookmarks-5.7.0/src/kbookmarkmanager.cpp 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkmanager.cpp 2015-03-07 15:37:53.000000000 +0100 @@ -78,12 +78,12 @@ return m_bk_map.value(url); } private: - virtual void visit(const KBookmark &); - virtual void visitEnter(const KBookmarkGroup &) + void visit(const KBookmark &) Q_DECL_OVERRIDE; + void visitEnter(const KBookmarkGroup &) Q_DECL_OVERRIDE { ; } - virtual void visitLeave(const KBookmarkGroup &) + void visitLeave(const KBookmarkGroup &) Q_DECL_OVERRIDE { ; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.7.0/src/kbookmarkmenu_p.h new/kbookmarks-5.8.0/src/kbookmarkmenu_p.h --- old/kbookmarks-5.7.0/src/kbookmarkmenu_p.h 2015-02-08 16:11:56.000000000 +0100 +++ new/kbookmarks-5.8.0/src/kbookmarkmenu_p.h 2015-03-07 15:37:53.000000000 +0100 @@ -51,8 +51,8 @@ KImportedBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu); ~KImportedBookmarkMenu(); - virtual void clear(); - virtual void refill(); + void clear() Q_DECL_OVERRIDE; + void refill() Q_DECL_OVERRIDE; protected Q_SLOTS: void slotNSLoad(); private: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
