diff options
-rw-r--r-- | src/plugins/autotest/testcodeparser.cpp | 2 | ||||
-rw-r--r-- | src/plugins/autotest/testcodeparser.h | 2 | ||||
-rw-r--r-- | src/plugins/autotest/testnavigationwidget.h | 6 | ||||
-rw-r--r-- | src/plugins/autotest/testresultdelegate.h | 2 | ||||
-rw-r--r-- | src/plugins/autotest/testresultspane.h | 9 | ||||
-rw-r--r-- | src/plugins/autotest/testrunner.h | 8 | ||||
-rw-r--r-- | src/plugins/autotest/testtreemodel.h | 2 |
7 files changed, 9 insertions, 22 deletions
diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index 857c16b25f3..7e6e0b3c3c4 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -143,7 +143,7 @@ void TestCodeParser::emitUpdateTestTree() qCDebug(LOG) << "adding singleShot"; m_singleShotScheduled = true; - QTimer::singleShot(1000, this, SLOT(updateTestTree())); + QTimer::singleShot(1000, this, &TestCodeParser::updateTestTree); } void TestCodeParser::updateTestTree() diff --git a/src/plugins/autotest/testcodeparser.h b/src/plugins/autotest/testcodeparser.h index 9bb1480b0a7..19b58dfa468 100644 --- a/src/plugins/autotest/testcodeparser.h +++ b/src/plugins/autotest/testcodeparser.h @@ -70,7 +70,7 @@ signals: void parsingFinished(); void parsingFailed(); -public slots: +public: void emitUpdateTestTree(); void updateTestTree(); void onCppDocumentUpdated(const CPlusPlus::Document::Ptr &document); diff --git a/src/plugins/autotest/testnavigationwidget.h b/src/plugins/autotest/testnavigationwidget.h index d64bf661e95..b52eeb941a1 100644 --- a/src/plugins/autotest/testnavigationwidget.h +++ b/src/plugins/autotest/testnavigationwidget.h @@ -65,16 +65,12 @@ public: signals: -public slots: - -private slots: +private: void onItemActivated(const QModelIndex &index); void onSortClicked(); void onFilterMenuTriggered(QAction *action); void onParsingStarted(); void onParsingFinished(); - -private: void initializeFilterMenu(); void onRunThisTestTriggered(TestRunner::Mode runMode); diff --git a/src/plugins/autotest/testresultdelegate.h b/src/plugins/autotest/testresultdelegate.h index c01c156f10a..5d1c713ff01 100644 --- a/src/plugins/autotest/testresultdelegate.h +++ b/src/plugins/autotest/testresultdelegate.h @@ -41,8 +41,6 @@ public: void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; - -public slots: void currentChanged(const QModelIndex ¤t, const QModelIndex &previous); private: diff --git a/src/plugins/autotest/testresultspane.h b/src/plugins/autotest/testresultspane.h index 4955783f894..a226e8df44d 100644 --- a/src/plugins/autotest/testresultspane.h +++ b/src/plugins/autotest/testresultspane.h @@ -87,20 +87,17 @@ public: void goToNext(); void goToPrev(); -signals: - -public slots: void addTestResult(const TestResultPtr &result); -private slots: +private: + explicit TestResultsPane(QObject *parent = 0); + void onItemActivated(const QModelIndex &index); void onRunAllTriggered(); void onRunSelectedTriggered(); void enableAllFilter(); void filterMenuTriggered(QAction *action); -private: - explicit TestResultsPane(QObject *parent = 0); void initializeFilterMenu(); void updateSummaryLabel(); void createToolButtons(); diff --git a/src/plugins/autotest/testrunner.h b/src/plugins/autotest/testrunner.h index b79840b2653..2e3621b29d0 100644 --- a/src/plugins/autotest/testrunner.h +++ b/src/plugins/autotest/testrunner.h @@ -56,21 +56,19 @@ public: void setSelectedTests(const QList<TestConfiguration *> &selected); bool isTestRunning() const { return m_executingTests; } + void prepareToRunTests(Mode mode); + signals: void testRunStarted(); void testRunFinished(); void requestStopTestRun(); void testResultReady(const TestResultPtr &result); -public slots: - void prepareToRunTests(Mode mode); - -private slots: +private: void buildProject(ProjectExplorer::Project *project); void buildFinished(bool success); void onFinished(); -private: void runTests(); void debugTests(); void runOrDebugTests(); diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h index d2c3467ce32..71291019375 100644 --- a/src/plugins/autotest/testtreemodel.h +++ b/src/plugins/autotest/testtreemodel.h @@ -83,8 +83,6 @@ signals: void sweepingDone(); #endif -public slots: - private: void onParseResultReady(const TestParseResultPtr result); void handleParseResult(const TestParseResult *result, TestTreeItem *rootNode); |