Hello community,
here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2015-11-24 22:28:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old)
and /work/SRC/openSUSE:Factory/.kiconthemes.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2015-10-19 22:25:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiconthemes.new/kiconthemes.changes 2015-11-24 22:28:43.000000000 +0100
@@ -1,0 +2,16 @@
+Fri Nov 20 15:14:29 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Added breeze.diff: default to breeze icon theme in order to avoid
+ setup with mixed icons (half oxygen, half breeze)
+
+-------------------------------------------------------------------
+Sun Nov 8 17:01:08 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.16.0 (boo#955067)
+ * kiconthemes now support themes embedded in qt resources inside
+ the :/icons prefix like Qt does itself for QIcon::fromTheme
+ * Add missing required dependencies
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.16.0.php
+
+-------------------------------------------------------------------
Old:
----
kiconthemes-5.15.0.tar.xz
New:
----
breeze.diff
kiconthemes-5.16.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiconthemes.spec ++++++
--- /var/tmp/diff_new_pack.HxqNih/_old 2015-11-24 22:28:44.000000000 +0100
+++ /var/tmp/diff_new_pack.HxqNih/_new 2015-11-24 22:28:44.000000000 +0100
@@ -18,15 +18,16 @@
%bcond_without lang
%define lname libKF5IconThemes5
-%define _tar_path 5.15
+%define _tar_path 5.16
Name: kiconthemes
-Version: 5.15.0
+Version: 5.16.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: fdupes
BuildRequires: kconfigwidgets-devel >= %{_tar_path}
+BuildRequires: kcoreaddons-devel >= %{_tar_path}
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel >= %{_tar_path}
BuildRequires: kitemviews-devel >= %{_tar_path}
@@ -42,6 +43,8 @@
Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
+# PATCH-FIX-OPENSUSE breeze.diff -- default to breeze icon theme in order to avoid setup with mixed icons (half oxygen, half breeze)
+Patch0: breeze.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -71,6 +74,7 @@
%lang_package -n %lname
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kf5 -d build
++++++ breeze.diff ++++++
diff --git a/src/kicontheme.cpp b/src/kicontheme.cpp
index 3d6d6b7..fc087e8 100644
--- a/src/kicontheme.cpp
+++ b/src/kicontheme.cpp
@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
// static
QString KIconTheme::defaultThemeName()
{
- return QStringLiteral("oxygen");
+ return QStringLiteral("breeze");
}
void KIconTheme::assignIconsToContextMenu(ContextMenus type,
++++++ kiconthemes-5.15.0.tar.xz -> kiconthemes-5.16.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/CMakeLists.txt new/kiconthemes-5.16.0/CMakeLists.txt
--- old/kiconthemes-5.15.0/CMakeLists.txt 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/CMakeLists.txt 2015-11-08 13:25:07.000000000 +0100
@@ -4,7 +4,7 @@
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.15.0 NO_MODULE)
+find_package(ECM 5.16.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)
@@ -19,8 +19,8 @@
include(ECMGenerateHeaders)
include(ECMMarkNonGuiExecutable)
-set(KF5_VERSION "5.15.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.15.0") # handled by release scripts
+set(KF5_VERSION "5.16.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.16.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX KICONTHEMES
@@ -35,6 +35,7 @@
find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
+find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/autotests/CMakeLists.txt new/kiconthemes-5.16.0/autotests/CMakeLists.txt
--- old/kiconthemes-5.15.0/autotests/CMakeLists.txt 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/autotests/CMakeLists.txt 2015-11-08 13:25:07.000000000 +0100
@@ -13,4 +13,5 @@
kiconthemes_tests(
kiconloader_unittest
+ kiconloader_resourcethemetest
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/autotests/kiconloader_resourcethemetest.cpp new/kiconthemes-5.16.0/autotests/kiconloader_resourcethemetest.cpp
--- old/kiconthemes-5.15.0/autotests/kiconloader_resourcethemetest.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/kiconthemes-5.16.0/autotests/kiconloader_resourcethemetest.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -0,0 +1,58 @@
+/* This file is part of the KDE libraries
+ Copyright 2015 Christoph Cullmann
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include
+
+#include <QStandardPaths>
+#include <QPixmap>
+#include <QTest>
+
+#include <KSharedConfig>
+#include <KConfigGroup>
+
+class KIconLoader_ResourceThemeTest : public QObject
+{
+ Q_OBJECT
+
+private Q_SLOTS:
+ void initTestCase()
+ {
+ QStandardPaths::setTestModeEnabled(true);
+
+ // set our test theme only present in :/icons
+ KConfigGroup cg(KSharedConfig::openConfig(), "Icons");
+ cg.writeEntry("Theme", "themeinresource");
+ cg.sync();
+ }
+
+ void testThemeFound()
+ {
+ // try to load icon that can only be found in resource theme and check we found it in the resource
+ QString path;
+ KIconLoader::global()->loadIcon(QStringLiteral("someiconintheme"), KIconLoader::Desktop, 22,
+ KIconLoader::DefaultState, QStringList(),
+ &path);
+ QCOMPARE(path, QString(":/icons/themeinresource/22x22/appsNoContext/someiconintheme.png"));
+
+ }
+};
+
+QTEST_MAIN(KIconLoader_ResourceThemeTest)
+
+#include "kiconloader_resourcethemetest.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/autotests/kiconloader_unittest.cpp new/kiconthemes-5.16.0/autotests/kiconloader_unittest.cpp
--- old/kiconthemes-5.15.0/autotests/kiconloader_unittest.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/autotests/kiconloader_unittest.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -43,7 +43,7 @@
{
QStandardPaths::setTestModeEnabled(true);
- const QStringList genericIconsFiles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "mime/generic-icons");
+ const QStringList genericIconsFiles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("mime/generic-icons"));
QVERIFY(!genericIconsFiles.isEmpty()); // KIconLoader relies on fallbacks to generic icons (e.g. x-office-document), which comes from a shared-mime-info file. Make sure it's installed!
KConfigGroup cg(KSharedConfig::openConfig(), "Icons");
@@ -168,33 +168,33 @@
KIconLoader iconLoader;
// We expect a warning here... This doesn't work though, due to the extended debug
//QTest::ignoreMessage(QtWarningMsg, "KIconLoader::loadIcon: No such icon \"this-icon-does-not-exist\"");
- QPixmap pix = iconLoader.loadIcon("this-icon-does-not-exist", KIconLoader::Desktop, 16);
+ QPixmap pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist"), KIconLoader::Desktop, 16);
QVERIFY(!pix.isNull());
QCOMPARE(pix.size(), QSize(16, 16));
// Try it again, to see if the cache interfers
- pix = iconLoader.loadIcon("this-icon-does-not-exist", KIconLoader::Desktop, 16);
+ pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist"), KIconLoader::Desktop, 16);
QVERIFY(!pix.isNull());
QCOMPARE(pix.size(), QSize(16, 16));
// And now set canReturnNull to true
- pix = iconLoader.loadIcon("this-icon-does-not-exist", KIconLoader::Desktop, 16, KIconLoader::DefaultState,
+ pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist"), KIconLoader::Desktop, 16, KIconLoader::DefaultState,
QStringList(), 0, true);
QVERIFY(pix.isNull());
// Try getting the "unknown" icon again, to see if the above call didn't put a null icon into the cache...
- pix = iconLoader.loadIcon("this-icon-does-not-exist", KIconLoader::Desktop, 16);
+ pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist"), KIconLoader::Desktop, 16);
QVERIFY(!pix.isNull());
QCOMPARE(pix.size(), QSize(16, 16));
// Another one, to clear "last" cache
- pix = iconLoader.loadIcon("this-icon-does-not-exist-either", KIconLoader::Desktop, 16);
+ pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist-either"), KIconLoader::Desktop, 16);
QVERIFY(!pix.isNull());
QCOMPARE(pix.size(), QSize(16, 16));
// Now load the initial one again - do we get the warning again?
- pix = iconLoader.loadIcon("this-icon-does-not-exist", KIconLoader::Desktop, 16);
+ pix = iconLoader.loadIcon(QStringLiteral("this-icon-does-not-exist"), KIconLoader::Desktop, 16);
QVERIFY(!pix.isNull());
QCOMPARE(pix.size(), QSize(16, 16));
- pix = iconLoader.loadIcon("#crazyname", KIconLoader::NoGroup, 1600);
+ pix = iconLoader.loadIcon(QStringLiteral("#crazyname"), KIconLoader::NoGroup, 1600);
QVERIFY(!pix.isNull());
QCOMPARE(pix.size(), QSize(1600, 1600));
}
@@ -202,19 +202,19 @@
void testAppPicsDir()
{
KIconLoader appIconLoader(appName);
- QString iconPath = appIconLoader.iconPath("image1", KIconLoader::User);
+ QString iconPath = appIconLoader.iconPath(QStringLiteral("image1"), KIconLoader::User);
QCOMPARE(iconPath, appDataDir.filePath("pics/image1.png"));
QVERIFY(QFile::exists(iconPath));
// Load it again, to use the "last loaded" cache
- QString iconPath2 = appIconLoader.iconPath("image1", KIconLoader::User);
+ QString iconPath2 = appIconLoader.iconPath(QStringLiteral("image1"), KIconLoader::User);
QCOMPARE(iconPath, iconPath2);
// Load something else, to clear the "last loaded" cache
- QString iconPathTextEdit = appIconLoader.iconPath("image2", KIconLoader::User);
+ QString iconPathTextEdit = appIconLoader.iconPath(QStringLiteral("image2"), KIconLoader::User);
QCOMPARE(iconPathTextEdit, appDataDir.filePath("pics/image2.png"));
QVERIFY(QFile::exists(iconPathTextEdit));
// Now load kdialog again, to use the real kiconcache
- iconPath2 = appIconLoader.iconPath("image1", KIconLoader::User);
+ iconPath2 = appIconLoader.iconPath(QStringLiteral("image1"), KIconLoader::User);
QCOMPARE(iconPath, iconPath2);
}
@@ -224,7 +224,7 @@
// QIcon::pixmap returns an unknown icon if it can't find the real icon...
KIconLoader appIconLoader(appName);
// Now using KDE::icon. Separate test so that KIconLoader isn't fully inited.
- QIcon icon = KDE::icon("image1", &appIconLoader);
+ QIcon icon = KDE::icon(QStringLiteral("image1"), &appIconLoader);
{
QPixmap pix = icon.pixmap(QSize(22, 22));
QVERIFY(!pix.isNull());
@@ -300,10 +300,10 @@
void testIconPath()
{
// Test iconPath with non-existing icon
- const QString path = KIconLoader::global()->iconPath("nope-no-such-icon", KIconLoader::Desktop, true /*canReturnNull*/);
+ const QString path = KIconLoader::global()->iconPath(QStringLiteral("nope-no-such-icon"), KIconLoader::Desktop, true /*canReturnNull*/);
QVERIFY2(path.isEmpty(), qPrintable(path));
- const QString unknownPath = KIconLoader::global()->iconPath("nope-no-such-icon", KIconLoader::Desktop, false);
+ const QString unknownPath = KIconLoader::global()->iconPath(QStringLiteral("nope-no-such-icon"), KIconLoader::Desktop, false);
QVERIFY(!unknownPath.isEmpty());
QVERIFY(QFile::exists(unknownPath));
}
@@ -311,7 +311,7 @@
void testPathStore()
{
QString path;
- QPixmap pix = KIconLoader::global()->loadIcon("kde", KIconLoader::Desktop, 0,
+ QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("kde"), KIconLoader::Desktop, 0,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
@@ -320,11 +320,11 @@
QCOMPARE(pix.size(), QSize(32, 32));
// Compare with iconPath()
- QString path2 = KIconLoader::global()->iconPath("kde", KIconLoader::Desktop);
+ QString path2 = KIconLoader::global()->iconPath(QStringLiteral("kde"), KIconLoader::Desktop);
QCOMPARE(path2, path);
// Now specify a size
- pix = KIconLoader::global()->loadIcon("kde", KIconLoader::Desktop, 24,
+ pix = KIconLoader::global()->loadIcon(QStringLiteral("kde"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
@@ -335,13 +335,13 @@
QVERIFY(KIconLoader::global()->hasIcon("kde"));
path = QString();
- KIconLoader::global()->loadIcon("does_not_exist", KIconLoader::Desktop, 24,
+ KIconLoader::global()->loadIcon(QStringLiteral("does_not_exist"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path, true /* canReturnNull */);
QVERIFY2(path.isEmpty(), qPrintable(path));
- path = "some filler to check loadIcon() clears the variable";
- KIconLoader::global()->loadIcon("does_not_exist", KIconLoader::Desktop, 24,
+ path = QStringLiteral("some filler to check loadIcon() clears the variable");
+ KIconLoader::global()->loadIcon(QStringLiteral("does_not_exist"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path, true /* canReturnNull */);
QVERIFY2(path.isEmpty(), qPrintable(path));
@@ -349,15 +349,15 @@
//Test that addAppDir doesn't break loading of icons from the old known paths
KIconLoader loader;
//only addAppDir
- loader.addAppDir("kiconloader_unittest");
+ loader.addAppDir(QStringLiteral("kiconloader_unittest"));
path = QString();
- loader.loadIcon("kde", KIconLoader::Desktop, 24,
+ loader.loadIcon(QStringLiteral("kde"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
path = QString();
- loader.loadIcon("image1", KIconLoader::Desktop, 24,
+ loader.loadIcon(QStringLiteral("image1"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
@@ -365,12 +365,12 @@
//only reconfigure
KIconLoader loader2;
path = QString();
- loader2.reconfigure("kiconloader_unittest");
- loader2.loadIcon("kde", KIconLoader::Desktop, 24,
+ loader2.reconfigure(QStringLiteral("kiconloader_unittest"));
+ loader2.loadIcon(QStringLiteral("kde"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
- loader2.loadIcon("image1", KIconLoader::Desktop, 24,
+ loader2.loadIcon(QStringLiteral("image1"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
@@ -378,15 +378,15 @@
//both addAppDir and reconfigure
KIconLoader loader3;
path = QString();
- loader3.addAppDir("kiconloader_unittest");
- loader3.reconfigure("kiconloader_unittest");
- loader3.loadIcon("kde", KIconLoader::Desktop, 24,
+ loader3.addAppDir(QStringLiteral("kiconloader_unittest"));
+ loader3.reconfigure(QStringLiteral("kiconloader_unittest"));
+ loader3.loadIcon(QStringLiteral("kde"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
path = QString();
- loader3.loadIcon("image1", KIconLoader::Desktop, 24,
+ loader3.loadIcon(QStringLiteral("image1"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(!path.isEmpty());
@@ -395,21 +395,21 @@
void testPathsNoContextType() {
{
QString path;
- KIconLoader::global()->loadIcon("iconindirectorywithoutcontext", KIconLoader::Desktop, 24,
+ KIconLoader::global()->loadIcon(QStringLiteral("iconindirectorywithoutcontext"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(path.endsWith("appsNoContext/iconindirectorywithoutcontext.png"));
}
{
QString path;
- KIconLoader::global()->loadIcon("iconindirectorywithouttype", KIconLoader::Desktop, 24,
+ KIconLoader::global()->loadIcon(QStringLiteral("iconindirectorywithouttype"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(path.endsWith("appsNoType/iconindirectorywithouttype.png"));
}
{
QString path;
- KIconLoader::global()->loadIcon("iconindirectorywithoutcontextortype", KIconLoader::Desktop, 24,
+ KIconLoader::global()->loadIcon(QStringLiteral("iconindirectorywithoutcontextortype"), KIconLoader::Desktop, 24,
KIconLoader::DefaultState, QStringList(),
&path);
QVERIFY(path.endsWith("appsNoContextOrType/iconindirectorywithoutcontextortype.png"));
@@ -418,13 +418,13 @@
void testLoadIconNoGroupOrSize() // #246016
{
- QPixmap pix = KIconLoader::global()->loadIcon("connected", KIconLoader::NoGroup);
+ QPixmap pix = KIconLoader::global()->loadIcon(QStringLiteral("connected"), KIconLoader::NoGroup);
QVERIFY(!pix.isNull());
}
void testLoadPixmapSequence()
{
- KPixmapSequence seq = KIconLoader::global()->loadPixmapSequence("process-working", 22);
+ KPixmapSequence seq = KIconLoader::global()->loadPixmapSequence(QStringLiteral("process-working"), 22);
QVERIFY(seq.isValid());
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/autotests/resources.qrc new/kiconthemes-5.16.0/autotests/resources.qrc
--- old/kiconthemes-5.15.0/autotests/resources.qrc 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/autotests/resources.qrc 2015-11-08 13:25:07.000000000 +0100
@@ -6,5 +6,7 @@
<file>anim-22x22.png</file>
<file>oxygen.theme</file>
<file>breeze.theme</file>
+ <file alias="/icons/themeinresource/index.theme">breeze.theme</file>
+ <file alias="/icons/themeinresource/22x22/appsNoContext/someiconintheme.png">test-22x22.png</file>
</qresource>
</RCC>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/po/ca@valencia/kiconthemes5.po new/kiconthemes-5.16.0/po/ca@valencia/kiconthemes5.po
--- old/kiconthemes-5.15.0/po/ca@valencia/kiconthemes5.po 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/po/ca@valencia/kiconthemes5.po 2015-11-08 13:25:07.000000000 +0100
@@ -1,5 +1,5 @@
-# Translation of kiconthemes5.po to Catalan
-# Copyright (C) 1998-2014 This_file_is_part_of_KDE
+# Translation of kiconthemes5.po to Catalan (Valencian)
+# Copyright (C) 2014 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
@@ -7,26 +7,26 @@
# Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
# Albert Astals Cid , 2007.
# Robert Millan , 2009.
-# Antoni Bella Pérez , 2011, 2013.
+# Antoni Bella Pérez , 2011, 2013, 2014.
msgid ""
msgstr ""
"Project-Id-Version: kiconthemes5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2015-03-15 08:31+0000\n"
-"PO-Revision-Date: 2014-01-18 09:26+0100\n"
-"Last-Translator: Josep Ma. Ferrer \n"
+"PO-Revision-Date: 2014-06-25 17:59+0200\n"
+"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
#: kicondialog.cpp:260 kicondialog.cpp:272 kicondialog.cpp:608
msgid "Select Icon"
-msgstr "Trieu icona"
+msgstr "Trieu una icona"
#: kicondialog.cpp:289
msgid "Icon Source"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/po/gd/kiconthemes5.po new/kiconthemes-5.16.0/po/gd/kiconthemes5.po
--- old/kiconthemes-5.15.0/po/gd/kiconthemes5.po 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/po/gd/kiconthemes5.po 2015-11-08 13:25:07.000000000 +0100
@@ -4,11 +4,11 @@
# GunChleoc , 2014.
msgid ""
msgstr ""
-"Project-Id-Version: kiconthemes5\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2015-03-15 08:31+0000\n"
-"PO-Revision-Date: 2014-12-09 12:25+0100\n"
-"Last-Translator: GunChleoc \n"
+"PO-Revision-Date: 2015-11-04 15:14+0000\n"
+"Last-Translator: Michael Bauer \n"
"Language-Team: Fòram na Gàidhlig\n"
"Language: gd\n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
"(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.8.4\n"
"X-Project-Style: kde\n"
#: kicondialog.cpp:260 kicondialog.cpp:272 kicondialog.cpp:608
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/src/CMakeLists.txt new/kiconthemes-5.16.0/src/CMakeLists.txt
--- old/kiconthemes-5.15.0/src/CMakeLists.txt 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/src/CMakeLists.txt 2015-11-08 13:25:07.000000000 +0100
@@ -29,6 +29,7 @@
KF5::WidgetsAddons # for KPixmapSequence family
KF5::ItemViews # for KListWidgetSearchLine
KF5::ConfigWidgets # for KColorScheme
+ KF5::CoreAddons # for kshareddatacache.h
)
set_target_properties(KF5IconThemes PROPERTIES VERSION ${KICONTHEMES_VERSION_STRING}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/src/kicondialog.cpp new/kiconthemes-5.16.0/src/kicondialog.cpp
--- old/kiconthemes-5.15.0/src/kicondialog.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/src/kicondialog.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -94,8 +94,8 @@
setMovement(Static);
setIconSize(QSize(60, 60));
connect(m_timer, SIGNAL(timeout()), this, SLOT(loadFiles()));
- connect(this, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
- this, SLOT(currentListItemChanged(QListWidgetItem*)));
+ connect(this, &QListWidget::currentItemChanged,
+ this, &KIconCanvas::currentListItemChanged);
setGridSize(QSize(100, 80));
setItemDelegate(m_delegate);
@@ -154,7 +154,7 @@
QString path = *it;
QString ext = path.right(3).toUpper();
- if (ext != "SVG" && ext != "VGZ") {
+ if (ext != QLatin1String("SVG") && ext != QLatin1String("VGZ")) {
img.load(*it);
} else {
#ifndef _WIN32_WCE
@@ -350,7 +350,7 @@
connect(mpCanvas, SIGNAL(finished()), q, SLOT(_k_slotFinished()));
// When pressing Ok or Cancel, stop loading icons
- connect(q, SIGNAL(finished(int)), mpCanvas, SLOT(stopLoading()));
+ connect(q, &QDialog::finished, mpCanvas, &KIconCanvas::stopLoading);
static const char *const context_text[] = {
I18N_NOOP("Actions"),
@@ -397,8 +397,8 @@
QDialogButtonBox *buttonBox = new QDialogButtonBox(q);
buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
- connect(buttonBox, SIGNAL(accepted()), q, SLOT(slotOk()));
- connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject()));
+ connect(buttonBox, &QDialogButtonBox::accepted, q, &KIconDialog::slotOk);
+ connect(buttonBox, &QDialogButtonBox::rejected, q, &QDialog::reject);
top->addWidget(buttonBox);
// Make the dialog a little taller
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/src/kiconeffect.cpp new/kiconthemes-5.16.0/src/kiconeffect.cpp
--- old/kiconthemes-5.15.0/src/kiconeffect.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/src/kiconeffect.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -67,25 +67,25 @@
//FIXME: this really should be using KIconLoader::metaObject() to guarantee synchronization
// performance wise it's also practically guaranteed to be faster
QStringList groups;
- groups += "Desktop";
- groups += "Toolbar";
- groups += "MainToolbar";
- groups += "Small";
- groups += "Panel";
- groups += "Dialog";
+ groups += QStringLiteral("Desktop");
+ groups += QStringLiteral("Toolbar");
+ groups += QStringLiteral("MainToolbar");
+ groups += QStringLiteral("Small");
+ groups += QStringLiteral("Panel");
+ groups += QStringLiteral("Dialog");
QStringList states;
- states += "Default";
- states += "Active";
- states += "Disabled";
+ states += QStringLiteral("Default");
+ states += QStringLiteral("Active");
+ states += QStringLiteral("Disabled");
QStringList::ConstIterator it, it2;
- QString _togray("togray");
- QString _colorize("colorize");
- QString _desaturate("desaturate");
- QString _togamma("togamma");
- QString _none("none");
- QString _tomonochrome("tomonochrome");
+ QString _togray(QStringLiteral("togray"));
+ QString _colorize(QStringLiteral("colorize"));
+ QString _desaturate(QStringLiteral("desaturate"));
+ QString _togamma(QStringLiteral("togamma"));
+ QString _none(QStringLiteral("none"));
+ QString _tomonochrome(QStringLiteral("tomonochrome"));
for (it = groups.constBegin(), i = 0; it != groups.constEnd(); ++it, ++i) {
// Default effects
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/src/kiconengine.cpp new/kiconthemes-5.16.0/src/kiconengine.cpp
--- old/kiconthemes-5.15.0/src/kiconengine.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/src/kiconengine.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -132,7 +132,7 @@
QString KIconEngine::key() const
{
- return QString::fromLatin1("KIconEngine");
+ return QStringLiteral("KIconEngine");
}
QIconEngine *KIconEngine::clone() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/src/kiconloader.cpp new/kiconthemes-5.16.0/src/kiconloader.cpp
--- old/kiconthemes-5.15.0/src/kiconloader.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/src/kiconloader.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -317,19 +317,19 @@
public:
KIconLoaderGlobalData()
{
- const QStringList genericIconsFiles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "mime/generic-icons");
+ const QStringList genericIconsFiles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("mime/generic-icons"));
//qCDebug(KICONTHEMES) << genericIconsFiles;
Q_FOREACH (const QString &file, genericIconsFiles) {
parseGenericIconsFiles(file);
}
- QDBusConnection::sessionBus().connect(QString(), "/KIconLoader", "org.kde.KIconLoader",
- "iconChanged", this, SIGNAL(iconChanged(int)));
+ QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"),
+ QStringLiteral("iconChanged"), this, SIGNAL(iconChanged(int)));
}
void emitChange(KIconLoader::Group group)
{
- QDBusMessage message = QDBusMessage::createSignal("/KIconLoader", "org.kde.KIconLoader", "iconChanged");
+ QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged"));
message.setArguments(QList<QVariant>() << int(group));
QDBusConnection::sessionBus().send(message);
}
@@ -490,7 +490,7 @@
}
// Initialize icon cache
- mIconCache = new KSharedDataCache("icon-cache", 10 * 1024 * 1024);
+ mIconCache = new KSharedDataCache(QStringLiteral("icon-cache"), 10 * 1024 * 1024);
// Cost here is number of pixels, not size. So this is actually a bit
// smaller.
mPixmapCache.setMaxCost(10 * 1024 * 1024);
@@ -548,9 +548,9 @@
searchPaths.append(appname + "/pics");
// Add legacy icon dirs.
- searchPaths.append("icons"); // was xdgdata-icon in KStandardDirs
+ searchPaths.append(QStringLiteral("icons")); // was xdgdata-icon in KStandardDirs
// These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
- searchPaths.append("pixmaps"); // was xdgdata-pixmaps in KStandardDirs
+ searchPaths.append(QStringLiteral("pixmaps")); // was xdgdata-pixmaps in KStandardDirs
return true;
}
@@ -577,7 +577,7 @@
{
initIconThemes();
- KIconTheme *def = new KIconTheme("hicolor", appname, themeBaseDir);
+ KIconTheme *def = new KIconTheme(QStringLiteral("hicolor"), appname, themeBaseDir);
if (!def->isValid()) {
delete def;
def = new KIconTheme(KIconTheme::defaultThemeName(), appname, themeBaseDir);
@@ -612,7 +612,7 @@
addInheritedThemes(node, appname);
addThemeByName(KIconTheme::defaultThemeName(), appname);
- addThemeByName("hicolor", appname);
+ addThemeByName(QStringLiteral("hicolor"), appname);
}
void KIconLoaderPrivate::addInheritedThemes(KIconThemeNode *node, const QString &appname)
@@ -620,7 +620,7 @@
const QStringList lst = node->theme->inherits();
for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) {
- if ((*it) == "hicolor") {
+ if ((*it) == QLatin1String("hicolor")) {
// The icon theme spec says that "hicolor" must be the very last
// of all inherited themes, so don't add it here but at the very end
// of addBaseThemes().
@@ -655,7 +655,7 @@
initIconThemes();
QStringList list;
- const QStringList icnlibs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory);
+ const QStringList icnlibs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
QStringList::ConstIterator it;
char buf[1000];
for (it = icnlibs.begin(); it != icnlibs.end(); ++it) {
@@ -663,7 +663,7 @@
if (!dir.exists()) {
continue;
}
- const QStringList lst = dir.entryList(QStringList("default.*"), QDir::Dirs);
+ const QStringList lst = dir.entryList(QStringList(QStringLiteral("default.*")), QDir::Dirs);
QStringList::ConstIterator it2;
for (it2 = lst.begin(); it2 != lst.end(); ++it2) {
if (!QFile::exists(*it + *it2 + "/index.desktop")
@@ -692,7 +692,7 @@
|| *it == QLatin1String("default.kde4")) {
continue;
}
- addThemeByName(*it, "");
+ addThemeByName(*it, QLatin1String(""));
}
extraDesktopIconsLoaded = true;
@@ -762,7 +762,7 @@
% QLatin1Char('_')
% QString::number(size)
% QLatin1Char('_')
- % overlays.join("_")
+ % overlays.join(QStringLiteral("_"))
% (group >= 0 ? mpEffect.fingerprint(group, state)
: *NULL_EFFECT_FINGERPRINT());
}
@@ -915,7 +915,7 @@
}
}
- if (!path.isEmpty() && path.contains("/apps/")) {
+ if (!path.isEmpty() && path.contains(QStringLiteral("/apps/"))) {
return path;
}
}
@@ -954,9 +954,9 @@
} else {
// From update-mime-database.c
static const QSet<QString> mediaTypes = QSet<QString>()
- << "text" << "application" << "image" << "audio"
- << "inode" << "video" << "message" << "model" << "multipart"
- << "x-content" << "x-epoc";
+ << QStringLiteral("text") << QStringLiteral("application") << QStringLiteral("image") << QStringLiteral("audio")
+ << QStringLiteral("inode") << QStringLiteral("video") << QStringLiteral("message") << QStringLiteral("model") << QStringLiteral("multipart")
+ << QStringLiteral("x-content") << QStringLiteral("x-epoc");
// Shared-mime-info spec says:
// "If [generic-icon] is not specified then the mimetype is used to generate the
// generic icon by using the top-level media type (e.g. "video" in "video/ogg")
@@ -975,7 +975,7 @@
inline QString KIconLoaderPrivate::unknownIconPath(int size) const
{
- QString path = findMatchingIcon(QLatin1String("unknown"), size);
+ QString path = findMatchingIcon(QStringLiteral("unknown"), size);
if (path.isEmpty()) {
qCDebug(KICONTHEMES) << "Warning: could not find \"unknown\" icon for size" << size;
return QString();
@@ -1085,7 +1085,7 @@
const QPixmap pixmap = loadIcon(iconName, group, size, state, overlays, path_store, true);
if (pixmap.isNull()) {
// Icon not found, fallback to application/octet-stream
- return loadIcon("application-octet-stream", group, size, state, overlays, path_store, false);
+ return loadIcon(QStringLiteral("application-octet-stream"), group, size, state, overlays, path_store, false);
}
return pixmap;
}
@@ -1160,7 +1160,7 @@
if (absolutePath && !favIconOverlay) {
path = name;
} else {
- path = d->findMatchingIconWithGenericFallbacks(favIconOverlay ? QString("text-html") : name, size);
+ path = d->findMatchingIconWithGenericFallbacks(favIconOverlay ? QStringLiteral("text-html") : name, size);
}
}
@@ -1334,7 +1334,7 @@
}
foreach (const QString &entry, dir.entryList()) {
- if (!(entry.left(4)).toUInt()) {
+ if (!(entry.leftRef(4)).toUInt()) {
continue;
}
@@ -1369,7 +1369,7 @@
QStringList KIconLoader::queryIconsByDir(const QString &iconsDir) const
{
const QDir dir(iconsDir);
- const QStringList formats = QStringList() << "*.png" << "*.xpm" << "*.svg" << "*.svgz";
+ const QStringList formats = QStringList() << QStringLiteral("*.png") << QStringLiteral("*.xpm") << QStringLiteral("*.svg") << QStringLiteral("*.svgz");
const QStringList lst = dir.entryList(formats, QDir::Files);
QStringList result;
QStringList::ConstIterator it;
@@ -1594,17 +1594,17 @@
QPixmap KIconLoader::unknown()
{
QPixmap pix;
- if (QPixmapCache::find("unknown", pix)) { //krazy:exclude=iconnames
+ if (QPixmapCache::find(QStringLiteral("unknown"), pix)) { //krazy:exclude=iconnames
return pix;
}
- QString path = global()->iconPath("unknown", KIconLoader::Small, true); //krazy:exclude=iconnames
+ QString path = global()->iconPath(QStringLiteral("unknown"), KIconLoader::Small, true); //krazy:exclude=iconnames
if (path.isEmpty()) {
qCDebug(KICONTHEMES) << "Warning: Cannot find \"unknown\" icon.";
pix = QPixmap(32, 32);
} else {
pix.load(path);
- QPixmapCache::insert("unknown", pix); //krazy:exclude=iconnames
+ QPixmapCache::insert(QStringLiteral("unknown"), pix); //krazy:exclude=iconnames
}
return pix;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/src/kicontheme.cpp new/kiconthemes-5.16.0/src/kicontheme.cpp
--- old/kiconthemes-5.15.0/src/kicontheme.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/src/kicontheme.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -141,11 +141,18 @@
themeDirs += basePathHint + '/' + name + '/';
}
}
- // Find the theme description file. These are always global.
- QStringList icnlibs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory);
+ // Find the theme description file. These are either locally in the :/icons resource path or global.
+ QStringList icnlibs;
+
+ // local embedded icons have preference
+ icnlibs << QStringLiteral(":/icons");
+
+ // global icons
+ icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
+
// These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
- icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "pixmaps", QStandardPaths::LocateDirectory);
+ icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("pixmaps"), QStandardPaths::LocateDirectory);
QString fileName, mainSection;
for (QStringList::ConstIterator it = icnlibs.constBegin(); it != icnlibs.constEnd(); ++it) {
@@ -156,11 +163,11 @@
if (QFile::exists(cDir + "index.theme")) {
d->mDir = cDir;
fileName = d->mDir + "index.theme";
- mainSection = "Icon Theme";
+ mainSection = QStringLiteral("Icon Theme");
} else if (QFile::exists(cDir + "index.desktop")) {
d->mDir = cDir;
fileName = d->mDir + "index.desktop";
- mainSection = "KDE Icon Theme";
+ mainSection = QStringLiteral("KDE Icon Theme");
}
}
}
@@ -210,12 +217,12 @@
}
QStringList groups;
- groups += "Desktop";
- groups += "Toolbar";
- groups += "MainToolbar";
- groups += "Small";
- groups += "Panel";
- groups += "Dialog";
+ groups += QStringLiteral("Desktop");
+ groups += QStringLiteral("Toolbar");
+ groups += QStringLiteral("MainToolbar");
+ groups += QStringLiteral("Small");
+ groups += QStringLiteral("Panel");
+ groups += QStringLiteral("Dialog");
const int defDefSizes[] = { 32, 22, 22, 16, 32, 32 };
KConfigGroup cg(d->sharedConfig, mainSection);
for (int i = 0; i < groups.size(); ++i) {
@@ -503,9 +510,17 @@
return *_theme_list();
}
- QStringList icnlibs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory);
+ // Find the theme description file. These are either locally in the :/icons resource path or global.
+ QStringList icnlibs;
+
+ // local embedded icons have preference
+ icnlibs << QStringLiteral(":/icons");
+
+ // global icons
+ icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
+
// These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
- icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "pixmaps", QStandardPaths::LocateDirectory);
+ icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("pixmaps"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &it, icnlibs) {
QDir dir(it);
@@ -542,7 +557,7 @@
// static
QString KIconTheme::defaultThemeName()
{
- return QLatin1String("oxygen");
+ return QStringLiteral("oxygen");
}
void KIconTheme::assignIconsToContextMenu(ContextMenus type,
@@ -559,14 +574,14 @@
return;
}
- actions[UndoAct]->setIcon(QIcon::fromTheme("edit-undo"));
- actions[RedoAct]->setIcon(QIcon::fromTheme("edit-redo"));
- actions[CutAct]->setIcon(QIcon::fromTheme("edit-cut"));
- actions[CopyAct]->setIcon(QIcon::fromTheme("edit-copy"));
- actions[PasteAct]->setIcon(QIcon::fromTheme("edit-paste"));
- actions[ClearAct]->setIcon(QIcon::fromTheme("edit-clear"));
- actions[DeleteAct]->setIcon(QIcon::fromTheme("edit-delete"));
- actions[SelectAllAct]->setIcon(QIcon::fromTheme("edit-select-all"));
+ actions[UndoAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")));
+ actions[RedoAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-redo")));
+ actions[CutAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-cut")));
+ actions[CopyAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
+ actions[PasteAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste")));
+ actions[ClearAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear")));
+ actions[DeleteAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")));
+ actions[SelectAllAct]->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-all")));
break;
case ReadOnlyText:
@@ -574,7 +589,7 @@
return;
}
- actions[0]->setIcon(QIcon::fromTheme("edit-copy"));
+ actions[0]->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
break;
}
}
@@ -665,7 +680,7 @@
{
const QDir icondir = dir();
- const QStringList formats = QStringList() << "*.png" << "*.svg" << "*.svgz" << "*.xpm";
+ const QStringList formats = QStringList() << QStringLiteral("*.png") << QStringLiteral("*.svg") << QStringLiteral("*.svgz") << QStringLiteral("*.xpm");
const QStringList lst = icondir.entryList(formats, QDir::Files);
QStringList result;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/src/tools/kiconfinder/kiconfinder.cpp new/kiconthemes-5.16.0/src/tools/kiconfinder/kiconfinder.cpp
--- old/kiconthemes-5.15.0/src/tools/kiconfinder/kiconfinder.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/src/tools/kiconfinder/kiconfinder.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -26,11 +26,11 @@
int main(int argc, char *argv[])
{
QGuiApplication app(argc, argv);
- app.setApplicationName("kiconfinder");
+ app.setApplicationName(QStringLiteral("kiconfinder"));
app.setApplicationVersion(KICONTHEMES_VERSION_STRING);
QCommandLineParser parser;
parser.setApplicationDescription(app.translate("main", "Finds an icon based on its name"));
- parser.addPositionalArgument("iconname", app.translate("main", "The icon name to look for"));
+ parser.addPositionalArgument(QStringLiteral("iconname"), app.translate("main", "The icon name to look for"));
parser.addHelpOption();
parser.process(app);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.15.0/tests/kiconeffecttest.cpp new/kiconthemes-5.16.0/tests/kiconeffecttest.cpp
--- old/kiconthemes-5.15.0/tests/kiconeffecttest.cpp 2015-10-05 10:08:51.000000000 +0200
+++ new/kiconthemes-5.16.0/tests/kiconeffecttest.cpp 2015-11-08 13:25:07.000000000 +0100
@@ -19,7 +19,7 @@
QGridLayout *layout = new QGridLayout(frame);
layout->setColumnStretch(1, 1);
- img = QImage(KIconLoader::global()->iconPath("application-x-cd-image", -128));
+ img = QImage(KIconLoader::global()->iconPath(QStringLiteral("application-x-cd-image"), -128));
QImage tmp;
QSlider *slider;
@@ -28,10 +28,10 @@
lbl[0] = new QLabel(frame);
lbl[0]->setPixmap(QPixmap::fromImage(tmp));
layout->addWidget(lbl[0], 0, 0, 3, 1);
- layout->addWidget(new QLabel("Grayscale", frame), 0, 1);
+ layout->addWidget(new QLabel(QStringLiteral("Grayscale"), frame), 0, 1);
slider = new QSlider(Qt::Horizontal, frame);
slider->setRange(0, 100);
- connect(slider, SIGNAL(valueChanged(int)), this, SLOT(slotGray(int)));
+ connect(slider, &QAbstractSlider::valueChanged, this, &KIconEffectTestWidget::slotGray);
layout->addWidget(slider, 1, 1);
tmp = img;
@@ -39,10 +39,10 @@
lbl[1] = new QLabel(frame);
lbl[1]->setPixmap(QPixmap::fromImage(tmp));
layout->addWidget(lbl[1], 4, 0, 3, 1);
- layout->addWidget(new QLabel("Monochrome", frame), 4, 1);
+ layout->addWidget(new QLabel(QStringLiteral("Monochrome"), frame), 4, 1);
slider = new QSlider(Qt::Horizontal, frame);
slider->setRange(0, 100);
- connect(slider, SIGNAL(valueChanged(int)), this, SLOT(slotMonochrome(int)));
+ connect(slider, &QAbstractSlider::valueChanged, this, &KIconEffectTestWidget::slotMonochrome);
layout->addWidget(slider, 5, 1);
tmp = img;
@@ -50,10 +50,10 @@
lbl[2] = new QLabel(frame);
lbl[2]->setPixmap(QPixmap::fromImage(tmp));
layout->addWidget(lbl[2], 8, 0, 3, 1);
- layout->addWidget(new QLabel("Desaturate", frame), 8, 1);
+ layout->addWidget(new QLabel(QStringLiteral("Desaturate"), frame), 8, 1);
slider = new QSlider(Qt::Horizontal, frame);
slider->setRange(0, 100);
- connect(slider, SIGNAL(valueChanged(int)), this, SLOT(slotDesaturate(int)));
+ connect(slider, &QAbstractSlider::valueChanged, this, &KIconEffectTestWidget::slotDesaturate);
layout->addWidget(slider, 9, 1);
tmp = img;
@@ -61,10 +61,10 @@
lbl[3] = new QLabel(frame);
lbl[3]->setPixmap(QPixmap::fromImage(tmp));
layout->addWidget(lbl[3], 12, 0, 3, 1);
- layout->addWidget(new QLabel("Gamma", frame), 12, 1);
+ layout->addWidget(new QLabel(QStringLiteral("Gamma"), frame), 12, 1);
slider = new QSlider(Qt::Horizontal, frame);
slider->setRange(0, 100);
- connect(slider, SIGNAL(valueChanged(int)), this, SLOT(slotGamma(int)));
+ connect(slider, &QAbstractSlider::valueChanged, this, &KIconEffectTestWidget::slotGamma);
layout->addWidget(slider, 13, 1);
tmp = img;
@@ -74,13 +74,13 @@
lbl[4] = new QLabel(frame);
lbl[4]->setPixmap(QPixmap::fromImage(tmp));
layout->addWidget(lbl[4], 16, 0, 4, 1);
- layout->addWidget(new QLabel("Colorize", frame), 16, 1);
+ layout->addWidget(new QLabel(QStringLiteral("Colorize"), frame), 16, 1);
slider = new QSlider(Qt::Horizontal, frame);
slider->setRange(0, 100);
- connect(slider, SIGNAL(valueChanged(int)), this, SLOT(slotColorizeValue(int)));
+ connect(slider, &QAbstractSlider::valueChanged, this, &KIconEffectTestWidget::slotColorizeValue);
layout->addWidget(slider, 17, 1);
KColorButton *btn = new KColorButton(colorizedColor, frame);
- connect(btn, SIGNAL(changed(QColor)), this, SLOT(slotColorizeColor(QColor)));
+ connect(btn, &KColorButton::changed, this, &KIconEffectTestWidget::slotColorizeColor);
layout->addWidget(btn, 18, 1);
tmp = img;
@@ -88,7 +88,7 @@
lbl[5] = new QLabel(frame);
lbl[5]->setPixmap(QPixmap::fromImage(tmp));
layout->addWidget(lbl[5], 20, 0, 3, 1);
- layout->addWidget(new QLabel("Semitransparent", frame), 20, 1);
+ layout->addWidget(new QLabel(QStringLiteral("Semitransparent"), frame), 20, 1);
layout->setRowStretch(21, 1);
frame->resize(frame->sizeHint());