Hello community,
here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2016-07-03 12:18:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old)
and /work/SRC/openSUSE:Factory/.attica-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2016-05-19 12:04:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2016-07-03 12:18:52.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Jun 6 21:22:31 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.23.0
+ * Make it actually possible to tell providers from the url
+ we were given
+ * Provide QDebug helpers for some Attica classes
+ * Fix redirection of absolute Urls (kde#354748)
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.23.0.php
+
+-------------------------------------------------------------------
Old:
----
attica-5.22.0.tar.xz
New:
----
attica-5.23.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ attica-qt5.spec ++++++
--- /var/tmp/diff_new_pack.pBAKrC/_old 2016-07-03 12:18:53.000000000 +0200
+++ /var/tmp/diff_new_pack.pBAKrC/_new 2016-07-03 12:18:53.000000000 +0200
@@ -19,9 +19,9 @@
%define sonum 5
%define rname attica
%define _libname KF5Attica
-%define _tar_path 5.22
+%define _tar_path 5.23
Name: attica-qt5
-Version: 5.22.0
+Version: 5.23.0
Release: 0
Summary: Open Collaboration Service client library
License: LGPL-2.1+
++++++ attica-5.22.0.tar.xz -> attica-5.23.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/.arcconfig new/attica-5.23.0/.arcconfig
--- old/attica-5.22.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100
+++ new/attica-5.23.0/.arcconfig 2016-06-06 11:23:52.000000000 +0200
@@ -0,0 +1,4 @@
+{
+ "phabricator.uri" : "https://phabricator.kde.org/project/profile/90/"
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/CMakeLists.txt new/attica-5.23.0/CMakeLists.txt
--- old/attica-5.22.0/CMakeLists.txt 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/CMakeLists.txt 2016-06-06 11:23:52.000000000 +0200
@@ -4,7 +4,7 @@
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.22.0 NO_MODULE)
+find_package(ECM 5.23.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)
@@ -18,7 +18,7 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(KF5_VERSION "5.22.0") # handled by release scripts
+set(KF5_VERSION "5.23.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX ATTICA
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/metainfo.yaml new/attica-5.23.0/metainfo.yaml
--- old/attica-5.22.0/metainfo.yaml 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/metainfo.yaml 2016-06-06 11:23:52.000000000 +0200
@@ -11,3 +11,7 @@
- qmake: Attica
cmake: "KF5::Attica"
cmakename: KF5Attica
+
+public_lib: true
+group: Frameworks
+subgroup: Tier 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/CMakeLists.txt new/attica-5.23.0/src/CMakeLists.txt
--- old/attica-5.22.0/src/CMakeLists.txt 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/CMakeLists.txt 2016-06-06 11:23:52.000000000 +0200
@@ -4,9 +4,6 @@
endif (MINGW)
configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-configure_file(atticaclient_export.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/atticaclient_export.h)
-# TODO: use generate_export_header?
-#generate_export_header(KF5Attica BASE_NAME Attica)
set(attica_SRCS
accountbalance.cpp
@@ -79,26 +76,15 @@
topicparser.cpp
)
-if (ATTICA_STATIC_BUILD)
- add_library(KF5Attica STATIC ${attica_SRCS})
- set_target_properties(KF5Attica PROPERTIES
- VERSION ${ATTICA_VERSION_STRING}
- SOVERSION ${ATTICA_VERSION_MAJOR}
- SOVERSION ${ATTICA_SOVERSION}
- EXPORT_NAME "Attica"
- )
-else (ATTICA_STATIC_BUILD)
- add_library(KF5Attica SHARED ${attica_SRCS})
- set_target_properties(KF5Attica PROPERTIES
- VERSION ${ATTICA_VERSION_STRING}
- #SOVERSION ${ATTICA_VERSION_MAJOR}.${ATTICA_VERSION_MINOR}
- SOVERSION ${ATTICA_SOVERSION}
- EXPORT_NAME "Attica"
- DEFINE_SYMBOL ATTICA_LIB_MAKEDLL
- )
-endif(ATTICA_STATIC_BUILD)
+add_library(KF5Attica ${attica_SRCS})
+set_target_properties(KF5Attica PROPERTIES
+ VERSION ${ATTICA_VERSION_STRING}
+ SOVERSION ${ATTICA_SOVERSION}
+ EXPORT_NAME "Attica"
+)
add_library(KF5::Attica ALIAS KF5Attica)
+generate_export_header(KF5Attica BASE_NAME Attica)
target_link_libraries(KF5Attica
PUBLIC
@@ -165,7 +151,7 @@
platformdependent_v2.h
${Attica_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/version.h
- ${CMAKE_CURRENT_BINARY_DIR}/atticaclient_export.h
+ ${CMAKE_CURRENT_BINARY_DIR}/attica_export.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Attica/attica
COMPONENT Devel
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/accountbalance.h new/attica-5.23.0/src/accountbalance.h
--- old/attica-5.22.0/src/accountbalance.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/accountbalance.h 2016-06-06 11:23:52.000000000 +0200
@@ -24,7 +24,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/achievement.h new/attica-5.23.0/src/achievement.h
--- old/attica-5.22.0/src/achievement.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/achievement.h 2016-06-06 11:23:52.000000000 +0200
@@ -23,7 +23,7 @@
#ifndef ATTICA_ACHIEVEMENT_H
#define ATTICA_ACHIEVEMENT_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/activity.h new/attica-5.23.0/src/activity.h
--- old/attica-5.22.0/src/activity.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/activity.h 2016-06-06 11:23:52.000000000 +0200
@@ -27,7 +27,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "person.h"
class QDateTime;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/atticabasejob.cpp new/attica-5.23.0/src/atticabasejob.cpp
--- old/attica-5.22.0/src/atticabasejob.cpp 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/atticabasejob.cpp 2016-06-06 11:23:52.000000000 +0200
@@ -56,8 +56,13 @@
httpStatusCode == 303 || // See Other
httpStatusCode == 307) { // Temporary Redirect
QNetworkRequest request = m_reply->request();
- newUrl = request.url();
- newUrl.setPath(m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toString());
+ QUrl redirectUrl(m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl());
+ if (redirectUrl.isRelative()) {
+ QUrl baseUrl(request.url());
+ newUrl = baseUrl.resolved(redirectUrl);
+ } else {
+ newUrl = redirectUrl;
+ }
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/atticabasejob.h new/attica-5.23.0/src/atticabasejob.h
--- old/attica-5.22.0/src/atticabasejob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/atticabasejob.h 2016-06-06 11:23:52.000000000 +0200
@@ -29,7 +29,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "metadata.h"
class QNetworkReply;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/atticaclient_export.h.cmake new/attica-5.23.0/src/atticaclient_export.h.cmake
--- old/attica-5.22.0/src/atticaclient_export.h.cmake 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/atticaclient_export.h.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-/*
- Copyright (c) 2009 Eckhart Wörner
- Copyright (c) 2009 Frederik Gladhorn
- Copyright (c) 2011 Tudorica Constantin-Alexandru
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
-
- 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see http://www.gnu.org/licenses/.
-
-*/
-#ifndef ATTICACLIENT_EXPORT_H
-#define ATTICACLIENT_EXPORT_H
-
-#include
-
-#cmakedefine01 ATTICA_STATIC_BUILD
-
-#ifndef ATTICA_EXPORT
-# if ATTICA_STATIC_BUILD
- /* No export/import for static libraries */
-# define ATTICA_EXPORT
-# elif defined(ATTICA_LIB_MAKEDLL)
- /* We are building this library */
-# define ATTICA_EXPORT Q_DECL_EXPORT
-# else
- /* We are using this library */
-# define ATTICA_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/buildservice.h new/attica-5.23.0/src/buildservice.h
--- old/attica-5.22.0/src/buildservice.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/buildservice.h 2016-06-06 11:23:52.000000000 +0200
@@ -30,7 +30,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/buildservicejob.h new/attica-5.23.0/src/buildservicejob.h
--- old/attica-5.22.0/src/buildservicejob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/buildservicejob.h 2016-06-06 11:23:52.000000000 +0200
@@ -30,7 +30,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/buildservicejoboutput.h new/attica-5.23.0/src/buildservicejoboutput.h
--- old/attica-5.22.0/src/buildservicejoboutput.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/buildservicejoboutput.h 2016-06-06 11:23:52.000000000 +0200
@@ -27,7 +27,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/category.cpp new/attica-5.23.0/src/category.cpp
--- old/attica-5.22.0/src/category.cpp 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/category.cpp 2016-06-06 11:23:52.000000000 +0200
@@ -24,9 +24,17 @@
#include "category.h"
#include
+#include
using namespace Attica;
+QDebug operator<<(QDebug s, const Attica::Category& cat)
+{
+ const QString name = cat.isValid() ? cat.name() : QStringLiteral("Invalid");
+ s.nospace() << "Category(" << name << ')';
+ return s.space();
+}
+
class Category::Private : public QSharedData
{
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/category.h new/attica-5.23.0/src/category.h
--- old/attica-5.22.0/src/category.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/category.h 2016-06-06 11:23:52.000000000 +0200
@@ -26,7 +26,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
@@ -102,4 +102,6 @@
}
+QDebug operator<<(QDebug s, const Attica::Category& cat);
+
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/cloud.h new/attica-5.23.0/src/cloud.h
--- old/attica-5.22.0/src/cloud.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/cloud.h 2016-06-06 11:23:52.000000000 +0200
@@ -23,7 +23,7 @@
#ifndef ATTICA_CLOUD_H
#define ATTICA_CLOUD_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/comment.h new/attica-5.23.0/src/comment.h
--- old/attica-5.22.0/src/comment.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/comment.h 2016-06-06 11:23:52.000000000 +0200
@@ -24,7 +24,7 @@
#ifndef ATTICA_COMMENT_H
#define ATTICA_COMMENT_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/content.h new/attica-5.23.0/src/content.h
--- old/attica-5.22.0/src/content.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/content.h 2016-06-06 11:23:52.000000000 +0200
@@ -29,7 +29,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "downloaddescription.h"
#include "homepageentry.h"
#include "icon.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/deletejob.h new/attica-5.23.0/src/deletejob.h
--- old/attica-5.22.0/src/deletejob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/deletejob.h 2016-06-06 11:23:52.000000000 +0200
@@ -26,7 +26,7 @@
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "atticabasejob.h"
namespace Attica
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/distribution.h new/attica-5.23.0/src/distribution.h
--- old/attica-5.22.0/src/distribution.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/distribution.h 2016-06-06 11:23:52.000000000 +0200
@@ -28,7 +28,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/downloaddescription.h new/attica-5.23.0/src/downloaddescription.h
--- old/attica-5.22.0/src/downloaddescription.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/downloaddescription.h 2016-06-06 11:23:52.000000000 +0200
@@ -27,7 +27,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/downloaditem.h new/attica-5.23.0/src/downloaditem.h
--- old/attica-5.22.0/src/downloaditem.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/downloaditem.h 2016-06-06 11:23:52.000000000 +0200
@@ -27,7 +27,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "downloaddescription.h"
namespace Attica
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/event.h new/attica-5.23.0/src/event.h
--- old/attica-5.22.0/src/event.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/event.h 2016-06-06 11:23:52.000000000 +0200
@@ -24,7 +24,7 @@
#ifndef ATTICA_EVENT_H
#define ATTICA_EVENT_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/folder.h new/attica-5.23.0/src/folder.h
--- old/attica-5.22.0/src/folder.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/folder.h 2016-06-06 11:23:52.000000000 +0200
@@ -23,7 +23,7 @@
#ifndef ATTICA_FOLDER_H
#define ATTICA_FOLDER_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/forum.h new/attica-5.23.0/src/forum.h
--- old/attica-5.22.0/src/forum.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/forum.h 2016-06-06 11:23:52.000000000 +0200
@@ -23,7 +23,7 @@
#ifndef ATTICA_FORUM_H
#define ATTICA_FORUM_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "topic.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/getjob.h new/attica-5.23.0/src/getjob.h
--- old/attica-5.22.0/src/getjob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/getjob.h 2016-06-06 11:23:52.000000000 +0200
@@ -26,7 +26,7 @@
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "atticabasejob.h"
namespace Attica
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/homepageentry.h new/attica-5.23.0/src/homepageentry.h
--- old/attica-5.22.0/src/homepageentry.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/homepageentry.h 2016-06-06 11:23:52.000000000 +0200
@@ -28,7 +28,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/homepagetype.h new/attica-5.23.0/src/homepagetype.h
--- old/attica-5.22.0/src/homepagetype.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/homepagetype.h 2016-06-06 11:23:52.000000000 +0200
@@ -28,7 +28,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/icon.h new/attica-5.23.0/src/icon.h
--- old/attica-5.22.0/src/icon.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/icon.h 2016-06-06 11:23:52.000000000 +0200
@@ -28,7 +28,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/itemjob.h new/attica-5.23.0/src/itemjob.h
--- old/attica-5.22.0/src/itemjob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/itemjob.h 2016-06-06 11:23:52.000000000 +0200
@@ -24,7 +24,7 @@
#ifndef ATTICA_ITEMJOB_H
#define ATTICA_ITEMJOB_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "getjob.h"
#include "deletejob.h"
#include "postjob.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/knowledgebaseentry.h new/attica-5.23.0/src/knowledgebaseentry.h
--- old/attica-5.22.0/src/knowledgebaseentry.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/knowledgebaseentry.h 2016-06-06 11:23:52.000000000 +0200
@@ -23,7 +23,7 @@
#ifndef ATTICA_KNOWLEDGEBASEENTRY_H
#define ATTICA_KNOWLEDGEBASEENTRY_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/license.h new/attica-5.23.0/src/license.h
--- old/attica-5.22.0/src/license.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/license.h 2016-06-06 11:23:52.000000000 +0200
@@ -25,7 +25,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/listjob.h new/attica-5.23.0/src/listjob.h
--- old/attica-5.22.0/src/listjob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/listjob.h 2016-06-06 11:23:52.000000000 +0200
@@ -24,7 +24,7 @@
#ifndef LISTJOB_H
#define LISTJOB_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "getjob.h"
class QNetworkRequest;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/message.h new/attica-5.23.0/src/message.h
--- old/attica-5.22.0/src/message.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/message.h 2016-06-06 11:23:52.000000000 +0200
@@ -27,7 +27,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/metadata.h new/attica-5.23.0/src/metadata.h
--- old/attica-5.22.0/src/metadata.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/metadata.h 2016-06-06 11:23:52.000000000 +0200
@@ -27,7 +27,7 @@
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/person.h new/attica-5.23.0/src/person.h
--- old/attica-5.22.0/src/person.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/person.h 2016-06-06 11:23:52.000000000 +0200
@@ -29,7 +29,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/personparser.h new/attica-5.23.0/src/personparser.h
--- old/attica-5.22.0/src/personparser.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/personparser.h 2016-06-06 11:23:52.000000000 +0200
@@ -27,7 +27,7 @@
#include "person.h"
#include "parser.h"
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/postjob.h new/attica-5.23.0/src/postjob.h
--- old/attica-5.22.0/src/postjob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/postjob.h 2016-06-06 11:23:52.000000000 +0200
@@ -26,7 +26,7 @@
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "atticabasejob.h"
// workaround to get initialization working with gcc < 4.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/privatedata.h new/attica-5.23.0/src/privatedata.h
--- old/attica-5.22.0/src/privatedata.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/privatedata.h 2016-06-06 11:23:52.000000000 +0200
@@ -31,7 +31,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/project.h new/attica-5.23.0/src/project.h
--- old/attica-5.22.0/src/project.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/project.h 2016-06-06 11:23:52.000000000 +0200
@@ -30,7 +30,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/provider.cpp new/attica-5.23.0/src/provider.cpp
--- old/attica-5.22.0/src/provider.cpp 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/provider.cpp 2016-06-06 11:23:52.000000000 +0200
@@ -91,6 +91,15 @@
using namespace Attica;
+QDebug operator<<(QDebug s, const Attica::Provider& prov)
+{
+ if (prov.isValid())
+ s.nospace() << "Provider(" << prov.name() << ':' << prov.baseUrl() << ')';
+ else
+ s.nospace() << "Provider(Invalid)";
+ return s.space();
+}
+
class Provider::Private : public QSharedData
{
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/provider.h new/attica-5.23.0/src/provider.h
--- old/attica-5.22.0/src/provider.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/provider.h 2016-06-06 11:23:52.000000000 +0200
@@ -33,7 +33,7 @@
#include
#include "achievement.h"
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "category.h"
#include "forum.h"
#include "itemjob.h"
@@ -699,4 +699,6 @@
};
}
+static QDebug operator<<(QDebug s, const Attica::Provider& prov);
+
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/providermanager.cpp new/attica-5.23.0/src/providermanager.cpp
--- old/attica-5.22.0/src/providermanager.cpp 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/providermanager.cpp 2016-06-06 11:23:52.000000000 +0200
@@ -48,7 +48,7 @@
public:
PlatformDependent *m_internals;
QHash m_providers;
- QHash m_providerFiles;
+ QHash m_providerTargets;
QSignalMapper m_downloadMapping;
QHash m_downloads;
bool m_authenticationSuppressed;
@@ -96,7 +96,7 @@
void ProviderManager::clear()
{
- d->m_providerFiles.clear();
+ d->m_providerTargets.clear();
d->m_providers.clear();
}
@@ -139,7 +139,7 @@
qWarning() << "ProviderManager::addProviderFile: could not open provider file: " << url.toString();
return;
}
- addProviderFromXml(QLatin1String(file.readAll()));
+ parseProviderFile(QLatin1String(file.readAll()), url);
} else {
if (!d->m_downloads.contains(url.toString())) {
QNetworkReply *reply = d->m_internals->get(QNetworkRequest(url));
@@ -153,18 +153,17 @@
void ProviderManager::fileFinished(const QString &url)
{
QNetworkReply *reply = d->m_downloads.take(url);
- parseProviderFile(QLatin1String(reply->readAll()), url);
+ parseProviderFile(QLatin1String(reply->readAll()), QUrl(url));
reply->deleteLater();
}
void ProviderManager::addProviderFromXml(const QString &providerXml)
{
- parseProviderFile(providerXml, QString());
+ parseProviderFile(providerXml, QUrl());
}
-void ProviderManager::parseProviderFile(const QString &xmlString, const QString &url)
+void ProviderManager::parseProviderFile(const QString &xmlString, const QUrl &url)
{
- Q_UNUSED(url)
QXmlStreamReader xml(xmlString);
while (!xml.atEnd() && xml.readNext()) {
if (xml.isStartElement() && xml.name() == QLatin1String("provider")) {
@@ -226,16 +225,26 @@
d->m_providers.insert(baseUrl, Provider(d->m_internals, baseUrl, name, icon,
person, friendV, message, achievement, activity, content, fan, forum, knowledgebase,
event, comment, registerUrl));
+ d->m_providerTargets[url] = baseUrl;
emit providerAdded(d->m_providers.value(baseUrl));
}
}
}
+ if (xml.error() != QXmlStreamReader::NoError) {
+ qDebug() << "error:" << xml.errorString() << "in" << url;
+ }
+
if (d->m_downloads.isEmpty()) {
emit defaultProvidersLoaded();
}
}
+Provider ProviderManager::providerFor(const QUrl &url) const
+{
+ return providerByUrl(d->m_providerTargets.value(url));
+}
+
Provider ProviderManager::providerByUrl(const QUrl &url) const
{
return d->m_providers.value(url);
@@ -253,7 +262,7 @@
QList<QUrl> ProviderManager::providerFiles() const
{
- return d->m_providerFiles.keys();
+ return d->m_providerTargets.keys();
}
void ProviderManager::authenticate(QNetworkReply *reply, QAuthenticator *auth)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/providermanager.h new/attica-5.23.0/src/providermanager.h
--- old/attica-5.22.0/src/providermanager.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/providermanager.h 2016-06-06 11:23:52.000000000 +0200
@@ -28,7 +28,7 @@
#include
#include "provider.h"
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
@@ -125,10 +125,28 @@
void addProviderFile(const QUrl &file);
QList<QUrl> providerFiles() const;
+ /**
+ * @returns all loaded providers
+ */
QList<Provider> providers() const;
- bool contains(const QString &provider) const;
+
+ ATTICA_DEPRECATED bool contains(const QString &provider) const;
+
+ /**
+ * @returns whether there's a provider with base url @p provider
+ */
+ bool contains(const QUrl &provider) const;
+
+ /**
+ * @returns the provider with @p url base url.
+ */
Provider providerByUrl(const QUrl &url) const;
+ /**
+ * @returns the provider for a given provider @p url.
+ */
+ Provider providerFor(const QUrl &url) const;
+
Q_SIGNALS:
void providerAdded(const Attica::Provider &provider);
void defaultProvidersLoaded();
@@ -147,7 +165,7 @@
void initNetworkAccesssManager();
PlatformDependent *loadPlatformDependent(const ProviderFlags &flags);
- void parseProviderFile(const QString &xmlString, const QString &url);
+ void parseProviderFile(const QString &xmlString, const QUrl &url);
class Private;
Private *const d;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/publisher.h new/attica-5.23.0/src/publisher.h
--- old/attica-5.22.0/src/publisher.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/publisher.h 2016-06-06 11:23:52.000000000 +0200
@@ -31,7 +31,7 @@
#include
#include "buildservice.h"
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/publisherfield.h new/attica-5.23.0/src/publisherfield.h
--- old/attica-5.22.0/src/publisherfield.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/publisherfield.h 2016-06-06 11:23:52.000000000 +0200
@@ -25,7 +25,7 @@
#define PUBLISHERFIELD_H
#include "buildservice.h"
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/putjob.h new/attica-5.23.0/src/putjob.h
--- old/attica-5.22.0/src/putjob.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/putjob.h 2016-06-06 11:23:52.000000000 +0200
@@ -26,7 +26,7 @@
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include "atticabasejob.h"
// workaround to get initialization working with gcc < 4.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/remoteaccount.h new/attica-5.23.0/src/remoteaccount.h
--- old/attica-5.22.0/src/remoteaccount.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/remoteaccount.h 2016-06-06 11:23:52.000000000 +0200
@@ -30,7 +30,7 @@
#include
#include
-#include "atticaclient_export.h"
+#include "attica_export.h"
namespace Attica
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/topic.h new/attica-5.23.0/src/topic.h
--- old/attica-5.22.0/src/topic.h 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/topic.h 2016-06-06 11:23:52.000000000 +0200
@@ -23,7 +23,7 @@
#ifndef ATTICA_TOPIC_H
#define ATTICA_TOPIC_H
-#include "atticaclient_export.h"
+#include "attica_export.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.22.0/src/version.h.cmake new/attica-5.23.0/src/version.h.cmake
--- old/attica-5.22.0/src/version.h.cmake 2016-05-06 21:29:06.000000000 +0200
+++ new/attica-5.23.0/src/version.h.cmake 2016-06-06 11:23:52.000000000 +0200
@@ -21,7 +21,7 @@
#ifndef _ATTICA_VERSION_H_
#define _ATTICA_VERSION_H_
-#include "atticaclient_export.h"
+#include "attica_export.h"
/// @brief Attica version as string at compile time.
#define LIBATTICA_VERSION_STRING "${CMAKE_LIBATTICA_VERSION_STRING}"