Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PIM Messagelib
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PIM
PIM Messagelib
Commits
20332db6
Commit
20332db6
authored
May 23, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Astyle kdelibs
parent
f55726a1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
33 deletions
+41
-33
messagecomposer/autotests/setupenv.h
messagecomposer/autotests/setupenv.h
+2
-4
messagecomposer/src/recipient/recipientline.h
messagecomposer/src/recipient/recipientline.h
+0
-1
messagelist/src/core/model.cpp
messagelist/src/core/model.cpp
+34
-22
messageviewer/autotests/util.h
messageviewer/autotests/util.h
+1
-2
messageviewer/src/widgets/mailsourcewebengineviewer.cpp
messageviewer/src/widgets/mailsourcewebengineviewer.cpp
+3
-1
mimetreeparser/autotests/util.h
mimetreeparser/autotests/util.h
+1
-2
webengineviewer/src/webengineview.cpp
webengineviewer/src/webengineview.cpp
+0
-1
No files found.
messagecomposer/autotests/setupenv.h
View file @
20332db6
...
...
@@ -56,12 +56,10 @@ public:
{
}
MimeTreeParser
::
HtmlWriter
*
htmlWriter
()
Q_DECL_OVERRIDE
{
MimeTreeParser
::
HtmlWriter
*
htmlWriter
()
Q_DECL_OVERRIDE
{
return
mWriter
;
}
MimeTreeParser
::
CSSHelperBase
*
cssHelper
()
Q_DECL_OVERRIDE
{
MimeTreeParser
::
CSSHelperBase
*
cssHelper
()
Q_DECL_OVERRIDE
{
return
mCSSHelper
;
}
...
...
messagecomposer/src/recipient/recipientline.h
View file @
20332db6
...
...
@@ -107,7 +107,6 @@ Q_SIGNALS:
void
countChanged
();
void
iconClicked
();
protected
Q_SLOTS
:
void
slotEditingFinished
();
void
slotTypeModified
();
...
...
messagelist/src/core/model.cpp
View file @
20332db6
...
...
@@ -312,7 +312,9 @@ Model::Model(View *pParent)
d
->
mInvariantRowMapper
=
new
ModelInvariantRowMapper
();
d
->
mModelForItemFunctions
=
this
;
connect
(
&
d
->
mFillStepTimer
,
&
QTimer
::
timeout
,
this
,
[
this
]()
{
d
->
viewItemJobStep
();
});
this
,
[
this
]()
{
d
->
viewItemJobStep
();
});
d
->
mCachedTodayLabel
=
i18n
(
"Today"
);
d
->
mCachedYesterdayLabel
=
i18n
(
"Yesterday"
);
...
...
@@ -327,7 +329,9 @@ Model::Model(View *pParent)
d
->
mCachedWatchedOrIgnoredStatusBits
=
Akonadi
::
MessageStatus
::
statusIgnored
().
toQInt32
()
|
Akonadi
::
MessageStatus
::
statusWatched
().
toQInt32
();
connect
(
_k_heartBeatTimer
,
&
QTimer
::
timeout
,
this
,
[
this
]()
{
d
->
checkIfDateChanged
();
});
this
,
[
this
]()
{
d
->
checkIfDateChanged
();
});
if
(
!
_k_heartBeatTimer
->
isActive
())
{
// First model starts it
_k_heartBeatTimer
->
start
(
60000
);
// 1 minute
...
...
@@ -380,7 +384,9 @@ void Model::setFilter(const Filter *filter)
d
->
mFilter
=
filter
;
if
(
d
->
mFilter
)
{
connect
(
d
->
mFilter
,
&
Filter
::
finished
,
this
,
[
this
]()
{
d
->
slotApplyFilter
();
});
connect
(
d
->
mFilter
,
&
Filter
::
finished
,
this
,
[
this
]()
{
d
->
slotApplyFilter
();
});
}
d
->
slotApplyFilter
();
...
...
@@ -738,7 +744,7 @@ void Model::setStorageModel(StorageModel *storageModel, PreSelectionMode preSele
if
(
d
->
mStorageModel
)
{
// Disconnect all signals from old storageModel
std
::
for_each
(
d
->
mStorageModelConnections
.
cbegin
(),
d
->
mStorageModelConnections
.
cend
(),
[](
const
QMetaObject
::
Connection
&
c
)
->
bool
{
return
QObject
::
disconnect
(
c
);
});
[](
const
QMetaObject
::
Connection
&
c
)
->
bool
{
return
QObject
::
disconnect
(
c
);
});
d
->
mStorageModelConnections
.
clear
();
}
...
...
@@ -756,29 +762,35 @@ void Model::setStorageModel(StorageModel *storageModel, PreSelectionMode preSele
d
->
mStorageModelConnections
=
{
connect
(
d
->
mStorageModel
,
&
StorageModel
::
rowsInserted
,
this
,
[
this
](
const
QModelIndex
&
parent
,
int
first
,
int
last
)
{
d
->
slotStorageModelRowsInserted
(
parent
,
first
,
last
);
}),
this
,
[
this
](
const
QModelIndex
&
parent
,
int
first
,
int
last
)
{
d
->
slotStorageModelRowsInserted
(
parent
,
first
,
last
);
}),
connect
(
d
->
mStorageModel
,
&
StorageModel
::
rowsRemoved
,
this
,
[
this
](
const
QModelIndex
&
parent
,
int
first
,
int
last
)
{
d
->
slotStorageModelRowsRemoved
(
parent
,
first
,
last
);
}),
this
,
[
this
](
const
QModelIndex
&
parent
,
int
first
,
int
last
)
{
d
->
slotStorageModelRowsRemoved
(
parent
,
first
,
last
);
}),
connect
(
d
->
mStorageModel
,
&
StorageModel
::
layoutChanged
,
this
,
[
this
]()
{
d
->
slotStorageModelLayoutChanged
();
}),
this
,
[
this
]()
{
d
->
slotStorageModelLayoutChanged
();
}),
connect
(
d
->
mStorageModel
,
&
StorageModel
::
modelReset
,
this
,
[
this
]()
{
d
->
slotStorageModelLayoutChanged
();
}),
this
,
[
this
]()
{
d
->
slotStorageModelLayoutChanged
();
}),
connect
(
d
->
mStorageModel
,
&
StorageModel
::
dataChanged
,
this
,
[
this
](
const
QModelIndex
&
topLeft
,
const
QModelIndex
&
bottomRight
)
{
d
->
slotStorageModelDataChanged
(
topLeft
,
bottomRight
);
}),
this
,
[
this
](
const
QModelIndex
&
topLeft
,
const
QModelIndex
&
bottomRight
)
{
d
->
slotStorageModelDataChanged
(
topLeft
,
bottomRight
);
}),
connect
(
d
->
mStorageModel
,
&
StorageModel
::
headerDataChanged
,
this
,
[
this
](
Qt
::
Orientation
orientation
,
int
first
,
int
last
)
{
d
->
slotStorageModelHeaderDataChanged
(
orientation
,
first
,
last
);
})
this
,
[
this
](
Qt
::
Orientation
orientation
,
int
first
,
int
last
)
{
d
->
slotStorageModelHeaderDataChanged
(
orientation
,
first
,
last
);
})
};
if
(
d
->
mStorageModel
->
rowCount
()
==
0
)
{
...
...
messageviewer/autotests/util.h
View file @
20332db6
...
...
@@ -31,8 +31,7 @@ public:
void
write
(
const
QString
&
)
Q_DECL_OVERRIDE
{}
void
end
()
Q_DECL_OVERRIDE
{}
void
reset
()
Q_DECL_OVERRIDE
{}
void
queue
(
const
QString
&
str
)
Q_DECL_OVERRIDE
{
void
queue
(
const
QString
&
str
)
Q_DECL_OVERRIDE
{
html
.
append
(
str
);
}
void
flush
()
Q_DECL_OVERRIDE
{}
...
...
messageviewer/src/widgets/mailsourcewebengineviewer.cpp
View file @
20332db6
...
...
@@ -108,7 +108,9 @@ void MailSourceWebEngineViewer::setDisplayedSource(QWebEnginePage *page)
#ifndef NDEBUG
if
(
page
)
{
MailSourceViewTextBrowserWidget
*
browser
=
mHtmlBrowser
;
page
->
toHtml
([
browser
](
const
QString
&
result
){
browser
->
setPlainText
(
result
);
});
page
->
toHtml
([
browser
](
const
QString
&
result
)
{
browser
->
setPlainText
(
result
);
});
}
#else
Q_UNUSED
(
page
);
...
...
mimetreeparser/autotests/util.h
View file @
20332db6
...
...
@@ -31,8 +31,7 @@ public:
void
write
(
const
QString
&
)
Q_DECL_OVERRIDE
{}
void
end
()
Q_DECL_OVERRIDE
{}
void
reset
()
Q_DECL_OVERRIDE
{}
void
queue
(
const
QString
&
str
)
Q_DECL_OVERRIDE
{
void
queue
(
const
QString
&
str
)
Q_DECL_OVERRIDE
{
html
.
append
(
str
);
}
void
flush
()
Q_DECL_OVERRIDE
{}
...
...
webengineviewer/src/webengineview.cpp
View file @
20332db6
...
...
@@ -27,7 +27,6 @@
#include <KLocalizedString>
#include <QWebEngineDownloadItem>
using
namespace
WebEngineViewer
;
class
WebEngineViewer
::
WebEngineViewPrivate
...
...
Write
Preview
Markdown
is supported
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