Remove dead code & small refactorings using the std library

vurpo · Mar 3, 2018 · 9d54b4f · 9d54b4f
1 parent 24a937b
commit 9d54b4f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 103 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,7 +196,6 @@ set(SRC_FILES
     src/RegisterPage.cc
     src/RoomInfoListItem.cc
     src/RoomList.cc
-    src/RoomMessages.cc
     src/RoomState.cc
     src/RunGuard.cc
     src/SideBarActions.cc

diff --git a/include/RoomMessages.h b/include/RoomMessages.h
diff --git a/include/RoomState.h b/include/RoomState.h
@@ -26,7 +26,7 @@
 class RoomState
 {
 public:
-        RoomState();
+        RoomState() = default;
         RoomState(const mtx::responses::Timeline &timeline);
         RoomState(const mtx::responses::State &state);
 

diff --git a/src/RoomMessages.cc b/src/RoomMessages.cc
diff --git a/src/RoomState.cc b/src/RoomState.cc
@@ -22,7 +22,6 @@
 
 #include "RoomState.h"
 
-RoomState::RoomState() {}
 RoomState::RoomState(const mtx::responses::Timeline &timeline)
 {
         updateFromEvents(timeline.events);

diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cc
@@ -21,7 +21,6 @@
 
 #include "Config.h"
 #include "FloatingButton.h"
-#include "RoomMessages.h"
 #include "Utils.h"
 
 #include "timeline/TimelineView.h"
@@ -578,17 +577,12 @@ TimelineView::isPendingMessage(const QString &txnid,
         if (sender != local_userid)
                 return false;
 
-        for (const auto &msg : pending_msgs_) {
-                if (QString::number(msg.txn_id) == txnid)
-                        return true;
-        }
-
-        for (const auto &msg : pending_sent_msgs_) {
-                if (QString::number(msg.txn_id) == txnid)
-                        return true;
-        }
+        auto match_txnid = [txnid](const auto &msg) -> bool {
+                return QString::number(msg.txn_id) == txnid;
+        };
 
-        return false;
+        return std::any_of(pending_msgs_.cbegin(), pending_msgs_.cend(), match_txnid) ||
+               std::any_of(pending_sent_msgs_.cbegin(), pending_sent_msgs_.cend(), match_txnid);
 }
 
 void

diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc
@@ -206,8 +206,8 @@ TimelineViewManager::addRoom(const QString &room_id)
 void
 TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
 {
-        for (auto it = rooms.join.cbegin(); it != rooms.join.cend(); ++it) {
-                auto roomid = QString::fromStdString(it->first);
+        for (const auto &room : rooms.join) {
+                auto roomid = QString::fromStdString(room.first);
 
                 if (!timelineViewExists(roomid)) {
                         qDebug() << "Ignoring event from unknown room" << roomid;
@@ -216,7 +216,7 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
 
                 auto view = views_.at(roomid);
 
-                view->addEvents(it->second.timeline);
+                view->addEvents(room.second.timeline);
         }
 }
 
@@ -309,9 +309,7 @@ TimelineViewManager::displayName(const QString &userid)
 bool
 TimelineViewManager::hasLoaded() const
 {
-        for (const auto &view : views_)
-                if (!view.second->hasLoaded())
-                        return false;
-
-        return true;
+        return std::all_of(views_.cbegin(), views_.cend(), [](const auto &view) {
+                return view.second->hasLoaded();
+        });
 }