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
chat
RocketChatMobileEngine
Commits
967a8364
Commit
967a8364
authored
Feb 10, 2019
by
Armin Felder
Browse files
fix message insert
parent
ae908aa2
Changes
3
Hide whitespace changes
Inline
Side-by-side
CustomModels/channelmodel.cpp
View file @
967a8364
...
...
@@ -170,7 +170,7 @@ bool ChannelModel::addChannelsSlot(const QVector<QSharedPointer<RocketChatChanne
beginResetModel
();
for
(
const
auto
&
channel
:
pChannels
){
if
(
!
channel
.
isNull
()
&&
channel
->
getRoomId
()
!=
""
&&
!
duplicateCheck
.
contains
(
channel
->
getRoomId
()
)
)
{
//
connect( channel.data(), &RocketChatChannel::messageAdded, this, &ChannelModel::onNewerMessage, Qt::UniqueConnection );
//connect( channel.data(), &RocketChatChannel::messageAdded, this, &ChannelModel::onNewerMessage, Qt::UniqueConnection );
connect
(
channel
.
data
(),
&
RocketChatChannel
::
unreadMessagesChanged
,
this
,
&
ChannelModel
::
onUnreadMessageChanged
,
Qt
::
UniqueConnection
);
connect
(
channel
.
data
(),
&
RocketChatChannel
::
dataChanged
,
this
,
&
ChannelModel
::
onDataChanged
,
Qt
::
UniqueConnection
);
connect
(
channel
.
data
(),
&
RocketChatChannel
::
channelDeleted
,
this
,
&
ChannelModel
::
onDeleted
,
Qt
::
UniqueConnection
);
...
...
container/sortedvector.cpp
View file @
967a8364
...
...
@@ -45,14 +45,12 @@ int SortedVector<T>::insertSort( const QSharedPointer<T> &pointer )
template
<
typename
T
>
int
SortedVector
<
T
>::
findInsertPosition
(
const
QSharedPointer
<
T
>
&
pointer
)
const
{
int
row
=
-
1
;
auto
elementSmallerThanNew
=
std
::
lower_bound
(
this
->
begin
(),
this
->
end
(),
pointer
,
[](
const
QSharedPointer
<
T
>
&
first
,
const
QSharedPointer
<
T
>
&
second
)
->
bool
{
return
(
*
first
)
>
(
*
second
);
return
(
*
first
)
<
(
*
second
);
}
);
r
ow
=
elementSmallerThanNew
-
this
->
begin
();
r
eturn
elementSmallerThanNew
-
this
->
begin
();
;
return
row
;
}
template
<
typename
T
>
...
...
engine.pro
View file @
967a8364
TEMPLATE
=
lib
QT
+=
core
network
websockets
sql
concurrent
CONFIG
+=
c
++
1
7
static
CONFIG
+=
c
++
1
4
static
SOURCES
+=
api
/
meteorddp
.
cpp
\
api
/
restapi
.
cpp
\
...
...
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