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
580bf35a
Commit
580bf35a
authored
Sep 27, 2010
by
dt
Browse files
Qt4Project: Remove dead code
parent
bbcd5706
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/project.cpp
View file @
580bf35a
...
...
@@ -298,21 +298,6 @@ EditorConfiguration *Project::editorConfiguration() const
return
d
->
m_editorConfiguration
;
}
QByteArray
Project
::
predefinedMacros
(
const
QString
&
)
const
{
return
QByteArray
();
}
QStringList
Project
::
includePaths
(
const
QString
&
)
const
{
return
QStringList
();
}
QStringList
Project
::
frameworkPaths
(
const
QString
&
)
const
{
return
QStringList
();
}
QString
Project
::
generatedUiHeader
(
const
QString
&
/* formFile */
)
const
{
return
QString
();
...
...
src/plugins/projectexplorer/project.h
View file @
580bf35a
...
...
@@ -111,12 +111,6 @@ public:
static
QString
makeUnique
(
const
QString
&
preferedName
,
const
QStringList
&
usedNames
);
// C++ specific
// TODO do a C++ project as a base ?
virtual
QByteArray
predefinedMacros
(
const
QString
&
fileName
)
const
;
virtual
QStringList
includePaths
(
const
QString
&
fileName
)
const
;
virtual
QStringList
frameworkPaths
(
const
QString
&
fileName
)
const
;
// Serialize all data into a QVariantMap. This map is then saved
// in the .user file of the project.
//
...
...
src/plugins/qt4projectmanager/qt4project.cpp
View file @
580bf35a
...
...
@@ -450,7 +450,6 @@ void Qt4Project::updateCppCodeModel()
QStringList
allPrecompileHeaders
;
// Collect per .pro file information
m_codeModelInfo
.
clear
();
foreach
(
Qt4ProFileNode
*
pro
,
proFiles
)
{
Internal
::
CodeModelInfo
info
;
info
.
defines
=
predefinedMacros
;
...
...
@@ -519,22 +518,6 @@ void Qt4Project::updateCppCodeModel()
// qDebug()<<info.includes;
// qDebug()<<info.frameworkPaths;
// qDebug()<<"\n";
#if 0
//Disable for now, we need better .pro file parsing first, and code model
//support to access this information
// TODO this is wastefull
// only save it per .pro file, and on being asked
// search for the .pro file that has that file
foreach (FileNode *fileNode, pro->fileNodes()) {
const QString path = fileNode->path();
const int type = fileNode->fileType();
if (type == HeaderType || type == SourceType) {
m_codeModelInfo.insert(path, info);
}
}
#endif
}
// Add mkspec directory
...
...
@@ -618,33 +601,6 @@ void Qt4Project::qtVersionsChanged()
setSupportedTargetIds
(
QtVersionManager
::
instance
()
->
supportedTargetIds
());
}
QByteArray
Qt4Project
::
predefinedMacros
(
const
QString
&
fileName
)
const
{
QMap
<
QString
,
CodeModelInfo
>::
const_iterator
it
=
m_codeModelInfo
.
constFind
(
fileName
);
if
(
it
==
m_codeModelInfo
.
constEnd
())
return
QByteArray
();
else
return
(
*
it
).
defines
;
}
QStringList
Qt4Project
::
includePaths
(
const
QString
&
fileName
)
const
{
QMap
<
QString
,
CodeModelInfo
>::
const_iterator
it
=
m_codeModelInfo
.
constFind
(
fileName
);
if
(
it
==
m_codeModelInfo
.
constEnd
())
return
QStringList
();
else
return
(
*
it
).
includes
;
}
QStringList
Qt4Project
::
frameworkPaths
(
const
QString
&
fileName
)
const
{
QMap
<
QString
,
CodeModelInfo
>::
const_iterator
it
=
m_codeModelInfo
.
constFind
(
fileName
);
if
(
it
==
m_codeModelInfo
.
constEnd
())
return
QStringList
();
else
return
(
*
it
).
frameworkPaths
;
}
///*!
// Updates complete project
// */
...
...
src/plugins/qt4projectmanager/qt4project.h
View file @
580bf35a
...
...
@@ -169,10 +169,6 @@ public:
void
notifyChanged
(
const
QString
&
name
);
virtual
QByteArray
predefinedMacros
(
const
QString
&
fileName
)
const
;
virtual
QStringList
includePaths
(
const
QString
&
fileName
)
const
;
virtual
QStringList
frameworkPaths
(
const
QString
&
fileName
)
const
;
/// \internal
Internal
::
ProFileReader
*
createProFileReader
(
Internal
::
Qt4ProFileNode
*
qt4ProFileNode
);
/// \internal
...
...
@@ -259,7 +255,6 @@ private:
bool
m_cancelEvaluate
;
QList
<
Internal
::
Qt4ProFileNode
*>
m_partialEvaluate
;
QMap
<
QString
,
Internal
::
CodeModelInfo
>
m_codeModelInfo
;
QFuture
<
void
>
m_codeModelFuture
;
Internal
::
CentralizedFolderWatcher
m_centralizedFolderWatcher
;
...
...
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