AutoTest: De-slot and complete Qt5-style connects

Change-Id: I013b42523f163e123a0cee85f9d232815ad284e3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-06-28 22:38:54 +03:00
committed by Orgad Shaneh
parent b1a1e169a6
commit 943c76f4ab
7 changed files with 9 additions and 22 deletions

View File

@@ -143,7 +143,7 @@ void TestCodeParser::emitUpdateTestTree()
qCDebug(LOG) << "adding singleShot"; qCDebug(LOG) << "adding singleShot";
m_singleShotScheduled = true; m_singleShotScheduled = true;
QTimer::singleShot(1000, this, SLOT(updateTestTree())); QTimer::singleShot(1000, this, &TestCodeParser::updateTestTree);
} }
void TestCodeParser::updateTestTree() void TestCodeParser::updateTestTree()

View File

@@ -70,7 +70,7 @@ signals:
void parsingFinished(); void parsingFinished();
void parsingFailed(); void parsingFailed();
public slots: public:
void emitUpdateTestTree(); void emitUpdateTestTree();
void updateTestTree(); void updateTestTree();
void onCppDocumentUpdated(const CPlusPlus::Document::Ptr &document); void onCppDocumentUpdated(const CPlusPlus::Document::Ptr &document);

View File

@@ -65,16 +65,12 @@ public:
signals: signals:
public slots: private:
private slots:
void onItemActivated(const QModelIndex &index); void onItemActivated(const QModelIndex &index);
void onSortClicked(); void onSortClicked();
void onFilterMenuTriggered(QAction *action); void onFilterMenuTriggered(QAction *action);
void onParsingStarted(); void onParsingStarted();
void onParsingFinished(); void onParsingFinished();
private:
void initializeFilterMenu(); void initializeFilterMenu();
void onRunThisTestTriggered(TestRunner::Mode runMode); void onRunThisTestTriggered(TestRunner::Mode runMode);

View File

@@ -41,8 +41,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
public slots:
void currentChanged(const QModelIndex &current, const QModelIndex &previous); void currentChanged(const QModelIndex &current, const QModelIndex &previous);
private: private:

View File

@@ -87,20 +87,17 @@ public:
void goToNext(); void goToNext();
void goToPrev(); void goToPrev();
signals:
public slots:
void addTestResult(const TestResultPtr &result); void addTestResult(const TestResultPtr &result);
private slots: private:
explicit TestResultsPane(QObject *parent = 0);
void onItemActivated(const QModelIndex &index); void onItemActivated(const QModelIndex &index);
void onRunAllTriggered(); void onRunAllTriggered();
void onRunSelectedTriggered(); void onRunSelectedTriggered();
void enableAllFilter(); void enableAllFilter();
void filterMenuTriggered(QAction *action); void filterMenuTriggered(QAction *action);
private:
explicit TestResultsPane(QObject *parent = 0);
void initializeFilterMenu(); void initializeFilterMenu();
void updateSummaryLabel(); void updateSummaryLabel();
void createToolButtons(); void createToolButtons();

View File

@@ -56,21 +56,19 @@ public:
void setSelectedTests(const QList<TestConfiguration *> &selected); void setSelectedTests(const QList<TestConfiguration *> &selected);
bool isTestRunning() const { return m_executingTests; } bool isTestRunning() const { return m_executingTests; }
void prepareToRunTests(Mode mode);
signals: signals:
void testRunStarted(); void testRunStarted();
void testRunFinished(); void testRunFinished();
void requestStopTestRun(); void requestStopTestRun();
void testResultReady(const TestResultPtr &result); void testResultReady(const TestResultPtr &result);
public slots: private:
void prepareToRunTests(Mode mode);
private slots:
void buildProject(ProjectExplorer::Project *project); void buildProject(ProjectExplorer::Project *project);
void buildFinished(bool success); void buildFinished(bool success);
void onFinished(); void onFinished();
private:
void runTests(); void runTests();
void debugTests(); void debugTests();
void runOrDebugTests(); void runOrDebugTests();

View File

@@ -83,8 +83,6 @@ signals:
void sweepingDone(); void sweepingDone();
#endif #endif
public slots:
private: private:
void onParseResultReady(const TestParseResultPtr result); void onParseResultReady(const TestParseResultPtr result);
void handleParseResult(const TestParseResult *result, TestTreeItem *rootNode); void handleParseResult(const TestParseResult *result, TestTreeItem *rootNode);