ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: new signal slot syntax

Browse Source 
SLOT()/SIGNAL() -> &class::method()
This commit is contained in:
Andreas Stallinger
2017-08-01 12:35:33 +02:00
parent 8d68203727
commit 244c9af3c6
47 changed files with 242 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/view/QtBookmarkView.cpp
+2 -2
View File
@@ -53,7 +53,7 @@ void QtBookmarkView::initView()
m_createBookmarkButton->setEnabled(false);
layout->addWidget(m_createBookmarkButton);
connect(m_createBookmarkButton, SIGNAL(clicked()), this, SLOT(createBookmarkClicked()));
connect(m_createBookmarkButton, &QPushButton::clicked, this, &QtBookmarkView::createBookmarkClicked);
m_showBookmarksButton = new QPushButton();
m_showBookmarksButton->setObjectName("show_bookmark_button");
@@ -62,7 +62,7 @@ void QtBookmarkView::initView()
m_showBookmarksButton->setEnabled(false);
layout->addWidget(m_showBookmarksButton);
connect(m_showBookmarksButton, SIGNAL(clicked()), this, SLOT(showBookmarksClicked()));
connect(m_showBookmarksButton, &QPushButton::clicked, this, &QtBookmarkView::showBookmarksClicked);
setStyleSheet();
refreshStyle();
src/lib_gui/qt/view/QtDialogView.cpp
+8 -5
View File
@@ -326,8 +326,7 @@ void QtDialogView::handleMessage(MessageWindowClosed* message)
void QtDialogView::updateErrorCount(size_t errorCount, size_t fatalCount)
{
QtIndexingDialog* window = dynamic_cast<QtIndexingDialog*>(m_windowStack.getTopWindow());
if (window)
if (QtIndexingDialog* window = dynamic_cast<QtIndexingDialog*>(m_windowStack.getTopWindow()))
{
window->updateErrorCount(errorCount, fatalCount);
}
@@ -346,10 +345,14 @@ template<typename T>
window = new T(m_mainWindow);
}
connect(window, SIGNAL(canceled()), &m_windowStack, SLOT(popWindow()));
connect(window, SIGNAL(finished()), &m_windowStack, SLOT(clearWindows()));
//make sure T is a QtWindow
if (dynamic_cast<QtWindow*>(window))
{
connect(window, &QtWindow::canceled, &m_windowStack, &QtWindowStack::popWindow);
connect(window, &QtWindow::finished, &m_windowStack, &QtWindowStack::clearWindows);
m_windowStack.pushWindow(window);
m_windowStack.pushWindow(window);
}
return window;
}
src/lib_gui/qt/view/QtErrorView.cpp
+6 -1
View File
@@ -207,6 +207,11 @@ void QtErrorView::resetErrorLimit()
errorFilterChanged(0, false);
}
void QtErrorView::errorFilterChanged(int i)
{
errorFilterChanged(i, true);
}
void QtErrorView::errorFilterChanged(int i, bool showErrors)
{
m_table->selectionModel()->clearSelection();
@@ -315,7 +320,7 @@ QCheckBox* QtErrorView::createFilterCheckbox(const QString& name, bool checked,
QCheckBox* checkbox = new QCheckBox(name);
checkbox->setChecked(checked);
connect(checkbox, SIGNAL(stateChanged(int)), this, SLOT(errorFilterChanged(int)));
connect(checkbox, &QCheckBox::stateChanged, this, static_cast<void (QtErrorView::*)(int)>(&QtErrorView::errorFilterChanged));
layout->addWidget(checkbox);
layout->addSpacing(25);
src/lib_gui/qt/view/QtErrorView.h
+2 -1
View File
@@ -38,7 +38,8 @@ public:
virtual void resetErrorLimit();
private slots:
void errorFilterChanged(int i = 0, bool showErrors = true);
void errorFilterChanged(int i = 0);
void errorFilterChanged(int i, bool showErrors);
private:
enum COLUMN {
src/lib_gui/qt/view/QtGraphView.cpp
+15 -15
View File
@@ -80,15 +80,15 @@ void QtGraphView::initView()
widget->layout()->addWidget(view);
connect(view, SIGNAL(emptySpaceClicked()), this, SLOT(clickedInEmptySpace()));
connect(view, SIGNAL(characterKeyPressed(QChar)), this, SLOT(pressedCharacterKey(QChar)));
connect(view, SIGNAL(resized()), this, SLOT(resized()));
connect(view, &QtGraphicsView::emptySpaceClicked, this, &QtGraphView::clickedInEmptySpace);
connect(view, &QtGraphicsView::characterKeyPressed, this, &QtGraphView::pressedCharacterKey);
connect(view, &QtGraphicsView::resized, this, &QtGraphView::resized);
m_scrollSpeedChangeListenerHorizontal.setScrollBar(view->horizontalScrollBar());
m_scrollSpeedChangeListenerVertical.setScrollBar(view->verticalScrollBar());
connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(scrolled(int)));
connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(scrolled(int)));
connect(view->horizontalScrollBar(), &QScrollBar::valueChanged, this, &QtGraphView::scrolled);
connect(view->verticalScrollBar(), &QScrollBar::valueChanged, this, &QtGraphView::scrolled);
// trail controls
{
@@ -99,7 +99,7 @@ void QtGraphView::initView()
m_expandButton->setObjectName("expand_button");
m_expandButton->setToolTip("show depth graph controls");
m_expandButton->setGeometry(0, 0, 26, 26);
connect(m_expandButton, SIGNAL(clicked()), this, SLOT(clickedExpand()));
connect(m_expandButton, &QPushButton::clicked, this, &QtGraphView::clickedExpand);
stack->addWidget(m_expandButton);
}
@@ -111,15 +111,15 @@ void QtGraphView::initView()
m_collapseButton = new QPushButton(ui);
m_collapseButton->setObjectName("collapse_button");
m_collapseButton->setToolTip("hide depth graph controls");
connect(m_collapseButton, SIGNAL(clicked()), this, SLOT(clickedCollapse()));
connect(m_collapseButton, &QPushButton::clicked, this, &QtGraphView::clickedCollapse);
m_forwardTrailButton = new QPushButton(ui);
m_forwardTrailButton->setObjectName("trail_button");
connect(m_forwardTrailButton, SIGNAL(clicked()), this, SLOT(clickedForwardTrail()));
connect(m_forwardTrailButton, &QPushButton::clicked, this, &QtGraphView::clickedForwardTrail);
m_backwardTrailButton = new QPushButton(ui);
m_backwardTrailButton->setObjectName("trail_button");
connect(m_backwardTrailButton, SIGNAL(clicked()), this, SLOT(clickedBackwardTrail()));
connect(m_backwardTrailButton, &QPushButton::clicked, this, &QtGraphView::clickedBackwardTrail);
m_trailDepthLabel = new QLabel(ui);
m_trailDepthLabel->setObjectName("depth_label");
@@ -132,7 +132,7 @@ void QtGraphView::initView()
m_trailDepthSlider->setMinimum(1);
m_trailDepthSlider->setMaximum(26);
m_trailDepthSlider->setValue(5);
connect(m_trailDepthSlider, SIGNAL(valueChanged(int)), this, SLOT(trailDepthChanged(int)));
connect(m_trailDepthSlider, &QSlider::valueChanged, this, &QtGraphView::trailDepthChanged);
m_collapseButton->setGeometry(0, 0, 26, 20);
m_backwardTrailButton->setGeometry(0, 22, 26, 26);
@@ -1054,8 +1054,8 @@ void QtGraphView::createTransition()
remain->addAnimation(anim);
connect(anim, SIGNAL(finished()), newNode, SLOT(showNode()));
connect(anim, SIGNAL(finished()), oldNode, SLOT(hideNode()));
connect(anim, &QPropertyAnimation::finished, newNode, &QtGraphNode::showNode);
connect(anim, &QPropertyAnimation::finished, oldNode, &QtGraphNode::hideNode);
newNode->hide();
anim = new QPropertyAnimation(oldNode, "size");
@@ -1079,7 +1079,7 @@ void QtGraphView::createTransition()
if (!remainingNodes.size() || m_scrollToTop || m_restoreScroll)
{
connect(anim, SIGNAL(finished()), this, SLOT(updateScrollBars()));
connect(anim, &QPropertyAnimation::finished, this, &QtGraphView::updateScrollBars);
}
remain->addAnimation(anim);
@@ -1101,7 +1101,7 @@ void QtGraphView::createTransition()
appear->addAnimation(anim);
connect(anim, SIGNAL(finished()), node, SLOT(blendIn()));
connect(anim, &QPropertyAnimation::finished, node, &QtGraphNode::blendIn);
node->blendOut();
}
@@ -1120,7 +1120,7 @@ void QtGraphView::createTransition()
m_transition->addAnimation(appear);
}
connect(m_transition.get(), SIGNAL(finished()), this, SLOT(finishedTransition()));
connect(m_transition.get(), &QPropertyAnimation::finished, this, &QtGraphView::finishedTransition);
m_transition->start();
}