Commit cec2204b authored by armin's avatar armin
Browse files

Merge branch 'master' into iosWS

parents 9e0b4d1e 5948f653
...@@ -170,7 +170,7 @@ bool ChannelModel::addChannelsSlot(const QVector<QSharedPointer<RocketChatChanne ...@@ -170,7 +170,7 @@ bool ChannelModel::addChannelsSlot(const QVector<QSharedPointer<RocketChatChanne
beginResetModel(); beginResetModel();
for(const auto &channel: pChannels){ for(const auto &channel: pChannels){
if ( !channel.isNull() && channel->getRoomId() != "" && !duplicateCheck.contains( channel->getRoomId() ) ) { 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::unreadMessagesChanged, this, &ChannelModel::onUnreadMessageChanged, Qt::UniqueConnection );
connect( channel.data(), &RocketChatChannel::dataChanged, this, &ChannelModel::onDataChanged, Qt::UniqueConnection ); connect( channel.data(), &RocketChatChannel::dataChanged, this, &ChannelModel::onDataChanged, Qt::UniqueConnection );
connect( channel.data(), &RocketChatChannel::channelDeleted, this, &ChannelModel::onDeleted, Qt::UniqueConnection ); connect( channel.data(), &RocketChatChannel::channelDeleted, this, &ChannelModel::onDeleted, Qt::UniqueConnection );
......
...@@ -45,14 +45,12 @@ int SortedVector<T>::insertSort( const QSharedPointer<T> &pointer ) ...@@ -45,14 +45,12 @@ int SortedVector<T>::insertSort( const QSharedPointer<T> &pointer )
template<typename T> template<typename T>
int SortedVector<T>::findInsertPosition( const QSharedPointer<T> &pointer ) const 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{ 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 );
} ); } );
row = elementSmallerThanNew - this->begin(); return elementSmallerThanNew - this->begin();;
return row;
} }
template<typename T> template<typename T>
......
TEMPLATE = lib TEMPLATE = lib
QT += core network websockets sql concurrent QT += core network websockets sql concurrent
CONFIG += c++17 static CONFIG += c++14 static
SOURCES += api/meteorddp.cpp \ SOURCES += api/meteorddp.cpp \
api/restapi.cpp \ api/restapi.cpp \
......
Supports Markdown
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