feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/coreplugin/find/highlightscrollbarcontroller.h
View File

@@ -30,7 +30,8 @@
#include <QVector>
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <utils/id.h>
#include <utils/theme/theme.h>
QT_BEGIN_NAMESPACE
@@ -50,10 +51,10 @@ struct CORE_EXPORT Highlight
HighestPriority = 3
};
Highlight(Id category, int position, Utils::Theme::Color color, Priority priority);
Highlight(Utils::Id category, int position, Utils::Theme::Color color, Priority priority);
Highlight() = default;
Id category;
Utils::Id category;
int position = -1;
Utils::Theme::Color color = Utils::Theme::TextColorNormal;
Priority priority = Invalid;
@@ -80,14 +81,14 @@ public:
double margin() const;
void setMargin(double margin);
QHash<Id, QVector<Highlight>> highlights() const;
QHash<Utils::Id, QVector<Highlight>> highlights() const;
void addHighlight(Highlight highlight);
void removeHighlights(Id id);
void removeHighlights(Utils::Id id);
void removeAllHighlights();
private:
QHash<Id, QVector<Highlight> > m_highlights;
QHash<Utils::Id, QVector<Highlight> > m_highlights;
double m_lineHeight = 0.0;
double m_visibleRange = 0.0; // in pixels
double m_margin = 0.0; // in pixels