Merge branch 'master' into iosWS

CustomModels/channelmodel.cpp

@@ -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 );

api/meteorddp.cpp

@@ -43,7 +43,7 @@ void MeteorDDP::init( const QString &pUri )
     if ( unsecure ) {
         protocol = QStringLiteral( "ws://" );
     }
-    
+
     QUrl wsUri = QUrl( protocol + pUri + QStringLiteral( "/websocket" ) );
     qDebug() << wsUri;
     qDebug() << "meteor init" ;

container/sortedvector.cpp

@@ -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 );
     } );
 
-    row = elementSmallerThanNew - this->begin();
+    return elementSmallerThanNew - this->begin();;
 
-    return row;
 }
 
 template<typename T>

engine.pro

 TEMPLATE = lib 
 QT += core network websockets sql concurrent
-CONFIG += c++17 static
+CONFIG += c++14 static
 
 SOURCES +=  api/meteorddp.cpp \
     api/restapi.cpp \