Hello community,
here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2016-11-17 12:38:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old)
and /work/SRC/openSUSE:Factory/.kxmlgui.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2016-10-28 12:24:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2016-11-17 12:38:26.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Nov 5 22:12:37 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.28.0
+ * Allow using new style connect in KActionCollection::addAction
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.28.0.php
+
+-------------------------------------------------------------------
Old:
----
kxmlgui-5.27.0.tar.xz
New:
----
kxmlgui-5.28.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kxmlgui.spec ++++++
--- /var/tmp/diff_new_pack.2bGDru/_old 2016-11-17 12:38:27.000000000 +0100
+++ /var/tmp/diff_new_pack.2bGDru/_new 2016-11-17 12:38:27.000000000 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5XmlGui5
-%define _tar_path 5.27
+%define _tar_path 5.28
Name: kxmlgui
-Version: 5.27.0
+Version: 5.28.0
Release: 0
%define kf5_version %{version}
BuildRequires: attica-qt5-devel >= %{_tar_path}
++++++ kxmlgui-5.27.0.tar.xz -> kxmlgui-5.28.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/CMakeLists.txt new/kxmlgui-5.28.0/CMakeLists.txt
--- old/kxmlgui-5.27.0/CMakeLists.txt 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/CMakeLists.txt 2016-11-05 16:00:35.000000000 +0100
@@ -4,7 +4,7 @@
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.27.0 NO_MODULE)
+find_package(ECM 5.28.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)
@@ -21,8 +21,8 @@
include(KDECMakeSettings)
include(ECMQtDeclareLoggingCategory)
-set(KF5_VERSION "5.27.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.27.0") # handled by release scripts
+set(KF5_VERSION "5.28.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.28.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX KXMLGUI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/autotests/kactioncategorytest.cpp new/kxmlgui-5.28.0/autotests/kactioncategorytest.cpp
--- old/kxmlgui-5.27.0/autotests/kactioncategorytest.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/autotests/kactioncategorytest.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -13,8 +13,8 @@
KActionCategory category2(QStringLiteral("category2"), &collection);
// Check that the name is correct
- QCOMPARE(category1.text(), QString("category1"));
- QCOMPARE(category2.text(), QString("category2"));
+ QCOMPARE(category1.text(), QStringLiteral("category1"));
+ QCOMPARE(category2.text(), QStringLiteral("category2"));
// Check that the parent is correct
QCOMPARE(category1.collection(), &collection);
@@ -28,7 +28,7 @@
// Change the text
category1.setText(QStringLiteral("Other Text"));
- QCOMPARE(category1.text(), QString("Other Text"));
+ QCOMPARE(category1.text(), QStringLiteral("Other Text"));
}
void tst_KActionCategory::tstSynchronization()
@@ -126,7 +126,7 @@
// const QObject *receiver = NULL,
// const char *member = NULL);
QAction *action4 = category.addAction(KStandardAction::Quit, QStringLiteral("myownname"));
- QCOMPARE(action4->objectName(), QString("myownname"));
+ QCOMPARE(action4->objectName(), QStringLiteral("myownname"));
QCOMPARE(category.actions().count(action4), 1);
QCOMPARE(collection.actions().count(action4), 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/autotests/kactioncollectiontest.cpp new/kxmlgui-5.28.0/autotests/kactioncollectiontest.cpp
--- old/kxmlgui-5.27.0/autotests/kactioncollectiontest.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/autotests/kactioncollectiontest.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -162,12 +162,12 @@
collection->addAction(QStringLiteral("a"), a);
QVERIFY(collection->actions().contains(a));
- QVERIFY(collection->action("a") == a);
+ QVERIFY(collection->action(QStringLiteral("a")) == a);
collection->addAction(QStringLiteral("a"), b);
QVERIFY(!collection->actions().contains(a));
QVERIFY(collection->actions().contains(b));
- QVERIFY(collection->action("a") == b);
+ QVERIFY(collection->action(QStringLiteral("a")) == b);
delete a;
delete b;
@@ -183,21 +183,21 @@
collection->addAction(QStringLiteral("a"), a);
QVERIFY(collection->actions().contains(a));
- QVERIFY(collection->action("a") == a);
+ QVERIFY(collection->action(QStringLiteral("a")) == a);
// Simple test: Just add it twice
collection->addAction(QStringLiteral("b"), a);
QVERIFY(collection->actions().contains(a));
- QVERIFY(!collection->action("a"));
- QVERIFY(collection->action("b") == a);
+ QVERIFY(!collection->action(QStringLiteral("a")));
+ QVERIFY(collection->action(QStringLiteral("b")) == a);
// Complex text: Mesh with the objectname
a->setObjectName(QStringLiteral("c"));
collection->addAction(QStringLiteral("d"), a);
QVERIFY(collection->actions().contains(a));
- QVERIFY(!collection->action("b"));
- QVERIFY(!collection->action("c"));
- QVERIFY(collection->action("d") == a);
+ QVERIFY(!collection->action(QStringLiteral("b")));
+ QVERIFY(!collection->action(QStringLiteral("c")));
+ QVERIFY(collection->action(QStringLiteral("d")) == a);
delete a;
}
@@ -211,18 +211,18 @@
void tst_KActionCollection::testSetShortcuts()
{
- QAction *action = new QAction(/*i18n*/("Next Unread &Folder"), this);
+ QAction *action = new QAction(/*i18n*/(QStringLiteral("Next Unread &Folder")), this);
collection->addAction(QStringLiteral("go_next_unread_folder"), action);
collection->setDefaultShortcut(action, QKeySequence(Qt::ALT + Qt::Key_Plus));
QList<QKeySequence> shortcut = action->shortcuts();
shortcut << QKeySequence(Qt::CTRL + Qt::Key_Plus);
action->setShortcuts(shortcut);
- QCOMPARE(QKeySequence::listToString(action->shortcuts()), QString("Alt++; Ctrl++"));
+ QCOMPARE(QKeySequence::listToString(action->shortcuts()), QStringLiteral("Alt++; Ctrl++"));
// Simpler way:
QList<QKeySequence> shortcut2;
shortcut2 << QKeySequence(Qt::ALT + Qt::Key_Plus) << QKeySequence(Qt::CTRL + Qt::Key_Plus);
- QCOMPARE(QKeySequence::listToString(shortcut2), QString("Alt++; Ctrl++"));
+ QCOMPARE(QKeySequence::listToString(shortcut2), QStringLiteral("Alt++; Ctrl++"));
}
void tst_KActionCollection::implicitStandardActionInsertionUsingCreate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/autotests/kmainwindow_unittest.cpp new/kxmlgui-5.28.0/autotests/kmainwindow_unittest.cpp
--- old/kxmlgui-5.27.0/autotests/kmainwindow_unittest.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/autotests/kmainwindow_unittest.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -45,11 +45,11 @@
KMainWindow mw;
mw.show();
mw.ensurePolished();
- QCOMPARE(mw.objectName(), QString::fromLatin1("MainWindow#1"));
+ QCOMPARE(mw.objectName(), QStringLiteral("MainWindow#1"));
KMainWindow mw2;
mw2.show();
mw2.ensurePolished();
- QCOMPARE(mw2.objectName(), QString::fromLatin1("MainWindow#2"));
+ QCOMPARE(mw2.objectName(), QStringLiteral("MainWindow#2"));
}
void KMainWindow_UnitTest::testFixedName()
@@ -58,12 +58,12 @@
mw.setObjectName(QStringLiteral("mymainwindow"));
mw.show();
mw.ensurePolished();
- QCOMPARE(mw.objectName(), QString::fromLatin1("mymainwindow"));
+ QCOMPARE(mw.objectName(), QStringLiteral("mymainwindow"));
KMainWindow mw2;
mw2.setObjectName(QStringLiteral("mymainwindow"));
mw2.show();
mw2.ensurePolished();
- QCOMPARE(mw2.objectName(), QString::fromLatin1("mymainwindow2"));
+ QCOMPARE(mw2.objectName(), QStringLiteral("mymainwindow2"));
}
void KMainWindow_UnitTest::testNameWithHash()
@@ -72,17 +72,17 @@
mw.setObjectName(QStringLiteral("composer#"));
mw.show();
mw.ensurePolished();
- QCOMPARE(mw.objectName(), QString::fromLatin1("composer#1"));
+ QCOMPARE(mw.objectName(), QStringLiteral("composer#1"));
KMainWindow mw2;
mw2.setObjectName(QStringLiteral("composer#"));
mw2.show();
mw2.ensurePolished();
- QCOMPARE(mw2.objectName(), QString::fromLatin1("composer#2"));
+ QCOMPARE(mw2.objectName(), QStringLiteral("composer#2"));
KMainWindow mw4;
mw4.setObjectName(QStringLiteral("composer#4"));
mw4.show();
mw4.ensurePolished();
- QCOMPARE(mw4.objectName(), QString::fromLatin1("composer#4"));
+ QCOMPARE(mw4.objectName(), QStringLiteral("composer#4"));
}
void KMainWindow_UnitTest::testNameWithSpecialChars()
@@ -91,12 +91,12 @@
mw.setObjectName(QStringLiteral("a#@_test/"));
mw.show();
mw.ensurePolished();
- QCOMPARE(mw.dbusName(), QString::fromLatin1("/kmainwindow_unittest/a___test_"));
+ QCOMPARE(mw.dbusName(), QStringLiteral("/kmainwindow_unittest/a___test_"));
KMainWindow mw2;
mw2.setObjectName(QStringLiteral("a#@_test/"));
mw2.show();
mw2.ensurePolished();
- QCOMPARE(mw2.dbusName(), QString::fromLatin1("/kmainwindow_unittest/a___test_2"));
+ QCOMPARE(mw2.dbusName(), QStringLiteral("/kmainwindow_unittest/a___test_2"));
}
static bool s_mainWindowDeleted;
@@ -150,7 +150,7 @@
void KMainWindow_UnitTest::testSaveWindowSize()
{
- QCOMPARE(KSharedConfig::openConfig()->name(), QString::fromLatin1("kmainwindow_unittestrc"));
+ QCOMPARE(KSharedConfig::openConfig()->name(), QStringLiteral("kmainwindow_unittestrc"));
KConfigGroup cfg(KSharedConfig::openConfig(), "TestWindowSize");
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/autotests/ktoolbar_unittest.cpp new/kxmlgui-5.28.0/autotests/ktoolbar_unittest.cpp
--- old/kxmlgui-5.27.0/autotests/ktoolbar_unittest.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/autotests/ktoolbar_unittest.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -324,7 +324,7 @@
// was it the default size? (for the main toolbar, we only check that one)
const bool usingDefaultSize = iconSize == KIconLoader::global()->currentSize(KIconLoader::MainToolbar);
if (usingDefaultSize) {
- QVERIFY(!group.groupList().contains("Toolbar mainToolBar"));
+ QVERIFY(!group.groupList().contains(QStringLiteral("Toolbar mainToolBar")));
QVERIFY(!group.group("Toolbar mainToolBar").hasKey("IconSize"));
} else {
QVERIFY(group.group("Toolbar mainToolBar").hasKey("IconSize"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/autotests/kxmlgui_unittest.cpp new/kxmlgui-5.28.0/autotests/kxmlgui_unittest.cpp
--- old/kxmlgui-5.27.0/autotests/kxmlgui_unittest.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/autotests/kxmlgui_unittest.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -173,12 +173,12 @@
KXmlGuiVersionHandler versionHandler(files);
QCOMPARE(versionHandler.finalFile(), firstFile);
QString finalDoc = versionHandler.finalDocument();
- QVERIFY(finalDoc.startsWith("isSeparator()) {
- QCOMPARE(QString("separator"), expectedActions[i]);
+ QCOMPARE(QStringLiteral("separator"), expectedActions[i]);
} else {
QCOMPARE(action->objectName(), expectedActions[i]);
}
@@ -607,8 +607,8 @@
const QDomDocument domDocument = client.domDocument();
const QDomElement docElem = domDocument.documentElement();
- QCOMPARE(docElem.attribute("name"), QString("foo")); // not standard_containers from ui_standards.rc
- QCOMPARE(docElem.attribute("version"), QString("1")); // not standard_containers from ui_standards.rc
+ QCOMPARE(docElem.attribute(QStringLiteral("name")), QStringLiteral("foo")); // not standard_containers from ui_standards.rc
+ QCOMPARE(docElem.attribute(QStringLiteral("version")), QStringLiteral("1")); // not standard_containers from ui_standards.rc
KMainWindow mainWindow;
KXMLGUIBuilder builder(&mainWindow);
@@ -664,7 +664,7 @@
action2->setObjectName(QStringLiteral("action2"));
const QList actionList = { action1, action2 };
client.plugActionList(QStringLiteral("view_groups_list"), actionList);
- QCOMPARE(QKeySequence::listToString(action1->shortcuts()), QString("Ctrl+2"));
+ QCOMPARE(QKeySequence::listToString(action1->shortcuts()), QStringLiteral("Ctrl+2"));
const QStringList expectedActionsOneList = {
QStringLiteral("action1"),
@@ -731,7 +731,7 @@
QVERIFY(mainToolBar->isHidden());
KXMLGUIFactory *factory = mainWindow.guiFactory();
- QVERIFY(!factory->container("visibleToolBar", &mainWindow)->isHidden());
+ QVERIFY(!factory->container(QStringLiteral("visibleToolBar"), &mainWindow)->isHidden());
KToolBar *hiddenToolBar = qobject_cast(factory->container(QStringLiteral("hiddenToolBar"), &mainWindow));
qDebug() << hiddenToolBar;
QVERIFY(hiddenToolBar->isHidden());
@@ -741,7 +741,7 @@
// KEditToolBar loads the stuff in showEvent...
QShowEvent ev; qApp->sendEvent(&editToolBar, &ev);
clickApply(&editToolBar);
- QVERIFY(qobject_cast(factory->container("hiddenToolBar", &mainWindow))->isHidden());
+ QVERIFY(qobject_cast(factory->container(QStringLiteral("hiddenToolBar"), &mainWindow))->isHidden());
mainWindow.close();
}
@@ -851,22 +851,22 @@
KXMLGUIFactory *factory = mainWindow.guiFactory();
//qDebug() << "containers:" << factory->containers("ToolBar");
- QVERIFY(!factory->container("mainToolBar", &mainWindow));
- QVERIFY(!factory->container("visibleToolBar", &mainWindow)->isHidden());
- QVERIFY(!factory->container("deletedToolBar", &mainWindow));
- QVERIFY(factory->container("file", &mainWindow)); // File menu was created
- QVERIFY(!factory->container("game", &mainWindow)); // Game menu was not created
+ QVERIFY(!factory->container(QStringLiteral("mainToolBar"), &mainWindow));
+ QVERIFY(!factory->container(QStringLiteral("visibleToolBar"), &mainWindow)->isHidden());
+ QVERIFY(!factory->container(QStringLiteral("deletedToolBar"), &mainWindow));
+ QVERIFY(factory->container(QStringLiteral("file"), &mainWindow)); // File menu was created
+ QVERIFY(!factory->container(QStringLiteral("game"), &mainWindow)); // Game menu was not created
// Now open KEditToolBar, just to check it doesn't crash.
KEditToolBar editToolBar(factory);
// KEditToolBar loads the stuff in showEvent...
QShowEvent ev; qApp->sendEvent(&editToolBar, &ev);
clickApply(&editToolBar);
- QVERIFY(!factory->container("mainToolBar", &mainWindow));
- QVERIFY(!factory->container("visibleToolBar", &mainWindow)->isHidden());
- QVERIFY(!factory->container("deletedToolBar", &mainWindow));
- QVERIFY(factory->container("file", &mainWindow));
- QVERIFY(!factory->container("game", &mainWindow));
+ QVERIFY(!factory->container(QStringLiteral("mainToolBar"), &mainWindow));
+ QVERIFY(!factory->container(QStringLiteral("visibleToolBar"), &mainWindow)->isHidden());
+ QVERIFY(!factory->container(QStringLiteral("deletedToolBar"), &mainWindow));
+ QVERIFY(factory->container(QStringLiteral("file"), &mainWindow));
+ QVERIFY(!factory->container(QStringLiteral("game"), &mainWindow));
mainWindow.close();
}
@@ -954,23 +954,23 @@
client.setXMLFilePublic(filenameOrig);
QString xml = client.domDocument().toString();
//qDebug() << xml;
- QVERIFY(xml.contains("shortcuts(), QList<QKeySequence>() << QKeySequence("Ctrl+O"));
+ QCOMPARE(actionOpen->shortcuts(), QList<QKeySequence>() << QKeySequence(QStringLiteral("Ctrl+O")));
// #345411
- QCOMPARE(actionQuit->shortcuts(), QList<QKeySequence>() << QKeySequence("Ctrl+Q") << QKeySequence("Ctrl+D"));
+ QCOMPARE(actionQuit->shortcuts(), QList<QKeySequence>() << QKeySequence(QStringLiteral("Ctrl+Q")) << QKeySequence(QStringLiteral("Ctrl+D")));
factory.removeClient(&client);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/po/ja/kxmlgui5.po new/kxmlgui-5.28.0/po/ja/kxmlgui5.po
--- old/kxmlgui-5.27.0/po/ja/kxmlgui5.po 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/po/ja/kxmlgui5.po 2016-11-05 16:00:35.000000000 +0100
@@ -1385,9 +1385,3 @@
#: ui_standards.rc:196
msgid "Main Toolbar"
msgstr "メインツールバー"
-
-#~ msgid "Save as Scheme Defaults"
-#~ msgstr "スキームのデフォルトとして保存"
-
-#~ msgid "&Details"
-#~ msgstr "詳細(&D)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/po/nn/kxmlgui5.po new/kxmlgui-5.28.0/po/nn/kxmlgui5.po
--- old/kxmlgui-5.27.0/po/nn/kxmlgui5.po 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/po/nn/kxmlgui5.po 2016-11-05 16:00:35.000000000 +0100
@@ -9,7 +9,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-08-18 07:19+0000\n"
-"PO-Revision-Date: 2016-04-24 21:16+0100\n"
+"PO-Revision-Date: 2016-10-30 17:23+0100\n"
"Last-Translator: Karl Ove Hufthammer \n"
"Language-Team: Norwegian Nynorsk \n"
"Language: nn\n"
@@ -761,7 +761,7 @@
"Example for Ctrl+A: hold the Ctrl key and press A."
msgstr ""
"Trykk på knappen, og skriv så inn snarvegen du ønskjer å bruka.\n"
-"For eksempel for «Ctrl + A»: Hald inne «Ctrl»-tasten, og trykk «A»."
+"For eksempel for «Ctrl + A»: Hald inne «Ctrl»-tasten og trykk «A»."
#: kkeysequencewidget.cpp:473
msgid "Reserved Shortcut"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/po/sl/kxmlgui5.po new/kxmlgui-5.28.0/po/sl/kxmlgui5.po
--- old/kxmlgui-5.27.0/po/sl/kxmlgui5.po 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/po/sl/kxmlgui5.po 2016-11-05 16:00:35.000000000 +0100
@@ -17,7 +17,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-08-18 07:19+0000\n"
-"PO-Revision-Date: 2016-07-10 20:04+0200\n"
+"PO-Revision-Date: 2016-11-01 09:33+0100\n"
"Last-Translator: Andrej Mernik \n"
"Language-Team: Slovenian \n"
"Language: sl\n"
@@ -1235,22 +1235,22 @@
#: ktoolbar.cpp:356 ktoolbar.cpp:377
#, kde-format
msgid "Small (%1x%2)"
-msgstr "Majhna (%1×%2)"
+msgstr "Majhna (%1 × %2)"
#: ktoolbar.cpp:358 ktoolbar.cpp:379
#, kde-format
msgid "Medium (%1x%2)"
-msgstr "Srednja (%1×%2)"
+msgstr "Srednja (%1 × %2)"
#: ktoolbar.cpp:360 ktoolbar.cpp:381
#, kde-format
msgid "Large (%1x%2)"
-msgstr "Velika (%1×%2)"
+msgstr "Velika (%1 × %2)"
#: ktoolbar.cpp:362 ktoolbar.cpp:383
#, kde-format
msgid "Huge (%1x%2)"
-msgstr "Ogromna (%1×%2)"
+msgstr "Velikanska (%1 × %2)"
#: ktoolbar.cpp:405
msgid "Lock Toolbar Positions"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kaboutapplicationdialog.cpp new/kxmlgui-5.28.0/src/kaboutapplicationdialog.cpp
--- old/kxmlgui-5.27.0/src/kaboutapplicationdialog.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kaboutapplicationdialog.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -188,10 +188,10 @@
bugsLabel->setText(i18n("Please use http://bugs.kde.org\">http://bugs.kde.org</a> to report bugs.\n"));
} else {
if ((aboutData.authors().count() == 1) &&
- (aboutData.authors().first().emailAddress() == aboutData.bugAddress())) {
+ (aboutData.authors().at(0).emailAddress() == aboutData.bugAddress())) {
bugsLabel->setText(i18n("Please report bugs to %2</a>.\n",
- aboutData.authors().first().emailAddress(),
- aboutData.authors().first().emailAddress()));
+ aboutData.authors().at(0).emailAddress(),
+ aboutData.authors().at(0).emailAddress()));
} else {
bugsLabel->setText(i18n("Please report bugs to %2</a>.\n",
aboutData.bugAddress(), aboutData.bugAddress()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kactioncollection.h new/kxmlgui-5.28.0/src/kactioncollection.h
--- old/kxmlgui-5.27.0/src/kactioncollection.h 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kactioncollection.h 2016-11-05 16:00:35.000000000 +0100
@@ -29,7 +29,8 @@
#include
#include
-#include
+#include <QObject>
+#include <QAction>
class QAction;
class KXMLGUIClient;
@@ -448,6 +449,47 @@
}
/**
+ * This is the same as add(const QString &name, const QObject *receiver = 0, const char *member = 0) using
+ * new style connect syntax
+ *
+ * @param name The internal name of the action (e.g. "file-open").
+ * @param receiver The QObject to connect the triggered(bool) signal to.
+ * @param member The slot or lambda to connect the triggered(bool) signal to.
+ * @return new action of the given type ActionType.
+ *
+ * @see add(const QString &, const QObject *, const char *)
+ * @since 5.28
+ */
+ template
+ inline typename std::enable_if::value, ActionType>::type *add(
+ const QString &name, const Receiver *receiver, Func slot)
+ {
+ ActionType *a = new ActionType(this);
+ connect(a, &QAction::triggered, receiver, slot);
+ addAction(name, a);
+ return a;
+ }
+
+ /**
+ * This is the same as addAction(const QString &name, const QObject *receiver = 0, const char *member = 0) using
+ * new style connect syntax
+ *
+ * @param name The internal name of the action (e.g. "file-open").
+ * @param receiver The QObject to connect the triggered(bool) signal to.
+ * @param member The slot or lambda to connect the triggered(bool) signal to.
+ * @return new action of the given type ActionType.
+ *
+ * @see addAction(const QString &, const QObject *, const char *)
+ * @since 5.28
+ */
+ template
+ inline typename std::enable_if::value, QAction>::type *addAction(
+ const QString &name, const Receiver *receiver, Func slot)
+ {
+ return add<QAction>(name, receiver, slot);
+ }
+
+ /**
* Get the default primary shortcut for the given action.
*
* @param action the action for which the default primary shortcut should be returned.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kbugreport.cpp new/kxmlgui-5.28.0/src/kbugreport.cpp
--- old/kxmlgui-5.27.0/src/kbugreport.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kbugreport.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -375,7 +375,7 @@
}
m_process = new QProcess;
QObject::connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), q, SLOT(_k_slotSetFrom()));
- m_process->start(QStringLiteral("kcmshell5"), QStringList() << QLatin1String("kcm_useraccount"));
+ m_process->start(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("kcm_useraccount"));
if (!m_process->waitForStarted()) {
//qDebug() << "Couldn't start kcmshell5..";
delete m_process;
@@ -481,8 +481,8 @@
QString severity = d->severityButtons[d->currentSeverity()]->objectName();
QString appname = d->appcombo->currentText();
QString os = QStringLiteral("OS: %1 (%2)\n").
- arg(QStringLiteral(XMLGUI_COMPILING_OS)).
- arg(QStringLiteral(XMLGUI_DISTRIBUTION_TEXT));
+ arg(QStringLiteral(XMLGUI_COMPILING_OS),
+ QStringLiteral(XMLGUI_DISTRIBUTION_TEXT));
QString bodyText;
/* for(int i = 0; i < m_lineedit->numLines(); i++)
{
@@ -509,7 +509,7 @@
appname = appname.replace(QLatin1Char('_'), QLatin1Char('-'));
// Case 2 : normal bug
return QStringLiteral("Package: %1\nVersion: %2\nSeverity: %3\n")
- .arg(appname).arg(d->m_strVersion).arg(severity) +
+ .arg(appname, d->m_strVersion, severity) +
QStringLiteral("Compiler: %1\n").arg(QStringLiteral(XMLGUI_COMPILER_VERSION)) +
os + QLatin1String("\n") + bodyText;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kcheckaccelerators.cpp new/kxmlgui-5.28.0/src/kcheckaccelerators.cpp
--- old/kxmlgui-5.27.0/src/kcheckaccelerators.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kcheckaccelerators.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -185,7 +185,7 @@
clipboard->setText(text);
} else {
QProcess *script = new QProcess(this);
- script->start(copyWidgetTextCommand.arg(text).arg(QFile::decodeName(KLocalizedString::applicationDomain())));
+ script->start(copyWidgetTextCommand.arg(text, QFile::decodeName(KLocalizedString::applicationDomain())));
connect(script, SIGNAL(finished(int,QProcess::ExitStatus)), script, SLOT(deleteLater()));
}
e->accept();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kedittoolbar.cpp new/kxmlgui-5.28.0/src/kedittoolbar.cpp
--- old/kxmlgui-5.27.0/src/kedittoolbar.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kedittoolbar.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -956,7 +956,7 @@
//qDebug(240) << "factory: " << clients.count() << " clients";
// remove the elements starting from the last going to the first
- if (!clients.count()) {
+ if (clients.isEmpty()) {
return;
}
@@ -1342,7 +1342,7 @@
void KEditToolBarWidgetPrivate::slotInactiveSelectionChanged()
{
- if (m_inactiveList->selectedItems().count()) {
+ if (!m_inactiveList->selectedItems().isEmpty()) {
m_insertAction->setEnabled(true);
QString statusText = static_cast(m_inactiveList->selectedItems().first())->statusText();
m_helpArea->setText(i18nc("@label Action tooltip in toolbar editor, below the action list", "%1", statusText));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kmainwindow.cpp new/kxmlgui-5.28.0/src/kmainwindow.cpp
--- old/kxmlgui-5.27.0/src/kmainwindow.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kmainwindow.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -134,10 +134,10 @@
KConfigGui::setSessionConfig(sm.sessionId(), sm.sessionKey());
KConfig *config = KConfigGui::sessionConfig();
- if (KMainWindow::memberList().count()) {
+ if (!KMainWindow::memberList().isEmpty()) {
// According to Jochen Wilhelmy , this
// hook is useful for better document orientation
- KMainWindow::memberList().first()->saveGlobalProperties(config);
+ KMainWindow::memberList().at(0)->saveGlobalProperties(config);
}
int n = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kmenumenuhandler_p.cpp new/kxmlgui-5.28.0/src/kmenumenuhandler_p.cpp
--- old/kxmlgui-5.27.0/src/kmenumenuhandler_p.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kmenumenuhandler_p.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -177,7 +177,7 @@
return;
}
- KToolBar *toolbar = window->toolBars()[tb];
+ KToolBar *toolbar = window->toolBars().at(tb);
toolbar->addAction(m_popupAction);
const KXMLGUIClient *client = collection->parentGUIClient();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/ksendbugmail/main.cpp new/kxmlgui-5.28.0/src/ksendbugmail/main.cpp
--- old/kxmlgui-5.27.0/src/ksendbugmail/main.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/ksendbugmail/main.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -149,7 +149,7 @@
sm->setSenderAddress(fromaddr);
sm->setRecipientAddress(recipient);
sm->setMessageSubject(subject);
- sm->setMessageHeader(QStringLiteral("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(QString(recipient)));
+ sm->setMessageHeader(QStringLiteral("From: %1\r\nTo: %2\r\n").arg(fromaddr, recipient));
sm->setMessageBody(text);
sm->sendMessage();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kshortcutseditordelegate.cpp new/kxmlgui-5.28.0/src/kshortcutseditordelegate.cpp
--- old/kxmlgui-5.27.0/src/kshortcutseditordelegate.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kshortcutseditordelegate.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -136,7 +136,7 @@
}
// Check if the models wants us to edit the item at index
- if (!index.data(ShowExtensionIndicatorRole).value<bool>()) {
+ if (!index.data(ShowExtensionIndicatorRole).toBool()) {
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/ktoolbar.cpp new/kxmlgui-5.28.0/src/ktoolbar.cpp
--- old/kxmlgui-5.27.0/src/ktoolbar.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/ktoolbar.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -443,7 +443,7 @@
int separatorToShow = -1;
for (int index = 0; index < q->actions().count(); ++index) {
- QAction *action = q->actions()[ index ];
+ QAction *action = q->actions().at(index);
if (action->isSeparator()) {
if (visibleNonSeparator) {
separatorToShow = index;
@@ -455,7 +455,7 @@
if (action->isVisible()) {
visibleNonSeparator = true;
if (separatorToShow != -1) {
- q->actions()[ separatorToShow ]->setVisible(true);
+ q->actions().at(separatorToShow)->setVisible(true);
separatorToShow = -1;
}
}
@@ -463,7 +463,7 @@
}
if (separatorToShow != -1) {
- q->actions()[ separatorToShow ]->setVisible(false);
+ q->actions().at(separatorToShow)->setVisible(false);
}
}
@@ -1133,7 +1133,7 @@
}
}
- if (d->actionsBeingDragged.count()) {
+ if (!d->actionsBeingDragged.isEmpty()) {
QAction *overAction = actionAt(event->pos());
QFrame *dropIndicatorWidget = new QFrame(this);
@@ -1173,7 +1173,7 @@
// Check to see if the indicator is already in the right spot
int dropIndicatorIndex = actions().indexOf(d->dropIndicatorAction);
if (dropIndicatorIndex + 1 < actions().count()) {
- if (actions()[ dropIndicatorIndex + 1 ] == overAction) {
+ if (actions().at(dropIndicatorIndex + 1) == overAction) {
break;
}
} else if (!overAction) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/src/kxmlguifactory_p.cpp new/kxmlgui-5.28.0/src/kxmlguifactory_p.cpp
--- old/kxmlgui-5.27.0/src/kxmlguifactory_p.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/src/kxmlguifactory_p.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -250,7 +250,7 @@
void ContainerNode::unplugActionList(BuildState &state, const MergingIndexList::iterator &mergingIdxIt)
{
- static const QString &tagActionList = QLatin1String("actionlist");
+ static const QString &tagActionList = QStringLiteral("actionlist");
MergingIndex mergingIdx = *mergingIdxIt;
@@ -615,7 +615,7 @@
{
QString stateName = element.attribute(QStringLiteral("name"));
- if (stateName.isNull() || !stateName.length()) {
+ if (stateName.isEmpty()) {
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.27.0/tests/kwindowtest.cpp new/kxmlgui-5.28.0/tests/kwindowtest.cpp
--- old/kxmlgui-5.27.0/tests/kwindowtest.cpp 2016-10-02 12:02:24.000000000 +0200
+++ new/kxmlgui-5.28.0/tests/kwindowtest.cpp 2016-11-05 16:00:35.000000000 +0100
@@ -320,7 +320,7 @@
exitB = false;
} else {
if (tb->actions().count() >= 7) {
- tb->insertAction(tb->actions()[6], exitAction);
+ tb->insertAction(tb->actions().at(6), exitAction);
} else {
tb->addAction(exitAction);
}