summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-07-06 19:48:23 +0200
committerMontel Laurent <[email protected]>2017-07-06 19:48:23 +0200
commit5655ee52df9b34afd393dd9816f28a4d36d15b7d (patch)
tree39ea56c77c49bdc8ad4b158c7d257aa16408fb07
parent8a810ad7cad6f5dbf025867a6364bb25fb5e3397 (diff)
Remove dead code
-rw-r--r--src/editor/kmcomposerwin.cpp5
-rw-r--r--src/job/fillcomposerjob.cpp5
-rw-r--r--src/job/opencomposerhiddenjob.cpp5
-rw-r--r--src/job/opencomposerjob.cpp5
-rw-r--r--src/kmkernel.cpp8
5 files changed, 2 insertions, 26 deletions
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 6b9d4f3..c6d8b47 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -2490,7 +2490,7 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method, Me
if (!mPluginEditorCheckBeforeSendManagerInterface->execute(params)) {
return;
}
- const QStringList recipients = { composerBaseToTrimmed, composerBaseCcTrimmed, composerBaseBccTrimmed};
+ const QStringList recipients = {composerBaseToTrimmed, composerBaseCcTrimmed, composerBaseBccTrimmed};
setEnabled(false);
@@ -2508,8 +2508,7 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method, Me
&& !KMailSettings::self()->neverEncryptDrafts()
&& mComposerBase->to().isEmpty() && mComposerBase->cc().isEmpty()) {
KMessageBox::information(this, i18n("You must specify at least one receiver "
- "in order to be able to encrypt a draft.")
- );
+ "in order to be able to encrypt a draft."));
return;
}
doDelayedSend(method, saveIn);
diff --git a/src/job/fillcomposerjob.cpp b/src/job/fillcomposerjob.cpp
index d9fedb8..35a2358 100644
--- a/src/job/fillcomposerjob.cpp
+++ b/src/job/fillcomposerjob.cpp
@@ -142,11 +142,6 @@ void FillComposerJob::slotOpenComposer()
}
if (mSettings.mForceShowWindow || (!mSettings.mHidden && !iCalAutoSend)) {
cWin->show();
- // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
- // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
- KStartupInfo::setNewStartupId(cWin, KStartupInfo::startupId());
-#endif
} else {
// Always disable word wrap when we don't show the composer, since otherwise QTextEdit
// gets the widget size wrong and wraps much too early.
diff --git a/src/job/opencomposerhiddenjob.cpp b/src/job/opencomposerhiddenjob.cpp
index be2e28b..5f1b4f3 100644
--- a/src/job/opencomposerhiddenjob.cpp
+++ b/src/job/opencomposerhiddenjob.cpp
@@ -74,11 +74,6 @@ void OpenComposerHiddenJob::slotOpenComposer()
KMail::Composer *cWin = KMail::makeComposer(mMsg, false, false, context);
if (!mSettings.mHidden) {
cWin->show();
- // Activate window - doing this instead of KWindowSystem::activateWindow(cWin->winId());
- // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_OS_X11 && !defined K_WS_QTONLY
- KStartupInfo::setNewStartupId(cWin, KStartupInfo::startupId());
-#endif
} else {
// Always disable word wrap when we don't show the composer; otherwise,
// QTextEdit gets the widget size wrong and wraps much too early.
diff --git a/src/job/opencomposerjob.cpp b/src/job/opencomposerjob.cpp
index c6ea000..c9e2d26 100644
--- a/src/job/opencomposerjob.cpp
+++ b/src/job/opencomposerjob.cpp
@@ -159,11 +159,6 @@ void OpenComposerJob::slotOpenComposer()
}
if (!mOpenComposerSettings.mHidden) {
cWin->show();
- // Activate window - doing this instead of KWindowSystem::activateWindow(cWin->winId());
- // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_OS_X11 && !defined K_WS_QTONLY
- KStartupInfo::setNewStartupId(cWin, KStartupInfo::startupId());
-#endif
}
deleteLater();
}
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index 6afdcbf..d8bac4f 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -551,14 +551,6 @@ void KMKernel::openReader(bool onlyCheck)
mWin->show();
activate = false; // new window: no explicit activation (#73591)
}
-
- if (activate) {
- // Activate window - doing this instead of KWindowSystem::activateWindow(mWin->winId());
- // so that it also works when called from KMailApplication::newInstance()
-#if defined Q_OS_X11 && !defined K_WS_QTONLY
- KStartupInfo::setNewStartupId(mWin, KStartupInfo::startupId());
-#endif
- }
}
void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile,