[pim/trojita] src: Fully qualify MOC types to fix Clazy warnings
Espen Sandøy Hustad <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit fa2c4160749cf8067926234c564cc14b8ed6d483 by Espen Sandøy Hustad.
Committed on 03/08/2026 at 19:00.
Pushed by ehustad into branch 'master'.
Fully qualify MOC types to fix Clazy warnings
Fixes most of Clazy:
* warning: slot arguments need to be fully-qualified [-Wclazy-fully-qualified-moc-types]
* warning: slot return types need to be fully-qualified [-Wclazy-fully-qualified-moc-types]
* warning: invokable arguments need to be fully-qualified [-Wclazy-fully-qualified-moc-types]
M +2 -2 src/Gui/MessageView.h
M +1 -1 src/Gui/ShortcutHandler/ShortcutConfigDialog.h
M +1 -1 src/Gui/ShortcutHandler/ShortcutConfigWidget.h
M +1 -1 src/Gui/ShortcutHandler/ShortcutHandler.h
M +4 -4 src/Imap/Model/TaskPresentationModel.h
M +2 -2 src/Imap/Model/ThreadingMsgListModel.h
M +53 -53 src/Imap/Parser/Parser.h
M +1 -1 src/Imap/Tasks/KeepMailboxOpenTask.h
M +1 -1 src/Imap/Tasks/ThreadTask.h
M +1 -1 src/MSA/Account.h
M +2 -2 src/Plugins/AbookAddressbook/AbookAddressbook.h
M +2 -2 src/Plugins/AddressbookPlugin.h
M +2 -2 src/Plugins/AkonadiAddressbook/AkonadiAddressbook.h
M +3 -3 src/Plugins/ClearTextPassword/ClearTextPassword.h
M +3 -3 src/Plugins/PasswordPlugin.h
M +3 -3 src/Plugins/QtKeyChain/QtKeyChainPassword.h
M +1 -1 src/qwwsmtpclient/qwwsmtpclient.h
https://invent.kde.org/pim/trojita/-/commit/fa2c4160749cf8067926234c564cc14b8ed6d483
diff --git a/src/Gui/MessageView.h b/src/Gui/MessageView.h
index f7cc46099..2397d6095 100644
--- a/src/Gui/MessageView.h
+++ b/src/Gui/MessageView.h
@@ -110,14 +110,14 @@ private slots:
void deleteLabelAction(const QString &tag);
void partContextMenuRequested(const QPoint &point);
void partLinkHovered(const QString &link, const QString &title, const QString &textContent);
- void triggerSearchDialogBy(EmbeddedWebView *w);
+ void triggerSearchDialogBy(Gui::EmbeddedWebView *w);
void onWebViewLoadStarted();
void onWebViewLoadFinished();
signals:
void messageChanged();
void messageModelChanged(QAbstractItemModel *model);
void linkHovered(const QString &url);
- void searchRequestedBy(EmbeddedWebView *webView);
+ void searchRequestedBy(Gui::EmbeddedWebView *webView);
void transferError(const QString &errorString);
private:
bool eventFilter(QObject *object, QEvent *event) override;
diff --git a/src/Gui/ShortcutHandler/ShortcutConfigDialog.h b/src/Gui/ShortcutHandler/ShortcutConfigDialog.h
index 556964e79..a3c60ed2d 100644
--- a/src/Gui/ShortcutHandler/ShortcutConfigDialog.h
+++ b/src/Gui/ShortcutHandler/ShortcutConfigDialog.h
@@ -51,7 +51,7 @@ public:
void setActionDescriptions(const QHash<QString, ActionDescription> &actionDescriptions);
Q_SIGNALS:
- void shortcutsChanged(const QHash<QString, ActionDescription> &actionDescriptions);
+ void shortcutsChanged(const QHash<QString, Gui::ActionDescription> &actionDescriptions);
protected Q_SLOTS:
void accept() override;
diff --git a/src/Gui/ShortcutHandler/ShortcutConfigWidget.h b/src/Gui/ShortcutHandler/ShortcutConfigWidget.h
index 6f83f5f99..6c8f54587 100644
--- a/src/Gui/ShortcutHandler/ShortcutConfigWidget.h
+++ b/src/Gui/ShortcutHandler/ShortcutConfigWidget.h
@@ -71,7 +71,7 @@ public:
void reject();
Q_SIGNALS:
- void shortcutsChanged(const QHash<QString, ActionDescription> &actionDescriptions);
+ void shortcutsChanged(const QHash<QString, Gui::ActionDescription> &actionDescriptions);
protected:
bool eventFilter(QObject *obj, QEvent *event) override;
diff --git a/src/Gui/ShortcutHandler/ShortcutHandler.h b/src/Gui/ShortcutHandler/ShortcutHandler.h
index 776add08c..9e6ef7a0f 100644
--- a/src/Gui/ShortcutHandler/ShortcutHandler.h
+++ b/src/Gui/ShortcutHandler/ShortcutHandler.h
@@ -329,7 +329,7 @@ public:
void readSettings();
private Q_SLOTS:
- void changeShortcuts(const QHash<QString, ActionDescription> &actionDescriptions);
+ void changeShortcuts(const QHash<QString, Gui::ActionDescription> &actionDescriptions);
void openShortcutConfigDialog();
private:
diff --git a/src/Imap/Model/TaskPresentationModel.h b/src/Imap/Model/TaskPresentationModel.h
index 9d89626c3..389ecf207 100644
--- a/src/Imap/Model/TaskPresentationModel.h
+++ b/src/Imap/Model/TaskPresentationModel.h
@@ -59,11 +59,11 @@ public:
public slots:
void slotSomeTaskDestroyed();
- void slotTaskGotReparented(const ImapTask *const task);
- void slotTaskMighHaveChanged(ImapTask *task);
+ void slotTaskGotReparented(const Imap::Mailbox::ImapTask *const task);
+ void slotTaskMighHaveChanged(Imap::Mailbox::ImapTask *task);
- void slotParserCreated(Parser *parser);
- void slotParserDeleted(Parser *parser);
+ void slotParserCreated(Imap::Parser *parser);
+ void slotParserDeleted(Imap::Parser *parser);
private:
Model *m_model;
diff --git a/src/Imap/Model/ThreadingMsgListModel.h b/src/Imap/Model/ThreadingMsgListModel.h
index 630c3520b..55e5a9e99 100644
--- a/src/Imap/Model/ThreadingMsgListModel.h
+++ b/src/Imap/Model/ThreadingMsgListModel.h
@@ -181,10 +181,10 @@ public slots:
/** @short Enable or disable threading */
void setUserWantsThreading(bool enable);
- Q_INVOKABLE bool setUserSearchingSortingPreference(const QStringList &searchConditions, const SortCriterium criterium,
+ Q_INVOKABLE bool setUserSearchingSortingPreference(const QStringList &searchConditions, const Imap::Mailbox::ThreadingMsgListModel::SortCriterium criterium,
const Qt::SortOrder order = Qt::AscendingOrder);
- void slotIncrementalThreadingAvailable(const Responses::ESearch::IncrementalThreadingData_t &data);
+ void slotIncrementalThreadingAvailable(const Imap::Responses::ESearch::IncrementalThreadingData_t &data);
void slotIncrementalThreadingFailed();
void delayedPrune();
diff --git a/src/Imap/Parser/Parser.h b/src/Imap/Parser/Parser.h
index 8cb38484d..b2b6a6729 100644
--- a/src/Imap/Parser/Parser.h
+++ b/src/Imap/Parser/Parser.h
@@ -89,17 +89,17 @@ public:
public slots:
/** @short CAPABILITY, RFC 3501 section 6.1.1 */
- CommandHandle capability();
+ Imap::CommandHandle capability();
/** @short NOOP, RFC 3501 section 6.1.2 */
- CommandHandle noop();
+ Imap::CommandHandle noop();
/** @short LOGOUT, RFC3501 section 6.1.3 */
- CommandHandle logout();
+ Imap::CommandHandle logout();
/** @short STARTTLS, RFC3051 section 6.2.1 */
- CommandHandle startTls();
+ Imap::CommandHandle startTls();
#if 0
/** @short AUTHENTICATE, RFC3501 section 6.2.2 */
@@ -107,116 +107,116 @@ public slots:
#endif
/** @short LOGIN, RFC3501 section 6.2.3 */
- CommandHandle login(const QString &user, const QString &pass);
+ Imap::CommandHandle login(const QString &user, const QString &pass);
/** @short SELECT, RFC3501 section 6.3.1 */
- CommandHandle select(const QString &mailbox, const QList<QByteArray> ¶ms = QList<QByteArray>());
+ Imap::CommandHandle select(const QString &mailbox, const QList<QByteArray> ¶ms = QList<QByteArray>());
/** @short SELECT extended according to RFC 5162 section 3.1 */
- CommandHandle selectQresync(const QString &mailbox, const uint uidValidity,
- const quint64 highestModSeq, const Sequence &knownUids = Sequence(),
- const Sequence &sequenceSnapshot = Sequence(), const Sequence &uidSnapshot = Sequence());
+ Imap::CommandHandle selectQresync(const QString &mailbox, const uint uidValidity,
+ const quint64 highestModSeq, const Imap::Sequence &knownUids = Sequence(),
+ const Imap::Sequence &sequenceSnapshot = Sequence(), const Imap::Sequence &uidSnapshot = Sequence());
/** @short EXAMINE, RFC3501 section 6.3.2 */
- CommandHandle examine(const QString &mailbox, const QList<QByteArray> ¶ms = QList<QByteArray>());
+ Imap::CommandHandle examine(const QString &mailbox, const QList<QByteArray> ¶ms = QList<QByteArray>());
/** @short CREATE, RFC3501 section 6.3.3 */
- CommandHandle create(const QString &mailbox);
+ Imap::CommandHandle create(const QString &mailbox);
/** @short DELETE, RFC3501 section 6.3.4 */
- CommandHandle deleteMailbox(const QString &mailbox);
+ Imap::CommandHandle deleteMailbox(const QString &mailbox);
/** @short RENAME, RFC3501 section 6.3.5 */
- CommandHandle rename(const QString &oldName, const QString &newName);
+ Imap::CommandHandle rename(const QString &oldName, const QString &newName);
/** @short SUBSCRIBE, RFC3501 section 6.3.6 */
- CommandHandle subscribe(const QString &mailbox);
+ Imap::CommandHandle subscribe(const QString &mailbox);
/** @short UNSUBSCRIBE, RFC3501 section 6.3.7 */
- CommandHandle unSubscribe(const QString &mailbox);
+ Imap::CommandHandle unSubscribe(const QString &mailbox);
/** @short LIST, RFC3501 section 6.3.8, as extended by RFC5258 */
- CommandHandle list(const QString &reference, const QString &mailbox, const QStringList &returnOptions = QStringList());
+ Imap::CommandHandle list(const QString &reference, const QString &mailbox, const QStringList &returnOptions = QStringList());
/** @short LSUB, RFC3501 section 6.3.9 */
- CommandHandle lSub(const QString &reference, const QString &mailbox);
+ Imap::CommandHandle lSub(const QString &reference, const QString &mailbox);
/** @short STATUS, RFC3501 section 6.3.10 */
- CommandHandle status(const QString &mailbox, const QStringList &fields);
+ Imap::CommandHandle status(const QString &mailbox, const QStringList &fields);
/** @short APPEND, RFC3501 section 6.3.11 */
- CommandHandle append(const QString &mailbox, const QByteArray &message,
+ Imap::CommandHandle append(const QString &mailbox, const QByteArray &message,
const QStringList &flags = QStringList(), const QDateTime ×tamp = QDateTime());
/** @short APPEND CATENATE, RFC 4469 */
- CommandHandle appendCatenate(const QString &mailbox, const QList<Imap::Mailbox::CatenatePair> &data,
+ Imap::CommandHandle appendCatenate(const QString &mailbox, const QList<Imap::Mailbox::CatenatePair> &data,
const QStringList &flags = QStringList(), const QDateTime ×tamp = QDateTime());
/** @short CHECK, RFC3501 sect 6.4.1 */
- CommandHandle check();
+ Imap::CommandHandle check();
/** @short CLOSE, RFC3501 sect 6.4.2 */
- CommandHandle close();
+ Imap::CommandHandle close();
/** @short EXPUNGE, RFC3501 sect 6.4.3 */
- CommandHandle expunge();
+ Imap::CommandHandle expunge();
/** @short SEARCH, RFC3501 sect 6.4.4 */
- CommandHandle search(const QStringList &criteria, const QByteArray &charset = QByteArray()) {
+ Imap::CommandHandle search(const QStringList &criteria, const QByteArray &charset = QByteArray()) {
return searchHelper("SEARCH", criteria, charset);
};
/** @short FETCH, RFC3501 sect 6.4.5 */
- CommandHandle fetch(const Sequence &seq, const QStringList &items,
+ Imap::CommandHandle fetch(const Imap::Sequence &seq, const QStringList &items,
const QMap<QByteArray, quint64> &uint64Modifiers = MapByteArrayUint64());
/** @short STORE, RFC3501 sect 6.4.6 */
- CommandHandle store(const Sequence &seq, const QString &item, const QString &value);
+ Imap::CommandHandle store(const Imap::Sequence &seq, const QString &item, const QString &value);
/** @short COPY, RFC3501 sect 6.4.7 */
- CommandHandle copy(const Sequence &seq, const QString &mailbox);
+ Imap::CommandHandle copy(const Imap::Sequence &seq, const QString &mailbox);
/** @short UID command (FETCH), RFC3501 sect 6.4.8 */
- CommandHandle uidFetch(const Sequence &seq, const QList<QByteArray> &items);
+ Imap::CommandHandle uidFetch(const Imap::Sequence &seq, const QList<QByteArray> &items);
/** @short UID command (STORE), RFC3501 sect 6.4.8 */
- CommandHandle uidStore(const Sequence &seq, const QString &item, const QString &value);
+ Imap::CommandHandle uidStore(const Imap::Sequence &seq, const QString &item, const QString &value);
/** @short UID command (COPY), RFC3501 sect 6.4.8 */
- CommandHandle uidCopy(const Sequence &seq, const QString &mailbox);
+ Imap::CommandHandle uidCopy(const Imap::Sequence &seq, const QString &mailbox);
/** @short UID XMOVE, draft-gulbrandsen-imap-move-01 as implemented by fastmail.fm */
- CommandHandle uidMove(const Sequence &seq, const QString &mailbox);
+ Imap::CommandHandle uidMove(const Imap::Sequence &seq, const QString &mailbox);
/** @short UID EXPUNGE from the UIDPLUS extension, RFC 2359 section 4.1 */
- CommandHandle uidExpunge(const Sequence &seq);
+ Imap::CommandHandle uidExpunge(const Imap::Sequence &seq);
/** @short UID command (SEARCH), RFC3501 sect 6.4.8 */
- CommandHandle uidSearch(const QStringList &criteria, const QByteArray &charset = QByteArray()) {
+ Imap::CommandHandle uidSearch(const QStringList &criteria, const QByteArray &charset = QByteArray()) {
return searchHelper("UID SEARCH", criteria, charset);
}
/** @short A special case of the "UID SEARCH UID" command */
- CommandHandle uidSearchUid(const QByteArray &sequence);
+ Imap::CommandHandle uidSearchUid(const QByteArray &sequence);
/** @short Perform the UID ESEARCH command with the specified UID set */
- CommandHandle uidESearchUid(const QByteArray &sequence);
+ Imap::CommandHandle uidESearchUid(const QByteArray &sequence);
/** @short X<atom>, RFC3501 sect 6.5.1 */
- CommandHandle xAtom(const Commands::Command &commands);
+ Imap::CommandHandle xAtom(const Imap::Commands::Command &commands);
/** @short UNSELECT, RFC3691 */
- CommandHandle unSelect();
+ Imap::CommandHandle unSelect();
/** @short IDLE, RFC2177
The IDLE command has to be explicitly terminated by calling idleDone().
*/
- CommandHandle idle();
+ Imap::CommandHandle idle();
/** @short The DONE for terminating the IDLE state, RFC2177 */
void idleDone();
@@ -229,54 +229,54 @@ public slots:
/** @short NAMESPACE, RFC 2342 */
- CommandHandle namespaceCommand();
+ Imap::CommandHandle namespaceCommand();
/** SORT, RFC5256 */
- CommandHandle sort(const QStringList &sortCriteria, const QByteArray &charset, const QStringList &searchCriteria);
+ Imap::CommandHandle sort(const QStringList &sortCriteria, const QByteArray &charset, const QStringList &searchCriteria);
/** UID SORT, RFC5256 */
- CommandHandle uidSort(const QStringList &sortCriteria, const QByteArray &charset, const QStringList &searchCriteria);
+ Imap::CommandHandle uidSort(const QStringList &sortCriteria, const QByteArray &charset, const QStringList &searchCriteria);
/** THREAD, RFC5256 */
- CommandHandle thread(const QByteArray &algo, const QByteArray &charset, const QStringList &searchCriteria);
+ Imap::CommandHandle thread(const QByteArray &algo, const QByteArray &charset, const QStringList &searchCriteria);
/** UID THREAD, RFC5256 */
- CommandHandle uidThread(const QByteArray &algo, const QByteArray &charset, const QStringList &searchCriteria);
+ Imap::CommandHandle uidThread(const QByteArray &algo, const QByteArray &charset, const QStringList &searchCriteria);
/** @short ESORT, the extended UID SORT from RFC 5267, section 3.1 */
- CommandHandle uidESort(const QStringList &sortCriteria, const QByteArray &charset, const QStringList &searchCriteria,
+ Imap::CommandHandle uidESort(const QStringList &sortCriteria, const QByteArray &charset, const QStringList &searchCriteria,
const QStringList &returnOptions);
/** @short ESEARCH, the extended UID SEARCH with support for ESEARCH return options from RFC 5267 */
- CommandHandle uidESearch(const QByteArray &charset, const QStringList &searchCriteria, const QStringList &returnOptions);
+ Imap::CommandHandle uidESearch(const QByteArray &charset, const QStringList &searchCriteria, const QStringList &returnOptions);
- CommandHandle uidEThread(const QByteArray &algo, const QByteArray &charset, const QStringList &searchCriteria,
+ Imap::CommandHandle uidEThread(const QByteArray &algo, const QByteArray &charset, const QStringList &searchCriteria,
const QStringList &returnOptions);
/** @short CANCELUPDATE, tell the server that it shall stop sending any ESEARCH responses associated with the given tag */
- CommandHandle cancelUpdate(const CommandHandle &tag);
+ Imap::CommandHandle cancelUpdate(const Imap::CommandHandle &tag);
/** @short ID, RFC 2971 section 3.1
This variant will send the ID NIL command.
*/
- CommandHandle idCommand();
+ Imap::CommandHandle idCommand();
/** @short ID, RFC 2971 section 3.1
This variant of the idCommand() sends an arbitrary list of arguments to the server.
*/
- CommandHandle idCommand(const QMap<QByteArray,QByteArray> &args);
+ Imap::CommandHandle idCommand(const QMap<QByteArray,QByteArray> &args);
/** @short ENABLE command, RFC 6151 */
- CommandHandle enable(const QList<QByteArray> &extensions);
+ Imap::CommandHandle enable(const QList<QByteArray> &extensions);
/** @short COMPRESS DEFLATE, RFC 4978 */
- CommandHandle compressDeflate();
+ Imap::CommandHandle compressDeflate();
/** @short GENURLAUTH, RFC 4467 */
- CommandHandle genUrlAuth(const QByteArray &url, const QByteArray mechanism);
+ Imap::CommandHandle genUrlAuth(const QByteArray &url, const QByteArray mechanism);
/** @short UID SENDMAIL, jkt's draft-imap-sendmail */
- CommandHandle uidSendmail(const uint uid, const Mailbox::UidSubmitOptionsList &submissionOptions);
+ Imap::CommandHandle uidSendmail(const uint uid, const Imap::Mailbox::UidSubmitOptionsList &submissionOptions);
void slotSocketStateChanged(const Imap::ConnectionState connState, const QString &message);
diff --git a/src/Imap/Tasks/KeepMailboxOpenTask.h b/src/Imap/Tasks/KeepMailboxOpenTask.h
index 4a4944ba8..38376f307 100644
--- a/src/Imap/Tasks/KeepMailboxOpenTask.h
+++ b/src/Imap/Tasks/KeepMailboxOpenTask.h
@@ -179,7 +179,7 @@ private slots:
bool handleFetch(const Imap::Responses::Fetch *const resp) override;
bool handleStateHelper(const Imap::Responses::State *const resp) override;
bool handleFlags(const Imap::Responses::Flags *const resp) override;
- bool handleVanished(const Responses::Vanished *const resp) override;
+ bool handleVanished(const Imap::Responses::Vanished *const resp) override;
bool handleResponseCodeInsideState(const Imap::Responses::State *const resp);
void slotPerformNoop();
diff --git a/src/Imap/Tasks/ThreadTask.h b/src/Imap/Tasks/ThreadTask.h
index 367d02ef6..abd815a15 100644
--- a/src/Imap/Tasks/ThreadTask.h
+++ b/src/Imap/Tasks/ThreadTask.h
@@ -56,7 +56,7 @@ public:
bool needsMailbox() const override {return true;}
signals:
/** @short An incremental update to the threading as per draft-imap-incthread */
- void incrementalThreadingAvailable(const Responses::ESearch::IncrementalThreadingData_t &update);
+ void incrementalThreadingAvailable(const Imap::Responses::ESearch::IncrementalThreadingData_t &update);
protected:
void _failed(const QString &errorMessage) override;
private:
diff --git a/src/MSA/Account.h b/src/MSA/Account.h
index ba43a7968..c3edae25b 100644
--- a/src/MSA/Account.h
+++ b/src/MSA/Account.h
@@ -88,7 +88,7 @@ signals:
void settingsRestored();
public slots:
- void setSubmissionMethod(const Method method);
+ void setSubmissionMethod(const MSA::Account::Method method);
void setServer(const QString &server);
void setPort(const quint16 port);
void setUsername(const QString &username);
diff --git a/src/Plugins/AbookAddressbook/AbookAddressbook.h b/src/Plugins/AbookAddressbook/AbookAddressbook.h
index fea2040f2..2b6f29070 100644
--- a/src/Plugins/AbookAddressbook/AbookAddressbook.h
+++ b/src/Plugins/AbookAddressbook/AbookAddressbook.h
@@ -59,8 +59,8 @@ public:
QStandardItemModel *model() const;
public slots:
- AddressbookCompletionJob *requestCompletion(const QString &input, const QStringList &ignores = QStringList(), int max = -1) override;
- AddressbookNamesJob *requestPrettyNamesForAddress(const QString &email) override;
+ Plugins::AddressbookCompletionJob *requestCompletion(const QString &input, const QStringList &ignores = QStringList(), int max = -1) override;
+ Plugins::AddressbookNamesJob *requestPrettyNamesForAddress(const QString &email) override;
void openAddressbookWindow() override;
void openContactWindow(const QString &email, const QString &displayName) override;
diff --git a/src/Plugins/AddressbookPlugin.h b/src/Plugins/AddressbookPlugin.h
index 65d9569d7..619b11b91 100644
--- a/src/Plugins/AddressbookPlugin.h
+++ b/src/Plugins/AddressbookPlugin.h
@@ -112,12 +112,12 @@ public slots:
* @p ignores is list of strings which are NOT included in result
* @p max is the demanded maximum reply length, negative value means "uncapped"
*/
- virtual AddressbookCompletionJob *requestCompletion(const QString &input, const QStringList &ignores = QStringList(), int max = -1) = 0;
+ virtual Plugins::AddressbookCompletionJob *requestCompletion(const QString &input, const QStringList &ignores = QStringList(), int max = -1) = 0;
/** @short Request a list of display names matching the given e-mail address and return AddressbookJob
* @p email is e-mail address
*/
- virtual AddressbookNamesJob *requestPrettyNamesForAddress(const QString &email) = 0;
+ virtual Plugins::AddressbookNamesJob *requestPrettyNamesForAddress(const QString &email) = 0;
/** @short Open window for addressbook manager */
virtual void openAddressbookWindow() = 0;
diff --git a/src/Plugins/AkonadiAddressbook/AkonadiAddressbook.h b/src/Plugins/AkonadiAddressbook/AkonadiAddressbook.h
index ac7d248cb..946684e2c 100644
--- a/src/Plugins/AkonadiAddressbook/AkonadiAddressbook.h
+++ b/src/Plugins/AkonadiAddressbook/AkonadiAddressbook.h
@@ -46,8 +46,8 @@ public:
virtual AddressbookPlugin::Features features() const;
public slots:
- virtual AddressbookCompletionJob *requestCompletion(const QString &input, const QStringList &ignores = QStringList(), int max = -1);
- virtual AddressbookNamesJob *requestPrettyNamesForAddress(const QString &email);
+ virtual Plugins::AddressbookCompletionJob *requestCompletion(const QString &input, const QStringList &ignores = QStringList(), int max = -1);
+ virtual Plugins::AddressbookNamesJob *requestPrettyNamesForAddress(const QString &email);
virtual void openAddressbookWindow();
virtual void openContactWindow(const QString &email, const QString &displayName);
};
diff --git a/src/Plugins/ClearTextPassword/ClearTextPassword.h b/src/Plugins/ClearTextPassword/ClearTextPassword.h
index 3eab5cbde..758798856 100644
--- a/src/Plugins/ClearTextPassword/ClearTextPassword.h
+++ b/src/Plugins/ClearTextPassword/ClearTextPassword.h
@@ -64,9 +64,9 @@ public:
Features features() const override;
public slots:
- PasswordJob *requestPassword(const QString &accountId, const QString &accountType) override;
- PasswordJob *storePassword(const QString &accountId, const QString &accountType, const QString &password) override;
- PasswordJob *deletePassword(const QString &accountId, const QString &accountType) override;
+ Plugins::PasswordJob *requestPassword(const QString &accountId, const QString &accountType) override;
+ Plugins::PasswordJob *storePassword(const QString &accountId, const QString &accountType, const QString &password) override;
+ Plugins::PasswordJob *deletePassword(const QString &accountId, const QString &accountType) override;
private:
QSettings *m_settings;
diff --git a/src/Plugins/PasswordPlugin.h b/src/Plugins/PasswordPlugin.h
index b8d458316..28c78176e 100644
--- a/src/Plugins/PasswordPlugin.h
+++ b/src/Plugins/PasswordPlugin.h
@@ -77,13 +77,13 @@ public:
public slots:
/** @short Request password associated with accountId and accountType and return PasswordJob */
- virtual PasswordJob *requestPassword(const QString &accountId, const QString &accountType) = 0;
+ virtual Plugins::PasswordJob *requestPassword(const QString &accountId, const QString &accountType) = 0;
/** @short Save password for accountId and accountType and return PasswordJob */
- virtual PasswordJob *storePassword(const QString &accountId, const QString &accountType, const QString &password) = 0;
+ virtual Plugins::PasswordJob *storePassword(const QString &accountId, const QString &accountType, const QString &password) = 0;
/** @short Delete password for accountId and accountType and return PasswordJob */
- virtual PasswordJob *deletePassword(const QString &accountId, const QString &accountType) = 0;
+ virtual Plugins::PasswordJob *deletePassword(const QString &accountId, const QString &accountType) = 0;
protected:
PasswordPlugin(QObject *parent);
diff --git a/src/Plugins/QtKeyChain/QtKeyChainPassword.h b/src/Plugins/QtKeyChain/QtKeyChainPassword.h
index 6712af66c..e9a735db2 100644
--- a/src/Plugins/QtKeyChain/QtKeyChainPassword.h
+++ b/src/Plugins/QtKeyChain/QtKeyChainPassword.h
@@ -71,9 +71,9 @@ public:
Features features() const override;
public slots:
- PasswordJob *requestPassword(const QString &accountId, const QString &accountType) override;
- PasswordJob *storePassword(const QString &accountId, const QString &accountType, const QString &password) override;
- PasswordJob *deletePassword(const QString &accountId, const QString &accountType) override;
+ Plugins::PasswordJob *requestPassword(const QString &accountId, const QString &accountType) override;
+ Plugins::PasswordJob *storePassword(const QString &accountId, const QString &accountType, const QString &password) override;
+ Plugins::PasswordJob *deletePassword(const QString &accountId, const QString &accountType) override;
};
}
diff --git a/src/qwwsmtpclient/qwwsmtpclient.h b/src/qwwsmtpclient/qwwsmtpclient.h
index cac3e35a3..5e058e68d 100644
--- a/src/qwwsmtpclient/qwwsmtpclient.h
+++ b/src/qwwsmtpclient/qwwsmtpclient.h
@@ -79,7 +79,7 @@ signals:
void done(bool);
void connected();
void disconnected();
- void stateChanged(State);
+ void stateChanged(QwwSmtpClient::State);
void commandFinished(int, bool error);
void commandStarted(int);
void tlsStarted();