Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 15:58:42 +01:00
parent 4c0e2af6e3
commit 8d487d31a4
109 changed files with 274 additions and 274 deletions
--- a/src/core/AutoTypeAssociations.cpp
+++ b/src/core/AutoTypeAssociations.cpp
@@ -39,29 +39,29 @@ void AutoTypeAssociations::copyDataFrom(const AutoTypeAssociations* other)
        return;
    }

-    Q_EMIT aboutToReset();
+    emit aboutToReset();
    m_associations = other->m_associations;
-    Q_EMIT reset();
-    Q_EMIT modified();
+    emit reset();
+    emit modified();
 }

 void AutoTypeAssociations::add(const AutoTypeAssociations::Association& association)
 {
    int index = m_associations.size();
-    Q_EMIT aboutToAdd(index);
+    emit aboutToAdd(index);
    m_associations.append(association);
-    Q_EMIT added(index);
-    Q_EMIT modified();
+    emit added(index);
+    emit modified();
 }

 void AutoTypeAssociations::remove(int index)
 {
    Q_ASSERT(index >= 0 && index < m_associations.size());

-    Q_EMIT aboutToRemove(index);
+    emit aboutToRemove(index);
    m_associations.removeAt(index);
-    Q_EMIT removed(index);
-    Q_EMIT modified();
+    emit removed(index);
+    emit modified();
 }

 void AutoTypeAssociations::removeEmpty()
@@ -81,8 +81,8 @@ void AutoTypeAssociations::update(int index, const AutoTypeAssociations::Associa

    if (m_associations.at(index) != association) {
        m_associations[index] = association;
-        Q_EMIT dataChanged(index);
-        Q_EMIT modified();
+        emit dataChanged(index);
+        emit modified();
    }
 }

--- a/src/core/AutoTypeAssociations.h
+++ b/src/core/AutoTypeAssociations.h
@@ -48,7 +48,7 @@ public:
 private:
    QList<AutoTypeAssociations::Association> m_associations;

-Q_SIGNALS:
+signals:
    void modified();
    void dataChanged(int index);
    void aboutToAdd(int index);
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -227,7 +227,7 @@ bool Database::setKey(const CompositeKey& key, const QByteArray& transformSeed,
    if (updateChangedTime) {
        m_metadata->setMasterKeyChanged(QDateTime::currentDateTimeUtc());
    }
-    Q_EMIT modifiedImmediate();
+    emit modifiedImmediate();

    return true;
 }
@@ -285,7 +285,7 @@ void Database::recycleGroup(Group* group)
 void Database::merge(const Database* other)
 {
    m_rootGroup->merge(other->rootGroup());
-    Q_EMIT modified();
+    emit modified();
 }

 void Database::setEmitModified(bool value)
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -115,7 +115,7 @@ public:

    static Database* databaseByUuid(const Uuid& uuid);

-Q_SIGNALS:
+signals:
    void groupDataChanged(Group* group);
    void groupAboutToAdd(Group* group, int index);
    void groupAdded();
@@ -127,7 +127,7 @@ Q_SIGNALS:
    void modified();
    void modifiedImmediate();

-private Q_SLOTS:
+private slots:
    void startModifiedTimer();

 private:
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -62,7 +62,7 @@ template <class T> inline bool Entry::set(T& property, const T& value)
 {
    if (property != value) {
        property = value;
-        Q_EMIT modified();
+        emit modified();
        return true;
    }
    else {
@@ -299,7 +299,7 @@ void Entry::setIcon(int iconNumber)
        m_data.iconNumber = iconNumber;
        m_data.customIcon = Uuid();

-        Q_EMIT modified();
+        emit modified();
        emitDataChanged();
    }
 }
@@ -312,7 +312,7 @@ void Entry::setIcon(const Uuid& uuid)
        m_data.customIcon = uuid;
        m_data.iconNumber = 0;

-        Q_EMIT modified();
+        emit modified();
        emitDataChanged();
    }
 }
@@ -392,7 +392,7 @@ void Entry::setExpires(const bool& value)
 {
    if (m_data.timeInfo.expires() != value) {
        m_data.timeInfo.setExpires(value);
-        Q_EMIT modified();
+        emit modified();
    }
 }

@@ -400,7 +400,7 @@ void Entry::setExpiryTime(const QDateTime& dateTime)
 {
    if (m_data.timeInfo.expiryTime() != dateTime) {
        m_data.timeInfo.setExpiryTime(dateTime);
-        Q_EMIT modified();
+        emit modified();
    }
 }

@@ -419,7 +419,7 @@ void Entry::addHistoryItem(Entry* entry)
    Q_ASSERT(!entry->parent());

    m_history.append(entry);
-    Q_EMIT modified();
+    emit modified();
 }

 void Entry::removeHistoryItems(const QList<Entry*>& historyEntries)
@@ -437,7 +437,7 @@ void Entry::removeHistoryItems(const QList<Entry*>& historyEntries)
        delete entry;
    }

-    Q_EMIT modified();
+    emit modified();
 }

 void Entry::truncateHistory()
@@ -633,7 +633,7 @@ void Entry::setGroup(Group* group)

 void Entry::emitDataChanged()
 {
-    Q_EMIT dataChanged(this);
+    emit dataChanged(this);
 }

 const Database* Entry::database() const
--- a/src/core/Entry.h
+++ b/src/core/Entry.h
@@ -147,7 +147,7 @@ public:

    void setUpdateTimeinfo(bool value);

-Q_SIGNALS:
+signals:
    /**
     * Emitted when a default attribute has been changed.
     */
@@ -155,7 +155,7 @@ Q_SIGNALS:

    void modified();

-private Q_SLOTS:
+private slots:
    void emitDataChanged();
    void updateTimeinfo();
    void updateModifiedSinceBegin();
--- a/src/core/EntryAttachments.cpp
+++ b/src/core/EntryAttachments.cpp
@@ -48,7 +48,7 @@ void EntryAttachments::set(const QString& key, const QByteArray& value)
    bool addAttachment = !m_attachments.contains(key);

    if (addAttachment) {
-        Q_EMIT aboutToBeAdded(key);
+        emit aboutToBeAdded(key);
    }

    if (addAttachment || m_attachments.value(key) != value) {
@@ -57,14 +57,14 @@ void EntryAttachments::set(const QString& key, const QByteArray& value)
    }

    if (addAttachment) {
-        Q_EMIT added(key);
+        emit added(key);
    }
    else {
-        Q_EMIT keyModified(key);
+        emit keyModified(key);
    }

    if (emitModified) {
-        Q_EMIT modified();
+        emit modified();
    }
 }

@@ -75,12 +75,12 @@ void EntryAttachments::remove(const QString& key)
        return;
    }

-    Q_EMIT aboutToBeRemoved(key);
+    emit aboutToBeRemoved(key);

    m_attachments.remove(key);

-    Q_EMIT removed(key);
-    Q_EMIT modified();
+    emit removed(key);
+    emit modified();
 }

 void EntryAttachments::clear()
@@ -89,23 +89,23 @@ void EntryAttachments::clear()
        return;
    }

-    Q_EMIT aboutToBeReset();
+    emit aboutToBeReset();

    m_attachments.clear();

-    Q_EMIT reset();
-    Q_EMIT modified();
+    emit reset();
+    emit modified();
 }

 void EntryAttachments::copyDataFrom(const EntryAttachments* other)
 {
    if (*this != *other) {
-        Q_EMIT aboutToBeReset();
+        emit aboutToBeReset();

        m_attachments = other->m_attachments;

-        Q_EMIT reset();
-        Q_EMIT modified();
+        emit reset();
+        emit modified();
    }
 }

--- a/src/core/EntryAttachments.h
+++ b/src/core/EntryAttachments.h
@@ -38,7 +38,7 @@ public:
    bool operator==(const EntryAttachments& other) const;
    bool operator!=(const EntryAttachments& other) const;

-Q_SIGNALS:
+signals:
    void modified();
    void keyModified(const QString& key);
    void aboutToBeAdded(const QString& key);
--- a/src/core/EntryAttributes.cpp
+++ b/src/core/EntryAttributes.cpp
@@ -98,7 +98,7 @@ void EntryAttributes::set(const QString& key, const QString& value, bool protect
    bool defaultAttribute = isDefaultAttribute(key);

    if (addAttribute && !defaultAttribute) {
-        Q_EMIT aboutToBeAdded(key);
+        emit aboutToBeAdded(key);
    }

    if (addAttribute || changeValue) {
@@ -117,17 +117,17 @@ void EntryAttributes::set(const QString& key, const QString& value, bool protect
    }

    if (emitModified) {
-        Q_EMIT modified();
+        emit modified();
    }

    if (defaultAttribute && changeValue) {
-        Q_EMIT defaultKeyModified();
+        emit defaultKeyModified();
    }
    else if (addAttribute) {
-        Q_EMIT added(key);
+        emit added(key);
    }
    else if (emitModified) {
-        Q_EMIT customKeyModified(key);
+        emit customKeyModified(key);
    }
 }

@@ -140,13 +140,13 @@ void EntryAttributes::remove(const QString& key)
        return;
    }

-    Q_EMIT aboutToBeRemoved(key);
+    emit aboutToBeRemoved(key);

    m_attributes.remove(key);
    m_protectedAttributes.remove(key);

-    Q_EMIT removed(key);
-    Q_EMIT modified();
+    emit removed(key);
+    emit modified();
 }

 void EntryAttributes::rename(const QString& oldKey, const QString& newKey)
@@ -167,7 +167,7 @@ void EntryAttributes::rename(const QString& oldKey, const QString& newKey)
    QString data = value(oldKey);
    bool protect = isProtected(oldKey);

-    Q_EMIT aboutToRename(oldKey, newKey);
+    emit aboutToRename(oldKey, newKey);

    m_attributes.remove(oldKey);
    m_attributes.insert(newKey, data);
@@ -176,8 +176,8 @@ void EntryAttributes::rename(const QString& oldKey, const QString& newKey)
        m_protectedAttributes.insert(newKey);
    }

-    Q_EMIT modified();
-    Q_EMIT renamed(oldKey, newKey);
+    emit modified();
+    emit renamed(oldKey, newKey);
 }

 void EntryAttributes::copyCustomKeysFrom(const EntryAttributes* other)
@@ -186,7 +186,7 @@ void EntryAttributes::copyCustomKeysFrom(const EntryAttributes* other)
        return;
    }

-    Q_EMIT aboutToBeReset();
+    emit aboutToBeReset();

    // remove all non-default keys
    const QList<QString> keyList = keys();
@@ -207,8 +207,8 @@ void EntryAttributes::copyCustomKeysFrom(const EntryAttributes* other)
        }
    }

-    Q_EMIT reset();
-    Q_EMIT modified();
+    emit reset();
+    emit modified();
 }

 bool EntryAttributes::areCustomKeysDifferent(const EntryAttributes* other)
@@ -235,13 +235,13 @@ bool EntryAttributes::areCustomKeysDifferent(const EntryAttributes* other)
 void EntryAttributes::copyDataFrom(const EntryAttributes* other)
 {
    if (*this != *other) {
-        Q_EMIT aboutToBeReset();
+        emit aboutToBeReset();

        m_attributes = other->m_attributes;
        m_protectedAttributes = other->m_protectedAttributes;

-        Q_EMIT reset();
-        Q_EMIT modified();
+        emit reset();
+        emit modified();
    }
 }

@@ -259,7 +259,7 @@ bool EntryAttributes::operator!=(const EntryAttributes& other) const

 void EntryAttributes::clear()
 {
-    Q_EMIT aboutToBeReset();
+    emit aboutToBeReset();

    m_attributes.clear();
    m_protectedAttributes.clear();
@@ -268,8 +268,8 @@ void EntryAttributes::clear()
        m_attributes.insert(key, "");
    }

-    Q_EMIT reset();
-    Q_EMIT modified();
+    emit reset();
+    emit modified();
 }

 int EntryAttributes::attributesSize()
--- a/src/core/EntryAttributes.h
+++ b/src/core/EntryAttributes.h
@@ -57,7 +57,7 @@ public:
    static const QString RememberCmdExecAttr;
    static bool isDefaultAttribute(const QString& key);

-Q_SIGNALS:
+signals:
    void modified();
    void defaultKeyModified();
    void customKeyModified(const QString& key);
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -74,7 +74,7 @@ template <class P, class V> inline bool Group::set(P& property, const V& value)
    if (property != value) {
        property = value;
        updateTimeinfo();
-        Q_EMIT modified();
+        emit modified();
        return true;
    }
    else {
@@ -249,7 +249,7 @@ void Group::setUuid(const Uuid& uuid)
 void Group::setName(const QString& name)
 {
    if (set(m_data.name, name)) {
-        Q_EMIT dataChanged(this);
+        emit dataChanged(this);
    }
 }

@@ -267,8 +267,8 @@ void Group::setIcon(int iconNumber)
        m_data.customIcon = Uuid();

        updateTimeinfo();
-        Q_EMIT modified();
-        Q_EMIT dataChanged(this);
+        emit modified();
+        emit dataChanged(this);
    }
 }

@@ -281,8 +281,8 @@ void Group::setIcon(const Uuid& uuid)
        m_data.iconNumber = 0;

        updateTimeinfo();
-        Q_EMIT modified();
-        Q_EMIT dataChanged(this);
+        emit modified();
+        emit dataChanged(this);
    }
 }

@@ -296,7 +296,7 @@ void Group::setExpanded(bool expanded)
    if (m_data.isExpanded != expanded) {
        m_data.isExpanded = expanded;
        updateTimeinfo();
-        Q_EMIT modified();
+        emit modified();
    }
 }

@@ -325,7 +325,7 @@ void Group::setExpires(bool value)
    if (m_data.timeInfo.expires() != value) {
        m_data.timeInfo.setExpires(value);
        updateTimeinfo();
-        Q_EMIT modified();
+        emit modified();
    }
 }

@@ -334,7 +334,7 @@ void Group::setExpiryTime(const QDateTime& dateTime)
    if (m_data.timeInfo.expiryTime() != dateTime) {
        m_data.timeInfo.setExpiryTime(dateTime);
        updateTimeinfo();
-        Q_EMIT modified();
+        emit modified();
    }
 }

@@ -391,12 +391,12 @@ void Group::setParent(Group* parent, int index)
            recSetDatabase(parent->m_db);
        }
        QObject::setParent(parent);
-        Q_EMIT aboutToAdd(this, index);
+        emit aboutToAdd(this, index);
        Q_ASSERT(index <= parent->m_children.size());
        parent->m_children.insert(index, this);
    }
    else {
-        Q_EMIT aboutToMove(this, parent, index);
+        emit aboutToMove(this, parent, index);
        m_parent->m_children.removeAll(this);
        m_parent = parent;
        QObject::setParent(parent);
@@ -408,13 +408,13 @@ void Group::setParent(Group* parent, int index)
        m_data.timeInfo.setLocationChanged(QDateTime::currentDateTimeUtc());
    }

-    Q_EMIT modified();
+    emit modified();

    if (!moveWithinDatabase) {
-        Q_EMIT added();
+        emit added();
    }
    else {
-        Q_EMIT moved();
+        emit moved();
    }
 }

@@ -566,7 +566,7 @@ void Group::merge(const Group* other)
        }
    }

-    Q_EMIT modified();
+    emit modified();
 }

 Group* Group::findChildByName(const QString& name)
@@ -623,7 +623,7 @@ void Group::addEntry(Entry* entry)
    Q_ASSERT(entry);
    Q_ASSERT(!m_entries.contains(entry));

-    Q_EMIT entryAboutToAdd(entry);
+    emit entryAboutToAdd(entry);

    m_entries << entry;
    connect(entry, SIGNAL(dataChanged(Entry*)), SIGNAL(entryDataChanged(Entry*)));
@@ -631,23 +631,23 @@ void Group::addEntry(Entry* entry)
        connect(entry, SIGNAL(modified()), m_db, SIGNAL(modifiedImmediate()));
    }

-    Q_EMIT modified();
-    Q_EMIT entryAdded(entry);
+    emit modified();
+    emit entryAdded(entry);
 }

 void Group::removeEntry(Entry* entry)
 {
    Q_ASSERT(m_entries.contains(entry));

-    Q_EMIT entryAboutToRemove(entry);
+    emit entryAboutToRemove(entry);

    entry->disconnect(this);
    if (m_db) {
        entry->disconnect(m_db);
    }
    m_entries.removeAll(entry);
-    Q_EMIT modified();
-    Q_EMIT entryRemoved(entry);
+    emit modified();
+    emit entryRemoved(entry);
 }

 void Group::recSetDatabase(Database* db)
@@ -693,10 +693,10 @@ void Group::recSetDatabase(Database* db)
 void Group::cleanupParent()
 {
    if (m_parent) {
-        Q_EMIT aboutToRemove(this);
+        emit aboutToRemove(this);
        m_parent->m_children.removeAll(this);
-        Q_EMIT modified();
-        Q_EMIT removed();
+        emit modified();
+        emit removed();
    }
 }

--- a/src/core/Group.h
+++ b/src/core/Group.h
@@ -122,7 +122,7 @@ public:
    void copyDataFrom(const Group* other);
    void merge(const Group* other);

-Q_SIGNALS:
+signals:
    void dataChanged(Group* group);

    void aboutToAdd(Group* group, int index);
--- a/src/core/InactivityTimer.cpp
+++ b/src/core/InactivityTimer.cpp
@@ -73,7 +73,7 @@ void InactivityTimer::timeout()
    }

    if (m_active && !m_timer->isActive()) {
-        Q_EMIT inactivityDetected();
+        emit inactivityDetected();
    }

    m_emitMutx.unlock();
--- a/src/core/InactivityTimer.h
+++ b/src/core/InactivityTimer.h
@@ -33,13 +33,13 @@ public:
    void activate();
    void deactivate();

-Q_SIGNALS:
+signals:
    void inactivityDetected();

 protected:
    bool eventFilter(QObject* watched, QEvent* event);

-private Q_SLOTS:
+private slots:
    void timeout();

 private:
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -55,7 +55,7 @@ template <class P, class V> bool Metadata::set(P& property, const V& value)
 {
    if (property != value) {
        property = value;
-        Q_EMIT modified();
+        emit modified();
        return true;
    }
    else {
@@ -69,7 +69,7 @@ template <class P, class V> bool Metadata::set(P& property, const V& value, QDat
        if (m_updateDatetime) {
            dateTime = QDateTime::currentDateTimeUtc();
        }
-        Q_EMIT modified();
+        emit modified();
        return true;
    }
    else {
@@ -308,7 +308,7 @@ void Metadata::setGenerator(const QString& value)
 void Metadata::setName(const QString& value)
 {
    if (set(m_data.name, value, m_data.nameChanged)) {
-        Q_EMIT nameTextChanged();
+        emit nameTextChanged();
    }
 }

@@ -391,7 +391,7 @@ void Metadata::addCustomIcon(const Uuid& uuid, const QImage& icon)
    m_customIconScaledCacheKeys[uuid] = QPixmapCache::Key();
    m_customIconsOrder.append(uuid);
    Q_ASSERT(m_customIcons.count() == m_customIconsOrder.count());
-    Q_EMIT modified();
+    emit modified();
 }

 void Metadata::addCustomIconScaled(const Uuid& uuid, const QImage& icon)
@@ -422,7 +422,7 @@ void Metadata::removeCustomIcon(const Uuid& uuid)
    m_customIconScaledCacheKeys.remove(uuid);
    m_customIconsOrder.removeAll(uuid);
    Q_ASSERT(m_customIcons.count() == m_customIconsOrder.count());
-    Q_EMIT modified();
+    emit modified();
 }

 void Metadata::copyCustomIcons(const QSet<Uuid>& iconList, const Metadata* otherMetadata)
@@ -504,7 +504,7 @@ void Metadata::addCustomField(const QString& key, const QString& value)
    Q_ASSERT(!m_customFields.contains(key));

    m_customFields.insert(key, value);
-    Q_EMIT modified();
+    emit modified();
 }

 void Metadata::removeCustomField(const QString& key)
@@ -512,5 +512,5 @@ void Metadata::removeCustomField(const QString& key)
    Q_ASSERT(m_customFields.contains(key));

    m_customFields.remove(key);
-    Q_EMIT modified();
+    emit modified();
 }
--- a/src/core/Metadata.h
+++ b/src/core/Metadata.h
@@ -146,7 +146,7 @@ public:
     */
    void copyAttributesFrom(const Metadata* other);

-Q_SIGNALS:
+signals:
    void nameTextChanged();
    void modified();