Astyle kdelibs

wilder-work
Montel Laurent 11 years ago
parent 17cd10c49d
commit cceef1d3ac
  1. 2
      editor/kmcomposereditorng.cpp
  2. 4
      editor/kmcomposereditorng.h
  3. 4
      editor/kmcomposereditorwidgetng.h
  4. 1
      editor/kmcomposewin.cpp
  5. 6
      kmcommands.cpp

@ -15,7 +15,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "kmcomposereditorng.h" #include "kmcomposereditorng.h"
#include "kmcomposewin.h" #include "kmcomposewin.h"
#include "kmkernel.h" #include "kmkernel.h"
@ -31,7 +30,6 @@
#include "messagecore/settings/globalsettings.h" #include "messagecore/settings/globalsettings.h"
#include <Sonnet/ConfigDialog> #include <Sonnet/ConfigDialog>
KMComposerEditorNg::KMComposerEditorNg(KMComposeWin *win, QWidget *parent) KMComposerEditorNg::KMComposerEditorNg(KMComposeWin *win, QWidget *parent)
: MessageComposer::RichTextComposer(parent), : MessageComposer::RichTextComposer(parent),
mComposerWin(win) mComposerWin(win)

@ -15,13 +15,13 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef KMCOMPOSEREDITORNG_H #ifndef KMCOMPOSEREDITORNG_H
#define KMCOMPOSEREDITORNG_H #define KMCOMPOSEREDITORNG_H
#include "messagecomposer/composer-ng/richtextcomposer.h" #include "messagecomposer/composer-ng/richtextcomposer.h"
class KMComposeWin; class KMComposeWin;
namespace KPIMTextEdit { namespace KPIMTextEdit
{
class EMailQuoteHighlighter; class EMailQuoteHighlighter;
} }

@ -15,12 +15,12 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef KMCOMPOSEREDITORWIDGETNG_H #ifndef KMCOMPOSEREDITORWIDGETNG_H
#define KMCOMPOSEREDITORWIDGETNG_H #define KMCOMPOSEREDITORWIDGETNG_H
#include <texteditor/richtexteditor/richtexteditorwidget.h> #include <texteditor/richtexteditor/richtexteditorwidget.h>
namespace PimCommon { namespace PimCommon
{
class RichTextEditor; class RichTextEditor;
} }
class KMComposerEditorWidgetNg : public PimCommon::RichTextEditorWidget class KMComposerEditorWidgetNg : public PimCommon::RichTextEditorWidget

@ -2095,7 +2095,6 @@ QUrl KMComposeWin::insertFile()
return url; return url;
} }
QString KMComposeWin::smartQuote(const QString &msg) QString KMComposeWin::smartQuote(const QString &msg)
{ {
return MessageCore::StringUtil::smartQuote(msg, MessageComposer::MessageComposerSettings::self()->lineWrapWidth()); return MessageCore::StringUtil::smartQuote(msg, MessageComposer::MessageComposerSettings::self()->lineWrapWidth());

@ -546,7 +546,7 @@ KMCommand::Result KMEditMessageCommand::execute()
bool lastEncrypt = false; bool lastEncrypt = false;
bool lastSign = false; bool lastSign = false;
KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, mMessage); KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, mMessage);
win->setMessage( mMessage, lastSign, lastEncrypt, false, true ); win->setMessage(mMessage, lastSign, lastEncrypt, false, true);
win->show(); win->show();
win->setModified(true); win->setModified(true);
return OK; return OK;
@ -586,7 +586,7 @@ KMCommand::Result KMEditItemCommand::execute()
bool lastEncrypt = false; bool lastEncrypt = false;
bool lastSign = false; bool lastSign = false;
KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg); KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg);
win->setMessage( msg, lastSign, lastEncrypt, false, true ); win->setMessage(msg, lastSign, lastEncrypt, false, true);
win->setFolder(item.parentCollection()); win->setFolder(item.parentCollection());
@ -1598,7 +1598,7 @@ KMCommand::Result KMResendMessageCommand::execute()
bool lastEncrypt = false; bool lastEncrypt = false;
bool lastSign = false; bool lastSign = false;
KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg); KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg);
win->setMessage( newMsg, lastSign, lastEncrypt, false, true ); win->setMessage(newMsg, lastSign, lastEncrypt, false, true);
win->show(); win->show();

Loading…
Cancel
Save