Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Messagelib
Commits
ef4a9325
Commit
ef4a9325
authored
Aug 02, 2021
by
Laurent Montel
😁
Browse files
Clean up code
parent
a67835b1
Pipeline
#73064
passed with stage
in 40 minutes and 29 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
messagecomposer/src/composer/composer.cpp
View file @
ef4a9325
...
...
@@ -354,9 +354,10 @@ void ComposerPrivate::contentJobFinished(KJob *job)
headers
->
assemble
();
}
else
{
// just use the saved headers from before
if
(
!
encData
.
isEmpty
())
{
qCDebug
(
MESSAGECOMPOSER_LOG
)
<<
"setting enc data:"
<<
encData
[
0
].
first
<<
"with num keys:"
<<
encData
[
0
].
second
.
size
();
keys
=
encData
[
0
].
second
;
recipients
=
encData
[
0
].
first
;
const
auto
firstElement
=
encData
.
at
(
0
);
qCDebug
(
MESSAGECOMPOSER_LOG
)
<<
"setting enc data:"
<<
firstElement
.
first
<<
"with num keys:"
<<
firstElement
.
second
.
size
();
keys
=
firstElement
.
second
;
recipients
=
firstElement
.
first
;
}
headers
=
skeletonMessage
;
...
...
messagecomposer/src/composer/composerviewbase.h
View file @
ef4a9325
...
...
@@ -80,7 +80,10 @@ public:
FoundMissingAttachmentAndCancel
};
enum
FailedType
{
Sending
,
AutoSave
};
enum
FailedType
{
Sending
,
AutoSave
,
};
/**
* Set the message to be opened in the composer window, and set the internal data structures to
...
...
@@ -279,7 +282,10 @@ private:
*/
void
readyForSending
();
enum
RecipientExpansion
{
UseExpandedRecipients
,
UseUnExpandedRecipients
};
enum
RecipientExpansion
{
UseExpandedRecipients
,
UseUnExpandedRecipients
,
};
Q_REQUIRED_RESULT
QVector
<
MessageComposer
::
Composer
*>
generateCryptoMessages
(
bool
&
wasCanceled
);
void
fillGlobalPart
(
MessageComposer
::
GlobalPart
*
globalPart
);
void
fillInfoPart
(
MessageComposer
::
InfoPart
*
part
,
RecipientExpansion
expansion
);
...
...
messagecomposer/src/composer/composerviewinterface.cpp
View file @
ef4a9325
...
...
@@ -19,41 +19,6 @@ ComposerViewInterface::~ComposerViewInterface()
{
}
void
ComposerViewInterface
::
setReplyTo
(
const
QString
&
str
)
{
if
(
mComposerView
)
{
// mComposerView->setReplyTo(str);
}
}
void
ComposerViewInterface
::
setSubject
(
const
QString
&
str
)
{
if
(
mComposerView
)
{
// mComposerView->setSubject(str);
}
}
void
ComposerViewInterface
::
setTo
(
const
QStringList
&
lst
)
{
if
(
mComposerView
)
{
// mComposerView->setTo(lst);
}
}
void
ComposerViewInterface
::
setCc
(
const
QStringList
&
lst
)
{
if
(
mComposerView
)
{
// mComposerView->setCc(lst);
}
}
void
ComposerViewInterface
::
setFrom
(
const
QString
&
str
)
{
if
(
mComposerView
)
{
// mComposerView->setFrom(str);
}
}
QString
ComposerViewInterface
::
subject
()
const
{
if
(
mComposerView
)
{
...
...
messagecomposer/src/composer/composerviewinterface.h
View file @
ef4a9325
...
...
@@ -22,12 +22,6 @@ public:
explicit
ComposerViewInterface
(
ComposerViewBase
*
composerView
);
~
ComposerViewInterface
();
void
setReplyTo
(
const
QString
&
str
);
void
setSubject
(
const
QString
&
str
);
void
setTo
(
const
QStringList
&
lst
);
void
setCc
(
const
QStringList
&
lst
);
void
setFrom
(
const
QString
&
str
);
Q_REQUIRED_RESULT
QString
subject
()
const
;
Q_REQUIRED_RESULT
QString
to
()
const
;
Q_REQUIRED_RESULT
QString
cc
()
const
;
...
...
messagecomposer/src/plugineditor/plugincomposerinterface.cpp
View file @
ef4a9325
...
...
@@ -27,31 +27,6 @@ void PluginComposerInterface::setComposerViewBase(ComposerViewBase *composerView
mComposerViewInterface
=
new
MessageComposer
::
ComposerViewInterface
(
composerViewBase
);
}
void
PluginComposerInterface
::
setReplyTo
(
const
QString
&
str
)
{
mComposerViewInterface
->
setReplyTo
(
str
);
}
void
PluginComposerInterface
::
setSubject
(
const
QString
&
str
)
{
mComposerViewInterface
->
setSubject
(
str
);
}
void
PluginComposerInterface
::
setTo
(
const
QStringList
&
lst
)
{
mComposerViewInterface
->
setTo
(
lst
);
}
void
PluginComposerInterface
::
setCc
(
const
QStringList
&
lst
)
{
mComposerViewInterface
->
setCc
(
lst
);
}
void
PluginComposerInterface
::
setFrom
(
const
QString
&
str
)
{
mComposerViewInterface
->
setFrom
(
str
);
}
QString
PluginComposerInterface
::
subject
()
const
{
return
mComposerViewInterface
->
subject
();
...
...
messagecomposer/src/plugineditor/plugincomposerinterface.h
View file @
ef4a9325
...
...
@@ -24,12 +24,6 @@ public:
~
PluginComposerInterface
();
void
setComposerViewBase
(
ComposerViewBase
*
composerViewBase
);
void
setReplyTo
(
const
QString
&
str
);
void
setSubject
(
const
QString
&
str
);
void
setTo
(
const
QStringList
&
lst
);
void
setCc
(
const
QStringList
&
lst
);
void
setFrom
(
const
QString
&
str
);
Q_REQUIRED_RESULT
QString
replyTo
()
const
;
Q_REQUIRED_RESULT
QString
subject
()
const
;
Q_REQUIRED_RESULT
QString
to
()
const
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment