From ddfec003adb3f32292ab257addd76eb744bc8353 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Sun, 22 Dec 2013 08:46:52 +0100
Subject: [PATCH] Revert "Git: add completion to ChangeSelectionDialog"
Missing dependency
This reverts commit 724690132cf6d8fb812ea67e1665d7bbf7c5d290
Change-Id: Ib20b7bbd23b0a22e271006f951095d805e4639e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/plugins/git/changeselectiondialog.cpp | 43 +----------------------
src/plugins/git/changeselectiondialog.h | 5 ---
src/plugins/git/changeselectiondialog.ui | 9 +----
3 files changed, 2 insertions(+), 55 deletions(-)
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 2a175be7791..80b7b4ea83f 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -42,9 +42,6 @@
#include <QPlainTextEdit>
#include <QDir>
#include <QFileDialog>
-#include <QCompleter>
-#include <QStringListModel>
-#include <QTimer>
namespace Git {
namespace Internal {
@@ -63,9 +60,8 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co
m_ui->changeNumberEdit->setFocus();
m_ui->changeNumberEdit->selectAll();
- connect(m_ui->changeNumberEdit, SIGNAL(textChanged(QString)), this, SLOT(changeTextChanged(QString)));
+ connect(m_ui->changeNumberEdit, SIGNAL(textChanged(QString)), this, SLOT(recalculateDetails()));
connect(m_ui->workingDirectoryEdit, SIGNAL(textChanged(QString)), this, SLOT(recalculateDetails()));
- connect(m_ui->workingDirectoryEdit, SIGNAL(textChanged(QString)), this, SLOT(recalculateCompletion()));
connect(m_ui->selectDirectoryButton, SIGNAL(clicked()), this, SLOT(chooseWorkingDirectory()));
connect(m_ui->selectFromHistoryButton, SIGNAL(clicked()), this, SLOT(selectCommitFromRecentHistory()));
connect(m_ui->showButton, SIGNAL(clicked()), this, SLOT(acceptShow()));
@@ -81,13 +77,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co
m_ui->checkoutButton->setDefault(true);
else
m_ui->showButton->setDefault(true);
- m_changeModel = new QStringListModel(this);
- QCompleter *changeCompleter = new QCompleter(m_changeModel, this);
- m_ui->changeNumberEdit->setCompleter(changeCompleter);
- changeCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-
recalculateDetails();
- recalculateCompletion();
}
ChangeSelectionDialog::~ChangeSelectionDialog()
@@ -198,26 +188,6 @@ void ChangeSelectionDialog::enableButtons(bool b)
m_ui->checkoutButton->setEnabled(b);
}
-void ChangeSelectionDialog::recalculateCompletion()
-{
- const QString workingDir = workingDirectory();
- if (workingDir == m_oldWorkingDir)
- return;
- m_oldWorkingDir = workingDir;
-
- if (!workingDir.isEmpty()) {
- GitClient *client = GitPlugin::instance()->gitClient();
- QStringList args;
- args << QLatin1String("--format=%(refname:short)");
- QString output;
- if (client->synchronousForEachRefCmd(workingDir, args, &output)) {
- m_changeModel->setStringList(output.split(QLatin1Char('\n')));
- return;
- }
- }
- m_changeModel->setStringList(QStringList());
-}
-
void ChangeSelectionDialog::recalculateDetails()
{
if (m_process) {
@@ -257,16 +227,5 @@ void ChangeSelectionDialog::recalculateDetails()
m_ui->detailsText->setPlainText(tr("Fetching commit data..."));
}
-void ChangeSelectionDialog::changeTextChanged(const QString &text)
-{
- if (QCompleter *comp = m_ui->changeNumberEdit->completer()) {
- if (text.isEmpty() && !comp->popup()->isVisible()) {
- comp->setCompletionPrefix(text);
- QTimer::singleShot(0, comp, SLOT(complete()));
- }
- }
- recalculateDetails();
-}
-
} // Internal
} // Git
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index 4003d1a864f..6af4f73af03 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -41,7 +41,6 @@ class QLabel;
class QLineEdit;
class QPlainTextEdit;
class QProcess;
-class QStringListModel;
QT_END_NAMESPACE
namespace Git {
@@ -73,9 +72,7 @@ private slots:
void chooseWorkingDirectory();
void selectCommitFromRecentHistory();
void setDetails(int exitCode);
- void recalculateCompletion();
void recalculateDetails();
- void changeTextChanged(const QString &text);
void acceptCheckout();
void acceptCherryPick();
void acceptRevert();
@@ -90,8 +87,6 @@ private:
QString m_gitBinaryPath;
QProcessEnvironment m_gitEnvironment;
ChangeCommand m_command;
- QStringListModel *m_changeModel;
- QString m_oldWorkingDir;
};
} // namespace Internal
diff --git a/src/plugins/git/changeselectiondialog.ui b/src/plugins/git/changeselectiondialog.ui
index 8fe291169fa..5fd084858c2 100644
--- a/src/plugins/git/changeselectiondialog.ui
+++ b/src/plugins/git/changeselectiondialog.ui
@@ -39,7 +39,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="Utils::CompletingLineEdit" name="changeNumberEdit">
+ <widget class="QLineEdit" name="changeNumberEdit">
<property name="text">
<string>HEAD</string>
</property>
@@ -119,13 +119,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>Utils::CompletingLineEdit</class>
- <extends>QLineEdit</extends>
- <header location="global">utils/completinglineedit.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections>
<connection>
--
GitLab