Commit b556ba50 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk
Browse files

TextEditor: Remove unneeded qualifications



Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: Ief087658e2adc337ee02c49f0fb406597114df07
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 69ac7f8d
...@@ -90,10 +90,10 @@ void AutoCompleter::countBrackets(QTextCursor cursor, ...@@ -90,10 +90,10 @@ void AutoCompleter::countBrackets(QTextCursor cursor,
cursor.setPosition(from); cursor.setPosition(from);
QTextBlock block = cursor.block(); QTextBlock block = cursor.block();
while (block.isValid() && block.position() < end) { while (block.isValid() && block.position() < end) {
TextEditor::Parentheses parenList = TextEditor::TextDocumentLayout::parentheses(block); Parentheses parenList = TextDocumentLayout::parentheses(block);
if (!parenList.isEmpty() && !TextEditor::TextDocumentLayout::ifdefedOut(block)) { if (!parenList.isEmpty() && !TextDocumentLayout::ifdefedOut(block)) {
for (int i = 0; i < parenList.count(); ++i) { for (int i = 0; i < parenList.count(); ++i) {
TextEditor::Parenthesis paren = parenList.at(i); Parenthesis paren = parenList.at(i);
int position = block.position() + paren.pos; int position = block.position() + paren.pos;
if (position < from || position >= end) if (position < from || position >= end)
continue; continue;
...@@ -151,10 +151,10 @@ QString AutoCompleter::autoComplete(QTextCursor &cursor, const QString &textToIn ...@@ -151,10 +151,10 @@ QString AutoCompleter::autoComplete(QTextCursor &cursor, const QString &textToIn
const QString brackets = QLatin1String("[]"); const QString brackets = QLatin1String("[]");
if (parentheses.contains(character) || brackets.contains(character)) { if (parentheses.contains(character) || brackets.contains(character)) {
QTextCursor tmp= cursor; QTextCursor tmp= cursor;
bool foundBlockStart = TextEditor::TextBlockUserData::findPreviousBlockOpenParenthesis(&tmp); bool foundBlockStart = TextBlockUserData::findPreviousBlockOpenParenthesis(&tmp);
int blockStart = foundBlockStart ? tmp.position() : 0; int blockStart = foundBlockStart ? tmp.position() : 0;
tmp = cursor; tmp = cursor;
bool foundBlockEnd = TextEditor::TextBlockUserData::findNextBlockClosingParenthesis(&tmp); bool foundBlockEnd = TextBlockUserData::findNextBlockClosingParenthesis(&tmp);
int blockEnd = foundBlockEnd ? tmp.position() : (cursor.document()->characterCount() - 1); int blockEnd = foundBlockEnd ? tmp.position() : (cursor.document()->characterCount() - 1);
const QChar openChar = parentheses.contains(character) ? QLatin1Char('(') : QLatin1Char('['); const QChar openChar = parentheses.contains(character) ? QLatin1Char('(') : QLatin1Char('[');
const QChar closeChar = parentheses.contains(character) ? QLatin1Char(')') : QLatin1Char(']'); const QChar closeChar = parentheses.contains(character) ? QLatin1Char(')') : QLatin1Char(']');
...@@ -218,10 +218,10 @@ bool AutoCompleter::autoBackspace(QTextCursor &cursor) ...@@ -218,10 +218,10 @@ bool AutoCompleter::autoBackspace(QTextCursor &cursor)
const QChar character = lookBehind; const QChar character = lookBehind;
if (character == QLatin1Char('(') || character == QLatin1Char('[')) { if (character == QLatin1Char('(') || character == QLatin1Char('[')) {
QTextCursor tmp = cursor; QTextCursor tmp = cursor;
TextEditor::TextBlockUserData::findPreviousBlockOpenParenthesis(&tmp); TextBlockUserData::findPreviousBlockOpenParenthesis(&tmp);
int blockStart = tmp.isNull() ? 0 : tmp.position(); int blockStart = tmp.isNull() ? 0 : tmp.position();
tmp = cursor; tmp = cursor;
TextEditor::TextBlockUserData::findNextBlockClosingParenthesis(&tmp); TextBlockUserData::findNextBlockClosingParenthesis(&tmp);
int blockEnd = tmp.isNull() ? (cursor.document()->characterCount()-1) : tmp.position(); int blockEnd = tmp.isNull() ? (cursor.document()->characterCount()-1) : tmp.position();
QChar openChar = character; QChar openChar = character;
QChar closeChar = (character == QLatin1Char('(')) ? QLatin1Char(')') : QLatin1Char(']'); QChar closeChar = (character == QLatin1Char('(')) ? QLatin1Char(')') : QLatin1Char(']');
......
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
#include <QLabel> #include <QLabel>
#include <QLabel> #include <QLabel>
using namespace Utils;
using namespace Core;
namespace TextEditor { namespace TextEditor {
namespace Internal { namespace Internal {
...@@ -63,8 +66,8 @@ class BaseFileFindPrivate ...@@ -63,8 +66,8 @@ class BaseFileFindPrivate
public: public:
BaseFileFindPrivate() : m_resultLabel(0), m_filterCombo(0) {} BaseFileFindPrivate() : m_resultLabel(0), m_filterCombo(0) {}
QMap<QFutureWatcher<Utils::FileSearchResultList> *, QPointer<Core::SearchResult> > m_watchers; QMap<QFutureWatcher<FileSearchResultList> *, QPointer<SearchResult> > m_watchers;
QPointer<Core::IFindSupport> m_currentFindSupport; QPointer<IFindSupport> m_currentFindSupport;
QLabel *m_resultLabel; QLabel *m_resultLabel;
QStringListModel m_filterStrings; QStringListModel m_filterStrings;
...@@ -75,8 +78,6 @@ public: ...@@ -75,8 +78,6 @@ public:
} // namespace Internal } // namespace Internal
using namespace Internal; using namespace Internal;
using namespace Utils;
using namespace Core;
BaseFileFind::BaseFileFind() : d(new BaseFileFindPrivate) BaseFileFind::BaseFileFind() : d(new BaseFileFindPrivate)
{ {
...@@ -125,15 +126,15 @@ QStringList BaseFileFind::fileNameFilters() const ...@@ -125,15 +126,15 @@ QStringList BaseFileFind::fileNameFilters() const
return filters; return filters;
} }
void BaseFileFind::runNewSearch(const QString &txt, Core::FindFlags findFlags, void BaseFileFind::runNewSearch(const QString &txt, FindFlags findFlags,
SearchResultWindow::SearchMode searchMode) SearchResultWindow::SearchMode searchMode)
{ {
d->m_currentFindSupport = 0; d->m_currentFindSupport = 0;
if (d->m_filterCombo) if (d->m_filterCombo)
updateComboEntries(d->m_filterCombo, true); updateComboEntries(d->m_filterCombo, true);
SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(label(), SearchResult *search = SearchResultWindow::instance()->startNewSearch(label(),
toolTip().arg(Core::IFindFilter::descriptionForFindFlags(findFlags)), toolTip().arg(IFindFilter::descriptionForFindFlags(findFlags)),
txt, searchMode, Core::SearchResultWindow::PreserveCaseEnabled, txt, searchMode, SearchResultWindow::PreserveCaseEnabled,
QString::fromLatin1("TextEditor")); QString::fromLatin1("TextEditor"));
search->setTextToReplace(txt); search->setTextToReplace(txt);
search->setSearchAgainSupported(true); search->setSearchAgainSupported(true);
...@@ -158,14 +159,14 @@ void BaseFileFind::runNewSearch(const QString &txt, Core::FindFlags findFlags, ...@@ -158,14 +159,14 @@ void BaseFileFind::runNewSearch(const QString &txt, Core::FindFlags findFlags,
runSearch(search); runSearch(search);
} }
void BaseFileFind::runSearch(Core::SearchResult *search) void BaseFileFind::runSearch(SearchResult *search)
{ {
FileFindParameters parameters = search->userData().value<FileFindParameters>(); FileFindParameters parameters = search->userData().value<FileFindParameters>();
CountingLabel *label = new CountingLabel; CountingLabel *label = new CountingLabel;
connect(search, SIGNAL(countChanged(int)), label, SLOT(updateCount(int))); connect(search, SIGNAL(countChanged(int)), label, SLOT(updateCount(int)));
CountingLabel *statusLabel = new CountingLabel; CountingLabel *statusLabel = new CountingLabel;
connect(search, SIGNAL(countChanged(int)), statusLabel, SLOT(updateCount(int))); connect(search, SIGNAL(countChanged(int)), statusLabel, SLOT(updateCount(int)));
Core::SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch|IOutputPane::WithFocus)); SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch|IOutputPane::WithFocus));
QFutureWatcher<FileSearchResultList> *watcher = new QFutureWatcher<FileSearchResultList>(); QFutureWatcher<FileSearchResultList> *watcher = new QFutureWatcher<FileSearchResultList>();
d->m_watchers.insert(watcher, search); d->m_watchers.insert(watcher, search);
watcher->setPendingResultsLimit(1); watcher->setPendingResultsLimit(1);
...@@ -189,24 +190,24 @@ void BaseFileFind::runSearch(Core::SearchResult *search) ...@@ -189,24 +190,24 @@ void BaseFileFind::runSearch(Core::SearchResult *search)
connect(progress, SIGNAL(clicked()), search, SLOT(popup())); connect(progress, SIGNAL(clicked()), search, SLOT(popup()));
} }
void BaseFileFind::findAll(const QString &txt, Core::FindFlags findFlags) void BaseFileFind::findAll(const QString &txt, FindFlags findFlags)
{ {
runNewSearch(txt, findFlags, SearchResultWindow::SearchOnly); runNewSearch(txt, findFlags, SearchResultWindow::SearchOnly);
} }
void BaseFileFind::replaceAll(const QString &txt, Core::FindFlags findFlags) void BaseFileFind::replaceAll(const QString &txt, FindFlags findFlags)
{ {
runNewSearch(txt, findFlags, SearchResultWindow::SearchAndReplace); runNewSearch(txt, findFlags, SearchResultWindow::SearchAndReplace);
} }
void BaseFileFind::doReplace(const QString &text, void BaseFileFind::doReplace(const QString &text,
const QList<Core::SearchResultItem> &items, const QList<SearchResultItem> &items,
bool preserveCase) bool preserveCase)
{ {
QStringList files = replaceAll(text, items, preserveCase); QStringList files = replaceAll(text, items, preserveCase);
if (!files.isEmpty()) { if (!files.isEmpty()) {
DocumentManager::notifyFilesChangedInternally(files); DocumentManager::notifyFilesChangedInternally(files);
Core::SearchResultWindow::instance()->hide(); SearchResultWindow::instance()->hide();
} }
} }
...@@ -219,10 +220,10 @@ void BaseFileFind::displayResult(int index) { ...@@ -219,10 +220,10 @@ void BaseFileFind::displayResult(int index) {
watcher->cancel(); watcher->cancel();
return; return;
} }
Utils::FileSearchResultList results = watcher->resultAt(index); FileSearchResultList results = watcher->resultAt(index);
QList<Core::SearchResultItem> items; QList<SearchResultItem> items;
foreach (const Utils::FileSearchResult &result, results) { foreach (const FileSearchResult &result, results) {
Core::SearchResultItem item; SearchResultItem item;
item.path = QStringList() << QDir::toNativeSeparators(result.fileName); item.path = QStringList() << QDir::toNativeSeparators(result.fileName);
item.lineNumber = result.lineNumber; item.lineNumber = result.lineNumber;
item.text = result.matchingLine; item.text = result.matchingLine;
...@@ -232,7 +233,7 @@ void BaseFileFind::displayResult(int index) { ...@@ -232,7 +233,7 @@ void BaseFileFind::displayResult(int index) {
item.userData = result.regexpCapturedTexts; item.userData = result.regexpCapturedTexts;
items << item; items << item;
} }
search->addResults(items, Core::SearchResult::AddOrdered); search->addResults(items, SearchResult::AddOrdered);
} }
void BaseFileFind::searchFinished() void BaseFileFind::searchFinished()
...@@ -305,7 +306,7 @@ void BaseFileFind::updateComboEntries(QComboBox *combo, bool onTop) ...@@ -305,7 +306,7 @@ void BaseFileFind::updateComboEntries(QComboBox *combo, bool onTop)
} }
} }
void BaseFileFind::openEditor(const Core::SearchResultItem &item) void BaseFileFind::openEditor(const SearchResultItem &item)
{ {
SearchResult *result = qobject_cast<SearchResult *>(sender()); SearchResult *result = qobject_cast<SearchResult *>(sender());
IEditor *openedEditor = 0; IEditor *openedEditor = 0;
...@@ -354,7 +355,7 @@ void BaseFileFind::recheckEnabled() ...@@ -354,7 +355,7 @@ void BaseFileFind::recheckEnabled()
} }
QStringList BaseFileFind::replaceAll(const QString &text, QStringList BaseFileFind::replaceAll(const QString &text,
const QList<Core::SearchResultItem> &items, const QList<SearchResultItem> &items,
bool preserveCase) bool preserveCase)
{ {
if (items.isEmpty()) if (items.isEmpty())
...@@ -362,12 +363,12 @@ QStringList BaseFileFind::replaceAll(const QString &text, ...@@ -362,12 +363,12 @@ QStringList BaseFileFind::replaceAll(const QString &text,
RefactoringChanges refactoring; RefactoringChanges refactoring;
QHash<QString, QList<Core::SearchResultItem> > changes; QHash<QString, QList<SearchResultItem> > changes;
foreach (const Core::SearchResultItem &item, items) foreach (const SearchResultItem &item, items)
changes[QDir::fromNativeSeparators(item.path.first())].append(item); changes[QDir::fromNativeSeparators(item.path.first())].append(item);
// Checking for files without write permissions // Checking for files without write permissions
QHashIterator<QString, QList<Core::SearchResultItem> > it(changes); QHashIterator<QString, QList<SearchResultItem> > it(changes);
QSet<QString> roFiles; QSet<QString> roFiles;
while (it.hasNext()) { while (it.hasNext()) {
it.next(); it.next();
...@@ -388,12 +389,12 @@ QStringList BaseFileFind::replaceAll(const QString &text, ...@@ -388,12 +389,12 @@ QStringList BaseFileFind::replaceAll(const QString &text,
while (it.hasNext()) { while (it.hasNext()) {
it.next(); it.next();
const QString fileName = it.key(); const QString fileName = it.key();
const QList<Core::SearchResultItem> changeItems = it.value(); const QList<SearchResultItem> changeItems = it.value();
ChangeSet changeSet; ChangeSet changeSet;
RefactoringFilePtr file = refactoring.file(fileName); RefactoringFilePtr file = refactoring.file(fileName);
QSet<QPair<int, int> > processed; QSet<QPair<int, int> > processed;
foreach (const Core::SearchResultItem &item, changeItems) { foreach (const SearchResultItem &item, changeItems) {
const QPair<int, int> &p = qMakePair(item.lineNumber, item.textMarkPos); const QPair<int, int> &p = qMakePair(item.lineNumber, item.textMarkPos);
if (processed.contains(p)) if (processed.contains(p))
continue; continue;
......
...@@ -267,11 +267,11 @@ const ExtraEncodingSettings &BehaviorSettingsPage::extraEncodingSettings() const ...@@ -267,11 +267,11 @@ const ExtraEncodingSettings &BehaviorSettingsPage::extraEncodingSettings() const
void BehaviorSettingsPage::openCodingStylePreferences(TabSettingsWidget::CodingStyleLink link) void BehaviorSettingsPage::openCodingStylePreferences(TabSettingsWidget::CodingStyleLink link)
{ {
switch (link) { switch (link) {
case TextEditor::TabSettingsWidget::CppLink: case TabSettingsWidget::CppLink:
Core::ICore::showOptionsDialog(CppTools::Constants::CPP_SETTINGS_CATEGORY, Core::ICore::showOptionsDialog(CppTools::Constants::CPP_SETTINGS_CATEGORY,
CppTools::Constants::CPP_CODE_STYLE_SETTINGS_ID); CppTools::Constants::CPP_CODE_STYLE_SETTINGS_ID);
break; break;
case TextEditor::TabSettingsWidget::QtQuickLink: case TabSettingsWidget::QtQuickLink:
Core::ICore::showOptionsDialog(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML, Core::ICore::showOptionsDialog(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML,
QmlJSTools::Constants::QML_JS_CODE_STYLE_SETTINGS_ID); QmlJSTools::Constants::QML_JS_CODE_STYLE_SETTINGS_ID);
break; break;
......
...@@ -214,7 +214,7 @@ void GenericProposalModel::filter(const QString &prefix) ...@@ -214,7 +214,7 @@ void GenericProposalModel::filter(const QString &prefix)
* *
* It also implements the fully and first-letter-only case sensitivity. * It also implements the fully and first-letter-only case sensitivity.
*/ */
const TextEditor::CaseSensitivity caseSensitivity = const CaseSensitivity caseSensitivity =
TextEditorSettings::completionSettings().m_caseSensitivity; TextEditorSettings::completionSettings().m_caseSensitivity;
QString keyRegExp; QString keyRegExp;
...@@ -223,8 +223,8 @@ void GenericProposalModel::filter(const QString &prefix) ...@@ -223,8 +223,8 @@ void GenericProposalModel::filter(const QString &prefix)
const QLatin1String uppercaseWordContinuation("[a-z0-9_]*"); const QLatin1String uppercaseWordContinuation("[a-z0-9_]*");
const QLatin1String lowercaseWordContinuation("(?:[a-zA-Z0-9]*_)?"); const QLatin1String lowercaseWordContinuation("(?:[a-zA-Z0-9]*_)?");
foreach (const QChar &c, prefix) { foreach (const QChar &c, prefix) {
if (caseSensitivity == TextEditor::CaseInsensitive || if (caseSensitivity == CaseInsensitive ||
(caseSensitivity == TextEditor::FirstLetterCaseSensitive && !first)) { (caseSensitivity == FirstLetterCaseSensitive && !first)) {
keyRegExp += QLatin1String("(?:"); keyRegExp += QLatin1String("(?:");
if (!first) if (!first)
......
...@@ -145,11 +145,11 @@ QVariant ModelAdapter::data(const QModelIndex &index, int role) const ...@@ -145,11 +145,11 @@ QVariant ModelAdapter::data(const QModelIndex &index, int role) const
// ------------------------ // ------------------------
// GenericProposalInfoFrame // GenericProposalInfoFrame
// ------------------------ // ------------------------
class GenericProposalInfoFrame : public Utils::FakeToolTip class GenericProposalInfoFrame : public FakeToolTip
{ {
public: public:
GenericProposalInfoFrame(QWidget *parent = 0) GenericProposalInfoFrame(QWidget *parent = 0)
: Utils::FakeToolTip(parent), m_label(new QLabel(this)) : FakeToolTip(parent), m_label(new QLabel(this))
{ {
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0); layout->setMargin(0);
......
...@@ -158,7 +158,7 @@ ICodeStylePreferences *CodeStylePool::createCodeStyle(const QByteArray &id, cons ...@@ -158,7 +158,7 @@ ICodeStylePreferences *CodeStylePool::createCodeStyle(const QByteArray &id, cons
if (!d->m_factory) if (!d->m_factory)
return 0; return 0;
TextEditor::ICodeStylePreferences *codeStyle = d->m_factory->createCodeStyle(); ICodeStylePreferences *codeStyle = d->m_factory->createCodeStyle();
codeStyle->setId(id); codeStyle->setId(id);
codeStyle->setTabSettings(tabSettings); codeStyle->setTabSettings(tabSettings);
codeStyle->setValue(codeStyleData); codeStyle->setValue(codeStyleData);
...@@ -230,7 +230,7 @@ void CodeStylePool::loadCustomCodeStyles() ...@@ -230,7 +230,7 @@ void CodeStylePool::loadCustomCodeStyles()
ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fileName) ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fileName)
{ {
TextEditor::ICodeStylePreferences *codeStyle = loadCodeStyle(fileName); ICodeStylePreferences *codeStyle = loadCodeStyle(fileName);
if (codeStyle) if (codeStyle)
saveCodeStyle(codeStyle); saveCodeStyle(codeStyle);
return codeStyle; return codeStyle;
...@@ -238,7 +238,7 @@ ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fil ...@@ -238,7 +238,7 @@ ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fil
ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FileName &fileName) ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FileName &fileName)
{ {
TextEditor::ICodeStylePreferences *codeStyle = 0; ICodeStylePreferences *codeStyle = 0;
Utils::PersistentSettingsReader reader; Utils::PersistentSettingsReader reader;
reader.load(fileName); reader.load(fileName);
QVariantMap m = reader.restoreValues(); QVariantMap m = reader.restoreValues();
......
...@@ -190,7 +190,7 @@ CodeStyleSelectorWidget::~CodeStyleSelectorWidget() ...@@ -190,7 +190,7 @@ CodeStyleSelectorWidget::~CodeStyleSelectorWidget()
delete m_ui; delete m_ui;
} }
void CodeStyleSelectorWidget::setCodeStyle(TextEditor::ICodeStylePreferences *codeStyle) void CodeStyleSelectorWidget::setCodeStyle(ICodeStylePreferences *codeStyle)
{ {
if (m_codeStyle == codeStyle) if (m_codeStyle == codeStyle)
return; // nothing changes return; // nothing changes
...@@ -244,15 +244,15 @@ void CodeStyleSelectorWidget::slotComboBoxActivated(int index) ...@@ -244,15 +244,15 @@ void CodeStyleSelectorWidget::slotComboBoxActivated(int index)
if (index < 0 || index >= m_ui->delegateComboBox->count()) if (index < 0 || index >= m_ui->delegateComboBox->count())
return; return;
TextEditor::ICodeStylePreferences *delegate = ICodeStylePreferences *delegate =
m_ui->delegateComboBox->itemData(index).value<TextEditor::ICodeStylePreferences *>(); m_ui->delegateComboBox->itemData(index).value<ICodeStylePreferences *>();
const bool wasBlocked = blockSignals(true); const bool wasBlocked = blockSignals(true);
m_codeStyle->setCurrentDelegate(delegate); m_codeStyle->setCurrentDelegate(delegate);
blockSignals(wasBlocked); blockSignals(wasBlocked);
} }
void CodeStyleSelectorWidget::slotCurrentDelegateChanged(TextEditor::ICodeStylePreferences *delegate) void CodeStyleSelectorWidget::slotCurrentDelegateChanged(ICodeStylePreferences *delegate)
{ {
m_ignoreGuiSignals = true; m_ignoreGuiSignals = true;
m_ui->delegateComboBox->setCurrentIndex(m_ui->delegateComboBox->findData(QVariant::fromValue(delegate))); m_ui->delegateComboBox->setCurrentIndex(m_ui->delegateComboBox->findData(QVariant::fromValue(delegate)));
......
...@@ -56,7 +56,7 @@ FindInFiles::FindInFiles() ...@@ -56,7 +56,7 @@ FindInFiles::FindInFiles()
m_directory(0) m_directory(0)
{ {
m_instance = this; m_instance = this;
connect(Core::EditorManager::instance(), SIGNAL(findOnFileSystemRequest(QString)), connect(EditorManager::instance(), SIGNAL(findOnFileSystemRequest(QString)),
this, SLOT(findOnFileSystem(QString))); this, SLOT(findOnFileSystem(QString)));
} }
...@@ -74,7 +74,7 @@ QString FindInFiles::displayName() const ...@@ -74,7 +74,7 @@ QString FindInFiles::displayName() const
return tr("Files on File System"); return tr("Files on File System");
} }
void FindInFiles::findAll(const QString &txt, Core::FindFlags findFlags) void FindInFiles::findAll(const QString &txt, FindFlags findFlags)
{ {
updateComboEntries(m_directory, true); updateComboEntries(m_directory, true);
BaseFileFind::findAll(txt, findFlags); BaseFileFind::findAll(txt, findFlags);
...@@ -85,7 +85,7 @@ Utils::FileIterator *FindInFiles::files(const QStringList &nameFilters, ...@@ -85,7 +85,7 @@ Utils::FileIterator *FindInFiles::files(const QStringList &nameFilters,
{ {
return new Utils::SubDirFileIterator(QStringList() << additionalParameters.toString(), return new Utils::SubDirFileIterator(QStringList() << additionalParameters.toString(),
nameFilters, nameFilters,
Core::EditorManager::defaultTextCodec()); EditorManager::defaultTextCodec());
} }
QVariant FindInFiles::additionalParameters() const QVariant FindInFiles::additionalParameters() const
......
...@@ -111,7 +111,7 @@ private: ...@@ -111,7 +111,7 @@ private:
class FontSettingsPagePrivate class FontSettingsPagePrivate
{ {
public: public:
FontSettingsPagePrivate(const TextEditor::FormatDescriptions &fd, FontSettingsPagePrivate(const FormatDescriptions &fd,
Core::Id id, Core::Id id,
const QString &displayName, const QString &displayName,
const QString &category); const QString &category);
...@@ -122,7 +122,7 @@ public: ...@@ -122,7 +122,7 @@ public:
const QString m_displayName; const QString m_displayName;
const QString m_settingsGroup; const QString m_settingsGroup;
TextEditor::FormatDescriptions m_descriptions; FormatDescriptions m_descriptions;
FontSettings m_value; FontSettings m_value;
FontSettings m_lastValue; FontSettings m_lastValue;
QPointer<QWidget> m_widget; QPointer<QWidget> m_widget;
...@@ -168,7 +168,7 @@ static QString createColorSchemeFileName(const QString &pattern) ...@@ -168,7 +168,7 @@ static QString createColorSchemeFileName(const QString &pattern)
} }
// ------- FontSettingsPagePrivate // ------- FontSettingsPagePrivate
FontSettingsPagePrivate::FontSettingsPagePrivate(const TextEditor::FormatDescriptions &fd, FontSettingsPagePrivate::FontSettingsPagePrivate(const FormatDescriptions &fd,
Core::Id id, Core::Id id,
const QString &displayName, const QString &displayName,
const QString &category) : const QString &category) :
......
...@@ -129,7 +129,7 @@ bool Context::isDynamic() const ...@@ -129,7 +129,7 @@ bool Context::isDynamic() const
void Context::updateDynamicRules(const QStringList &captures) const void Context::updateDynamicRules(const QStringList &captures) const
{ {
TextEditor::Internal::updateDynamicRules(m_rules, captures); Internal::updateDynamicRules(m_rules, captures);
} }
void Context::addRule(const QSharedPointer<Rule> &rule) void Context::addRule(const QSharedPointer<Rule> &rule)
......
...@@ -82,7 +82,7 @@ HighlighterCodeFormatterData *formatterData(const QTextBlock &block) ...@@ -82,7 +82,7 @@ HighlighterCodeFormatterData *formatterData(const QTextBlock &block)
} }
Highlighter::Highlighter(QTextDocument *parent) : Highlighter::Highlighter(QTextDocument *parent) :
TextEditor::SyntaxHighlighter(parent), SyntaxHighlighter(parent),
m_regionDepth(0), m_regionDepth(0),
m_indentationBasedFolding(false), m_indentationBasedFolding(false),
m_tabSettings(0), m_tabSettings(0),
...@@ -90,24 +90,24 @@ Highlighter::Highlighter(QTextDocument *parent) : ...@@ -90,24 +90,24 @@ Highlighter::Highlighter(QTextDocument *parent) :
m_dynamicContextsCounter(0), m_dynamicContextsCounter(0),
m_isBroken(false) m_isBroken(false)
{ {
static QVector<TextEditor::TextStyle></