Commit f065f5f0 authored by Laurent Montel's avatar Laurent Montel 😁

Use macro

parent 94e2ac6f
......@@ -86,7 +86,7 @@ public:
qulonglong sentItemsSize;
SentActionHandler *sentActionHandler;
// slots:
// Q_SLOTS:
void abort();
void dispatch();
void itemFetched(const Item &item);
......
......@@ -94,7 +94,7 @@ public:
void initQueue();
void addIfComplete(const Item &item);
// slots:
// Q_SLOTS:
void checkFuture();
void collectionFetched(KJob *job);
void itemFetched(KJob *job);
......
......@@ -47,7 +47,7 @@ public:
bool success;
QString message;
// slots:
// Q_SLOTS:
void fetchDone(KJob *job);
void modifyDone(KJob *job);
};
......
......@@ -42,7 +42,7 @@ public:
void pause() Q_DECL_OVERRIDE;
void abort() Q_DECL_OVERRIDE;
private slots:
private Q_SLOTS:
void onTimerElapsed();
};
......
......@@ -101,7 +101,7 @@ public:
class SchedulerTest: public QObject
{
Q_OBJECT
private slots:
private Q_SLOTS:
void initTestcase()
{
......
......@@ -46,7 +46,7 @@ protected:
bool doResume() Q_DECL_OVERRIDE;
bool doSuspend() Q_DECL_OVERRIDE;
private slots:
private Q_SLOTS:
void onStoppedProcessing();
void executeNext();
......
......@@ -36,7 +36,7 @@ class MigratorModel;
class LogModel : public QStandardItemModel
{
Q_OBJECT
public slots:
public Q_SLOTS:
void message(MigratorBase::MessageType type, const QString &msg);
};
......@@ -51,7 +51,7 @@ public:
bool operator==(const Row &other) const;
private slots:
private Q_SLOTS:
void stateChanged(MigratorBase::MigrationState);
void progress(int);
};
......
......@@ -31,14 +31,14 @@ class MigrationStatusWidget: public QWidget
Q_OBJECT
public:
explicit MigrationStatusWidget(MigrationScheduler &scheduler, QWidget *parent = Q_NULLPTR);
private slots:
private Q_SLOTS:
void startSelected();
void pauseSelected();
void abortSelected();
private:
MigrationScheduler &mScheduler;
QItemSelectionModel *mSelectionModel;
public slots:
public Q_SLOTS:
void onItemActivated(const QModelIndex &);
};
......
......@@ -40,7 +40,7 @@ public:
void save();
void defaults();
private slots:
private Q_SLOTS:
void updateStatus();
void startStopClicked();
void restartClicked();
......
......@@ -33,7 +33,7 @@ public:
/* reimp */ void doStart();
private slots:
private Q_SLOTS:
void collectionCreateJobDone(KJob *);
private:
......
......@@ -51,7 +51,7 @@ public:
void doStart() Q_DECL_OVERRIDE;
private slots:
private Q_SLOTS:
void collectionsReceived(const Akonadi::Collection::List &);
void collectionsFetched(KJob *);
void itemsUpdated(KJob *);
......@@ -75,7 +75,7 @@ public:
void doStart() Q_DECL_OVERRIDE;
void slotResult(KJob *job) Q_DECL_OVERRIDE;
private slots:
private Q_SLOTS:
void itemsReceived(const Akonadi::Item::List &items);
private:
bool processNext();
......
......@@ -39,7 +39,7 @@ public:
protected:
virtual void startWork();
private slots:
private Q_SLOTS:
void migrationFinished(KJob *);
private:
QString mMimeType;
......
......@@ -37,7 +37,7 @@ public:
InfoDialog(bool closeWhenDone = true);
~InfoDialog();
public slots:
public Q_SLOTS:
void message(KMigratorBase::MessageType type, const QString &msg);
void message(MigratorBase::MessageType type, const QString &msg);
......@@ -58,7 +58,7 @@ public slots:
void progress(int value);
void progress(int min, int max, int value);
private slots:
private Q_SLOTS:
void scrollBarMoved(int value);
private:
......
......@@ -76,13 +76,13 @@ protected:
virtual void migrationFailed(const QString &errorMsg, const Akonadi::AgentInstance &instance
= Akonadi::AgentInstance()) = 0;
signals:
Q_SIGNALS:
void message(KMigratorBase::MessageType type, const QString &msg);
protected slots:
protected Q_SLOTS:
virtual void migrate() = 0;
private slots:
private Q_SLOTS:
void logMessage(KMigratorBase::MessageType type, const QString &msg);
private:
......
......@@ -184,7 +184,7 @@ public:
*/
QString status() const;
signals:
Q_SIGNALS:
//Signal for state changes
void stateChanged(MigratorBase::MigrationState);
......@@ -207,7 +207,7 @@ protected:
void setProgress(int);
private slots:
private Q_SLOTS:
/**
* Logs a message, that appears in the logfile and potentially in a log window.
* Do not call this directly. Emit the message signal instead, which is connected to this slot.
......
......@@ -27,7 +27,7 @@ using namespace Akonadi;
class AddresseeSerializerTest : public QObject
{
Q_OBJECT
private slots:
private Q_SLOTS:
void testGid()
{
const QString uid(QLatin1String("uid"));
......
......@@ -28,7 +28,7 @@ using namespace KCalCore;
class KCalCoreSerializerTest : public QObject
{
Q_OBJECT
private slots:
private Q_SLOTS:
void testEventSerialize_data()
{
QTest::addColumn<QString>("mimeType");
......
......@@ -25,7 +25,7 @@
class MailSerializerPluginTest : public QObject
{
Q_OBJECT
private slots:
private Q_SLOTS:
void testMailPlugin();
void testMessageIntegrity();
};
......
......@@ -25,7 +25,7 @@
class MailSerializerTest : public QObject
{
Q_OBJECT
private slots:
private Q_SLOTS:
void testEnvelopeDeserialize();
void testEnvelopeDeserializeWithReferencesHeader();
void testEnvelopeSerialize();
......
......@@ -53,7 +53,7 @@ private:
KCalCore::Event::Ptr createAnniversary(const Akonadi::Item &contactItem);
KCalCore::Event::Ptr createEvent(const QDate &date);
private slots:
private Q_SLOTS:
void doFullSearch();
void listContacts(const Akonadi::Collection::List &cols);
void createEvents(const Akonadi::Item::List &items);
......
......@@ -34,7 +34,7 @@ public:
ConfigDialog(QWidget *parent = Q_NULLPTR);
~ConfigDialog();
private slots:
private Q_SLOTS:
void save();
private:
......
......@@ -92,7 +92,7 @@ public:
*/
QList<Result> results() const;
private slots:
private Q_SLOTS:
void principalCollectionSetSearchFinished(KJob *job);
void principalPropertySearchFinished(KJob *job);
......
......@@ -57,7 +57,7 @@ public:
*/
void retrieveFreeBusy(const QString &email, const KDateTime &start, const KDateTime &end);
signals:
Q_SIGNALS:
/**
* Emitted once we know if the free-busy info for @p email
* can be handled or not.
......@@ -69,7 +69,7 @@ signals:
*/
void freeBusyRetrieved(const QString &email, const QString &freeBusy, bool success, const QString &errorText);
private slots:
private Q_SLOTS:
void onPrincipalSearchJobFinished(KJob *job);
void onRetrieveFreeBusyJobFinished(KJob *job);
......
......@@ -101,7 +101,7 @@ public:
bool validatePage() Q_DECL_OVERRIDE;
private slots:
private Q_SLOTS:
void manualConfigToggled(bool toggled);
private:
......@@ -119,7 +119,7 @@ public:
void initializePage() Q_DECL_OVERRIDE;
void cleanupPage() Q_DECL_OVERRIDE;
private slots:
private Q_SLOTS:
void urlElementChanged();
private:
......
......@@ -32,7 +32,7 @@ public:
explicit AddItemTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~AddItemTask();
private slots:
private Q_SLOTS:
void onAppendMessageDone(KJob *job);
void onPreSearchSelectDone(KJob *job);
void onSearchDone(KJob *job);
......
......@@ -39,7 +39,7 @@ public:
virtual void requestPassword(RequestType request = StandardRequest,
const QString &serverError = QString());
private slots:
private Q_SLOTS:
void emitResult();
private:
......
......@@ -55,7 +55,7 @@ protected:
Akonadi::Collection createCollectionChain(const QString &remoteId) const;
private slots:
private Q_SLOTS:
void setupTestCase();
};
......
......@@ -27,7 +27,7 @@ class TestAddCollectionTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldCreateAndSubscribe_data()
{
QTest::addColumn<Akonadi::Collection>("parentCollection");
......
......@@ -29,7 +29,7 @@ class TestAddItemTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldAppendMessage_data()
{
QTest::addColumn<Akonadi::Item>("item");
......
......@@ -30,7 +30,7 @@ class TestChangeCollectionTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldUpdateMetadataAclAndName_data()
{
QTest::addColumn<Akonadi::Collection>("collection");
......
......@@ -30,7 +30,7 @@ class TestChangeItemTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldAppendMessage_data()
{
QTest::addColumn<Akonadi::Item>("item");
......
......@@ -25,7 +25,7 @@ class TestExpungeCollectionTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldDeleteMailBox_data()
{
QTest::addColumn<Akonadi::Collection>("collection");
......
......@@ -25,7 +25,7 @@ class TestMoveCollectionTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldRenameMailBox_data()
{
QTest::addColumn<Akonadi::Collection>("collection");
......
......@@ -30,7 +30,7 @@ class TestMoveItemsTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldCopyAndDeleteMessage_data()
{
QTest::addColumn<Akonadi::Item>("item");
......
......@@ -43,7 +43,7 @@ class TestResourceTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldRequestSession_data()
{
QTest::addColumn<DummyResourceState::Ptr>("state");
......
......@@ -38,7 +38,7 @@ class TestRetrieveCollectionMetadataTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void initTestCase()
{
......
......@@ -37,7 +37,7 @@ public:
{
}
private slots:
private Q_SLOTS:
void shouldListCollections_data()
{
QTest::addColumn<Akonadi::Collection::List>("expectedCollections");
......
......@@ -32,7 +32,7 @@ class TestRetrieveItemsTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldIntrospectCollection_data()
{
QTest::addColumn<Akonadi::Collection>("collection");
......
......@@ -25,7 +25,7 @@ class TestRetrieveItemTask : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldFetchMessage_data()
{
QTest::addColumn<Akonadi::Item>("item");
......
......@@ -25,7 +25,7 @@ class TestSessionPool : public ImapTestBase
{
Q_OBJECT
private slots:
private Q_SLOTS:
void shouldPrepareFirstSessionOnConnect_data()
{
QTest::addColumn<ImapAccount *>("account");
......
......@@ -34,7 +34,7 @@ public:
void syncEnabledState(bool);
private slots:
private Q_SLOTS:
void onRenameDone(KJob *job);
void onSubscribeDone(KJob *job);
void onSetAclDone(KJob *job);
......
......@@ -32,7 +32,7 @@ public:
explicit ChangeItemTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~ChangeItemTask();
private slots:
private Q_SLOTS:
void onAppendMessageDone(KJob *job);
void onPreStoreSelectDone(KJob *job);
......
......@@ -32,7 +32,7 @@ public:
explicit ExpungeCollectionTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~ExpungeCollectionTask();
private slots:
private Q_SLOTS:
void onSelectDone(KJob *job);
void onExpungeDone(KJob *job);
......
......@@ -55,7 +55,7 @@ public:
KIMAP::Session *session() const;
private slots:
private Q_SLOTS:
void onConnectionLost(KIMAP::Session *session);
void onPoolDisconnect();
......
......@@ -32,7 +32,7 @@ public:
explicit MoveCollectionTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~MoveCollectionTask();
private slots:
private Q_SLOTS:
void onExamineDone(KJob *job);
void onRenameDone(KJob *job);
void onSubscribeDone(KJob *job);
......
......@@ -34,7 +34,7 @@ public:
explicit MoveItemsTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~MoveItemsTask();
private slots:
private Q_SLOTS:
void onSelectDone(KJob *job);
void onCopyDone(KJob *job);
void onStoreFlagsDone(KJob *job);
......
......@@ -50,7 +50,7 @@ public:
const QString &serverError = QString()) = 0;
virtual void cancelPasswordRequests();
signals:
Q_SIGNALS:
void done(int resultType, const QString &password = QString());
};
......
......@@ -34,7 +34,7 @@ public:
explicit RemoveCollectionRecursiveTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~RemoveCollectionRecursiveTask();
private slots:
private Q_SLOTS:
void onMailBoxesReceived(const QList<KIMAP::MailBoxDescriptor> &descriptors,
const QList< QList<QByteArray> > &flags);
void onCloseJobDone(KJob *job);
......
......@@ -32,7 +32,7 @@ public:
explicit RetrieveCollectionMetadataTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~RetrieveCollectionMetadataTask();
private slots:
private Q_SLOTS:
void onGetMetaDataDone(KJob *job);
void onGetAclDone(KJob *job);
void onRightsReceived(KJob *job);
......
......@@ -36,7 +36,7 @@ public:
explicit RetrieveCollectionsTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~RetrieveCollectionsTask();
private slots:
private Q_SLOTS:
void onMailBoxesReceived(const QList<KIMAP::MailBoxDescriptor> &descriptors,
const QList< QList<QByteArray> > &flags);
void onMailBoxesReceiveDone(KJob *job);
......
......@@ -42,11 +42,11 @@ public:
virtual ~RetrieveItemsTask();
void setFetchMissingItemBodies(bool enabled);
public slots:
public Q_SLOTS:
void onFetchItemsWithoutBodiesDone(const QList<qint64> &items);
void onReadyForNextBatch(int size);
private slots:
private Q_SLOTS:
void fetchItemsWithoutBodiesDone(KJob *job);
void onPreExpungeSelectDone(KJob *job);
void onExpungeDone(KJob *job);
......
......@@ -34,7 +34,7 @@ public:
explicit RetrieveItemTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~RetrieveItemTask();
private slots:
private Q_SLOTS:
void onSelectDone(KJob *job);
void onMessagesReceived(const QString &mailBox,
const QMap<qint64, qint64> &uids,
......
......@@ -89,7 +89,7 @@ public:
};
QList<KIMAP::MailBoxDescriptor> serverNamespaces(Namespace) const;
signals:
Q_SIGNALS:
void connectionLost(KIMAP::Session *session);
void sessionRequestDone(qint64 requestNumber, KIMAP::Session *session,
......@@ -97,7 +97,7 @@ signals:
void connectDone(int errorCode = NoError, const QString &errorString = QString());
void disconnectDone();
private slots:
private Q_SLOTS:
void processPendingRequests();
void onPasswordRequestDone(int resultType, const QString &password);
......
......@@ -50,16 +50,16 @@ public:
virtual void clearCachedPassword();
virtual void cleanup();
signals:
Q_SIGNALS: