summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase/vcsbaseeditor.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-07-17 22:54:58 +0300
committerOrgad Shaneh <orgads@gmail.com>2018-07-18 08:44:45 +0000
commitafb60d0434b575148abd126933d15b4ef182fa82 (patch)
tree918717f23c78c295fd9c165ce866e2408e59a104 /src/plugins/vcsbase/vcsbaseeditor.cpp
parentdc29aafb5250f56bd34187a11c1ce7f67642eeda (diff)
downloadqt-creator-afb60d0434b575148abd126933d15b4ef182fa82.tar.gz
VCS: Use namespace Utils
Change-Id: I41c818362398fd194995baf5b1adb16899e83217 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseeditor.cpp')
-rw-r--r--src/plugins/vcsbase/vcsbaseeditor.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index c79776a8e3..c4382728a7 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -90,6 +90,7 @@
*/
using namespace TextEditor;
+using namespace Utils;
namespace VcsBase {
@@ -563,7 +564,7 @@ public:
QList<AbstractTextCursorHandler *> m_textCursorHandlers;
QPointer<VcsCommand> m_command;
VcsBaseEditorWidget::DescribeFunc m_describeFunc = nullptr;
- Utils::ProgressIndicator *m_progressIndicator = nullptr;
+ ProgressIndicator *m_progressIndicator = nullptr;
bool m_fileLogAnnotateEnabled = false;
bool m_mouseDragging = false;
@@ -867,7 +868,7 @@ void VcsBaseEditorWidget::slotPopulateDiffBrowser()
lastFileName = file;
// ignore any headers
d->m_entrySections.push_back(d->m_entrySections.empty() ? 0 : lineNumber);
- entriesComboBox->addItem(Utils::FileName::fromString(file).fileName());
+ entriesComboBox->addItem(FileName::fromString(file).fileName());
}
}
}
@@ -1397,7 +1398,7 @@ void VcsBaseEditorWidget::setCommand(VcsCommand *command)
}
d->m_command = command;
if (command) {
- d->m_progressIndicator = new Utils::ProgressIndicator(Utils::ProgressIndicatorSize::Large);
+ d->m_progressIndicator = new ProgressIndicator(ProgressIndicatorSize::Large);
d->m_progressIndicator->attachToWidget(this);
connect(command, &VcsCommand::finished, this, &VcsBaseEditorWidget::reportCommandFinished);
QTimer::singleShot(100, this, &VcsBaseEditorWidget::showProgressIndicator);