Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
ed69c399
Commit
ed69c399
authored
Mar 02, 2009
by
Roberto Raggi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More cleanup
parent
2553e250
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
16 deletions
+14
-16
src/libs/cplusplus/TypeOfExpression.cpp
src/libs/cplusplus/TypeOfExpression.cpp
+1
-2
src/libs/cplusplus/pp-engine.cpp
src/libs/cplusplus/pp-engine.cpp
+7
-7
src/libs/cplusplus/pp-engine.h
src/libs/cplusplus/pp-engine.h
+3
-3
src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/cpptools/cppmodelmanager.cpp
+3
-4
No files found.
src/libs/cplusplus/TypeOfExpression.cpp
View file @
ed69c399
...
...
@@ -139,7 +139,6 @@ QString TypeOfExpression::preprocessedExpression(const QString &expression,
&
env
,
&
processed
);
const
QByteArray
code
=
expression
.
toUtf8
();
Preprocessor
preproc
(
0
,
env
);
QByteArray
preprocessedCode
;
preproc
(
"<expression>"
,
code
,
&
preprocessedCode
);
const
QByteArray
preprocessedCode
=
preproc
(
"<expression>"
,
code
);
return
QString
::
fromUtf8
(
preprocessedCode
.
constData
(),
preprocessedCode
.
size
());
}
src/libs/cplusplus/pp-engine.cpp
View file @
ed69c399
...
...
@@ -485,25 +485,25 @@ QByteArray Preprocessor::operator()(const QByteArray &filename,
const
QByteArray
&
source
)
{
QByteArray
preprocessed
;
operator
()
(
filename
,
source
,
&
preprocessed
);
preprocess
(
filename
,
source
,
&
preprocessed
);
return
preprocessed
;
}
QByteArray
Preprocessor
::
operator
()(
const
QByteArray
&
source
)
{
QByteArray
preprocessed
;
operator
()
(
source
,
&
preprocessed
);
preprocess
(
source
,
&
preprocessed
);
return
preprocessed
;
}
void
Preprocessor
::
operator
()
(
const
QByteArray
&
filename
,
const
QByteArray
&
source
,
QByteArray
*
result
)
void
Preprocessor
::
preprocess
(
const
QByteArray
&
filename
,
const
QByteArray
&
source
,
QByteArray
*
result
)
{
const
QByteArray
previousFile
=
env
.
currentFile
;
env
.
currentFile
=
filename
;
operator
()
(
source
,
result
);
preprocess
(
source
,
result
);
env
.
currentFile
=
previousFile
;
}
...
...
@@ -523,7 +523,7 @@ Preprocessor::State Preprocessor::createStateFromSource(const QByteArray &source
return
state
;
}
void
Preprocessor
::
operator
()
(
const
QByteArray
&
source
,
QByteArray
*
result
)
void
Preprocessor
::
preprocess
(
const
QByteArray
&
source
,
QByteArray
*
result
)
{
pushState
(
createStateFromSource
(
source
));
...
...
src/libs/cplusplus/pp-engine.h
View file @
ed69c399
...
...
@@ -186,14 +186,14 @@ namespace CPlusPlus {
QByteArray
operator
()(
const
QByteArray
&
source
);
void
operator
()(
const
QByteArray
&
filename
,
private:
void
preprocess
(
const
QByteArray
&
filename
,
const
QByteArray
&
source
,
QByteArray
*
result
);
void
operator
()
(
const
QByteArray
&
source
,
void
preprocess
(
const
QByteArray
&
source
,
QByteArray
*
result
);
private:
void
resetIfLevel
();
bool
testIfLevel
();
int
skipping
()
const
;
...
...
src/plugins/cpptools/cppmodelmanager.cpp
View file @
ed69c399
...
...
@@ -202,7 +202,7 @@ protected:
private:
QPointer
<
CppModelManager
>
m_modelManager
;
Environment
env
;
Preprocessor
m_
proc
;
Preprocessor
pre
proc
ess
;
QStringList
m_includePaths
;
QStringList
m_systemIncludePaths
;
QMap
<
QString
,
QByteArray
>
m_workingCopy
;
...
...
@@ -220,7 +220,7 @@ private:
CppPreprocessor
::
CppPreprocessor
(
QPointer
<
CppModelManager
>
modelManager
)
:
snapshot
(
modelManager
->
snapshot
()),
m_modelManager
(
modelManager
),
m_
proc
(
this
,
env
)
pre
proc
ess
(
this
,
env
)
{
}
void
CppPreprocessor
::
setWorkingCopy
(
const
QMap
<
QString
,
QByteArray
>
&
workingCopy
)
...
...
@@ -506,8 +506,7 @@ void CppPreprocessor::sourceNeeded(QString &fileName, IncludeType type,
Document
::
Ptr
previousDoc
=
switchDocument
(
doc
);
QByteArray
preprocessedCode
;
m_proc
(
fileName
.
toUtf8
(),
contents
,
&
preprocessedCode
);
const
QByteArray
preprocessedCode
=
preprocess
(
fileName
.
toUtf8
(),
contents
);
doc
->
setSource
(
preprocessedCode
);
doc
->
tokenize
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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