Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenFlipper
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenFlipper-Free
OpenFlipper
Commits
e874e5b7
Commit
e874e5b7
authored
7 years ago
by
Jan Möbius
Browse files
Options
Downloads
Patches
Plain Diff
- Remove QT4 ifdefs
refs #141
parent
3f31babe
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!86
Removed qt4 ifdefs
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
common/BaseObject.hh
+0
-9
0 additions, 9 deletions
common/BaseObject.hh
with
0 additions
and
9 deletions
common/BaseObject.hh
+
0
−
9
View file @
e874e5b7
...
...
@@ -77,10 +77,8 @@
#include
<vector>
#include
<QMap>
#include
"perObjectData.hh"
#if QT_VERSION >= 0x050000
#include
<QJsonDocument>
#include
<QJsonObject>
#endif
//== TYPEDEFS =================================================================
...
...
@@ -598,7 +596,6 @@ class DLLEXPORT BaseObject : public QObject {
/*
* Compose JSON parsable object.
*/
#if QT_VERSION >= 0x050000
QJsonObject
comment_obj
;
for
(
QMap
<
QString
,
QString
>::
const_iterator
it
=
commentsByKey_
.
begin
(),
it_end
=
commentsByKey_
.
end
();
it
!=
it_end
;
++
it
)
{
...
...
@@ -614,12 +611,6 @@ class DLLEXPORT BaseObject : public QObject {
}
}
result
.
append
(
QString
::
fromUtf8
(
QJsonDocument
(
comment_obj
).
toJson
(
QJsonDocument
::
Indented
)));
#else
for
(
QMap
<
QString
,
QString
>::
const_iterator
it
=
commentsByKey_
.
begin
(),
it_end
=
commentsByKey_
.
end
();
it
!=
it_end
;
++
it
)
{
result
.
append
(
QString
(
"%1: %2"
).
arg
(
it
.
key
(),
it
.
value
()));
}
#endif
result
.
append
(
QString
(
"END Comments for object
\"
%1
\"\n
"
).
arg
(
name
()));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment