chatterino2
Code Issues

removed namespaces

Browse Source
This commit is contained in:
fourtf
2018-06-26 17:06:17 +02:00
parent 2df0566492
commit 54eb07e116
132 changed files with 805 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/helper/ChannelView.cpp
+30 -30
View File
@@ -271,7 +271,7 @@ QString ChannelView::getSelectedText()
{
QString result = "";
messages::LimitedQueueSnapshot<MessageLayoutPtr> messagesSnapshot = this->getMessagesSnapshot();
chatterino::LimitedQueueSnapshot<MessageLayoutPtr> messagesSnapshot = this->getMessagesSnapshot();
Selection _selection = this->selection_;
@@ -317,17 +317,17 @@ bool ChannelView::getEnableScrollingToBottom() const
return this->enableScrollingToBottom_;
}
void ChannelView::setOverrideFlags(boost::optional<messages::MessageElement::Flags> value)
void ChannelView::setOverrideFlags(boost::optional<chatterino::MessageElement::Flags> value)
{
this->overrideFlags_ = value;
}
const boost::optional<messages::MessageElement::Flags> &ChannelView::getOverrideFlags() const
const boost::optional<chatterino::MessageElement::Flags> &ChannelView::getOverrideFlags() const
{
return this->overrideFlags_;
}
messages::LimitedQueueSnapshot<MessageLayoutPtr> ChannelView::getMessagesSnapshot()
chatterino::LimitedQueueSnapshot<MessageLayoutPtr> ChannelView::getMessagesSnapshot()
{
if (!this->isPaused() /*|| this->scrollBar_.isVisible()*/) {
this->snapshot_ = this->messages.getSnapshot();
@@ -435,7 +435,7 @@ void ChannelView::setChannel(ChannelPtr newChannel)
MessageLayoutPtr newItem(new MessageLayout(replacement));
auto snapshot = this->messages.getSnapshot();
if (index >= snapshot.getLength()) {
debug::Log("Tried to replace out of bounds message. Index: {}. Length: {}", index,
Log("Tried to replace out of bounds message. Index: {}. Length: {}", index,
snapshot.getLength());
return;
}
@@ -530,7 +530,7 @@ void ChannelView::setSelection(const SelectionItem &start, const SelectionItem &
this->selectionChanged.invoke();
}
messages::MessageElement::Flags ChannelView::getFlags() const
chatterino::MessageElement::Flags ChannelView::getFlags() const
{
auto app = getApp();
@@ -598,11 +598,11 @@ void ChannelView::drawMessages(QPainter &painter)
int y = int(-(messagesSnapshot[start].get()->getHeight() *
(fmod(this->scrollBar_.getCurrentValue(), 1))));
messages::MessageLayout *end = nullptr;
chatterino::MessageLayout *end = nullptr;
bool windowFocused = this->window() == QApplication::activeWindow();
for (size_t i = start; i < messagesSnapshot.getLength(); ++i) {
messages::MessageLayout *layout = messagesSnapshot[i].get();
chatterino::MessageLayout *layout = messagesSnapshot[i].get();
bool isLastMessage = false;
if (app->settings->showLastMessageIndicator) {
@@ -633,7 +633,7 @@ void ChannelView::drawMessages(QPainter &painter)
}
// delete the message buffers that aren't on screen
for (const std::shared_ptr<messages::MessageLayout> &item : this->messagesOnScreen_) {
for (const std::shared_ptr<chatterino::MessageLayout> &item : this->messagesOnScreen_) {
item->deleteBuffer();
}
@@ -641,7 +641,7 @@ void ChannelView::drawMessages(QPainter &painter)
// add all messages on screen to the map
for (size_t i = start; i < messagesSnapshot.getLength(); ++i) {
std::shared_ptr<messages::MessageLayout> layout = messagesSnapshot[i];
std::shared_ptr<chatterino::MessageLayout> layout = messagesSnapshot[i];
this->messagesOnScreen_.insert(layout);
@@ -758,7 +758,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
}
auto tooltipWidget = TooltipWidget::getInstance();
std::shared_ptr<messages::MessageLayout> layout;
std::shared_ptr<chatterino::MessageLayout> layout;
QPoint relativePos;
int messageIndex;
@@ -787,7 +787,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
}
// check if word underneath cursor
const messages::MessageLayoutElement *hoverLayoutElement = layout->getElementAt(relativePos);
const chatterino::MessageLayoutElement *hoverLayoutElement = layout->getElementAt(relativePos);
if (hoverLayoutElement == nullptr) {
this->setCursor(Qt::ArrowCursor);
@@ -820,7 +820,7 @@ void ChannelView::mousePressEvent(QMouseEvent *event)
this->mouseDown.invoke(event);
std::shared_ptr<messages::MessageLayout> layout;
std::shared_ptr<chatterino::MessageLayout> layout;
QPoint relativePos;
int messageIndex;
@@ -882,7 +882,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
if (this->isMouseDown_) {
this->isMouseDown_ = false;
if (fabsf(util::distanceBetweenPoints(this->lastPressPosition_, event->screenPos())) >
if (fabsf(distanceBetweenPoints(this->lastPressPosition_, event->screenPos())) >
15.f) {
return;
}
@@ -893,7 +893,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
if (this->isRightMouseDown_) {
this->isRightMouseDown_ = false;
if (fabsf(util::distanceBetweenPoints(this->lastRightPressPosition_,
if (fabsf(distanceBetweenPoints(this->lastRightPressPosition_,
event->screenPos())) > 15.f) {
return;
}
@@ -908,7 +908,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
// find message
this->layoutMessages();
std::shared_ptr<messages::MessageLayout> layout;
std::shared_ptr<chatterino::MessageLayout> layout;
QPoint relativePos;
int messageIndex;
@@ -927,7 +927,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
return;
}
const messages::MessageLayoutElement *hoverLayoutElement = layout->getElementAt(relativePos);
const chatterino::MessageLayoutElement *hoverLayoutElement = layout->getElementAt(relativePos);
if (hoverLayoutElement == nullptr) {
return;
@@ -938,8 +938,8 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
}
void ChannelView::handleMouseClick(QMouseEvent *event,
const messages::MessageLayoutElement *hoveredElement,
messages::MessageLayout *layout)
const chatterino::MessageLayoutElement *hoveredElement,
chatterino::MessageLayout *layout)
{
switch (event->button()) {
case Qt::LeftButton: {
@@ -971,8 +971,8 @@ void ChannelView::handleMouseClick(QMouseEvent *event,
}
}
void ChannelView::addContextMenuItems(const messages::MessageLayoutElement *hoveredElement,
messages::MessageLayout *layout)
void ChannelView::addContextMenuItems(const chatterino::MessageLayoutElement *hoveredElement,
chatterino::MessageLayout *layout)
{
const auto &creator = hoveredElement->getCreator();
auto creatorFlags = creator.getFlags();
@@ -982,7 +982,7 @@ void ChannelView::addContextMenuItems(const messages::MessageLayoutElement *hove
// Emote actions
if (creatorFlags & (MessageElement::Flags::EmoteImages | MessageElement::Flags::EmojiImage)) {
const auto &emoteElement = static_cast<const messages::EmoteElement &>(creator);
const auto &emoteElement = static_cast<const chatterino::EmoteElement &>(creator);
// TODO: We might want to add direct "Open image" variants alongside the Copy
// actions
@@ -1099,7 +1099,7 @@ void ChannelView::mouseDoubleClickEvent(QMouseEvent *event)
auto app = getApp();
if (app->settings->linksDoubleClickOnly) {
std::shared_ptr<messages::MessageLayout> layout;
std::shared_ptr<chatterino::MessageLayout> layout;
QPoint relativePos;
int messageIndex;
@@ -1112,7 +1112,7 @@ void ChannelView::mouseDoubleClickEvent(QMouseEvent *event)
return;
}
const messages::MessageLayoutElement *hoverLayoutElement =
const chatterino::MessageLayoutElement *hoverLayoutElement =
layout->getElementAt(relativePos);
if (hoverLayoutElement == nullptr) {
@@ -1133,15 +1133,15 @@ void ChannelView::hideEvent(QHideEvent *)
this->messagesOnScreen_.clear();
}
void ChannelView::handleLinkClick(QMouseEvent *event, const messages::Link &link,
messages::MessageLayout *layout)
void ChannelView::handleLinkClick(QMouseEvent *event, const chatterino::Link &link,
chatterino::MessageLayout *layout)
{
if (event->button() != Qt::LeftButton) {
return;
}
switch (link.type) {
case messages::Link::UserInfo: {
case chatterino::Link::UserInfo: {
auto user = link.value;
auto *userPopup = new UserInfoPopup;
@@ -1155,12 +1155,12 @@ void ChannelView::handleLinkClick(QMouseEvent *event, const messages::Link &link
break;
}
case messages::Link::Url: {
case chatterino::Link::Url: {
QDesktopServices::openUrl(QUrl(link.value));
break;
}
case messages::Link::UserAction: {
case chatterino::Link::UserAction: {
QString value = link.value;
value.replace("{user}", layout->getMessage()->loginName);
this->channel_->sendMessage(value);
@@ -1170,7 +1170,7 @@ void ChannelView::handleLinkClick(QMouseEvent *event, const messages::Link &link
}
}
bool ChannelView::tryGetMessageAt(QPoint p, std::shared_ptr<messages::MessageLayout> &_message,
bool ChannelView::tryGetMessageAt(QPoint p, std::shared_ptr<chatterino::MessageLayout> &_message,
QPoint &relativePos, int &index)
{
auto messagesSnapshot = this->getMessagesSnapshot();
src/widgets/helper/ChannelView.hpp
+19 -19
View File
@@ -36,13 +36,13 @@ public:
void clearSelection();
void setEnableScrollingToBottom(bool);
bool getEnableScrollingToBottom() const;
void setOverrideFlags(boost::optional<messages::MessageElement::Flags> value);
const boost::optional<messages::MessageElement::Flags> &getOverrideFlags() const;
void setOverrideFlags(boost::optional<chatterino::MessageElement::Flags> value);
const boost::optional<chatterino::MessageElement::Flags> &getOverrideFlags() const;
void pause(int msecTimeout);
void updateLastReadMessage();
void setChannel(ChannelPtr channel_);
messages::LimitedQueueSnapshot<messages::MessageLayoutPtr> getMessagesSnapshot();
chatterino::LimitedQueueSnapshot<chatterino::MessageLayoutPtr> getMessagesSnapshot();
void layoutMessages();
void clearMessages();
@@ -50,7 +50,7 @@ public:
pajlada::Signals::Signal<QMouseEvent *> mouseDown;
pajlada::Signals::NoArgSignal selectionChanged;
pajlada::Signals::Signal<HighlightState> tabHighlightRequested;
pajlada::Signals::Signal<const messages::Link &> linkClicked;
pajlada::Signals::Signal<const chatterino::Link &> linkClicked;
protected:
void themeRefreshEvent() override;
@@ -70,10 +70,10 @@ protected:
void hideEvent(QHideEvent *) override;
void handleLinkClick(QMouseEvent *event, const messages::Link &link,
messages::MessageLayout *layout);
void handleLinkClick(QMouseEvent *event, const chatterino::Link &link,
chatterino::MessageLayout *layout);
bool tryGetMessageAt(QPoint p, std::shared_ptr<messages::MessageLayout> &message,
bool tryGetMessageAt(QPoint p, std::shared_ptr<chatterino::MessageLayout> &message,
QPoint &relativePos, int &index);
private:
@@ -92,24 +92,24 @@ private:
int messagesAddedSinceSelectionPause_ = 0;
QTimer pauseTimeout_;
boost::optional<messages::MessageElement::Flags> overrideFlags_;
messages::MessageLayoutPtr lastReadMessage_;
boost::optional<chatterino::MessageElement::Flags> overrideFlags_;
chatterino::MessageLayoutPtr lastReadMessage_;
messages::LimitedQueueSnapshot<messages::MessageLayoutPtr> snapshot_;
chatterino::LimitedQueueSnapshot<chatterino::MessageLayoutPtr> snapshot_;
void detachChannel();
void actuallyLayoutMessages(bool causedByScollbar = false);
void drawMessages(QPainter &painter);
void setSelection(const messages::SelectionItem &start, const messages::SelectionItem &end);
messages::MessageElement::Flags getFlags() const;
void setSelection(const chatterino::SelectionItem &start, const chatterino::SelectionItem &end);
chatterino::MessageElement::Flags getFlags() const;
bool isPaused();
void handleMouseClick(QMouseEvent *event,
const messages::MessageLayoutElement *hoverLayoutElement,
messages::MessageLayout *layout);
void addContextMenuItems(const messages::MessageLayoutElement *hoveredElement,
messages::MessageLayout *layout);
const chatterino::MessageLayoutElement *hoverLayoutElement,
chatterino::MessageLayout *layout);
void addContextMenuItems(const chatterino::MessageLayoutElement *hoveredElement,
chatterino::MessageLayout *layout);
// void beginPause();
// void endPause();
@@ -132,10 +132,10 @@ private:
QPointF lastPressPosition_;
QPointF lastRightPressPosition_;
messages::Selection selection_;
chatterino::Selection selection_;
bool selecting_ = false;
messages::LimitedQueue<messages::MessageLayoutPtr> messages;
chatterino::LimitedQueue<chatterino::MessageLayoutPtr> messages;
pajlada::Signals::Connection messageAppendedConnection_;
pajlada::Signals::Connection messageAddedAtStartConnection_;
@@ -147,7 +147,7 @@ private:
std::vector<pajlada::Signals::ScopedConnection> connections_;
std::vector<pajlada::Signals::ScopedConnection> channelConnections_;
std::unordered_set<std::shared_ptr<messages::MessageLayout>> messagesOnScreen_;
std::unordered_set<std::shared_ptr<chatterino::MessageLayout>> messagesOnScreen_;
int getLayoutWidth() const;
src/widgets/helper/DebugPopup.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ DebugPopup::DebugPopup()
timer->setInterval(1000);
QObject::connect(timer, &QTimer::timeout,
[text] { text->setText(util::DebugCount::getDebugText()); });
[text] { text->setText(DebugCount::getDebugText()); });
timer->start();
text->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
src/widgets/helper/NotebookTab.cpp
+4 -4
View File
@@ -60,7 +60,7 @@ NotebookTab::NotebookTab(Notebook *notebook)
// QObject::connect(enableHighlightsOnNewMessageAction, &QAction::toggled, [this](bool
// newValue) {
// debug::Log("New value is {}", newValue); //
// Log("New value is {}", newValue); //
// });
}
@@ -86,7 +86,7 @@ void NotebookTab::updateSize()
width = (metrics.width(this->getTitle()) + int(16 * scale));
}
width = util::clamp(width, this->height(), int(150 * scale));
width = clamp(width, this->height(), int(150 * scale));
if (this->width() != width) {
this->resize(width, int(NOTEBOOK_TAB_HEIGHT * scale));
@@ -221,8 +221,8 @@ void NotebookTab::paintEvent(QPaintEvent *)
// int fullHeight = (int)(scale * 48);
// select the right tab colors
singletons::ThemeManager::TabColors colors;
singletons::ThemeManager::TabColors regular = this->themeManager->tabs.regular;
chatterino::ThemeManager::TabColors colors;
chatterino::ThemeManager::TabColors regular = this->themeManager->tabs.regular;
if (this->selected_) {
colors = this->themeManager->tabs.selected;
src/widgets/helper/SearchPopup.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ void SearchPopup::performSearch()
ChannelPtr channel(new Channel("search", Channel::None));
for (size_t i = 0; i < this->snapshot.getLength(); i++) {
messages::MessagePtr message = this->snapshot[i];
chatterino::MessagePtr message = this->snapshot[i];
if (text.isEmpty() ||
message->searchText.indexOf(this->searchInput->text(), 0, Qt::CaseInsensitive) != -1) {
src/widgets/helper/SearchPopup.hpp
+1 -1
View File
@@ -21,7 +21,7 @@ public:
void setChannel(std::shared_ptr<Channel> channel);
private:
messages::LimitedQueueSnapshot<messages::MessagePtr> snapshot;
chatterino::LimitedQueueSnapshot<chatterino::MessagePtr> snapshot;
QLineEdit *searchInput;
ChannelView *channelView;
src/widgets/helper/SettingsDialogTab.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
namespace chatterino {
SettingsDialogTab::SettingsDialogTab(SettingsDialog *_dialog, settingspages::SettingsPage *_page,
SettingsDialogTab::SettingsDialogTab(SettingsDialog *_dialog, SettingsPage *_page,
QString imageFileName)
: BaseWidget(_dialog)
, dialog(_dialog)
@@ -33,7 +33,7 @@ void SettingsDialogTab::setSelected(bool _selected)
emit selectedChanged(selected);
}
settingspages::SettingsPage *SettingsDialogTab::getSettingsPage()
SettingsPage *SettingsDialogTab::getSettingsPage()
{
return this->page;
}
src/widgets/helper/SettingsDialogTab.hpp
+3 -3
View File
@@ -16,11 +16,11 @@ class SettingsDialogTab : public BaseWidget
Q_OBJECT
public:
SettingsDialogTab(SettingsDialog *dialog, settingspages::SettingsPage *page,
SettingsDialogTab(SettingsDialog *dialog, SettingsPage *page,
QString imageFileName);
void setSelected(bool selected);
settingspages::SettingsPage *getSettingsPage();
SettingsPage *getSettingsPage();
signals:
void selectedChanged(bool);
@@ -36,7 +36,7 @@ private:
// Parent settings dialog
SettingsDialog *dialog;
settingspages::SettingsPage *page;
SettingsPage *page;
bool selected = false;
};