Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2018-01-22 15:58:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old) and /work/SRC/openSUSE:Factory/.kbookmarks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks" Mon Jan 22 15:58:33 2018 rev:49 rq:566658 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2018-01-09 14:41:19.289201632 +0100 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new/kbookmarks.changes 2018-01-22 15:59:11.404193751 +0100 @@ -1,0 +2,12 @@ +Tue Jan 16 22:50:14 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * Port to new connect api + * Use debug categories + +------------------------------------------------------------------- Old: ---- kbookmarks-5.41.0.tar.xz New: ---- kbookmarks-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.adQNeQ/_old 2018-01-22 15:59:11.904170352 +0100 +++ /var/tmp/diff_new_pack.adQNeQ/_new 2018-01-22 15:59:11.908170165 +0100 @@ -1,7 +1,7 @@ # # spec file for package kbookmarks # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5Bookmarks5 -%define _tar_path 5.41 +%define _tar_path 5.42 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kbookmarks -Version: 5.41.0 +Version: 5.42.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -106,6 +106,7 @@ %defattr(-,root,root) %doc COPYING* README* %{_kf5_libdir}/libKF5Bookmarks.so.* +%{_kf5_debugdir}/*.categories %files devel %defattr(-,root,root) ++++++ kbookmarks-5.41.0.tar.xz -> kbookmarks-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/.reviewboardrc new/kbookmarks-5.42.0/.reviewboardrc --- old/kbookmarks-5.41.0/.reviewboardrc 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kbookmarks' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/CMakeLists.txt new/kbookmarks-5.42.0/CMakeLists.txt --- old/kbookmarks-5.41.0/CMakeLists.txt 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/CMakeLists.txt 2018-01-07 17:06:13.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts -set(KF5_DEP_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts +set(KF5_DEP_VERSION "5.42.0") # handled by release scripts project(KBookmarks VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -15,6 +15,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(ECMQtDeclareLoggingCategory) include(GenerateExportHeader) @@ -90,4 +91,7 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +# contains list of debug categories, for kdebugsettings +install(FILES kbookmarks.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/kbookmarks.categories new/kbookmarks-5.42.0/kbookmarks.categories --- old/kbookmarks-5.41.0/kbookmarks.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kbookmarks-5.42.0/kbookmarks.categories 2018-01-07 17:06:13.000000000 +0100 @@ -0,0 +1 @@ +kf5.kbookmarks kbookmarks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/gl/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/gl/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/gl/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/gl/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -196,7 +196,7 @@ msgid "" "Could not find %1. Netscape is probably not installed. Aborting the export." msgstr "" -"Non foi posíbel atopar %1. Netscape posibelmente non estea instalado. " +"Non se puido atopar %1. Netscape posibelmente non estea instalado. " "Interrómpese a exportación." #: kbookmarkimporter_ns.cpp:137 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/ko/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/ko/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/ko/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/ko/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -2,14 +2,14 @@ # Copyright (c) 2003, 2004, 2007-2008 Free Software Foundation, Inc. # KIM KyungHeon <[email protected]>, 2003, 2004. # Shinjo Park <[email protected]>, 2007, 2008, 2009, 2010. -# Shinjo Park <[email protected]>, 2011, 2012, 2013, 2014, 2015. +# Shinjo Park <[email protected]>, 2011, 2012, 2013, 2014, 2015, 2017. # 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: 2015-01-18 17:05+0900\n" +"PO-Revision-Date: 2017-12-02 20:36+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" #: kbookmark.cpp:310 @@ -218,6 +218,9 @@ "\n" "Most likely you do not have keditbookmarks currently installed" msgstr "" +"keditbookmarks를 실행할 수 없습니다.\n" +"\n" +"keditbookmarks 설치 상태를 확인하십시오" #: kbookmarkmanager.cpp:482 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/pt_BR/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/pt_BR/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/pt_BR/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/pt_BR/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -10,21 +10,21 @@ # doutor.zero <[email protected]>, 2007. # Diniz Bortolotto <[email protected]>, 2007, 2008. # André Marcelo Alvarenga <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. -# Luiz Fernando Ranghetti <[email protected]>, 2009, 2010, 2012. +# Luiz Fernando Ranghetti <[email protected]>, 2009, 2010, 2012, 2017. msgid "" msgstr "" "Project-Id-Version: kbookmarks5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-28 02:03+0000\n" -"PO-Revision-Date: 2014-03-29 22:10-0300\n" -"Last-Translator: André Marcelo Alvarenga <[email protected]>\n" -"Language-Team: Brazilian Portuguese <[email protected]>\n" +"PO-Revision-Date: 2017-12-12 15:55-0300\n" +"Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" +"Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\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.5\n" +"X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" #: kbookmark.cpp:310 @@ -229,6 +229,9 @@ "\n" "Most likely you do not have keditbookmarks currently installed" msgstr "" +"Não foi possível iniciar o keditbookmarks.\n" +"\n" +"Provavelmente você não tem o keditbookmarks instalado" #: kbookmarkmanager.cpp:482 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/sr/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/sr/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/sr/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/sr/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -242,37 +242,37 @@ "бити приказана само једном. Најбоље је да што пре отклоните узрок грешке, а " "то је највероватније пун хард‑диск." -#: kbookmarkmenu.cpp:260 +#: kbookmarkmenu.cpp:261 msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Отвори фасциклу у језичцима" -#: kbookmarkmenu.cpp:264 +#: kbookmarkmenu.cpp:265 msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Отвори све обележиваче у овој фасцикли као нови језичак." -#: kbookmarkmenu.cpp:280 +#: kbookmarkmenu.cpp:281 msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Обележи језичке као фасциклу..." -#: kbookmarkmenu.cpp:284 +#: kbookmarkmenu.cpp:285 msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Додај фасциклу обележивача за све отворене језичке." -#: kbookmarkmenu.cpp:323 +#: kbookmarkmenu.cpp:325 msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Уредите своју збирку обележивача у посебном прозору" -#: kbookmarkmenu.cpp:335 +#: kbookmarkmenu.cpp:337 msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Нова фасцикла обележивача..." -#: kbookmarkmenu.cpp:337 +#: kbookmarkmenu.cpp:339 msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" msgstr "Направи нову фасциклу обележивача у овом менију" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/sr@ijekavian/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/sr@ijekavian/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/sr@ijekavian/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/sr@ijekavian/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -241,37 +241,37 @@ "бити приказана само једном. Најбоље је да што прије отклоните узрок грешке, " "а то је највјероватније пун хард‑диск." -#: kbookmarkmenu.cpp:260 +#: kbookmarkmenu.cpp:261 msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Отвори фасциклу у језичцима" -#: kbookmarkmenu.cpp:264 +#: kbookmarkmenu.cpp:265 msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Отвори све обиљеживаче у овој фасцикли као нови језичак." -#: kbookmarkmenu.cpp:280 +#: kbookmarkmenu.cpp:281 msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Обиљежи језичке као фасциклу..." -#: kbookmarkmenu.cpp:284 +#: kbookmarkmenu.cpp:285 msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Додај фасциклу обиљеживача за све отворене језичке." -#: kbookmarkmenu.cpp:323 +#: kbookmarkmenu.cpp:325 msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Уредите своју збирку обиљеживача у посебном прозору" -#: kbookmarkmenu.cpp:335 +#: kbookmarkmenu.cpp:337 msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Нова фасцикла обиљеживача..." -#: kbookmarkmenu.cpp:337 +#: kbookmarkmenu.cpp:339 msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" msgstr "Направи нову фасциклу обиљеживача у овом менију" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/sr@ijekavianlatin/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/sr@ijekavianlatin/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/sr@ijekavianlatin/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/sr@ijekavianlatin/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -241,37 +241,37 @@ "će biti prikazana samo jednom. Najbolje je da što prije otklonite uzrok " "greške, a to je najvjerovatnije pun hard‑disk." -#: kbookmarkmenu.cpp:260 +#: kbookmarkmenu.cpp:261 msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Otvori fasciklu u jezičcima" -#: kbookmarkmenu.cpp:264 +#: kbookmarkmenu.cpp:265 msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Otvori sve obilježivače u ovoj fascikli kao novi jezičak." -#: kbookmarkmenu.cpp:280 +#: kbookmarkmenu.cpp:281 msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Obilježi jezičke kao fasciklu..." -#: kbookmarkmenu.cpp:284 +#: kbookmarkmenu.cpp:285 msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Dodaj fasciklu obilježivača za sve otvorene jezičke." -#: kbookmarkmenu.cpp:323 +#: kbookmarkmenu.cpp:325 msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Uredite svoju zbirku obilježivača u posebnom prozoru" -#: kbookmarkmenu.cpp:335 +#: kbookmarkmenu.cpp:337 msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Nova fascikla obilježivača..." -#: kbookmarkmenu.cpp:337 +#: kbookmarkmenu.cpp:339 msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" msgstr "Napravi novu fasciklu obilježivača u ovom meniju" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/sr@latin/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/sr@latin/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/sr@latin/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/sr@latin/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -241,37 +241,37 @@ "će biti prikazana samo jednom. Najbolje je da što pre otklonite uzrok " "greške, a to je najverovatnije pun hard‑disk." -#: kbookmarkmenu.cpp:260 +#: kbookmarkmenu.cpp:261 msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Otvori fasciklu u jezičcima" -#: kbookmarkmenu.cpp:264 +#: kbookmarkmenu.cpp:265 msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Otvori sve obeleživače u ovoj fascikli kao novi jezičak." -#: kbookmarkmenu.cpp:280 +#: kbookmarkmenu.cpp:281 msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Obeleži jezičke kao fasciklu..." -#: kbookmarkmenu.cpp:284 +#: kbookmarkmenu.cpp:285 msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Dodaj fasciklu obeleživača za sve otvorene jezičke." -#: kbookmarkmenu.cpp:323 +#: kbookmarkmenu.cpp:325 msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Uredite svoju zbirku obeleživača u posebnom prozoru" -#: kbookmarkmenu.cpp:335 +#: kbookmarkmenu.cpp:337 msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Nova fascikla obeleživača..." -#: kbookmarkmenu.cpp:337 +#: kbookmarkmenu.cpp:339 msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" msgstr "Napravi novu fasciklu obeleživača u ovom meniju" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/po/zh_CN/kbookmarks5_qt.po new/kbookmarks-5.42.0/po/zh_CN/kbookmarks5_qt.po --- old/kbookmarks-5.41.0/po/zh_CN/kbookmarks5_qt.po 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/po/zh_CN/kbookmarks5_qt.po 2018-01-07 17:06:13.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2017-07-13 11:17-0400\n" +"PO-Revision-Date: 2018-01-05 06:38-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -26,6 +26,12 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: crowdin.com\n" "X-Qt-Contexts: true\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-trunk/messages/frameworks/kbookmarks5_qt.pot\n" #: kbookmark.cpp:310 msgctxt "KBookmark|Bookmark separator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/CMakeLists.txt new/kbookmarks-5.42.0/src/CMakeLists.txt --- old/kbookmarks-5.41.0/src/CMakeLists.txt 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/CMakeLists.txt 2018-01-07 17:06:13.000000000 +0100 @@ -23,6 +23,9 @@ ${kbookmarks_QM_LOADER} ) + +ecm_qt_declare_logging_category(kbookmarks_SRCS HEADER kbookmarks_debug.h IDENTIFIER KBOOKMARKS_LOG CATEGORY_NAME kf5.kbookmarks) + add_library(KF5Bookmarks ${kbookmarks_SRCS}) generate_export_header(KF5Bookmarks BASE_NAME KBookmarks) add_library(KF5::Bookmarks ALIAS KF5Bookmarks) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmark.cpp new/kbookmarks-5.42.0/src/kbookmark.cpp --- old/kbookmarks-5.41.0/src/kbookmark.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmark.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -23,7 +23,7 @@ #include <QStack> #include <QCoreApplication> #include <qmimedatabase.h> -#include <QDebug> +#include "kbookmarks_debug.h" #include <kstringhandler.h> #include <kurlmimedata.h> #include <kbookmarkmanager.h> @@ -533,7 +533,7 @@ void KBookmark::updateAccessMetadata() { - // qDebug() << "KBookmark::updateAccessMetadata " << address() << " " << url(); + // qCDebug(KBOOKMARKS_LOG) << "KBookmark::updateAccessMetadata " << address() << " " << url(); const uint timet = QDateTime::currentDateTime().toTime_t(); setMetaDataItem(QStringLiteral("time_added"), QString::number(timet), DontOverwriteMetaData); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkcontextmenu.cpp new/kbookmarks-5.42.0/src/kbookmarkcontextmenu.cpp --- old/kbookmarks-5.41.0/src/kbookmarkcontextmenu.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkcontextmenu.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -93,13 +93,13 @@ void KBookmarkContextMenu::slotEditAt() { - // qDebug() << "KBookmarkMenu::slotEditAt" << m_highlightedAddress; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::slotEditAt" << m_highlightedAddress; m_pManager->slotEditBookmarksAtAddress(bm.address()); } void KBookmarkContextMenu::slotProperties() { - // qDebug() << "KBookmarkMenu::slotProperties" << m_highlightedAddress; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::slotProperties" << m_highlightedAddress; KBookmarkDialog *dlg = m_pOwner->bookmarkDialog(m_pManager, QApplication::activeWindow()); dlg->editBookmark(bm); @@ -108,7 +108,7 @@ void KBookmarkContextMenu::slotInsert() { - // qDebug() << "KBookmarkMenu::slotInsert" << m_highlightedAddress; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::slotInsert" << m_highlightedAddress; QUrl url = m_pOwner->currentUrl(); if (url.isEmpty()) { @@ -137,7 +137,7 @@ void KBookmarkContextMenu::slotRemove() { - // qDebug() << "KBookmarkMenu::slotRemove" << m_highlightedAddress; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::slotRemove" << m_highlightedAddress; bool folder = bm.isGroup(); @@ -160,7 +160,7 @@ void KBookmarkContextMenu::slotCopyLocation() { - // qDebug() << "KBookmarkMenu::slotCopyLocation" << m_highlightedAddress; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::slotCopyLocation" << m_highlightedAddress; if (!bm.isGroup()) { QMimeData *mimeData = new QMimeData; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkdombuilder.cpp new/kbookmarks-5.42.0/src/kbookmarkdombuilder.cpp --- old/kbookmarks-5.41.0/src/kbookmarkdombuilder.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkdombuilder.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -19,9 +19,8 @@ */ #include "kbookmarkdombuilder.h" - +#include "kbookmarks_debug.h" #include <kbookmarkmanager.h> -#include <QtCore/QDebug> KBookmarkDomBuilder::KBookmarkDomBuilder( const KBookmarkGroup &bkGroup, KBookmarkManager *manager @@ -61,7 +60,7 @@ // store additional info bk.internalElement().setAttribute(QStringLiteral("netscapeinfo"), additionalInfo); } else { - qWarning() << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; + qCWarning(KBOOKMARKS_LOG) << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; } } @@ -79,7 +78,7 @@ element.setAttribute(QStringLiteral("netscapeinfo"), additionalInfo); element.setAttribute(QStringLiteral("folded"), (open ? "no" : "yes")); } else { - qWarning() << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; + qCWarning(KBOOKMARKS_LOG) << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; } } @@ -88,7 +87,7 @@ if (!m_stack.isEmpty()) { m_stack.top().createNewSeparator(); } else { - qWarning() << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; + qCWarning(KBOOKMARKS_LOG) << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; } } @@ -97,7 +96,7 @@ if (!m_stack.isEmpty()) { m_stack.pop(); } else { - qWarning() << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; + qCWarning(KBOOKMARKS_LOG) << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkimporter.cpp new/kbookmarks-5.42.0/src/kbookmarkimporter.cpp --- old/kbookmarks-5.41.0/src/kbookmarkimporter.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkimporter.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -19,7 +19,7 @@ #include "kbookmarkimporter.h" -#include <QDebug> +#include "kbookmarks_debug.h" #include <kcharsets.h> #include <qtextcodec.h> @@ -36,7 +36,7 @@ void KXBELBookmarkImporterImpl::parse() { - // qDebug() << "KXBELBookmarkImporterImpl::parse()"; + // qCDebug(KBOOKMARKS_LOG) << "KXBELBookmarkImporterImpl::parse()"; KBookmarkManager *manager = KBookmarkManager::managerForFile(m_fileName, QString()); KBookmarkGroup root = manager->root(); traverse(root); @@ -46,7 +46,7 @@ void KXBELBookmarkImporterImpl::visit(const KBookmark &bk) { - // qDebug() << "KXBELBookmarkImporterImpl::visit"; + // qCDebug(KBOOKMARKS_LOG) << "KXBELBookmarkImporterImpl::visit"; if (bk.isSeparator()) { emit newSeparator(); } else { @@ -56,13 +56,13 @@ void KXBELBookmarkImporterImpl::visitEnter(const KBookmarkGroup &grp) { - // qDebug() << "KXBELBookmarkImporterImpl::visitEnter"; + // qCDebug(KBOOKMARKS_LOG) << "KXBELBookmarkImporterImpl::visitEnter"; emit newFolder(grp.fullText(), false, QLatin1String("")); } void KXBELBookmarkImporterImpl::visitLeave(const KBookmarkGroup &) { - // qDebug() << "KXBELBookmarkImporterImpl::visitLeave"; + // qCDebug(KBOOKMARKS_LOG) << "KXBELBookmarkImporterImpl::visitLeave"; emit endFolder(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkimporter_ie.cpp new/kbookmarks-5.42.0/src/kbookmarkimporter_ie.cpp --- old/kbookmarks-5.41.0/src/kbookmarkimporter_ie.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkimporter_ie.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -21,7 +21,7 @@ #include <QFileDialog> -#include <QDebug> +#include "kbookmarks_debug.h" #include <qtextcodec.h> #include <QApplication> #include <QRegularExpression> @@ -71,7 +71,7 @@ while (f.readLine(s.data(), g_lineLimit) >= 0) { if (s[s.length() - 1] != '\n') { // Gosh, this line is longer than g_lineLimit. Skipping. - qWarning() << "IE bookmarks contain a line longer than " << g_lineLimit << ". Skipping."; + qCWarning(KBOOKMARKS_LOG) << "IE bookmarks contain a line longer than " << g_lineLimit << ". Skipping."; continue; } QByteArray t = s.trimmed(); @@ -191,7 +191,7 @@ void IEExporter::visit(const KBookmark &bk) { QString fname = m_currentDir.path() + '/' + ieStyleQuote(bk.fullText()) + ".url"; - // qDebug() << "visit(" << bk.text() << "), fname == " << fname; + // qCDebug(KBOOKMARKS_LOG) << "visit(" << bk.text() << "), fname == " << fname; QFile file(fname); if (file.open(QIODevice::WriteOnly)) { QTextStream ts(&file); @@ -203,14 +203,14 @@ void IEExporter::visitEnter(const KBookmarkGroup &grp) { QString dname = m_currentDir.path() + '/' + ieStyleQuote(grp.fullText()); - // qDebug() << "visitEnter(" << grp.text() << "), dname == " << dname; + // qCDebug(KBOOKMARKS_LOG) << "visitEnter(" << grp.text() << "), dname == " << dname; m_currentDir.mkdir(dname); m_currentDir.cd(dname); } void IEExporter::visitLeave(const KBookmarkGroup &) { - // qDebug() << "visitLeave()"; + // qCDebug(KBOOKMARKS_LOG) << "visitLeave()"; m_currentDir.cdUp(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkimporter_ns.cpp new/kbookmarks-5.42.0/src/kbookmarkimporter_ns.cpp --- old/kbookmarks-5.41.0/src/kbookmarkimporter_ns.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkimporter_ns.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -25,7 +25,7 @@ #include "kbookmarkmanager.h" #include <QFileDialog> #include <QMessageBox> -#include <QDebug> +#include "kbookmarks_debug.h" #include <kcharsets.h> #include <qtextcodec.h> @@ -51,7 +51,7 @@ while (int size = f.readLine(s.data(), g_lineLimit) >= 1) { if (size == g_lineLimit) { // Gosh, this line is longer than g_lineLimit. Skipping. - qWarning() << "Netscape bookmarks contain a line longer than " << g_lineLimit << ". Skipping."; + qCWarning(KBOOKMARKS_LOG) << "Netscape bookmarks contain a line longer than " << g_lineLimit << ". Skipping."; continue; } QByteArray t = s.trimmed(); @@ -144,7 +144,7 @@ QFile file(m_fileName); if (!file.open(QIODevice::WriteOnly)) { - qCritical() << "Can't write to file " << m_fileName << endl; + qCCritical(KBOOKMARKS_LOG) << "Can't write to file " << m_fileName << endl; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkimporter_opera.cpp new/kbookmarks-5.42.0/src/kbookmarkimporter_opera.cpp --- old/kbookmarks-5.41.0/src/kbookmarkimporter_opera.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkimporter_opera.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -21,7 +21,7 @@ #include "kbookmarkimporter_opera_p.h" #include <QFileDialog> -#include <QDebug> +#include "kbookmarks_debug.h" #include <qtextcodec.h> #include <QApplication> @@ -150,7 +150,7 @@ void OperaExporter::visit(const KBookmark &bk) { - // qDebug() << "visit(" << bk.text() << ")"; + // qCDebug(KBOOKMARKS_LOG) << "visit(" << bk.text() << ")"; m_out << "#URL" << endl; m_out << "\tNAME=" << bk.fullText() << endl; m_out << "\tURL=" << bk.url().toString().toUtf8() << endl; @@ -159,7 +159,7 @@ void OperaExporter::visitEnter(const KBookmarkGroup &grp) { - // qDebug() << "visitEnter(" << grp.text() << ")"; + // qCDebug(KBOOKMARKS_LOG) << "visitEnter(" << grp.text() << ")"; m_out << "#FOLDER" << endl; m_out << "\tNAME=" << grp.fullText() << endl; m_out << endl; @@ -167,7 +167,7 @@ void OperaExporter::visitLeave(const KBookmarkGroup &) { - // qDebug() << "visitLeave()"; + // qCDebug(KBOOKMARKS_LOG) << "visitLeave()"; m_out << "-" << endl; m_out << endl; } @@ -178,7 +178,7 @@ QString content = exporter.generate(parent); QFile file(m_fileName); if (!file.open(QIODevice::WriteOnly)) { - qCritical() << "Can't write to file " << m_fileName << endl; + qCCritical(KBOOKMARKS_LOG) << "Can't write to file " << m_fileName << endl; return; } QTextStream fstream(&file); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkmanager.cpp new/kbookmarks-5.42.0/src/kbookmarkmanager.cpp --- old/kbookmarks-5.41.0/src/kbookmarkmanager.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkmanager.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -21,7 +21,7 @@ #include "kbookmarkmanager.h" -#include <QDebug> +#include "kbookmarks_debug.h" #include <QtCore/QDir> #include <QtCore/QFile> #include <QtCore/QFileInfo> @@ -298,7 +298,7 @@ QObject::connect(d->m_dirWatch, &KDirWatch::deleted, this, &KBookmarkManager::slotFileChanged); - // qDebug() << "starting KDirWatch for" << d->m_bookmarksFile; + // qCDebug(KBOOKMARKS_LOG) << "starting KDirWatch for" << d->m_bookmarksFile; } KBookmarkManager::KBookmarkManager() @@ -337,7 +337,7 @@ QMessageBox::warning(QApplication::activeWindow(), QApplication::applicationName(), err); } - qWarning() << QStringLiteral("Failed to start keditbookmarks"); + qCWarning(KBOOKMARKS_LOG) << QStringLiteral("Failed to start keditbookmarks"); emit this->error(err); } } @@ -345,7 +345,7 @@ void KBookmarkManager::slotFileChanged(const QString &path) { if (path == d->m_bookmarksFile) { - // qDebug() << "file changed (KDirWatch) " << path ; + // qCDebug(KBOOKMARKS_LOG) << "file changed (KDirWatch) " << path ; // Reparse parse(); // Tell our GUI @@ -391,17 +391,17 @@ void KBookmarkManager::parse() const { d->m_docIsLoaded = true; - // qDebug() << "KBookmarkManager::parse " << d->m_bookmarksFile; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::parse " << d->m_bookmarksFile; QFile file(d->m_bookmarksFile); if (!file.open(QIODevice::ReadOnly)) { - qWarning() << "Can't open " << d->m_bookmarksFile; + qCWarning(KBOOKMARKS_LOG) << "Can't open " << d->m_bookmarksFile; return; } d->m_doc = QDomDocument(QStringLiteral("xbel")); d->m_doc.setContent(&file); if (d->m_doc.documentElement().isNull()) { - qWarning() << "KBookmarkManager::parse : main tag is missing, creating default " << d->m_bookmarksFile; + qCWarning(KBOOKMARKS_LOG) << "KBookmarkManager::parse : main tag is missing, creating default " << d->m_bookmarksFile; QDomElement element = d->m_doc.createElement(QStringLiteral("xbel")); d->m_doc.appendChild(element); } @@ -410,7 +410,7 @@ QString mainTag = docElem.tagName(); if (mainTag != QLatin1String("xbel")) { - qWarning() << "KBookmarkManager::parse : unknown main tag " << mainTag; + qCWarning(KBOOKMARKS_LOG) << "KBookmarkManager::parse : unknown main tag " << mainTag; } if (d->m_dbusObjectName.isNull()) { @@ -442,7 +442,7 @@ bool KBookmarkManager::saveAs(const QString &filename, bool toolbarCache) const { - // qDebug() << "KBookmarkManager::save " << filename; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::save " << filename; // Save the bookmark toolbar folder for quick loading // but only when it will actually make things quicker @@ -488,7 +488,7 @@ QMessageBox::critical(QApplication::activeWindow(), QApplication::applicationName(), err); } - qCritical() << QStringLiteral("Unable to save bookmarks in %1. File reported the following error-code: %2.").arg(filename).arg(file.error()); + qCCritical(KBOOKMARKS_LOG) << QStringLiteral("Unable to save bookmarks in %1. File reported the following error-code: %2.").arg(filename).arg(file.error()); emit const_cast<KBookmarkManager *>(this)->error(err); } hadSaveError = true; @@ -507,27 +507,27 @@ KBookmarkGroup KBookmarkManager::toolbar() { - // qDebug() << "KBookmarkManager::toolbar begin"; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::toolbar begin"; // Only try to read from a toolbar cache if the full document isn't loaded if (!d->m_docIsLoaded) { - // qDebug() << "KBookmarkManager::toolbar trying cache"; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::toolbar trying cache"; const QString cacheFilename = d->m_bookmarksFile + QLatin1String(".tbcache"); QFileInfo bmInfo(d->m_bookmarksFile); QFileInfo cacheInfo(cacheFilename); if (d->m_toolbarDoc.isNull() && QFile::exists(cacheFilename) && bmInfo.lastModified() < cacheInfo.lastModified()) { - // qDebug() << "KBookmarkManager::toolbar reading file"; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::toolbar reading file"; QFile file(cacheFilename); if (file.open(QIODevice::ReadOnly)) { d->m_toolbarDoc = QDomDocument(QStringLiteral("cache")); d->m_toolbarDoc.setContent(&file); - // qDebug() << "KBookmarkManager::toolbar opened"; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::toolbar opened"; } } if (!d->m_toolbarDoc.isNull()) { - // qDebug() << "KBookmarkManager::toolbar returning element"; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::toolbar returning element"; QDomElement elem = d->m_toolbarDoc.firstChild().toElement(); return KBookmarkGroup(elem); } @@ -548,11 +548,11 @@ KBookmark KBookmarkManager::findByAddress(const QString &address) { - // qDebug() << "KBookmarkManager::findByAddress " << address; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::findByAddress " << address; KBookmark result = root(); // The address is something like /5/10/2+ const QStringList addresses = address.split(QRegularExpression(QStringLiteral("[/+]")), QString::SkipEmptyParts); - // qWarning() << addresses.join(","); + // qCWarning(KBOOKMARKS_LOG) << addresses.join(","); for (QStringList::const_iterator it = addresses.begin(); it != addresses.end();) { bool append = ((*it) == QLatin1String("+")); uint number = (*it).toUInt(); @@ -562,16 +562,16 @@ for (uint i = 0; ((i < number) || append) && !bk.isNull(); ++i) { lbk = bk; bk = group.next(bk); - // qWarning() << i; + // qCWarning(KBOOKMARKS_LOG) << i; } it++; - // qWarning() << "found section"; + // qCWarning(KBOOKMARKS_LOG) << "found section"; result = bk; } if (result.isNull()) { - qWarning() << "KBookmarkManager::findByAddress: couldn't find item " << address; + qCWarning(KBOOKMARKS_LOG) << "KBookmarkManager::findByAddress: couldn't find item " << address; } - // qWarning() << "found " << result.address(); + // qCWarning(KBOOKMARKS_LOG) << "found " << result.address(); return result; } @@ -585,7 +585,7 @@ (void) save(); // KDE5 TODO: emitChanged should return a bool? Maybe rename it to saveAndEmitChanged? // Tell the other processes too - // qDebug() << "KBookmarkManager::emitChanged : broadcasting change " << group.address(); + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::emitChanged : broadcasting change " << group.address(); emit bookmarksChanged(group.address()); @@ -604,7 +604,7 @@ return; } - // qDebug() << "KBookmarkManager::notifyCompleteChange"; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::notifyCompleteChange"; // The bk editor tells us we should reload everything // Reparse parse(); @@ -615,7 +615,7 @@ void KBookmarkManager::notifyConfigChanged() // DBUS call { - // qDebug() << "reloaded bookmark config!"; + // qCDebug(KBOOKMARKS_LOG) << "reloaded bookmark config!"; KBookmarkSettings::self()->readSettings(); parse(); // reload, and thusly recreate the menus emit configChanged(); @@ -623,7 +623,7 @@ void KBookmarkManager::notifyChanged(const QString &groupAddress, const QDBusMessage &msg) // DBUS call { - // qDebug() << "KBookmarkManager::notifyChanged ( "<<groupAddress<<")"; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::notifyChanged ( "<<groupAddress<<")"; if (!d->m_update) { return; } @@ -634,7 +634,7 @@ parse(); } - // qDebug() << "KBookmarkManager::notifyChanged " << groupAddress; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::notifyChanged " << groupAddress; //KBookmarkGroup group = findByAddress( groupAddress ).toGroup(); //Q_ASSERT(!group.isNull()); emit changed(groupAddress, QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/kbookmarkmenu.cpp new/kbookmarks-5.42.0/src/kbookmarkmenu.cpp --- old/kbookmarks-5.41.0/src/kbookmarkmenu.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/kbookmarkmenu.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -33,7 +33,7 @@ #include <kstringhandler.h> #include <QApplication> -#include <QDebug> +#include "kbookmarks_debug.h" #include <QMenu> #include <QObject> #include <QStandardPaths> @@ -70,7 +70,7 @@ // TODO KDE5 find a QMenu equvalnet for this one //m_parentMenu->setKeyboardShortcutsEnabled( true ); - // qDebug() << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress; + // qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress; connect(_parentMenu, &QMenu::aboutToShow, this, &KBookmarkMenu::slotAboutToShow); @@ -211,9 +211,9 @@ void KBookmarkMenu::slotBookmarksChanged(const QString &groupAddress) { - qDebug() << "KBookmarkMenu::slotBookmarksChanged groupAddress: " << groupAddress; + qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::slotBookmarksChanged groupAddress: " << groupAddress; if (groupAddress == m_parentAddress) { - //qDebug() << "KBookmarkMenu::slotBookmarksChanged -> setting m_bDirty on " << groupAddress; + //qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::slotBookmarksChanged -> setting m_bDirty on " << groupAddress; m_bDirty = true; } else { // Iterate recursively into child menus @@ -241,7 +241,7 @@ void KBookmarkMenu::refill() { - //qDebug() << "KBookmarkMenu::refill()"; + //qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::refill()"; if (m_bIsRoot) { addActions(); } @@ -362,7 +362,7 @@ QAction *KBookmarkMenu::actionForBookmark(const KBookmark &bm) { if (bm.isGroup()) { - //qDebug() << "Creating bookmark submenu named " << bm.text(); + //qCDebug(KBOOKMARKS_LOG) << "Creating bookmark submenu named " << bm.text(); KActionMenu *actionMenu = new KBookmarkActionMenu(bm, this); m_actions.append(actionMenu); KBookmarkMenu *subMenu = new KBookmarkMenu(m_pManager, m_pOwner, actionMenu->menu(), bm.address()); @@ -374,7 +374,7 @@ m_actions.append(sa); return sa; } else { - //qDebug() << "Creating bookmark menu item for " << bm.text(); + //qCDebug(KBOOKMARKS_LOG) << "Creating bookmark menu item for " << bm.text(); QAction *action = new KBookmarkAction(bm, m_pOwner, this); m_actions.append(action); return action; @@ -434,7 +434,7 @@ void KImportedBookmarkMenu::slotNSLoad() { - // qDebug()<<"**** slotNSLoad ****"<<m_type<<" "<<m_location; + // qCDebug(KBOOKMARKS_LOG)<<"**** slotNSLoad ****"<<m_type<<" "<<m_location; // only fill menu once parentMenu()->disconnect(SIGNAL(aboutToShow())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.41.0/src/konqbookmarkmenu.cpp new/kbookmarks-5.42.0/src/konqbookmarkmenu.cpp --- old/kbookmarks-5.41.0/src/konqbookmarkmenu.cpp 2017-12-02 21:02:10.000000000 +0100 +++ new/kbookmarks-5.42.0/src/konqbookmarkmenu.cpp 2018-01-07 17:06:13.000000000 +0100 @@ -23,7 +23,7 @@ #include "kbookmarkaction.h" #include "kbookmarkcontextmenu.h" -#include <QDebug> +#include "kbookmarks_debug.h" #include <QMenu> #include <QFile> @@ -57,20 +57,20 @@ if (filteredToolbar) { QString text = bookmark().showInToolbar() ? tr("Hide in toolbar") : tr("Show in toolbar"); - addAction(QIcon::fromTheme(QLatin1String("")), text, this, SLOT(toggleShowInToolbar())); + addAction(text, this, &KonqBookmarkContextMenu::toggleShowInToolbar); } addFolderActions(); } else { if (owner()) { - addAction(QIcon::fromTheme(QStringLiteral("window-new")), tr("Open in New Window"), this, SLOT(openInNewWindow())); - addAction(QIcon::fromTheme(QStringLiteral("tab-new")), tr("Open in New Tab"), this, SLOT(openInNewTab())); + addAction(QIcon::fromTheme(QStringLiteral("window-new")), tr("Open in New Window"), this, &KonqBookmarkContextMenu::openInNewWindow); + addAction(QIcon::fromTheme(QStringLiteral("tab-new")), tr("Open in New Tab"), this, &KonqBookmarkContextMenu::openInNewTab); } addBookmark(); if (filteredToolbar) { QString text = bookmark().showInToolbar() ? tr("Hide in toolbar") : tr("Show in toolbar"); - addAction(QIcon::fromTheme(QLatin1String("")), text, this, SLOT(toggleShowInToolbar())); + addAction(text, this, &KonqBookmarkContextMenu::toggleShowInToolbar); } addBookmarkActions(); @@ -147,7 +147,7 @@ QAction *KonqBookmarkMenu::actionForBookmark(const KBookmark &bm) { if (bm.isGroup()) { - // qDebug() << "Creating Konq bookmark submenu named " << bm.text(); + // qCDebug(KBOOKMARKS_LOG) << "Creating Konq bookmark submenu named " << bm.text(); KBookmarkActionMenu *actionMenu = new KBookmarkActionMenu(bm, this); m_actionCollection->addAction(QStringLiteral("kbookmarkmenu"), actionMenu); m_actions.append(actionMenu); @@ -159,7 +159,7 @@ } else if (bm.isSeparator()) { return KBookmarkMenu::actionForBookmark(bm); } else { - // qDebug() << "Creating Konq bookmark action named " << bm.text(); + // qCDebug(KBOOKMARKS_LOG) << "Creating Konq bookmark action named " << bm.text(); KBookmarkAction *action = new KBookmarkAction(bm, owner(), this); m_actionCollection->addAction(action->objectName(), action); m_actions.append(action);
