Hello community,
here is the log from the commit of package libaccounts-qt5 for openSUSE:Factory
checked in at 2019-10-02 11:55:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libaccounts-qt5 (Old)
and /work/SRC/openSUSE:Factory/.libaccounts-qt5.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libaccounts-qt5"
Wed Oct 2 11:55:09 2019 rev:4 rq:733537 version:1.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/libaccounts-qt5/libaccounts-qt5.changes
2017-11-09 16:22:16.163409239 +0100
+++
/work/SRC/openSUSE:Factory/.libaccounts-qt5.new.2352/libaccounts-qt5.changes
2019-10-02 11:55:10.575604679 +0200
@@ -1,0 +2,10 @@
+Wed Sep 25 16:50:25 UTC 2019 - [email protected]
+
+- Update to 1.16
+ * Use nullptr instead of 0 to suppress modern compiler warning
+ * Stop using deprecated API
+ * Add method to retrieve service-type descriptions
+ * Add method to retrieve service descriptions
+- Run spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8.tar.bz2
New:
----
libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libaccounts-qt5.spec ++++++
--- /var/tmp/diff_new_pack.oXmiO0/_old 2019-10-02 11:55:11.063603413 +0200
+++ /var/tmp/diff_new_pack.oXmiO0/_new 2019-10-02 11:55:11.067603402 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libaccounts-qt5
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,25 +12,26 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define _soname 1
%define _tarbasename libaccounts-qt
-%define _version VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8
+%define _version VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e
Name: libaccounts-qt5
-Version: 1.15
+Version: 1.16
Release: 0
Summary: Qt library for Single Sign On
-License: LGPL-2.1
+License: LGPL-2.1-only
Group: System/Libraries
-Url: https://gitlab.com/accounts-sso/libaccounts-qt
+URL: https://gitlab.com/accounts-sso/libaccounts-qt
Source:
https://gitlab.com/accounts-sso/%{_tarbasename}/repository/VERSION_%{version}/archive.tar.bz2#/%{_tarbasename}-%{_version}.tar.bz2
Source99: baselibs.conf
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: graphviz
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Xml)
@@ -89,16 +90,14 @@
%fdupes %{buildroot}%{_docdir}/
%post -n libaccounts-qt5-%{_soname} -p /sbin/ldconfig
-
%postun -n libaccounts-qt5-%{_soname} -p /sbin/ldconfig
%files -n libaccounts-qt5-%{_soname}
-%defattr(-,root,root)
-%doc COPYING README.md
+%license COPYING
+%doc README.md
%{_libdir}/libaccounts-qt5.so.*
%files devel
-%defattr(-,root,root)
%{_includedir}/accounts-qt5/
%{_libdir}/libaccounts-qt5.so
%{_libdir}/pkgconfig/accounts-qt5.pc
@@ -106,7 +105,6 @@
%{_libdir}/cmake/AccountsQt5/
%files doc
-%defattr(-,root,root)
%doc %{_docdir}/accounts-qt/
%changelog
++++++
libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8.tar.bz2 ->
libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/.gitlab-ci.yml
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/.gitlab-ci.yml
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/.gitlab-ci.yml
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/.gitlab-ci.yml
2019-09-18 21:00:34.000000000 +0200
@@ -1,4 +1,4 @@
-image: ubuntu:xenial
+image: ubuntu:bionic
cache:
key: apt-cache
@@ -7,7 +7,7 @@
before_script:
- export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
- - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR"
install -y qt5-qmake qtbase5-dev qtchooser pkg-config doxygen
libaccounts-glib-dev
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR"
install -y qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config
doxygen libaccounts-glib-dev
- apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y
dbus-test-runner lcov gcovr
build_amd64:
@@ -30,3 +30,25 @@
- make coverage-html
dependencies:
- build_amd64
+ artifacts:
+ paths:
+ - build/
+
+pages:
+ stage: deploy
+ script:
+ - find build | xargs touch # Avoid rebuilding
+ - cd build
+ - make docs
+ - cd ..
+ - mkdir public
+ - cp -a build/coverage-html public/coverage
+ - cp -a build/doc/html/* public/
+ dependencies:
+ - test_amd64
+ artifacts:
+ paths:
+ - public
+ only:
+ - master
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account-service.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account-service.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account-service.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account-service.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -153,7 +153,7 @@
g_signal_handlers_disconnect_by_func(m_accountService,
(void *)&onChanged, q);
g_object_unref(m_accountService);
- m_accountService = 0;
+ m_accountService = nullptr;
}
void AccountServicePrivate::onEnabled(AccountService *accountService,
@@ -173,7 +173,7 @@
* @param service A Service supported by the account.
*/
AccountService::AccountService(Account *account, const Service &service):
- QObject(0),
+ QObject(nullptr),
d_ptr(new AccountServicePrivate(account, service, this))
{
}
@@ -389,7 +389,7 @@
Q_D(AccountService);
GVariant *variant = qVariantToGVariant(value);
- if (variant == 0) {
+ if (variant == nullptr) {
return;
}
@@ -428,7 +428,7 @@
ag_account_service_get_variant(d->m_accountService,
ba.constData(),
&settingSource);
- if (source != 0) {
+ if (source != nullptr) {
switch (settingSource) {
case AG_SETTING_SOURCE_ACCOUNT: *source = ACCOUNT; break;
case AG_SETTING_SOURCE_PROFILE: *source = TEMPLATE; break;
@@ -436,7 +436,7 @@
}
}
- return (variant != 0) ? gVariantToQVariant(variant) : defaultValue;
+ return (variant != nullptr) ? gVariantToQVariant(variant) : defaultValue;
}
/*!
@@ -472,11 +472,11 @@
ag_account_service_get_changed_fields(d->m_accountService);
QStringList keyList;
- if (changedFields == 0)
+ if (changedFields == nullptr)
return keyList;
gchar **keys = changedFields;
- while (*keys != 0) {
+ while (*keys != nullptr) {
keyList.append(QString(ASCII(*keys)));
keys++;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account-service.h
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account-service.h
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account-service.h
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account-service.h
2019-09-18 21:00:34.000000000 +0200
@@ -74,9 +74,9 @@
QVariant value(const QString &key,
const QVariant &defaultValue,
- SettingSource *source = 0) const;
- QVariant value(const QString &key, SettingSource *source = 0) const;
- QVariant value(const char *key, SettingSource *source = 0) const;
+ SettingSource *source = nullptr) const;
+ QVariant value(const QString &key, SettingSource *source = nullptr) const;
+ QVariant value(const char *key, SettingSource *source = nullptr) const;
QStringList changedFields() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -156,7 +156,7 @@
void Account::Private::init(Account *account)
{
- if (m_account == 0) return;
+ if (m_account == nullptr) return;
g_signal_connect_swapped(m_account, "display-name-changed",
G_CALLBACK(&Private::on_display_name_changed),
account);
@@ -224,16 +224,16 @@
*/
Account *Account::fromId(Manager *manager, AccountId id, QObject *parent)
{
- GError *error = 0;
+ GError *error = nullptr;
AgAccount *account = ag_manager_load_account(manager->d->m_manager, id,
&error);
- if (account == 0) {
- Q_ASSERT(error != 0);
+ if (account == nullptr) {
+ Q_ASSERT(error != nullptr);
manager->d->lastError = Error(error);
g_error_free(error);
return 0;
}
- Q_ASSERT(error == 0);
+ Q_ASSERT(error == nullptr);
return new Account(new Private(manager, account), parent);
}
@@ -258,7 +258,7 @@
(d->m_account, (void *)&Private::on_deleted, this);
g_object_unref(d->m_account);
delete d;
- d = 0;
+ d = nullptr;
}
/*!
@@ -608,7 +608,7 @@
void Account::setValue(const QString &key, const QVariant &value)
{
GVariant *variant = qVariantToGVariant(value);
- if (variant == 0) {
+ if (variant == nullptr) {
return;
}
@@ -657,7 +657,7 @@
AgSettingSource settingSource;
GVariant *variant =
ag_account_get_variant(d->m_account, ba.constData(), &settingSource);
- if (source != 0) {
+ if (source != nullptr) {
switch (settingSource) {
case AG_SETTING_SOURCE_ACCOUNT: *source = ACCOUNT; break;
case AG_SETTING_SOURCE_PROFILE: *source = TEMPLATE; break;
@@ -665,7 +665,7 @@
}
}
- return (variant != 0) ? gVariantToQVariant(variant) : defaultValue;
+ return (variant != nullptr) ? gVariantToQVariant(variant) : defaultValue;
}
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account.h
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account.h
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/account.h
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/account.h
2019-09-18 21:00:34.000000000 +0200
@@ -75,7 +75,7 @@
/* We don't want to document these.
* \cond
*/
- Watch(QObject *parent = 0);
+ Watch(QObject *parent = nullptr);
~Watch();
void setWatch(AgAccountWatch w) { watch = w; };
@@ -97,11 +97,11 @@
Q_OBJECT
public:
- Account(Manager *manager, const QString &provider, QObject *parent = 0);
+ Account(Manager *manager, const QString &provider, QObject *parent =
nullptr);
virtual ~Account();
static Account *fromId(Manager *manager, AccountId id,
- QObject *parent = 0);
+ QObject *parent = nullptr);
AccountId id() const;
@@ -159,20 +159,20 @@
void setValue(const QString &key, const QVariant &value);
QVariant value(const QString &key,
const QVariant &defaultValue = QVariant(),
- SettingSource *source = 0) const;
+ SettingSource *source = nullptr) const;
SettingSource value(const QString &key, QVariant &value) const;
QString valueAsString(const QString &key,
- QString default_value = QString::null,
- SettingSource *source = 0) const;
+ QString default_value = QString(),
+ SettingSource *source = nullptr) const;
int valueAsInt(const QString &key,
int default_value = 0,
- SettingSource *source = 0) const;
+ SettingSource *source = nullptr) const;
quint64 valueAsUInt64(const QString &key,
quint64 default_value = 0,
- SettingSource *source = 0) const;
+ SettingSource *source = nullptr) const;
bool valueAsBool(const QString &key,
bool default_value = false,
- SettingSource *source = 0) const;
+ SettingSource *source = nullptr) const;
Watch *watchKey(const QString &key = QString());
@@ -198,7 +198,7 @@
AgAccount *account();
// Don't include private data in docs: \cond
class Private;
- Account(Private *d, QObject *parent = 0);
+ Account(Private *d, QObject *parent = nullptr);
friend class Manager;
friend class Account::Private;
friend class Watch;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/application.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/application.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/application.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/application.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -51,7 +51,7 @@
* Construct an invalid application.
*/
Application::Application():
- m_application(0)
+ m_application(nullptr)
{
}
@@ -62,17 +62,17 @@
Application::Application(const Application &other):
m_application(other.m_application)
{
- if (m_application != 0)
+ if (m_application != nullptr)
ag_application_ref(m_application);
}
Application &Application::operator=(const Application &other)
{
if (m_application == other.m_application) return *this;
- if (m_application != 0)
+ if (m_application != nullptr)
ag_application_unref(m_application);
m_application = other.m_application;
- if (m_application != 0)
+ if (m_application != nullptr)
ag_application_ref(m_application);
return *this;
}
@@ -82,9 +82,9 @@
*/
Application::~Application()
{
- if (m_application != 0) {
+ if (m_application != nullptr) {
ag_application_unref(m_application);
- m_application = 0;
+ m_application = nullptr;
}
}
@@ -94,7 +94,7 @@
*/
bool Application::isValid() const
{
- return m_application != 0;
+ return m_application != nullptr;
}
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/auth-data.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/auth-data.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/auth-data.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/auth-data.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -65,7 +65,7 @@
AuthData::~AuthData()
{
ag_auth_data_unref(m_authData);
- m_authData = 0;
+ m_authData = nullptr;
}
/*!
@@ -106,7 +106,7 @@
GVariant *glibParameters;
glibParameters = ag_auth_data_get_login_parameters(m_authData, NULL);
- if (glibParameters == 0) return QVariantMap();
+ if (glibParameters == nullptr) return QVariantMap();
QVariant variant = gVariantToQVariant(glibParameters);
g_variant_unref(glibParameters);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/manager.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/manager.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/manager.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/manager.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -94,8 +94,8 @@
void Manager::Private::init(Manager *q, AgManager *manager)
{
- Q_ASSERT(q_ptr == 0);
- Q_ASSERT(m_manager == 0);
+ Q_ASSERT(q_ptr == nullptr);
+ Q_ASSERT(m_manager == nullptr);
q_ptr = q;
m_manager = manager;
@@ -149,7 +149,7 @@
{
AgManager *manager = ag_manager_new();
- if (manager != 0) {
+ if (manager != nullptr) {
d->init(this, manager);
} else {
qWarning() << "Manager could not be created. DB is locked";
@@ -177,7 +177,7 @@
AgManager *manager =
ag_manager_new_for_service_type(serviceType.toUtf8().constData());
- if (manager != 0) {
+ if (manager != nullptr) {
d->init(this, manager);
} else {
qWarning() << "Manager could not be created, DB is locked";
@@ -227,7 +227,7 @@
g_object_unref(d->m_manager);
delete d;
- d = 0;
+ d = nullptr;
}
/*!
@@ -245,7 +245,7 @@
Account *Manager::account(const AccountId &id) const
{
Account *account = d->m_accounts.value(id, 0);
- if (account == 0) {
+ if (account == nullptr) {
/* Create a new account object */
account = Account::fromId(const_cast<Manager*>(this), id,
const_cast<Manager*>(this));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/manager.h
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/manager.h
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/manager.h
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/manager.h
2019-09-18 21:00:34.000000000 +0200
@@ -62,20 +62,20 @@
};
Q_DECLARE_FLAGS(Options, Option)
- Manager(QObject *parent = 0);
- Manager(const QString &serviceType, QObject *parent = 0);
- Manager(Options options, QObject *parent = 0);
+ Manager(QObject *parent = nullptr);
+ Manager(const QString &serviceType, QObject *parent = nullptr);
+ Manager(Options options, QObject *parent = nullptr);
~Manager();
Account *account(const AccountId &id) const;
- AccountIdList accountList(const QString &serviceType = QString::null)
const;
- AccountIdList accountListEnabled(const QString &serviceType =
QString::null) const;
+ AccountIdList accountList(const QString &serviceType = QString()) const;
+ AccountIdList accountListEnabled(const QString &serviceType = QString())
const;
Account *createAccount(const QString &providerName);
Service service(const QString &serviceName) const;
- ServiceList serviceList(const QString &serviceType = QString::null) const;
+ ServiceList serviceList(const QString &serviceType = QString()) const;
ServiceList serviceList(const Application &application) const;
Provider provider(const QString &providerName) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/provider.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/provider.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/provider.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/provider.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -46,7 +46,7 @@
Provider::Provider(AgProvider *provider, ReferenceMode mode):
m_provider(provider)
{
- if (m_provider != 0 && mode == AddReference)
+ if (m_provider != nullptr && mode == AddReference)
ag_provider_ref(m_provider);
}
@@ -54,7 +54,7 @@
* Construct an invalid provider.
*/
Provider::Provider():
- m_provider(0)
+ m_provider(nullptr)
{
}
@@ -65,26 +65,26 @@
Provider::Provider(const Provider &other):
m_provider(other.m_provider)
{
- if (m_provider != 0)
+ if (m_provider != nullptr)
ag_provider_ref(m_provider);
}
Provider &Provider::operator=(const Provider &other)
{
if (m_provider == other.m_provider) return *this;
- if (m_provider != 0)
+ if (m_provider != nullptr)
ag_provider_unref(m_provider);
m_provider = other.m_provider;
- if (m_provider != 0)
+ if (m_provider != nullptr)
ag_provider_ref(m_provider);
return *this;
}
Provider::~Provider()
{
- if (m_provider != 0) {
+ if (m_provider != nullptr) {
ag_provider_unref(m_provider);
- m_provider = 0;
+ m_provider = nullptr;
}
}
@@ -94,7 +94,7 @@
*/
bool Provider::isValid() const
{
- return m_provider != 0;
+ return m_provider != nullptr;
}
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service-type.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service-type.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service-type.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service-type.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -47,9 +47,9 @@
ServiceType::ServiceType(AgServiceType *serviceType, ReferenceMode mode):
m_serviceType(serviceType),
- m_tags(0)
+ m_tags(nullptr)
{
- if (m_serviceType != 0 && mode == AddReference)
+ if (m_serviceType != nullptr && mode == AddReference)
ag_service_type_ref(m_serviceType);
}
@@ -57,8 +57,8 @@
* Construct an invalid serviceType.
*/
ServiceType::ServiceType():
- m_serviceType(0),
- m_tags(0)
+ m_serviceType(nullptr),
+ m_tags(nullptr)
{
}
@@ -68,32 +68,32 @@
*/
ServiceType::ServiceType(const ServiceType &other):
m_serviceType(other.m_serviceType),
- m_tags(0)
+ m_tags(nullptr)
{
- if (m_serviceType != 0)
+ if (m_serviceType != nullptr)
ag_service_type_ref(m_serviceType);
}
ServiceType &ServiceType::operator=(const ServiceType &other)
{
if (m_serviceType == other.m_serviceType) return *this;
- if (m_serviceType != 0)
+ if (m_serviceType != nullptr)
ag_service_type_unref(m_serviceType);
m_serviceType = other.m_serviceType;
- if (m_serviceType != 0)
+ if (m_serviceType != nullptr)
ag_service_type_ref(m_serviceType);
return *this;
}
ServiceType::~ServiceType()
{
- if (m_serviceType != 0) {
+ if (m_serviceType != nullptr) {
ag_service_type_unref(m_serviceType);
- m_serviceType = 0;
+ m_serviceType = nullptr;
}
- if (m_tags != 0) {
+ if (m_tags != nullptr) {
delete m_tags;
- m_tags = 0;
+ m_tags = nullptr;
}
}
@@ -103,7 +103,7 @@
*/
bool ServiceType::isValid() const
{
- return m_serviceType != 0;
+ return m_serviceType != nullptr;
}
/*!
@@ -116,6 +116,14 @@
}
/*!
+ * @return The description of the service type.
+ */
+QString ServiceType::description() const
+{
+ return UTF8(ag_service_type_get_description(m_serviceType));
+}
+
+/*!
* @return The display name of the service type; this is a string that
* could be shown in the UI to describe the service type to the user.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service-type.h
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service-type.h
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service-type.h
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service-type.h
2019-09-18 21:00:34.000000000 +0200
@@ -57,6 +57,7 @@
bool isValid() const;
QString name() const;
+ QString description() const;
QString displayName() const;
QString trCatalog() const;
QString iconName() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -47,9 +47,9 @@
Service::Service(AgService *service, ReferenceMode mode):
m_service(service),
- m_tags(0)
+ m_tags(nullptr)
{
- if (m_service != 0 && mode == AddReference)
+ if (m_service != nullptr && mode == AddReference)
ag_service_ref(m_service);
}
@@ -57,8 +57,8 @@
* Construct an invalid service.
*/
Service::Service():
- m_service(0),
- m_tags(0)
+ m_service(nullptr),
+ m_tags(nullptr)
{
}
@@ -68,32 +68,32 @@
*/
Service::Service(const Service &other):
m_service(other.m_service),
- m_tags(0)
+ m_tags(nullptr)
{
- if (m_service != 0)
+ if (m_service != nullptr)
ag_service_ref(m_service);
}
Service &Service::operator=(const Service &other)
{
if (m_service == other.m_service) return *this;
- if (m_service != 0)
+ if (m_service != nullptr)
ag_service_unref(m_service);
m_service = other.m_service;
- if (m_service != 0)
+ if (m_service != nullptr)
ag_service_ref(m_service);
return *this;
}
Service::~Service()
{
- if (m_service != 0) {
+ if (m_service != nullptr) {
ag_service_unref(m_service);
- m_service = 0;
+ m_service = nullptr;
}
- if (m_tags != 0) {
+ if (m_tags != nullptr) {
delete m_tags;
- m_tags = 0;
+ m_tags = nullptr;
}
}
@@ -103,7 +103,7 @@
*/
bool Service::isValid() const
{
- return m_service != 0;
+ return m_service != nullptr;
}
/*!
@@ -118,6 +118,15 @@
}
/*!
+ * Get the description of the service.
+ * @return The description of the service.
+ */
+QString Service::description() const
+{
+ return UTF8(ag_service_get_description(m_service));
+}
+
+/*!
* Get the display name of the service, untranslated.
* @return The display name of the service.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service.h
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service.h
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/service.h
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/service.h
2019-09-18 21:00:34.000000000 +0200
@@ -56,6 +56,7 @@
bool isValid() const;
QString name() const;
+ QString description() const;
QString displayName() const;
QString trCatalog() const;
QString serviceType() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/utils.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/utils.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/Accounts/utils.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/Accounts/utils.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -116,7 +116,7 @@
GVariant *qVariantToGVariant(const QVariant &variant)
{
- GVariant *ret = 0;
+ GVariant *ret = nullptr;
QByteArray tmpvalue;
switch (variant.type())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/README.md
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/README.md
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/README.md
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/README.md
2019-09-18 21:00:34.000000000 +0200
@@ -21,3 +21,10 @@
make
make install
```
+
+Resources
+---------
+
+[API reference documentation](http://accounts-sso.gitlab.io/libaccounts-qt/)
+
+[Official source code
repository](https://gitlab.com/accounts-sso/libaccounts-qt)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/common-vars.pri
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/common-vars.pri
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/common-vars.pri
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/common-vars.pri
2019-09-18 21:00:34.000000000 +0200
@@ -13,12 +13,12 @@
#-----------------------------------------------------------------------------
# Project version
#-----------------------------------------------------------------------------
-PROJECT_VERSION = 1.15
+PROJECT_VERSION = 1.16
#-----------------------------------------------------------------------------
# Library version
#-----------------------------------------------------------------------------
-VERSION = 1.3
+VERSION = 1.4
# End of File
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/tests/MyService.service
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/tests/MyService.service
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/tests/MyService.service
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/tests/MyService.service
2019-09-18 21:00:34.000000000 +0200
@@ -2,6 +2,7 @@
<service id="MyService">
<type>e-mail</type>
<name>My Service</name>
+ <description>Test description</description>
<icon>general_myservice</icon>
<provider>MyProvider</provider>
<translations>accounts</translations>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/tests/e-mail.service-type
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/tests/e-mail.service-type
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/tests/e-mail.service-type
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/tests/e-mail.service-type
2019-09-18 21:00:34.000000000 +0200
@@ -2,6 +2,7 @@
<service-type id="e-mail">
<translations>translation_file</translations>
<name>Electronic mail</name>
+ <description>Email test description</description>
<icon>email_icon</icon>
<tags>
<tag>email</tag>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/tests/tst_libaccounts.cpp
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/tests/tst_libaccounts.cpp
---
old/libaccounts-qt-VERSION_1.15-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8/tests/tst_libaccounts.cpp
2016-09-28 10:38:09.000000000 +0200
+++
new/libaccounts-qt-VERSION_1.16-525ec684cfa8d234f797d7e49e21c476eea04d8e/tests/tst_libaccounts.cpp
2019-09-18 21:00:34.000000000 +0200
@@ -322,6 +322,7 @@
Service service = mgr->service(MYSERVICE);
QVERIFY(service.isValid());
QCOMPARE(service.name(), MYSERVICE);
+ QCOMPARE(service.description(), QStringLiteral("Test description"));
QCOMPARE(service.iconName(), QString("general_myservice"));
QCOMPARE(service.trCatalog(), QString("accounts"));
QStringList tags;
@@ -1334,6 +1335,7 @@
QVERIFY(serviceType.isValid());
QCOMPARE(serviceType.name(), EMAIL_SERVICE_TYPE);
+ QCOMPARE(serviceType.description(), QStringLiteral("Email test
description"));
QCOMPARE(serviceType.displayName(), QStringLiteral("Electronic mail"));
QCOMPARE(serviceType.trCatalog(), QStringLiteral("translation_file"));
QCOMPARE(serviceType.iconName(), QStringLiteral("email_icon"));
