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
Marco Bubke
flatpak-qt-creator
Commits
f09eca29
Commit
f09eca29
authored
Jun 18, 2010
by
Oswald Buddenhagen
Browse files
inline last use of ProFileReader::readProFile()
parent
82e10eae
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/profilereader.cpp
View file @
f09eca29
...
...
@@ -89,16 +89,6 @@ ProFileReader::~ProFileReader()
pf
->
deref
();
}
bool
ProFileReader
::
readProFile
(
const
QString
&
fileName
)
{
if
(
ProFile
*
pro
=
parsedProFile
(
fileName
))
{
bool
ok
=
accept
(
pro
);
pro
->
deref
();
return
ok
;
}
return
false
;
}
void
ProFileReader
::
aboutToEval
(
ProFile
*
,
ProFile
*
pro
,
EvalFileType
type
)
{
if
(
m_ignoreLevel
||
(
type
!=
EvalProjectFile
&&
type
!=
EvalIncludeFile
))
{
...
...
src/plugins/qt4projectmanager/profilereader.h
View file @
f09eca29
...
...
@@ -71,8 +71,6 @@ public:
ProFileReader
(
ProFileOption
*
option
);
~
ProFileReader
();
// fileName is expected to be absolute and cleanPath()ed.
bool
readProFile
(
const
QString
&
fileName
);
QList
<
ProFile
*>
includeFiles
()
const
;
ProFile
*
proFileFor
(
const
QString
&
name
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
View file @
f09eca29
...
...
@@ -421,8 +421,12 @@ void MaemoPackageContents::parseProFile(ParseType type) const
m_proFile
=
m_proFileReader
->
parsedProFile
(
m_proFileName
,
false
,
m_proFileLines
.
join
(
"
\n
"
));
}
else
{
m_proFile
=
m_proFileReader
->
readProFile
(
m_proFileName
)
?
m_proFileReader
->
proFileFor
(
m_proFileName
)
:
0
;
m_proFile
=
0
;
if
(
ProFile
*
pro
=
m_proFileReader
->
parsedProFile
(
m_proFileName
))
{
if
(
m_proFileReader
->
accept
(
pro
))
m_proFile
=
pro
;
pro
->
deref
();
}
}
}
...
...
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