summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 05:23:01 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 05:31:37 (GMT)
commit357c2f923f5ba694e4f25c2da13db3ecb60bb19f (patch)
treed79a5d8cbead084a861b3c7346915e155732e320
parent019df53b4e5aed978f686bda588c8383e71b950a (diff)
Group boolean members for improved byte layout
-rw-r--r--src/lib/marble/AbstractWorkerThread.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLineStyle.cpp6
-rw-r--r--src/lib/marble/geodata/data/GeoDataTrack.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/marble/AbstractWorkerThread.cpp b/src/lib/marble/AbstractWorkerThread.cpp
index b8d17ec..a58489c 100644
--- a/src/lib/marble/AbstractWorkerThread.cpp
+++ b/src/lib/marble/AbstractWorkerThread.cpp
@@ -37,8 +37,8 @@ class AbstractWorkerThreadPrivate
m_parent->wait( 1000 );
}
- bool m_running;
QMutex m_runningMutex;
+ bool m_running;
bool m_end;
AbstractWorkerThread *m_parent;
diff --git a/src/lib/marble/geodata/data/GeoDataLineStyle.cpp b/src/lib/marble/geodata/data/GeoDataLineStyle.cpp
index cd29d4b..9a502be 100644
--- a/src/lib/marble/geodata/data/GeoDataLineStyle.cpp
+++ b/src/lib/marble/geodata/data/GeoDataLineStyle.cpp
@@ -23,8 +23,8 @@ class GeoDataLineStylePrivate
public:
GeoDataLineStylePrivate()
: m_width( 1.0 ), m_physicalWidth( 0.0 ),
- m_cosmeticOutline( false ), m_capStyle( Qt::FlatCap ),
- m_penStyle( Qt::SolidLine ), m_background( false )
+ m_capStyle( Qt::FlatCap ), m_penStyle( Qt::SolidLine ),
+ m_cosmeticOutline( false ), m_background( false )
{
}
@@ -37,9 +37,9 @@ class GeoDataLineStylePrivate
float m_width;
/// The current real width of the line
float m_physicalWidth;
- bool m_cosmeticOutline;
Qt::PenCapStyle m_capStyle;
Qt::PenStyle m_penStyle;
+ bool m_cosmeticOutline;
bool m_background;
QVector< qreal > m_pattern;
};
diff --git a/src/lib/marble/geodata/data/GeoDataTrack.cpp b/src/lib/marble/geodata/data/GeoDataTrack.cpp
index 2bf61fa..77934b7 100644
--- a/src/lib/marble/geodata/data/GeoDataTrack.cpp
+++ b/src/lib/marble/geodata/data/GeoDataTrack.cpp
@@ -51,12 +51,12 @@ public:
GeoDataLineString m_lineString;
bool m_lineStringNeedsUpdate;
+ bool m_interpolate;
+
QVector<QDateTime> m_when;
QVector<GeoDataCoordinates> m_coordinates;
GeoDataExtendedData m_extendedData;
-
- bool m_interpolate;
};
GeoDataTrack::GeoDataTrack() :