[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmailtransport] src: Use Q_REQUIRED_RESULT
From: Laurent Montel <null () kde ! org>
Date: 2018-06-19 11:33:45
Message-ID: E1fVEtN-0004bm-Cv () code ! kde ! org
[Download RAW message or body]
Git commit 6cb7f6036453b40c90d86f208cf27a8b6ce2342e by Laurent Montel.
Committed on 19/06/2018 at 11:33.
Pushed by mlaurent into branch 'master'.
Use Q_REQUIRED_RESULT
M +1 -1 src/kmailtransport/plugins/smtp/sessionuiproxy.h
M +3 -3 src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h
M +3 -3 src/kmailtransport/plugins/transportabstractplugin.h
M +2 -2 src/kmailtransport/plugins/transportpluginmanager.h
M +6 -6 src/kmailtransport/transport.h
M +2 -2 src/kmailtransport/transportmanager.h
M +6 -6 src/kmailtransport/transporttype.h
M +4 -4 src/kmailtransport/widgets/transportcombobox.h
M +1 -1 src/kmailtransport/widgets/transportmanagementwidget.h
M +1 -1 src/kmailtransportakonadi/dispatcherinterface.h
M +1 -1 src/kmailtransportakonadi/messagequeuejob.h
M +2 -2 src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h
https://commits.kde.org/kmailtransport/6cb7f6036453b40c90d86f208cf27a8b6ce2342e
diff --git a/src/kmailtransport/plugins/smtp/sessionuiproxy.h \
b/src/kmailtransport/plugins/smtp/sessionuiproxy.h index 0afe15c..9c9b61d 100644
--- a/src/kmailtransport/plugins/smtp/sessionuiproxy.h
+++ b/src/kmailtransport/plugins/smtp/sessionuiproxy.h
@@ -24,7 +24,7 @@
class SmtpSessionUiProxy : public KSmtp::SessionUiProxy
{
public:
- bool ignoreSslError(const KSslErrorUiData &errorData) override
+ Q_REQUIRED_RESULT bool ignoreSslError(const KSslErrorUiData &errorData) override
{
return KIO::SslUi::askIgnoreSslErrors(errorData, \
KIO::SslUi::RecallAndStoreRules); }
diff --git a/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h \
b/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h index 38947ee..54be8db \
100644
--- a/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h
+++ b/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h
@@ -32,9 +32,9 @@ public:
});
~SMTPMailTransportPlugin() override;
- QVector<MailTransport::TransportAbstractPluginInfo> names() const override;
- bool configureTransport(const QString &identifier, MailTransport::Transport \
*transport, QWidget *parent) override;
- MailTransport::TransportJob *createTransportJob(MailTransport::Transport *t, \
const QString &identifier) override; + Q_REQUIRED_RESULT \
QVector<MailTransport::TransportAbstractPluginInfo> names() const override; + \
Q_REQUIRED_RESULT bool configureTransport(const QString &identifier, \
MailTransport::Transport *transport, QWidget *parent) override; + \
Q_REQUIRED_RESULT MailTransport::TransportJob \
*createTransportJob(MailTransport::Transport *t, const QString &identifier) override; \
};
#endif // SMTPMAILTRANSPORTPLUGIN_H
diff --git a/src/kmailtransport/plugins/transportabstractplugin.h \
b/src/kmailtransport/plugins/transportabstractplugin.h index 6924a86..c7ab4c6 100644
--- a/src/kmailtransport/plugins/transportabstractplugin.h
+++ b/src/kmailtransport/plugins/transportabstractplugin.h
@@ -42,9 +42,9 @@ public:
explicit TransportAbstractPlugin(QObject *parent = nullptr);
~TransportAbstractPlugin();
- virtual TransportJob *createTransportJob(MailTransport::Transport *t, const \
QString &identifier) = 0;
- virtual QVector<TransportAbstractPluginInfo> names() const = 0;
- virtual bool configureTransport(const QString &identifier, Transport *transport, \
QWidget *parent) = 0; + Q_REQUIRED_RESULT virtual TransportJob \
*createTransportJob(MailTransport::Transport *t, const QString &identifier) = 0; + \
Q_REQUIRED_RESULT virtual QVector<TransportAbstractPluginInfo> names() const = 0; + \
Q_REQUIRED_RESULT virtual bool configureTransport(const QString &identifier, \
Transport *transport, QWidget *parent) = 0; virtual void \
cleanUp(MailTransport::Transport *t);
virtual void initializeTransport(MailTransport::Transport *t, const QString \
&identifier);
diff --git a/src/kmailtransport/plugins/transportpluginmanager.h \
b/src/kmailtransport/plugins/transportpluginmanager.h index af77b49..520c444 100644
--- a/src/kmailtransport/plugins/transportpluginmanager.h
+++ b/src/kmailtransport/plugins/transportpluginmanager.h
@@ -34,8 +34,8 @@ public:
static TransportPluginManager *self();
- MailTransport::TransportAbstractPlugin *plugin(const QString &identifier);
- QVector<MailTransport::TransportAbstractPlugin *> pluginsList() const;
+ Q_REQUIRED_RESULT MailTransport::TransportAbstractPlugin *plugin(const QString \
&identifier); + Q_REQUIRED_RESULT QVector<MailTransport::TransportAbstractPlugin \
*> pluginsList() const;
Q_SIGNALS:
void updatePluginList();
diff --git a/src/kmailtransport/transport.h b/src/kmailtransport/transport.h
index 22ea14b..c8b7db5 100644
--- a/src/kmailtransport/transport.h
+++ b/src/kmailtransport/transport.h
@@ -54,12 +54,12 @@ public:
/**
Returns true if this transport is valid, ie. has all necessary data set.
*/
- bool isValid() const;
+ Q_REQUIRED_RESULT bool isValid() const;
/**
Returns the password of this transport.
*/
- QString password();
+ Q_REQUIRED_RESULT QString password();
/**
Sets the password of this transport.
@@ -91,12 +91,12 @@ public:
This is the way to find out if the password has already been loaded
from the wallet.
*/
- bool isComplete() const;
+ Q_REQUIRED_RESULT bool isComplete() const;
/**
Returns a string representation of the authentication type.
*/
- QString authenticationTypeString() const;
+ Q_REQUIRED_RESULT QString authenticationTypeString() const;
/**
Returns a string representation of the authentication type.
@@ -122,9 +122,9 @@ public:
@see TransportType.
@since 4.4
*/
- TransportType transportType() const;
+ Q_REQUIRED_RESULT TransportType transportType() const;
- QByteArray toJson() const;
+ Q_REQUIRED_RESULT QByteArray toJson() const;
protected:
/**
diff --git a/src/kmailtransport/transportmanager.h \
b/src/kmailtransport/transportmanager.h index 794818a..0f7f318 100644
--- a/src/kmailtransport/transportmanager.h
+++ b/src/kmailtransport/transportmanager.h
@@ -101,12 +101,12 @@ public:
Note: The Transport objects become invalid as soon as a change occur, so
they are only suitable for immediate use.
*/
- QList<Transport *> transports() const;
+ Q_REQUIRED_RESULT QList<Transport *> transports() const;
/**
Returns a list of all available transport types.
*/
- TransportType::List types() const;
+ Q_REQUIRED_RESULT TransportType::List types() const;
/**
Creates a new, empty Transport object. The object is owned by the caller.
diff --git a/src/kmailtransport/transporttype.h b/src/kmailtransport/transporttype.h
index f5d8578..3c11a5d 100644
--- a/src/kmailtransport/transporttype.h
+++ b/src/kmailtransport/transporttype.h
@@ -75,29 +75,29 @@ public:
/**
* Compares the transport type with the @p other.
*/
- bool operator==(const TransportType &other) const;
+ Q_REQUIRED_RESULT bool operator==(const TransportType &other) const;
/**
Returns whether the transport type is valid.
*/
- bool isValid() const;
+ Q_REQUIRED_RESULT bool isValid() const;
/**
Returns the i18n'ed name of the transport type.
*/
- QString name() const;
+ Q_REQUIRED_RESULT QString name() const;
/**
Returns a description of the transport type.
*/
- QString description() const;
+ Q_REQUIRED_RESULT QString description() const;
/**
* Returns a plugin identifier
*/
- QString identifier() const;
+ Q_REQUIRED_RESULT QString identifier() const;
- bool isAkonadiResource() const;
+ Q_REQUIRED_RESULT bool isAkonadiResource() const;
private:
//@cond PRIVATE
diff --git a/src/kmailtransport/widgets/transportcombobox.h \
b/src/kmailtransport/widgets/transportcombobox.h index 3a2bc0f..4f87371 100644
--- a/src/kmailtransport/widgets/transportcombobox.h
+++ b/src/kmailtransport/widgets/transportcombobox.h
@@ -42,24 +42,24 @@ public:
*/
explicit TransportComboBox(QWidget *parent = nullptr);
- ~TransportComboBox();
+ ~TransportComboBox() override;
/**
Returns identifier of the currently selected mail transport.
*/
- int currentTransportId() const;
+ Q_REQUIRED_RESULT int currentTransportId() const;
/**
Selects the given transport.
@param transportId The transport identifier.
@return return true if we success to find transportId
*/
- bool setCurrentTransport(int transportId);
+ Q_REQUIRED_RESULT bool setCurrentTransport(int transportId);
/**
Returns the type of the selected transport.
*/
- QString transportType() const;
+ Q_REQUIRED_RESULT QString transportType() const;
Q_SIGNALS:
void transportRemoved(int id, const QString &name);
diff --git a/src/kmailtransport/widgets/transportmanagementwidget.h \
b/src/kmailtransport/widgets/transportmanagementwidget.h index 4871029..1231f35 \
100644
--- a/src/kmailtransport/widgets/transportmanagementwidget.h
+++ b/src/kmailtransport/widgets/transportmanagementwidget.h
@@ -40,7 +40,7 @@ public:
Creates a new TransportManagementWidget.
@param parent The parent widget.
*/
- TransportManagementWidget(QWidget *parent = nullptr);
+ explicit TransportManagementWidget(QWidget *parent = nullptr);
/**
Destroys the widget.
diff --git a/src/kmailtransportakonadi/dispatcherinterface.h \
b/src/kmailtransportakonadi/dispatcherinterface.h index 9c64e11..8a9a6bc 100644
--- a/src/kmailtransportakonadi/dispatcherinterface.h
+++ b/src/kmailtransportakonadi/dispatcherinterface.h
@@ -52,7 +52,7 @@ public:
Returns the current instance of the mail dispatcher agent. May return an \
invalid AgentInstance in case it cannot find the mail dispatcher agent.
*/
- Akonadi::AgentInstance dispatcherInstance() const;
+ Q_REQUIRED_RESULT Akonadi::AgentInstance dispatcherInstance() const;
/**
Looks for messages in the outbox with DispatchMode::Manual and marks them
diff --git a/src/kmailtransportakonadi/messagequeuejob.h \
b/src/kmailtransportakonadi/messagequeuejob.h index a58e732..64e82ca 100644
--- a/src/kmailtransportakonadi/messagequeuejob.h
+++ b/src/kmailtransportakonadi/messagequeuejob.h
@@ -101,7 +101,7 @@ public:
/**
Returns the message to be sent.
*/
- KMime::Message::Ptr message() const;
+ Q_REQUIRED_RESULT KMime::Message::Ptr message() const;
/**
Returns a reference to the dispatch mode attribue for this message.
diff --git a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h \
b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h index \
6bcfed9..4599ebe 100644
--- a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h
+++ b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h
@@ -35,8 +35,8 @@ public:
});
~AkonadiMailTransportPlugin() override;
- QVector<MailTransport::TransportAbstractPluginInfo> names() const override;
- bool configureTransport(const QString &identifier, MailTransport::Transport \
*transport, QWidget *parent) override; + Q_REQUIRED_RESULT \
QVector<MailTransport::TransportAbstractPluginInfo> names() const override; + \
Q_REQUIRED_RESULT bool configureTransport(const QString &identifier, \
MailTransport::Transport *transport, QWidget *parent) override;
void cleanUp(MailTransport::Transport *t) override;
MailTransport::TransportJob *createTransportJob(MailTransport::Transport *t, \
const QString &identifier) override;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic