summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-07-28 11:20:37 (GMT)
committerMontel Laurent <montel@kde.org>2016-07-28 11:20:37 (GMT)
commit116109e09834d0ffa3de90df460f8d801ad4608f (patch)
treefd4483dea28e2ef0e0a6dcec407c00aafa70667f
parenta2160ef3ce11df8b2da79ef227b70ddde097bcea (diff)
Remove not necessary private Q_SLOTS
-rw-r--r--src/filter/mdnadvicedialog.h4
-rw-r--r--src/filter/soundtestwidget.h4
-rw-r--r--src/folder/accountconfigorderdialog.h3
-rw-r--r--src/folder/foldercollectionmonitor.h4
-rw-r--r--src/folder/folderselectiondialog.cpp2
-rw-r--r--src/job/backupjob.h4
-rw-r--r--src/job/expirejob.h5
-rw-r--r--src/job/jobscheduler.h4
-rw-r--r--src/snippets/snippetvariabledialog.h4
-rw-r--r--src/tag/addtagdialog.h4
-rw-r--r--src/tag/tagwidget.h4
-rw-r--r--src/widgets/redirectwidget.cpp5
-rw-r--r--src/widgets/redirectwidget.h4
13 files changed, 15 insertions, 36 deletions
diff --git a/src/filter/mdnadvicedialog.h b/src/filter/mdnadvicedialog.h
index 19bb121..0035c53 100644
--- a/src/filter/mdnadvicedialog.h
+++ b/src/filter/mdnadvicedialog.h
@@ -86,12 +86,10 @@ public:
MessageComposer::MDNAdvice result() const;
-private Q_SLOTS:
+private:
void slotUser1Clicked();
void slotUser2Clicked();
void slotYesClicked();
-
-private:
MessageComposer::MDNAdvice m_result;
protected:
diff --git a/src/filter/soundtestwidget.h b/src/filter/soundtestwidget.h
index cf7af8f..8bcb4d3 100644
--- a/src/filter/soundtestwidget.h
+++ b/src/filter/soundtestwidget.h
@@ -76,12 +76,10 @@ Q_SIGNALS:
*/
void textChanged(const QString &);
-private Q_SLOTS:
+private:
void playSound();
void openSoundDialog(KUrlRequester *);
void slotUrlChanged(const QString &);
-
-private:
KUrlRequester *m_urlRequester;
QPushButton *m_playButton;
};
diff --git a/src/folder/accountconfigorderdialog.h b/src/folder/accountconfigorderdialog.h
index 4942651..90fb3ab 100644
--- a/src/folder/accountconfigorderdialog.h
+++ b/src/folder/accountconfigorderdialog.h
@@ -32,13 +32,12 @@ public:
explicit AccountConfigOrderDialog(QWidget *parent);
~AccountConfigOrderDialog();
-private Q_SLOTS:
+private:
void slotOk();
void slotMoveUp();
void slotMoveDown();
void slotEnableControls();
void slotEnableAccountOrder(bool state);
-private:
enum Type {
IdentifierAccount = Qt::UserRole + 1
};
diff --git a/src/folder/foldercollectionmonitor.h b/src/folder/foldercollectionmonitor.h
index 0d4f29a..a6ae3c4 100644
--- a/src/folder/foldercollectionmonitor.h
+++ b/src/folder/foldercollectionmonitor.h
@@ -50,14 +50,12 @@ public:
void expireAllFolders(bool immediate, QAbstractItemModel *collectionModel);
void expunge(const Akonadi::Collection &, bool sync = false);
-private Q_SLOTS:
- void slotDeleteJob(KJob *job);
-
protected:
void expireAllCollection(const QAbstractItemModel *model, bool immediate,
const QModelIndex &parentIndex = QModelIndex());
private:
+ void slotDeleteJob(KJob *job);
FolderCollectionMonitorPrivate *const d;
};
diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp
index 725b04e..fb09bd7 100644
--- a/src/folder/folderselectiondialog.cpp
+++ b/src/folder/folderselectiondialog.cpp
@@ -150,7 +150,7 @@ void FolderSelectionDialog::slotFolderTreeWidgetContextMenuRequested(const QPoin
{
if (d->mUser1Button && d->mUser1Button->isEnabled() && d->folderTreeWidget->folderTreeView()->indexAt(pos).isValid()) {
QMenu menu;
- menu.addAction(i18n("&New Subfolder..."), this, SLOT(slotAddChildFolder()));
+ menu.addAction(i18n("&New Subfolder..."), this, &FolderSelectionDialog::slotAddChildFolder);
menu.exec(QCursor::pos());
}
}
diff --git a/src/job/backupjob.h b/src/job/backupjob.h
index 553fab7..25ad884 100644
--- a/src/job/backupjob.h
+++ b/src/job/backupjob.h
@@ -82,14 +82,12 @@ Q_SIGNALS:
void backupDone(const QString &);
void error(const QString &);
-private Q_SLOTS:
+private:
void itemFetchJobResult(KJob *job);
void cancelJob();
void archiveNextFolder();
void onArchiveNextFolderDone(KJob *job);
void archiveNextMessage();
-
-private:
bool queueFolders(const Akonadi::Collection &root);
void processMessage(const Akonadi::Item &item);
QString pathForCollection(const Akonadi::Collection &collection) const;
diff --git a/src/job/expirejob.h b/src/job/expirejob.h
index 4e9dfe1..8648286 100644
--- a/src/job/expirejob.h
+++ b/src/job/expirejob.h
@@ -50,13 +50,12 @@ public:
void execute() Q_DECL_OVERRIDE;
void kill() Q_DECL_OVERRIDE;
-private Q_SLOTS:
+
+private:
void slotDoWork();
void slotExpireDone(KJob *job);
void slotMoveDone(KJob *job);
void itemFetchResult(KJob *job);
-
-private:
void done();
private:
diff --git a/src/job/jobscheduler.h b/src/job/jobscheduler.h
index e606a40..3ec5c0b 100644
--- a/src/job/jobscheduler.h
+++ b/src/job/jobscheduler.h
@@ -115,14 +115,12 @@ public:
void pause();
void resume();
-private Q_SLOTS:
+private:
/// Called by a timer to run the next job
void slotRunNextJob();
/// Called when the current job terminates
void slotJobFinished();
-
-private:
void restartTimer();
void interruptCurrentTask();
void runTaskNow(ScheduledTask *task);
diff --git a/src/snippets/snippetvariabledialog.h b/src/snippets/snippetvariabledialog.h
index 7207112..7a2cc69 100644
--- a/src/snippets/snippetvariabledialog.h
+++ b/src/snippets/snippetvariabledialog.h
@@ -43,10 +43,8 @@ public:
QString variableValue() const;
bool saveVariableIsChecked() const;
-private Q_SLOTS:
- void slotAccepted();
-
private:
+ void slotAccepted();
QString mVariableName;
QMap<QString, QString> *mVariables;
KPIMTextEdit::PlainTextEditorWidget *mVariableValueText;
diff --git a/src/tag/addtagdialog.h b/src/tag/addtagdialog.h
index c519605..9cc3bf1 100644
--- a/src/tag/addtagdialog.h
+++ b/src/tag/addtagdialog.h
@@ -41,12 +41,10 @@ public:
QString label() const;
Akonadi::Tag tag() const;
-private Q_SLOTS:
+private:
void slotSave();
void slotTagNameChanged(const QString &text);
void onTagCreated(KJob *job);
-
-private:
AddTagDialogPrivate *const d;
};
}
diff --git a/src/tag/tagwidget.h b/src/tag/tagwidget.h
index 0392a0c..5370e8c 100644
--- a/src/tag/tagwidget.h
+++ b/src/tag/tagwidget.h
@@ -67,10 +67,8 @@ Q_SIGNALS:
void changed();
void iconNameChanged(const QString &);
-private Q_SLOTS:
- void slotEmitChangeCheck();
-
private:
+ void slotEmitChangeCheck();
TagWidgetPrivate *const d;
};
}
diff --git a/src/widgets/redirectwidget.cpp b/src/widgets/redirectwidget.cpp
index 0f85d83..ac52d4b 100644
--- a/src/widgets/redirectwidget.cpp
+++ b/src/widgets/redirectwidget.cpp
@@ -37,11 +37,10 @@ using namespace MailCommon;
RedirectWidget::RedirectWidget(QWidget *parent)
: QWidget(parent)
{
- QHBoxLayout *hbox = new QHBoxLayout;
+ QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setSpacing(0);
hbox->setMargin(0);
hbox->setAlignment(Qt::AlignRight);
- setLayout(hbox);
mEdit = new MessageComposer::ComposerLineEdit(true);
mEdit->setRecentAddressConfig(KernelIf->config().data());
@@ -49,7 +48,7 @@ RedirectWidget::RedirectWidget(QWidget *parent)
mEdit->setClearButtonShown(true);
hbox->addWidget(mEdit);
- QPushButton *BtnTo = new QPushButton();
+ QPushButton *BtnTo = new QPushButton(this);
BtnTo->setIcon(QIcon::fromTheme(QStringLiteral("help-contents")));
BtnTo->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
BtnTo->setToolTip(i18n("Use the Address-Selection Dialog"));
diff --git a/src/widgets/redirectwidget.h b/src/widgets/redirectwidget.h
index 991e655..3182cd1 100644
--- a/src/widgets/redirectwidget.h
+++ b/src/widgets/redirectwidget.h
@@ -44,10 +44,8 @@ public:
Q_SIGNALS:
void addressChanged(const QString &);
-private Q_SLOTS:
- void slotAddressSelection();
-
private:
+ void slotAddressSelection();
MessageComposer::ComposerLineEdit *mEdit;
QString mResendStr;
};