src: applied clang-format

This commit is contained in:
mlangkabel
2019-11-18 17:07:20 +01:00
parent 52058d9947
commit 078feca004
1100 changed files with 21382 additions and 20822 deletions
+8 -9
View File
@@ -7,9 +7,8 @@
#include "MessageBase.h"
#include "MessageQueue.h"
template<typename MessageType>
class Message
: public MessageBase
template <typename MessageType>
class Message: public MessageBase
{
public:
virtual ~Message() = default;
@@ -21,19 +20,19 @@ public:
virtual void dispatch()
{
std::shared_ptr<MessageBase> message = std::make_shared<MessageType>(*dynamic_cast<MessageType*>(this));
std::shared_ptr<MessageBase> message = std::make_shared<MessageType>(
*dynamic_cast<MessageType*>(this));
MessageQueue::getInstance()->pushMessage(message);
}
virtual void dispatchImmediately()
{
std::shared_ptr<MessageBase> message = std::make_shared<MessageType>(*dynamic_cast<MessageType*>(this));
std::shared_ptr<MessageBase> message = std::make_shared<MessageType>(
*dynamic_cast<MessageType*>(this));
MessageQueue::getInstance()->processMessage(message, true);
}
virtual void print(std::wostream& os) const
{
}
virtual void print(std::wostream& os) const {}
};
#endif // MESSAGE_H
#endif // MESSAGE_H
+1 -1
View File
@@ -128,4 +128,4 @@ private:
bool m_isLogged;
};
#endif // MESSAGE_BASE_H
#endif // MESSAGE_BASE_H
+1 -1
View File
@@ -11,4 +11,4 @@ public:
virtual void filter(MessageQueue::MessageBufferType* messageBuffer) = 0;
};
#endif // MESSAGE_FILTER_H
#endif // MESSAGE_FILTER_H
+4 -7
View File
@@ -7,14 +7,11 @@
#include "MessageListenerBase.h"
#include "MessageQueue.h"
template<typename MessageType>
class MessageListener
: public MessageListenerBase
template <typename MessageType>
class MessageListener: public MessageListenerBase
{
public:
MessageListener()
{
}
MessageListener() {}
private:
virtual std::string doGetType() const
@@ -35,4 +32,4 @@ private:
virtual void handleMessage(MessageType* message) = 0;
};
#endif // MESSAGE_LISTENER_H
#endif // MESSAGE_LISTENER_H
@@ -10,9 +10,7 @@
class MessageListenerBase
{
public:
MessageListenerBase()
: m_id(s_nextId++)
, m_alive(true)
MessageListenerBase(): m_id(s_nextId++), m_alive(true)
{
MessageQueue::getInstance()->registerListener(this);
}
@@ -68,4 +66,4 @@ private:
bool m_alive;
};
#endif // MESSAGE_LISTENER_BASE_H
#endif // MESSAGE_LISTENER_BASE_H
+19 -20
View File
@@ -3,14 +3,14 @@
#include <chrono>
#include <thread>
#include "logging.h"
#include "MessageBase.h"
#include "MessageFilter.h"
#include "MessageListenerBase.h"
#include "TabId.h"
#include "TaskGroupParallel.h"
#include "TaskGroupSequence.h"
#include "TaskLambda.h"
#include "TabId.h"
#include "logging.h"
std::shared_ptr<MessageQueue> MessageQueue::getInstance()
{
@@ -46,8 +46,8 @@ void MessageQueue::unregisterListener(MessageListenerBase* listener)
{
m_listeners.erase(m_listeners.begin() + i);
// m_currentListenerIndex and m_listenersLength need to be updated in case this happens while a message is
// handled.
// m_currentListenerIndex and m_listenersLength need to be updated in case this happens
// while a message is handled.
if (i <= m_currentListenerIndex)
{
m_currentListenerIndex--;
@@ -216,7 +216,7 @@ void MessageQueue::processMessages()
{
std::lock_guard<std::mutex> lock(m_messageBufferMutex);
for (std::shared_ptr<MessageFilter> filter : m_filters)
for (std::shared_ptr<MessageFilter> filter: m_filters)
{
if (!m_messageBuffer.size())
{
@@ -243,19 +243,20 @@ void MessageQueue::sendMessage(std::shared_ptr<MessageBase> message)
{
std::lock_guard<std::mutex> lock(m_listenersMutex);
// m_listenersLength is saved, so that new listeners registered whithin message handling don't get the
// current message and the length can be reduced when a listener gets unregistered.
// m_listenersLength is saved, so that new listeners registered whithin message handling don't
// get the current message and the length can be reduced when a listener gets unregistered.
m_listenersLength = m_listeners.size();
// The currentListenerIndex holds the index of the current listener being handled, so it can be changed when a
// listener gets removed while message handling.
for (m_currentListenerIndex = 0; m_currentListenerIndex < m_listenersLength; m_currentListenerIndex++)
// The currentListenerIndex holds the index of the current listener being handled, so it can be
// changed when a listener gets removed while message handling.
for (m_currentListenerIndex = 0; m_currentListenerIndex < m_listenersLength;
m_currentListenerIndex++)
{
MessageListenerBase* listener = m_listeners[m_currentListenerIndex];
if (listener->getType() == message->getType() &&
(message->getSchedulerId() == 0 || listener->getSchedulerId() == 0 ||
listener->getSchedulerId() == message->getSchedulerId()))
listener->getSchedulerId() == message->getSchedulerId()))
{
// The listenersMutex gets unlocked so changes to listeners are possible while message handling.
m_listenersMutex.unlock();
@@ -285,19 +286,17 @@ void MessageQueue::sendMessageAsTask(std::shared_ptr<MessageBase> message, bool
if (listener->getType() == message->getType() &&
(message->getSchedulerId() == 0 || listener->getSchedulerId() == 0 ||
listener->getSchedulerId() == message->getSchedulerId()))
listener->getSchedulerId() == message->getSchedulerId()))
{
Id listenerId = listener->getId();
taskGroup->addTask(std::make_shared<TaskLambda>(
[listenerId, message]()
taskGroup->addTask(std::make_shared<TaskLambda>([listenerId, message]() {
MessageListenerBase* listener = MessageQueue::getInstance()->getListenerById(
listenerId);
if (listener)
{
MessageListenerBase* listener = MessageQueue::getInstance()->getListenerById(listenerId);
if (listener)
{
listener->handleMessageBase(message.get());
}
listener->handleMessageBase(message.get());
}
));
}));
}
}
}
+1 -1
View File
@@ -69,4 +69,4 @@ private:
bool m_sendMessagesAsTasks;
};
#endif // MESSAGE_QUEUE_H
#endif // MESSAGE_QUEUE_H
@@ -1,11 +1,10 @@
#ifndef MESSAGE_FILTER_ERROR_COUNT_UPDATE_H
#define MESSAGE_FILTER_ERROR_COUNT_UPDATE_H
#include "MessageFilter.h"
#include "MessageErrorCountUpdate.h"
#include "MessageFilter.h"
class MessageFilterErrorCountUpdate
: public MessageFilter
class MessageFilterErrorCountUpdate: public MessageFilter
{
void filter(MessageQueue::MessageBufferType* messageBuffer) override
{
@@ -21,14 +20,15 @@ class MessageFilterErrorCountUpdate
{
if ((*it)->getType() == MessageErrorCountUpdate::getStaticType())
{
MessageErrorCountUpdate* frontErrorsMessage = dynamic_cast<MessageErrorCountUpdate*>(message);
MessageErrorCountUpdate* backErrorsMessage = dynamic_cast<MessageErrorCountUpdate*>(it->get());
MessageErrorCountUpdate* frontErrorsMessage =
dynamic_cast<MessageErrorCountUpdate*>(message);
MessageErrorCountUpdate* backErrorsMessage =
dynamic_cast<MessageErrorCountUpdate*>(it->get());
backErrorsMessage->newErrors.insert(
backErrorsMessage->newErrors.begin(),
frontErrorsMessage->newErrors.begin(),
frontErrorsMessage->newErrors.end()
);
frontErrorsMessage->newErrors.end());
messageBuffer->pop_front();
return;
@@ -38,4 +38,4 @@ class MessageFilterErrorCountUpdate
}
};
#endif // MESSAGE_FILTER_ERROR_COUNT_UPDATE_H
#endif // MESSAGE_FILTER_ERROR_COUNT_UPDATE_H
@@ -5,8 +5,7 @@
#include "MessageFocusIn.h"
#include "MessageFocusOut.h"
class MessageFilterFocusInOut
: public MessageFilter
class MessageFilterFocusInOut: public MessageFilter
{
void filter(MessageQueue::MessageBufferType* messageBuffer) override
{
@@ -21,7 +20,8 @@ class MessageFilterFocusInOut
for (auto it = messageBuffer->begin() + 1; it != messageBuffer->end(); it++)
{
if ((*it)->getType() == MessageFocusOut::getStaticType() &&
dynamic_cast<MessageFocusIn*>(message)->tokenIds == dynamic_cast<MessageFocusOut*>(it->get())->tokenIds)
dynamic_cast<MessageFocusIn*>(message)->tokenIds ==
dynamic_cast<MessageFocusOut*>(it->get())->tokenIds)
{
messageBuffer->erase(it);
messageBuffer->pop_front();
@@ -32,4 +32,4 @@ class MessageFilterFocusInOut
}
};
#endif // MESSAGE_FILTER_FOCUS_IN_OUT_H
#endif // MESSAGE_FILTER_FOCUS_IN_OUT_H
@@ -4,8 +4,7 @@
#include "MessageFilter.h"
#include "MessageSearchAutocomplete.h"
class MessageFilterSearchAutocomplete
: public MessageFilter
class MessageFilterSearchAutocomplete: public MessageFilter
{
void filter(MessageQueue::MessageBufferType* messageBuffer) override
{
@@ -29,4 +28,4 @@ class MessageFilterSearchAutocomplete
}
};
#endif // MESSAGE_FILTER_SEARCH_AUTOCOMPLETE_H
#endif // MESSAGE_FILTER_SEARCH_AUTOCOMPLETE_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessageActivateWindow
: public Message<MessageActivateWindow>
class MessageActivateWindow: public Message<MessageActivateWindow>
{
public:
MessageActivateWindow()
{
}
MessageActivateWindow() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_ACTIVATE_WINDOW_H
#endif // MESSAGE_ACTIVATE_WINDOW_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessageClearStatusView:
public Message<MessageClearStatusView>
class MessageClearStatusView: public Message<MessageClearStatusView>
{
public:
MessageClearStatusView()
{
}
MessageClearStatusView() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_CLEAR_STATUS_VIEW_H
#endif // MESSAGE_CLEAR_STATUS_VIEW_H
@@ -6,22 +6,17 @@
#include "FilePath.h"
#include "Message.h"
class MessageCloseProject
: public Message<MessageCloseProject>
class MessageCloseProject: public Message<MessageCloseProject>
{
public:
MessageCloseProject()
{
}
MessageCloseProject() {}
static const std::string getStaticType()
{
return "MessageCloseProject";
}
virtual void print(std::wostream& os) const
{
}
virtual void print(std::wostream& os) const {}
};
#endif // MESSAGE_CLOSE_PROJECT_H
#endif // MESSAGE_CLOSE_PROJECT_H
@@ -4,8 +4,7 @@
#include "Message.h"
#include "TabId.h"
class MessageFlushUpdates:
public Message<MessageFlushUpdates>
class MessageFlushUpdates: public Message<MessageFlushUpdates>
{
public:
MessageFlushUpdates(bool keepsContent = false)
@@ -20,4 +19,4 @@ public:
}
};
#endif // MESSAGE_FLUSH_UPDATES_H
#endif // MESSAGE_FLUSH_UPDATES_H
@@ -9,13 +9,11 @@
#include "TooltipOrigin.h"
class MessageFocusIn
: public Message<MessageFocusIn>
class MessageFocusIn: public Message<MessageFocusIn>
{
public:
MessageFocusIn(const std::vector<Id>& tokenIds, TooltipOrigin origin)
: tokenIds(tokenIds)
, origin(origin)
: tokenIds(tokenIds), origin(origin)
{
setIsLogged(false);
setSchedulerId(TabId::currentTab());
@@ -28,7 +26,7 @@ public:
virtual void print(std::wostream& os) const
{
for (const Id& id : tokenIds)
for (const Id& id: tokenIds)
{
os << id << L" ";
}
@@ -38,4 +36,4 @@ public:
const TooltipOrigin origin;
};
#endif //MESSAGE_FOCUS_IN_H
#endif // MESSAGE_FOCUS_IN_H
@@ -7,12 +7,10 @@
#include "TabId.h"
#include "types.h"
class MessageFocusOut
: public Message<MessageFocusOut>
class MessageFocusOut: public Message<MessageFocusOut>
{
public:
MessageFocusOut(const std::vector<Id>& tokenIds)
: tokenIds(tokenIds)
MessageFocusOut(const std::vector<Id>& tokenIds): tokenIds(tokenIds)
{
setIsLogged(false);
setSchedulerId(TabId::currentTab());
@@ -25,7 +23,7 @@ public:
virtual void print(std::wostream& os) const
{
for (const Id& id : tokenIds)
for (const Id& id: tokenIds)
{
os << id << L" ";
}
@@ -34,4 +32,4 @@ public:
const std::vector<Id> tokenIds;
};
#endif //MESSAGE_FOCUS_OUT_H
#endif // MESSAGE_FOCUS_OUT_H
@@ -6,11 +6,11 @@
#include "FilePath.h"
#include "Message.h"
class MessageLoadProject
: public Message<MessageLoadProject>
class MessageLoadProject: public Message<MessageLoadProject>
{
public:
MessageLoadProject(const FilePath& filePath, bool settingsChanged = false, RefreshMode refreshMode = REFRESH_NONE)
MessageLoadProject(
const FilePath& filePath, bool settingsChanged = false, RefreshMode refreshMode = REFRESH_NONE)
: projectSettingsFilePath(filePath)
, settingsChanged(settingsChanged)
, refreshMode(refreshMode)
@@ -34,4 +34,4 @@ public:
const RefreshMode refreshMode;
};
#endif // MESSAGE_LOAD_PROJECT_H
#endif // MESSAGE_LOAD_PROJECT_H
@@ -1,17 +1,13 @@
#ifndef MESSAGE_LOG_FILTER_CHANGED_H
#define MESSAGE_LOG_FILTER_CHANGED_H
#include "Message.h"
#include "Logger.h"
#include "Message.h"
class MessageLogFilterChanged
: public Message<MessageLogFilterChanged>
class MessageLogFilterChanged: public Message<MessageLogFilterChanged>
{
public:
MessageLogFilterChanged(const Logger::LogLevelMask filter)
: logFilter(filter)
{
}
MessageLogFilterChanged(const Logger::LogLevelMask filter): logFilter(filter) {}
static const std::string getStaticType()
{
@@ -21,4 +17,4 @@ public:
const Logger::LogLevelMask logFilter;
};
#endif // MESSAGE_LOG_FILTER_CHANGED_H
#endif // MESSAGE_LOG_FILTER_CHANGED_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessageProjectEdit
: public Message<MessageProjectEdit>
class MessageProjectEdit: public Message<MessageProjectEdit>
{
public:
MessageProjectEdit()
{
}
MessageProjectEdit() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_PROJECT_EDIT_H
#endif // MESSAGE_PROJECT_EDIT_H
@@ -4,14 +4,10 @@
#include "FilePath.h"
#include "Message.h"
class MessageProjectNew
: public Message<MessageProjectNew>
class MessageProjectNew: public Message<MessageProjectNew>
{
public:
MessageProjectNew(const FilePath& cdbPath)
: cdbPath(cdbPath)
{
}
MessageProjectNew(const FilePath& cdbPath): cdbPath(cdbPath) {}
static const std::string getStaticType()
{
@@ -21,4 +17,4 @@ public:
const FilePath cdbPath;
};
#endif // MESSAGE_PROJECT_NEW_H
#endif // MESSAGE_PROJECT_NEW_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessageQuitApplication
: public Message<MessageQuitApplication>
class MessageQuitApplication: public Message<MessageQuitApplication>
{
public:
MessageQuitApplication()
{
}
MessageQuitApplication() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_QUIT_APPLICATION_H
#endif // MESSAGE_QUIT_APPLICATION_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageRefresh
: public Message<MessageRefresh>
class MessageRefresh: public Message<MessageRefresh>
{
public:
static const std::string getStaticType()
@@ -12,10 +11,7 @@ public:
return "MessageRefresh";
}
MessageRefresh()
: all(false)
{
}
MessageRefresh(): all(false) {}
MessageRefresh& refreshAll()
{
@@ -34,4 +30,4 @@ public:
bool all;
};
#endif // MESSAGE_REFRESH_H
#endif // MESSAGE_REFRESH_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageRefreshUI
: public Message<MessageRefreshUI>
class MessageRefreshUI: public Message<MessageRefreshUI>
{
public:
static const std::string getStaticType()
@@ -12,11 +11,7 @@ public:
return "MessageRefreshUI";
}
MessageRefreshUI()
: loadStyle(true)
, isAfterIndexing(false)
{
}
MessageRefreshUI(): loadStyle(true), isAfterIndexing(false) {}
MessageRefreshUI& noStyleReload()
{
@@ -42,4 +37,4 @@ public:
bool isAfterIndexing;
};
#endif // MESSAGE_REFRESH_UI_H
#endif // MESSAGE_REFRESH_UI_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessageResetZoom
: public Message<MessageResetZoom>
class MessageResetZoom: public Message<MessageResetZoom>
{
public:
MessageResetZoom()
{
}
MessageResetZoom() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_RESET_ZOOM_H
#endif // MESSAGE_RESET_ZOOM_H
@@ -3,14 +3,10 @@
#include "Message.h"
class MessageScrollSpeedChange
: public Message<MessageScrollSpeedChange>
class MessageScrollSpeedChange: public Message<MessageScrollSpeedChange>
{
public:
MessageScrollSpeedChange(float scrollSpeed)
: scrollSpeed(scrollSpeed)
{
}
MessageScrollSpeedChange(float scrollSpeed): scrollSpeed(scrollSpeed) {}
static const std::string getStaticType()
{
@@ -25,4 +21,4 @@ public:
const float scrollSpeed;
};
#endif // MESSAGE_SCROLL_SPEED_CHANGE_H
#endif // MESSAGE_SCROLL_SPEED_CHANGE_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessageShowStatus
: public Message<MessageShowStatus>
class MessageShowStatus: public Message<MessageShowStatus>
{
public:
MessageShowStatus()
{
}
MessageShowStatus() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_SHOW_STATUS_H
#endif // MESSAGE_SHOW_STATUS_H
@@ -2,21 +2,18 @@
#include "utilityString.h"
MessageStatus::MessageStatus(const std::wstring& status, bool isError, bool showLoader, bool showInStatusBar)
: isError(isError)
, showLoader(showLoader)
, showInStatusBar(showInStatusBar)
MessageStatus::MessageStatus(
const std::wstring& status, bool isError, bool showLoader, bool showInStatusBar)
: isError(isError), showLoader(showLoader), showInStatusBar(showInStatusBar)
{
m_stati.push_back(utility::replace(status, L"\n", L" "));
setSendAsTask(false);
}
MessageStatus::MessageStatus(const std::vector<std::wstring>& stati, bool isError, bool showLoader, bool showInStatusBar)
: isError(isError)
, showLoader(showLoader)
, showInStatusBar(showInStatusBar)
, m_stati(stati)
MessageStatus::MessageStatus(
const std::vector<std::wstring>& stati, bool isError, bool showLoader, bool showInStatusBar)
: isError(isError), showLoader(showLoader), showInStatusBar(showInStatusBar), m_stati(stati)
{
setSendAsTask(false);
}
@@ -43,7 +40,7 @@ std::wstring MessageStatus::status() const
void MessageStatus::print(std::wostream& os) const
{
for (const std::wstring& status : m_stati)
for (const std::wstring& status: m_stati)
{
os << status;
@@ -63,4 +60,3 @@ void MessageStatus::print(std::wostream& os) const
os << L" - loading";
}
}
+12 -5
View File
@@ -6,12 +6,19 @@
#include "Message.h"
class MessageStatus
: public Message<MessageStatus>
class MessageStatus: public Message<MessageStatus>
{
public:
MessageStatus(const std::wstring& status, bool isError = false, bool showLoader = false, bool showInStatusBar = true);
MessageStatus(const std::vector<std::wstring>& stati, bool isError = false, bool showLoader = false, bool showInStatusBar = true);
MessageStatus(
const std::wstring& status,
bool isError = false,
bool showLoader = false,
bool showInStatusBar = true);
MessageStatus(
const std::vector<std::wstring>& stati,
bool isError = false,
bool showLoader = false,
bool showInStatusBar = true);
static const std::string getStaticType();
@@ -27,4 +34,4 @@ private:
std::vector<std::wstring> m_stati;
};
#endif // MESSAGE_STATUS_H
#endif // MESSAGE_STATUS_H
@@ -4,14 +4,10 @@
#include "Message.h"
#include "Status.h"
class MessageStatusFilterChanged
: public Message<MessageStatusFilterChanged>
class MessageStatusFilterChanged: public Message<MessageStatusFilterChanged>
{
public:
MessageStatusFilterChanged(const StatusFilter filter)
: statusFilter(filter)
{
}
MessageStatusFilterChanged(const StatusFilter filter): statusFilter(filter) {}
static const std::string getStaticType()
{
@@ -21,4 +17,4 @@ public:
const StatusFilter statusFilter;
};
#endif // MESSAGE_STATUS_FILTER_CHANGED_H
#endif // MESSAGE_STATUS_FILTER_CHANGED_H
@@ -3,14 +3,10 @@
#include "Message.h"
class MessageSwitchColorScheme
: public Message<MessageSwitchColorScheme>
class MessageSwitchColorScheme: public Message<MessageSwitchColorScheme>
{
public:
MessageSwitchColorScheme(const FilePath& filePath)
: colorSchemePath(filePath)
{
}
MessageSwitchColorScheme(const FilePath& filePath): colorSchemePath(filePath) {}
static const std::string getStaticType()
{
@@ -25,4 +21,4 @@ public:
const FilePath colorSchemePath;
};
#endif // MESSAGE_SWITCH_COLOR_SCHEME_H
#endif // MESSAGE_SWITCH_COLOR_SCHEME_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageTooltipHide
: public Message<MessageTooltipHide>
class MessageTooltipHide: public Message<MessageTooltipHide>
{
public:
MessageTooltipHide()
@@ -19,4 +18,4 @@ public:
}
};
#endif // MESSAGE_TOOLTIP_HIDE_H
#endif // MESSAGE_TOOLTIP_HIDE_H
@@ -3,25 +3,23 @@
#include "Message.h"
#include "TooltipOrigin.h"
#include "TooltipInfo.h"
#include "TooltipOrigin.h"
class MessageTooltipShow
: public Message<MessageTooltipShow>
class MessageTooltipShow: public Message<MessageTooltipShow>
{
public:
MessageTooltipShow(TooltipInfo info, TooltipOrigin origin)
: tooltipInfo(info)
, origin(origin)
MessageTooltipShow(TooltipInfo info, TooltipOrigin origin): tooltipInfo(info), origin(origin)
{
setSendAsTask(false);
setIsLogged(false);
}
MessageTooltipShow(const std::vector<Id>& sourceLocationIds, const std::vector<Id>& localSymbolIds, TooltipOrigin origin)
: sourceLocationIds(sourceLocationIds)
, localSymbolIds(localSymbolIds)
, origin(origin)
MessageTooltipShow(
const std::vector<Id>& sourceLocationIds,
const std::vector<Id>& localSymbolIds,
TooltipOrigin origin)
: sourceLocationIds(sourceLocationIds), localSymbolIds(localSymbolIds), origin(origin)
{
setSendAsTask(false);
setIsLogged(false);
@@ -42,4 +40,4 @@ public:
bool force = false;
};
#endif // MESSAGE_TOOLTIP_SHOW_H
#endif // MESSAGE_TOOLTIP_SHOW_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageWindowClosed
: public Message<MessageWindowClosed>
class MessageWindowClosed: public Message<MessageWindowClosed>
{
public:
MessageWindowClosed()
@@ -18,4 +17,4 @@ public:
}
};
#endif // MESSAGE_WINDOW_CLOSED_H
#endif // MESSAGE_WINDOW_CLOSED_H
@@ -3,14 +3,10 @@
#include "Message.h"
class MessageWindowFocus
: public Message<MessageWindowFocus>
class MessageWindowFocus: public Message<MessageWindowFocus>
{
public:
MessageWindowFocus(bool focusIn)
: focusIn(focusIn)
{
}
MessageWindowFocus(bool focusIn): focusIn(focusIn) {}
static const std::string getStaticType()
{
@@ -20,4 +16,4 @@ public:
const bool focusIn;
};
#endif // MESSAGE_WINDOW_FOCUS_H
#endif // MESSAGE_WINDOW_FOCUS_H
+3 -7
View File
@@ -3,14 +3,10 @@
#include "Message.h"
class MessageZoom
: public Message<MessageZoom>
class MessageZoom: public Message<MessageZoom>
{
public:
MessageZoom(bool zoomIn)
: zoomIn(zoomIn)
{
}
MessageZoom(bool zoomIn): zoomIn(zoomIn) {}
static const std::string getStaticType()
{
@@ -32,4 +28,4 @@ public:
const bool zoomIn;
};
#endif // MESSAGE_ZOOM_H
#endif // MESSAGE_ZOOM_H
@@ -11,4 +11,4 @@ public:
virtual std::vector<SearchMatch> getSearchMatches() const = 0;
};
#endif // MESSAGE_ACTIVATE_BASE_H
#endif // MESSAGE_ACTIVATE_BASE_H
@@ -18,15 +18,14 @@ public:
}
MessageActivateErrors(const ErrorFilter& filter, const FilePath& file = FilePath())
: filter(filter)
, file(file)
: filter(filter), file(file)
{
setSchedulerId(TabId::currentTab());
}
std::vector<SearchMatch> getSearchMatches() const override
{
std::vector<SearchMatch> matches = { SearchMatch::createCommand(SearchMatch::COMMAND_ERROR) };
std::vector<SearchMatch> matches = {SearchMatch::createCommand(SearchMatch::COMMAND_ERROR)};
if (!file.empty())
{
SearchMatch match;
@@ -42,4 +41,4 @@ public:
const FilePath file;
};
#endif // MESSAGE_ACTIVATE_ERRORS_H
#endif // MESSAGE_ACTIVATE_ERRORS_H
@@ -16,8 +16,7 @@ public:
}
MessageActivateFullTextSearch(const std::wstring& searchTerm, bool caseSensitive = false)
: searchTerm(searchTerm)
, caseSensitive(caseSensitive)
: searchTerm(searchTerm), caseSensitive(caseSensitive)
{
setSchedulerId(TabId::currentTab());
}
@@ -32,11 +31,11 @@ public:
std::wstring prefix(caseSensitive ? 2 : 1, SearchMatch::FULLTEXT_SEARCH_CHARACTER);
SearchMatch match(prefix + searchTerm);
match.searchType = SearchMatch::SEARCH_FULLTEXT;
return { match };
return {match};
}
const std::wstring searchTerm;
bool caseSensitive;
};
#endif // MESSAGE_ACTIVATE_FULLTEXT_SEARCH_H
#endif // MESSAGE_ACTIVATE_FULLTEXT_SEARCH_H
@@ -22,8 +22,8 @@ public:
std::vector<SearchMatch> getSearchMatches() const override
{
return { SearchMatch::createCommand(SearchMatch::COMMAND_LEGEND) };
return {SearchMatch::createCommand(SearchMatch::COMMAND_LEGEND)};
}
};
#endif // MESSAGE_ACTIVATE_LEGEND_H
#endif // MESSAGE_ACTIVATE_LEGEND_H
@@ -30,10 +30,10 @@ public:
{
return SearchMatch::createCommandsForNodeTypes(acceptedNodeTypes);
}
return { SearchMatch::createCommand(SearchMatch::COMMAND_ALL) };
return {SearchMatch::createCommand(SearchMatch::COMMAND_ALL)};
}
NodeTypeSet acceptedNodeTypes;
};
#endif // MESSAGE_ACTIVATE_ALL_H
#endif // MESSAGE_ACTIVATE_ALL_H
@@ -18,9 +18,7 @@ public:
}
MessageActivateTokens(const MessageBase* other)
: isEdge(false)
, isAggregation(false)
, isFromSearch(false)
: isEdge(false), isAggregation(false), isFromSearch(false)
{
setIsParallel(true);
setKeepContent(other->keepContent());
@@ -29,14 +27,14 @@ public:
void print(std::wostream& os) const override
{
for (const Id& id : tokenIds)
for (const Id& id: tokenIds)
{
os << id << L" ";
}
for (const SearchMatch& match : searchMatches)
for (const SearchMatch& match: searchMatches)
{
for (const NameHierarchy& name : match.tokenNames)
for (const NameHierarchy& name: match.tokenNames)
{
os << name.getQualifiedName() << L" ";
}
@@ -48,10 +46,10 @@ public:
if (isAggregation)
{
SearchMatch match;
match.name = match.text = L"aggregation"; // TODO: show aggregation source and target
match.name = match.text = L"aggregation"; // TODO: show aggregation source and target
match.searchType = SearchMatch::SEARCH_TOKEN;
match.nodeType = NodeType::NODE_TYPE;
return { match };
return {match};
}
return searchMatches;
@@ -65,4 +63,4 @@ public:
bool isFromSearch;
};
#endif // MESSAGE_ACTIVATE_TOKENS_H
#endif // MESSAGE_ACTIVATE_TOKENS_H
@@ -13,8 +13,7 @@ class MessageActivateTrail
{
public:
MessageActivateTrail(
Id originId, Id targetId, Edge::TypeMask edgeTypes, size_t depth, bool horizontalLayout
)
Id originId, Id targetId, Edge::TypeMask edgeTypes, size_t depth, bool horizontalLayout)
: originId(originId)
, targetId(targetId)
, nodeTypes(0)
@@ -34,8 +33,7 @@ public:
Edge::TypeMask edgeTypes,
bool nodeNonIndexed,
size_t depth,
bool horizontalLayout
)
bool horizontalLayout)
: originId(originId)
, targetId(targetId)
, nodeTypes(nodeTypes)
@@ -70,4 +68,4 @@ public:
const bool custom;
};
#endif // MESSAGE_ACTIVATE_TRAIL_H
#endif // MESSAGE_ACTIVATE_TRAIL_H
@@ -4,14 +4,10 @@
#include "Bookmark.h"
#include "Message.h"
class MessageBookmarkActivate
: public Message<MessageBookmarkActivate>
class MessageBookmarkActivate: public Message<MessageBookmarkActivate>
{
public:
MessageBookmarkActivate(const std::shared_ptr<Bookmark>& bookmark)
: bookmark(bookmark)
{
}
MessageBookmarkActivate(const std::shared_ptr<Bookmark>& bookmark): bookmark(bookmark) {}
static const std::string getStaticType()
{
@@ -21,4 +17,4 @@ public:
const std::shared_ptr<Bookmark> bookmark;
};
#endif // MESSAGE_BOOKMARK_ACTIVATE_H
#endif // MESSAGE_BOOKMARK_ACTIVATE_H
@@ -4,16 +4,13 @@
#include "Bookmark.h"
#include "Message.h"
class MessageBookmarkBrowse
: public Message<MessageBookmarkBrowse>
class MessageBookmarkBrowse: public Message<MessageBookmarkBrowse>
{
public:
MessageBookmarkBrowse(
Bookmark::BookmarkFilter filter = Bookmark::FILTER_UNKNOWN,
Bookmark::BookmarkOrder order = Bookmark::ORDER_NONE
)
: filter(filter)
, order(order)
Bookmark::BookmarkOrder order = Bookmark::ORDER_NONE)
: filter(filter), order(order)
{
}
@@ -26,4 +23,4 @@ public:
const Bookmark::BookmarkOrder order;
};
#endif // MESSAGE_BOOKMARKS_BROWSE_H
#endif // MESSAGE_BOOKMARKS_BROWSE_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageBookmarkButtonState:
public Message<MessageBookmarkButtonState>
class MessageBookmarkButtonState: public Message<MessageBookmarkButtonState>
{
public:
enum ButtonState
@@ -19,8 +18,7 @@ public:
return "MessageBookmarkButtonState";
}
MessageBookmarkButtonState(Id schedulerId, ButtonState state)
: state(state)
MessageBookmarkButtonState(Id schedulerId, ButtonState state): state(state)
{
setSchedulerId(schedulerId);
}
@@ -28,4 +26,4 @@ public:
const ButtonState state;
};
#endif // MESSAGE_BOOKMARK_BUTTON_STATE_H
#endif // MESSAGE_BOOKMARK_BUTTON_STATE_H
@@ -3,14 +3,10 @@
#include "Message.h"
class MessageBookmarkCreate
: public Message<MessageBookmarkCreate>
class MessageBookmarkCreate: public Message<MessageBookmarkCreate>
{
public:
MessageBookmarkCreate(Id nodeId = 0)
: nodeId(nodeId)
{
}
MessageBookmarkCreate(Id nodeId = 0): nodeId(nodeId) {}
static const std::string getStaticType()
{
@@ -20,4 +16,4 @@ public:
const Id nodeId;
};
#endif // MESSAGE_BOOKMARK_CREATE_H
#endif // MESSAGE_BOOKMARK_CREATE_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageBookmarkDelete:
public Message<MessageBookmarkDelete>
class MessageBookmarkDelete: public Message<MessageBookmarkDelete>
{
public:
static const std::string getStaticType()
@@ -13,4 +12,4 @@ public:
}
};
#endif // MESSAGE_BOOKMARK_DELETE_H
#endif // MESSAGE_BOOKMARK_DELETE_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageBookmarkEdit:
public Message<MessageBookmarkEdit>
class MessageBookmarkEdit: public Message<MessageBookmarkEdit>
{
public:
static const std::string getStaticType()
@@ -13,4 +12,4 @@ public:
}
};
#endif // MESSAGE_BOOKMARK_EDIT_H
#endif // MESSAGE_BOOKMARK_EDIT_H
@@ -1,17 +1,15 @@
#ifndef MESSAGE_ACTIVATE_FILE_H
#define MESSAGE_ACTIVATE_FILE_H
#include "Message.h"
#include "FilePath.h"
#include "Message.h"
#include "TabId.h"
class MessageActivateFile
: public Message<MessageActivateFile>
class MessageActivateFile: public Message<MessageActivateFile>
{
public:
MessageActivateFile(const FilePath& filePath, unsigned int line = 0)
: filePath(filePath)
, line(line)
: filePath(filePath), line(line)
{
setSchedulerId(TabId::currentTab());
}
@@ -30,4 +28,4 @@ public:
unsigned int line;
};
#endif // MESSAGE_ACTIVATE_FILE_H
#endif // MESSAGE_ACTIVATE_FILE_H
@@ -2,11 +2,10 @@
#define MESSAGE_ACTIVATE_LOCAL_SYMBOLS_H
#include "Message.h"
#include "types.h"
#include "TabId.h"
#include "types.h"
class MessageActivateLocalSymbols
: public Message<MessageActivateLocalSymbols>
class MessageActivateLocalSymbols: public Message<MessageActivateLocalSymbols>
{
public:
MessageActivateLocalSymbols()
@@ -14,8 +13,7 @@ public:
setSchedulerId(TabId::currentTab());
}
MessageActivateLocalSymbols(const std::vector<Id>& symbolIds)
: symbolIds(symbolIds)
MessageActivateLocalSymbols(const std::vector<Id>& symbolIds): symbolIds(symbolIds)
{
setSchedulerId(TabId::currentTab());
}
@@ -32,7 +30,7 @@ public:
virtual void print(std::wostream& os) const
{
for (const Id& symbolId : symbolIds)
for (const Id& symbolId: symbolIds)
{
os << symbolId << L" ";
}
@@ -41,4 +39,4 @@ public:
std::vector<Id> symbolIds;
};
#endif // MESSAGE_ACTIVATE_LOCAL_SYMBOLS_H
#endif // MESSAGE_ACTIVATE_LOCAL_SYMBOLS_H
@@ -5,13 +5,11 @@
#include "TabId.h"
#include "types.h"
class MessageActivateSourceLocations
: public Message<MessageActivateSourceLocations>
class MessageActivateSourceLocations: public Message<MessageActivateSourceLocations>
{
public:
MessageActivateSourceLocations(const std::vector<Id>& locationIds, bool containsUnsolvedLocations)
: locationIds(locationIds)
, containsUnsolvedLocations(containsUnsolvedLocations)
: locationIds(locationIds), containsUnsolvedLocations(containsUnsolvedLocations)
{
setSchedulerId(TabId::currentTab());
}
@@ -23,7 +21,7 @@ public:
virtual void print(std::wostream& os) const
{
for (const Id& id : locationIds)
for (const Id& id: locationIds)
{
os << id << L" ";
}
@@ -33,4 +31,4 @@ public:
const bool containsUnsolvedLocations;
};
#endif // MESSAGE_ACTIVATE_SOURCE_LOCATIONS_H
#endif // MESSAGE_ACTIVATE_SOURCE_LOCATIONS_H
@@ -5,12 +5,10 @@
#include "TabId.h"
#include "types.h"
class MessageActivateTokenIds
: public Message<MessageActivateTokenIds>
class MessageActivateTokenIds: public Message<MessageActivateTokenIds>
{
public:
MessageActivateTokenIds(const std::vector<Id>& tokenIds)
: tokenIds(tokenIds)
MessageActivateTokenIds(const std::vector<Id>& tokenIds): tokenIds(tokenIds)
{
setSchedulerId(TabId::currentTab());
}
@@ -22,7 +20,7 @@ public:
virtual void print(std::wostream& os) const
{
for (const Id& id : tokenIds)
for (const Id& id: tokenIds)
{
os << id << L" ";
}
@@ -31,4 +29,4 @@ public:
const std::vector<Id> tokenIds;
};
#endif // MESSAGE_ACTIVATE_TOKEN_IDS_H
#endif // MESSAGE_ACTIVATE_TOKEN_IDS_H
@@ -7,8 +7,7 @@
#include "Message.h"
#include "TabId.h"
class MessageChangeFileView
: public Message<MessageChangeFileView>
class MessageChangeFileView: public Message<MessageChangeFileView>
{
public:
enum FileState
@@ -30,8 +29,7 @@ public:
FileState state,
ViewMode viewMode,
CodeScrollParams scrollParams,
bool switchesViewMode = false
)
bool switchesViewMode = false)
: filePath(filePath)
, state(state)
, viewMode(viewMode)
@@ -52,16 +50,28 @@ public:
switch (state)
{
case FILE_MINIMIZED: os << L", minimize"; break;
case FILE_SNIPPETS: os << L", snippets"; break;
case FILE_MAXIMIZED: os << L", maximize"; break;
case FILE_MINIMIZED:
os << L", minimize";
break;
case FILE_SNIPPETS:
os << L", snippets";
break;
case FILE_MAXIMIZED:
os << L", maximize";
break;
}
switch (viewMode)
{
case VIEW_LIST: os << L", list"; break;
case VIEW_SINGLE: os << L", single"; break;
case VIEW_CURRENT: os << L", current"; break;
case VIEW_LIST:
os << L", list";
break;
case VIEW_SINGLE:
os << L", single";
break;
case VIEW_CURRENT:
os << L", current";
break;
}
}
@@ -72,4 +82,4 @@ public:
const bool switchesViewMode;
};
#endif // MESSAGE_CHANGE_FILE_VIEW_H
#endif // MESSAGE_CHANGE_FILE_VIEW_H
@@ -4,8 +4,7 @@
#include "Message.h"
#include "TabId.h"
class MessageCodeReference
: public Message<MessageCodeReference>
class MessageCodeReference: public Message<MessageCodeReference>
{
public:
enum ReferenceType
@@ -15,8 +14,7 @@ public:
};
MessageCodeReference(ReferenceType type, bool localReference)
: type(type)
, localReference(localReference)
: type(type), localReference(localReference)
{
setSchedulerId(TabId::currentTab());
}
@@ -47,4 +45,4 @@ public:
bool localReference;
};
#endif // MESSAGE_CODE_REFERENCE_H
#endif // MESSAGE_CODE_REFERENCE_H
@@ -5,8 +5,7 @@
#include "TabId.h"
#include "types.h"
class MessageCodeShowDefinition
: public Message<MessageCodeShowDefinition>
class MessageCodeShowDefinition: public Message<MessageCodeShowDefinition>
{
public:
static const std::string getStaticType()
@@ -14,9 +13,7 @@ public:
return "MessageCodeShowDefinition";
}
MessageCodeShowDefinition(Id nodeId, bool inIDE = false)
: nodeId(nodeId)
, inIDE(inIDE)
MessageCodeShowDefinition(Id nodeId, bool inIDE = false): nodeId(nodeId), inIDE(inIDE)
{
setSchedulerId(TabId::currentTab());
}
@@ -30,4 +27,4 @@ public:
const bool inIDE;
};
#endif // MESSAGE_CODE_SHOW_DEFINITION_H
#endif // MESSAGE_CODE_SHOW_DEFINITION_H
@@ -4,13 +4,10 @@
#include "Message.h"
#include "TabId.h"
class MessageScrollCode
: public Message<MessageScrollCode>
class MessageScrollCode: public Message<MessageScrollCode>
{
public:
MessageScrollCode(int value, bool inListMode)
: value(value)
, inListMode(inListMode)
MessageScrollCode(int value, bool inListMode): value(value), inListMode(inListMode)
{
setIsLogged(false);
setSchedulerId(TabId::currentTab());
@@ -25,4 +22,4 @@ public:
bool inListMode;
};
#endif // MESSAGE_SCROLL_CODE_H
#endif // MESSAGE_SCROLL_CODE_H
@@ -5,13 +5,10 @@
#include "Message.h"
#include "TabId.h"
class MessageScrollToLine
: public Message<MessageScrollToLine>
class MessageScrollToLine: public Message<MessageScrollToLine>
{
public:
MessageScrollToLine(const FilePath& filePath, size_t line)
: filePath(filePath)
, line(line)
MessageScrollToLine(const FilePath& filePath, size_t line): filePath(filePath), line(line)
{
setSchedulerId(TabId::currentTab());
}
@@ -30,4 +27,4 @@ public:
size_t line;
};
#endif // MESSAGE_SCROLL_TO_LINE_H
#endif // MESSAGE_SCROLL_TO_LINE_H
@@ -5,15 +5,11 @@
#include "TabId.h"
#include "types.h"
class MessageShowReference
: public Message<MessageShowReference>
class MessageShowReference: public Message<MessageShowReference>
{
public:
MessageShowReference(size_t refIndex, Id tokenId, Id locationId, bool fromUser)
: refIndex(refIndex)
, tokenId(tokenId)
, locationId(locationId)
, fromUser(fromUser)
: refIndex(refIndex), tokenId(tokenId), locationId(locationId), fromUser(fromUser)
{
setSchedulerId(TabId::currentTab());
}
@@ -34,4 +30,4 @@ public:
const bool fromUser;
};
#endif // MESSAGE_SHOW_REFERENCE_H
#endif // MESSAGE_SHOW_REFERENCE_H
@@ -2,16 +2,14 @@
#define MESSAGE_SHOW_SCOPE_H
#include "Message.h"
#include "types.h"
#include "TabId.h"
#include "types.h"
class MessageShowScope
: public Message<MessageShowScope>
class MessageShowScope: public Message<MessageShowScope>
{
public:
MessageShowScope(Id scopeLocationId, bool showErrors)
: scopeLocationId(scopeLocationId)
, showErrors(showErrors)
: scopeLocationId(scopeLocationId), showErrors(showErrors)
{
setSchedulerId(TabId::currentTab());
}
@@ -30,4 +28,4 @@ public:
const bool showErrors;
};
#endif // MESSAGE_SHOW_SCOPE_H
#endif // MESSAGE_SHOW_SCOPE_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessageCustomTrailShow
: public Message<MessageCustomTrailShow>
class MessageCustomTrailShow: public Message<MessageCustomTrailShow>
{
public:
MessageCustomTrailShow()
{
}
MessageCustomTrailShow() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_CUSTOM_TRAIL_SHOW_H
#endif // MESSAGE_CUSTOM_TRAIL_SHOW_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageErrorCountClear
: public Message<MessageErrorCountClear>
class MessageErrorCountClear: public Message<MessageErrorCountClear>
{
public:
static const std::string getStaticType()
@@ -18,4 +17,4 @@ public:
}
};
#endif // MESSAGE_ERROR_COUNT_CLEAR_H
#endif // MESSAGE_ERROR_COUNT_CLEAR_H
@@ -5,8 +5,7 @@
#include "ErrorCountInfo.h"
class MessageErrorCountUpdate
: public Message<MessageErrorCountUpdate>
class MessageErrorCountUpdate: public Message<MessageErrorCountUpdate>
{
public:
static const std::string getStaticType()
@@ -15,19 +14,19 @@ public:
}
MessageErrorCountUpdate(const ErrorCountInfo& errorCount, const std::vector<ErrorInfo>& newErrors)
: errorCount(errorCount)
, newErrors(newErrors)
: errorCount(errorCount), newErrors(newErrors)
{
setSendAsTask(false);
}
virtual void print(std::wostream& os) const
{
os << errorCount.total << '/' << errorCount.fatal << L" - " << newErrors.size() << L" new errors";
os << errorCount.total << '/' << errorCount.fatal << L" - " << newErrors.size()
<< L" new errors";
}
const ErrorCountInfo errorCount;
std::vector<ErrorInfo> newErrors;
};
#endif // MESSAGE_ERROR_COUNT_UPDATE_H
#endif // MESSAGE_ERROR_COUNT_UPDATE_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageErrorsAll:
public Message<MessageErrorsAll>
class MessageErrorsAll: public Message<MessageErrorsAll>
{
public:
static const std::string getStaticType()
@@ -12,9 +11,7 @@ public:
return "MessageErrorsAll";
}
MessageErrorsAll()
{
}
MessageErrorsAll() {}
};
#endif // MESSAGE_ERRORS_ALL_H
#endif // MESSAGE_ERRORS_ALL_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageErrorsForFile:
public Message<MessageErrorsForFile>
class MessageErrorsForFile: public Message<MessageErrorsForFile>
{
public:
static const std::string getStaticType()
@@ -12,12 +11,9 @@ public:
return "MessageErrorsForFile";
}
MessageErrorsForFile(const FilePath& file)
: file(file)
{
}
MessageErrorsForFile(const FilePath& file): file(file) {}
const FilePath& file;
};
#endif // MESSAGE_ERRORS_FOR_FILE_H
#endif // MESSAGE_ERRORS_FOR_FILE_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageErrorsHelpMessage:
public Message<MessageErrorsHelpMessage>
class MessageErrorsHelpMessage: public Message<MessageErrorsHelpMessage>
{
public:
static const std::string getStaticType()
@@ -12,12 +11,9 @@ public:
return "MessageErrorsHelpMessage";
}
MessageErrorsHelpMessage(bool force = false)
: force(force)
{
}
MessageErrorsHelpMessage(bool force = false): force(force) {}
const bool force;
};
#endif // MESSAGE_ERRORS_HELP_MESSAGE_H
#endif // MESSAGE_ERRORS_HELP_MESSAGE_H
@@ -4,8 +4,7 @@
#include "Message.h"
#include "TabId.h"
class MessageShowError
: public Message<MessageShowError>
class MessageShowError: public Message<MessageShowError>
{
public:
static const std::string getStaticType()
@@ -13,8 +12,7 @@ public:
return "MessageShowError";
}
MessageShowError(Id errorId)
: errorId(errorId)
MessageShowError(Id errorId): errorId(errorId)
{
setSchedulerId(TabId::currentTab());
}
@@ -22,4 +20,4 @@ public:
const Id errorId;
};
#endif // MESSAGE_SHOW_ERROR_H
#endif // MESSAGE_SHOW_ERROR_H
@@ -5,15 +5,18 @@
#include "NameHierarchy.h"
#include "Message.h"
#include "TabId.h"
#include "types.h"
#include "utilityString.h"
#include "TabId.h"
class MessageActivateEdge
: public Message<MessageActivateEdge>
class MessageActivateEdge: public Message<MessageActivateEdge>
{
public:
MessageActivateEdge(Id tokenId, Edge::EdgeType type, const NameHierarchy& sourceNameHierarchy, const NameHierarchy& targetNameHierarchy)
MessageActivateEdge(
Id tokenId,
Edge::EdgeType type,
const NameHierarchy& sourceNameHierarchy,
const NameHierarchy& targetNameHierarchy)
: tokenId(tokenId)
, type(type)
, sourceNameHierarchy(sourceNameHierarchy)
@@ -58,4 +61,4 @@ public:
std::vector<Id> aggregationIds;
};
#endif // MESSAGE_ACTIVATE_EDGE_H
#endif // MESSAGE_ACTIVATE_EDGE_H
@@ -5,16 +5,12 @@
#include "TabId.h"
#include "types.h"
class MessageActivateNodes
: public Message<MessageActivateNodes>
class MessageActivateNodes: public Message<MessageActivateNodes>
{
public:
struct ActiveNode
{
ActiveNode()
: nodeId(0)
, nameHierarchy(NAME_DELIMITER_UNKNOWN)
{ }
ActiveNode(): nodeId(0), nameHierarchy(NAME_DELIMITER_UNKNOWN) {}
Id nodeId;
NameHierarchy nameHierarchy;
};
@@ -51,7 +47,7 @@ public:
virtual void print(std::wostream& os) const
{
for (const ActiveNode& node : nodes)
for (const ActiveNode& node: nodes)
{
os << node.nodeId << L" ";
}
@@ -60,4 +56,4 @@ public:
std::vector<ActiveNode> nodes;
};
#endif // MESSAGE_ACTIVATE_NODES_H
#endif // MESSAGE_ACTIVATE_NODES_H
@@ -9,14 +9,14 @@
#include "types.h"
#include "utilityString.h"
class MessageActivateTrailEdge
: public Message<MessageActivateTrailEdge>
class MessageActivateTrailEdge: public Message<MessageActivateTrailEdge>
{
public:
MessageActivateTrailEdge(
const std::vector<Id>& edgeIds, Edge::EdgeType type,
const NameHierarchy& sourceNameHierarchy, const NameHierarchy& targetNameHierarchy
)
const std::vector<Id>& edgeIds,
Edge::EdgeType type,
const NameHierarchy& sourceNameHierarchy,
const NameHierarchy& targetNameHierarchy)
: edgeIds(edgeIds)
, type(type)
, sourceNameHierarchy(sourceNameHierarchy)
@@ -40,7 +40,7 @@ public:
virtual void print(std::wostream& os) const
{
for (Id edgeId : edgeIds)
for (Id edgeId: edgeIds)
{
os << edgeId << L",";
}
@@ -53,4 +53,4 @@ public:
const NameHierarchy targetNameHierarchy;
};
#endif // MESSAGE_ACTIVATE_TRAIL_EDGE_H
#endif // MESSAGE_ACTIVATE_TRAIL_EDGE_H
@@ -4,12 +4,10 @@
#include "Message.h"
#include "TabId.h"
class MessageDeactivateEdge
: public Message<MessageDeactivateEdge>
class MessageDeactivateEdge: public Message<MessageDeactivateEdge>
{
public:
MessageDeactivateEdge(bool scrollToDefinition)
: scrollToDefinition(scrollToDefinition)
MessageDeactivateEdge(bool scrollToDefinition): scrollToDefinition(scrollToDefinition)
{
setSchedulerId(TabId::currentTab());
}
@@ -22,4 +20,4 @@ public:
bool scrollToDefinition;
};
#endif // MESSAGE_DEACTIVATE_EDGE_H
#endif // MESSAGE_DEACTIVATE_EDGE_H
@@ -5,14 +5,11 @@
#include "TabId.h"
#include "types.h"
class MessageGraphNodeBundleSplit
: public Message<MessageGraphNodeBundleSplit>
class MessageGraphNodeBundleSplit: public Message<MessageGraphNodeBundleSplit>
{
public:
MessageGraphNodeBundleSplit(Id bundleId, bool removeOtherNodes = false, bool layoutToList = false)
: bundleId(bundleId)
, removeOtherNodes(removeOtherNodes)
, layoutToList(layoutToList)
: bundleId(bundleId), removeOtherNodes(removeOtherNodes), layoutToList(layoutToList)
{
setSchedulerId(TabId::currentTab());
}
@@ -32,4 +29,4 @@ public:
bool layoutToList;
};
#endif // MESSAGE_GRAPH_NODE_BUNDLE_SPLIT_H
#endif // MESSAGE_GRAPH_NODE_BUNDLE_SPLIT_H
@@ -2,17 +2,14 @@
#define MESSAGE_GRAPH_NODE_EXPAND_H
#include "Message.h"
#include "types.h"
#include "TabId.h"
#include "types.h"
class MessageGraphNodeExpand
: public Message<MessageGraphNodeExpand>
class MessageGraphNodeExpand: public Message<MessageGraphNodeExpand>
{
public:
MessageGraphNodeExpand(Id tokenId, bool expand, bool ignoreIfNotReplayed = false)
: tokenId(tokenId)
, expand(expand)
, ignoreIfNotReplayed(ignoreIfNotReplayed)
: tokenId(tokenId), expand(expand), ignoreIfNotReplayed(ignoreIfNotReplayed)
{
setSchedulerId(TabId::currentTab());
}
@@ -40,4 +37,4 @@ public:
const bool ignoreIfNotReplayed;
};
#endif // MESSAGE_GRAPH_NODE_EXPAND_H
#endif // MESSAGE_GRAPH_NODE_EXPAND_H
@@ -5,12 +5,10 @@
#include "TabId.h"
#include "types.h"
class MessageGraphNodeHide
: public Message<MessageGraphNodeHide>
class MessageGraphNodeHide: public Message<MessageGraphNodeHide>
{
public:
MessageGraphNodeHide(Id tokenId)
: tokenId(tokenId)
MessageGraphNodeHide(Id tokenId): tokenId(tokenId)
{
setSchedulerId(TabId::currentTab());
}
@@ -28,4 +26,4 @@ public:
const Id tokenId;
};
#endif // MESSAGE_GRAPH_NODE_HIDE_H
#endif // MESSAGE_GRAPH_NODE_HIDE_H
@@ -3,16 +3,13 @@
#include "Message.h"
#include "TabId.h"
#include "types.h"
#include "Vector2.h"
#include "types.h"
class MessageGraphNodeMove
: public Message<MessageGraphNodeMove>
class MessageGraphNodeMove: public Message<MessageGraphNodeMove>
{
public:
MessageGraphNodeMove(Id tokenId, const Vec2i& delta)
: tokenId(tokenId)
, delta(delta)
MessageGraphNodeMove(Id tokenId, const Vec2i& delta): tokenId(tokenId), delta(delta)
{
setSchedulerId(TabId::currentTab());
}
@@ -31,4 +28,4 @@ public:
const Vec2i delta;
};
#endif // MESSAGE_GRAPH_NODE_MOVE_H
#endif // MESSAGE_GRAPH_NODE_MOVE_H
@@ -4,13 +4,10 @@
#include "Message.h"
#include "TabId.h"
class MessageScrollGraph
: public Message<MessageScrollGraph>
class MessageScrollGraph: public Message<MessageScrollGraph>
{
public:
MessageScrollGraph(int xValue, int yValue)
: xValue(xValue)
, yValue(yValue)
MessageScrollGraph(int xValue, int yValue): xValue(xValue), yValue(yValue)
{
setIsLogged(false);
setSchedulerId(TabId::currentTab());
@@ -25,4 +22,4 @@ public:
int yValue;
};
#endif // MESSAGE_SCROLL_GRAPH_H
#endif // MESSAGE_SCROLL_GRAPH_H
@@ -4,8 +4,7 @@
#include "Message.h"
#include "TabId.h"
class MessageHistoryRedo
: public Message<MessageHistoryRedo>
class MessageHistoryRedo: public Message<MessageHistoryRedo>
{
public:
static const std::string getStaticType()
@@ -19,4 +18,4 @@ public:
}
};
#endif // MESSAGE_HISTORY_REDO_H
#endif // MESSAGE_HISTORY_REDO_H
@@ -4,8 +4,7 @@
#include "Message.h"
#include "TabId.h"
class MessageHistoryToPosition
: public Message<MessageHistoryToPosition>
class MessageHistoryToPosition: public Message<MessageHistoryToPosition>
{
public:
static const std::string getStaticType()
@@ -13,8 +12,7 @@ public:
return "MessageHistoryToPosition";
}
MessageHistoryToPosition(size_t index)
: index(index)
MessageHistoryToPosition(size_t index): index(index)
{
setSchedulerId(TabId::currentTab());
}
@@ -22,4 +20,4 @@ public:
const size_t index;
};
#endif // MESSAGE_HISTORY_TO_POSITION_H
#endif // MESSAGE_HISTORY_TO_POSITION_H
@@ -4,8 +4,7 @@
#include "Message.h"
#include "TabId.h"
class MessageHistoryUndo
: public Message<MessageHistoryUndo>
class MessageHistoryUndo: public Message<MessageHistoryUndo>
{
public:
static const std::string getStaticType()
@@ -19,4 +18,4 @@ public:
}
};
#endif // MESSAGE_HISTORY_UNDO_H
#endif // MESSAGE_HISTORY_UNDO_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageIndexingFinished
: public Message<MessageIndexingFinished>
class MessageIndexingFinished: public Message<MessageIndexingFinished>
{
public:
static const std::string getStaticType()
@@ -12,9 +11,7 @@ public:
return "MessageIndexingFinished";
}
MessageIndexingFinished()
{
}
MessageIndexingFinished() {}
};
#endif // MESSAGE_INDEXING_FINISHED_H
#endif // MESSAGE_INDEXING_FINISHED_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageIndexingInterrupted
: public Message<MessageIndexingInterrupted>
class MessageIndexingInterrupted: public Message<MessageIndexingInterrupted>
{
public:
static const std::string getStaticType()
@@ -18,4 +17,4 @@ public:
}
};
#endif // MESSAGE_INDEXING_INTERRUPTED_H
#endif // MESSAGE_INDEXING_INTERRUPTED_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageIndexingShowDialog
: public Message<MessageIndexingShowDialog>
class MessageIndexingShowDialog: public Message<MessageIndexingShowDialog>
{
public:
static const std::string getStaticType()
@@ -18,4 +17,4 @@ public:
}
};
#endif // MESSAGE_INDEXING_SHOW_DIALOG_H
#endif // MESSAGE_INDEXING_SHOW_DIALOG_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageIndexingStarted
: public Message<MessageIndexingStarted>
class MessageIndexingStarted: public Message<MessageIndexingStarted>
{
public:
static const std::string getStaticType()
@@ -12,9 +11,7 @@ public:
return "MessageIndexingStarted";
}
MessageIndexingStarted()
{
}
MessageIndexingStarted() {}
};
#endif // MESSAGE_INDEXING_STARTED_H
#endif // MESSAGE_INDEXING_STARTED_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageIndexingStatus
: public Message<MessageIndexingStatus>
class MessageIndexingStatus: public Message<MessageIndexingStatus>
{
public:
static const std::string getStaticType()
@@ -13,8 +12,7 @@ public:
}
MessageIndexingStatus(bool showProgress, size_t progressPercent = 0)
: showProgress(showProgress)
, progressPercent(progressPercent)
: showProgress(showProgress), progressPercent(progressPercent)
{
setSendAsTask(false);
}
@@ -23,4 +21,4 @@ public:
const size_t progressPercent;
};
#endif // MESSAGE_INDEXING_STATUS_H
#endif // MESSAGE_INDEXING_STATUS_H
@@ -3,12 +3,10 @@
#include "Message.h"
class MessageIDECreateCDB : public Message<MessageIDECreateCDB>
class MessageIDECreateCDB: public Message<MessageIDECreateCDB>
{
public:
MessageIDECreateCDB()
{
}
MessageIDECreateCDB() {}
static const std::string getStaticType()
{
@@ -21,4 +19,4 @@ public:
}
};
#endif // MESSAGE_IDE_CREATE_CDB_H
#endif // MESSAGE_IDE_CREATE_CDB_H
@@ -4,13 +4,11 @@
#include "FilePath.h"
#include "Message.h"
class MessageMoveIDECursor : public Message<MessageMoveIDECursor>
class MessageMoveIDECursor: public Message<MessageMoveIDECursor>
{
public:
MessageMoveIDECursor(const FilePath& filePath, const unsigned int row, const unsigned int column)
: filePath(filePath)
, row(row)
, column(column)
: filePath(filePath), row(row), column(column)
{
}
@@ -29,4 +27,4 @@ public:
const unsigned int column;
};
#endif // MESSAGE_MOVE_IDE_CURSOR_H
#endif // MESSAGE_MOVE_IDE_CURSOR_H
@@ -3,14 +3,10 @@
#include "Message.h"
class MessagePingReceived
: public Message<MessagePingReceived>
class MessagePingReceived: public Message<MessagePingReceived>
{
public:
MessagePingReceived()
: ideName(L"")
{
}
MessagePingReceived(): ideName(L"") {}
static const std::string getStaticType()
{
@@ -20,4 +16,4 @@ public:
std::wstring ideName;
};
#endif // MESSAGE_PING_RECEIVED_H
#endif // MESSAGE_PING_RECEIVED_H
@@ -3,13 +3,10 @@
#include "Message.h"
class MessagePluginPortChange
: public Message<MessagePluginPortChange>
class MessagePluginPortChange: public Message<MessagePluginPortChange>
{
public:
MessagePluginPortChange()
{
}
MessagePluginPortChange() {}
static const std::string getStaticType()
{
@@ -17,4 +14,4 @@ public:
}
};
#endif // MESSAGE_PLUGIN_PORT_CHANGE_H
#endif // MESSAGE_PLUGIN_PORT_CHANGE_H
@@ -4,12 +4,10 @@
#include "Message.h"
#include "TabId.h"
class MessageFind
: public Message<MessageFind>
class MessageFind: public Message<MessageFind>
{
public:
MessageFind(bool fulltext = false)
: findFulltext(fulltext)
MessageFind(bool fulltext = false): findFulltext(fulltext)
{
setSchedulerId(TabId::currentTab());
}
@@ -22,4 +20,4 @@ public:
bool findFulltext;
};
#endif // MESSAGE_FIND_H
#endif // MESSAGE_FIND_H
@@ -7,8 +7,7 @@
#include "SearchMatch.h"
#include "TabId.h"
class MessageSearch
: public Message<MessageSearch>
class MessageSearch: public Message<MessageSearch>
{
public:
static const std::string getStaticType()
@@ -17,8 +16,7 @@ public:
}
MessageSearch(const std::vector<SearchMatch>& matches, NodeTypeSet acceptedNodeTypes)
: acceptedNodeTypes(acceptedNodeTypes)
, m_matches(matches)
: acceptedNodeTypes(acceptedNodeTypes), m_matches(matches)
{
setSchedulerId(TabId::currentTab());
}
@@ -30,10 +28,10 @@ public:
virtual void print(std::wostream& os) const
{
for (const SearchMatch& match : m_matches)
for (const SearchMatch& match: m_matches)
{
os << " @" << match.name;
for (Id id : match.tokenIds)
for (Id id: match.tokenIds)
{
os << ' ' << id;
}
@@ -46,4 +44,4 @@ private:
const std::vector<SearchMatch> m_matches;
};
#endif // MESSAGE_SEARCH_H
#endif // MESSAGE_SEARCH_H
@@ -1,18 +1,16 @@
#ifndef MESSAGE_SEARCH_AUTOCOMPLETE_H
#define MESSAGE_SEARCH_AUTOCOMPLETE_H
#include "Message.h"
#include "Node.h"
#include "NodeTypeSet.h"
#include "Message.h"
#include "TabId.h"
class MessageSearchAutocomplete
: public Message<MessageSearchAutocomplete>
class MessageSearchAutocomplete: public Message<MessageSearchAutocomplete>
{
public:
MessageSearchAutocomplete(const std::wstring& query, NodeTypeSet acceptedNodeTypes)
: query(query)
, acceptedNodeTypes(acceptedNodeTypes)
: query(query), acceptedNodeTypes(acceptedNodeTypes)
{
setSchedulerId(TabId::currentTab());
}
@@ -41,4 +39,4 @@ public:
const NodeTypeSet acceptedNodeTypes;
};
#endif // MESSAGE_SEARCH_AUTOCOMPLETE_H
#endif // MESSAGE_SEARCH_AUTOCOMPLETE_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageTabClose
: public Message<MessageTabClose>
class MessageTabClose: public Message<MessageTabClose>
{
public:
static const std::string getStaticType()
@@ -13,4 +12,4 @@ public:
}
};
#endif // MESSAGE_TAB_CLOSE_H
#endif // MESSAGE_TAB_CLOSE_H
@@ -3,8 +3,7 @@
#include "Message.h"
class MessageTabOpen
: public Message<MessageTabOpen>
class MessageTabOpen: public Message<MessageTabOpen>
{
public:
static const std::string getStaticType()
@@ -13,4 +12,4 @@ public:
}
};
#endif // MESSAGE_TAB_OPEN_H
#endif // MESSAGE_TAB_OPEN_H
@@ -5,8 +5,7 @@
#include "Message.h"
#include "SearchMatch.h"
class MessageTabOpenWith
: public Message<MessageTabOpenWith>
class MessageTabOpenWith: public Message<MessageTabOpenWith>
{
public:
static const std::string getStaticType()
@@ -14,22 +13,11 @@ public:
return "MessageTabOpenWith";
}
MessageTabOpenWith(Id tokenId, Id locationId = 0)
: tokenId(tokenId)
, locationId(locationId)
{
}
MessageTabOpenWith(Id tokenId, Id locationId = 0): tokenId(tokenId), locationId(locationId) {}
MessageTabOpenWith(const FilePath& path, size_t line = 0)
: filePath(path)
, line(line)
{
}
MessageTabOpenWith(const FilePath& path, size_t line = 0): filePath(path), line(line) {}
MessageTabOpenWith(const SearchMatch& match)
: match(match)
{
}
MessageTabOpenWith(const SearchMatch& match): match(match) {}
MessageTabOpenWith& showNewTab(bool show)
{
@@ -48,4 +36,4 @@ public:
bool showTab = false;
};
#endif // MESSAGE_TAB_OPEN_WITH_H
#endif // MESSAGE_TAB_OPEN_WITH_H
@@ -3,14 +3,10 @@
#include "Message.h"
class MessageTabSelect
: public Message<MessageTabSelect>
class MessageTabSelect: public Message<MessageTabSelect>
{
public:
MessageTabSelect(bool next)
: next(next)
{
}
MessageTabSelect(bool next): next(next) {}
static const std::string getStaticType()
{
@@ -20,4 +16,4 @@ public:
bool next;
};
#endif // MESSAGE_TAB_SELECT_H
#endif // MESSAGE_TAB_SELECT_H
@@ -4,13 +4,11 @@
#include "Message.h"
#include "SearchMatch.h"
class MessageTabState
: public Message<MessageTabState>
class MessageTabState: public Message<MessageTabState>
{
public:
MessageTabState(Id tabId, const std::vector<SearchMatch>& searchMatches)
: tabId(tabId)
, searchMatches(searchMatches)
: tabId(tabId), searchMatches(searchMatches)
{
}
@@ -23,4 +21,4 @@ public:
const std::vector<SearchMatch> searchMatches;
};
#endif // MESSAGE_TAB_STATE_H
#endif // MESSAGE_TAB_STATE_H