forked from qt-creator/qt-creator
Git: Un-slot private slots
Change-Id: If88d7e1b501daf6f0dfc696cb20e5f1eb4aa83fe Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
74849134f4
commit
1b9b1541d3
@@ -49,10 +49,9 @@ public:
|
|||||||
|
|
||||||
bool track();
|
bool track();
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void updateButtonStatus();
|
void updateButtonStatus();
|
||||||
|
|
||||||
private:
|
|
||||||
Ui::BranchAddDialog *m_ui;
|
Ui::BranchAddDialog *m_ui;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -53,10 +53,9 @@ public:
|
|||||||
bool hasStashForNextBranch();
|
bool hasStashForNextBranch();
|
||||||
bool hasLocalChanges();
|
bool hasLocalChanges();
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void updatePopStashCheckBox(bool moveChangesChecked);
|
void updatePopStashCheckBox(bool moveChangesChecked);
|
||||||
|
|
||||||
private:
|
|
||||||
Ui::BranchCheckoutDialog *m_ui;
|
Ui::BranchCheckoutDialog *m_ui;
|
||||||
bool m_foundStashForNextBranch;
|
bool m_foundStashForNextBranch;
|
||||||
bool m_hasLocalChanges;
|
bool m_hasLocalChanges;
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ public:
|
|||||||
QString workingDirectory() const;
|
QString workingDirectory() const;
|
||||||
ChangeCommand command() const;
|
ChangeCommand command() const;
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void chooseWorkingDirectory();
|
void chooseWorkingDirectory();
|
||||||
void selectCommitFromRecentHistory();
|
void selectCommitFromRecentHistory();
|
||||||
void setDetails(int exitCode);
|
void setDetails(int exitCode);
|
||||||
@@ -79,7 +79,6 @@ private slots:
|
|||||||
void acceptRevert();
|
void acceptRevert();
|
||||||
void acceptShow();
|
void acceptShow();
|
||||||
|
|
||||||
private:
|
|
||||||
void enableButtons(bool b);
|
void enableButtons(bool b);
|
||||||
void terminateProcess();
|
void terminateProcess();
|
||||||
|
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public slots:
|
|||||||
void fetchStarted(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
|
void fetchStarted(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
|
||||||
void fetchFinished();
|
void fetchFinished();
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void slotCurrentChanged();
|
void slotCurrentChanged();
|
||||||
void slotActivated(const QModelIndex &);
|
void slotActivated(const QModelIndex &);
|
||||||
void slotRefreshStateChanged(bool);
|
void slotRefreshStateChanged(bool);
|
||||||
@@ -87,7 +87,6 @@ private slots:
|
|||||||
|
|
||||||
void manageProgressIndicator();
|
void manageProgressIndicator();
|
||||||
|
|
||||||
private:
|
|
||||||
void setProgressIndicatorVisible(bool v);
|
void setProgressIndicatorVisible(bool v);
|
||||||
QModelIndex currentIndex() const;
|
QModelIndex currentIndex() const;
|
||||||
QPushButton *addActionButton(const QString &text, const std::function<void()> &buttonSlot);
|
QPushButton *addActionButton(const QString &text, const std::function<void()> &buttonSlot);
|
||||||
|
|||||||
@@ -228,14 +228,13 @@ signals:
|
|||||||
void queryFinished(const QByteArray &);
|
void queryFinished(const QByteArray &);
|
||||||
void finished();
|
void finished();
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void processError(QProcess::ProcessError);
|
void processError(QProcess::ProcessError);
|
||||||
void processFinished(int exitCode, QProcess::ExitStatus);
|
void processFinished(int exitCode, QProcess::ExitStatus);
|
||||||
void readyReadStandardError();
|
void readyReadStandardError();
|
||||||
void readyReadStandardOutput();
|
void readyReadStandardOutput();
|
||||||
void timeout();
|
void timeout();
|
||||||
|
|
||||||
private:
|
|
||||||
void startQuery(const QString &query);
|
void startQuery(const QString &query);
|
||||||
void errorTermination(const QString &msg);
|
void errorTermination(const QString &msg);
|
||||||
void terminate();
|
void terminate();
|
||||||
|
|||||||
@@ -105,12 +105,6 @@ public:
|
|||||||
public slots:
|
public slots:
|
||||||
void start();
|
void start();
|
||||||
|
|
||||||
private slots:
|
|
||||||
void processError(QProcess::ProcessError);
|
|
||||||
void processFinished(int exitCode, QProcess::ExitStatus);
|
|
||||||
void processReadyReadStandardError();
|
|
||||||
void processReadyReadStandardOutput();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum State
|
enum State
|
||||||
{
|
{
|
||||||
@@ -119,6 +113,11 @@ private:
|
|||||||
ErrorState
|
ErrorState
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void processError(QProcess::ProcessError);
|
||||||
|
void processFinished(int exitCode, QProcess::ExitStatus);
|
||||||
|
void processReadyReadStandardError();
|
||||||
|
void processReadyReadStandardOutput();
|
||||||
|
|
||||||
void handleError(const QString &message);
|
void handleError(const QString &message);
|
||||||
void show();
|
void show();
|
||||||
void cherryPick();
|
void cherryPick();
|
||||||
|
|||||||
@@ -55,12 +55,11 @@ public:
|
|||||||
QString reviewers() const;
|
QString reviewers() const;
|
||||||
bool isValid() const;
|
bool isValid() const;
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void setChangeRange();
|
void setChangeRange();
|
||||||
void setRemoteBranches(bool includeOld = false);
|
void setRemoteBranches(bool includeOld = false);
|
||||||
void updateCommits(int index);
|
void updateCommits(int index);
|
||||||
|
|
||||||
private:
|
|
||||||
typedef QPair<QString, QDate> BranchDate;
|
typedef QPair<QString, QDate> BranchDate;
|
||||||
typedef QMultiMap<QString, BranchDate> RemoteBranchesMap;
|
typedef QMultiMap<QString, BranchDate> RemoteBranchesMap;
|
||||||
|
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ public:
|
|||||||
~BaseController();
|
~BaseController();
|
||||||
void runCommand(const QList<QStringList> &args, QTextCodec *codec = 0);
|
void runCommand(const QList<QStringList> &args, QTextCodec *codec = 0);
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
virtual void processOutput(const QString &output);
|
virtual void processOutput(const QString &output);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -343,7 +343,7 @@ public:
|
|||||||
public slots:
|
public slots:
|
||||||
void show(const QString &source, const QString &id, const QString &name = QString());
|
void show(const QString &source, const QString &id, const QString &name = QString());
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void finishSubmoduleUpdate();
|
void finishSubmoduleUpdate();
|
||||||
void fetchFinished(const QVariant &cookie);
|
void fetchFinished(const QVariant &cookie);
|
||||||
void slotChunkActionsRequested(QMenu *menu, bool isValid);
|
void slotChunkActionsRequested(QMenu *menu, bool isValid);
|
||||||
@@ -351,7 +351,6 @@ private slots:
|
|||||||
void slotUnstageChunk();
|
void slotUnstageChunk();
|
||||||
void branchesForCommit(const QString &revision);
|
void branchesForCommit(const QString &revision);
|
||||||
|
|
||||||
private:
|
|
||||||
void stage(const QString &patch, bool revert);
|
void stage(const QString &patch, bool revert);
|
||||||
|
|
||||||
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
|
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
|
||||||
|
|||||||
@@ -46,14 +46,13 @@ public:
|
|||||||
|
|
||||||
void setPlainText(const QString &text) override;
|
void setPlainText(const QString &text) override;
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void checkoutChange();
|
void checkoutChange();
|
||||||
void cherryPickChange();
|
void cherryPickChange();
|
||||||
void revertChange();
|
void revertChange();
|
||||||
void logChange();
|
void logChange();
|
||||||
void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert);
|
void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert);
|
||||||
|
|
||||||
private:
|
|
||||||
void init() override;
|
void init() override;
|
||||||
void resetChange(const QByteArray &resetType);
|
void resetChange(const QByteArray &resetType);
|
||||||
void addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk) override;
|
void addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk) override;
|
||||||
|
|||||||
Reference in New Issue
Block a user