Merge branch 'dirtyFixBuggyReplyMessage' into 'master'

replace depricated qsort

See merge request chat/RocketChatMobileEngine!80

repos/entities/rocketchatattachment.h

@@ -28,14 +28,10 @@ class RocketChatAttachment : public QObject
 {
         Q_OBJECT
     public:
-        enum class attachmentsType {
-            replyMessage
-        };
-
-        RocketChatAttachment( const QString &pFileUrl, const attachmentsType &pType, const QString &pTitle );
+        RocketChatAttachment( const QString &pFileUrl, const QString &pType, const QString &pTitle );
 
         const QString &getUrl() const;
-        const attachmentsType getType() const;
+        const QString &getType() const;
         const QString &getTitle() const;
 
         int getWidth() const;
@@ -46,7 +42,7 @@ class RocketChatAttachment : public QObject
 
     protected:
         QString mUrl;
-        attachmentsType mType;
+        QString mType;
         QString mTitle;
         int mWidth = -1;
         int mHeight = -1;

services/messageservice.cpp

@@ -19,7 +19,7 @@
  ********************************************************************************************/
 
 
-
+#include <algorithm>
 #include "messageservice.h"
 
 #include <repos/entities/rocketchatreplymessage.h>
@@ -406,7 +406,7 @@ void MessageService::loadHistoryFromAutoSource( const QSharedPointer<LoadHistory
             MessageList currentList = channelMap->values( key );
 
             if ( currentList.count() < limit ) {
-                qSort( currentList );
+                std::sort( currentList.begin(), currentList.end() );
                 double timestamp;
 
                 if ( !currentList.empty() ) {

services/rocketchatchannelservice.cpp

@@ -574,7 +574,7 @@ void RocketChatChannelService::searchRoom( const QString &pTerm, const QString &
         channelList << searchRoomLocal( pTerm, ids, pType, names );
 
         if ( !channelList.isEmpty() ) {
-            qSort( channelList.begin(), channelList.end(), []( const QSharedPointer<RocketChatChannel> &v1, const QSharedPointer<RocketChatChannel> &v2 )->bool{
+            std::sort( channelList.begin(), channelList.end(), []( const QSharedPointer<RocketChatChannel> &v1, const QSharedPointer<RocketChatChannel> &v2 )->bool{
                 return v1->getName().toLower() < v2->getName().toLower();
             } );
             auto result = QMetaObject::invokeMethod( roomsModel, "addChannels", Q_ARG( channelVector, channelList ) );