summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-21 07:20:41 +0200
committerMontel Laurent <[email protected]>2017-09-21 07:20:41 +0200
commit8cf5b6aa3e533afee27f79809b0a0a81609fa013 (patch)
treedbbce1788929774a7a20b3d642382277244392f1
parente5054ca24930a8c8dacc9d00f481ba01f3707c4a (diff)
Remove default value (fix bug)
-rw-r--r--src/kmmainwidget.cpp6
-rw-r--r--src/kmmainwidget.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index 40ea66d..4c73621 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -1276,7 +1276,7 @@ void KMMainWidget::slotFocusQuickSearch()
}
//-------------------------------------------------------------------------
-bool KMMainWidget::slotSearch()
+bool KMMainWidget::showSearchDialog()
{
if (!mSearchWin) {
mSearchWin = new SearchWindow(this, mCurrentCollection);
@@ -2934,7 +2934,7 @@ void KMMainWidget::setupActions()
mDeleteThreadAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete T&hread"), this);
actionCollection()->addAction(QStringLiteral("delete_thread"), mDeleteThreadAction);
//Don't use new connect api.
- connect(mDeleteThreadAction, SIGNAL(triggered(bool)), this, SLOT(slotDeleteThread()));
+ connect(mDeleteThreadAction, &QAction::triggered, this, &KMMainWidget::slotDeleteThread);
actionCollection()->setDefaultShortcut(mDeleteThreadAction, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Delete));
mSearchMessages = new QAction(QIcon::fromTheme(QStringLiteral("edit-find-mail")), i18n("&Find Messages..."), this);
@@ -4337,7 +4337,7 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch()
{
// First, open the search window. If we are currently on a search folder,
// the search associated with that will be loaded.
- if (!slotSearch()) {
+ if (!showSearchDialog()) {
return;
}
diff --git a/src/kmmainwidget.h b/src/kmmainwidget.h
index 073f0f3..2d6fd48 100644
--- a/src/kmmainwidget.h
+++ b/src/kmmainwidget.h
@@ -371,9 +371,8 @@ private Q_SLOTS:
void slotShowSelectedFolderInPane();
void slotOverrideHtmlLoadExt();
void slotUseTemplate();
- void slotDeleteMsg(bool confirmDelete = true); // completely delete message
void slotTrashThread();
- void slotDeleteThread(bool confirmDelete = true); // completely delete thread
+ void slotDeleteThread(bool confirmDelete); // completely delete thread
void slotUndo();
void slotReadOn();
void slotSaveMsg();
@@ -404,7 +403,7 @@ private Q_SLOTS:
void slotContactSearchJobForMessagePopupDone(KJob *job);
void slotSelectAllMessages();
void slotFocusQuickSearch();
- bool slotSearch();
+
void slotIntro();
void slotShowStartupFolder();
void slotCopyDecryptedTo(QAction *action);
@@ -519,6 +518,8 @@ private Q_SLOTS:
void slotEditCurrentVacation();
void slotReplyMessageTo(const KMime::Message::Ptr &message, bool replyToAll);
private:
+ void slotDeleteMsg(bool confirmDelete); // completely delete message
+ bool showSearchDialog();
void clearCurrentFolder();
void setCurrentCollection(const Akonadi::Collection &col);
void showMessageActivities(const QString &str);