Hello community,
here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2017-03-03 14:40:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old)
and /work/SRC/openSUSE:Factory/.attica-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5"
Fri Mar 3 14:40:13 2017 rev:39 rq:461382 version:5.31.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2017-02-03 17:31:45.759131979 +0100
+++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2017-03-03 14:40:14.397999723 +0100
@@ -1,0 +2,7 @@
+Thu Feb 9 09:21:06 UTC 2017 - hrvoje.senjan@gmail.com
+
+- Update to 5.31.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.31.0.php
+
+-------------------------------------------------------------------
Old:
----
attica-5.30.0.tar.xz
New:
----
attica-5.31.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ attica-qt5.spec ++++++
--- /var/tmp/diff_new_pack.I9N0Va/_old 2017-03-03 14:40:15.033909698 +0100
+++ /var/tmp/diff_new_pack.I9N0Va/_new 2017-03-03 14:40:15.033909698 +0100
@@ -19,9 +19,9 @@
%define sonum 5
%define rname attica
%define _libname KF5Attica
-%define _tar_path 5.30
+%define _tar_path 5.31
Name: attica-qt5
-Version: 5.30.0
+Version: 5.31.0
Release: 0
Summary: Open Collaboration Service client library
License: LGPL-2.1+
@@ -34,8 +34,8 @@
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: pkg-config
-BuildRequires: cmake(Qt5Core) >= 5.5.0
-BuildRequires: cmake(Qt5Network) >= 5.5.0
+BuildRequires: cmake(Qt5Core) >= 5.6.0
+BuildRequires: cmake(Qt5Network) >= 5.6.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -54,8 +54,8 @@
Summary: Open Collaboration Service client library - development files
Group: Development/Libraries/C and C++
Requires: lib%{_libname}%{sonum} = %{version}
-Requires: cmake(Qt5Core) >= 5.5.0
-Requires: cmake(Qt5Network) >= 5.5.0
+Requires: cmake(Qt5Core) >= 5.6.0
+Requires: cmake(Qt5Network) >= 5.6.0
%description -n attica-qt5-devel
Development files for attica, Attica a library to access Open Collaboration Service servers.
++++++ attica-5.30.0.tar.xz -> attica-5.31.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/CMakeLists.txt new/attica-5.31.0/CMakeLists.txt
--- old/attica-5.30.0/CMakeLists.txt 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/CMakeLists.txt 2017-02-04 19:01:05.000000000 +0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.30.0") # handled by release scripts
+set(KF5_VERSION "5.31.0") # handled by release scripts
project(Attica VERSION ${KF5_VERSION})
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.30.0 NO_MODULE)
+find_package(ECM 5.31.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)
@@ -28,7 +28,7 @@
SOVERSION 5)
# Dependencies
-set(REQUIRED_QT_VERSION 5.5.0)
+set(REQUIRED_QT_VERSION 5.6.0)
# Required Qt5 components to build this framework
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Network)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/atticabasejob.cpp new/attica-5.31.0/src/atticabasejob.cpp
--- old/attica-5.30.0/src/atticabasejob.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/atticabasejob.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -41,13 +41,13 @@
QNetworkReply *m_reply;
Private(PlatformDependent *internals)
- : m_internals(internals), m_reply(0)
+ : m_internals(internals), m_reply(nullptr)
{
}
bool redirection(QUrl &newUrl) const
{
- if (m_reply == 0 || m_reply->error() != QNetworkReply::NoError) {
+ if (m_reply == nullptr || m_reply->error() != QNetworkReply::NoError) {
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/category.cpp new/attica-5.31.0/src/category.cpp
--- old/attica-5.30.0/src/category.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/category.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -40,6 +40,7 @@
public:
QString m_id;
QString m_name;
+ QString m_displayName;
};
Category::Category() : d(new Private)
@@ -81,6 +82,16 @@
return d->m_name;
}
+void Category::setDisplayName(const QString &name)
+{
+ d->m_displayName = name;
+}
+
+QString Category::displayName() const
+{
+ return d->m_displayName;
+}
+
bool Category::isValid() const
{
return !(d->m_id.isEmpty());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/category.h new/attica-5.31.0/src/category.h
--- old/attica-5.30.0/src/category.h 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/category.h 2017-02-04 19:01:05.000000000 +0100
@@ -95,6 +95,24 @@
*/
bool isValid() const;
+ /**
+ * Sets the display name of the Category.
+ * This name is guaranteed to be user friendly, while name may be
+ * internal for the server
+ * @param name the new name
+ * @since 5.31
+ */
+ void setDisplayName(const QString &name);
+
+ /**
+ * Gets the display name of the Category.
+ * This name is guaranteed to be user friendly, while name may be
+ * internal for the server
+ * @return the name
+ * @since 5.31
+ */
+ QString displayName() const;
+
private:
class Private;
QSharedDataPointer<Private> d;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/categoryparser.cpp new/attica-5.31.0/src/categoryparser.cpp
--- old/attica-5.30.0/src/categoryparser.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/categoryparser.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -37,6 +37,8 @@
category.setId(xml.readElementText());
} else if (xml.name() == QLatin1String("name")) {
category.setName(xml.readElementText());
+ } else if (xml.name() == QLatin1String("display_name")) {
+ category.setDisplayName(xml.readElementText());
}
} else if (xml.isEndElement() && xml.name() == QLatin1String("category")) {
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/deletejob.cpp new/attica-5.31.0/src/deletejob.cpp
--- old/attica-5.30.0/src/deletejob.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/deletejob.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -38,7 +38,7 @@
{
Attica::PlatformDependentV2 *platformDependentV2 = dynamic_cast(internals());
if (!platformDependentV2) {
- return 0;
+ return nullptr;
}
return platformDependentV2->deleteResource(m_request);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/postjob.cpp new/attica-5.31.0/src/postjob.cpp
--- old/attica-5.30.0/src/postjob.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/postjob.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -38,12 +38,12 @@
}
Attica::PostJob::PostJob(PlatformDependent *internals, const QNetworkRequest &request, const QByteArray &byteArray)
- : BaseJob(internals), m_ioDevice(0), m_byteArray(byteArray), m_request(request)
+ : BaseJob(internals), m_ioDevice(nullptr), m_byteArray(byteArray), m_request(request)
{
}
PostJob::PostJob(PlatformDependent *internals, const QNetworkRequest &request, const StringMap ¶meters)
- : BaseJob(internals), m_ioDevice(0), m_request(request)
+ : BaseJob(internals), m_ioDevice(nullptr), m_request(request)
{
// Create post data
int j = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/privatedata.cpp new/attica-5.31.0/src/privatedata.cpp
--- old/attica-5.30.0/src/privatedata.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/privatedata.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -36,7 +36,7 @@
Provider *m_provider;
Private()
- : m_provider(0)
+ : m_provider(nullptr)
{
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/provider.cpp new/attica-5.31.0/src/provider.cpp
--- old/attica-5.30.0/src/provider.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/provider.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -123,7 +123,7 @@
PlatformDependent *m_internals;
Private()
- : m_internals(0)
+ : m_internals(nullptr)
{}
Private(const Private &other)
@@ -298,7 +298,7 @@
PostJob *Provider::checkLogin(const QString &user, const QString &password)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QMap postParameters;
@@ -312,7 +312,7 @@
PostJob *Provider::registerAccount(const QString &id, const QString &password, const QString &mail, const QString &firstName, const QString &lastName)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QMap postParameters;
@@ -334,7 +334,7 @@
ItemJob<Person> *Provider::requestPerson(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("person/data/") + id);
@@ -344,7 +344,7 @@
ItemJob<Person> *Provider::requestPersonSelf()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("person/self"));
@@ -354,7 +354,7 @@
ItemJob<AccountBalance> *Provider::requestAccountBalance()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("person/balance"));
@@ -364,7 +364,7 @@
ListJob<Person> *Provider::requestPersonSearchByName(const QString &name)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("person/data"));
@@ -377,7 +377,7 @@
ListJob<Person> *Provider::requestPersonSearchByLocation(qreal latitude, qreal longitude, qreal distance, int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("person/data"));
@@ -397,7 +397,7 @@
ListJob<Person> *Provider::requestFriends(const QString &id, int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("friend/data/") + id);
@@ -412,7 +412,7 @@
ListJob<Person> *Provider::requestSentInvitations(int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("friend/sentinvitations"));
@@ -427,7 +427,7 @@
ListJob<Person> *Provider::requestReceivedInvitations(int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("friend/receivedinvitations"));
@@ -442,7 +442,7 @@
ListJob<Achievement> *Provider::requestAchievements(const QString &contentId, const QString &achievementId, const QString &userId)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("achievements/content/") + contentId + achievementId);
@@ -455,7 +455,7 @@
ItemPostJob<Achievement> *Provider::addNewAchievement(const QString &contentId, const Achievement &newAchievement)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -484,11 +484,11 @@
PutJob *Provider::editAchievement(const QString &contentId, const QString &achievementId, const Achievement &achievement)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
if (!dynamic_cast(d->m_internals)) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -517,11 +517,11 @@
DeleteJob *Provider::deleteAchievement(const QString &contentId, const QString &achievementId)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
if (!dynamic_cast(d->m_internals)) {
- return 0;
+ return nullptr;
}
return new ItemDeleteJob<Achievement>(d->m_internals, createRequest(QLatin1String("achievements/progress/") + contentId + achievementId));
@@ -530,7 +530,7 @@
PostJob *Provider::setAchievementProgress(const QString &id, const QVariant &progress, const QDateTime ×tamp)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -544,11 +544,11 @@
DeleteJob *Provider::resetAchievementProgress(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
if (!dynamic_cast(d->m_internals)) {
- return 0;
+ return nullptr;
}
return new ItemDeleteJob<Achievement>(d->m_internals, createRequest(QLatin1String("achievements/progress/") + id));
@@ -557,7 +557,7 @@
ListJob<Activity> *Provider::requestActivities()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
//qDebug() << "request activity";
@@ -568,7 +568,7 @@
ListJob<Project> *Provider::requestProjects()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
//qDebug() << "request projects";
@@ -579,7 +579,7 @@
ItemJob<Project> *Provider::requestProject(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("buildservice/project/get/") + id);
@@ -626,7 +626,7 @@
PostJob *Provider::createProject(const Project &project)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return new PostJob(d->m_internals, createRequest(QLatin1String("buildservice/project/create")),
@@ -636,7 +636,7 @@
PostJob *Provider::editProject(const Project &project)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return new PostJob(d->m_internals, createRequest(
@@ -647,7 +647,7 @@
PostJob *Provider::deleteProject(const Project &project)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return new PostJob(d->m_internals, createRequest(
@@ -658,7 +658,7 @@
ItemJob<BuildService> *Provider::requestBuildService(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("buildservice/buildservices/get/") + id);
@@ -668,7 +668,7 @@
ItemJob<Publisher> *Provider::requestPublisher(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
//qDebug() << "request publisher" << id;
@@ -679,7 +679,7 @@
PostJob *Provider::savePublisherField(const Project &project, const PublisherField &field)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -695,7 +695,7 @@
PostJob *Provider::publishBuildJob(const BuildServiceJob &buildjob, const Publisher &publisher)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -711,7 +711,7 @@
ItemJob<BuildServiceJobOutput> *Provider::requestBuildServiceJobOutput(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("buildservice/jobs/getoutput/") + id);
@@ -722,7 +722,7 @@
ItemJob<BuildServiceJob> *Provider::requestBuildServiceJob(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("buildservice/jobs/get/") + id);
@@ -753,7 +753,7 @@
PostJob *Provider::cancelBuildServiceJob(const BuildServiceJob &job)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -766,7 +766,7 @@
PostJob *Provider::createBuildServiceJob(const BuildServiceJob &job)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -784,7 +784,7 @@
ListJob<BuildService> *Provider::requestBuildServices()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
//qDebug() << "request projects";
@@ -795,7 +795,7 @@
ListJob<Publisher> *Provider::requestPublishers()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("buildservice/publishing/getpublishingcapabilities"));
@@ -806,7 +806,7 @@
ListJob<BuildServiceJob> *Provider::requestBuildServiceJobs(const Project &project)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
//qDebug() << "request projects";
@@ -817,7 +817,7 @@
ListJob<RemoteAccount> *Provider::requestRemoteAccounts()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
//qDebug() << "request remoteaccounts";
@@ -828,7 +828,7 @@
PostJob *Provider::createRemoteAccount(const RemoteAccount &account)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -848,7 +848,7 @@
PostJob *Provider::editRemoteAccount(const RemoteAccount &account)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -868,7 +868,7 @@
ItemJob<RemoteAccount> *Provider::requestRemoteAccount(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("buildservice/remoteaccounts/get/") + id);
@@ -879,7 +879,7 @@
PostJob *Provider::deleteRemoteAccount(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -891,7 +891,7 @@
PostJob *Provider::uploadTarballToBuildService(const QString &projectId, const QString &fileName, const QByteArray &payload)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("buildservice/project/uploadsource/") + projectId);
@@ -906,7 +906,7 @@
PostJob *Provider::postActivity(const QString &message)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -917,7 +917,7 @@
PostJob *Provider::inviteFriend(const QString &to, const QString &message)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -928,7 +928,7 @@
PostJob *Provider::approveFriendship(const QString &to)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return new PostJob(d->m_internals, createRequest(QLatin1String("friend/approve/") + to));
@@ -937,7 +937,7 @@
PostJob *Provider::declineFriendship(const QString &to)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return new PostJob(d->m_internals, createRequest(QLatin1String("friend/decline/") + to));
@@ -946,7 +946,7 @@
PostJob *Provider::cancelFriendship(const QString &to)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return new PostJob(d->m_internals, createRequest(QLatin1String("friend/cancel/") + to));
@@ -955,7 +955,7 @@
PostJob *Provider::postLocation(qreal latitude, qreal longitude, const QString &city, const QString &country)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -969,7 +969,7 @@
ListJob<Folder> *Provider::requestFolders()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return doRequestFolderList(createUrl(QLatin1String("message")));
@@ -978,7 +978,7 @@
ListJob<Message> *Provider::requestMessages(const Folder &folder)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return doRequestMessageList(createUrl(QLatin1String("message/") + folder.id()));
@@ -987,7 +987,7 @@
ListJob<Message> *Provider::requestMessages(const Folder &folder, Message::Status status)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("message/") + folder.id());
@@ -1000,7 +1000,7 @@
ItemJob<Message> *Provider::requestMessage(const Folder &folder, const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
return new ItemJob<Message>(d->m_internals, createRequest(QLatin1String("message/") + folder.id() + QLatin1Char('/') + id));
@@ -1009,7 +1009,7 @@
PostJob *Provider::postMessage(const Message &message)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -1022,7 +1022,7 @@
ListJob<Category> *Provider::requestCategories()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/categories"));
@@ -1033,7 +1033,7 @@
ListJob< License > *Provider::requestLicenses()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/licenses"));
@@ -1044,7 +1044,7 @@
ListJob< Distribution > *Provider::requestDistributions()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/distributions"));
@@ -1055,7 +1055,7 @@
ListJob< HomePageType > *Provider::requestHomePageTypes()
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/homepages"));
@@ -1076,7 +1076,7 @@
ListJob<Content> *Provider::searchContents(const Category::List &categories, const QString &person, const Distribution::List &distributions, const License::List &licenses, const QString &search, SortMode sortMode, uint page, uint pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("content/data"));
@@ -1135,7 +1135,7 @@
ItemJob<Content> *Provider::requestContent(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/data/") + id);
@@ -1146,7 +1146,7 @@
ItemPostJob<Content> *Provider::addNewContent(const Category &category, const Content &cont)
{
if (!isValid() || !category.isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/add"));
@@ -1163,7 +1163,7 @@
ItemPostJob<Content> *Provider::editContent(const Category &updatedCategory, const QString &contentId, const Content &updatedContent)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
// FIXME I get a server error message here, though the name of the item is changed
@@ -1193,7 +1193,7 @@
PostJob *Provider::deleteContent(const QString &contentId)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/delete/") + contentId);
@@ -1205,7 +1205,7 @@
PostJob *Provider::setDownloadFile(const QString &contentId, const QString &fileName, const QByteArray &payload)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/uploaddownload/") + contentId);
@@ -1219,7 +1219,7 @@
PostJob *Provider::deleteDownloadFile(const QString &contentId)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/deletedownload/") + contentId);
@@ -1231,7 +1231,7 @@
PostJob *Provider::setPreviewImage(const QString &contentId, const QString &previewId, const QString &fileName, const QByteArray &image)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/uploadpreview/") + contentId + QLatin1Char('/') + previewId);
@@ -1248,7 +1248,7 @@
PostJob *Provider::deletePreviewImage(const QString &contentId, const QString &previewId)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/deletepreview/") + contentId + QLatin1Char('/') + previewId);
@@ -1261,7 +1261,7 @@
PostJob *Provider::voteForContent(const QString &contentId, bool positiveVote)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -1273,7 +1273,7 @@
PostJob *Provider::voteForContent(const QString &contentId, uint rating)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
// according to OCS API, the rating is 0..100
@@ -1291,7 +1291,7 @@
PostJob *Provider::becomeFan(const QString &contentId)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("fan/add/") + contentId);
@@ -1303,7 +1303,7 @@
ListJob<Person> *Provider::requestFans(const QString &contentId, uint page, uint pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("fan/data/") + contentId);
@@ -1319,7 +1319,7 @@
ListJob<Forum> *Provider::requestForums(uint page, uint pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("forum/list"));
@@ -1334,7 +1334,7 @@
ListJob<Topic> *Provider::requestTopics(const QString &forum, const QString &search, const QString &description, Provider::SortMode mode, int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("forum/topics/list"));
@@ -1366,7 +1366,7 @@
PostJob *Provider::postTopic(const QString &forumId, const QString &subject, const QString &content)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
StringMap postParameters;
@@ -1379,7 +1379,7 @@
ItemJob<DownloadItem> *Provider::downloadLink(const QString &contentId, const QString &itemId)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("content/download/") + contentId + QLatin1Char('/') + itemId);
@@ -1390,7 +1390,7 @@
ItemJob<KnowledgeBaseEntry> *Provider::requestKnowledgeBaseEntry(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("knowledgebase/data/") + id);
@@ -1401,7 +1401,7 @@
ListJob<KnowledgeBaseEntry> *Provider::searchKnowledgeBase(const Content &content, const QString &search, Provider::SortMode sortMode, int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("knowledgebase/data"));
@@ -1442,7 +1442,7 @@
ItemJob<Event> *Provider::requestEvent(const QString &id)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
ItemJob<Event> *job = new ItemJob<Event>(d->m_internals, createRequest(QLatin1String("event/data/") + id));
@@ -1452,7 +1452,7 @@
ListJob<Event> *Provider::requestEvent(const QString &country, const QString &search, const QDate &startAt, Provider::SortMode mode, int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QStringLiteral("event/data"));
@@ -1494,13 +1494,13 @@
ListJob<Comment> *Provider::requestComments(const Comment::Type commentType, const QString &id, const QString &id2, int page, int pageSize)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QString commentTypeString;
commentTypeString = Comment::commentTypeToString(commentType);
if (commentTypeString.isEmpty()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("comments/data/") + commentTypeString + QLatin1Char('/') + id + QLatin1Char('/') + id2);
@@ -1517,13 +1517,13 @@
ItemPostJob<Comment> *Provider::addNewComment(const Comment::Type commentType, const QString &id, const QString &id2, const QString &parentId, const QString &subject, const QString &message)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QString commentTypeString;
commentTypeString = Comment::commentTypeToString(commentType);
if (commentTypeString.isEmpty()) {
- return 0;
+ return nullptr;
}
QMap postParameters;
@@ -1541,7 +1541,7 @@
PostJob *Provider::voteForComment(const QString &id, uint rating)
{
if (!isValid() || (rating > 100)) {
- return 0;
+ return nullptr;
}
QMap postParameters;
@@ -1554,7 +1554,7 @@
PostJob *Provider::setPrivateData(const QString &app, const QString &key, const QString &value)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
QUrl url = createUrl(QLatin1String("privatedata/setattribute/") + app + QLatin1Char('/') + key);
@@ -1568,7 +1568,7 @@
ItemJob<PrivateData> *Provider::requestPrivateData(const QString &app, const QString &key)
{
if (!isValid()) {
- return 0;
+ return nullptr;
}
ItemJob<PrivateData> *job = new ItemJob<PrivateData>(d->m_internals, createRequest(QLatin1String("privatedata/getattribute/") + app + QLatin1Char('/') + key));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/providermanager.cpp new/attica-5.31.0/src/providermanager.cpp
--- old/attica-5.30.0/src/providermanager.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/providermanager.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -54,7 +54,7 @@
bool m_authenticationSuppressed;
Private()
- : m_internals(0)
+ : m_internals(nullptr)
, m_authenticationSuppressed(false)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/putjob.cpp new/attica-5.31.0/src/putjob.cpp
--- old/attica-5.30.0/src/putjob.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/putjob.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -38,12 +38,12 @@
}
Attica::PutJob::PutJob(PlatformDependent *internals, const QNetworkRequest &request, const QByteArray &byteArray)
- : BaseJob(internals), m_ioDevice(0), m_byteArray(byteArray), m_request(request)
+ : BaseJob(internals), m_ioDevice(nullptr), m_byteArray(byteArray), m_request(request)
{
}
PutJob::PutJob(PlatformDependent *internals, const QNetworkRequest &request, const StringMap ¶meters)
- : BaseJob(internals), m_ioDevice(0), m_request(request)
+ : BaseJob(internals), m_ioDevice(nullptr), m_request(request)
{
// Create put data
int j = 0;
@@ -61,7 +61,7 @@
{
Attica::PlatformDependentV2 *platformDependentV2 = dynamic_cast(internals());
if (!platformDependentV2) {
- return 0;
+ return nullptr;
}
if (m_ioDevice) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/src/qtplatformdependent.cpp new/attica-5.31.0/src/qtplatformdependent.cpp
--- old/attica-5.30.0/src/qtplatformdependent.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/src/qtplatformdependent.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -57,7 +57,7 @@
QMutexLocker l(&m_accessMutex);
QThread *currThread = QThread::currentThread();
- QNetworkAccessManager *oldNam = 0;
+ QNetworkAccessManager *oldNam = nullptr;
if (m_threadNamHash.contains(currThread) && m_ourNamSet.contains(currThread)) {
oldNam = m_threadNamHash[ currThread ];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.30.0/tests/projecttest/projecttest.cpp new/attica-5.31.0/tests/projecttest/projecttest.cpp
--- old/attica-5.30.0/tests/projecttest/projecttest.cpp 2017-01-08 16:11:28.000000000 +0100
+++ new/attica-5.31.0/tests/projecttest/projecttest.cpp 2017-02-04 19:01:05.000000000 +0100
@@ -42,7 +42,7 @@
using namespace Attica;
ProjectTest::ProjectTest() : QMainWindow(),
- m_mainWidget(0)
+ m_mainWidget(nullptr)
{
m_mainWidget = new QWidget();
setCentralWidget(m_mainWidget);