Commit 426699d1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Rename it

parent a7a71e0a
......@@ -7,7 +7,7 @@ add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
qt5_generate_dbus_interface(kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
qt5_generate_dbus_interface(editor/kmcomposewin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
qt5_generate_dbus_interface(editor/kmcomposerwin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
add_custom_target(kmail_xml ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml
......@@ -101,7 +101,7 @@ set(kmailprivate_editor_LIB_SRCS
editor/composer.cpp
editor/codec/codecaction.cpp
editor/codec/codecmanager.cpp
editor/kmcomposewin.cpp
editor/kmcomposerwin.cpp
editor/attachment/attachmentcontroller.cpp
editor/attachment/attachmentview.cpp
editor/widgets/cryptostateindicatorwidget.cpp
......@@ -214,9 +214,9 @@ set(kmailprivate_LIB_SRCS
${kmailprivate_editor_plugininterface_LIB_SRCS}
)
qt5_generate_dbus_interface(editor/kmcomposewin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
qt5_generate_dbus_interface(editor/kmcomposerwin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
qt5_add_dbus_adaptor(kmailprivate_LIB_SRCS
${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.mailcomposer.xml editor/kmcomposewin.h KMComposeWin
${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.mailcomposer.xml editor/kmcomposerwin.h KMComposerWin
)
qt5_add_dbus_adaptor(kmailprivate_LIB_SRCS
......
......@@ -26,7 +26,7 @@
#include "MailCommon/FolderCollection"
#include "settings/kmailsettings.h"
#include "kmcommands.h"
#include "editor/kmcomposewin.h"
#include "editor/kmcomposerwin.h"
#include "kmkernel.h"
#include "kmreadermainwin.h"
#include "mailcommon/mailutil.h"
......@@ -44,12 +44,12 @@ using namespace KPIM;
using namespace MailCommon;
using namespace MessageCore;
AttachmentController::AttachmentController(MessageComposer::AttachmentModel *model, AttachmentView *view, KMComposeWin *composer)
AttachmentController::AttachmentController(MessageComposer::AttachmentModel *model, AttachmentView *view, KMComposerWin *composer)
: AttachmentControllerBase(model, composer, composer->actionCollection()),
mComposer(composer),
mView(view)
{
connect(composer, &KMComposeWin::identityChanged,
connect(composer, &KMComposerWin::identityChanged,
this, &AttachmentController::identityChanged);
connect(view, &AttachmentView::contextMenuRequested, this, &AttachmentControllerBase::showContextMenu);
......@@ -107,7 +107,7 @@ void AttachmentController::addAttachmentItems(const Akonadi::Item::List &items)
Akonadi::ItemFetchJob *itemFetchJob = new Akonadi::ItemFetchJob(items, this);
itemFetchJob->fetchScope().fetchFullPayload(true);
itemFetchJob->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
connect(itemFetchJob, &Akonadi::ItemFetchJob::result, mComposer, &KMComposeWin::slotFetchJob);
connect(itemFetchJob, &Akonadi::ItemFetchJob::result, mComposer, &KMComposerWin::slotFetchJob);
}
void AttachmentController::selectionChanged()
......
......@@ -25,7 +25,7 @@
#include "messagecomposer/attachmentcontrollerbase.h"
class KMComposeWin;
class KMComposerWin;
class QModelIndex;
namespace MessageComposer
{
......@@ -41,7 +41,7 @@ class AttachmentController : public MessageComposer::AttachmentControllerBase
Q_OBJECT
public:
explicit AttachmentController(MessageComposer::AttachmentModel *model, AttachmentView *view, KMComposeWin *composer);
explicit AttachmentController(MessageComposer::AttachmentModel *model, AttachmentView *view, KMComposerWin *composer);
~AttachmentController();
public Q_SLOTS:
......@@ -58,7 +58,7 @@ private Q_SLOTS:
void slotSelectAllAttachment();
private:
KMComposeWin *mComposer;
KMComposerWin *mComposer;
AttachmentView *mView;
};
......
......@@ -16,7 +16,7 @@
*/
#include "kmcomposereditorng.h"
#include "kmcomposewin.h"
#include "kmcomposerwin.h"
#include "kmkernel.h"
#include "util.h"
#include "kmail_debug.h"
......@@ -32,7 +32,7 @@
#include <KPIMTextEdit/RichTextComposerEmailQuoteHighlighter>
#include <sonnet/dictionarycombobox.h>
KMComposerEditorNg::KMComposerEditorNg(KMComposeWin *win, QWidget *parent)
KMComposerEditorNg::KMComposerEditorNg(KMComposerWin *win, QWidget *parent)
: MessageComposer::RichTextComposerNg(parent),
mComposerWin(win)
{
......
......@@ -19,7 +19,7 @@
#define KMCOMPOSEREDITORNG_H
#include "messagecomposer/richtextcomposerng.h"
class KMComposeWin;
class KMComposerWin;
namespace KPIMTextEdit
{
class RichTextComposerEmailQuoteHighlighter;
......@@ -28,7 +28,7 @@ class KMComposerEditorNg : public MessageComposer::RichTextComposerNg
{
Q_OBJECT
public:
explicit KMComposerEditorNg(KMComposeWin *win, QWidget *parent);
explicit KMComposerEditorNg(KMComposerWin *win, QWidget *parent);
~KMComposerEditorNg();
QString smartQuote(const QString &msg) Q_DECL_OVERRIDE;
......@@ -46,7 +46,7 @@ protected:
void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE;
private:
KMComposeWin *mComposerWin;
KMComposerWin *mComposerWin;
};
#endif // KMCOMPOSEREDITORNG_H
......@@ -16,7 +16,7 @@
*/
#include "kmcomposerglobalaction.h"
#include "kmcomposewin.h"
#include "kmcomposerwin.h"
#include <pimcommon/lineeditwithautocorrection.h>
......@@ -24,7 +24,7 @@
#include <editor/kmcomposereditorng.h>
KMComposerGlobalAction::KMComposerGlobalAction(KMComposeWin *composerWin, QObject *parent)
KMComposerGlobalAction::KMComposerGlobalAction(KMComposerWin *composerWin, QObject *parent)
: QObject(parent),
mComposerWin(composerWin)
{
......
......@@ -19,12 +19,12 @@
#define KMCOMPOSERGLOBALACTION_H
#include <QObject>
class KMComposeWin;
class KMComposerWin;
class KMComposerGlobalAction : public QObject
{
Q_OBJECT
public:
explicit KMComposerGlobalAction(KMComposeWin *composerWin, QObject *parent = Q_NULLPTR);
explicit KMComposerGlobalAction(KMComposerWin *composerWin, QObject *parent = Q_NULLPTR);
~KMComposerGlobalAction();
public Q_SLOTS:
......@@ -35,7 +35,7 @@ public Q_SLOTS:
void slotPaste();
void slotMarkAll();
private:
KMComposeWin *mComposerWin;
KMComposerWin *mComposerWin;
};
#endif // KMCOMPOSERGLOBALACTION_H
......@@ -53,7 +53,7 @@ class QPushButton;
class QSplitter;
class KSplitterCollapserButton;
class CodecAction;
class KMComposeWin;
class KMComposerWin;
class KMComposerEditor;
class KSelectAction;
class QAction;
......@@ -112,7 +112,7 @@ class LineEditWithAutoCorrection;
}
class KMStorageService;
//-----------------------------------------------------------------------------
class KMComposeWin : public KMail::Composer
class KMComposerWin : public KMail::Composer
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.kmail.mailcomposer")
......@@ -120,10 +120,10 @@ class KMComposeWin : public KMail::Composer
friend class ::KMComposerEditor;
private: // mailserviceimpl, kmkernel, kmcommands, callback, kmmainwidget
explicit KMComposeWin(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate,
explicit KMComposerWin(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate,
uint identity = 0, const QString &textSelection = QString(),
const QString &customTemplate = QString());
~KMComposeWin();
~KMComposerWin();
public:
static Composer *create(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment