Hello community, here is the log from the commit of package leechcraft for openSUSE:Leap:15.2 checked in at 2020-02-06 21:36:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/leechcraft (Old) and /work/SRC/openSUSE:Leap:15.2/.leechcraft.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leechcraft" Thu Feb 6 21:36:36 2020 rev:24 rq:770077 version:0.6.70+git.13605.g8cd066ad6a Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/leechcraft/leechcraft-doc.changes 2020-01-15 15:18:31.678345860 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.leechcraft.new.26092/leechcraft-doc.changes 2020-02-06 21:36:38.336110404 +0100 @@ -1,0 +2,6 @@ +Mon Feb 3 10:34:39 UTC 2020 - Dmitriy Perlow <dap.darkn...@gmail.com> + +- Updated to 0.6.70-13588-g98cf733e94 snapshot: + * no changes for doc subpackages. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Leap:15.2/leechcraft/leechcraft.changes 2020-01-15 15:18:31.754345903 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.leechcraft.new.26092/leechcraft.changes 2020-02-06 21:36:38.412110437 +0100 @@ -1,0 +2,7 @@ +Mon Feb 3 10:34:39 UTC 2020 - Dmitriy Perlow <dap.darkn...@gmail.com> + +- Updated to 0.6.70-13588-g98cf733e94 snapshot: + * Qt 5.14 compatibility; + * Overall code refactoring. + +------------------------------------------------------------------- Old: ---- leechcraft-0.6.70-13588-g98cf733e94.tar.xz New: ---- leechcraft-0.6.70-13605-g8cd066ad6a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft-doc.spec ++++++ --- /var/tmp/diff_new_pack.Ytlono/_old 2020-02-06 21:36:39.020110695 +0100 +++ /var/tmp/diff_new_pack.Ytlono/_new 2020-02-06 21:36:39.020110695 +0100 @@ -1,7 +1,7 @@ # # spec file for package leechcraft-doc # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -16,10 +16,10 @@ # -%define LEECHCRAFT_VERSION 0.6.70-13588-g98cf733e94 +%define LEECHCRAFT_VERSION 0.6.70-13605-g8cd066ad6a Name: leechcraft-doc -Version: 0.6.70+git.13588.g98cf733e94 +Version: 0.6.70+git.13605.g8cd066ad6a Release: 0 Summary: Modular Internet Client Documentation License: BSL-1.0 ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.Ytlono/_old 2020-02-06 21:36:39.120110737 +0100 +++ /var/tmp/diff_new_pack.Ytlono/_new 2020-02-06 21:36:39.144110747 +0100 @@ -1,7 +1,7 @@ # # spec file for package leechcraft # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -24,7 +24,7 @@ %define qml_dir %{_datadir}/leechcraft/qml5 %define so_ver -qt5-0_6_75 -%define LEECHCRAFT_VERSION 0.6.70-13588-g98cf733e94 +%define LEECHCRAFT_VERSION 0.6.70-13605-g8cd066ad6a %define db_postfix %{so_ver}_1 %define gui_postfix %{so_ver}_1 @@ -43,7 +43,7 @@ %define xsd_postfix %{so_ver} Name: leechcraft -Version: 0.6.70+git.13588.g98cf733e94 +Version: 0.6.70+git.13605.g8cd066ad6a Release: 0 Summary: Modular Internet Client License: BSL-1.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Ytlono/_old 2020-02-06 21:36:39.416110863 +0100 +++ /var/tmp/diff_new_pack.Ytlono/_new 2020-02-06 21:36:39.436110871 +0100 @@ -1,7 +1,7 @@ <services> <service name="verify_file" mode="buildtime"> - <param name="file">leechcraft-0.6.70-13588-g98cf733e94.tar.xz</param> + <param name="file">leechcraft-0.6.70-13605-g8cd066ad6a.tar.xz</param> <param name="verifier">sha1</param> - <param name="checksum">17db7faa61261c466042718e4cd9895be84e27b2</param> + <param name="checksum">91b4699050fe165378998fc525057d99a4f3ec4e</param> </service> </services> ++++++ leechcraft-0.6.70-13588-g98cf733e94.tar.xz -> leechcraft-0.6.70-13605-g8cd066ad6a.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/core/resources/data/authors.xml new/leechcraft-0.6.70-13605-g8cd066ad6a/src/core/resources/data/authors.xml --- old/leechcraft-0.6.70-13588-g98cf733e94/src/core/resources/data/authors.xml 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/core/resources/data/authors.xml 2020-01-11 16:25:31.000000000 +0100 @@ -5,7 +5,7 @@ <roles> <role>Lead developer and original author.</role> </roles> - <years start="2006" end="2018" /> + <years start="2006" end="2020" /> </contrib> <contrib type="author" name="Oleg Linkin" nick="magog" jid="ma...@gentoo.ru" email="maledictusdema...@gmail.com"> <roles> @@ -84,7 +84,7 @@ <role>Azoth user guide.</role> <role>Various patches.</role> </roles> - <years start="2012" end="2018" /> + <years start="2012" end="2020" /> </contrib> <contrib type="contrib" name="Dimitriy Ryazantcev" nick="DJm00n" jid="djm...@jabber.ru" email="dimitriy.ryazant...@gmail.com"> <roles> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/core/settingstab.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/core/settingstab.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/core/settingstab.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/core/settingstab.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -150,9 +150,9 @@ for (const auto obj : settables) { if (obj == Core::Instance ().GetCoreInstanceObject ()) - result [obj].append ({ "LeechCraft", {} }); + result [obj].push_back ({ "LeechCraft", {} }); else if (!IsProperPlugin2 (obj, settables)) - result [obj].append ({ SettingsTab::tr ("General plugins"), {} }); + result [obj].push_back ({ SettingsTab::tr ("General plugins"), {} }); } return result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/chathistory/storage.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/chathistory/storage.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/chathistory/storage.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/chathistory/storage.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -254,50 +254,52 @@ } QSqlQuery query (*DB_); - QList<QPair<QString, QString>> table2query; - table2query.append ({ - "azoth_users", - "CREATE TABLE azoth_users (" - "Id INTEGER PRIMARY KEY AUTOINCREMENT, " - "EntryID TEXT " - ");" - }); - table2query.append ({ - "azoth_accounts", - "CREATE TABLE azoth_accounts (" - "Id INTEGER PRIMARY KEY AUTOINCREMENT, " - "AccountID TEXT " - ");" - }); - table2query.append ({ - "azoth_history", - "CREATE TABLE azoth_history (" - "Id INTEGER, " - "AccountId INTEGER, " - "Date DATETIME, " - "Direction INTEGER, " - "Message TEXT, " - "Variant TEXT, " - "Type INTEGER, " - "RichMessage TEXT, " - "EscapePolicy VARCHAR(3), " - "UNIQUE (Id, AccountId, Date, Direction, Message, Variant, Type) ON CONFLICT IGNORE);" - }); - table2query.append ({ - "azoth_entrycache", - "CREATE TABLE azoth_entrycache (" - "Id INTEGER UNIQUE ON CONFLICT REPLACE REFERENCES azoth_users (Id) ON DELETE CASCADE, " - "VisibleName TEXT " - ");" - }); - table2query.append ({ - "azoth_acc2users2", - "CREATE TABLE azoth_acc2users2 (" - "AccountId INTEGER REFERENCES azoth_accounts (Id) ON DELETE CASCADE, " - "UserId INTEGER REFERENCES azoth_users (Id) ON DELETE CASCADE, " - "UNIQUE (AccountId, UserId)" - ");" - }); + const QList<QPair<QString, QString>> table2query + { + { + "azoth_users", + "CREATE TABLE azoth_users (" + "Id INTEGER PRIMARY KEY AUTOINCREMENT, " + "EntryID TEXT " + ");" + }, + { + "azoth_accounts", + "CREATE TABLE azoth_accounts (" + "Id INTEGER PRIMARY KEY AUTOINCREMENT, " + "AccountID TEXT " + ");" + }, + { + "azoth_history", + "CREATE TABLE azoth_history (" + "Id INTEGER, " + "AccountId INTEGER, " + "Date DATETIME, " + "Direction INTEGER, " + "Message TEXT, " + "Variant TEXT, " + "Type INTEGER, " + "RichMessage TEXT, " + "EscapePolicy VARCHAR(3), " + "UNIQUE (Id, AccountId, Date, Direction, Message, Variant, Type) ON CONFLICT IGNORE);" + }, + { + "azoth_entrycache", + "CREATE TABLE azoth_entrycache (" + "Id INTEGER UNIQUE ON CONFLICT REPLACE REFERENCES azoth_users (Id) ON DELETE CASCADE, " + "VisibleName TEXT " + ");" + }, + { + "azoth_acc2users2", + "CREATE TABLE azoth_acc2users2 (" + "AccountId INTEGER REFERENCES azoth_accounts (Id) ON DELETE CASCADE, " + "UserId INTEGER REFERENCES azoth_users (Id) ON DELETE CASCADE, " + "UNIQUE (AccountId, UserId)" + ");" + } + }; const auto& tables = DB_->tables (); const bool hadAcc2User = tables.contains ("azoth_acc2users2"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/annotationsmanager.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/annotationsmanager.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/annotationsmanager.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/annotationsmanager.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -40,7 +40,7 @@ { AnnotationsManager::AnnotationsManager (ClientConnection& conn, QObject *parent) : QObject { parent } - , XMPPAnnManager_ { conn.GetExtensionsManager ().Get<XMPPAnnotationsManager> () } + , XMPPAnnManager_ { conn.Exts ().Get<XMPPAnnotationsManager> () } { connect (&XMPPAnnManager_, &XMPPAnnotationsManager::notesReceived, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/clientconnection.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/clientconnection.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/clientconnection.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/clientconnection.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -115,7 +115,7 @@ , ServerInfoStorage_ (new ServerInfoStorage (this, Settings_)) , VCardQueue_ (new FetchQueue ([this] (QString str, bool report) { - const auto& id = Client_->vCardManager ().requestVCard (str); + const auto& id = Exts ().Get<QXmppVCardManager> ().requestVCard (str); ErrorMgr_->Whitelist (id, report); }, OurJID_.contains ("gmail.com") ? 3000 : 1500, 1, this)) @@ -127,7 +127,7 @@ OurJID_.contains ("gmail.com") ? 1000 : 400, 1, this)) , VersionQueue_ (new FetchQueue ([this] (QString str, bool report) { - const auto& id = Client_->versionManager ().requestVersion (str); + const auto& id = Exts ().Get<QXmppVersionManager> ().requestVersion (str); ErrorMgr_->Whitelist (id, report); }, OurJID_.contains ("gmail.com") ? 2000 : 1000, 1, this)) @@ -183,7 +183,7 @@ DiscoveryManager_->setClientCapabilitiesNode ("http://leechcraft.org/azoth"); - auto& vm = Client_->versionManager (); + auto& vm = Exts ().Get<QXmppVersionManager> (); vm.setClientName ("LeechCraft Azoth"); handleVersionSettingsChanged (); XmlSettingsManager::Instance ().RegisterObject ("AdvertiseQtVersion", @@ -217,29 +217,30 @@ this, SLOT (handleRoomInvitation (QString, QString, QString))); - connect (&Client_->rosterManager (), + auto& rosterManager = Exts ().Get<QXmppRosterManager> (); + connect (&rosterManager, SIGNAL (rosterReceived ()), this, SLOT (handleRosterReceived ())); - connect (&Client_->rosterManager (), + connect (&rosterManager, SIGNAL (itemAdded (QString)), this, SLOT (handleRosterChanged (QString))); - connect (&Client_->rosterManager (), + connect (&rosterManager, SIGNAL (itemChanged (QString)), this, SLOT (handleRosterChanged (QString))); - connect (&Client_->rosterManager (), + connect (&rosterManager, SIGNAL (itemRemoved (QString)), this, SLOT (handleRosterItemRemoved (QString))); - connect (&Client_->vCardManager (), + connect (&Exts ().Get<QXmppVCardManager> (), SIGNAL (vCardReceived (QXmppVCardIq)), this, SLOT (handleVCardReceived (QXmppVCardIq))); - connect (&Client_->versionManager (), + connect (&Exts ().Get<QXmppVersionManager> (), SIGNAL (versionReceived (QXmppVersionIq)), this, SLOT (handleVersionReceived (QXmppVersionIq))); @@ -398,7 +399,7 @@ emit gotRosterItems ({ entry }); } - ClientConnectionExtensionsManager& ClientConnection::GetExtensionsManager () const + ClientConnectionExtensionsManager& ClientConnection::Exts () const { return *ExtsMgr_; } @@ -420,7 +421,7 @@ QXmppVersionManager* ClientConnection::GetVersionManager () const { - return &Client_->versionManager (); + return &Exts ().Get<QXmppVersionManager> (); } CapsManager* ClientConnection::GetCapsManager () const @@ -527,31 +528,30 @@ void ClientConnection::AddEntry (const QString& id, const QString& name, const QStringList& groups) { - Client_->rosterManager ().addItem (id, - name, QSet<QString>::fromList (groups)); + Exts ().Get<QXmppRosterManager> ().addItem (id, name, QSet<QString>::fromList (groups)); } void ClientConnection::Subscribe (const QString& id, const QString& msg, const QString& name, const QStringList& groups) { qDebug () << "Subscribe" << id; - if (!Client_->rosterManager ().getRosterBareJids ().contains (id)) - Client_->rosterManager ().addItem (id, - name, QSet<QString>::fromList (groups)); - Client_->rosterManager ().subscribe (id, msg); - Client_->rosterManager ().acceptSubscription (id, msg); + auto& rm = Exts ().Get<QXmppRosterManager> (); + if (!rm.getRosterBareJids ().contains (id)) + rm.addItem (id, name, QSet<QString>::fromList (groups)); + rm.subscribe (id, msg); + rm.acceptSubscription (id, msg); } void ClientConnection::Unsubscribe (const QString& jid, const QString& reason) { qDebug () << "Unsubscribe" << jid; - Client_->rosterManager ().unsubscribe (jid, reason); + Exts ().Get<QXmppRosterManager> ().unsubscribe (jid, reason); } void ClientConnection::GrantSubscription (const QString& jid, const QString& reason) { qDebug () << "GrantSubscription" << jid; - Client_->rosterManager ().acceptSubscription (jid, reason); + Exts ().Get<QXmppRosterManager> ().acceptSubscription (jid, reason); if (JID2CLEntry_ [jid]) JID2CLEntry_ [jid]->SetAuthRequested (false); } @@ -559,7 +559,7 @@ void ClientConnection::RevokeSubscription (const QString& jid, const QString& reason) { qDebug () << "RevokeSubscription" << jid; - Client_->rosterManager ().refuseSubscription (jid, reason); + Exts ().Get<QXmppRosterManager> ().refuseSubscription (jid, reason); if (JID2CLEntry_ [jid]) JID2CLEntry_ [jid]->SetAuthRequested (false); } @@ -568,7 +568,7 @@ { const QString& jid = entry->GetJID (); - auto& rm = Client_->rosterManager (); + auto& rm = Exts ().Get<QXmppRosterManager> (); if (rm.getRosterBareJids ().contains (jid)) rm.removeItem (jid); else @@ -741,7 +741,7 @@ emit connected (); emit statusChanged ({ LastState_.State_, LastState_.Status_ }); - Client_->vCardManager ().requestVCard (OurBareJID_); + Exts ().Get<QXmppVCardManager> ().requestVCard (OurBareJID_); for (auto rh : RoomHandlers_) rh->Join (); @@ -765,7 +765,7 @@ void ClientConnection::handleRosterReceived () { - const auto& rm = Client_->rosterManager (); + const auto& rm = Exts ().Get<QXmppRosterManager> (); QObjectList items; for (const auto& bareJid : rm.getRosterBareJids ()) { @@ -792,7 +792,7 @@ void ClientConnection::handleRosterChanged (const QString& bareJid) { - const auto& rm = Client_->rosterManager (); + const auto& rm = Exts ().Get<QXmppRosterManager> (); const auto& presences = rm.getAllPresencesForBareJid (bareJid); if (!JID2CLEntry_.contains (bareJid)) @@ -875,7 +875,7 @@ else if (!JID2CLEntry_.contains (jid)) { if (ODSEntries_.contains (jid)) - ConvertFromODS (jid, Client_->rosterManager ().getRosterEntry (jid)); + ConvertFromODS (jid, Exts ().Get<QXmppRosterManager> ().getRosterEntry (jid)); else return; } @@ -928,7 +928,7 @@ RoomHandlers_ [jid]->HandleMessage (msg, resource); else if (JID2CLEntry_.contains (jid)) HandleMessageForEntry (JID2CLEntry_ [jid], msg, resource, this, forwarded); - else if (!Client_->rosterManager ().isRosterReceived ()) + else if (!Exts ().Get<QXmppRosterManager> ().isRosterReceived ()) OfflineMsgQueue_ << msg; else if (jid == OurBareJID_) { @@ -1154,7 +1154,7 @@ versionStr += ")"; } - auto& vm = Client_->versionManager (); + auto& vm = Exts ().Get<QXmppVersionManager> (); vm.setClientOs (infoStr); vm.setClientVersion (versionStr); @@ -1184,7 +1184,7 @@ GlooxCLEntry* ClientConnection::CreateCLEntry (const QString& jid) { - return CreateCLEntry (Client_->rosterManager ().getRosterEntry (jid)); + return CreateCLEntry (Exts ().Get<QXmppRosterManager> ().getRosterEntry (jid)); } GlooxCLEntry* ClientConnection::CreateCLEntry (const QXmppRosterIq::Item& ri) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/clientconnection.h new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/clientconnection.h --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/clientconnection.h 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/clientconnection.h 2020-01-11 16:25:31.000000000 +0100 @@ -164,7 +164,7 @@ void CreateEntry (const QString&); - ClientConnectionExtensionsManager& GetExtensionsManager () const; + ClientConnectionExtensionsManager& Exts () const; DiscoManagerWrapper* GetDiscoManagerWrapper () const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/entrybase.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/entrybase.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/entrybase.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/entrybase.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -521,7 +521,7 @@ LastEntityTimeRequest_.secsTo (now) < 60) return; - auto& timeMgr = Account_->GetClientConnection ()->GetExtensionsManager ().Get<QXmppEntityTimeManager> (); + auto& timeMgr = Account_->GetClientConnection ()->Exts ().Get<QXmppEntityTimeManager> (); connect (&timeMgr, SIGNAL (timeReceived (QXmppEntityTimeIq)), this, @@ -550,7 +550,7 @@ jid += '/' + variant; auto reply = new PingReplyObject { this }; - Account_->GetClientConnection ()->GetExtensionsManager ().Get<PingManager> ().Ping (jid, + Account_->GetClientConnection ()->Exts ().Get<PingManager> ().Ping (jid, [reply] (int msecs) { reply->HandleReply (msecs); }); return reply; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/executecommanddialog.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/executecommanddialog.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/executecommanddialog.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/executecommanddialog.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -127,7 +127,7 @@ CommandResultPage (const AdHocResult& result, GlooxAccount *acc, QWidget *parent = 0) : QWizardPage { parent } , Result_ { result } - , FB_ { {}, &acc->GetClientConnection ()->GetExtensionsManager ().Get<XMPPBobManager> () } + , FB_ { {}, &acc->GetClientConnection ()->Exts ().Get<XMPPBobManager> () } { Ui_.setupUi (this); setCommitPage (true); @@ -176,7 +176,7 @@ GlooxAccount *account, QWidget *parent, Tag) : QWizard { parent } , Account_ { account } - , Manager_ { account->GetClientConnection ()->GetExtensionsManager ().Get<AdHocCommandManager> () } + , Manager_ { account->GetClientConnection ()->Exts ().Get<AdHocCommandManager> () } , JID_ { jid } { Ui_.setupUi (this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/glooxaccount.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/glooxaccount.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/glooxaccount.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/glooxaccount.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -170,7 +170,7 @@ ClientConnection& Conn_; GlooxAccount& Acc_; - ClientConnectionExtensionsManager& ExtsMgr_ = Conn_.GetExtensionsManager (); + ClientConnectionExtensionsManager& ExtsMgr_ = Conn_.Exts (); TransferManager TransferManager_ { ExtsMgr_.Get<QXmppTransferManager> (), Conn_, Acc_ }; BookmarksIntegrator BookmarksIntegrator_ { ExtsMgr_.Get<QXmppBookmarkManager> (), Conn_, Acc_ }; @@ -554,7 +554,7 @@ { auto pending = new PendingLastActivityRequest { jid, this }; - auto& manager = ClientConnection_->GetExtensionsManager ().Get<LastActivityManager> (); + auto& manager = ClientConnection_->Exts ().Get<LastActivityManager> (); const auto& id = manager.RequestLastActivity (jid); connect (&manager, SIGNAL (gotLastActivity (QString, int)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/glooxclentry.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/glooxclentry.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/glooxclentry.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/glooxclentry.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -42,16 +42,13 @@ #include "glooxaccount.h" #include "core.h" #include "clientconnection.h" +#include "clientconnectionextensionsmanager.h" #include "gwoptionsdialog.h" #include "xeps/privacylistsmanager.h" #include "glooxmessage.h" #include "util.h" -namespace LC -{ -namespace Azoth -{ -namespace Xoox +namespace LC::Azoth::Xoox { GlooxCLEntry::GlooxCLEntry (const QString& jid, GlooxAccount *parent) : EntryBase (jid, parent) @@ -109,15 +106,14 @@ QXmppRosterIq::Item GlooxCLEntry::GetRI () const { - return Account_->GetClientConnection ()->GetClient ()-> - rosterManager ().getRosterEntry (HumanReadableId_); + return Account_->GetClientConnection ()->Exts ().Get<QXmppRosterManager> ().getRosterEntry (HumanReadableId_); } ICLEntry::Features GlooxCLEntry::GetEntryFeatures () const { ICLEntry::Features result = FSupportsAuth | FSupportsGrouping; - auto& rm = Account_->GetClientConnection ()->GetClient ()->rosterManager (); + auto& rm = Account_->GetClientConnection ()->Exts ().Get<QXmppRosterManager> (); const bool isPerm = ODS_ || rm.getRosterBareJids ().contains (GetJID ()); result |= isPerm ? @@ -190,8 +186,8 @@ if (!ODS_) { - const auto& presences = Account_->GetClientConnection ()->GetClient ()-> - rosterManager ().getAllPresencesForBareJid (HumanReadableId_); + const auto& presences = Account_->GetClientConnection ()->Exts () + .Get<QXmppRosterManager> ().getAllPresencesForBareJid (HumanReadableId_); if (presences.size () == 1) result << presences.begin ().key (); else @@ -216,8 +212,7 @@ if (AuthRequested_) return EntryStatus (SOnline, QString ()); - QXmppRosterManager& rm = Account_-> - GetClientConnection ()->GetClient ()->rosterManager (); + auto& rm = Account_->GetClientConnection ()->Exts ().Get<QXmppRosterManager> (); if (!rm.isRosterReceived ()) return EntryBase::GetStatus (variant); @@ -397,5 +392,3 @@ dia->show (); } } -} -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/glooxclentry.h new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/glooxclentry.h --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/glooxclentry.h 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/glooxclentry.h 2020-01-11 16:25:31.000000000 +0100 @@ -39,14 +39,13 @@ #include "entrybase.h" #include "offlinedatasource.h" -namespace LC +namespace LC::Azoth { -namespace Azoth -{ -class IAccount; -class IProxyObject; + class IAccount; + class IProxyObject; +} -namespace Xoox +namespace LC::Azoth::Xoox { class GlooxAccount; class PrivacyList; @@ -120,7 +119,5 @@ void handleGWEdit (); }; } -} -} #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/jabbersearchsession.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/jabbersearchsession.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/jabbersearchsession.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/jabbersearchsession.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -46,7 +46,7 @@ JabberSearchSession::JabberSearchSession (GlooxAccount *acc) : QObject (acc) , Model_ (new QStandardItemModel (this)) - , SM_ (acc->GetClientConnection ()->GetExtensionsManager ().Get<JabberSearchManager> ()) + , SM_ (acc->GetClientConnection ()->Exts ().Get<JabberSearchManager> ()) { connect (&SM_, SIGNAL (gotServerError (QXmppIq)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/roomclentry.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/roomclentry.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/roomclentry.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/roomclentry.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -127,7 +127,7 @@ this, SLOT (reemitStatusChange (const EntryStatus&))); - connect (&Account_->GetClientConnection ()->GetExtensionsManager ().Get<QXmppBookmarkManager> (), + connect (&Account_->GetClientConnection ()->Exts ().Get<QXmppBookmarkManager> (), SIGNAL (bookmarksReceived (QXmppBookmarkSet)), this, SLOT (handleBookmarks (QXmppBookmarkSet))); @@ -160,7 +160,7 @@ QString RoomCLEntry::GetEntryName () const { - const auto& bmManager = Account_->GetClientConnection ()->GetExtensionsManager ().Get<QXmppBookmarkManager> (); + const auto& bmManager = Account_->GetClientConnection ()->Exts ().Get<QXmppBookmarkManager> (); for (const auto& bm : bmManager.bookmarks ().conferences ()) if (bm.jid () == RH_->GetRoomJID () && !bm.name ().isEmpty ()) return bm.name (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/roomhandler.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/roomhandler.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/roomhandler.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/roomhandler.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -426,7 +426,7 @@ { const auto client = Account_->GetClientConnection (); - FormBuilder fb { from, &client->GetExtensionsManager ().Get<XMPPBobManager> () }; + FormBuilder fb { from, &client->Exts ().Get<XMPPBobManager> () }; QDialog dia; dia.setWindowTitle (tr ("Data form from %1").arg (from)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/sdsession.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/sdsession.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/sdsession.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/sdsession.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -461,7 +461,7 @@ return; } - FormBuilder builder { {}, &Account_->GetClientConnection ()->GetExtensionsManager ().Get<XMPPBobManager> () }; + FormBuilder builder { {}, &Account_->GetClientConnection ()->Exts ().Get<XMPPBobManager> () }; const auto widget = builder.CreateForm (form); if (!XooxUtil::RunFormDialog (widget)) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/vcarddialog.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/vcarddialog.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/vcarddialog.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/vcarddialog.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -38,17 +38,14 @@ #include "entrybase.h" #include "glooxaccount.h" #include "clientconnection.h" +#include "clientconnectionextensionsmanager.h" #include "capsmanager.h" #include "annotationsmanager.h" #include "useravatarmanager.h" #include "vcardlisteditdialog.h" #include "accountsettingsholder.h" -namespace LC -{ -namespace Azoth -{ -namespace Xoox +namespace LC::Azoth::Xoox { VCardDialog::VCardDialog (GlooxAccount *acc, QWidget *parent) : QDialog (parent) @@ -283,7 +280,7 @@ if (!Account_) return; - EntryBase *entry = qobject_cast<EntryBase*> (Account_->GetClientConnection ()->GetCLEntry (JID_)); + auto entry = qobject_cast<EntryBase*> (Account_->GetClientConnection ()->GetCLEntry (JID_)); if (!entry) return; @@ -299,7 +296,7 @@ QString::number (info ["priority"].toInt ()) + ")<br />"; const auto& version = entry->GetClientVersion (variant); - auto gapp = [&html] (QString user, QString part) + auto gapp = [&html] (const QString& user, const QString& part) { if (!part.isEmpty ()) html += user + ": " + part + "<br />"; @@ -308,9 +305,9 @@ gapp (tr ("Version"), version.version ()); gapp (tr ("OS"), version.os ()); - QStringList caps = mgr->GetCaps (entry->GetVariantVerString (variant)); + auto caps = mgr->GetCaps (entry->GetVariantVerString (variant)); caps.sort (); - if (caps.size ()) + if (!caps.isEmpty ()) html += "<strong>" + tr ("Capabilities") + "</strong>:<ul><li>" + caps.join ("</li><li>") + "</li></ul>"; } @@ -369,9 +366,7 @@ PublishAvatar (px ? px->toImage () : QImage ()); PhotoChanged_ = false; - auto& mgr = Account_->GetClientConnection ()-> - GetClient ()->vCardManager (); - mgr.setClientVCard (VCard_); + Account_->GetClientConnection ()->Exts ().Get<QXmppVCardManager> ().setClientVCard (VCard_); } void VCardDialog::on_PhoneButton__released () @@ -402,7 +397,7 @@ QPair<QString, QStringList> pair; pair.first = phone.number (); - for (size_t i = 0; i < type2pos.size (); ++i) + for (std::size_t i = 0; i < type2pos.size (); ++i) if (phone.type () & type2pos [i]) pair.second << options.at (i); @@ -419,7 +414,7 @@ phone.setNumber (item.first); QXmppVCardPhone::Type type = QXmppVCardPhone::None; - for (size_t i = 0; i < type2pos.size (); ++i) + for (std::size_t i = 0; i < type2pos.size (); ++i) if (item.second.contains (options.at (i))) type &= type2pos [i]; phone.setType (type); @@ -457,7 +452,7 @@ QPair<QString, QStringList> pair; pair.first = email.address (); - for (size_t i = 0; i < type2pos.size (); ++i) + for (std::size_t i = 0; i < type2pos.size (); ++i) if (email.type () & type2pos [i]) pair.second << options.at (i); @@ -474,7 +469,7 @@ email.setAddress (item.first); QXmppVCardEmail::Type type = QXmppVCardEmail::None; - for (size_t i = 0; i < type2pos.size (); ++i) + for (std::size_t i = 0; i < type2pos.size (); ++i) if (item.second.contains (options.at (i))) type &= type2pos [i]; email.setType (type); @@ -543,5 +538,3 @@ Ui_.NotesEdit_->setPlainText (Note_.GetNote ()); } } -} -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/vcarddialog.h new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/vcarddialog.h --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/vcarddialog.h 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/vcarddialog.h 2020-01-11 16:25:31.000000000 +0100 @@ -27,18 +27,14 @@ * DEALINGS IN THE SOFTWARE. **********************************************************************/ -#ifndef VCARDDIALOG_H -#define VCARDDIALOG_H +#pragma once + #include <QDialog> #include <QXmppVCardIq.h> #include "ui_vcarddialog.h" #include "xeps/xmppannotationsiq.h" -namespace LC -{ -namespace Azoth -{ -namespace Xoox +namespace LC::Azoth::Xoox { class EntryBase; class GlooxAccount; @@ -62,12 +58,12 @@ QPixmap ShownPixmap_; public: - VCardDialog (GlooxAccount*, QWidget* = 0); - VCardDialog (EntryBase*, QWidget* = 0); + explicit VCardDialog (GlooxAccount*, QWidget* = nullptr); + explicit VCardDialog (EntryBase*, QWidget* = nullptr); void UpdateInfo (const QXmppVCardIq&); - bool eventFilter (QObject*, QEvent*); + bool eventFilter (QObject*, QEvent*) override; private: void SetPixmapLabel (QPixmap); @@ -87,7 +83,3 @@ void on_PhotoClear__released (); }; } -} -} - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/xep0232handler.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/xep0232handler.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/xep0232handler.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/xep0232handler.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -32,13 +32,7 @@ #include <QtDebug> #include <QXmppDataForm.h> -namespace LC -{ -namespace Azoth -{ -namespace Xoox -{ -namespace XEP0232Handler +namespace LC::Azoth::Xoox::XEP0232Handler { const QString SWInfoFormType = "urn:xmpp:dataforms:softwareinfo"; @@ -149,6 +143,3 @@ return form; } } -} -} -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/xep0232handler.h new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/xep0232handler.h --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xoox/xep0232handler.h 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xoox/xep0232handler.h 2020-01-11 16:25:31.000000000 +0100 @@ -33,13 +33,7 @@ class QXmppDataForm; -namespace LC -{ -namespace Azoth -{ -namespace Xoox -{ -namespace XEP0232Handler +namespace LC::Azoth::Xoox::XEP0232Handler { struct SoftwareInformation { @@ -60,6 +54,3 @@ SoftwareInformation FromDataForm (const QXmppDataForm&); QXmppDataForm ToDataForm (const SoftwareInformation&); } -} -} -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xtazy/xtazy.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xtazy/xtazy.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/azoth/plugins/xtazy/xtazy.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/azoth/plugins/xtazy/xtazy.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -214,7 +214,7 @@ auto sharer = qobject_cast<IWebFileStorage*> (sharerObj); sharer->UploadFile (localPath, selectedVar); - PendingUploads_ [localPath].append ({ entry->GetQObject (), {} }); + PendingUploads_ [localPath].push_back ({ entry->GetQObject (), {} }); connect (sharerObj, SIGNAL (fileUploaded (QString, QUrl)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/htthare/requesthandler.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/htthare/requesthandler.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/htthare/requesthandler.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/htthare/requesthandler.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -64,7 +64,7 @@ RequestHandler::RequestHandler (const Connection_ptr& conn) : Conn_ (conn) { - ResponseHeaders_.append ({ "Accept-Ranges", "bytes" }); + ResponseHeaders_.push_back ({ "Accept-Ranges", "bytes" }); } void RequestHandler::operator() (QByteArray data) @@ -398,7 +398,7 @@ { ResponseLine_ = "HTTP/1.1 403 Forbidden\r\n"; - ResponseHeaders_.append ({ "Content-Type", "text/html; charset=utf-8" }); + ResponseHeaders_.push_back ({ "Content-Type", "text/html; charset=utf-8" }); ResponseBody_ = QString (R"delim(<html> <head><title>%2</title></head> <body> @@ -422,7 +422,7 @@ { ResponseLine_ = "HTTP/1.1 404 Not found\r\n"; - ResponseHeaders_.append ({ "Content-Type", "text/html; charset=utf-8" }); + ResponseHeaders_.push_back ({ "Content-Type", "text/html; charset=utf-8" }); ResponseBody_ = QString (R"delim(<html> <head><title>%1</title></head> <body> @@ -449,7 +449,7 @@ { ResponseLine_ = "HTTP/1.1 200 OK\r\n"; - ResponseHeaders_.append ({ "Content-Type", "text/html; charset=utf-8" }); + ResponseHeaders_.push_back ({ "Content-Type", "text/html; charset=utf-8" }); ResponseBody_ = MakeDirResponse (fi, path, Url_); DefaultWrite (verb); @@ -581,7 +581,7 @@ !ResponseBody_.isEmpty () && SupportsDeflate (splitAe)) { - ResponseHeaders_.append ({ "Content-Encoding", "deflate" }); + ResponseHeaders_.push_back ({ "Content-Encoding", "deflate" }); ResponseBody_ = qCompress (ResponseBody_, 6); ResponseBody_.remove (0, 4); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/lastfmscrobble/util.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/lastfmscrobble/util.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/lastfmscrobble/util.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/lastfmscrobble/util.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -116,11 +116,11 @@ QNetworkReply* Request (const QString& method, QNetworkAccessManager *nam, ParamsList_t params) { - params.append ({ "method", method }); - params.append ({ "api_key", lastfm::ws::ApiKey }); + params.push_back ({ "method", method }); + params.push_back ({ "api_key", lastfm::ws::ApiKey }); if (!lastfm::ws::SessionKey.isEmpty ()) - params.append ({ "sk", lastfm::ws::SessionKey }); + params.push_back ({ "sk", lastfm::ws::SessionKey }); return XmlSettingsManager::Instance ().property ("UseGetRequests").toBool () ? MakeGetRequest (nam, params) : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/address.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/address.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/address.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/address.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -29,6 +29,7 @@ #include "address.h" #include <QDebug> +#include <QDataStream> namespace LC::Snails { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/mailwebpagenam.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/mailwebpagenam.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/mailwebpagenam.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/mailwebpagenam.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -28,6 +28,7 @@ **********************************************************************/ #include "mailwebpagenam.h" +#include <QFile> #include <util/network/customnetworkreply.h> #include <util/sll/prelude.h> #include <util/sll/visitor.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/messageinfo.h new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/messageinfo.h --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/messageinfo.h 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/messageinfo.h 2020-01-11 16:25:31.000000000 +0100 @@ -30,6 +30,7 @@ #pragma once #include <QDateTime> +#include <QHash> #include "address.h" #include "attdescr.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/messagelisteditormanager.cpp new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/messagelisteditormanager.cpp --- old/leechcraft-0.6.70-13588-g98cf733e94/src/plugins/snails/messagelisteditormanager.cpp 2019-12-20 00:55:32.000000000 +0100 +++ new/leechcraft-0.6.70-13605-g8cd066ad6a/src/plugins/snails/messagelisteditormanager.cpp 2020-01-11 16:25:31.000000000 +0100 @@ -29,6 +29,7 @@ #include "messagelisteditormanager.h" #include <QTreeView> +#include <QEvent> #include <util/sll/lambdaeventfilter.h> #include "common.h" #include "mailmodel.h"