Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
3163e13c
Commit
3163e13c
authored
Dec 08, 2008
by
Kavindra Palaraja
Browse files
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
parents
764f9b3a
02488eeb
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/cpptools/cppmodelmanager.cpp
View file @
3163e13c
...
...
@@ -115,7 +115,6 @@ public:
void
setWorkingCopy
(
const
QMap
<
QString
,
QByteArray
>
&
workingCopy
);
void
setIncludePaths
(
const
QStringList
&
includePaths
);
void
setFrameworkPaths
(
const
QStringList
&
frameworkPaths
);
void
addIncludePath
(
const
QString
&
path
);
void
setProjectFiles
(
const
QStringList
&
files
);
void
run
(
QString
&
fileName
);
void
operator
()(
QString
&
fileName
);
...
...
@@ -170,9 +169,6 @@ void CppPreprocessor::setIncludePaths(const QStringList &includePaths)
void
CppPreprocessor
::
setFrameworkPaths
(
const
QStringList
&
frameworkPaths
)
{
m_frameworkPaths
=
frameworkPaths
;
}
void
CppPreprocessor
::
addIncludePath
(
const
QString
&
path
)
{
m_includePaths
.
append
(
path
);
}
void
CppPreprocessor
::
setProjectFiles
(
const
QStringList
&
files
)
{
m_projectFiles
=
files
;
}
...
...
@@ -488,14 +484,14 @@ void CppModelManager::ensureUpdated()
if
(
!
m_dirty
)
return
;
m_projectFiles
=
update
ProjectFiles
();
m_includePaths
=
update
IncludePaths
();
m_frameworkPaths
=
update
FrameworkPaths
();
m_definedMacros
=
update
DefinedMacros
();
m_projectFiles
=
internal
ProjectFiles
();
m_includePaths
=
internal
IncludePaths
();
m_frameworkPaths
=
internal
FrameworkPaths
();
m_definedMacros
=
internal
DefinedMacros
();
m_dirty
=
false
;
}
QStringList
CppModelManager
::
update
ProjectFiles
()
const
QStringList
CppModelManager
::
internal
ProjectFiles
()
const
{
QStringList
files
;
QMapIterator
<
ProjectExplorer
::
Project
*
,
ProjectInfo
>
it
(
m_projects
);
...
...
@@ -504,10 +500,11 @@ QStringList CppModelManager::updateProjectFiles() const
ProjectInfo
pinfo
=
it
.
value
();
files
+=
pinfo
.
sourceFiles
;
}
files
.
removeDuplicates
();
return
files
;
}
QStringList
CppModelManager
::
update
IncludePaths
()
const
QStringList
CppModelManager
::
internal
IncludePaths
()
const
{
QStringList
includePaths
;
QMapIterator
<
ProjectExplorer
::
Project
*
,
ProjectInfo
>
it
(
m_projects
);
...
...
@@ -516,10 +513,11 @@ QStringList CppModelManager::updateIncludePaths() const
ProjectInfo
pinfo
=
it
.
value
();
includePaths
+=
pinfo
.
includePaths
;
}
includePaths
.
removeDuplicates
();
return
includePaths
;
}
QStringList
CppModelManager
::
update
FrameworkPaths
()
const
QStringList
CppModelManager
::
internal
FrameworkPaths
()
const
{
QStringList
frameworkPaths
;
QMapIterator
<
ProjectExplorer
::
Project
*
,
ProjectInfo
>
it
(
m_projects
);
...
...
@@ -528,10 +526,11 @@ QStringList CppModelManager::updateFrameworkPaths() const
ProjectInfo
pinfo
=
it
.
value
();
frameworkPaths
+=
pinfo
.
frameworkPaths
;
}
frameworkPaths
.
removeDuplicates
();
return
frameworkPaths
;
}
QByteArray
CppModelManager
::
update
DefinedMacros
()
const
QByteArray
CppModelManager
::
internal
DefinedMacros
()
const
{
QByteArray
macros
;
QMapIterator
<
ProjectExplorer
::
Project
*
,
ProjectInfo
>
it
(
m_projects
);
...
...
@@ -588,6 +587,7 @@ void CppModelManager::updateProjectInfo(const ProjectInfo &pinfo)
return
;
m_projects
.
insert
(
pinfo
.
project
,
pinfo
);
m_dirty
=
true
;
}
QFuture
<
void
>
CppModelManager
::
refreshSourceFiles
(
const
QStringList
&
sourceFiles
)
...
...
src/plugins/cpptools/cppmodelmanager.h
View file @
3163e13c
...
...
@@ -133,10 +133,10 @@ private:
}
void
ensureUpdated
();
QStringList
update
ProjectFiles
()
const
;
QStringList
update
IncludePaths
()
const
;
QStringList
update
FrameworkPaths
()
const
;
QByteArray
update
DefinedMacros
()
const
;
QStringList
internal
ProjectFiles
()
const
;
QStringList
internal
IncludePaths
()
const
;
QStringList
internal
FrameworkPaths
()
const
;
QByteArray
internal
DefinedMacros
()
const
;
static
void
parse
(
QFutureInterface
<
void
>
&
future
,
CppPreprocessor
*
preproc
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment