Commit 0816dcf3 authored by Mathieu Faverge's avatar Mathieu Faverge

Apply patch 3 from issue #13

parent 699ec1e4
......@@ -30,20 +30,8 @@
#include <QStylePainter>
#include <QStyleOptionSlider>
QxtSpanSliderPrivate::QxtSpanSliderPrivate() :
lower(0),
upper(0),
lowerPos(0),
upperPos(0),
offset(0),
position(0),
lastPressed(QxtSpanSlider::NoHandle),
mainControl(QxtSpanSlider::LowerHandle),
lowerPressed(QStyle::SC_None),
upperPressed(QStyle::SC_None),
movement(QxtSpanSlider::FreeMovement),
firstMovement(false),
blockTracking(false)
QxtSpanSliderPrivate::QxtSpanSliderPrivate()
{
}
......
......@@ -54,19 +54,19 @@ public:
void triggerAction(QAbstractSlider::SliderAction action, bool main);
void swapControls();
int lower;
int upper;
int lowerPos;
int upperPos;
int offset;
int position;
QxtSpanSlider::SpanHandle lastPressed;
QxtSpanSlider::SpanHandle mainControl;
QStyle::SubControl lowerPressed;
QStyle::SubControl upperPressed;
QxtSpanSlider::HandleMovementMode movement;
bool firstMovement;
bool blockTracking;
int lower {0};
int upper {0};
int lowerPos {0};
int upperPos {0};
int offset {0};
int position {0};
QxtSpanSlider::SpanHandle lastPressed {QxtSpanSlider::NoHandle};
QxtSpanSlider::SpanHandle mainControl {QxtSpanSlider::LowerHandle};
QStyle::SubControl lowerPressed {QStyle::SC_None};
QStyle::SubControl upperPressed {QStyle::SC_None};
QxtSpanSlider::HandleMovementMode movement {QxtSpanSlider::FreeMovement};
bool firstMovement {false};
bool blockTracking {false};
public Q_SLOTS:
void updateRange(int min, int max);
......
......@@ -51,7 +51,7 @@
using namespace std;
PajeFileManager::PajeFileManager() : _filename(""), _filesize(-1), _lineid(0), _nbtks(0) {
PajeFileManager::PajeFileManager() : _filename("") {
_tokens = new char*[_PAJE_NBMAXTKS];
}
......
......@@ -104,10 +104,10 @@ class PajeFileManager : public std::ifstream {
private:
std::string _filename;
long long _filesize;
long long _filesize {-1};
unsigned int _lineid;
int _nbtks;
unsigned int _lineid {0};
int _nbtks {0};
char** _tokens;
std::string _line;
......
......@@ -66,7 +66,7 @@
using namespace std;
ParserPaje::ParserPaje() : _ParserDefinition(new ParserDefinitionPaje()),
_ParserEvent(new ParserEventPaje(_ParserDefinition)), _file(nullptr){}
_ParserEvent(new ParserEventPaje(_ParserDefinition)) {}
ParserPaje::ParserPaje(const string &filename) : Parser(filename),
_ParserDefinition(new ParserDefinitionPaje()),
......
......@@ -64,7 +64,7 @@ class ParserPaje : public Parser{
private:
ParserDefinitionPaje *_ParserDefinition;
ParserEventPaje *_ParserEvent;
PajeFileManager *_file;
PajeFileManager *_file {nullptr};
public:
/*!
......
......@@ -4,8 +4,7 @@
#include "Shader.hpp"
/* Default constructor*/
Shader::Shader() : m_vertexID(0), m_fragmentID(0), m_programID(0),
m_vertex_code("#version 330 core \n"
Shader::Shader() : m_vertex_code("#version 330 core \n"
"in vec2 in_Vertex; \n"
"in vec3 in_Color; \n"
"uniform mat4 MVP; \n"
......
......@@ -43,9 +43,9 @@ class Shader
private:
GLuint m_vertexID;
GLuint m_fragmentID;
GLuint m_programID;
GLuint m_vertexID {0};
GLuint m_fragmentID {0};
GLuint m_programID {0};
std::string m_vertex_code;
std::string m_fragment_code;
......
......@@ -98,8 +98,8 @@ private:
*/
struct current_state_t {
Date start;
StateType *type;
EntityValue *value;
StateType *type {nullptr};
EntityValue *value {nullptr};
std::map<std::string, Value *> opt;
current_state_t(Date t, StateType *st, EntityValue *val,
......@@ -107,7 +107,7 @@ private:
: start(t), type(st), value(val), opt(o) {}
current_state_t()
: start(0), type(nullptr), value(nullptr) {}
: start(0) {}
};
std::stack<current_state_t> _current_states;
......@@ -116,9 +116,9 @@ private:
*/
struct current_link_t {
Date start;
LinkType *type;
Container *source;
EntityValue *value;
LinkType *type {nullptr};
Container *source {nullptr};
EntityValue *value {nullptr};
std::map<std::string, Value *> opt;
current_link_t(Date st, LinkType *ty, Container *src, EntityValue *val,
......@@ -126,7 +126,7 @@ private:
: start(st), type(ty), source(src), value(val), opt(o) {}
current_link_t()
: start(0), type(nullptr), source(nullptr), value(nullptr) {}
: start(0) {}
};
//stores unfinished sent messages
......
......@@ -63,7 +63,7 @@ Entity::Entity(Container *container, map<std::string, Value *> opt): _container(
}
Entity::Entity():_extra_fields(nullptr){};
Entity::Entity(){};
const Container *Entity::get_container() const {
return _container;
......
......@@ -54,7 +54,7 @@ class Container;
struct Entity {
private:
Container *_container;
std::map<std::string, Value *> *_extra_fields;
std::map<std::string, Value *> *_extra_fields {nullptr};
public:
/*
......
......@@ -54,7 +54,7 @@
#include <iostream>
Date::Date() : _value(0.0) {
Date::Date() {
_is_correct = true;
}
......
......@@ -56,7 +56,7 @@
*/
class Date: public Value {
private :
double _value;
double _value {0.0};
public :
/*!
......
......@@ -52,7 +52,7 @@
#include "trace/values/Double.hpp"
Double::Double() : _value(0.0) {
Double::Double() {
_is_correct = true;
}
......
......@@ -56,7 +56,7 @@
*/
class Double: public Value {
private :
double _value;
double _value {0.0};
public:
/*!
......
......@@ -52,7 +52,7 @@
#define sscanf sscanf_s
#endif
Hex::Hex() : _value(0) {
Hex::Hex() {
_is_correct = true;
}
......
......@@ -56,7 +56,7 @@
*/
class Hex: public Value {
private:
unsigned int _value;
unsigned int _value {0};
public:
/*!
......
......@@ -53,7 +53,7 @@
#define sscanf sscanf_s
#endif
Integer::Integer() : _value(0){
Integer::Integer() {
_is_correct = true;
}
......
......@@ -56,7 +56,7 @@
*/
class Integer: public Value {
private:
int _value;
int _value {0};
public:
/*!
* \brief Constructor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment