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

Valgrind: Proactively shut up sanity bot

Browse Source 
It complains about alledgedly wrong spelling of "Visualisation"
in unrelated patches.

Change-Id: I047f2be4b534a7d01d8c0bc39ff22b615d2c0467
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-08-01 12:15:04 +02:00
parent 7afd05476c
commit 83024557d6
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -185,7 +185,7 @@ public:
std::unique_ptr<CostView> m_flatView; std::unique_ptr<CostView> m_flatView;
std::unique_ptr<CostView> m_callersView; std::unique_ptr<CostView> m_callersView;
std::unique_ptr<CostView> m_calleesView; std::unique_ptr<CostView> m_calleesView;
std::unique_ptr<Visualisation> m_visualization; std::unique_ptr<Visualization> m_visualization;
// Navigation // Navigation
QAction *m_goBack = nullptr; QAction *m_goBack = nullptr;
@@ -307,12 +307,12 @@ CallgrindTool::CallgrindTool()
// //
// DockWidgets // DockWidgets
// //
m_visualization = std::make_unique<Visualisation>(); m_visualization = std::make_unique<Visualization>();
m_visualization->setFrameStyle(QFrame::NoFrame); m_visualization->setFrameStyle(QFrame::NoFrame);
m_visualization->setObjectName(QLatin1String("Valgrind.CallgrindTool.Visualisation")); m_visualization->setObjectName(QLatin1String("Valgrind.CallgrindTool.Visualisation"));
m_visualization->setWindowTitle(tr("Visualization")); m_visualization->setWindowTitle(tr("Visualization"));
m_visualization->setModel(&m_dataModel); m_visualization->setModel(&m_dataModel);
connect(m_visualization.get(), &Visualisation::functionActivated, connect(m_visualization.get(), &Visualization::functionActivated,
this, &CallgrindTool::visualisationFunctionSelected); this, &CallgrindTool::visualisationFunctionSelected);
m_callersView = std::make_unique<CostView>(); m_callersView = std::make_unique<CostView>();

62
src/plugins/valgrind/callgrindvisualisation.cpp
View File

@@ -204,21 +204,21 @@ void FunctionGraphicsItem::paint(QPainter *painter,
painter->restore(); painter->restore();
} }
class Visualisation::Private class Visualization::Private
{ {
public: public:
Private(Visualisation *qq); Private(Visualization *qq);
void handleMousePressEvent(QMouseEvent *event, bool doubleClicked); void handleMousePressEvent(QMouseEvent *event, bool doubleClicked);
qreal sceneHeight() const; qreal sceneHeight() const;
qreal sceneWidth() const; qreal sceneWidth() const;
Visualisation *q; Visualization *q;
DataProxyModel *m_model; DataProxyModel *m_model;
QGraphicsScene m_scene; QGraphicsScene m_scene;
}; };
Visualisation::Private::Private(Visualisation *qq) Visualization::Private::Private(Visualization *qq)
: q(qq) : q(qq)
, m_model(new DataProxyModel(qq)) , m_model(new DataProxyModel(qq))
{ {
@@ -230,10 +230,10 @@ Visualisation::Private::Private(Visualisation *qq)
// setup model // setup model
m_model->setMinimumInclusiveCostRatio(0.1); m_model->setMinimumInclusiveCostRatio(0.1);
connect(m_model, &DataProxyModel::filterFunctionChanged, connect(m_model, &DataProxyModel::filterFunctionChanged,
qq, &Visualisation::populateScene); qq, &Visualization::populateScene);
} }
void Visualisation::Private::handleMousePressEvent(QMouseEvent *event, void Visualization::Private::handleMousePressEvent(QMouseEvent *event,
bool doubleClicked) bool doubleClicked)
{ {
// find the first item that accepts mouse presses under the cursor position // find the first item that accepts mouse presses under the cursor position
@@ -261,18 +261,18 @@ void Visualisation::Private::handleMousePressEvent(QMouseEvent *event,
} }
qreal Visualisation::Private::sceneHeight() const qreal Visualization::Private::sceneHeight() const
{ {
return m_scene.height() - FIT_IN_VIEW_MARGIN; return m_scene.height() - FIT_IN_VIEW_MARGIN;
} }
qreal Visualisation::Private::sceneWidth() const qreal Visualization::Private::sceneWidth() const
{ {
// Magic number to improve margins appearance // Magic number to improve margins appearance
return m_scene.width() + 1; return m_scene.width() + 1;
} }
Visualisation::Visualisation(QWidget *parent) Visualization::Visualization(QWidget *parent)
: QGraphicsView(parent) : QGraphicsView(parent)
, d(new Private(this)) , d(new Private(this))
{ {
@@ -281,17 +281,17 @@ Visualisation::Visualisation(QWidget *parent)
setRenderHint(QPainter::Antialiasing); setRenderHint(QPainter::Antialiasing);
} }
Visualisation::~Visualisation() Visualization::~Visualization()
{ {
delete d; delete d;
} }
const Function *Visualisation::functionForItem(QGraphicsItem *item) const const Function *Visualization::functionForItem(QGraphicsItem *item) const
{ {
return item->data(FunctionGraphicsItem::FunctionCallKey).value<const Function *>(); return item->data(FunctionGraphicsItem::FunctionCallKey).value<const Function *>();
} }
QGraphicsItem *Visualisation::itemForFunction(const Function *function) const QGraphicsItem *Visualization::itemForFunction(const Function *function) const
{ {
foreach (QGraphicsItem *item, items()) { foreach (QGraphicsItem *item, items()) {
if (functionForItem(item) == function) if (functionForItem(item) == function)
@@ -300,49 +300,49 @@ QGraphicsItem *Visualisation::itemForFunction(const Function *function) const
return 0; return 0;
} }
void Visualisation::setFunction(const Function *function) void Visualization::setFunction(const Function *function)
{ {
d->m_model->setFilterFunction(function); d->m_model->setFilterFunction(function);
} }
const Function *Visualisation::function() const const Function *Visualization::function() const
{ {
return d->m_model->filterFunction(); return d->m_model->filterFunction();
} }
void Visualisation::setMinimumInclusiveCostRatio(double ratio) void Visualization::setMinimumInclusiveCostRatio(double ratio)
{ {
d->m_model->setMinimumInclusiveCostRatio(ratio); d->m_model->setMinimumInclusiveCostRatio(ratio);
} }
void Visualisation::setModel(QAbstractItemModel *model) void Visualization::setModel(QAbstractItemModel *model)
{ {
QTC_ASSERT(!d->m_model->sourceModel() && model, return); // only set once! QTC_ASSERT(!d->m_model->sourceModel() && model, return); // only set once!
d->m_model->setSourceModel(model); d->m_model->setSourceModel(model);
connect(model, &QAbstractItemModel::columnsInserted, connect(model, &QAbstractItemModel::columnsInserted,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::columnsMoved, connect(model, &QAbstractItemModel::columnsMoved,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::columnsRemoved, connect(model, &QAbstractItemModel::columnsRemoved,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::dataChanged, connect(model, &QAbstractItemModel::dataChanged,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::headerDataChanged, connect(model, &QAbstractItemModel::headerDataChanged,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::layoutChanged, this, &Visualisation::populateScene); connect(model, &QAbstractItemModel::layoutChanged, this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::modelReset, this, &Visualisation::populateScene); connect(model, &QAbstractItemModel::modelReset, this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::rowsInserted, connect(model, &QAbstractItemModel::rowsInserted,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::rowsMoved, connect(model, &QAbstractItemModel::rowsMoved,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
connect(model, &QAbstractItemModel::rowsRemoved, connect(model, &QAbstractItemModel::rowsRemoved,
this, &Visualisation::populateScene); this, &Visualization::populateScene);
populateScene(); populateScene();
} }
void Visualisation::setText(const QString &message) void Visualization::setText(const QString &message)
{ {
d->m_scene.clear(); d->m_scene.clear();
@@ -353,7 +353,7 @@ void Visualisation::setText(const QString &message)
textItem->setFlag(QGraphicsItem::ItemIgnoresTransformations); textItem->setFlag(QGraphicsItem::ItemIgnoresTransformations);
} }
void Visualisation::populateScene() void Visualization::populateScene()
{ {
// reset scene first // reset scene first
d->m_scene.clear(); d->m_scene.clear();
@@ -419,21 +419,21 @@ void Visualisation::populateScene()
} }
} }
void Visualisation::mousePressEvent(QMouseEvent *event) void Visualization::mousePressEvent(QMouseEvent *event)
{ {
d->handleMousePressEvent(event, false); d->handleMousePressEvent(event, false);
QGraphicsView::mousePressEvent(event); QGraphicsView::mousePressEvent(event);
} }
void Visualisation::mouseDoubleClickEvent(QMouseEvent *event) void Visualization::mouseDoubleClickEvent(QMouseEvent *event)
{ {
d->handleMousePressEvent(event, true); d->handleMousePressEvent(event, true);
QGraphicsView::mouseDoubleClickEvent(event); QGraphicsView::mouseDoubleClickEvent(event);
} }
void Visualisation::resizeEvent(QResizeEvent *event) void Visualization::resizeEvent(QResizeEvent *event)
{ {
fitInView(sceneRect()); fitInView(sceneRect());

6
src/plugins/valgrind/callgrindvisualisation.h
View File

@@ -38,13 +38,13 @@ namespace Callgrind { class Function; }
namespace Valgrind { namespace Valgrind {
namespace Internal { namespace Internal {
class Visualisation : public QGraphicsView class Visualization : public QGraphicsView
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit Visualisation(QWidget *parent = 0); explicit Visualization(QWidget *parent = 0);
virtual ~Visualisation(); virtual ~Visualization();
void setModel(QAbstractItemModel *model); void setModel(QAbstractItemModel *model);