feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Rename namespace Core::Utils into Utils

Browse Source 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
This commit is contained in:
Friedemann Kleint
2009-10-05 11:06:05 +02:00
parent 406d35acd6
commit 5948e284bb
249 changed files with 619 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -208,7 +208,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
if (const Core::MimeType headerMt = mdb->findByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)))
foreach (const QString &suffix, headerMt.suffixes())
m_ui->headerSuffixComboBox->addItem(suffix);
m_ui->licenseTemplatePathChooser->setExpectedKind(Core::Utils::PathChooser::File);
m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
}

4
src/plugins/cpptools/cppfilesettingspage.ui
View File

@@ -61,7 +61,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="Core::Utils::PathChooser" name="licenseTemplatePathChooser" native="true"/>
<widget class="Utils::PathChooser" name="licenseTemplatePathChooser" native="true"/>
</item>
</layout>
</widget>
@@ -83,7 +83,7 @@
</widget>
<customwidgets>
<customwidget>
<class>Core::Utils::PathChooser</class>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>

12
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -69,7 +69,7 @@ struct Process: protected ASTVisitor
{
public:
Process(Document::Ptr doc, const Snapshot &snapshot,
QFutureInterface<Core::Utils::FileSearchResult> *future)
QFutureInterface<Utils::FileSearchResult> *future)
: ASTVisitor(doc->control()),
_future(future),
_doc(doc),
@@ -129,7 +129,7 @@ protected:
const int len = tk.f.length;
if (_future)
_future->reportResult(Core::Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
_future->reportResult(Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
line, lineText, col, len));
_references.append(tokenIndex);
@@ -365,7 +365,7 @@ protected:
}
private:
QFutureInterface<Core::Utils::FileSearchResult> *_future;
QFutureInterface<Utils::FileSearchResult> *_future;
Identifier *_id; // ### remove me
Symbol *_declSymbol;
Document::Ptr _doc;
@@ -415,7 +415,7 @@ QList<int> CppFindReferences::references(Symbol *symbol,
return references;
}
static void find_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
static void find_helper(QFutureInterface<Utils::FileSearchResult> &future,
const QMap<QString, QString> wl,
Snapshot snapshot,
Symbol *symbol)
@@ -502,7 +502,7 @@ void CppFindReferences::findAll(Symbol *symbol)
Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
QFuture<Core::Utils::FileSearchResult> result = QtConcurrent::run(&find_helper, wl, snapshot, symbol);
QFuture<Utils::FileSearchResult> result = QtConcurrent::run(&find_helper, wl, snapshot, symbol);
m_watcher.setFuture(result);
Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching..."),
@@ -514,7 +514,7 @@ void CppFindReferences::findAll(Symbol *symbol)
void CppFindReferences::displayResult(int index)
{
Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index);
Utils::FileSearchResult result = m_watcher.future().resultAt(index);
Find::ResultWindowItem *item = _resultWindow->addResult(result.fileName,
result.lineNumber,
result.matchingLine,

2
src/plugins/cpptools/cppfindreferences.h
View File

@@ -72,7 +72,7 @@ private Q_SLOTS:
private:
QPointer<CppModelManager> _modelManager;
Find::SearchResultWindow *_resultWindow;
QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
QFutureWatcher<Utils::FileSearchResult> m_watcher;
};
} // end of namespace Internal

16
src/plugins/cpptools/cppsemanticsearch.cpp
View File

@@ -51,7 +51,7 @@ class SearchClass: public SemanticSearch
QTextDocument::FindFlags _findFlags;
public:
SearchClass(QFutureInterface<Core::Utils::FileSearchResult> &future,
SearchClass(QFutureInterface<Utils::FileSearchResult> &future,
Document::Ptr doc, Snapshot snapshot)
: SemanticSearch(future, doc, snapshot)
{ }
@@ -118,7 +118,7 @@ class SearchFunctionCall: public SemanticSearch
QTextDocument::FindFlags _findFlags;
public:
SearchFunctionCall(QFutureInterface<Core::Utils::FileSearchResult> &future,
SearchFunctionCall(QFutureInterface<Utils::FileSearchResult> &future,
Document::Ptr doc, Snapshot snapshot)
: SemanticSearch(future, doc, snapshot)
{ }
@@ -184,7 +184,7 @@ protected:
} // end of anonymous namespace
SemanticSearch::SemanticSearch(QFutureInterface<Core::Utils::FileSearchResult> &future,
SemanticSearch::SemanticSearch(QFutureInterface<Utils::FileSearchResult> &future,
Document::Ptr doc,
Snapshot snapshot)
: ASTVisitor(doc->control()),
@@ -236,11 +236,11 @@ void SemanticSearch::reportResult(unsigned tokenIndex, int offset, int len)
if (col)
--col; // adjust the column position.
_future.reportResult(Core::Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
_future.reportResult(Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
line, lineText, col + offset, len));
}
SemanticSearch *SearchClassDeclarationsFactory::create(QFutureInterface<Core::Utils::FileSearchResult> &future,
SemanticSearch *SearchClassDeclarationsFactory::create(QFutureInterface<Utils::FileSearchResult> &future,
Document::Ptr doc,
Snapshot snapshot)
{
@@ -250,7 +250,7 @@ SemanticSearch *SearchClassDeclarationsFactory::create(QFutureInterface<Core::Ut
return search;
}
SemanticSearch *SearchFunctionCallFactory::create(QFutureInterface<Core::Utils::FileSearchResult> &future,
SemanticSearch *SearchFunctionCallFactory::create(QFutureInterface<Utils::FileSearchResult> &future,
Document::Ptr doc,
Snapshot snapshot)
{
@@ -260,7 +260,7 @@ SemanticSearch *SearchFunctionCallFactory::create(QFutureInterface<Core::Utils::
return search;
}
static void semanticSearch_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
static void semanticSearch_helper(QFutureInterface<Utils::FileSearchResult> &future,
QPointer<CppModelManager> modelManager,
QMap<QString, QString> wl,
SemanticSearchFactory::Ptr factory)
@@ -300,7 +300,7 @@ static void semanticSearch_helper(QFutureInterface<Core::Utils::FileSearchResult
}
}
QFuture<Core::Utils::FileSearchResult> CppTools::Internal::semanticSearch(QPointer<CppModelManager> modelManager,
QFuture<Utils::FileSearchResult> CppTools::Internal::semanticSearch(QPointer<CppModelManager> modelManager,
SemanticSearchFactory::Ptr factory)
{
return QtConcurrent::run(&semanticSearch_helper, modelManager,

12
src/plugins/cpptools/cppsemanticsearch.h
View File

@@ -48,14 +48,14 @@ class SemanticSearchFactory;
class SemanticSearch: protected CPlusPlus::ASTVisitor
{
QFutureInterface<Core::Utils::FileSearchResult> &_future;
QFutureInterface<Utils::FileSearchResult> &_future;
CPlusPlus::Document::Ptr _doc;
CPlusPlus::Snapshot _snapshot;
CPlusPlus::Document::Ptr _thisDocument;
QByteArray _source;
public:
SemanticSearch(QFutureInterface<Core::Utils::FileSearchResult> &future,
SemanticSearch(QFutureInterface<Utils::FileSearchResult> &future,
CPlusPlus::Document::Ptr doc,
CPlusPlus::Snapshot snapshot);
@@ -81,7 +81,7 @@ public:
SemanticSearchFactory() {}
virtual ~SemanticSearchFactory() {}
virtual SemanticSearch *create(QFutureInterface<Core::Utils::FileSearchResult> &future,
virtual SemanticSearch *create(QFutureInterface<Utils::FileSearchResult> &future,
CPlusPlus::Document::Ptr doc,
CPlusPlus::Snapshot snapshot) = 0;
};
@@ -96,7 +96,7 @@ public:
: _text(text), _findFlags(findFlags)
{ }
virtual SemanticSearch *create(QFutureInterface<Core::Utils::FileSearchResult> &future,
virtual SemanticSearch *create(QFutureInterface<Utils::FileSearchResult> &future,
CPlusPlus::Document::Ptr doc,
CPlusPlus::Snapshot snapshot);
};
@@ -111,12 +111,12 @@ public:
: _text(text), _findFlags(findFlags)
{ }
virtual SemanticSearch *create(QFutureInterface<Core::Utils::FileSearchResult> &future,
virtual SemanticSearch *create(QFutureInterface<Utils::FileSearchResult> &future,
CPlusPlus::Document::Ptr doc,
CPlusPlus::Snapshot snapshot);
};
QFuture<Core::Utils::FileSearchResult> semanticSearch(QPointer<CppModelManager> modelManager,
QFuture<Utils::FileSearchResult> semanticSearch(QPointer<CppModelManager> modelManager,
SemanticSearchFactory::Ptr factory);

8
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -93,7 +93,7 @@ void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlag
SemanticSearchFactory::Ptr factory(new SearchClassDeclarationsFactory(text, findFlags));
QFuture<Core::Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
QFuture<Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
m_watcher.setFuture(result);
@@ -106,7 +106,7 @@ void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlag
void FindClassDeclarations::displayResult(int index)
{
Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index);
Utils::FileSearchResult result = m_watcher.future().resultAt(index);
Find::ResultWindowItem *item = _resultWindow->addResult(result.fileName,
result.lineNumber,
result.matchingLine,
@@ -146,7 +146,7 @@ void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags fi
SemanticSearchFactory::Ptr factory(new SearchFunctionCallFactory(text, findFlags));
QFuture<Core::Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
QFuture<Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
m_watcher.setFuture(result);
@@ -159,7 +159,7 @@ void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags fi
void FindFunctionCalls::displayResult(int index)
{
Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index);
Utils::FileSearchResult result = m_watcher.future().resultAt(index);
Find::ResultWindowItem *item = _resultWindow->addResult(result.fileName,
result.lineNumber,
result.matchingLine,

4
src/plugins/cpptools/cpptoolsplugin.h
View File

@@ -84,7 +84,7 @@ protected Q_SLOTS:
private:
QPointer<CppModelManager> _modelManager;
Find::SearchResultWindow *_resultWindow;
QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
QFutureWatcher<Utils::FileSearchResult> m_watcher;
};
class FindFunctionCalls: public Find::IFindFilter // ### share code with FindClassDeclarations
@@ -109,7 +109,7 @@ protected Q_SLOTS:
private:
QPointer<CppModelManager> _modelManager;
Find::SearchResultWindow *_resultWindow;
QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
QFutureWatcher<Utils::FileSearchResult> m_watcher;
};
class CppToolsPlugin : public ExtensionSystem::IPlugin