Hello community, here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2017-08-24 17:59:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old) and /work/SRC/openSUSE:Factory/.kxmlgui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui" Thu Aug 24 17:59:09 2017 rev:47 rq:516705 version:5.37.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2017-07-17 10:26:20.580407420 +0200 +++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2017-08-24 17:59:11.734986459 +0200 @@ -1,0 +2,15 @@ +Sat Aug 12 09:23:41 UTC 2017 - christo...@krop.fr + +- Update to 5.37.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.37.0.php +- Changes since 5.36.0 : + * API dox: use official name "D-Bus" + * API dox: fixes of typos & markup mistakes + * Drop usage of KDE_DEFAULT_WINDOWFLAGS + * API dox: fix another usage of KMainWindow in KXmlGuiWindow text + * API dox: fix outdated note about KXmlGuiWindow constructor window flags arg + * API dox: fix usage of KMainWindow in KXmlGuiWindow constructor text copy + +------------------------------------------------------------------- Old: ---- kxmlgui-5.36.0.tar.xz New: ---- kxmlgui-5.37.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmlgui.spec ++++++ --- /var/tmp/diff_new_pack.In7Ylu/_old 2017-08-24 17:59:13.898681704 +0200 +++ /var/tmp/diff_new_pack.In7Ylu/_new 2017-08-24 17:59:13.914679452 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5XmlGui5 -%define _tar_path 5.36 +%define _tar_path 5.37 Name: kxmlgui -Version: 5.36.0 +Version: 5.37.0 Release: 0 %define kf5_version %{version} BuildRequires: attica-qt5-devel >= %{_tar_path} ++++++ kxmlgui-5.36.0.tar.xz -> kxmlgui-5.37.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/CMakeLists.txt new/kxmlgui-5.37.0/CMakeLists.txt --- old/kxmlgui-5.36.0/CMakeLists.txt 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/CMakeLists.txt 2017-08-06 20:12:58.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.36.0") # handled by release scripts -set(KF5_DEP_VERSION "5.36.0") # handled by release scripts +set(KF5_VERSION "5.37.0") # handled by release scripts +set(KF5_DEP_VERSION "5.37.0") # handled by release scripts project(KXmlGui VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.36.0 NO_MODULE) +find_package(ECM 5.37.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) @@ -35,7 +35,7 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") # Dependencies -set(REQUIRED_QT_VERSION 5.6.0) +set(REQUIRED_QT_VERSION 5.7.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/po/gl/kxmlgui5.po new/kxmlgui-5.37.0/po/gl/kxmlgui5.po --- old/kxmlgui-5.36.0/po/gl/kxmlgui5.po 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/po/gl/kxmlgui5.po 2017-08-06 20:12:58.000000000 +0200 @@ -10,14 +10,14 @@ # Xosé <xoseca...@gmail.com>, 2010. # Marce Villarino <mvillar...@kde-espana.es>, 2011, 2012, 2013, 2014. # Adrián Chaves Fernández <adriyeticha...@gmail.com>, 2015, 2016, 2017. +# Adrián Chaves (Gallaecio) <adr...@chaves.io>, 2017. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-06-17 03:03+0200\n" -"PO-Revision-Date: 2017-02-02 21:34+0100\n" -"Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." -"com>\n" +"PO-Revision-Date: 2017-07-28 09:59+0100\n" +"Last-Translator: Adrián Chaves (Gallaecio) <adr...@chaves.io>\n" "Language-Team: Galician <kde-i18n-...@kde.org>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -35,12 +35,9 @@ msgstr "Sobre %1" #: kaboutapplicationdialog.cpp:98 -#, fuzzy, kde-format -#| msgid "" -#| "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br /> </html>" +#, kde-format msgid "<html><font size=\"5\">%1</font><br />Version %2</html>" -msgstr "" -"<html><font size=\"5\">%1</font><br /><b>Versión %2</b><br /> </html>" +msgstr "<html><font size=\"5\">%1</font><br />Versión %2</html>" #: kaboutapplicationdialog.cpp:136 #, kde-format @@ -53,22 +50,18 @@ msgstr "&Sobre" #: kaboutapplicationdialog.cpp:155 -#, fuzzy, kde-format -#| msgid "" -#| "Using:<ul><li>KDE Frameworks %1</li><li>Qt %2 (built against %3)</" -#| "li><li>The <em>%4</em> windowing system</li></ul>" +#, kde-format msgid "" "<ul><li>KDE Frameworks %1</li><li>Qt %2 (built against %3)</li><li>The <em>" "%4</em> windowing system</li></ul>" msgstr "" -"Usando:<ul><li>KDE Frameworks %1</li><li>Qt %2 (construído sobre %3)</" -"li><li>O sistema de xanelas <em>%4</em></li></ul>" +"<ul><li>KDE Frameworks %1</li><li>Qt %2 (construído sobre %3)</li><li>O " +"sistema de xanelas <em>%4</em></li></ul>" #: kaboutapplicationdialog.cpp:165 -#, fuzzy, kde-format -#| msgid "Libraries" +#, kde-format msgid "&Libraries" -msgstr "Bibliotecas" +msgstr "Bib&liotecas" #: kaboutapplicationdialog.cpp:186 #, kde-format @@ -80,10 +73,9 @@ "a> para informar de fallos.\n" #: kaboutapplicationdialog.cpp:192 -#, fuzzy, kde-format -#| msgid "Please report bugs to <a href=\"mailto:%1\";>%2</a>.\n" +#, kde-format msgid "Please report bugs to <a href=\"%1\">%2</a>.\n" -msgstr "Por favor, informe dos fallos a <a href=\"mailto:%1\";>%2</a>.\n" +msgstr "Informe de calquera fallo a <a href=\"%1\">%2</a>.\n" #: kaboutapplicationdialog.cpp:218 #, kde-format @@ -492,20 +484,13 @@ "mostrada enriba transferirase a ese servidor.</qt>" #: kbugreport.cpp:299 -#, fuzzy, kde-format -#| msgid "" -#| "<qt>To submit a bug report, click on the button below. This will open a " -#| "web browser window on <a href=\"http://bugs.kde.org\";>http://bugs.kde."; -#| "org</a> where you will find a form to fill in. The information displayed " -#| "above will be transferred to that server.</qt>" +#, kde-format msgid "" "<qt>To submit a bug report, click on the button below. This will open a web " "browser window on <a href=\"%1\">%2</a>.</qt>" msgstr "" -"<qt>Para enviar un informe do fallo, prema a ligazón de baixo. Isto abrirá " -"unha xanela do navegador web en <a href=\"http://bugs.kde.org\";>http://bugs."; -"kde.org</a> na que poderá atopar un formulario para preencher. A información " -"mostrada enriba transferirase a ese servidor.</qt>" +"<qt>Para enviar un informe de fallo, prema o botón de embaixo. Isto abrirá " +"unha xanela do navegador web en <a href=\"%1\">%2</a>.</qt>" #: kbugreport.cpp:316 #, kde-format @@ -513,10 +498,9 @@ msgstr "&Iniciar o asistente de informe de fallos" #: kbugreport.cpp:318 -#, fuzzy, kde-format -#| msgid "Submit Bug Report" +#, kde-format msgid "&Submit Bug Report" -msgstr "Enviar un informe de fallo" +msgstr "&Enviar un informe de fallo" #: kbugreport.cpp:382 #, kde-format @@ -672,8 +656,7 @@ "default? The changes will be applied immediately." msgstr "" "Está seguro de que quere repor os valores predeterminados de todas as barras " -"de ferramentas deste aplicativo? As modificacións han ser aplicadas de " -"inmediato." +"de ferramentas deste aplicativo? Os cambios aplicaranse inmediatamente." #: kedittoolbar.cpp:682 #, kde-format @@ -1018,7 +1001,7 @@ #: kshortcuteditwidget.cpp:65 #, kde-format msgid "Default:" -msgstr "Por omisión:" +msgstr "De maneira predeterminada:" #: kshortcuteditwidget.cpp:73 #, kde-format @@ -1485,12 +1468,14 @@ "is most probably a bug. Please report it in <a href='https://bugs.kde."; "org'>bugs.kde.org</a>" msgstr "" +"Existen dúas accións (%1, %2) asociadas co mesmo atallo (%3). O máis " +"probábel é que se trate dun fallo. Informe del desde <a href='https://bugs."; +"kde.org'>bugs.kde.org</a>." #: kxmlguiwindow.cpp:430 -#, fuzzy, kde-format -#| msgid "Ambiguous shortcut detected" +#, kde-format msgid "Ambiguous Shortcuts" -msgstr "Detectouse un atallo ambiguo" +msgstr "Atallos ambiguos" #. i18n: ectx: Menu (file) #: ui_standards.rc:5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/po/zh_CN/kxmlgui5.po new/kxmlgui-5.37.0/po/zh_CN/kxmlgui5.po --- old/kxmlgui-5.36.0/po/zh_CN/kxmlgui5.po 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/po/zh_CN/kxmlgui5.po 2017-08-06 20:12:58.000000000 +0200 @@ -1,30 +1,20 @@ -# translation of kdelibs4.po to Chinese Simplified -# Copyright (C) 2007 Free Software Foundation, Inc. -# -# Lie Ex <lilith...@gmail.com> 2007-2011. -# Wang Jian <l...@linux.ustc.edu.cn>, 1998. -# Sarah Smith <sar...@redhat.com>, 2002. -# Xiong Jiang <jxi...@offtopic.org>, 2002,2003,2004. -# Funda Wang <fundaw...@linux.net.cn>, 2002,2003,2004. -# Liang Qi <cavendish...@gmail.com>, 2007. -# Feng Chao <chaofeng...@gmail.com>, 2010, 2012, 2014. -# Ni Hui <shuizhuyuan...@126.com>, 2010, 2011, 2012. -# Weng Xuetian <wen...@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. -# Guo Yunhe <guoyunhebr...@gmail.com>, 2016, 2017. msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-06-17 03:03+0200\n" -"PO-Revision-Date: 2017-02-04 14:55-0800\n" -"Last-Translator: Weng Xuetian <wen...@gmail.com>\n" -"Language-Team: Chinese <kde-ch...@kde.org>\n" +"PO-Revision-Date: 2017-08-05 09:29-0400\n" +"Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.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/kxmlgui5.pot\n" #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:290 #, kde-format @@ -248,10 +238,8 @@ msgstr "" "<html>您不必是软件开发者就可以成为 KDE 团队的一员。您可以参加翻译程序界面的小" "组。您可以提供图片、主题、音效或改进文档。您可以自己决定！<br /><br />请访问 " -"<a href=\"%1\">%1</a> 了解可参与项目的信息。而要想参与 KDE 的简体中文翻译工" -"作，请查看 <a href=\"https://community.kde.org/KDE_Localization/zh-cn\";>翻译" -"组 wiki 页面</a>。<br /><br />如果您需要更多的信息或文档，请访问 <a href=" -"\"%2\">%2</a>。</html>" +"<a href=\"%1\">%1</a> 了解可参与项目的信息。<br /><br />如果您需要更多的信息" +"或文档，请访问 <a href=\"%2\">%2</a>。</html>" #: kaboutkdedialog_p.cpp:114 #, kde-format @@ -273,8 +261,9 @@ "了 KDE 协会，一个在德国合法建立的非营利组织。KDE 协会在法律和财政方面代表了 " "KDE 社区。请参看 <a href=\"%1\">%1</a> 中关于 KDE 协会的信息。<br /><br /" ">KDE 团队的确需要资金支持。其中大部分的资金用于偿还成员和其他人在为 KDE 作出" -"贡献的时候所付出的开支。我们鼓励您通过资金捐助来支持 KDE。详细的捐助方法在 " -"<a href=\"%2\">%2</a> 上有描述。</html>" +"贡献的时候所付出的开支。其他资金会用于法律支持和组织会议和聚会。<br /> <br />" +"我们鼓励您通过资金捐助来支持 KDE。详细的捐助方法在 <a href=\"%2\">%2</a> 上有" +"描述。<br /><br />非常感谢您的支持。</html>" #: kaboutkdedialog_p.cpp:134 #, kde-format @@ -673,7 +662,7 @@ #, kde-format msgctxt "@item:intable Action name in toolbar editor" msgid "%1" -msgstr "%1|/|$[~stripAccel %1]" +msgstr "%1" #: kedittoolbar.cpp:1237 #, kde-format @@ -1197,7 +1186,7 @@ #, kde-format msgctxt "@item:intable Action name in shortcuts configuration" msgid "%1" -msgstr "%1|/|$[~stripAccel %1]" +msgstr "%1" #: kswitchlanguagedialog_p.cpp:152 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kaboutapplicationdialog.h new/kxmlgui-5.37.0/src/kaboutapplicationdialog.h --- old/kxmlgui-5.36.0/src/kaboutapplicationdialog.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kaboutapplicationdialog.h 2017-08-06 20:12:58.000000000 +0200 @@ -44,7 +44,7 @@ * thereby this dialog box is available through the * KMainWindow::helpMenu() function. * - * \image html kaboutapplicationdialog.png "KDE About Application Dialog" + * \image html kaboutapplicationdialog.png "KAboutApplicationDialog" * * @author Urs Wolfer uwolfer @ kde.org */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kactioncollection.h new/kxmlgui-5.37.0/src/kactioncollection.h --- old/kxmlgui-5.36.0/src/kactioncollection.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kactioncollection.h 2017-08-06 20:12:58.000000000 +0200 @@ -87,8 +87,8 @@ void clear(); /** - * Associate all actions in this collection to the given \a widget. - * Unlike addAssociatedWidget, this method only adds all current actions + * Associate all actions in this collection to the given @p widget. + * Unlike addAssociatedWidget(), this method only adds all current actions * in the collection to the given widget. Any action added after this call * will not be added to the given widget automatically. * So this is just a shortcut for a foreach loop and a widget->addAction call. @@ -96,7 +96,7 @@ void associateWidget(QWidget *widget) const; /** - * Associate all actions in this collection to the given \a widget, including any actions + * Associate all actions in this collection to the given @p widget, including any actions * added after this association is made. * * This does not change the action's shortcut context, so if you need to have the actions only @@ -106,7 +106,7 @@ void addAssociatedWidget(QWidget *widget); /** - * Remove an association between all actions in this collection and the given \a widget, i.e. + * Remove an association between all actions in this collection and the given @p widget, i.e. * remove those actions from the widget, and stop associating newly added actions as well. */ void removeAssociatedWidget(QWidget *widget); @@ -127,19 +127,19 @@ QString configGroup() const; /** - * Returns whether this action collection's configuration should be global to KDE ( \e true ), - * or specific to the application ( \e false ). + * Returns whether this action collection's configuration should be global to KDE ( @c true ), + * or specific to the application ( @c false ). */ bool configIsGlobal() const; /** - * Sets \a group as the KConfig group with which settings will be loaded and saved. + * Sets @p group as the KConfig group with which settings will be loaded and saved. */ void setConfigGroup(const QString &group); /** - * Set whether this action collection's configuration should be global to KDE ( \e true ), - * or specific to the application ( \e false ). + * Set whether this action collection's configuration should be global to KDE ( @c true ), + * or specific to the application ( @c false ). */ void setConfigGlobal(bool global); @@ -172,13 +172,13 @@ void exportGlobalShortcuts(KConfigGroup *config, bool writeDefaults = false) const; /** - * Write the current configurable key associations to @a config. What the - * function does if @a config is zero depends. If this action collection - * belongs to a KXMLGuiClient the setting are saved to the kxmlgui + * Write the current configurable key associations to @p config. What the + * function does if @p config is zero depends. If this action collection + * belongs to a KXMLGUIClient the setting are saved to the kxmlgui * definition file. If not the settings are written to the applications * config file. * - * \note oneAction() and writeDefaults() have no meaning for the kxmlgui + * \note @p oneAction and @p writeDefaults have no meaning for the kxmlgui * configuration file. * * \param config Config object to save to, or null (see above) @@ -201,14 +201,14 @@ bool isEmpty() const; /** - * Return the QAction* at position "index" in the action collection. + * Return the QAction* at position @p index in the action collection. * * This is equivalent to actions().value(index); */ QAction *action(int index) const; /** - * Get the action with the given \a name from the action collection. + * Get the action with the given \p name from the action collection. * * @param name Name of the QAction * @return A pointer to the QAction in the collection which matches the parameters or @@ -235,14 +235,14 @@ const QList<QActionGroup *> actionGroups() const; /** - * Set the \a componentName associated with this action collection. + * Set the @p componentName associated with this action collection. * * \warning Don't call this method on a KActionCollection that contains * actions. This is not supported. * * \param componentData the name which is to be associated with this action collection, * or QString() to indicate the app name. This is used to load/save settings into XML files. - * KXmlGuiClient::setComponentName takes care of calling this. + * KXMLGUIClient::setComponentName takes care of calling this. */ void setComponentName(const QString &componentName); @@ -252,7 +252,7 @@ /** * Set the component display name associated with this action collection. * (e.g. for the toolbar editor) - * KXmlGuiClient::setComponentName takes care of calling this. + * KXMLGUIClient::setComponentName takes care of calling this. */ void setComponentDisplayName(const QString &displayName); @@ -266,29 +266,29 @@ Q_SIGNALS: /** - * Indicates that \a action was inserted into this action collection. + * Indicates that @p action was inserted into this action collection. */ void inserted(QAction *action); /** - * Indicates that \a action was removed from this action collection. + * Indicates that @p action was removed from this action collection. * @deprecated */ QT_MOC_COMPAT void removed(QAction *action); /** - * Indicates that \a action was highlighted (hovered over). + * Indicates that @p action was highlighted (hovered over). * @deprecated Replaced by actionHovered(QAction* action); */ QT_MOC_COMPAT void actionHighlighted(QAction *action); /** - * Indicates that \a action was hovered. + * Indicates that @p action was hovered. */ void actionHovered(QAction *action); /** - * Indicates that \a action was triggered + * Indicates that @p action was triggered */ void actionTriggered(QAction *action); @@ -341,7 +341,7 @@ * The ownership of the action objects is not transferred. * If the action is destroyed it will be removed automatically from the KActionCollection. * - * Uses addAction(QString, QAction*). + * Uses addAction(const QString&, QAction*). * * @param actions the list of the actions to add. * @@ -370,7 +370,7 @@ * action's triggered(bool) signal to the specified receiver/member. The * newly created action is also returned. * - * Note: Using KStandardAction::OpenRecent will cause a different signal than + * @note Using KStandardAction::OpenRecent will cause a different signal than * triggered(bool) to be used, see KStandardAction for more information. * * The action can be retrieved later from the collection by its standard name as per @@ -392,7 +392,7 @@ * and connects the action's triggered(bool) signal to the specified * receiver/member. The newly created action is also returned. * - * Note: Using KStandardAction::OpenRecent will cause a different signal than + * @note Using KStandardAction::OpenRecent will cause a different signal than * triggered(bool) to be used, see KStandardAction for more information. * * The action can be retrieved later from the collection by the specified name. @@ -479,9 +479,14 @@ * @see add(const QString &, const QObject *, const char *) * @since 5.28 */ + #ifdef DOXYGEN_SHOULD_SKIP_THIS + template<class ActionType> + inline ActionType *add(const QString &name, const Receiver *receiver, Func slot) + #else template<class ActionType, class Receiver, class Func> inline typename std::enable_if<!std::is_convertible<Func, const char*>::value, ActionType>::type *add( const QString &name, const Receiver *receiver, Func slot) + #endif { ActionType *a = new ActionType(this); connect(a, &QAction::triggered, receiver, slot); @@ -501,9 +506,13 @@ * @see addAction(const QString &, const QObject *, const char *) * @since 5.28 */ + #ifdef DOXYGEN_SHOULD_SKIP_THIS + inline QAction *addAction(const QString &name, const Receiver *receiver, Func slot) + #else template<class Receiver, class Func> inline typename std::enable_if<!std::is_convertible<Func, const char*>::value, QAction>::type *addAction( const QString &name, const Receiver *receiver, Func slot) + #endif { return add<QAction>(name, receiver, slot); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kbugreport.h new/kxmlgui-5.37.0/src/kbugreport.h --- old/kxmlgui-5.36.0/src/kbugreport.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kbugreport.h 2017-08-06 20:12:58.000000000 +0200 @@ -36,7 +36,7 @@ * Make sure you create an instance of KAboutData and call * KAboutData::setApplicationData(<aboutData>). * - * \image html kbugreport.png "KDE Bug Report Dialog" + * \image html kbugreport.png "KBugReport" * * @author David Faure <fa...@kde.org> */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kedittoolbar.h new/kxmlgui-5.37.0/src/kedittoolbar.h --- old/kxmlgui-5.36.0/src/kedittoolbar.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kedittoolbar.h 2017-08-06 20:12:58.000000000 +0200 @@ -40,8 +40,8 @@ * Typically you do not need to use it directly as KXmlGuiWindow::setupGUI * takes care of it. * - * If you use plugListAction you need to overload saveNewToolbarConfig() - * to plug actions again: + * If you use KXMLGUIClient::plugActionList() you need to overload + * KXmlGuiWindow::saveNewToolbarConfig() to plug actions again: * * \code * void MyClass::saveNewToolbarConfig() @@ -63,7 +63,7 @@ * and connecting to its newToolBarConfig slot, but if you really really want to do it * yourself, see the KXmlGuiWindow::configureToolbars() and KXmlGuiWindow::saveNewToolbarConfig() code. * - * \image html kedittoolbar.png "KDE Toolbar Editor (KWrite)" + * \image html kedittoolbar.png "KEditToolBar (example: usage in KWrite)" * * @author Kurt Granroth <granr...@kde.org> * @maintainer David Faure <fa...@kde.org> @@ -125,15 +125,15 @@ * overridden by calling this method. * * The global parameter controls whether or not the - * global resource file is used. If this is @p true, then you may + * global resource file is used. If this is @c true, then you may * edit all of the actions in your toolbars -- global ones and - * local one. If it is @p false, then you may edit only your + * local one. If it is @c false, then you may edit only your * application's entries. The only time you should set this to * false is if your application does not use the global resource * file at all (very rare). * - * @param xmlfile The application's local resource file. - * @param global If @p true, then the global resource file will also + * @param file The application's local resource file. + * @param global If @c true, then the global resource file will also * be parsed. */ void setResourceFile(const QString &file, bool global = true); @@ -142,7 +142,8 @@ * Sets the default toolbar which will be auto-selected for all * KEditToolBar instances. Can be overridden on a per-dialog basis * by calling setDefaultToolBar( const QString& ) on the dialog. - * @param toolbarName the name of the tool bar + * + * @param toolBarName the name of the tool bar */ static void setGlobalDefaultToolBar(const char *toolBarName); // TODO should be const QString& diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kedittoolbar_p.h new/kxmlgui-5.37.0/src/kedittoolbar_p.h --- old/kxmlgui-5.36.0/src/kedittoolbar_p.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kedittoolbar_p.h 2017-08-06 20:12:58.000000000 +0200 @@ -156,7 +156,7 @@ /** * Destructor. Note that any changes done in this widget will - * @p NOT be saved in the destructor. You @p must call save() + * @em NOT be saved in the destructor. You @em must call save() * to do that. */ virtual ~KEditToolBarWidget(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/khelpmenu.h new/kxmlgui-5.37.0/src/khelpmenu.h --- old/kxmlgui-5.36.0/src/khelpmenu.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/khelpmenu.h 2017-08-06 20:12:58.000000000 +0200 @@ -102,7 +102,7 @@ * } * \endcode * - * \image html khelpmenu.png "KDE Help Menu" + * \image html khelpmenu.png "KHelpMenu" * * KHelpMenu respects Kiosk settings (see the KAuthorized namespace in the * KConfig framework). In particular, system administrators can disable items diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kkeysequencewidget.cpp new/kxmlgui-5.37.0/src/kkeysequencewidget.cpp --- old/kxmlgui-5.36.0/src/kkeysequencewidget.cpp 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kkeysequencewidget.cpp 2017-08-06 20:12:58.000000000 +0200 @@ -63,25 +63,25 @@ void startRecording(); /** - * Conflicts the key sequence @a seq with a current standard + * Conflicts the key sequence @p seq with a current standard * shortcut? */ bool conflictWithStandardShortcuts(const QKeySequence &seq); /** - * Conflicts the key sequence @a seq with a current local + * Conflicts the key sequence @p seq with a current local * shortcut? */ bool conflictWithLocalShortcuts(const QKeySequence &seq); /** - * Conflicts the key sequence @a seq with a current global + * Conflicts the key sequence @p seq with a current global * shortcut? */ bool conflictWithGlobalShortcuts(const QKeySequence &seq); /** - * Get permission to steal the shortcut @seq from the standard shortcut @a std. + * Get permission to steal the shortcut @seq from the standard shortcut @p std. */ bool stealStandardShortcut(KStandardShortcut::StandardShortcut std, const QKeySequence &seq); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kkeysequencewidget.h new/kxmlgui-5.37.0/src/kkeysequencewidget.h --- old/kxmlgui-5.36.0/src/kkeysequencewidget.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kkeysequencewidget.h 2017-08-06 20:12:58.000000000 +0200 @@ -40,7 +40,7 @@ * The widgets provides support for conflict handling. See * setCheckForConflictsAgainst() for more information. * - * \image html kkeysequencewidget.png "KDE Key Sequence Widget" + * \image html kkeysequencewidget.png "KKeySequenceWidget" * * @author Mark Donohoe <dono...@kde.org> * @internal @@ -121,7 +121,7 @@ * manually. It's your responsibility to save that change later when * you think it is appropriate. * - * 2. Call applyStealShortcut and KKeySequenceWidget will steal the + * 2. Call applyStealShortcut() and KKeySequenceWidget will steal the * shortcut. This will save the actionCollections the shortcut is part * of so make sure it doesn't inadvertly save some unwanted changes * too. Read its documentation for some limitation when handling @@ -193,7 +193,7 @@ //@} /** - * Checks whether the key sequence @a seq is available to grab. + * Checks whether the key sequence @p seq is available to grab. * * The sequence is checked under the same rules as if it has been typed by * the user. This method is useful if you get key sequences from another diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kmainwindow.h new/kxmlgui-5.37.0/src/kmainwindow.h --- old/kxmlgui-5.36.0/src/kmainwindow.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kmainwindow.h 2017-08-06 20:12:58.000000000 +0200 @@ -47,13 +47,13 @@ inline const classname ## Private *k_func() const { return reinterpret_cast<classname ## Private *>(k_ptr); } \ friend class classname ## Private; -// This is mostly from KDE3. TODO KDE5: remove the constructor parameter. +// TODO KF6: remove #define KDE_DEFAULT_WINDOWFLAGS 0 /** * @class KMainWindow kmainwindow.h KMainWindow * - * @short %KDE top level main window + * @short Top level main window * * Top level widget that provides toolbars, a status line and a frame. * @@ -98,7 +98,6 @@ * the last mainwindow will quit the application unless there is still something * that holds a ref in KGlobal - like a KIO job, or a systray icon. * - * @see KApplication * @author Reginald Stadlbauer (reg...@kde.org) Stephan Kulow (co...@kde.org), Matthias Ettrich (ettr...@kde.org), Chris Schlaeger (c...@kde.org), Sven Radej (ra...@kde.org). Maintained by David Faure (fa...@kde.org) */ @@ -123,9 +122,11 @@ * @param f Specify the window flags. The default is none. * * Note that a KMainWindow per-default is created with the - * WA_DeleteOnClose attribute, i.e. it is automatically destroyed when the - * window is closed. If you do not want this behavior, call - * setAttribute(Qt::WA_DeleteOnClose, false); + * Qt::WA_DeleteOnClose attribute set, i.e. it is automatically destroyed + * when the window is closed. If you do not want this behavior, call + * \code + * window->setAttribute(Qt::WA_DeleteOnClose, false); + * \endcode * * KMainWindows must be created on the heap with 'new', like: * \code @@ -151,7 +152,7 @@ * for the composer windows "composer#". * */ - explicit KMainWindow(QWidget *parent = nullptr, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS); + explicit KMainWindow(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); /** * \brief Destructor. @@ -208,7 +209,7 @@ * menuBar()->addMenu( customHelpMenu() ); * \endcode * - * @param showWhatsThis Set this to @p false if you do not want to include + * @param showWhatsThis Set this to @c false if you do not want to include * the "What's This" menu entry. * * @return A standard help menu. @@ -219,8 +220,8 @@ #endif /** - * If the session did contain so high a number, @p true is returned, - * else @p false. + * If the session did contain so high a number, @c true is returned, + * else @c false. * @see restore() **/ static bool canBeRestored(int number); @@ -240,7 +241,7 @@ * You should call canBeRestored() first. * * If the session did not contain so high a number, the configuration - * is not changed and @p false returned. + * is not changed and @c false returned. * * That means clients could simply do the following: * \code @@ -254,7 +255,7 @@ * // create default application as usual * } * \endcode - * Note that if @p show is true (default), QWidget::show() is called + * Note that if @p show is @c true (default), QWidget::show() is called * implicitly in restore. * * With this you can easily restore all toplevel windows of your @@ -265,8 +266,8 @@ * to determine the exact type before calling the childMW * constructor in the example from above. * - * <i>Note that you don't need to deal with this function. Use the - * kRestoreMainWindows() convenience template function instead!</i> + * @note You don't need to deal with this function. Use the + * kRestoreMainWindows() convenience template function instead! * @see kRestoreMainWindows() * @see readProperties() * @see canBeRestored() @@ -324,7 +325,7 @@ * determine the default window size. Hard coded window sizes will * be wrong for users that have big fonts, use different styles, * long/small translations, large toolbars, and other factors. - * - Put the setAutoSaveSettings ( or setupGUI() ) call after all widgets + * - Put the setAutoSaveSettings() ( or setupGUI() ) call after all widgets * have been created and placed inside the main window (i.e. for 99% of * apps setCentralWidget()) * - Widgets that inherit from QWidget (like game boards) should overload @@ -356,19 +357,19 @@ /** * @return the group used for setting-autosaving. - * Only meaningful if setAutoSaveSettings(QString) was called. + * Only meaningful if setAutoSaveSettings(const QString&, bool) was called. * This can be useful for forcing a save or an apply, e.g. before and after - * using KEditToolbar. + * using KEditToolBar. * - * NOTE: you should rather use saveAutoSaveSettings() for saving or autoSaveConfigGroup() for loading. - * This method doesn't make sense if setAutoSaveSettings(KConfigGroup) was called. + * @note You should rather use saveAutoSaveSettings() for saving or autoSaveConfigGroup() for loading. + * This method doesn't make sense if setAutoSaveSettings(const KConfigGroup&, bool) was called. */ QString autoSaveGroup() const; /** * @return the group used for setting-autosaving. * Only meaningful if setAutoSaveSettings() was called. - * This can be useful for forcing an apply, e.g. after using KEditToolbar. + * This can be useful for forcing an apply, e.g. after using KEditToolBar. * @since 4.1 */ KConfigGroup autoSaveConfigGroup() const; @@ -378,6 +379,7 @@ * groups in the config file and apply them. * * @param config Config group to read the settings from. + * * KF5 porting note: the unused bool argument was removed, make sure to remove it from your * reimplementations too! And add a Q_DECL_OVERRIDE for good measure. */ @@ -487,7 +489,7 @@ The purpose of this function is to prepare the window in a way that it is safe to close it, i.e. without the user losing some data. - Default implementation returns true. Returning @p false will cancel + Default implementation returns true. Returning @c false will cancel the closing, and, if KApplication::sessionSaving() is true, it will also cancel KDE logout. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kshortcutsdialog.h new/kxmlgui-5.37.0/src/kshortcutsdialog.h --- old/kxmlgui-5.36.0/src/kshortcutsdialog.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kshortcutsdialog.h 2017-08-06 20:12:58.000000000 +0200 @@ -47,14 +47,13 @@ * KShortcutsDialog::configure( actionCollection() ); * \endcode * - * @since 4.3 - * By default this dialog is modal. If you don't want that, setModal(false) and then the non-static + * By default this dialog is modal (since 4.3). If you don't want that, setModal(false) and then the non-static * configure() will show the dialog. If you want to do anything extra when the dialog is done, * connect to okClicked() and/or cancelClicked(). However, if your extra stuff depends on the * changed settings already being saved, connect to saved() instead to be safe; if you connect to * okClicked() your function might be called before the save happens. * - * example: + * Example: * \code * KShortcutsDialog dlg; * dlg.addCollection(myActions); @@ -63,7 +62,7 @@ * dlg.configure(); * \endcode * - * \image html kshortcutsdialog.png "KDE Shortcuts Dialog" + * \image html kshortcutsdialog.png "KShortcutsDialog" * * @author Nicolas Hadacek <hada...@via.ecp.fr> * @author Hamish Rodda <ro...@kde.org> (KDE 4 porting) @@ -104,7 +103,7 @@ /** * Run the dialog and call writeSettings() on the action collections - * that were added if @p bSaveSettings is true. + * that were added if @p saveSettings is true. */ bool configure(bool saveSettings = true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kshortcutsdialog_p.h new/kxmlgui-5.37.0/src/kshortcutsdialog_p.h --- old/kxmlgui-5.36.0/src/kshortcutsdialog_p.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kshortcutsdialog_p.h 2017-08-06 20:12:58.000000000 +0200 @@ -410,10 +410,10 @@ enum hierarchyLevel {Root = 0, Program, Action}; /** - * Add @a action at @a level. Checks for QActions and unnamed actions + * Add @p action at @p level. Checks for QActions and unnamed actions * before adding. * - * @return true if the actions was really added, false if not + * @return @c true if the action was really added, @c false if not */ bool addAction(QAction *action, QTreeWidgetItem *hier[], hierarchyLevel level); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kshortcutseditor.h new/kxmlgui-5.37.0/src/kshortcutseditor.h --- old/kxmlgui-5.36.0/src/kshortcutseditor.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kshortcutseditor.h 2017-08-06 20:12:58.000000000 +0200 @@ -170,7 +170,7 @@ * This does not initialize the \p config object. It adds the * configuration. * - * @note this will not save the global configuration! globalaccel holds + * @note This will not save the global configuration! globalaccel holds * that part of the configuration. * @see writeGlobalConfig() * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kshortcutwidget.h new/kxmlgui-5.37.0/src/kshortcutwidget.h --- old/kxmlgui-5.36.0/src/kshortcutwidget.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kshortcutwidget.h 2017-08-06 20:12:58.000000000 +0200 @@ -31,7 +31,7 @@ /** * @class KShortcutWidget kshortcutwidget.h KShortcutWidget * - * \image html kshortcutwidget.png "KDE Shortcut Widget" + * \image html kshortcutwidget.png "KShortcutWidget" */ class KXMLGUI_EXPORT KShortcutWidget : public QWidget { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/ktoggletoolbaraction.h new/kxmlgui-5.37.0/src/ktoggletoolbaraction.h --- old/kxmlgui-5.36.0/src/ktoggletoolbaraction.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/ktoggletoolbaraction.h 2017-08-06 20:12:58.000000000 +0200 @@ -52,22 +52,20 @@ public: /** - * Create a KToggleToolbarAction that manages the toolbar - * named toolBarName. This can be either the name of a + * Create a KToggleToolBarAction that manages the toolbar + * named @p toolBarName. This can be either the name of a * toolbar in an xml ui file, or a toolbar programmatically * created with that name. * - * @param The action's parent object. + * @param parent the action's parent object. */ KToggleToolBarAction(const char *toolBarName, const QString &text, QObject *parent); /** - * Create a KToggleToolbarAction that manages the @param toolBar. - * This can be either the name of a toolbar in an xml ui file, - * or a toolbar programmatically created with that name. + * Create a KToggleToolBarAction that manages the @p toolBar. * * @param toolBar the toolbar to be managed - * @param parent The action's parent object. + * @param parent the action's parent object. */ KToggleToolBarAction(KToolBar *toolBar, const QString &text, QObject *parent); @@ -82,7 +80,7 @@ KToolBar *toolBar(); /** - * Reimplemented from @see QObject. + * Reimplemented from QObject. */ bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/ktoolbar.h new/kxmlgui-5.37.0/src/ktoolbar.h --- old/kxmlgui-5.36.0/src/ktoolbar.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/ktoolbar.h 2017-08-06 20:12:58.000000000 +0200 @@ -79,7 +79,7 @@ * if @p parent is a QMainWindow. * * Normally KDE applications do not call this directly, they either - * call KMainWindow::toolBar(name), or they use XML-GUI and specify + * call KMainWindow::toolBar(), or they use XML-GUI and specify * toolbars using XML. * * @param parent The standard toolbar parent (usually a KMainWindow) @@ -97,7 +97,7 @@ * if @p parent is a QMainWindow. * * Normally KDE applications do not call this directly, they either - * call KMainWindow::toolBar(name), or they use XML-GUI and specify + * call KMainWindow::toolBar(), or they use XML-GUI and specify * toolbars using XML. * * @param objectName The QObject name of this toolbar, required so that QMainWindow can save and load the toolbar position, @@ -148,7 +148,7 @@ * This allows you to enable or disable the context menu. * * @param enable If false, then the context menu will be disabled - * @deprecated use setContextMenuPolicy + * @deprecated use setContextMenuPolicy() */ #ifndef KXMLGUI_NO_DEPRECATED KXMLGUI_DEPRECATED void setContextMenuEnabled(bool enable = true); @@ -157,26 +157,26 @@ /** * Returns the context menu enabled flag * @return true if the context menu is disabled - * @deprecated use contextMenuPolicy + * @deprecated use contextMenuPolicy() */ #ifndef KXMLGUI_NO_DEPRECATED KXMLGUI_DEPRECATED bool contextMenuEnabled() const; #endif /** - * Save the toolbar settings to group @p configGroup in @p config. + * Save the toolbar settings to group @p cg. */ void saveSettings(KConfigGroup &cg); /** - * Read the toolbar settings from group @p configGroup in @p config + * Read the toolbar settings from group @p cg * and apply them. */ void applySettings(const KConfigGroup &cg); /** * Sets the XML gui client. - * @deprecated use addXMLGUIClient. + * @deprecated use addXMLGUIClient() */ #ifndef KXMLGUI_NO_DEPRECATED KXMLGUI_DEPRECATED void setXMLGUIClient(KXMLGUIClient *client); @@ -216,8 +216,8 @@ /** * Enable or disable toolbar editing via drag & drop of actions. This is - * called by KEditToolbar and should generally be set to disabled whenever - * KEditToolbar is not active. + * called by KEditToolBar and should generally be set to disabled whenever + * KEditToolBar is not active. */ static void setToolBarsEditable(bool editable); @@ -232,7 +232,7 @@ static void setToolBarsLocked(bool locked); /** - * Emits a dbus signal to tell all toolbars in all applications, that the user settings have + * Emits a D-Bus signal to tell all toolbars in all applications, that the user settings have * changed. * @since 5.0 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kxmlguiclient.h new/kxmlgui-5.37.0/src/kxmlguiclient.h --- old/kxmlgui-5.36.0/src/kxmlguiclient.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kxmlguiclient.h 2017-08-06 20:12:58.000000000 +0200 @@ -145,14 +145,14 @@ void setFactory(KXMLGUIFactory *factory); /** * Retrieves a pointer to the KXMLGUIFactory this client is - * associated with (will return 0 if the client's GUI has not been built + * associated with (will return nullptr if the client's GUI has not been built * by a KXMLGUIFactory. */ KXMLGUIFactory *factory() const; /** * KXMLGUIClients can form a simple child/parent object tree. This - * method returns a pointer to the parent client or 0 if it has no + * method returns a pointer to the parent client or nullptr if it has no * parent client assigned. */ KXMLGUIClient *parentClient() const; @@ -186,7 +186,7 @@ void setClientBuilder(KXMLGUIBuilder *builder); /** - * Retrieves the client's GUI builder or 0 if no client specific + * Retrieves the client's GUI builder or nullptr if no client specific * builder has been assigned via setClientBuilder() */ KXMLGUIBuilder *clientBuilder() const; @@ -237,7 +237,7 @@ * \endcode * every time a file is selected, unselected or ... * - * \note You should not call createGUI() after calling this + * \note You should not call KXmlGuiWindow::createGUI() after calling this * function. In fact, that would remove the newly added * actionlists again... * \note Forgetting to call unplugActionList() before @@ -285,7 +285,7 @@ * @param localxmlfile The local xml file to set. This should be the full path * to a writeable file, usually using QStandardPaths::writableLocation. * You can set this to QString(), but no user changes to shortcuts / toolbars - * will be possible in this case. @see setLocalXMLFile() + * will be possible in this case. * @param merge Whether to merge with the global document * * @note If in any doubt whether you need this or not, use setXMLFile() @@ -294,6 +294,7 @@ * the client is added to a KXMLGUIFactory in order to have an * effect. * + * @see setLocalXMLFile() * @since 4.4 */ void replaceXMLFile(const QString &xmlfile, const QString &localxmlfile, bool merge = false); @@ -313,7 +314,7 @@ * Sets the name of the rc file containing the XML for the part. * * Call this in the inherited class constructor, for parts and plugins. - * NOTE: for mainwindows, don't call this, pass the name of the xml file + * @note For mainwindows, don't call this, pass the name of the xml file * to KXmlGuiWindow::setupGUI() or KXmlGuiWindow::createGUI(). * * @param file Either an absolute path for the file, or simply the @@ -373,15 +374,15 @@ * Sets the Document for the part, describing the layout of the GUI. * * Call this in the Part-inherited class constructor if you don't call - * setXMLFile or setXML. + * setXMLFile() or setXML(). * - * WARNING: using this method is not recommended. Many code paths + * @warning Using this method is not recommended. Many code paths * lead to reloading from the XML file on disk. And editing toolbars requires * that the result is written to disk anyway, and loaded from there the next time. * * For application-specific changes to a client's XML, it is a better idea to * save the modified dom document to an app/default-client.xml and define a local-xml-file - * to something specific like app/local-client.xml, using replaceXMLFile. + * to something specific like app/local-client.xml, using replaceXMLFile(). * See kdepimlibs/kontactinterface/plugin.cpp for an example. */ virtual void setDOMDocument(const QDomDocument &document, bool merge = false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kxmlguifactory.h new/kxmlgui-5.37.0/src/kxmlguifactory.h --- old/kxmlgui-5.36.0/src/kxmlguifactory.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kxmlguifactory.h 2017-08-06 20:12:58.000000000 +0200 @@ -147,7 +147,7 @@ * @param useTagName Specifies whether to compare the specified name with the name attribute or * the tag name. * - * This method may return 0 if no container with the given name exists or is not owned by the client. + * This method may return nullptr if no container with the given name exists or is not owned by the client. */ QWidget *container(const QString &containerName, KXMLGUIClient *client, bool useTagName = false); @@ -159,7 +159,7 @@ * NOT touched at all, meaning no containers are deleted nor any actions unplugged. That is * something you have to do on your own. So use this method only if you know what you are doing :-) * - * (also note that this will call KXMLGUIClient::setFactory( 0 ) for all inserted clients) + * (also note that this will call KXMLGUIClient::setFactory(nullptr) for all inserted clients) */ void reset(); @@ -169,7 +169,7 @@ * specified container. The actual GUI is not touched, no containers are deleted or any actions * unplugged. Use this method only if you know what you are doing :-) * - * (also note that this will call KXMLGUIClient::setFactory( 0 ) for all clients of the + * (also note that this will call KXMLGUIClient::setFactory(nullptr) for all clients of the * container) */ void resetContainer(const QString &containerName, bool useTagName = false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.36.0/src/kxmlguiwindow.h new/kxmlgui-5.37.0/src/kxmlguiwindow.h --- old/kxmlgui-5.36.0/src/kxmlguiwindow.h 2017-07-02 10:13:30.000000000 +0200 +++ new/kxmlgui-5.37.0/src/kxmlguiwindow.h 2017-08-06 20:12:58.000000000 +0200 @@ -40,12 +40,13 @@ class KToolBar; class KXmlGuiWindowPrivate; +// TODO KF6: remove #define KDE_DEFAULT_WINDOWFLAGS 0 /** * @class KXmlGuiWindow kxmlguiwindow.h KXmlGuiWindow * - * @short %KDE top level main window with predefined action layout + * @short Top level main window with predefined action layout * * Instead of creating a KMainWindow manually and assigning menus, menu entries, * toolbar buttons and actions to it by hand, this class can be used to load an @@ -73,27 +74,27 @@ * Construct a main window. * * @param parent The widget parent. This is usually 0 but it may also be the window - * group leader. In that case, the KMainWindow becomes sort of a + * group leader. In that case, the KXmlGuiWindow becomes sort of a * secondary window. * - * @param f Specify the widget flags. The default is - * Qt::Window and Qt::WA_DeleteOnClose. Qt::Window indicates that a - * main window is a toplevel window, regardless of whether it has a - * parent or not. Qt::WA_DeleteOnClose indicates that a main window is - * automatically destroyed when its window is closed. Pass 0 if - * you do not want this behavior. + * @param f Specify the window flags. The default is none. * - * @see https://doc.qt.io/qt-5/qt.html#WindowType-enum + * Note that a KXmlGuiWindow per-default is created with the + * Qt::WA_DeleteOnClose attribute set, i.e. it is automatically destroyed + * when the window is closed. If you do not want this behavior, call + * \code + * window->setAttribute(Qt::WA_DeleteOnClose, false); + * \endcode * - * KMainWindows must be created on the heap with 'new', like: + * KXmlGuiWindows must be created on the heap with 'new', like: * \code - * KMainWindow *kmw = new KMainWindow(...); + * KXmlGuiWindow *kmw = new KXmlGuiWindow(...); * kmw->setObjectName(...); * \endcode * * IMPORTANT: For session management and window management to work * properly, all main windows in the application should have a - * different name. If you don't do it, KMainWindow will create + * different name. If you don't do it, the base class KMainWindow will create * a unique name, but it's recommended to explicitly pass a window name that will * also describe the type of the window. If there can be several windows of the same * type, append '#' (hash) to the name, and KMainWindow will replace it with numbers to make @@ -103,7 +104,7 @@ * for the composer windows "composer#". * */ - explicit KXmlGuiWindow(QWidget *parent = nullptr, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS); + explicit KXmlGuiWindow(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); /** * \brief Destructor. @@ -114,7 +115,7 @@ virtual ~KXmlGuiWindow(); /** - * Enables the build of a standard help menu when calling createGUI/setupGUI(). + * Enables the build of a standard help menu when calling createGUI() or setupGUI(). * * The default behavior is to build one, you must call this function * to disable it @@ -122,7 +123,7 @@ void setHelpMenuEnabled(bool showHelpMenu = true); /** - * Return @p true when the help menu is enabled + * Return @c true when the help menu is enabled */ bool isHelpMenuEnabled() const; @@ -157,27 +158,28 @@ * <Merge name="StandardToolBarMenuHandler" /> * line to the settings menu section of your resource file ( usually appname.rc ). * - * Note that you should enable this feature before calling createGUI() ( or similar ) . + * @note You should enable this feature before calling createGUI() ( or similar ). */ void setStandardToolBarMenuEnabled(bool enable); bool isStandardToolBarMenuEnabled() const; /** * Sets whether KMainWindow should provide a menu that allows showing/hiding - * of the statusbar ( using KToggleStatusBarAction ). + * of the statusbar ( using KStandardAction::showStatusbar()). * * The menu / menu item is implemented using xmlgui. It will be inserted * in your menu structure in the 'Settings' menu. * - * Note that you should enable this feature before calling createGUI() - * ( or similar ). + * @note You should enable this feature before calling createGUI() ( or similar ). * * If an application maintains the action on its own (i.e. never calls * this function) a connection needs to be made to let KMainWindow * know when that status (hidden/shown) of the statusbar has changed. * For example: + * @code * connect(action, SIGNAL(activated()), * kmainwindow, SLOT(setSettingsDirty())); + * @endcode * Otherwise the status (hidden/show) of the statusbar might not be saved * by KMainWindow. */ @@ -201,31 +203,33 @@ /** * adds action to show/hide the statusbar if the - * statusbar exists. @see createStandardStatusBarAction + * statusbar exists. + * @see createStandardStatusBarAction */ StatusBar = 4, /** * auto-saves (and loads) the toolbar/menubar/statusbar settings and - * window size using the default name. @see setAutoSaveSettings + * window size using the default name. * * Typically you want to let the default window size be determined by * the widgets size hints. Make sure that setupGUI() is called after * all the widgets are created ( including setCentralWidget ) so the - * default size's will be correct. @see setAutoSaveSettings for - * more information on this topic. + * default size's will be correct. + * @see setAutoSaveSettings */ Save = 8, /** * calls createGUI() once ToolBar, Keys and Statusbar have been - * taken care of. @see createGUI + * taken care of. * - * NOTE: when using KParts::MainWindow, remove this flag from the + * @note When using KParts::MainWindow, remove this flag from the * setupGUI call, since you'll be using createGUI(part) instead. * @code * setupGUI(ToolBar | Keys | StatusBar | Save); * @endcode + * @see createGUI */ Create = 16, @@ -248,9 +252,9 @@ * @see StandardWindowOptions * @note Since this method will restore the state of the application (toolbar, dockwindows * positions...), you need to have added all your actions to your toolbars etc before - * calling to this method. (This note is only applicable if you are using the Default or - * Save flag). - * @warning If you are calling createGUI yourself, remember to remove the Create flag from + * calling to this method. (This note is only applicable if you are using the @c Default or + * @c Save flag). + * @warning If you are calling createGUI yourself, remember to remove the @c Create flag from * the @p options parameter. * */ @@ -261,16 +265,16 @@ * fashion. The options are all enabled by default but can be turned * off if desired through the params or if the prereqs don't exists. * - * @p defaultSize The default size of the window + * @param defaultSize The default size of the window * * Typically this function replaces createGUI(). * * @see StandardWindowOptions * @note Since this method will restore the state of the application (toolbar, dockwindows * positions...), you need to have added all your actions to your toolbars etc before - * calling to this method. (This note is only applicable if you are using the Default or - * Save flag). - * @warning If you are calling createGUI yourself, remember to remove the Create flag from + * calling to this method. (This note is only applicable if you are using the @c Default or + * @c Save flag). + * @warning If you are calling createGUI yourself, remember to remove the @c Create flag from * the @p options parameter. Also, call setupGUI always after you call createGUI. */ void setupGUI(const QSize &defaultSize, StandardWindowOptions options = Default, const QString &xmlfile = QString()); @@ -343,7 +347,7 @@ protected Q_SLOTS: /** - * Rebuilds the GUI after KEditToolbar changed the toolbar layout. + * Rebuilds the GUI after KEditToolBar changed the toolbar layout. * @see configureToolbars() */ virtual void saveNewToolbarConfig();
