chatterino2
Code Issues

Remove SharedChannel (just use std::shared_ptr<Channel>)

Browse Source 
More code-refactoring BBaper
This commit is contained in:
Rasmus Karlsson
2017-06-11 11:36:42 +02:00
parent 9cd70877a5
commit 1d6f558452
12 changed files with 230 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/channelmanager.hpp
+10 -10
View File
@@ -12,14 +12,14 @@ public:
return instance;
}
SharedChannel getWhispers();
SharedChannel getMentions();
SharedChannel getEmpty();
std::shared_ptr<Channel> getWhispers();
std::shared_ptr<Channel> getMentions();
std::shared_ptr<Channel> getEmpty();
const std::vector<SharedChannel> getItems();
const std::vector<std::shared_ptr<Channel>> getItems();
SharedChannel addChannel(const QString &channel);
SharedChannel getChannel(const QString &channel);
std::shared_ptr<Channel> addChannel(const QString &channel);
std::shared_ptr<Channel> getChannel(const QString &channel);
void removeChannel(const QString &channel);
private:
@@ -27,12 +27,12 @@ private:
ChannelManager();
QMap<QString, std::tuple<SharedChannel, int>> _channels;
QMap<QString, std::tuple<std::shared_ptr<Channel>, int>> _channels;
QMutex _channelsMutex;
SharedChannel _whispers;
SharedChannel _mentions;
SharedChannel _empty;
std::shared_ptr<Channel> _whispers;
std::shared_ptr<Channel> _mentions;
std::shared_ptr<Channel> _empty;
};
} // namespace chatterino