From 145c65d5f3dc43a97cec86c2d6f8c3bab7f039ba Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Wed, 7 Sep 2016 12:03:11 +0200 Subject: gplv3 -> gplv2+ --- .../package/contents/ui/ImapAccountSettings.qml | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'accounts') diff --git a/accounts/imap/package/contents/ui/ImapAccountSettings.qml b/accounts/imap/package/contents/ui/ImapAccountSettings.qml index 070f08aa..3b277a5f 100644 --- a/accounts/imap/package/contents/ui/ImapAccountSettings.qml +++ b/accounts/imap/package/contents/ui/ImapAccountSettings.qml @@ -1,19 +1,22 @@ /* - * Copyright (C) 2016 Michael Bohlender + * Copyright 2016 Michael Bohlender michael.bohlender@kdemail.net * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 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 14 of version 3 of the license. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ import QtQuick 2.4 import QtQuick.Controls 1.4 -- cgit v1.2.3 From 98e17d6a8ecd46a9d6956d81f781b05e940387e4 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 15 Sep 2016 11:58:26 +0200 Subject: Adapt to KAsync changes. --- accounts/imap/tests/settingstest.cpp | 4 ++-- accounts/maildir/tests/settingstest.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'accounts') diff --git a/accounts/imap/tests/settingstest.cpp b/accounts/imap/tests/settingstest.cpp index 4301943c..2fbc9b7b 100644 --- a/accounts/imap/tests/settingstest.cpp +++ b/accounts/imap/tests/settingstest.cpp @@ -43,7 +43,7 @@ private slots: settings.setProperty("emailAddress", emailAddress); settings.save(); - Sink::Store::fetchAll(Sink::Query()).then>([](const QList &resources) { + Sink::Store::fetchAll(Sink::Query()).syncThen>([](const QList &resources) { QCOMPARE(resources.size(), 2); }) .exec().waitForFinished(); @@ -76,7 +76,7 @@ private slots: settings.remove(); } - Sink::Store::fetchAll(Sink::Query()).then>([](const QList &resources) { + Sink::Store::fetchAll(Sink::Query()).syncThen>([](const QList &resources) { QCOMPARE(resources.size(), 0); }) .exec().waitForFinished(); diff --git a/accounts/maildir/tests/settingstest.cpp b/accounts/maildir/tests/settingstest.cpp index 342a3b40..47cb3b35 100644 --- a/accounts/maildir/tests/settingstest.cpp +++ b/accounts/maildir/tests/settingstest.cpp @@ -39,7 +39,7 @@ private slots: settings.setProperty("emailAddress", emailAddress); settings.save(); - Sink::Store::fetchAll(Sink::Query()).then>([](const QList &resources) { + Sink::Store::fetchAll(Sink::Query()).syncThen>([](const QList &resources) { QCOMPARE(resources.size(), 2); }) .exec().waitForFinished(); @@ -70,7 +70,7 @@ private slots: settings.remove(); } - Sink::Store::fetchAll(Sink::Query()).then>([](const QList &resources) { + Sink::Store::fetchAll(Sink::Query()).syncThen>([](const QList &resources) { QCOMPARE(resources.size(), 0); }) .exec().waitForFinished(); -- cgit v1.2.3 From acae662cf3aee020f3c5e2eb5876e562926cb931 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Mon, 26 Sep 2016 10:29:24 +0200 Subject: more gplv3 -> gplv2+ --- .../package/contents/ui/ImapAccountSettings.qml | 32 ++++++++++------------ .../contents/ui/KolabnowAccountSettings.qml | 31 +++++++++++---------- .../package/contents/ui/MaildirAccountSettings.qml | 31 +++++++++++---------- 3 files changed, 47 insertions(+), 47 deletions(-) (limited to 'accounts') diff --git a/accounts/imap/package/contents/ui/ImapAccountSettings.qml b/accounts/imap/package/contents/ui/ImapAccountSettings.qml index 3b277a5f..83886572 100644 --- a/accounts/imap/package/contents/ui/ImapAccountSettings.qml +++ b/accounts/imap/package/contents/ui/ImapAccountSettings.qml @@ -1,21 +1,19 @@ /* - * Copyright 2016 Michael Bohlender michael.bohlender@kdemail.net - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 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 14 of version 3 of the license. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + Copyright (C) 2016 Michael Bohlender, + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import QtQuick 2.4 diff --git a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml index 274b9207..753762b7 100644 --- a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml +++ b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml @@ -1,19 +1,20 @@ /* - * Copyright (C) 2016 Michael Bohlender - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ + Copyright (C) 2016 Michael Bohlender, + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ import QtQuick 2.4 import QtQuick.Controls 1.4 diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml index 4db7177b..d867c264 100644 --- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml +++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml @@ -1,19 +1,20 @@ /* - * Copyright (C) 2016 Michael Bohlender - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ + Copyright (C) 2016 Michael Bohlender, + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ import QtQuick 2.4 import QtQuick.Controls 1.4 -- cgit v1.2.3