noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move CompletionModel to a more appropriate folder

Browse source
This commit is contained in:
Rasmus Karlsson 2018-03-24 12:13:09 +01:00
parent d9bd39e8a4
commit b2f041989c
5 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chatterino.pro
View file

@ -116,7 +116,7 @@ SOURCES += \
src/singletons/commandmanager.cpp \ src/singletons/commandmanager.cpp \
src/singletons/emotemanager.cpp \ src/singletons/emotemanager.cpp \
src/singletons/fontmanager.cpp \ src/singletons/fontmanager.cpp \
src/singletons/helper/completionmodel.cpp \ src/util/completionmodel.cpp \
src/singletons/helper/loggingchannel.cpp \ src/singletons/helper/loggingchannel.cpp \
src/singletons/helper/moderationaction.cpp \ src/singletons/helper/moderationaction.cpp \
src/singletons/loggingmanager.cpp \ src/singletons/loggingmanager.cpp \
@ -210,7 +210,7 @@ HEADERS += \
src/singletons/emotemanager.hpp \ src/singletons/emotemanager.hpp \
src/singletons/fontmanager.hpp \ src/singletons/fontmanager.hpp \
src/singletons/helper/chatterinosetting.hpp \ src/singletons/helper/chatterinosetting.hpp \
src/singletons/helper/completionmodel.hpp \ src/util/completionmodel.hpp \
src/singletons/helper/loggingchannel.hpp \ src/singletons/helper/loggingchannel.hpp \
src/singletons/helper/moderationaction.hpp \ src/singletons/helper/moderationaction.hpp \
src/singletons/loggingmanager.hpp \ src/singletons/loggingmanager.hpp \

4
src/channel.hpp
View file

@ -3,7 +3,7 @@
#include "messages/image.hpp" #include "messages/image.hpp"
#include "messages/limitedqueue.hpp" #include "messages/limitedqueue.hpp"
#include "messages/message.hpp" #include "messages/message.hpp"
#include "singletons/helper/completionmodel.hpp" #include "util/completionmodel.hpp"
#include "util/concurrentmap.hpp" #include "util/concurrentmap.hpp"
#include <QMap> #include <QMap>
@ -65,7 +65,7 @@ public:
static std::shared_ptr<Channel> getEmpty(); static std::shared_ptr<Channel> getEmpty();
singletons::CompletionModel completionModel; CompletionModel completionModel;
protected: protected:
virtual void onConnected(); virtual void onConnected();

4
src/singletons/helper/completionmodel.cpp → src/util/completionmodel.cpp
View file

@ -1,4 +1,4 @@
#include "completionmodel.hpp" #include "util/completionmodel.hpp"
#include "common.hpp" #include "common.hpp"
#include "debug/log.hpp" #include "debug/log.hpp"
@ -8,7 +8,6 @@
#include <QtAlgorithms> #include <QtAlgorithms>
namespace chatterino { namespace chatterino {
namespace singletons {
CompletionModel::CompletionModel(const QString &_channelName) CompletionModel::CompletionModel(const QString &_channelName)
: channelName(_channelName) : channelName(_channelName)
@ -95,5 +94,4 @@ void CompletionModel::addUser(const QString &str)
this->emotes.insert(this->createUser(str + " ")); this->emotes.insert(this->createUser(str + " "));
} }
} // namespace singletons
} // namespace chatterino } // namespace chatterino

2
src/singletons/helper/completionmodel.hpp → src/util/completionmodel.hpp
View file

@ -9,7 +9,6 @@
#include <string> #include <string>
namespace chatterino { namespace chatterino {
namespace singletons {
class CompletionModel : public QAbstractListModel class CompletionModel : public QAbstractListModel
{ {
@ -89,5 +88,4 @@ private:
QString channelName; QString channelName;
}; };
} // namespace singletons
} // namespace chatterino } // namespace chatterino

4
src/widgets/helper/resizingtextedit.cpp
View file

@ -1,6 +1,6 @@
#include "widgets/helper/resizingtextedit.hpp" #include "widgets/helper/resizingtextedit.hpp"
#include "common.hpp" #include "common.hpp"
#include "singletons/helper/completionmodel.hpp" #include "util/completionmodel.hpp"
ResizingTextEdit::ResizingTextEdit() ResizingTextEdit::ResizingTextEdit()
{ {
@ -97,7 +97,7 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
} }
auto *completionModel = auto *completionModel =
static_cast<chatterino::singletons::CompletionModel *>(this->completer->model()); static_cast<chatterino::CompletionModel *>(this->completer->model());
if (!this->completionInProgress) { if (!this->completionInProgress) {
// First type pressing tab after modifying a message, we refresh our completion model // First type pressing tab after modifying a message, we refresh our completion model