From 485fa9c888f6ff34c80e50b879c0e161059d422f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 19 Mar 2017 20:10:35 +0200 Subject: [PATCH] Valgrind: De-slot Change-Id: Id72d2463201107ae53d8be3d0f3ac30ec88530a4 Reviewed-by: hjk --- src/plugins/valgrind/callgrind/callgrindcontroller.h | 6 ++---- src/plugins/valgrind/callgrind/callgrinddatamodel.h | 1 - src/plugins/valgrind/callgrind/callgrindparser.h | 4 +--- src/plugins/valgrind/callgrind/callgrindproxymodel.h | 3 +-- src/plugins/valgrind/callgrind/callgrindstackbrowser.h | 1 - src/plugins/valgrind/callgrindengine.h | 1 - src/plugins/valgrind/callgrindvisualisation.h | 5 +---- src/plugins/valgrind/memcheck/memcheckrunner.h | 3 +-- src/plugins/valgrind/memcheckerrorview.h | 6 +----- src/plugins/valgrind/suppressiondialog.h | 4 +--- src/plugins/valgrind/valgrindconfigwidget.h | 4 +--- src/plugins/valgrind/valgrindmemcheckparsertest.h | 3 +-- src/plugins/valgrind/valgrindrunner.h | 6 ++---- src/plugins/valgrind/valgrindsettings.h | 4 ---- src/plugins/valgrind/xmlprotocol/parser.h | 4 +--- src/plugins/valgrind/xmlprotocol/stackmodel.h | 2 -- src/plugins/valgrind/xmlprotocol/threadedparser.h | 5 ++--- 17 files changed, 15 insertions(+), 47 deletions(-) diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.h b/src/plugins/valgrind/callgrind/callgrindcontroller.h index 373b4c87a0a..a1e06fe4456 100644 --- a/src/plugins/valgrind/callgrind/callgrindcontroller.h +++ b/src/plugins/valgrind/callgrind/callgrindcontroller.h @@ -68,22 +68,20 @@ public: */ void getLocalDataFile(); -Q_SIGNALS: +signals: void finished(Valgrind::Callgrind::CallgrindController::Option option); void localParseDataAvailable(const QString &file); void statusMessage(const QString &msg); -private Q_SLOTS: +private: void processError(QProcess::ProcessError); void processFinished(int, QProcess::ExitStatus); void foundRemoteFile(); void sftpInitialized(); void sftpJobFinished(QSsh::SftpJobId job, const QString &error); - -private: void cleanupTempFile(); // callgrind_control process diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.h b/src/plugins/valgrind/callgrind/callgrinddatamodel.h index 3daaf77d396..b1df49d9177 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.h +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.h @@ -78,7 +78,6 @@ public: FileNameRole }; -public slots: /// enable/disable cycle detection void enableCycleDetection(bool enabled); void setShortenTemplates(bool enabled); diff --git a/src/plugins/valgrind/callgrind/callgrindparser.h b/src/plugins/valgrind/callgrind/callgrindparser.h index 2b36da5e4c0..76f1430a2e0 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.h +++ b/src/plugins/valgrind/callgrind/callgrindparser.h @@ -56,13 +56,11 @@ public: // get and take ownership of the parsing results. If this function is not called the repository // will be destroyed when the parser is destroyed. Subsequent calls return null. ParseData *takeData(); + void parse(QIODevice *stream); signals: void parserDataReady(); -public Q_SLOTS: - void parse(QIODevice *stream); - private: class Private; Private *const d; diff --git a/src/plugins/valgrind/callgrind/callgrindproxymodel.h b/src/plugins/valgrind/callgrind/callgrindproxymodel.h index d8f17d883f3..12a5213a277 100644 --- a/src/plugins/valgrind/callgrind/callgrindproxymodel.h +++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.h @@ -49,7 +49,6 @@ public: /// Only functions with an inclusive cost ratio above this minimum will be shown in the model double minimumInclusiveCostRatio() const { return m_minimumInclusiveCostRatio; } -public Q_SLOTS: /// This will filter out all entries that are not located within \param baseDir void setFilterBaseDir(const QString& baseDir); void setFilterFunction(const Function *call); @@ -59,7 +58,7 @@ public Q_SLOTS: /// by this model. If @c 0 is passed as argument, all rows will be shown. void setMinimumInclusiveCostRatio(double minimumInclusiveCost); -Q_SIGNALS: +signals: void filterFunctionChanged(const Function *previous, const Function *current); void filterMaximumRowsChanged(int rows); diff --git a/src/plugins/valgrind/callgrind/callgrindstackbrowser.h b/src/plugins/valgrind/callgrind/callgrindstackbrowser.h index 35f91bc5ca7..b886b90d145 100644 --- a/src/plugins/valgrind/callgrind/callgrindstackbrowser.h +++ b/src/plugins/valgrind/callgrind/callgrindstackbrowser.h @@ -46,7 +46,6 @@ public: bool hasPrevious() const { return !m_stack.isEmpty(); } bool hasNext() const { return !m_redoStack.isEmpty(); } -public slots: void goBack(); void goNext(); diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h index a9aa3ab47a3..352c7bf3059 100644 --- a/src/plugins/valgrind/callgrindengine.h +++ b/src/plugins/valgrind/callgrindengine.h @@ -44,7 +44,6 @@ public: Valgrind::Callgrind::ParseData *takeParserData(); -public slots: /// controller actions void dump(); void reset(); diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h index ee920b74701..cbb38ca6e51 100644 --- a/src/plugins/valgrind/callgrindvisualisation.h +++ b/src/plugins/valgrind/callgrindvisualisation.h @@ -57,17 +57,14 @@ public: void setMinimumInclusiveCostRatio(double ratio); -public slots: void setText(const QString &message); signals: void functionActivated(const Valgrind::Callgrind::Function *); void functionSelected(const Valgrind::Callgrind::Function *); -protected slots: - void populateScene(); - protected: + void populateScene(); void mousePressEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event); void resizeEvent(QResizeEvent *event); diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.h b/src/plugins/valgrind/memcheck/memcheckrunner.h index 58f55f904f6..de8cecf5380 100644 --- a/src/plugins/valgrind/memcheck/memcheckrunner.h +++ b/src/plugins/valgrind/memcheck/memcheckrunner.h @@ -51,14 +51,13 @@ public: signals: void logMessageReceived(const QByteArray &); -private slots: +private: void localHostAddressRetrieved(const QHostAddress &localHostAddress); void xmlSocketConnected(); void logSocketConnected(); void readLogSocket(); -private: QString tool() const; bool startServers(const QHostAddress &localHostAddress); diff --git a/src/plugins/valgrind/memcheckerrorview.h b/src/plugins/valgrind/memcheckerrorview.h index 244f7df1577..2cc44392683 100644 --- a/src/plugins/valgrind/memcheckerrorview.h +++ b/src/plugins/valgrind/memcheckerrorview.h @@ -46,14 +46,10 @@ public: void setDefaultSuppressionFile(const QString &suppFile); QString defaultSuppressionFile() const; ValgrindBaseSettings *settings() const { return m_settings; } - -public slots: void settingsChanged(ValgrindBaseSettings *settings); -private slots: - void suppressError(); - private: + void suppressError(); QList customActions() const override; QAction *m_suppressAction; diff --git a/src/plugins/valgrind/suppressiondialog.h b/src/plugins/valgrind/suppressiondialog.h index 70a5ee7ff22..5b1a91720c2 100644 --- a/src/plugins/valgrind/suppressiondialog.h +++ b/src/plugins/valgrind/suppressiondialog.h @@ -52,10 +52,8 @@ public: const QList &errors); static void maybeShow(MemcheckErrorView *view); -private slots: - void validate(); - private: + void validate(); void accept(); void reject(); diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h index 5f31a28d4ee..c37d5c04c1a 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.h +++ b/src/plugins/valgrind/valgrindconfigwidget.h @@ -50,17 +50,15 @@ public: void setSuppressions(const QStringList &files); QStringList suppressions() const; -public Q_SLOTS: void slotAddSuppression(); void slotRemoveSuppression(); void slotSuppressionsRemoved(const QStringList &files); void slotSuppressionsAdded(const QStringList &files); void slotSuppressionSelectionChanged(); -private slots: +private: void updateUi(); -private: ValgrindBaseSettings *m_settings; Ui::ValgrindConfigWidget *m_ui; QStandardItemModel *m_model; diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.h b/src/plugins/valgrind/valgrindmemcheckparsertest.h index 7f51f61ce46..b431047ed03 100644 --- a/src/plugins/valgrind/valgrindmemcheckparsertest.h +++ b/src/plugins/valgrind/valgrindmemcheckparsertest.h @@ -69,7 +69,7 @@ public: QVector > errorcounts; QVector > suppcounts; -public Q_SLOTS: +public: void error(const Valgrind::XmlProtocol::Error &err) { errors.append(err); @@ -108,7 +108,6 @@ public: this, &RunnerDumper::processErrorReceived); } -public slots: void error(const Valgrind::XmlProtocol::Error &e) { qDebug() << "error received"; diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h index 97c3f8703f6..97ead3f8867 100644 --- a/src/plugins/valgrind/valgrindrunner.h +++ b/src/plugins/valgrind/valgrindrunner.h @@ -67,16 +67,14 @@ public: ValgrindProcess *valgrindProcess() const; -protected: - virtual QString tool() const = 0; - signals: void processOutputReceived(const QString &, Utils::OutputFormat); void processErrorReceived(const QString &, QProcess::ProcessError); void started(); void finished(); -protected slots: +protected: + virtual QString tool() const = 0; virtual void processError(QProcess::ProcessError); virtual void processFinished(int, QProcess::ExitStatus); virtual void localHostAddressRetrieved(const QHostAddress &localHostAddress); diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h index 252b8191346..b0d62e83172 100644 --- a/src/plugins/valgrind/valgrindsettings.h +++ b/src/plugins/valgrind/valgrindsettings.h @@ -74,7 +74,6 @@ public: QString valgrindExecutable() const; SelfModifyingCodeDetection selfModifyingCodeDetection() const; -public slots: void setValgrindExecutable(const QString &); void setSelfModifyingCodeDetection(int); @@ -102,7 +101,6 @@ public: virtual void addSuppressionFiles(const QStringList &) = 0; virtual void removeSuppressionFiles(const QStringList &) = 0; -public slots: void setNumCallers(int); void setLeakCheckOnFinish(int); void setShowReachable(bool); @@ -144,7 +142,6 @@ public: /// \return Minimum cost ratio, range [0.0..100.0] double visualisationMinimumInclusiveCostRatio() const { return m_visualisationMinimumInclusiveCostRatio; } -public slots: void setEnableCacheSim(bool enable); void setEnableBranchSim(bool enable); void setCollectSystime(bool collect); @@ -226,7 +223,6 @@ public: bool detectCycles() const; bool shortenTemplates() const; -public slots: void setCostFormat(Valgrind::Internal::CostDelegate::CostFormat format); void setDetectCycles(bool on); void setShortenTemplates(bool on); diff --git a/src/plugins/valgrind/xmlprotocol/parser.h b/src/plugins/valgrind/xmlprotocol/parser.h index 4ed7d820289..6bc9f1fac0a 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.h +++ b/src/plugins/valgrind/xmlprotocol/parser.h @@ -58,11 +58,9 @@ public: ~Parser(); QString errorString() const; - -public Q_SLOTS: void parse(QIODevice *stream); -Q_SIGNALS: +signals: void status(const Valgrind::XmlProtocol::Status &status); void error(const Valgrind::XmlProtocol::Error &error); void internalError(const QString &errorString); diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.h b/src/plugins/valgrind/xmlprotocol/stackmodel.h index a948b13bdcb..6bcd4b1075e 100644 --- a/src/plugins/valgrind/xmlprotocol/stackmodel.h +++ b/src/plugins/valgrind/xmlprotocol/stackmodel.h @@ -67,8 +67,6 @@ public: int columnCount(const QModelIndex &parent = QModelIndex()) const; void clear(); - -public Q_SLOTS: void setError(const Valgrind::XmlProtocol::Error &error); private: diff --git a/src/plugins/valgrind/xmlprotocol/threadedparser.h b/src/plugins/valgrind/xmlprotocol/threadedparser.h index 5e749494743..339255d7ad2 100644 --- a/src/plugins/valgrind/xmlprotocol/threadedparser.h +++ b/src/plugins/valgrind/xmlprotocol/threadedparser.h @@ -56,14 +56,13 @@ public: bool waitForFinished(); bool isRunning() const; -public Q_SLOTS: ///@warning will move @p stream to a different thread and take ownership of it void parse(QIODevice *stream); -private Q_SLOTS: +private: void slotInternalError(const QString &errorString); -Q_SIGNALS: +signals: void status(const Valgrind::XmlProtocol::Status &status); void error(const Valgrind::XmlProtocol::Error &error); void internalError(const QString &errorString);