From 88f05bea263495f8ffc646f57fc299d4ecb4ad91 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 16 Jun 2023 15:29:33 +0200 Subject: [PATCH] Fix indentation --- .../sip-addresses/SipAddressesModel.hpp | 236 +++++++++--------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/linphone-app/src/components/sip-addresses/SipAddressesModel.hpp b/linphone-app/src/components/sip-addresses/SipAddressesModel.hpp index 2f7850427..b2846f906 100644 --- a/linphone-app/src/components/sip-addresses/SipAddressesModel.hpp +++ b/linphone-app/src/components/sip-addresses/SipAddressesModel.hpp @@ -36,122 +36,122 @@ class CoreHandlers; class HistoryModel; class SipAddressesModel : public QAbstractListModel { - Q_OBJECT; - + Q_OBJECT; + public: - struct ConferenceEntry { - int unreadMessageCount; - int missedCallCount; - bool isComposing; - QDateTime timestamp; - }; - - struct SipAddressEntry { - QString sipAddress; - QSharedPointer contact; - Presence::PresenceStatus presenceStatus; - QHash localAddressToConferenceEntry; - }; - - SipAddressesModel (QObject *parent = Q_NULLPTR); - - void reset(); - - int rowCount (const QModelIndex &index = QModelIndex()) const override; - - QHash roleNames () const override; - QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const override; - - //Q_PROPERTY(QList resultExceptions READ getResultExceptions WRITE setResultExceptions NOTIFY resultExceptionsChanged) - - Q_INVOKABLE QVariantMap find (const QString &sipAddress) const; - Q_INVOKABLE ContactModel *mapSipAddressToContact (const QString &sipAddress) const; - Q_INVOKABLE SipAddressObserver *getSipAddressObserver (const QString &peerAddress, const QString &localAddress); - - // --------------------------------------------------------------------------- - // Sip addresses helpers. - // --------------------------------------------------------------------------- - - Q_INVOKABLE static QString getTransportFromSipAddress (const QString &sipAddress); - Q_INVOKABLE static QString addTransportToSipAddress (const QString &sipAddress, const QString &transport); - - Q_INVOKABLE static QString interpretSipAddress (const QString &sipAddress, bool checkUsername = true); - Q_INVOKABLE static QString interpretSipAddress (const QUrl &sipAddress); - Q_INVOKABLE static QString interpretSipAddress (const QString &sipAddress, const QString &domain); - - Q_INVOKABLE static bool addressIsValid (const QString &address); - Q_INVOKABLE static bool sipAddressIsValid (const QString &sipAddress); - - Q_INVOKABLE static QString cleanSipAddress (const QString &sipAddress); - - // --------------------------------------------------------------------------- + struct ConferenceEntry { + int unreadMessageCount; + int missedCallCount; + bool isComposing; + QDateTime timestamp; + }; + + struct SipAddressEntry { + QString sipAddress; + QSharedPointer contact; + Presence::PresenceStatus presenceStatus; + QHash localAddressToConferenceEntry; + }; + + SipAddressesModel (QObject *parent = Q_NULLPTR); + + void reset(); + + int rowCount (const QModelIndex &index = QModelIndex()) const override; + + QHash roleNames () const override; + QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const override; + + //Q_PROPERTY(QList resultExceptions READ getResultExceptions WRITE setResultExceptions NOTIFY resultExceptionsChanged) + + Q_INVOKABLE QVariantMap find (const QString &sipAddress) const; + Q_INVOKABLE ContactModel *mapSipAddressToContact (const QString &sipAddress) const; + Q_INVOKABLE SipAddressObserver *getSipAddressObserver (const QString &peerAddress, const QString &localAddress); + + // --------------------------------------------------------------------------- + // Sip addresses helpers. + // --------------------------------------------------------------------------- + + Q_INVOKABLE static QString getTransportFromSipAddress (const QString &sipAddress); + Q_INVOKABLE static QString addTransportToSipAddress (const QString &sipAddress, const QString &transport); + + Q_INVOKABLE static QString interpretSipAddress (const QString &sipAddress, bool checkUsername = true); + Q_INVOKABLE static QString interpretSipAddress (const QUrl &sipAddress); + Q_INVOKABLE static QString interpretSipAddress (const QString &sipAddress, const QString &domain); + + Q_INVOKABLE static bool addressIsValid (const QString &address); + Q_INVOKABLE static bool sipAddressIsValid (const QString &sipAddress); + + Q_INVOKABLE static QString cleanSipAddress (const QString &sipAddress); + + // --------------------------------------------------------------------------- signals: - void sipAddressReset();// The model has been reset - + void sipAddressReset();// The model has been reset + public slots: - void handleAllCallCountReset (); - + void handleAllCallCountReset (); + private: - bool removeRow (int row, const QModelIndex &parent = QModelIndex()); - bool removeRows (int row, int count, const QModelIndex &parent = QModelIndex()) override; - - // --------------------------------------------------------------------------- - - void handleChatRoomModelCreated (const QSharedPointer &chatRoomModel); - void handleHistoryModelCreated (HistoryModel *historyModel) ; - - void handleContactAdded (QSharedPointer contact); - void handleContactRemoved (QSharedPointer contact); - - void handleSipAddressAdded (QSharedPointer contact, const QString &sipAddress); - void handleSipAddressRemoved (QSharedPointer contact, const QString &sipAddress); - - void handleMessageReceived (const std::shared_ptr &message); - void handleMessagesReceived (const std::list> &messages); - void handleCallStateChanged (const std::shared_ptr &call, linphone::Call::State state); - void handlePresenceReceived (const QString &sipAddress, const std::shared_ptr &presenceModel); - - void handleAllEntriesRemoved (ChatRoomModel *chatRoomModel); - void handleLastEntryRemoved (ChatRoomModel *chatRoomModel); - - void handleMessageCountReset (ChatRoomModel *chatRoomModel); - - void handleMessageSent (const std::shared_ptr &message); - - void handleIsComposingChanged (const std::shared_ptr &chatRoom); - - // --------------------------------------------------------------------------- - - // A sip address exists in this list if a contact is linked to it, or a call, or a message. - - void addOrUpdateSipAddress (SipAddressEntry &sipAddressEntry, QSharedPointer contact); - void addOrUpdateSipAddress (SipAddressEntry &sipAddressEntry, const std::shared_ptr &call); - void addOrUpdateSipAddress (SipAddressEntry &sipAddressEntry, const std::shared_ptr &message); - - - //NMN TODO bind to missedCall event and implement void addOrUpdateSipAddress - - template - void addOrUpdateSipAddress (const QString &sipAddress, T data); - - // --------------------------------------------------------------------------- - - void removeContactOfSipAddress (const QString &sipAddress); - - void initSipAddresses (); - - void initSipAddressesFromChat (); - void initSipAddressesFromCalls (); - void initSipAddressesFromContacts (); - - void initRefs (); - - void updateObservers (const QString &sipAddress, QSharedPointer contact); - void updateObservers (const QString &sipAddress, const Presence::PresenceStatus &presenceStatus); - void updateObservers (const QString &peerAddress, const QString &localAddress, int messageCount, int missedCallCount); - - // --------------------------------------------------------------------------- - + bool removeRow (int row, const QModelIndex &parent = QModelIndex()); + bool removeRows (int row, int count, const QModelIndex &parent = QModelIndex()) override; + + // --------------------------------------------------------------------------- + + void handleChatRoomModelCreated (const QSharedPointer &chatRoomModel); + void handleHistoryModelCreated (HistoryModel *historyModel) ; + + void handleContactAdded (QSharedPointer contact); + void handleContactRemoved (QSharedPointer contact); + + void handleSipAddressAdded (QSharedPointer contact, const QString &sipAddress); + void handleSipAddressRemoved (QSharedPointer contact, const QString &sipAddress); + + void handleMessageReceived (const std::shared_ptr &message); + void handleMessagesReceived (const std::list> &messages); + void handleCallStateChanged (const std::shared_ptr &call, linphone::Call::State state); + void handlePresenceReceived (const QString &sipAddress, const std::shared_ptr &presenceModel); + + void handleAllEntriesRemoved (ChatRoomModel *chatRoomModel); + void handleLastEntryRemoved (ChatRoomModel *chatRoomModel); + + void handleMessageCountReset (ChatRoomModel *chatRoomModel); + + void handleMessageSent (const std::shared_ptr &message); + + void handleIsComposingChanged (const std::shared_ptr &chatRoom); + + // --------------------------------------------------------------------------- + + // A sip address exists in this list if a contact is linked to it, or a call, or a message. + + void addOrUpdateSipAddress (SipAddressEntry &sipAddressEntry, QSharedPointer contact); + void addOrUpdateSipAddress (SipAddressEntry &sipAddressEntry, const std::shared_ptr &call); + void addOrUpdateSipAddress (SipAddressEntry &sipAddressEntry, const std::shared_ptr &message); + + + //NMN TODO bind to missedCall event and implement void addOrUpdateSipAddress + + template + void addOrUpdateSipAddress (const QString &sipAddress, T data); + + // --------------------------------------------------------------------------- + + void removeContactOfSipAddress (const QString &sipAddress); + + void initSipAddresses (); + + void initSipAddressesFromChat (); + void initSipAddressesFromCalls (); + void initSipAddressesFromContacts (); + + void initRefs (); + + void updateObservers (const QString &sipAddress, QSharedPointer contact); + void updateObservers (const QString &sipAddress, const Presence::PresenceStatus &presenceStatus); + void updateObservers (const QString &peerAddress, const QString &localAddress, int messageCount, int missedCallCount); + + // --------------------------------------------------------------------------- + SipAddressEntry *getSipAddressEntry (const QString &peerAddress) { auto it = mPeerAddressToSipAddressEntry.find(peerAddress); if (it == mPeerAddressToSipAddressEntry.end()){ @@ -160,12 +160,12 @@ private: } return &(*it); } - QHash mPeerAddressToSipAddressEntry; - QList mRefs; - - QMultiHash mObservers; - - std::shared_ptr mCoreHandlers; + QHash mPeerAddressToSipAddressEntry; + QList mRefs; + + QMultiHash mObservers; + + std::shared_ptr mCoreHandlers; }; using LocalAddressToConferenceEntry = QHash;