diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 6102efcc8665b39e90271d9b348e4d0a44e95f7f..242e42db45a05fb922515dbf719eebfe6b91c7cb 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -153,28 +153,14 @@ GitClient::~GitClient() const char *GitClient::noColorOption = "--no-color"; -QString GitClient::findRepositoryForFile(const QString &fileName) -{ - const QString gitDirectory = QLatin1String(kGitDirectoryC); - const QFileInfo info(fileName); - QDir dir = info.absoluteDir(); - do { - if (dir.entryList(QDir::AllDirs|QDir::Hidden).contains(gitDirectory)) - return dir.absolutePath(); - } while (dir.cdUp()); - - return QString(); -} - QString GitClient::findRepositoryForDirectory(const QString &dir) { const QString gitDirectory = QLatin1String(kGitDirectoryC); QDir directory(dir); do { - if (directory.entryList(QDir::AllDirs|QDir::Hidden).contains(gitDirectory)) + if (QFileInfo(directory, gitDirectory).isDir()) return directory.absolutePath(); } while (directory.cdUp()); - return QString(); } diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 81803fe8b2e7a7898c2d3281b495e226527f1578..99f95fd6e011e448675527d67b64bff47572c040 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -75,7 +75,6 @@ public: bool managesDirectory(const QString &) const { return false; } QString findTopLevelForDirectory(const QString &) const { return QString(); } - static QString findRepositoryForFile(const QString &fileName); static QString findRepositoryForDirectory(const QString &dir); void diff(const QString &workingDirectory, const QStringList &diffArgs, const QString &fileName); diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 40d781fcb0c93812b3712853ab5a132512219077..436920142f2568507d5f87765979af74ce215cfe 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -173,8 +173,6 @@ StateListener::StateListener(QObject *parent) : QObject(parent) { Core::ICore *core = Core::ICore::instance(); - connect(core, SIGNAL(contextChanged(Core::IContext*,QList<int>)), - this, SLOT(slotStateChanged())); connect(core->fileManager(), SIGNAL(currentFileChanged(QString)), this, SLOT(slotStateChanged()));