summaryrefslogtreecommitdiff
path: root/src/plugins/clearcase
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2016-02-10 14:32:01 +0100
committerTobias Hunger <tobias.hunger@theqtcompany.com>2016-02-10 15:02:05 +0000
commitf62663e8e43c2d7b65446976a1293903bb3dcaee (patch)
treef823799350cf8e59354a8fea22495f00902efbe9 /src/plugins/clearcase
parentb4195d51746d86f4aa459d07d14a328c7945981a (diff)
downloadqt-creator-f62663e8e43c2d7b65446976a1293903bb3dcaee.tar.gz
Polish: Remove some more useless "slots" from headers
Change-Id: I9ba3b93e53e63153c1573d51c1aac53b7e088362 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/clearcase')
-rw-r--r--src/plugins/clearcase/activityselector.h4
-rw-r--r--src/plugins/clearcase/checkoutdialog.h10
-rw-r--r--src/plugins/clearcase/clearcaseplugin.h23
-rw-r--r--src/plugins/clearcase/clearcasesync.h3
4 files changed, 19 insertions, 21 deletions
diff --git a/src/plugins/clearcase/activityselector.h b/src/plugins/clearcase/activityselector.h
index 11a5f83ce8..08ce36f172 100644
--- a/src/plugins/clearcase/activityselector.h
+++ b/src/plugins/clearcase/activityselector.h
@@ -49,13 +49,11 @@ public:
bool refresh();
bool changed() { return m_changed; }
-public slots:
void newActivity();
-private slots:
+private:
void userChanged();
-private:
ClearCasePlugin *m_plugin;
bool m_changed = false;
QComboBox *m_cmbActivity;
diff --git a/src/plugins/clearcase/checkoutdialog.h b/src/plugins/clearcase/checkoutdialog.h
index fb3295fd30..3baed4aef8 100644
--- a/src/plugins/clearcase/checkoutdialog.h
+++ b/src/plugins/clearcase/checkoutdialog.h
@@ -40,8 +40,10 @@ class CheckOutDialog : public QDialog
Q_OBJECT
public:
- explicit CheckOutDialog(const QString &fileName, bool isUcm, bool showComment, QWidget *parent = 0);
- ~CheckOutDialog();
+ explicit CheckOutDialog(const QString &fileName, bool isUcm, bool showComment,
+ QWidget *parent = nullptr);
+ ~CheckOutDialog() override;
+
QString activity() const;
QString comment() const;
bool isReserved() const;
@@ -51,10 +53,10 @@ public:
void hideHijack();
void hideComment();
-private slots:
- void toggleUnreserved(bool checked);
private:
+ void toggleUnreserved(bool checked);
+
Ui::CheckOutDialog *ui;
ActivitySelector *m_actSelector = nullptr;
};
diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h
index 80c774628f..d32d36350c 100644
--- a/src/plugins/clearcase/clearcaseplugin.h
+++ b/src/plugins/clearcase/clearcaseplugin.h
@@ -164,19 +164,19 @@ public:
inline bool isFakeCleartool() const { return m_fakeClearTool; }
#endif
-public slots:
void vcsAnnotate(const QString &workingDir, const QString &file,
const QString &revision = QString(), int lineNumber = -1) const;
bool newActivity();
void updateStreamAndView();
-private slots:
- void annotateVersion(const QString &workingDirectory, const QString &file, const QString &revision, int lineNumber);
- void describe(const QString &source, const QString &changeNr);
- void syncSlot();
- void updateStatusActions();
+protected:
+ void updateActions(VcsBase::VcsBasePlugin::ActionState) override;
+ bool submitEditorAboutToClose() override;
+ QString ccGet(const QString &workingDir, const QString &file, const QString &prefix = QString());
+ QList<QStringPair> ccGetActivities() const;
#ifdef WITH_TESTS
+private slots:
void initTestCase();
void cleanupTestCase();
void testDiffFileResolving_data();
@@ -194,13 +194,12 @@ private slots:
void testVcsStatusDynamicNotManaged();
#endif
-protected:
- void updateActions(VcsBase::VcsBasePlugin::ActionState) override;
- bool submitEditorAboutToClose() override;
- QString ccGet(const QString &workingDir, const QString &file, const QString &prefix = QString());
- QList<QStringPair> ccGetActivities() const;
-
private:
+ void annotateVersion(const QString &workingDirectory, const QString &file, const QString &revision, int lineNumber);
+ void describe(const QString &source, const QString &changeNr);
+ void syncSlot();
+ void updateStatusActions();
+
void checkOutCurrentFile();
void addCurrentFile();
void undoCheckOutCurrent();
diff --git a/src/plugins/clearcase/clearcasesync.h b/src/plugins/clearcase/clearcasesync.h
index 21bab53de4..179c3c6a23 100644
--- a/src/plugins/clearcase/clearcasesync.h
+++ b/src/plugins/clearcase/clearcasesync.h
@@ -57,8 +57,8 @@ private:
ClearCasePlugin *const m_plugin;
QSharedPointer<StatusMap> m_statusMap;
-public slots:
#ifdef WITH_TESTS
+public slots:
void verifyParseStatus(const QString &fileName, const QString &cleartoolLsLine,
const FileStatus::Status);
void verifyFileNotManaged();
@@ -66,7 +66,6 @@ public slots:
void verifyFileCheckedOutDynamicView();
void verifyFileCheckedInDynamicView();
void verifyFileNotManagedDynamicView();
-
#endif
};