Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2019-03-21 09:42:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Thu Mar 21 09:42:23 2019 rev:65 rq:686709 version:5.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2019-02-28 21:26:53.549863090 +0100 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new.28833/attica-qt5.changes 2019-03-21 09:42:26.546950869 +0100 @@ -1,0 +2,13 @@ +Sun Mar 10 20:15:34 UTC 2019 - lbeltr...@kde.org + +- Update to 5.56.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.56.0.php +- Changes since 5.55.0: + * It compiles fine with qt5.13 + * Remove deprecated QSignalMapper + * Fix some clazy error + * Port to for(...:...) + +------------------------------------------------------------------- Old: ---- attica-5.55.0.tar.xz New: ---- attica-5.56.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.DYTUhd/_old 2019-03-21 09:42:27.382950677 +0100 +++ /var/tmp/diff_new_pack.DYTUhd/_new 2019-03-21 09:42:27.386950676 +0100 @@ -19,13 +19,13 @@ %define sonum 5 %define rname attica %define _libname KF5Attica -%define _tar_path 5.55 +%define _tar_path 5.56 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: attica-qt5 -Version: 5.55.0 +Version: 5.56.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1-or-later ++++++ attica-5.55.0.tar.xz -> attica-5.56.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/CMakeLists.txt new/attica-5.56.0/CMakeLists.txt --- old/attica-5.55.0/CMakeLists.txt 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/CMakeLists.txt 2019-03-02 14:23:27.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.55.0") # handled by release scripts +set(KF5_VERSION "5.56.0") # handled by release scripts project(Attica VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.55.0 NO_MODULE) +find_package(ECM 5.56.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) @@ -40,7 +40,7 @@ # Enable static build option(ATTICA_STATIC_BUILD "Build a static library" Off) - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) add_subdirectory(src) # Enable unit testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/autotests/providertest.cpp new/attica-5.56.0/autotests/providertest.cpp --- old/attica-5.55.0/autotests/providertest.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/autotests/providertest.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -89,10 +89,10 @@ delete m_manager; m_manager = new Attica::ProviderManager; m_manager->setAuthenticationSuppressed(true); - connect(m_manager, SIGNAL(defaultProvidersLoaded()), this, SLOT(slotDefaultProvidersLoaded())); - connect(m_manager, SIGNAL(providerAdded(Attica::Provider)), this, SLOT(providerAdded(Attica::Provider))); + connect(m_manager, &ProviderManager::defaultProvidersLoaded, this, &ProviderTest::slotDefaultProvidersLoaded); + connect(m_manager, &ProviderManager::providerAdded, this, &ProviderTest::providerAdded); m_manager->addProviderFile(url); - m_timer.singleShot(5000, this, SLOT(slotTimeout())); + m_timer.singleShot(5000, this, &ProviderTest::slotTimeout); m_eventloop->exec(); } @@ -103,7 +103,7 @@ Attica::Provider provider = m_manager->providers().at(0); ItemJob<Config>* job = provider.requestConfig(); QVERIFY(job); - connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(slotConfigResult(Attica::BaseJob*))); + connect(job, &BaseJob::finished, this, &ProviderTest::slotConfigResult); job->start(); m_eventloop->exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/accountbalanceparser.cpp new/attica-5.56.0/src/accountbalanceparser.cpp --- old/attica-5.55.0/src/accountbalanceparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/accountbalanceparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -29,7 +29,7 @@ QStringList AccountBalance::Parser::xmlElement() const { - return QStringList(QLatin1String("person")); + return QStringList(QStringLiteral("person")); } AccountBalance AccountBalance::Parser::parseXml(QXmlStreamReader &xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/achievement.cpp new/attica-5.56.0/src/achievement.cpp --- old/attica-5.55.0/src/achievement.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/achievement.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -45,13 +45,13 @@ { switch (type) { case Achievement::FlowingAchievement: - return QLatin1String("flowing"); + return QStringLiteral("flowing"); case Achievement::SteppedAchievement: - return QLatin1String("stepped"); + return QStringLiteral("stepped"); case Achievement::NamedstepsAchievement: - return QLatin1String("namedsteps"); + return QStringLiteral("namedsteps"); case Achievement::SetAchievement: - return QLatin1String("set"); + return QStringLiteral("set"); } Q_ASSERT(false); @@ -76,11 +76,11 @@ { switch (visibility) { case Achievement::VisibleAchievement: - return QLatin1String("visible"); + return QStringLiteral("visible"); case Achievement::DependentsAchievement: - return QLatin1String("dependents"); + return QStringLiteral("dependents"); case Achievement::SecretAchievement: - return QLatin1String("secret"); + return QStringLiteral("secret"); } Q_ASSERT(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/achievementparser.cpp new/attica-5.56.0/src/achievementparser.cpp --- old/attica-5.55.0/src/achievementparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/achievementparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -147,5 +147,5 @@ QStringList Achievement::Parser::xmlElement() const { - return QStringList(QLatin1String("achievement")); + return QStringList(QStringLiteral("achievement")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/activityparser.cpp new/attica-5.56.0/src/activityparser.cpp --- old/attica-5.55.0/src/activityparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/activityparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -68,5 +68,5 @@ QStringList Activity::Parser::xmlElement() const { - return QStringList(QLatin1String("activity")); + return QStringList(QStringLiteral("activity")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/atticabasejob.cpp new/attica-5.56.0/src/atticabasejob.cpp --- old/attica-5.55.0/src/atticabasejob.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/atticabasejob.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -103,7 +103,7 @@ // reissue same request with different Url request.setUrl(newUrl); d->m_reply = internals()->get(request); - connect(d->m_reply, SIGNAL(finished()), SLOT(dataFinished())); + connect(d->m_reply, &QNetworkReply::finished, this, &BaseJob::dataFinished); return; } else { error = true; @@ -132,16 +132,16 @@ void BaseJob::start() { - QTimer::singleShot(0, this, SLOT(doWork())); + QTimer::singleShot(0, this, &BaseJob::doWork); } void BaseJob::doWork() { d->m_reply = executeRequest(); qCDebug(ATTICA) << "executing" << Utils::toString(d->m_reply->operation()) << "request for" << d->m_reply->url(); - connect(d->m_reply, SIGNAL(finished()), SLOT(dataFinished())); - connect(d->m_reply->manager(), SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), - this, SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*))); + connect(d->m_reply, &QNetworkReply::finished, this, &BaseJob::dataFinished); + connect(d->m_reply->manager(), &QNetworkAccessManager::authenticationRequired, + this, &BaseJob::authenticationRequired); connect(d->m_reply, static_cast<void(QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), [](QNetworkReply::NetworkError code){ qCDebug(ATTICA) << "error found" << code; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/atticautils.cpp new/attica-5.56.0/src/atticautils.cpp --- old/attica-5.55.0/src/atticautils.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/atticautils.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -34,11 +34,11 @@ int tzsign = 0; if (str.indexOf(QLatin1String("+")) != -1) { - list = str.split(QLatin1String("+")); + list = str.split(QStringLiteral("+")); datetime = list[0]; tzsign = 1; } else if (str.indexOf(QLatin1String("-")) != -1) { - list = str.split(QLatin1String("-")); + list = str.split(QStringLiteral("-")); datetime = list[0]; tzsign = -1; } else { @@ -56,7 +56,7 @@ int mm = 0; int tzsecs = 0; if (tz.indexOf(QLatin1String(":")) != -1) { - QStringList tzlist = tz.split(QLatin1String(":")); + QStringList tzlist = tz.split(QStringLiteral(":")); if (tzlist.count() == 2) { hh = tzlist[0].toInt(); mm = tzlist[1].toInt(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/buildservicejoboutputparser.cpp new/attica-5.56.0/src/buildservicejoboutputparser.cpp --- old/attica-5.55.0/src/buildservicejoboutputparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/buildservicejoboutputparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -47,5 +47,5 @@ QStringList BuildServiceJobOutput::Parser::xmlElement() const { - return QStringList(QLatin1String("output")); + return QStringList(QStringLiteral("output")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/buildservicejobparser.cpp new/attica-5.56.0/src/buildservicejobparser.cpp --- old/attica-5.55.0/src/buildservicejobparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/buildservicejobparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -67,5 +67,5 @@ QStringList BuildServiceJob::Parser::xmlElement() const { - return QStringList(QLatin1String("buildjob")) << QLatin1String("user"); + return QStringList(QStringLiteral("buildjob")) << QStringLiteral("user"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/buildserviceparser.cpp new/attica-5.56.0/src/buildserviceparser.cpp --- old/attica-5.55.0/src/buildserviceparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/buildserviceparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -82,5 +82,5 @@ QStringList BuildService::Parser::xmlElement() const { - return QStringList(QLatin1String("buildservice")) << QLatin1String("user"); + return QStringList(QStringLiteral("buildservice")) << QStringLiteral("user"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/categoryparser.cpp new/attica-5.56.0/src/categoryparser.cpp --- old/attica-5.55.0/src/categoryparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/categoryparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -50,5 +50,5 @@ QStringList Category::Parser::xmlElement() const { - return QStringList(QLatin1String("category")); + return QStringList(QStringLiteral("category")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/comment.cpp new/attica-5.56.0/src/comment.cpp --- old/attica-5.55.0/src/comment.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/comment.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -32,13 +32,13 @@ { switch (type) { case ContentComment: - return QLatin1String("1"); + return QStringLiteral("1"); case ForumComment: - return QLatin1String("4"); + return QStringLiteral("4"); case KnowledgeBaseComment: - return QLatin1String("7"); + return QStringLiteral("7"); case EventComment: - return QLatin1String("8"); + return QStringLiteral("8"); } Q_ASSERT(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/commentparser.cpp new/attica-5.56.0/src/commentparser.cpp --- old/attica-5.55.0/src/commentparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/commentparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -84,5 +84,5 @@ QStringList Comment::Parser::xmlElement() const { - return QStringList(QLatin1String("comment")); + return QStringList(QStringLiteral("comment")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/configparser.cpp new/attica-5.56.0/src/configparser.cpp --- old/attica-5.55.0/src/configparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/configparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -57,5 +57,5 @@ QStringList Config::Parser::xmlElement() const { - return QStringList(QLatin1String( "data" )); + return QStringList(QStringLiteral( "data" )); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/content.cpp new/attica-5.56.0/src/content.cpp --- old/attica-5.55.0/src/content.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/content.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -163,28 +163,28 @@ QString Content::summary() const { - return attribute(QLatin1String("summary")); + return attribute(QStringLiteral("summary")); } QString Content::description() const { - return attribute(QLatin1String("description")); + return attribute(QStringLiteral("description")); } QUrl Content::detailpage() const { - return QUrl(attribute(QLatin1String("detailpage"))); + return QUrl(attribute(QStringLiteral("detailpage"))); } QString Attica::Content::changelog() const { - return attribute(QLatin1String("changelog")); + return attribute(QStringLiteral("changelog")); } QString Attica::Content::depend() const { - return attribute(QLatin1String("depend")); + return attribute(QStringLiteral("depend")); } QList<Attica::DownloadDescription> Attica::Content::downloadUrlDescriptions() const @@ -267,7 +267,7 @@ QString num(QString::number(number)); HomePageEntry homepage; - if (number == 1 && attribute(QLatin1String("homepage1")).isEmpty()) { + if (number == 1 && attribute(QStringLiteral("homepage1")).isEmpty()) { num.clear(); } homepage.setType(attribute(QLatin1String("homepagetype") + num)); @@ -277,22 +277,22 @@ QString Attica::Content::version() const { - return attribute(QLatin1String("version")); + return attribute(QStringLiteral("version")); } QString Attica::Content::author() const { - return attribute(QLatin1String("personid")); + return attribute(QStringLiteral("personid")); } QString Attica::Content::license() const { - return attribute(QLatin1String("licensetype")); + return attribute(QStringLiteral("licensetype")); } QString Attica::Content::licenseName() const { - return attribute(QLatin1String("license")); + return attribute(QStringLiteral("license")); } QString Attica::Content::previewPicture(const QString &number) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/content.h new/attica-5.56.0/src/content.h --- old/attica-5.55.0/src/content.h 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/content.h 2019-03-02 14:23:27.000000000 +0100 @@ -200,8 +200,8 @@ */ QList<HomePageEntry> homePageEntries(); - QString previewPicture(const QString &number = QLatin1String("1")) const; - QString smallPreviewPicture(const QString &number = QLatin1String("1")) const; + QString previewPicture(const QString &number = QStringLiteral("1")) const; + QString smallPreviewPicture(const QString &number = QStringLiteral("1")) const; QString license() const; QString licenseName() const; QString author() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/contentparser.cpp new/attica-5.56.0/src/contentparser.cpp --- old/attica-5.55.0/src/contentparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/contentparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -100,5 +100,5 @@ QStringList Content::Parser::xmlElement() const { - return QStringList(QLatin1String("content")); + return QStringList(QStringLiteral("content")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/distributionparser.cpp new/attica-5.56.0/src/distributionparser.cpp --- old/attica-5.55.0/src/distributionparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/distributionparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -28,7 +28,7 @@ QStringList Distribution::Parser::xmlElement() const { - return QStringList(QLatin1String("distribution")); + return QStringList(QStringLiteral("distribution")); } Distribution Distribution::Parser::parseXml(QXmlStreamReader &xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/downloaditemparser.cpp new/attica-5.56.0/src/downloaditemparser.cpp --- old/attica-5.55.0/src/downloaditemparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/downloaditemparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -29,7 +29,7 @@ QStringList DownloadItem::Parser::xmlElement() const { - return QStringList(QLatin1String("content")); + return QStringList(QStringLiteral("content")); } DownloadItem DownloadItem::Parser::parseXml(QXmlStreamReader &xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/eventparser.cpp new/attica-5.56.0/src/eventparser.cpp --- old/attica-5.55.0/src/eventparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/eventparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -72,5 +72,5 @@ QStringList Event::Parser::xmlElement() const { - return QStringList(QLatin1String("event")); + return QStringList(QStringLiteral("event")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/folderparser.cpp new/attica-5.56.0/src/folderparser.cpp --- old/attica-5.55.0/src/folderparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/folderparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -52,5 +52,5 @@ QStringList Folder::Parser::xmlElement() const { - return QStringList(QLatin1String("folder")); + return QStringList(QStringLiteral("folder")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/forumparser.cpp new/attica-5.56.0/src/forumparser.cpp --- old/attica-5.55.0/src/forumparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/forumparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -82,5 +82,5 @@ QStringList Forum::Parser::xmlElement() const { - return QStringList(QLatin1String("forum")); + return QStringList(QStringLiteral("forum")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/homepagetypeparser.cpp new/attica-5.56.0/src/homepagetypeparser.cpp --- old/attica-5.55.0/src/homepagetypeparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/homepagetypeparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -28,7 +28,7 @@ QStringList HomePageType::Parser::xmlElement() const { - return QStringList(QLatin1String("homepagetype")); + return QStringList(QStringLiteral("homepagetype")); } HomePageType HomePageType::Parser::parseXml(QXmlStreamReader &xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/knowledgebaseentryparser.cpp new/attica-5.56.0/src/knowledgebaseentryparser.cpp --- old/attica-5.55.0/src/knowledgebaseentryparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/knowledgebaseentryparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -69,5 +69,5 @@ QStringList KnowledgeBaseEntry::Parser::xmlElement() const { - return QStringList(QLatin1String("content")); + return QStringList(QStringLiteral("content")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/licenseparser.cpp new/attica-5.56.0/src/licenseparser.cpp --- old/attica-5.55.0/src/licenseparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/licenseparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -25,7 +25,7 @@ QStringList License::Parser::xmlElement() const { - return QStringList(QLatin1String("license")); + return QStringList(QStringLiteral("license")); } License License::Parser::parseXml(QXmlStreamReader &xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/messageparser.cpp new/attica-5.56.0/src/messageparser.cpp --- old/attica-5.55.0/src/messageparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/messageparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -60,5 +60,5 @@ QStringList Message::Parser::xmlElement() const { - return QStringList(QLatin1String("message")); + return QStringList(QStringLiteral("message")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/personparser.cpp new/attica-5.56.0/src/personparser.cpp --- old/attica-5.55.0/src/personparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/personparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -76,5 +76,5 @@ QStringList Person::Parser::xmlElement() const { - return QStringList(QLatin1String("person")) << QLatin1String("user"); + return QStringList(QStringLiteral("person")) << QStringLiteral("user"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/postfiledata.h new/attica-5.56.0/src/postfiledata.h --- old/attica-5.55.0/src/postfiledata.h 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/postfiledata.h 2019-03-02 14:23:27.000000000 +0100 @@ -45,7 +45,7 @@ void addArgument(const QString &key, const QString &value); void addFile(const QString &fileName, QIODevice *file, const QString &mimeType); - void addFile(const QString &fileName, const QByteArray &file, const QString &mimeType, const QString &fieldName = QLatin1String("localfile")); + void addFile(const QString &fileName, const QByteArray &file, const QString &mimeType, const QString &fieldName = QStringLiteral("localfile")); QNetworkRequest request(); QByteArray data(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/privatedataparser.cpp new/attica-5.56.0/src/privatedataparser.cpp --- old/attica-5.55.0/src/privatedataparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/privatedataparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -52,6 +52,6 @@ QStringList PrivateData::Parser::xmlElement() const { - return QStringList(QLatin1String("privatedata")); + return QStringList(QStringLiteral("privatedata")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/projectparser.cpp new/attica-5.56.0/src/projectparser.cpp --- old/attica-5.55.0/src/projectparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/projectparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -54,7 +54,7 @@ } else if (xml.name() == QLatin1String("specfile")) { project.setSpecFile(xml.readElementText()); } else if (xml.name() == QLatin1String("developers")) { - project.setDevelopers(xml.readElementText().split(QLatin1String("\n"))); + project.setDevelopers(xml.readElementText().split(QStringLiteral("\n"))); } else if (xml.name() == QLatin1String("projectlist")) { QXmlStreamReader list_xml(xml.readElementText()); while (!list_xml.atEnd()) { @@ -74,5 +74,5 @@ QStringList Project::Parser::xmlElement() const { - return QStringList(QLatin1String("project")) << QLatin1String("user"); + return QStringList(QStringLiteral("project")) << QStringLiteral("user"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/provider.cpp new/attica-5.56.0/src/provider.cpp --- old/attica-5.55.0/src/provider.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/provider.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -1093,7 +1093,8 @@ QUrl url = createUrl(QStringLiteral("content/data")); QUrlQuery q(url); QStringList categoryIds; - foreach (const Category &category, categories) { + categoryIds.reserve(categories.count()); + for (const Category &category : categories) { categoryIds.append(category.id()); } q.addQueryItem(QStringLiteral("categories"), categoryIds.join(QLatin1String("x"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/provider.h new/attica-5.56.0/src/provider.h --- old/attica-5.55.0/src/provider.h 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/provider.h 2019-03-02 14:23:27.000000000 +0100 @@ -586,7 +586,7 @@ */ ItemJob<Content> *requestContent(const QString &contentId); - ItemJob<DownloadItem> *downloadLink(const QString &contentId, const QString &itemId = QLatin1String("1")); + ItemJob<DownloadItem> *downloadLink(const QString &contentId, const QString &itemId = QStringLiteral("1")); /** Vote for a content item * This version is for the old OCS API < 1.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/providermanager.cpp new/attica-5.56.0/src/providermanager.cpp --- old/attica-5.55.0/src/providermanager.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/providermanager.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -32,7 +32,6 @@ #include <QFile> #include <QPluginLoader> #include <QSet> -#include <QSignalMapper> #include <QTimer> #include <QProcess> #include <QAuthenticator> @@ -53,7 +52,6 @@ PlatformDependent *m_internals; QHash<QUrl, Provider> m_providers; QHash<QUrl, QUrl> m_providerTargets; - QSignalMapper m_downloadMapping; QHash<QString, QNetworkReply *> m_downloads; bool m_authenticationSuppressed; @@ -84,13 +82,12 @@ : d(new Private) { d->m_internals = loadPlatformDependent(flags); - connect(d->m_internals->nam(), SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), SLOT(authenticate(QNetworkReply*,QAuthenticator*))); - connect(&d->m_downloadMapping, SIGNAL(mapped(QString)), SLOT(fileFinished(QString))); + connect(d->m_internals->nam(), &QNetworkAccessManager::authenticationRequired, this, &ProviderManager::authenticate); } void ProviderManager::loadDefaultProviders() { - QTimer::singleShot(0, this, SLOT(slotLoadDefaultProvidersInternal())); + QTimer::singleShot(0, this, &ProviderManager::slotLoadDefaultProvidersInternal); } void ProviderManager::setAuthenticationSuppressed(bool suppressed) @@ -150,8 +147,9 @@ req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); QNetworkReply *reply = d->m_internals->get(req); qCDebug(ATTICA) << "executing" << Utils::toString(reply->operation()) << "for" << reply->url(); - connect(reply, SIGNAL(finished()), &d->m_downloadMapping, SLOT(map())); - d->m_downloadMapping.setMapping(reply, url.toString()); + connect(reply, &QNetworkReply::finished, this, [this, url]() { + fileFinished(url.toString()); + }); d->m_downloads.insert(url.toString(), reply); } } @@ -278,8 +276,8 @@ void ProviderManager::authenticate(QNetworkReply *reply, QAuthenticator *auth) { QUrl baseUrl; - QList<QUrl> urls = d->m_providers.keys(); - foreach (const QUrl &url, urls) { + const QList<QUrl> urls = d->m_providers.keys(); + for (const QUrl &url : urls) { if (url.isParentOf(reply->url())) { baseUrl = url; break; @@ -321,7 +319,7 @@ void ProviderManager::initNetworkAccesssManager() { - connect(d->m_internals->nam(), SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(authenticate(QNetworkReply*,QAuthenticator*))); - connect(d->m_internals->nam(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); + connect(d->m_internals->nam(), &QNetworkAccessManager::authenticationRequired, this, &ProviderManager::authenticate); + connect(d->m_internals->nam(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &ProviderManager::proxyAuthenticationRequired); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/publisherfieldparser.cpp new/attica-5.56.0/src/publisherfieldparser.cpp --- old/attica-5.55.0/src/publisherfieldparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/publisherfieldparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -48,5 +48,5 @@ QStringList PublisherField::Parser::xmlElement() const { - return QStringList(QLatin1String("field")); + return QStringList(QStringLiteral("field")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/publisherparser.cpp new/attica-5.56.0/src/publisherparser.cpp --- old/attica-5.55.0/src/publisherparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/publisherparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -114,5 +114,5 @@ QStringList Publisher::Parser::xmlElement() const { - return QStringList(QLatin1String("publisher")) << QLatin1String("user"); + return QStringList(QStringLiteral("publisher")) << QStringLiteral("user"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/remoteaccountparser.cpp new/attica-5.56.0/src/remoteaccountparser.cpp --- old/attica-5.55.0/src/remoteaccountparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/remoteaccountparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -59,5 +59,5 @@ QStringList RemoteAccount::Parser::xmlElement() const { - return QStringList(QLatin1String("remoteaccount")) << QLatin1String("user"); + return QStringList(QStringLiteral("remoteaccount")) << QStringLiteral("user"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/src/topicparser.cpp new/attica-5.56.0/src/topicparser.cpp --- old/attica-5.55.0/src/topicparser.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/src/topicparser.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -59,5 +59,5 @@ QStringList Topic::Parser::xmlElement() const { - return QStringList(QLatin1String("topic")); + return QStringList(QStringLiteral("topic")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.55.0/tests/projecttest/projecttest.cpp new/attica-5.56.0/tests/projecttest/projecttest.cpp --- old/attica-5.55.0/tests/projecttest/projecttest.cpp 2019-02-02 18:18:53.000000000 +0100 +++ new/attica-5.56.0/tests/projecttest/projecttest.cpp 2019-03-02 14:23:27.000000000 +0100 @@ -51,20 +51,20 @@ m_editor->setupUi(m_mainWidget); // Project page - connect(m_editor->save, SIGNAL(clicked()), this, SLOT(save())); + connect(m_editor->save, &QAbstractButton::clicked, this, &ProjectTest::save); connect(m_editor->create, SIGNAL(clicked()), this, SLOT(create())); connect(m_editor->deleteProject, SIGNAL(clicked()), this, SLOT(deleteProject())); // build service / job page - connect(m_editor->build, SIGNAL(clicked()), this, SLOT(createBuildServiceJob())); - connect(m_editor->cancelJob, SIGNAL(clicked()), this, SLOT(cancelBuildServiceJob())); - connect(m_editor->updateJob, SIGNAL(clicked()), this, SLOT(updateCurrentProject())); - connect(m_editor->buildServices, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), - this, SLOT(selectedBuildServiceChanged(QListWidgetItem*,QListWidgetItem*))); + connect(m_editor->build, &QAbstractButton::clicked, this, &ProjectTest::createBuildServiceJob); + connect(m_editor->cancelJob, &QAbstractButton::clicked, this, &ProjectTest::cancelBuildServiceJob); + connect(m_editor->updateJob, &QAbstractButton::clicked, this, &ProjectTest::updateCurrentProject); + connect(m_editor->buildServices, &QListWidget::currentItemChanged, + this, &ProjectTest::selectedBuildServiceChanged); QAction *a = new QAction(this); a->setText(QLatin1String("Quit")); - connect(a, SIGNAL(triggered()), SLOT(close())); + connect(a, &QAction::triggered, this, &QWidget::close); menuBar()->addMenu(QLatin1String("File"))->addAction(a); initOcs(); @@ -76,7 +76,7 @@ void ProjectTest::initOcs() { m_pm.setAuthenticationSuppressed(true); - connect(&m_pm, SIGNAL(providerAdded(Attica::Provider)), SLOT(providerAdded(Attica::Provider))); + connect(&m_pm, &ProviderManager::providerAdded, this, &ProjectTest::providerAdded); m_pm.loadDefaultProviders(); m_mainWidget->setEnabled(false); setStatus(QLatin1String("Loading providers...")); @@ -108,7 +108,7 @@ void ProjectTest::getProject(QString id) { ItemJob<Project> *job = m_provider.requestProject(id); - connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(projectResult(Attica::BaseJob*))); + connect(job, &BaseJob::finished, this, &ProjectTest::projectResult); job->start(); setStatus(QString(QLatin1String("Loading project %")).arg(id)); m_mainWidget->setEnabled(false); @@ -118,21 +118,21 @@ void ProjectTest::listProjects() { ListJob<Project> *job = m_provider.requestProjects(); - connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(projectListResult(Attica::BaseJob*))); + connect(job, &BaseJob::finished, this, &ProjectTest::projectListResult); job->start(); } void ProjectTest::listBuildServices() { ListJob<BuildService> *job = m_provider.requestBuildServices(); - connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(buildServiceListResult(Attica::BaseJob*))); + connect(job, &BaseJob::finished, this, &ProjectTest::buildServiceListResult); job->start(); } void ProjectTest::listBuildServiceJobs(const Project &p) { ListJob<BuildServiceJob> *job = m_provider.requestBuildServiceJobs(p); - connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(buildServiceJobListResult(Attica::BaseJob*))); + connect(job, &BaseJob::finished, this, &ProjectTest::buildServiceJobListResult); job->start(); } @@ -200,7 +200,7 @@ void ProjectTest::save() { Attica::PostJob *postjob = m_provider.editProject(uiToProject()); - connect(postjob, SIGNAL(finished(Attica::BaseJob*)), SLOT(saveProjectResult(Attica::BaseJob*))); + connect(postjob, &BaseJob::finished, this, &ProjectTest::saveProjectResult); postjob->start(); m_mainWidget->setEnabled(false); } @@ -208,7 +208,7 @@ void ProjectTest::create() { Attica::PostJob *postjob = m_provider.createProject(uiToProject()); - connect(postjob, SIGNAL(finished(Attica::BaseJob*)), SLOT(createProjectResult(Attica::BaseJob*))); + connect(postjob, &BaseJob::finished, this, &ProjectTest::createProjectResult); postjob->start(); m_mainWidget->setEnabled(false); } @@ -216,7 +216,7 @@ void ProjectTest::deleteProject() { Attica::PostJob *postjob = m_provider.deleteProject(uiToProject()); - connect(postjob, SIGNAL(finished(Attica::BaseJob*)), SLOT(deleteProjectResult(Attica::BaseJob*))); + connect(postjob, &BaseJob::finished, this, &ProjectTest::deleteProjectResult); postjob->start(); m_mainWidget->setEnabled(false); } @@ -411,7 +411,7 @@ qDebug() << "Buildservice:" << b.buildServiceId(); //*/ Attica::PostJob *j = m_provider.createBuildServiceJob(b); - connect(j, SIGNAL(finished(Attica::BaseJob*)), this, SLOT(buildServiceJobCreated(Attica::BaseJob*))); + connect(j, &BaseJob::finished, this, &ProjectTest::buildServiceJobCreated); j->start(); setStatus(QLatin1String("Starting a build job on the server.")); } @@ -423,7 +423,7 @@ BuildServiceJob b = BuildServiceJob(); b.setId(bsj_id); Attica::PostJob *j = m_provider.cancelBuildServiceJob(b); - connect(j, SIGNAL(finished(Attica::BaseJob*)), this, SLOT(buildServiceJobCanceled(Attica::BaseJob*))); + connect(j, &BaseJob::finished, this, &ProjectTest::buildServiceJobCanceled); j->start(); }
