HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[STYLE] remove (void) in () to be c++ coherent

Browse Source
This commit is contained in:
Edouard DUPIN 2014-05-15 21:37:39 +02:00
parent f1543f6199
commit 2d8c5d588d
60 changed files with 314 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sources/appl/Buffer.cpp
View File

@ -21,7 +21,7 @@ const char* const appl::Buffer::eventIsSave = "edn-is-save";
const char* const appl::Buffer::eventSelectChange = "edn-select-change"; const char* const appl::Buffer::eventSelectChange = "edn-select-change";
const char* const appl::Buffer::eventChangeName = "edn-buffer-name-change"; const char* const appl::Buffer::eventChangeName = "edn-buffer-name-change";
appl::Buffer::Iterator& appl::Buffer::Iterator::operator++ (void) { appl::Buffer::Iterator& appl::Buffer::Iterator::operator++ () {
m_value = u32char::Null; m_value = u32char::Null;
if (m_current < 0) { if (m_current < 0) {
m_current = 0; m_current = 0;
@ -43,7 +43,7 @@ appl::Buffer::Iterator& appl::Buffer::Iterator::operator++ (void) {
return *this; return *this;
} }
appl::Buffer::Iterator& appl::Buffer::Iterator::operator-- (void) { appl::Buffer::Iterator& appl::Buffer::Iterator::operator-- () {
m_value = u32char::Null; m_value = u32char::Null;
if (m_data != NULL) { if (m_data != NULL) {
if (m_current > 0) { if (m_current > 0) {
@ -64,7 +64,7 @@ appl::Buffer::Iterator& appl::Buffer::Iterator::operator-- (void) {
return *this; return *this;
} }
char32_t appl::Buffer::Iterator::operator* (void) { char32_t appl::Buffer::Iterator::operator* () {
if (m_value != u32char::Null) { if (m_value != u32char::Null) {
return m_value; return m_value;
} }
@ -94,32 +94,32 @@ appl::Buffer::Iterator appl::Buffer::position(int64_t _pos) {
return appl::Buffer::Iterator(this, _pos); return appl::Buffer::Iterator(this, _pos);
} }
appl::Buffer::Iterator appl::Buffer::begin(void) { appl::Buffer::Iterator appl::Buffer::begin() {
return position(0); return position(0);
} }
appl::Buffer::Iterator appl::Buffer::end(void) { appl::Buffer::Iterator appl::Buffer::end() {
// TODO : chek the validity of the char ... // TODO : chek the validity of the char ...
return position( m_data.size() ); return position( m_data.size() );
} }
appl::Buffer::Iterator appl::Buffer::cursor(void) { appl::Buffer::Iterator appl::Buffer::cursor() {
if (m_cursorPos<= 0) { if (m_cursorPos<= 0) {
return begin(); return begin();
} }
return position( m_cursorPos ); return position( m_cursorPos );
} }
appl::Buffer::Iterator appl::Buffer::selectStart(void) { appl::Buffer::Iterator appl::Buffer::selectStart() {
return position( getStartSelectionPos() ); return position( getStartSelectionPos() );
} }
appl::Buffer::Iterator appl::Buffer::selectStop(void) { appl::Buffer::Iterator appl::Buffer::selectStop() {
return position( getStopSelectionPos() ); return position( getStopSelectionPos() );
} }
appl::Buffer::Buffer(void) : appl::Buffer::Buffer() :
m_hasFileName(false), m_hasFileName(false),
m_fileName(""), m_fileName(""),
m_isModify(false), m_isModify(false),
@ -138,7 +138,7 @@ appl::Buffer::Buffer(void) :
addEventId(eventChangeName); addEventId(eventChangeName);
} }
appl::Buffer::~Buffer(void) { appl::Buffer::~Buffer() {
if (m_highlight == NULL) { if (m_highlight == NULL) {
appl::Highlight::release(m_highlight); appl::Highlight::release(m_highlight);
} }
@ -177,7 +177,7 @@ void appl::Buffer::setFileName(const std::string& _name) {
setModification(true); setModification(true);
} }
bool appl::Buffer::storeFile(void) { bool appl::Buffer::storeFile() {
if (m_data.dumpIn(m_fileName) == true) { if (m_data.dumpIn(m_fileName) == true) {
APPL_INFO("saving file : " << m_fileName); APPL_INFO("saving file : " << m_fileName);
setModification(false); setModification(false);
@ -199,7 +199,7 @@ void appl::Buffer::setModification(bool _status) {
} }
// TODO : Naming error // TODO : Naming error
void appl::Buffer::countNumberofLine(void) { void appl::Buffer::countNumberofLine() {
m_nbLines = 1; m_nbLines = 1;
for (Iterator it = begin(); for (Iterator it = begin();
(bool)it == true; (bool)it == true;
@ -519,7 +519,7 @@ void appl::Buffer::setSelectionPos(const appl::Buffer::Iterator& _pos) {
generateEventId(eventSelectChange); generateEventId(eventSelectChange);
} }
void appl::Buffer::unSelect(void) { void appl::Buffer::unSelect() {
m_cursorSelectPos = -1; m_cursorSelectPos = -1;
generateEventId(eventSelectChange); generateEventId(eventSelectChange);
} }
@ -667,7 +667,7 @@ bool appl::Buffer::replace(const std::string& _data, const appl::Buffer::Iterato
return true; return true;
} }
void appl::Buffer::removeSelection(void) { void appl::Buffer::removeSelection() {
if (hasTextSelected() == false) { if (hasTextSelected() == false) {
return; return;
} }
@ -681,7 +681,7 @@ void appl::Buffer::removeSelection(void) {
setModification(true); setModification(true);
} }
void appl::Buffer::tryFindHighlightType(void) { void appl::Buffer::tryFindHighlightType() {
etk::FSNode file(m_fileName); etk::FSNode file(m_fileName);
std::string type = appl::highlightManager::getTypeExtention(file.fileGetExtention()); std::string type = appl::highlightManager::getTypeExtention(file.fileGetExtention());
if (type.size() == 0) { if (type.size() == 0) {
@ -868,7 +868,7 @@ void appl::Buffer::generateHighLightAt(int64_t _pos, int64_t _endPos, int64_t _a
m_highlight->parse(_pos, _endPos, m_HLDataPass1, _addingPos, m_data); m_highlight->parse(_pos, _endPos, m_HLDataPass1, _addingPos, m_data);
} }
void appl::Buffer::cleanHighLight(void) { void appl::Buffer::cleanHighLight() {
// remove all element in the list... // remove all element in the list...
m_HLDataPass1.clear(); m_HLDataPass1.clear();
} }
@ -980,7 +980,7 @@ appl::HighlightInfo* appl::Buffer::getElementColorAtPosition(appl::DisplayHLData
return getElementColorAtPosition(_pos, _MData.posHLPass1); return getElementColorAtPosition(_pos, _MData.posHLPass1);
} }
uint32_t appl::Buffer::getCursorLinesId(void) { uint32_t appl::Buffer::getCursorLinesId() {
if (m_data.size() == 0) { if (m_data.size() == 0) {
return 0; return 0;
} }

66
sources/appl/Buffer.h
View File

@ -38,7 +38,7 @@ namespace appl {
/** /**
* @brief Basic itarator constructor with no link. * @brief Basic itarator constructor with no link.
*/ */
Iterator(void): Iterator():
m_current(0), m_current(0),
m_data(NULL), m_data(NULL),
m_value(u32char::Null) { m_value(u32char::Null) {
@ -68,7 +68,7 @@ namespace appl {
/** /**
* @brief Basic destructor * @brief Basic destructor
*/ */
~Iterator(void) { ~Iterator() {
m_current = 0; m_current = 0;
m_data = NULL; m_data = NULL;
m_value = u32char::Null; m_value = u32char::Null;
@ -77,7 +77,7 @@ namespace appl {
* @brief basic boolean cast * @brief basic boolean cast
* @return true if the element is present in buffer * @return true if the element is present in buffer
*/ */
operator bool (void) const { operator bool () const {
if (m_data == NULL) { if (m_data == NULL) {
return false; return false;
} }
@ -93,7 +93,7 @@ namespace appl {
* @brief basic boolean cast * @brief basic boolean cast
* @return true if the element is present in buffer * @return true if the element is present in buffer
*/ */
operator int64_t (void) const { operator int64_t () const {
if (m_data == NULL) { if (m_data == NULL) {
return 0; return 0;
} }
@ -109,12 +109,12 @@ namespace appl {
* @brief Incremental operator * @brief Incremental operator
* @return Reference on the current iterator incremented * @return Reference on the current iterator incremented
*/ */
Iterator& operator++ (void); Iterator& operator++ ();
/** /**
* @brief Decremental operator * @brief Decremental operator
* @return Reference on the current iterator decremented * @return Reference on the current iterator decremented
*/ */
Iterator& operator-- (void); Iterator& operator-- ();
/** /**
* @brief Incremental operator * @brief Incremental operator
* @return Reference on a new iterator and increment the other one * @return Reference on a new iterator and increment the other one
@ -211,12 +211,12 @@ namespace appl {
* @brief Get the value on the current element * @brief Get the value on the current element
* @return The request element value * @return The request element value
*/ */
char32_t operator* (void); char32_t operator* ();
/** /**
* @brief Get the position in the buffer * @brief Get the position in the buffer
* @return The requested position. * @return The requested position.
*/ */
int64_t getPos(void) const { int64_t getPos() const {
if (m_data == NULL) { if (m_data == NULL) {
return 0; return 0;
} }
@ -293,8 +293,8 @@ namespace appl {
static const char* const eventSelectChange; static const char* const eventSelectChange;
static const char* const eventChangeName; static const char* const eventChangeName;
public: public:
Buffer(void); Buffer();
~Buffer(void); ~Buffer();
private: private:
bool m_hasFileName; //!< when new file, the buffer has no name ==> but it might be reference with a single name ... bool m_hasFileName; //!< when new file, the buffer has no name ==> but it might be reference with a single name ...
std::string m_fileName; //!< name of the file (with his path) std::string m_fileName; //!< name of the file (with his path)
@ -302,14 +302,14 @@ namespace appl {
/** /**
* @brief get the curent filename of the Buffer * @brief get the curent filename of the Buffer
*/ */
const std::string& getFileName(void) { const std::string& getFileName() {
return m_fileName; return m_fileName;
} }
/** /**
* @brief Check if the buffer has a real filename. * @brief Check if the buffer has a real filename.
* @return the status of the existance of a name. * @return the status of the existance of a name.
*/ */
bool hasFileName(void) { bool hasFileName() {
return m_hasFileName; return m_hasFileName;
} }
/** /**
@ -327,7 +327,7 @@ namespace appl {
* @brief save the file in the specify path. * @brief save the file in the specify path.
* @return true is saving well done * @return true is saving well done
*/ */
bool storeFile(void); bool storeFile();
protected: protected:
bool m_isModify; //!< true if the file is modify bool m_isModify; //!< true if the file is modify
public: public:
@ -335,7 +335,7 @@ namespace appl {
* @breif get the status of file modification. * @breif get the status of file modification.
* @return true if file is modify. * @return true if file is modify.
*/ */
bool isModify(void) { bool isModify() {
return m_isModify; return m_isModify;
} }
/** /**
@ -346,7 +346,7 @@ namespace appl {
protected: protected:
etk::Buffer m_data; //!< copy of the file buffer etk::Buffer m_data; //!< copy of the file buffer
public: public:
etk::Buffer& getData(void) { etk::Buffer& getData() {
return m_data; return m_data;
}; };
protected: protected:
@ -364,30 +364,30 @@ namespace appl {
/** /**
* @brief Remove Selection of the buffer. * @brief Remove Selection of the buffer.
*/ */
void unSelect(void); void unSelect();
/** /**
* @brief Remove the selection of the buffer. (do nothing if no secection) * @brief Remove the selection of the buffer. (do nothing if no secection)
*/ */
void removeSelection(void); void removeSelection();
/** /**
* @brief Get the status of selection. * @brief Get the status of selection.
* @return true if we have a curent selection, false otherwise. * @return true if we have a curent selection, false otherwise.
*/ */
bool hasTextSelected(void) { bool hasTextSelected() {
return m_cursorSelectPos >= 0; return m_cursorSelectPos >= 0;
} }
/** /**
* @brief Get the Start position of the selection. * @brief Get the Start position of the selection.
* @return position of the start selection. * @return position of the start selection.
*/ */
int64_t getStartSelectionPos(void) { int64_t getStartSelectionPos() {
return etk_min(m_cursorPos, m_cursorSelectPos); return etk_min(m_cursorPos, m_cursorSelectPos);
} }
/** /**
* @brief Get the Stop position of the selection. * @brief Get the Stop position of the selection.
* @return position of the stop selection. * @return position of the stop selection.
*/ */
int64_t getStopSelectionPos(void) { int64_t getStopSelectionPos() {
return etk_max(m_cursorPos, m_cursorSelectPos); return etk_max(m_cursorPos, m_cursorSelectPos);
} }
protected: protected:
@ -404,7 +404,7 @@ namespace appl {
* @brief Get the favorite distance from the left screen (For up and down moving). * @brief Get the favorite distance from the left screen (For up and down moving).
* @return The distance in pixels. * @return The distance in pixels.
*/ */
float getFavoriteUpDownPos(void) { float getFavoriteUpDownPos() {
return m_cursorPreferredCol; return m_cursorPreferredCol;
} }
protected: protected:
@ -421,7 +421,7 @@ namespace appl {
* @brief Get the selection mode (if true, the move event creata a selection) * @brief Get the selection mode (if true, the move event creata a selection)
* @return The selecting mode. * @return The selecting mode.
*/ */
bool getSelectMode(void) { bool getSelectMode() {
return m_selectMode; return m_selectMode;
} }
public: public:
@ -544,27 +544,27 @@ namespace appl {
* @brief Get an Iterator on the start position. * @brief Get an Iterator on the start position.
* @return The Iterator * @return The Iterator
*/ */
Iterator begin(void); Iterator begin();
/** /**
* @brief Get an Iterator on the end position. * @brief Get an Iterator on the end position.
* @return The Iterator * @return The Iterator
*/ */
Iterator end(void); Iterator end();
/** /**
* @brief Get an Iterator on the cursor position. * @brief Get an Iterator on the cursor position.
* @return The Iterator * @return The Iterator
*/ */
Iterator cursor(void); Iterator cursor();
/** /**
* @brief Get an Iterator on the start selection. * @brief Get an Iterator on the start selection.
* @return The Iterator * @return The Iterator
*/ */
Iterator selectStart(void); Iterator selectStart();
/** /**
* @brief Get an Iterator on the stop selection. * @brief Get an Iterator on the stop selection.
* @return The Iterator * @return The Iterator
*/ */
Iterator selectStop(void); Iterator selectStop();
protected: protected:
int32_t m_nbLines; //!< number of line in the buffer int32_t m_nbLines; //!< number of line in the buffer
public: public:
@ -572,19 +572,19 @@ namespace appl {
* @brief Get the number of line in the buffer. * @brief Get the number of line in the buffer.
* @return number of line in the Buffer. * @return number of line in the Buffer.
*/ */
int32_t getNumberOfLines(void) { int32_t getNumberOfLines() {
return m_nbLines; return m_nbLines;
} }
/** /**
* @brief Get the cursor line numberin the buffer. * @brief Get the cursor line numberin the buffer.
* @return the line id in the Buffer. * @return the line id in the Buffer.
*/ */
uint32_t getCursorLinesId(void); uint32_t getCursorLinesId();
protected: protected:
/** /**
* @brief Count the number of line in the buffer * @brief Count the number of line in the buffer
*/ */
void countNumberofLine(void); void countNumberofLine();
protected: protected:
std::string m_highlightType; //!< Name of the highlight type std::string m_highlightType; //!< Name of the highlight type
@ -594,7 +594,7 @@ namespace appl {
/** /**
* @brief Find the Highligh capability * @brief Find the Highligh capability
*/ */
void tryFindHighlightType(void); void tryFindHighlightType();
/** /**
* @brief Set type of highlight * @brief Set type of highlight
* @param[in] _type type of the highlight * @param[in] _type type of the highlight
@ -604,7 +604,7 @@ namespace appl {
* @brief Get type of highlight * @brief Get type of highlight
* @return Type of the highlight * @return Type of the highlight
*/ */
const std::string& setHighlightType(void) { const std::string& setHighlightType() {
return m_highlightType; return m_highlightType;
}; };
@ -615,7 +615,7 @@ namespace appl {
int64_t& _stopId, int64_t& _stopId,
bool _backPreviousNotEnded); bool _backPreviousNotEnded);
void generateHighLightAt(int64_t _pos, int64_t _endPos, int64_t _addingPos=0); void generateHighLightAt(int64_t _pos, int64_t _endPos, int64_t _addingPos=0);
void cleanHighLight(void); void cleanHighLight();
appl::HighlightInfo* getElementColorAtPosition(int64_t _pos, int64_t &_starPos); appl::HighlightInfo* getElementColorAtPosition(int64_t _pos, int64_t &_starPos);
void hightlightGenerateLines(appl::DisplayHLData& _MData, const appl::Buffer::Iterator& _HLStart, int64_t _nbLines); void hightlightGenerateLines(appl::DisplayHLData& _MData, const appl::Buffer::Iterator& _HLStart, int64_t _nbLines);
appl::HighlightInfo* getElementColorAtPosition(appl::DisplayHLData& _MData, int64_t _pos); appl::HighlightInfo* getElementColorAtPosition(appl::DisplayHLData& _MData, int64_t _pos);

8
sources/appl/BufferManager.cpp
View File

@ -18,13 +18,13 @@
#undef __class__ #undef __class__
#define __class__ "BufferManager" #define __class__ "BufferManager"
appl::BufferManager::BufferManager(void) : appl::BufferManager::BufferManager() :
ewol::Resource("???BufferManager???"), ewol::Resource("???BufferManager???"),
m_bufferSelected(NULL) { m_bufferSelected(NULL) {
addObjectType("appl::BufferManager"); addObjectType("appl::BufferManager");
} }
appl::BufferManager::~BufferManager(void) { appl::BufferManager::~BufferManager() {
int32_t previousCount = m_list.size(); int32_t previousCount = m_list.size();
for (int32_t iii = m_list.size()-1; iii >= 0 ; --iii) { for (int32_t iii = m_list.size()-1; iii >= 0 ; --iii) {
if (m_list[iii] == NULL) { if (m_list[iii] == NULL) {
@ -40,7 +40,7 @@ appl::BufferManager::~BufferManager(void) {
} }
appl::Buffer* appl::BufferManager::createNewBuffer(void) { appl::Buffer* appl::BufferManager::createNewBuffer() {
appl::Buffer* tmp = new appl::Buffer(); appl::Buffer* tmp = new appl::Buffer();
if (tmp == NULL) { if (tmp == NULL) {
APPL_ERROR("Can not allocate the Buffer (empty)."); APPL_ERROR("Can not allocate the Buffer (empty).");
@ -123,7 +123,7 @@ void appl::BufferManager::onReceiveMessage(const ewol::object::Message& _msg) {
APPL_DEBUG("receive message !!! " << _msg); APPL_DEBUG("receive message !!! " << _msg);
} }
appl::BufferManager* appl::BufferManager::keep(void) { appl::BufferManager* appl::BufferManager::keep() {
//EWOL_INFO("KEEP : appl::GlyphPainting : file : \"" << _filename << "\""); //EWOL_INFO("KEEP : appl::GlyphPainting : file : \"" << _filename << "\"");
appl::BufferManager* object = static_cast<appl::BufferManager*>(getManager().localKeep("???BufferManager???")); appl::BufferManager* object = static_cast<appl::BufferManager*>(getManager().localKeep("???BufferManager???"));
if (NULL != object) { if (NULL != object) {

12
sources/appl/BufferManager.h
View File

@ -17,8 +17,8 @@
namespace appl { namespace appl {
class BufferManager : public ewol::Resource { class BufferManager : public ewol::Resource {
protected: protected:
BufferManager(void); BufferManager();
~BufferManager(void); ~BufferManager();
private: private:
std::vector<appl::Buffer*> m_list; // list of all buffer curently open std::vector<appl::Buffer*> m_list; // list of all buffer curently open
public: public:
@ -44,7 +44,7 @@ namespace appl {
* @brief Get count of all buffer availlable. * @brief Get count of all buffer availlable.
* @return Number of buffer * @return Number of buffer
*/ */
int32_t size(void) const { int32_t size() const {
return m_list.size(); return m_list.size();
} }
/** /**
@ -59,7 +59,7 @@ namespace appl {
* @brief Create a new buffer empty. * @brief Create a new buffer empty.
* @return Created buffer or NULL. * @return Created buffer or NULL.
*/ */
appl::Buffer* createNewBuffer(void); appl::Buffer* createNewBuffer();
private: private:
appl::Buffer* m_bufferSelected; appl::Buffer* m_bufferSelected;
public: public:
@ -72,7 +72,7 @@ namespace appl {
* @brief Get the current buffer selected * @brief Get the current buffer selected
* @return Pointer on the buffer selected * @return Pointer on the buffer selected
*/ */
appl::Buffer* getBufferSelected(void) { appl::Buffer* getBufferSelected() {
return m_bufferSelected; return m_bufferSelected;
}; };
public: // herited function public: // herited function
@ -85,7 +85,7 @@ namespace appl {
* @param[in] _filename Name of the configuration file. * @param[in] _filename Name of the configuration file.
* @return pointer on the resource or NULL if an error occured. * @return pointer on the resource or NULL if an error occured.
*/ */
static appl::BufferManager* keep(void); static appl::BufferManager* keep();
/** /**
* @brief release the keeped resources * @brief release the keeped resources
* @param[in,out] reference on the object pointer * @param[in,out] reference on the object pointer

16
sources/appl/GlyphDecoration.h
View File

@ -17,7 +17,7 @@ namespace appl {
public: public:
// Constructeur // Constructeur
GlyphDecoration(const std::string& _newColorName = "no_name"); GlyphDecoration(const std::string& _newColorName = "no_name");
~GlyphDecoration(void) { ~GlyphDecoration() {
// nothing to do ... // nothing to do ...
}; };
private: private:
@ -34,7 +34,7 @@ namespace appl {
* @brief Get the color name. * @brief Get the color name.
* @return The name of the color. * @return The name of the color.
*/ */
const std::string& getName(void) const { const std::string& getName() const {
return m_colorName; return m_colorName;
}; };
private: private:
@ -51,14 +51,14 @@ namespace appl {
* @brief Get the foreground color. * @brief Get the foreground color.
* @return The color. * @return The color.
*/ */
const etk::Color<>& getForeground(void) const { const etk::Color<>& getForeground() const {
return m_colorFG; return m_colorFG;
}; };
/** /**
* @brief Get the foreground color status. * @brief Get the foreground color status.
* @return true if the color is visible. * @return true if the color is visible.
*/ */
bool haveFg(void) const { bool haveFg() const {
return m_colorFG.a() != 0; return m_colorFG.a() != 0;
}; };
private: private:
@ -75,14 +75,14 @@ namespace appl {
* @brief Get the background color. * @brief Get the background color.
* @return The color. * @return The color.
*/ */
const etk::Color<>& getBackground(void) const { const etk::Color<>& getBackground() const {
return m_colorBG; return m_colorBG;
}; };
/** /**
* @brief Get the background color status. * @brief Get the background color status.
* @return true if the color is visible. * @return true if the color is visible.
*/ */
bool haveBackground(void) const { bool haveBackground() const {
return m_colorBG.a()!=0; return m_colorBG.a()!=0;
}; };
private: private:
@ -97,7 +97,7 @@ namespace appl {
* @brief Get the italic status. * @brief Get the italic status.
* @return true if the glyph might be display in italic. * @return true if the glyph might be display in italic.
*/ */
bool getItalic(void) const { bool getItalic() const {
return m_italic; return m_italic;
}; };
private: private:
@ -112,7 +112,7 @@ namespace appl {
* @brief Get the bold status. * @brief Get the bold status.
* @return true if the glyph might be display in bold. * @return true if the glyph might be display in bold.
*/ */
bool getBold(void) const { bool getBold() const {
return m_bold; return m_bold;
}; };
}; };

4
sources/appl/GlyphPainting.cpp
View File

@ -25,11 +25,11 @@ appl::GlyphPainting::GlyphPainting(const std::string& _filename) :
reload(); reload();
} }
appl::GlyphPainting::~GlyphPainting(void) { appl::GlyphPainting::~GlyphPainting() {
} }
void appl::GlyphPainting::reload(void) { void appl::GlyphPainting::reload() {
ejson::Document doc; ejson::Document doc;
if (false == doc.load(m_name)) { if (false == doc.load(m_name)) {
APPL_ERROR("Can not load file : '" << m_name << "' = " << etk::FSNode(m_name).getFileSystemName()); APPL_ERROR("Can not load file : '" << m_name << "' = " << etk::FSNode(m_name).getFileSystemName());

4
sources/appl/GlyphPainting.h
View File

@ -20,12 +20,12 @@ namespace appl {
std::vector<appl::GlyphDecoration> m_list; std::vector<appl::GlyphDecoration> m_list;
protected: protected:
GlyphPainting(const std::string& _filename); GlyphPainting(const std::string& _filename);
virtual ~GlyphPainting(void); virtual ~GlyphPainting();
public: public:
/** /**
* @brief Load or reload data from config * @brief Load or reload data from config
*/ */
void reload(void); void reload();
/** /**
* @brief Register a decoration with his name and get the ref id. * @brief Register a decoration with his name and get the ref id.
* @param[in] _name Name of the deco. * @param[in] _name Name of the deco.

12
sources/appl/Gui/BufferView.cpp
View File

@ -39,7 +39,7 @@ static void SortElementList(std::vector<appl::dataBufferStruct*>& _list) {
} }
} }
BufferView::BufferView(void) : BufferView::BufferView() :
m_openOrderMode(false) { m_openOrderMode(false) {
addObjectType("appl::BufferView"); addObjectType("appl::BufferView");
setCanHaveFocus(true); setCanHaveFocus(true);
@ -63,11 +63,11 @@ BufferView::BufferView(void) :
m_colorTextModify = m_paintingProperties->request("textModify"); m_colorTextModify = m_paintingProperties->request("textModify");
} }
BufferView::~BufferView(void) { BufferView::~BufferView() {
removeAllElement(); removeAllElement();
} }
void BufferView::removeAllElement(void) { void BufferView::removeAllElement() {
for(int32_t iii=0; iii<m_list.size(); iii++) { for(int32_t iii=0; iii<m_list.size(); iii++) {
if (NULL!=m_list[iii]) { if (NULL!=m_list[iii]) {
delete(m_list[iii]); delete(m_list[iii]);
@ -237,11 +237,11 @@ void BufferView::onObjectRemove(ewol::Object* _removeObject) {
} }
etk::Color<> BufferView::getBasicBG(void) { etk::Color<> BufferView::getBasicBG() {
return (*m_paintingProperties)[m_colorBackground1].getForeground(); return (*m_paintingProperties)[m_colorBackground1].getForeground();
} }
uint32_t BufferView::getNuberOfColomn(void) { uint32_t BufferView::getNuberOfColomn() {
return 1; return 1;
} }
@ -250,7 +250,7 @@ bool BufferView::getTitle(int32_t _colomn, std::string &_myTitle, etk::Color<> &
return true; return true;
} }
uint32_t BufferView::getNuberOfRaw(void) { uint32_t BufferView::getNuberOfRaw() {
return m_list.size(); return m_list.size();
} }

14
sources/appl/Gui/BufferView.h
View File

@ -27,7 +27,7 @@ namespace appl
m_buffer(_buffer) { m_buffer(_buffer) {
}; };
~dataBufferStruct(void) { }; ~dataBufferStruct() { };
}; };
}; };
@ -53,8 +53,8 @@ class BufferView : public ewol::widget::List
void insertAlphabetic(appl::dataBufferStruct* _dataStruct, bool _selectNewPosition = false); void insertAlphabetic(appl::dataBufferStruct* _dataStruct, bool _selectNewPosition = false);
public: public:
// Constructeur // Constructeur
BufferView(void); BufferView();
~BufferView(void); ~BufferView();
// Derived function // Derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object* _removeObject); virtual void onObjectRemove(ewol::Object* _removeObject);
@ -62,12 +62,12 @@ class BufferView : public ewol::widget::List
bool m_openOrderMode; //!< true if the order is the opening order mode, otherwise, Alphabetic order bool m_openOrderMode; //!< true if the order is the opening order mode, otherwise, Alphabetic order
protected: protected:
// function call to display the list : // function call to display the list :
virtual etk::Color<> getBasicBG(void); virtual etk::Color<> getBasicBG();
void removeAllElement(void); void removeAllElement();
// Derived function // Derived function
virtual uint32_t getNuberOfColomn(void); virtual uint32_t getNuberOfColomn();
virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg); virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
virtual uint32_t getNuberOfRaw(void); virtual uint32_t getNuberOfRaw();
virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg); virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
virtual bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); virtual bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
}; };

90
sources/appl/Gui/MainWindows.cpp
View File

@ -38,7 +38,7 @@
#include <appl/Gui/WorkerCloseAllFile.h> #include <appl/Gui/WorkerCloseAllFile.h>
namespace appl { namespace appl {
std::string getVersion(void) { std::string getVersion() {
#define FIRST_YEAR (2010) #define FIRST_YEAR (2010)
std::string tmpOutput = std::to_string(date::getYear()-FIRST_YEAR); std::string tmpOutput = std::to_string(date::getYear()-FIRST_YEAR);
tmpOutput += "."; tmpOutput += ".";
@ -59,7 +59,7 @@ namespace appl {
class ParameterAboutGui : public ewol::widget::Sizer { class ParameterAboutGui : public ewol::widget::Sizer {
public : public :
ParameterAboutGui(void) : ParameterAboutGui() :
ewol::widget::Sizer(ewol::widget::Sizer::modeVert) { ewol::widget::Sizer(ewol::widget::Sizer::modeVert) {
ewol::widget::Spacer* mySpacer = NULL; ewol::widget::Spacer* mySpacer = NULL;
@ -102,7 +102,7 @@ class ParameterAboutGui : public ewol::widget::Sizer {
} }
}; };
~ParameterAboutGui(void) { ~ParameterAboutGui() {
}; };
}; };
@ -119,7 +119,7 @@ const char* l_smoothMax = "tmpEvent_maxChange";
#undef __class__ #undef __class__
#define __class__ "MainWindows" #define __class__ "MainWindows"
MainWindows::MainWindows(void) { MainWindows::MainWindows() {
addObjectType("appl::MainWindows"); addObjectType("appl::MainWindows");
APPL_DEBUG("CREATE WINDOWS ... "); APPL_DEBUG("CREATE WINDOWS ... ");
ewol::widget::Sizer * mySizerVert = NULL; ewol::widget::Sizer * mySizerVert = NULL;
@ -172,51 +172,51 @@ MainWindows::MainWindows(void) {
myMenu = new ewol::widget::Menu(); myMenu = new ewol::widget::Menu();
mySizerHori->subWidgetAdd(myMenu); mySizerHori->subWidgetAdd(myMenu);
int32_t idMenuFile = myMenu->addTitle("File"); int32_t idMenuFile = myMenu->addTitle("File");
(void)myMenu->add(idMenuFile, "New", "", ednMsgGuiNew); myMenu->add(idMenuFile, "New", "", ednMsgGuiNew);
(void)myMenu->addSpacer(); myMenu->addSpacer();
(void)myMenu->add(idMenuFile, "Open", "THEME:GUI:Load.edf", ednMsgGuiOpen); myMenu->add(idMenuFile, "Open", "THEME:GUI:Load.edf", ednMsgGuiOpen);
(void)myMenu->add(idMenuFile, "Close", "THEME:GUI:Close.edf", ednMsgGuiClose, "current"); myMenu->add(idMenuFile, "Close", "THEME:GUI:Close.edf", ednMsgGuiClose, "current");
(void)myMenu->add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All"); myMenu->add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All");
(void)myMenu->add(idMenuFile, "Save", "THEME:GUI:Save.edf", ednMsgGuiSave, "current"); myMenu->add(idMenuFile, "Save", "THEME:GUI:Save.edf", ednMsgGuiSave, "current");
(void)myMenu->add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs); myMenu->add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs);
(void)myMenu->addSpacer(); myMenu->addSpacer();
//(void)myMenu->add(idMenuFile, "Exit", "", ednMsgGuiExit); //myMenu->add(idMenuFile, "Exit", "", ednMsgGuiExit);
(void)myMenu->addSpacer(); myMenu->addSpacer();
(void)myMenu->add(idMenuFile, "Properties", "THEME:GUI:Parameter.edf", ednMsgProperties); myMenu->add(idMenuFile, "Properties", "THEME:GUI:Parameter.edf", ednMsgProperties);
int32_t idMenuEdit = myMenu->addTitle("Edit"); int32_t idMenuEdit = myMenu->addTitle("Edit");
(void)myMenu->add(idMenuEdit, "Undo", "THEME:GUI:Undo.edf", ednMsgGuiUndo); myMenu->add(idMenuEdit, "Undo", "THEME:GUI:Undo.edf", ednMsgGuiUndo);
(void)myMenu->add(idMenuEdit, "Redo", "THEME:GUI:Redo.edf", ednMsgGuiRedo); myMenu->add(idMenuEdit, "Redo", "THEME:GUI:Redo.edf", ednMsgGuiRedo);
(void)myMenu->addSpacer(); myMenu->addSpacer();
(void)myMenu->add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD"); myMenu->add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD");
(void)myMenu->add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD"); myMenu->add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD");
(void)myMenu->add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD"); myMenu->add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD");
(void)myMenu->add(idMenuEdit, "Remove", "", ednMsgGuiRm); myMenu->add(idMenuEdit, "Remove", "", ednMsgGuiRm);
(void)myMenu->addSpacer(); myMenu->addSpacer();
(void)myMenu->add(idMenuEdit, "Select All","", ednMsgGuiSelect, "ALL"); myMenu->add(idMenuEdit, "Select All","", ednMsgGuiSelect, "ALL");
(void)myMenu->add(idMenuEdit, "Un-Select","", ednMsgGuiSelect, "NONE"); myMenu->add(idMenuEdit, "Un-Select","", ednMsgGuiSelect, "NONE");
(void)myMenu->add(idMenuEdit, "Goto line ...","", ednMsgGuiGotoLine, "???"); myMenu->add(idMenuEdit, "Goto line ...","", ednMsgGuiGotoLine, "???");
int32_t idMenuSearch = myMenu->addTitle("Search"); int32_t idMenuSearch = myMenu->addTitle("Search");
(void)myMenu->add(idMenuSearch, "Search", "THEME:GUI:Search.edf", ednMsgGuiSearch); myMenu->add(idMenuSearch, "Search", "THEME:GUI:Search.edf", ednMsgGuiSearch);
(void)myMenu->add(idMenuSearch, "Replace", "THEME:GUI:Replace.edf", ednMsgGuiReplace); myMenu->add(idMenuSearch, "Replace", "THEME:GUI:Replace.edf", ednMsgGuiReplace);
(void)myMenu->addSpacer(); myMenu->addSpacer();
(void)myMenu->add(idMenuSearch, "Find (previous)","", ednMsgGuiFind, "Previous"); myMenu->add(idMenuSearch, "Find (previous)","", ednMsgGuiFind, "Previous");
(void)myMenu->add(idMenuSearch, "Find (next)", "", ednMsgGuiFind, "Next"); myMenu->add(idMenuSearch, "Find (next)", "", ednMsgGuiFind, "Next");
(void)myMenu->add(idMenuSearch, "Find (all)", "", ednMsgGuiFind, "All"); myMenu->add(idMenuSearch, "Find (all)", "", ednMsgGuiFind, "All");
(void)myMenu->add(idMenuSearch, "Un-Select", "", ednMsgGuiFind, "None"); myMenu->add(idMenuSearch, "Un-Select", "", ednMsgGuiFind, "None");
/* ==> must be in the pluggin list control ... /* ==> must be in the pluggin list control ...
int32_t idMenuCTags = myMenu->addTitle("C-tags"); int32_t idMenuCTags = myMenu->addTitle("C-tags");
(void)myMenu->add(idMenuCTags, "Load", "", ednMsgGuiCtags, "Load"); myMenu->add(idMenuCTags, "Load", "", ednMsgGuiCtags, "Load");
(void)myMenu->add(idMenuCTags, "ReLoad", "", ednMsgGuiCtags, "ReLoad"); myMenu->add(idMenuCTags, "ReLoad", "", ednMsgGuiCtags, "ReLoad");
(void)myMenu->add(idMenuCTags, "Jump", "", ednMsgGuiCtags, "Jump"); myMenu->add(idMenuCTags, "Jump", "", ednMsgGuiCtags, "Jump");
(void)myMenu->add(idMenuCTags, "Back", "", ednMsgGuiCtags, "Back"); myMenu->add(idMenuCTags, "Back", "", ednMsgGuiCtags, "Back");
*/ */
int32_t idMenugDisplay = myMenu->addTitle("Display"); int32_t idMenugDisplay = myMenu->addTitle("Display");
(void)myMenu->add(idMenugDisplay, "Color Black", "", appl::MsgNameGuiChangeColor, "color/black/"); myMenu->add(idMenugDisplay, "Color Black", "", appl::MsgNameGuiChangeColor, "color/black/");
(void)myMenu->add(idMenugDisplay, "Color White", "", appl::MsgNameGuiChangeColor, "color/white/"); myMenu->add(idMenugDisplay, "Color White", "", appl::MsgNameGuiChangeColor, "color/white/");
(void)myMenu->add(idMenugDisplay, "Shape square", "", l_MsgNameGuiChangeShape, "shape/square/"); myMenu->add(idMenugDisplay, "Shape square", "", l_MsgNameGuiChangeShape, "shape/square/");
(void)myMenu->add(idMenugDisplay, "Shape round", "", l_MsgNameGuiChangeShape, "shape/round/"); myMenu->add(idMenugDisplay, "Shape round", "", l_MsgNameGuiChangeShape, "shape/round/");
(void)myMenu->addSpacer(); myMenu->addSpacer();
(void)myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader); myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader);
m_widgetLabelFileName = new ewol::widget::Label("FileName"); m_widgetLabelFileName = new ewol::widget::Label("FileName");
m_widgetLabelFileName->setExpand(bvec2(true,false)); m_widgetLabelFileName->setExpand(bvec2(true,false));
@ -264,7 +264,7 @@ MainWindows::MainWindows(void) {
} }
MainWindows::~MainWindows(void) { MainWindows::~MainWindows() {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }
@ -393,7 +393,7 @@ void MainWindows::onReceiveMessage(const ewol::object::Message& _msg) {
} else if (_msg.getMessage() == ednMsgGuiNew) { } else if (_msg.getMessage() == ednMsgGuiNew) {
(void)m_bufferManager->createNewBuffer(); m_bufferManager->createNewBuffer();
} else if (_msg.getMessage() == ednEventPopUpFileSelected) { } else if (_msg.getMessage() == ednEventPopUpFileSelected) {
APPL_DEBUG("Request opening the file : " << _msg.getData()); APPL_DEBUG("Request opening the file : " << _msg.getData());
m_bufferManager->open(_msg.getData()); m_bufferManager->open(_msg.getData());

4
sources/appl/Gui/MainWindows.h
View File

@ -22,8 +22,8 @@ class MainWindows : public ewol::widget::Windows {
ewol::widget::Label* m_widgetLabelFileName; ewol::widget::Label* m_widgetLabelFileName;
public: public:
// Constructeur // Constructeur
MainWindows(void); MainWindows();
~MainWindows(void); ~MainWindows();
private: private:
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
/** /**

8
sources/appl/Gui/Search.cpp
View File

@ -28,7 +28,7 @@ const char* const l_eventWrapCb = "appl-wrap-CheckBox";
const char* const l_eventForwardCb = "appl-forward-CheckBox"; const char* const l_eventForwardCb = "appl-forward-CheckBox";
const char* const l_eventHideBt = "appl-hide-button"; const char* const l_eventHideBt = "appl-hide-button";
Search::Search(void) : Search::Search() :
ewol::widget::Composer(ewol::widget::Composer::file, "DATA:GUI-Search.xml"), ewol::widget::Composer(ewol::widget::Composer::file, "DATA:GUI-Search.xml"),
m_viewerManager(NULL), m_viewerManager(NULL),
m_forward(true), m_forward(true),
@ -63,11 +63,11 @@ Search::Search(void) :
hide(); hide();
} }
Search::~Search(void) { Search::~Search() {
appl::ViewerManager::release(m_viewerManager); appl::ViewerManager::release(m_viewerManager);
} }
void Search::find(void) { void Search::find() {
if (m_viewerManager == NULL) { if (m_viewerManager == NULL) {
APPL_WARNING("No viewer manager selected!!!"); APPL_WARNING("No viewer manager selected!!!");
return; return;
@ -103,7 +103,7 @@ void Search::find(void) {
} }
} }
void Search::replace(void) { void Search::replace() {
if (m_viewerManager == NULL) { if (m_viewerManager == NULL) {
APPL_WARNING("No viewer manager selected!!!"); APPL_WARNING("No viewer manager selected!!!");
return; return;

8
sources/appl/Gui/Search.h
View File

@ -27,17 +27,17 @@ class Search : public ewol::widget::Composer {
std::u32string m_replaceData; std::u32string m_replaceData;
public: public:
// Constructeur // Constructeur
Search(void); Search();
~Search(void); ~Search();
private: private:
/** /**
* @brief Find the next element that corespond at the search * @brief Find the next element that corespond at the search
*/ */
void find(void); void find();
/** /**
* @brief Replace the current selected text. * @brief Replace the current selected text.
*/ */
void replace(void); void replace();
public: // derived function public: // derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object * _removeObject); virtual void onObjectRemove(ewol::Object * _removeObject);

10
sources/appl/Gui/TagFileList.cpp
View File

@ -16,7 +16,7 @@ extern const char * const applEventCtagsListSelect = "appl-event-ctags-list-
extern const char * const applEventCtagsListUnSelect = "appl-event-ctags-list-un-select"; extern const char * const applEventCtagsListUnSelect = "appl-event-ctags-list-un-select";
extern const char * const applEventCtagsListValidate = "appl-event-ctags-list-validate"; extern const char * const applEventCtagsListValidate = "appl-event-ctags-list-validate";
appl::TagFileList::TagFileList(void) { appl::TagFileList::TagFileList() {
addObjectType("appl::TagFileList"); addObjectType("appl::TagFileList");
m_selectedLine = -1; m_selectedLine = -1;
addEventId(applEventCtagsListSelect); addEventId(applEventCtagsListSelect);
@ -33,7 +33,7 @@ appl::TagFileList::TagFileList(void) {
} }
appl::TagFileList::~TagFileList(void) { appl::TagFileList::~TagFileList() {
for (int32_t iii=0; iii<m_list.size(); iii++) { for (int32_t iii=0; iii<m_list.size(); iii++) {
delete(m_list[iii]); delete(m_list[iii]);
m_list[iii] = NULL; m_list[iii] = NULL;
@ -41,11 +41,11 @@ appl::TagFileList::~TagFileList(void) {
ewol::resource::ColorFile::release(m_colorProperty); ewol::resource::ColorFile::release(m_colorProperty);
} }
etk::Color<> appl::TagFileList::getBasicBG(void) { etk::Color<> appl::TagFileList::getBasicBG() {
return 0x00000010; return 0x00000010;
} }
uint32_t appl::TagFileList::getNuberOfColomn(void) { uint32_t appl::TagFileList::getNuberOfColomn() {
return 2; return 2;
} }
@ -54,7 +54,7 @@ bool appl::TagFileList::getTitle(int32_t _colomn, std::string& _myTitle, etk::Co
return true; return true;
} }
uint32_t appl::TagFileList::getNuberOfRaw(void) { uint32_t appl::TagFileList::getNuberOfRaw() {
return m_list.size(); return m_list.size();
} }

12
sources/appl/Gui/TagFileList.h
View File

@ -28,7 +28,7 @@ namespace appl {
fileLine(_line) { fileLine(_line) {
}; };
~TagListElement(void) { ~TagListElement() {
}; };
}; };
@ -43,13 +43,13 @@ namespace appl {
int32_t m_colorIdBackground2; //!< Color of the Background 2. int32_t m_colorIdBackground2; //!< Color of the Background 2.
int32_t m_colorIdBackgroundSelected; //!< Color of line selected. int32_t m_colorIdBackgroundSelected; //!< Color of line selected.
public: public:
TagFileList(void); TagFileList();
~TagFileList(void); ~TagFileList();
// display API : // display API :
virtual etk::Color<> getBasicBG(void); virtual etk::Color<> getBasicBG();
uint32_t getNuberOfColomn(void); uint32_t getNuberOfColomn();
bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg); bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
uint32_t getNuberOfRaw(void); uint32_t getNuberOfRaw();
bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg); bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
public: public:

4
sources/appl/Gui/TagFileSelection.cpp
View File

@ -30,7 +30,7 @@ extern const char * const applEventctagsSelection = "appl-event-ctags-validate";
extern const char * const applEventctagsCancel = "appl-event-ctags-cancel"; extern const char * const applEventctagsCancel = "appl-event-ctags-cancel";
appl::TagFileSelection::TagFileSelection(void) { appl::TagFileSelection::TagFileSelection() {
addObjectType("appl::TagFileSelection"); addObjectType("appl::TagFileSelection");
addEventId(applEventctagsSelection); addEventId(applEventctagsSelection);
addEventId(applEventctagsCancel); addEventId(applEventctagsCancel);
@ -98,7 +98,7 @@ appl::TagFileSelection::TagFileSelection(void) {
} }
appl::TagFileSelection::~TagFileSelection(void) { appl::TagFileSelection::~TagFileSelection() {
} }

4
sources/appl/Gui/TagFileSelection.h
View File

@ -22,8 +22,8 @@ namespace appl {
appl::TagFileList* m_listTag; appl::TagFileList* m_listTag;
std::string m_eventNamed; std::string m_eventNamed;
public: public:
TagFileSelection(void); TagFileSelection();
virtual ~TagFileSelection(void); virtual ~TagFileSelection();
/** /**
* @brief add a Ctags item on the curent list * @brief add a Ctags item on the curent list
* @param[in] file Compleate file name * @param[in] file Compleate file name

26
sources/appl/Gui/TextViewer.cpp
View File

@ -63,14 +63,14 @@ appl::TextViewer::TextViewer(const std::string& _fontName, int32_t _fontSize) :
setCurrentSelect(); setCurrentSelect();
} }
appl::TextViewer::~TextViewer(void) { appl::TextViewer::~TextViewer() {
appl::textPluginManager::disconnect(*this); appl::textPluginManager::disconnect(*this);
appl::GlyphPainting::release(m_paintingProperties); appl::GlyphPainting::release(m_paintingProperties);
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
appl::ViewerManager::release(m_viewerManager); appl::ViewerManager::release(m_viewerManager);
} }
std::string appl::TextViewer::getBufferPath(void) { std::string appl::TextViewer::getBufferPath() {
if (m_buffer == NULL) { if (m_buffer == NULL) {
return ""; return "";
} }
@ -87,19 +87,19 @@ void appl::TextViewer::changeZoom(float _range) {
markToRedraw(); markToRedraw();
} }
bool appl::TextViewer::calculateMinSize(void) { bool appl::TextViewer::calculateMinSize() {
m_minSize.setValue(50,50); m_minSize.setValue(50,50);
return true; return true;
} }
void appl::TextViewer::onDraw(void) { void appl::TextViewer::onDraw() {
m_displayDrawing.draw(); m_displayDrawing.draw();
m_displayText.draw(); m_displayText.draw();
WidgetScrolled::onDraw(); WidgetScrolled::onDraw();
} }
void appl::TextViewer::onRegenerateDisplay(void) { void appl::TextViewer::onRegenerateDisplay() {
if (false == needRedraw()) { if (false == needRedraw()) {
return; return;
} }
@ -549,7 +549,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
} }
void appl::TextViewer::mouseEventDouble(void) { void appl::TextViewer::mouseEventDouble() {
//m_selectMode = false; //m_selectMode = false;
appl::Buffer::Iterator beginPos, endPos; appl::Buffer::Iterator beginPos, endPos;
if (true == m_buffer->getPosAround(m_buffer->cursor(), beginPos, endPos)) { if (true == m_buffer->getPosAround(m_buffer->cursor(), beginPos, endPos)) {
@ -558,7 +558,7 @@ void appl::TextViewer::mouseEventDouble(void) {
} }
} }
void appl::TextViewer::mouseEventTriple(void) { void appl::TextViewer::mouseEventTriple() {
//m_selectMode = false; //m_selectMode = false;
moveCursor(m_buffer->getEndLine(m_buffer->cursor())); moveCursor(m_buffer->getEndLine(m_buffer->cursor()));
m_buffer->setSelectionPos(m_buffer->getStartLine(m_buffer->cursor())); m_buffer->setSelectionPos(m_buffer->getStartLine(m_buffer->cursor()));
@ -710,14 +710,14 @@ void appl::TextViewer::onObjectRemove(ewol::Object* _removeObject) {
} }
} }
void appl::TextViewer::onGetFocus(void) { void appl::TextViewer::onGetFocus() {
showKeyboard(); showKeyboard();
APPL_INFO("Focus - In"); APPL_INFO("Focus - In");
setCurrentSelect(); setCurrentSelect();
markToRedraw(); markToRedraw();
} }
void appl::TextViewer::onLostFocus(void) { void appl::TextViewer::onLostFocus() {
hideKeyboard(); hideKeyboard();
APPL_INFO("Focus - out"); APPL_INFO("Focus - out");
markToRedraw(); markToRedraw();
@ -733,7 +733,7 @@ void appl::TextViewer::setFontName(const std::string& _fontName) {
} }
// TODO : Update process time ==> a little expensive (2->4ms) in end of file // TODO : Update process time ==> a little expensive (2->4ms) in end of file
void appl::TextViewer::updateScrolling(void) { void appl::TextViewer::updateScrolling() {
if (m_buffer == NULL) { if (m_buffer == NULL) {
return; return;
} }
@ -828,7 +828,7 @@ bool appl::TextViewer::replace(const std::string& _data) {
return replace(_data, m_buffer->selectStart(), m_buffer->selectStop()); return replace(_data, m_buffer->selectStart(), m_buffer->selectStop());
} }
void appl::TextViewer::remove(void) { void appl::TextViewer::remove() {
if (m_buffer == NULL) { if (m_buffer == NULL) {
return; return;
} }
@ -998,13 +998,13 @@ float appl::TextViewer::getScreenSize(const appl::Buffer::Iterator& _startLinePo
return ret; return ret;
} }
void appl::TextViewer::setCurrentSelect(void) { void appl::TextViewer::setCurrentSelect() {
if (m_viewerManager != NULL) { if (m_viewerManager != NULL) {
m_viewerManager->setViewerSelected(this, m_buffer); m_viewerManager->setViewerSelected(this, m_buffer);
} }
} }
bool appl::TextViewer::isSelectedLast(void) { bool appl::TextViewer::isSelectedLast() {
if (m_viewerManager != NULL) { if (m_viewerManager != NULL) {
return m_viewerManager->isLastSelected(this); return m_viewerManager->isLastSelected(this);
} }

46
sources/appl/Gui/TextViewer.h
View File

@ -37,7 +37,7 @@ namespace appl {
appl::ViewerManager* m_viewerManager; //!< handle on the buffer manager appl::ViewerManager* m_viewerManager; //!< handle on the buffer manager
public: public:
TextViewer(const std::string& _fontName="", int32_t _fontSize=-1); TextViewer(const std::string& _fontName="", int32_t _fontSize=-1);
virtual ~TextViewer(void); virtual ~TextViewer();
private: private:
appl::Buffer* m_buffer; //!< pointer on the current buffer to display (can be null if the buffer is remover or in state of changing buffer) appl::Buffer* m_buffer; //!< pointer on the current buffer to display (can be null if the buffer is remover or in state of changing buffer)
public: public:
@ -45,7 +45,7 @@ namespace appl {
* @brief Get the buffer property (only for the class : template <typename TYPE> class TextViewerPluginData) * @brief Get the buffer property (only for the class : template <typename TYPE> class TextViewerPluginData)
* @return pointer on buffer * @return pointer on buffer
*/ */
appl::Buffer* internalGetBuffer(void) { appl::Buffer* internalGetBuffer() {
return m_buffer; return m_buffer;
} }
private: private:
@ -56,17 +56,17 @@ namespace appl {
void setFontSize(int32_t _size); void setFontSize(int32_t _size);
void setFontName(const std::string& _fontName); void setFontName(const std::string& _fontName);
protected: // derived function protected: // derived function
virtual void onDraw(void); virtual void onDraw();
public: // Derived function public: // Derived function
virtual bool calculateMinSize(void); virtual bool calculateMinSize();
virtual void onRegenerateDisplay(void); virtual void onRegenerateDisplay();
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object* _removeObject); virtual void onObjectRemove(ewol::Object* _removeObject);
virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::event::Entry& _event); virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID); virtual void onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID);
virtual void onGetFocus(void); virtual void onGetFocus();
virtual void onLostFocus(void); virtual void onLostFocus();
virtual void changeZoom(float _range); virtual void changeZoom(float _range);
private: private:
float m_lastOffsetDisplay; //!< Line number ofssed in the display float m_lastOffsetDisplay; //!< Line number ofssed in the display
@ -77,7 +77,7 @@ namespace appl {
* @brief Update the scrolling position from the cursor position, * @brief Update the scrolling position from the cursor position,
* it might be be all time in the display screen. * it might be be all time in the display screen.
*/ */
void updateScrolling(void); void updateScrolling();
// TODO : Doc : write data on buffer // TODO : Doc : write data on buffer
bool moveCursor(const appl::Buffer::Iterator& _pos); bool moveCursor(const appl::Buffer::Iterator& _pos);
bool write(const std::string& _data); bool write(const std::string& _data);
@ -90,11 +90,11 @@ namespace appl {
/** /**
* @brief Remove selected data ... * @brief Remove selected data ...
*/ */
void remove(void); void remove();
/** /**
* @brief Remove selected data ... (No plugin call) * @brief Remove selected data ... (No plugin call)
*/ */
void removeDirect(void) { void removeDirect() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return; return;
} }
@ -156,8 +156,8 @@ namespace appl {
} }
appl::Buffer::Iterator getMousePosition(const vec2& _relativePos); appl::Buffer::Iterator getMousePosition(const vec2& _relativePos);
void mouseEventDouble(void); void mouseEventDouble();
void mouseEventTriple(void); void mouseEventTriple();
private: private:
enum moveMode { enum moveMode {
moveLetter, moveLetter,
@ -191,30 +191,30 @@ namespace appl {
/** /**
* @brief Set the current buffer selected * @brief Set the current buffer selected
*/ */
void setCurrentSelect(void); void setCurrentSelect();
/** /**
* @brief Check if the current buffer is last selected * @brief Check if the current buffer is last selected
* @return true if selected last * @return true if selected last
*/ */
bool isSelectedLast(void); bool isSelectedLast();
public: public:
/** /**
* @brief get the path of the current buffer * @brief get the path of the current buffer
* @return Path of the buffer (remove the ended name) * @return Path of the buffer (remove the ended name)
*/ */
virtual std::string getBufferPath(void); virtual std::string getBufferPath();
/** /**
* @brief Check if the buffer is availlable * @brief Check if the buffer is availlable
* @return true if a display buffer is present, false otherwise. * @return true if a display buffer is present, false otherwise.
*/ */
virtual bool hasBuffer(void) { virtual bool hasBuffer() {
return m_buffer != NULL; return m_buffer != NULL;
} }
/** /**
* @brief Get the status of selection. * @brief Get the status of selection.
* @return true if we have a current selection, false otherwise. * @return true if we have a current selection, false otherwise.
*/ */
virtual bool hasTextSelected(void) { virtual bool hasTextSelected() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return false; return false;
} }
@ -223,7 +223,7 @@ namespace appl {
/** /**
* @brief Remove Selection of the buffer. * @brief Remove Selection of the buffer.
*/ */
virtual void unSelect(void) { virtual void unSelect() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return; return;
} }
@ -317,7 +317,7 @@ namespace appl {
* @brief Get the cursor position. * @brief Get the cursor position.
* @return The iterator on the cursor position * @return The iterator on the cursor position
*/ */
appl::Buffer::Iterator cursor(void) { appl::Buffer::Iterator cursor() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return appl::Buffer::Iterator(); return appl::Buffer::Iterator();
} }
@ -327,7 +327,7 @@ namespace appl {
* @brief Get the begin position. * @brief Get the begin position.
* @return The iterator on the begin position * @return The iterator on the begin position
*/ */
appl::Buffer::Iterator begin(void) { appl::Buffer::Iterator begin() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return appl::Buffer::Iterator(); return appl::Buffer::Iterator();
} }
@ -337,7 +337,7 @@ namespace appl {
* @brief Get the end position. * @brief Get the end position.
* @return The iterator on the end position * @return The iterator on the end position
*/ */
appl::Buffer::Iterator end(void) { appl::Buffer::Iterator end() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return appl::Buffer::Iterator(); return appl::Buffer::Iterator();
} }
@ -347,7 +347,7 @@ namespace appl {
* @brief Get an Iterator on the start selection. * @brief Get an Iterator on the start selection.
* @return The Iterator * @return The Iterator
*/ */
appl::Buffer::Iterator selectStart(void) { appl::Buffer::Iterator selectStart() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return appl::Buffer::Iterator(); return appl::Buffer::Iterator();
} }
@ -357,7 +357,7 @@ namespace appl {
* @brief Get an Iterator on the stop selection. * @brief Get an Iterator on the stop selection.
* @return The Iterator * @return The Iterator
*/ */
appl::Buffer::Iterator selectStop(void) { appl::Buffer::Iterator selectStop() {
if (m_buffer==NULL) { if (m_buffer==NULL) {
return appl::Buffer::Iterator(); return appl::Buffer::Iterator();
} }

6
sources/appl/Gui/ViewerManager.cpp
View File

@ -17,7 +17,7 @@
#undef __class__ #undef __class__
#define __class__ "ViewerManager" #define __class__ "ViewerManager"
appl::ViewerManager::ViewerManager(void) : appl::ViewerManager::ViewerManager() :
ewol::Resource("???ViewerManager???"), ewol::Resource("???ViewerManager???"),
m_viewer(NULL) { m_viewer(NULL) {
addObjectType("appl::ViewerManager"); addObjectType("appl::ViewerManager");
@ -25,7 +25,7 @@ appl::ViewerManager::ViewerManager(void) :
m_bufferManager = appl::BufferManager::keep(); m_bufferManager = appl::BufferManager::keep();
} }
appl::ViewerManager::~ViewerManager(void) { appl::ViewerManager::~ViewerManager() {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }
@ -51,7 +51,7 @@ void appl::ViewerManager::onObjectRemove(ewol::Object* _removeObject) {
} }
} }
appl::ViewerManager* appl::ViewerManager::keep(void) { appl::ViewerManager* appl::ViewerManager::keep() {
//EWOL_INFO("KEEP : appl::GlyphPainting : file : \"" << _filename << "\""); //EWOL_INFO("KEEP : appl::GlyphPainting : file : \"" << _filename << "\"");
appl::ViewerManager* object = static_cast<appl::ViewerManager*>(getManager().localKeep("???ViewerManager???")); appl::ViewerManager* object = static_cast<appl::ViewerManager*>(getManager().localKeep("???ViewerManager???"));
if (NULL != object) { if (NULL != object) {

8
sources/appl/Gui/ViewerManager.h
View File

@ -19,8 +19,8 @@ namespace appl {
class TextViewer; class TextViewer;
class ViewerManager : public ewol::Resource { class ViewerManager : public ewol::Resource {
protected: protected:
ViewerManager(void); ViewerManager();
~ViewerManager(void); ~ViewerManager();
private: private:
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
appl::TextViewer* m_viewer; appl::TextViewer* m_viewer;
@ -34,7 +34,7 @@ namespace appl {
* @brief Get the current buffer selected * @brief Get the current buffer selected
* @return Pointer on the buffer selected * @return Pointer on the buffer selected
*/ */
appl::TextViewer* getViewerSelected(void) { appl::TextViewer* getViewerSelected() {
return m_viewer; return m_viewer;
}; };
/** /**
@ -55,7 +55,7 @@ namespace appl {
* @param[in] _filename Name of the configuration file. * @param[in] _filename Name of the configuration file.
* @return pointer on the resource or NULL if an error occured. * @return pointer on the resource or NULL if an error occured.
*/ */
static appl::ViewerManager* keep(void); static appl::ViewerManager* keep();
/** /**
* @brief release the keeped resources * @brief release the keeped resources
* @param[in,out] reference on the object pointer * @param[in,out] reference on the object pointer

4
sources/appl/Gui/WorkerCloseAllFile.cpp
View File

@ -15,7 +15,7 @@
static const char* s_closeDone = "close-done"; static const char* s_closeDone = "close-done";
appl::WorkerCloseAllFile::WorkerCloseAllFile(void) : appl::WorkerCloseAllFile::WorkerCloseAllFile() :
m_worker(NULL), m_worker(NULL),
m_bufferManager(NULL) { m_bufferManager(NULL) {
addObjectType("appl::WorkerCloseAllFile"); addObjectType("appl::WorkerCloseAllFile");
@ -55,7 +55,7 @@ appl::WorkerCloseAllFile::WorkerCloseAllFile(void) :
m_worker->registerOnEvent(this, appl::WorkerCloseFile::eventCloseDone, s_closeDone); m_worker->registerOnEvent(this, appl::WorkerCloseFile::eventCloseDone, s_closeDone);
} }
appl::WorkerCloseAllFile::~WorkerCloseAllFile(void) { appl::WorkerCloseAllFile::~WorkerCloseAllFile() {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }

4
sources/appl/Gui/WorkerCloseAllFile.h
View File

@ -15,8 +15,8 @@
namespace appl { namespace appl {
class WorkerCloseAllFile : public ewol::Object { class WorkerCloseAllFile : public ewol::Object {
public: public:
WorkerCloseAllFile(void); WorkerCloseAllFile();
virtual ~WorkerCloseAllFile(void); virtual ~WorkerCloseAllFile();
private: private:
std::vector<std::string> m_bufferNameList; std::vector<std::string> m_bufferNameList;
appl::WorkerCloseFile* m_worker; //! pop-up element that is open... appl::WorkerCloseFile* m_worker; //! pop-up element that is open...

2
sources/appl/Gui/WorkerCloseFile.cpp
View File

@ -96,7 +96,7 @@ appl::WorkerCloseFile::WorkerCloseFile(const std::string& _bufferName) :
tmpWindows->popUpWidgetPush(tmpPopUp); tmpWindows->popUpWidgetPush(tmpPopUp);
} }
appl::WorkerCloseFile::~WorkerCloseFile(void) { appl::WorkerCloseFile::~WorkerCloseFile() {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }

2
sources/appl/Gui/WorkerCloseFile.h
View File

@ -20,7 +20,7 @@ namespace appl {
public: public:
// note : if == "" ==> current ... // note : if == "" ==> current ...
WorkerCloseFile(const std::string& _bufferName); WorkerCloseFile(const std::string& _bufferName);
virtual ~WorkerCloseFile(void); virtual ~WorkerCloseFile();
private: private:
std::string m_bufferName; std::string m_bufferName;
appl::Buffer* m_buffer; //!< reference on the buffer (when rename, we have no more reference on the buffer appl::Buffer* m_buffer; //!< reference on the buffer (when rename, we have no more reference on the buffer

4
sources/appl/Gui/WorkerSaveAllFile.cpp
View File

@ -15,7 +15,7 @@
static const char* s_saveAsDone = "save-as-done"; static const char* s_saveAsDone = "save-as-done";
appl::WorkerSaveAllFile::WorkerSaveAllFile(void) : appl::WorkerSaveAllFile::WorkerSaveAllFile() :
m_worker(NULL), m_worker(NULL),
m_bufferManager(NULL) { m_bufferManager(NULL) {
addObjectType("appl::WorkerSaveAllFile"); addObjectType("appl::WorkerSaveAllFile");
@ -58,7 +58,7 @@ appl::WorkerSaveAllFile::WorkerSaveAllFile(void) :
m_worker->registerOnEvent(this, appl::WorkerSaveFile::eventSaveDone, s_saveAsDone); m_worker->registerOnEvent(this, appl::WorkerSaveFile::eventSaveDone, s_saveAsDone);
} }
appl::WorkerSaveAllFile::~WorkerSaveAllFile(void) { appl::WorkerSaveAllFile::~WorkerSaveAllFile() {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }

4
sources/appl/Gui/WorkerSaveAllFile.h
View File

@ -15,8 +15,8 @@
namespace appl { namespace appl {
class WorkerSaveAllFile : public ewol::Object { class WorkerSaveAllFile : public ewol::Object {
public: public:
WorkerSaveAllFile(void); WorkerSaveAllFile();
virtual ~WorkerSaveAllFile(void); virtual ~WorkerSaveAllFile();
private: private:
std::vector<std::string> m_bufferNameList; std::vector<std::string> m_bufferNameList;
appl::WorkerSaveFile* m_worker; //! pop-up element that is open... appl::WorkerSaveFile* m_worker; //! pop-up element that is open...

2
sources/appl/Gui/WorkerSaveFile.cpp
View File

@ -81,7 +81,7 @@ appl::WorkerSaveFile::WorkerSaveFile(const std::string& _bufferName, bool _force
m_chooser->registerOnEvent(this, ewol::widget::FileChooser::eventValidate, s_saveAsValidate); m_chooser->registerOnEvent(this, ewol::widget::FileChooser::eventValidate, s_saveAsValidate);
} }
appl::WorkerSaveFile::~WorkerSaveFile(void) { appl::WorkerSaveFile::~WorkerSaveFile() {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }

2
sources/appl/Gui/WorkerSaveFile.h
View File

@ -18,7 +18,7 @@ namespace appl {
static const char* eventSaveDone; static const char* eventSaveDone;
public: public:
WorkerSaveFile(const std::string& _bufferName, bool _forceSaveAs=true); WorkerSaveFile(const std::string& _bufferName, bool _forceSaveAs=true);
virtual ~WorkerSaveFile(void); virtual ~WorkerSaveFile();
private: private:
std::string m_bufferName; std::string m_bufferName;
ewol::widget::FileChooser* m_chooser; //! pop-up element that is open... ewol::widget::FileChooser* m_chooser; //! pop-up element that is open...

4
sources/appl/Highlight.cpp
View File

@ -99,7 +99,7 @@ appl::Highlight::Highlight(const std::string& _xmlFilename, const std::string& _
} }
} }
appl::Highlight::~Highlight(void) { appl::Highlight::~Highlight() {
// clean all Element // clean all Element
for (int32_t iii = 0; iii < m_listHighlightPass1.size(); ++iii) { for (int32_t iii = 0; iii < m_listHighlightPass1.size(); ++iii) {
if (m_listHighlightPass1[iii] != NULL) { if (m_listHighlightPass1[iii] != NULL) {
@ -144,7 +144,7 @@ bool appl::Highlight::fileNameCompatible(const std::string& _fileName) {
} }
void appl::Highlight::display(void) { void appl::Highlight::display() {
APPL_INFO("List of ALL Highlight : "); APPL_INFO("List of ALL Highlight : ");
for (int32_t iii=0; iii< m_listExtentions.size(); iii++) { for (int32_t iii=0; iii< m_listExtentions.size(); iii++) {
APPL_INFO(" Extention : " << iii << " : " << m_listExtentions[iii] ); APPL_INFO(" Extention : " << iii << " : " << m_listExtentions[iii] );

8
sources/appl/Highlight.h
View File

@ -38,17 +38,17 @@ namespace appl {
protected: protected:
// Constructeur // Constructeur
Highlight(const std::string& _xmlFilename, const std::string& _colorFile); Highlight(const std::string& _xmlFilename, const std::string& _colorFile);
~Highlight(void); ~Highlight();
private: private:
std::string m_typeName; //!< descriptive string type like "C/C++" std::string m_typeName; //!< descriptive string type like "C/C++"
public: public:
const std::string& getTypeName(void) { const std::string& getTypeName() {
return m_typeName; return m_typeName;
} }
public: public:
bool hasExtention(const std::string& _ext); bool hasExtention(const std::string& _ext);
bool fileNameCompatible(const std::string& _fileName); bool fileNameCompatible(const std::string& _fileName);
void display(void); void display();
void parse(int64_t _start, void parse(int64_t _start,
int64_t _stop, int64_t _stop,
std::vector<appl::HighlightInfo> &_metaData, std::vector<appl::HighlightInfo> &_metaData,
@ -80,7 +80,7 @@ namespace appl {
*/ */
static void release(appl::Highlight*& _object); static void release(appl::Highlight*& _object);
public: // herited function : public: // herited function :
virtual void updateContext(void) { virtual void updateContext() {
// no upfate to do ... // no upfate to do ...
}; };
}; };

8
sources/appl/HighlightManager.cpp
View File

@ -15,13 +15,13 @@
#undef __class__ #undef __class__
#define __class__ "highlightManager" #define __class__ "highlightManager"
static std::vector<appl::Highlight*>& s_list(void) { static std::vector<appl::Highlight*>& s_list() {
static std::vector<appl::Highlight*> list; static std::vector<appl::Highlight*> list;
return list; return list;
} }
void appl::highlightManager::init(void) { void appl::highlightManager::init() {
std::vector<appl::Highlight*>& hlList = s_list(); std::vector<appl::Highlight*>& hlList = s_list();
if (hlList.size() != 0) { if (hlList.size() != 0) {
APPL_ERROR("HighlightManager == > already exist, just unlink the previous ..."); APPL_ERROR("HighlightManager == > already exist, just unlink the previous ...");
@ -58,7 +58,7 @@ void appl::highlightManager::init(void) {
*/ */
} }
void appl::highlightManager::unInit(void) { void appl::highlightManager::unInit() {
std::vector<Highlight*>& hlList = s_list(); std::vector<Highlight*>& hlList = s_list();
if (hlList.size() == 0) { if (hlList.size() == 0) {
APPL_DEBUG("HighlightManager ==> no highlight"); APPL_DEBUG("HighlightManager ==> no highlight");
@ -111,7 +111,7 @@ std::string appl::highlightManager::getFileWithTypeType(const std::string& _type
return ""; return "";
} }
std::vector<std::string> appl::highlightManager::getTypeList(void) { std::vector<std::string> appl::highlightManager::getTypeList() {
std::vector<std::string> ret; std::vector<std::string> ret;
return ret; return ret;
} }

6
sources/appl/HighlightManager.h
View File

@ -20,11 +20,11 @@ namespace appl {
/** /**
* @brief Init the Highlight manager * @brief Init the Highlight manager
*/ */
void init(void); void init();
/** /**
* @brief Un-Init the Highlight manager * @brief Un-Init the Highlight manager
*/ */
void unInit(void); void unInit();
/** /**
* @brief Un-Init the Highlight manager * @brief Un-Init the Highlight manager
* @param[in] extention of the file * @param[in] extention of the file
@ -41,7 +41,7 @@ namespace appl {
* @brief Get the list of extention type * @brief Get the list of extention type
* @return the requested list. * @return the requested list.
*/ */
std::vector<std::string> getTypeList(void); std::vector<std::string> getTypeList();
}; };
}; };

4
sources/appl/HighlightPattern.cpp
View File

@ -25,7 +25,7 @@ appl::HighlightPattern::HighlightPattern(appl::GlyphPainting*& _glyphPainting) :
m_regExpStart = new etk::RegExp<etk::Buffer>(); m_regExpStart = new etk::RegExp<etk::Buffer>();
} }
appl::HighlightPattern::~HighlightPattern(void) { appl::HighlightPattern::~HighlightPattern() {
if (m_regExpStart != NULL) { if (m_regExpStart != NULL) {
delete(m_regExpStart); delete(m_regExpStart);
m_regExpStart = NULL; m_regExpStart = NULL;
@ -68,7 +68,7 @@ void appl::HighlightPattern::setColorGlyph(std::string& _colorName) {
APPL_VERBOSE("Resuest color name '" << m_colorName << "' => id=" << m_colorId); APPL_VERBOSE("Resuest color name '" << m_colorName << "' => id=" << m_colorId);
} }
void appl::HighlightPattern::display(void) { void appl::HighlightPattern::display() {
APPL_INFO("patern : \"" << m_paternName << "\" level=" << m_level ); APPL_INFO("patern : \"" << m_paternName << "\" level=" << m_level );
APPL_INFO(" == > colorName \"" << m_colorName << "\""); APPL_INFO(" == > colorName \"" << m_colorName << "\"");
APPL_INFO(" == > regExpStart \"" << m_regExpStart->getRegExp() << "\""); APPL_INFO(" == > regExpStart \"" << m_regExpStart->getRegExp() << "\"");

10
sources/appl/HighlightPattern.h
View File

@ -33,14 +33,14 @@ namespace appl {
public: public:
// Constructeur // Constructeur
HighlightPattern(appl::GlyphPainting*& _glyphPainting); HighlightPattern(appl::GlyphPainting*& _glyphPainting);
~HighlightPattern(void); ~HighlightPattern();
private: private:
std::string m_paternName; //!< Current style name (like "c++" or "c" or "script Bash") std::string m_paternName; //!< Current style name (like "c++" or "c" or "script Bash")
public: public:
void setName(std::string& _name) { void setName(std::string& _name) {
m_paternName = _name; m_paternName = _name;
}; };
std::string getName(void) { std::string getName() {
return m_paternName; return m_paternName;
}; };
private: private:
@ -56,7 +56,7 @@ namespace appl {
int32_t m_colorId; //!< Id of the the glyph painting int32_t m_colorId; //!< Id of the the glyph painting
public: public:
void setColorGlyph(std::string& _colorName); void setColorGlyph(std::string& _colorName);
const appl::GlyphDecoration& getColorGlyph(void) { const appl::GlyphDecoration& getColorGlyph() {
return (*m_glyphPainting)[m_colorId]; return (*m_glyphPainting)[m_colorId];
}; };
private: private:
@ -75,13 +75,13 @@ namespace appl {
void setLevel(int32_t _newLevel) { void setLevel(int32_t _newLevel) {
m_level = _newLevel; m_level = _newLevel;
}; };
int32_t getLevel(void) { int32_t getLevel() {
return m_level; return m_level;
}; };
private: private:
public: public:
void display(void); void display();
/** /**
* @brief find Element only in the specify start characters and find the end with the range done * @brief find Element only in the specify start characters and find the end with the range done
* @param[in] _start First character to search data (if recognise it start here) * @param[in] _start First character to search data (if recognise it start here)

4
sources/appl/TextPlugin.cpp
View File

@ -14,7 +14,7 @@
#define __class__ "TextViewerPlugin" #define __class__ "TextViewerPlugin"
appl::TextViewerPlugin::TextViewerPlugin(void) : appl::TextViewerPlugin::TextViewerPlugin() :
m_isEnable(true), m_isEnable(true),
m_activateOnEventEntry(false), m_activateOnEventEntry(false),
m_activateOnEventInput(false), m_activateOnEventInput(false),
@ -26,7 +26,7 @@ appl::TextViewerPlugin::TextViewerPlugin(void) :
} }
appl::TextViewerPlugin::~TextViewerPlugin(void) { appl::TextViewerPlugin::~TextViewerPlugin() {
if (m_isEnable == false) { if (m_isEnable == false) {
return; return;
} }

24
sources/appl/TextPlugin.h
View File

@ -18,8 +18,8 @@ namespace appl {
class TextViewerPlugin : public ewol::Object { class TextViewerPlugin : public ewol::Object {
friend class appl::TextViewer; friend class appl::TextViewer;
public: public:
TextViewerPlugin(void); TextViewerPlugin();
virtual ~TextViewerPlugin(void); virtual ~TextViewerPlugin();
private: private:
bool m_isEnable; //!< The plugin is enable or not (for all viewer). bool m_isEnable; //!< The plugin is enable or not (for all viewer).
public: public:
@ -32,20 +32,20 @@ namespace appl {
* @brief Get the activity status. * @brief Get the activity status.
* @return true if the plugin is active, false otherwise. * @return true if the plugin is active, false otherwise.
*/ */
bool isEnable(void) { bool isEnable() {
return m_isEnable; return m_isEnable;
}; };
public: public:
/** /**
* @brief On plugin global enable. * @brief On plugin global enable.
*/ */
virtual void onPluginEnable(void) { virtual void onPluginEnable() {
// nothing to do here ... // nothing to do here ...
}; };
/** /**
* @brief On plugin global disable. * @brief On plugin global disable.
*/ */
virtual void onPluginDisable(void) { virtual void onPluginDisable() {
// nothing to do here ... // nothing to do here ...
}; };
/** /**
@ -69,7 +69,7 @@ namespace appl {
* @brief Get the availlability of a callback * @brief Get the availlability of a callback
* @return true if availlable * @return true if availlable
*/ */
bool isAvaillableOnEventEntry(void) { bool isAvaillableOnEventEntry() {
return m_activateOnEventEntry; return m_activateOnEventEntry;
} }
/** /**
@ -89,7 +89,7 @@ namespace appl {
* @brief Get the availlability of a callback * @brief Get the availlability of a callback
* @return true if availlable * @return true if availlable
*/ */
bool isAvaillableOnEventInput(void) { bool isAvaillableOnEventInput() {
return m_activateOnEventInput; return m_activateOnEventInput;
} }
/** /**
@ -109,7 +109,7 @@ namespace appl {
* @brief Get the availlability of a callback * @brief Get the availlability of a callback
* @return true if availlable * @return true if availlable
*/ */
bool isAvaillableOnWrite(void) { bool isAvaillableOnWrite() {
return m_activateOnWrite; return m_activateOnWrite;
} }
/** /**
@ -131,7 +131,7 @@ namespace appl {
* @brief Get the availlability of a callback * @brief Get the availlability of a callback
* @return true if availlable * @return true if availlable
*/ */
bool isAvaillableOnReplace(void) { bool isAvaillableOnReplace() {
return m_activateOnReplace; return m_activateOnReplace;
} }
/** /**
@ -155,7 +155,7 @@ namespace appl {
* @brief Get the availlability of a callback * @brief Get the availlability of a callback
* @return true if availlable * @return true if availlable
*/ */
bool isAvaillableOnRemove(void) { bool isAvaillableOnRemove() {
return m_activateOnRemove; return m_activateOnRemove;
} }
/** /**
@ -177,7 +177,7 @@ namespace appl {
* @brief Get the availlability of a callback * @brief Get the availlability of a callback
* @return true if availlable * @return true if availlable
*/ */
bool isAvaillableOnReceiveMessage(void) { bool isAvaillableOnReceiveMessage() {
return m_activateOnReceiveMessage; return m_activateOnReceiveMessage;
} }
/** /**
@ -197,7 +197,7 @@ namespace appl {
* @brief Get the availlability of a callback * @brief Get the availlability of a callback
* @return true if availlable * @return true if availlable
*/ */
bool isAvaillableOnCursorMove(void) { bool isAvaillableOnCursorMove() {
return m_activateOnCursorMove; return m_activateOnCursorMove;
} }
/** /**

2
sources/appl/TextPluginAutoIndent.cpp
View File

@ -15,7 +15,7 @@
#define __class__ "TextPluginAutoIndent" #define __class__ "TextPluginAutoIndent"
appl::TextPluginAutoIndent::TextPluginAutoIndent(void) { appl::TextPluginAutoIndent::TextPluginAutoIndent() {
m_activateOnEventEntry = true; m_activateOnEventEntry = true;
} }

4
sources/appl/TextPluginAutoIndent.h
View File

@ -18,8 +18,8 @@
namespace appl { namespace appl {
class TextPluginAutoIndent : public appl::TextViewerPlugin { class TextPluginAutoIndent : public appl::TextViewerPlugin {
public: public:
TextPluginAutoIndent(void); TextPluginAutoIndent();
~TextPluginAutoIndent(void) { ~TextPluginAutoIndent() {
// nothing to do ... // nothing to do ...
}; };
public: public:

2
sources/appl/TextPluginCopy.cpp
View File

@ -15,7 +15,7 @@
#define __class__ "TextPluginCopy" #define __class__ "TextPluginCopy"
appl::TextPluginCopy::TextPluginCopy(void) { appl::TextPluginCopy::TextPluginCopy() {
m_activateOnReceiveMessage = true; m_activateOnReceiveMessage = true;
} }

4
sources/appl/TextPluginCopy.h
View File

@ -18,8 +18,8 @@
namespace appl { namespace appl {
class TextPluginCopy : public appl::TextViewerPlugin { class TextPluginCopy : public appl::TextViewerPlugin {
public: public:
TextPluginCopy(void); TextPluginCopy();
~TextPluginCopy(void) { ~TextPluginCopy() {
// nothing to do ... // nothing to do ...
}; };
public: public:

6
sources/appl/TextPluginCtags.cpp
View File

@ -18,7 +18,7 @@
#define __class__ "TextPluginCtags" #define __class__ "TextPluginCtags"
appl::TextPluginCtags::TextPluginCtags(void) : appl::TextPluginCtags::TextPluginCtags() :
m_tagFilename(""), m_tagFilename(""),
m_tagFolderBase(""), m_tagFolderBase(""),
m_ctagFile(NULL) { m_ctagFile(NULL) {
@ -26,7 +26,7 @@ appl::TextPluginCtags::TextPluginCtags(void) :
// load buffer manager: // load buffer manager:
m_bufferManager = appl::BufferManager::keep(); m_bufferManager = appl::BufferManager::keep();
} }
appl::TextPluginCtags::~TextPluginCtags(void) { appl::TextPluginCtags::~TextPluginCtags() {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }
@ -108,7 +108,7 @@ void appl::TextPluginCtags::jumpFile(const std::string& _filename, int64_t _line
sendMultiCast(appl::MsgSelectGotoLineSelect, std::to_string(_lineId)); sendMultiCast(appl::MsgSelectGotoLineSelect, std::to_string(_lineId));
} }
void appl::TextPluginCtags::loadTagFile(void) { void appl::TextPluginCtags::loadTagFile() {
tagFileInfo info; tagFileInfo info;
// close previous tag file // close previous tag file
if (NULL != m_ctagFile) { if (NULL != m_ctagFile) {

6
sources/appl/TextPluginCtags.h
View File

@ -29,14 +29,14 @@ namespace appl {
std::string m_tagFolderBase; std::string m_tagFolderBase;
std::string m_tagFilename; std::string m_tagFilename;
tagFile* m_ctagFile; tagFile* m_ctagFile;
void loadTagFile(void); void loadTagFile();
void printTag(const tagEntry *_entry); void printTag(const tagEntry *_entry);
void jumpTo(const std::string& _name); void jumpTo(const std::string& _name);
void jumpFile(const std::string& _filename, int64_t _lineId); void jumpFile(const std::string& _filename, int64_t _lineId);
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: public:
TextPluginCtags(void); TextPluginCtags();
~TextPluginCtags(void); ~TextPluginCtags();
public: public:
virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginEnable(appl::TextViewer& _textDrawer);
virtual void onPluginDisable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer);

4
sources/appl/TextPluginData.h
View File

@ -18,10 +18,10 @@
namespace appl { namespace appl {
template <typename TYPE> class TextViewerPluginData : public appl::TextViewerPlugin { template <typename TYPE> class TextViewerPluginData : public appl::TextViewerPlugin {
public: public:
TextViewerPluginData(void) { TextViewerPluginData() {
// nothing to do ... // nothing to do ...
} }
virtual ~TextViewerPluginData(void) { virtual ~TextViewerPluginData() {
for (size_t iii = 0; iii < m_specificData.size() ; ++iii) { for (size_t iii = 0; iii < m_specificData.size() ; ++iii) {
if (m_specificData[iii].second != NULL) { if (m_specificData[iii].second != NULL) {
remove(*m_specificData[iii].second); remove(*m_specificData[iii].second);

2
sources/appl/TextPluginHistory.cpp
View File

@ -15,7 +15,7 @@
#undef __class__ #undef __class__
#define __class__ "TextPluginHistory" #define __class__ "TextPluginHistory"
appl::TextPluginHistory::TextPluginHistory(void) { appl::TextPluginHistory::TextPluginHistory() {
m_activateOnReceiveMessage = true; m_activateOnReceiveMessage = true;
m_activateOnWrite = true; m_activateOnWrite = true;
m_activateOnReplace = true; m_activateOnReplace = true;

6
sources/appl/TextPluginHistory.h
View File

@ -18,7 +18,7 @@
namespace appl { namespace appl {
class History { class History {
public: public:
History(void) : History() :
m_posAdded(0), m_posAdded(0),
m_endPosAdded(0), m_endPosAdded(0),
m_endPosRemoved(0) { m_endPosRemoved(0) {
@ -37,8 +37,8 @@ namespace appl {
}; };
class TextPluginHistory : public appl::TextViewerPluginData<appl::PluginHistoryData> { class TextPluginHistory : public appl::TextViewerPluginData<appl::PluginHistoryData> {
public: public:
TextPluginHistory(void); TextPluginHistory();
virtual ~TextPluginHistory(void) { }; virtual ~TextPluginHistory() { };
private: private:
public: public:
virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginEnable(appl::TextViewer& _textDrawer);

22
sources/appl/TextPluginManager.cpp
View File

@ -19,44 +19,44 @@
#undef __class__ #undef __class__
#define __class__ "textPluginManager" #define __class__ "textPluginManager"
static std::vector<appl::TextViewerPlugin *>& getList(void) { static std::vector<appl::TextViewerPlugin *>& getList() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
static std::vector<appl::TextViewerPlugin *>& getListOnEventEntry(void) { static std::vector<appl::TextViewerPlugin *>& getListOnEventEntry() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
static std::vector<appl::TextViewerPlugin *>& getListOnEventInput(void) { static std::vector<appl::TextViewerPlugin *>& getListOnEventInput() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
static std::vector<appl::TextViewerPlugin *>& getListOnWrite(void) { static std::vector<appl::TextViewerPlugin *>& getListOnWrite() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
static std::vector<appl::TextViewerPlugin *>& getListOnReplace(void) { static std::vector<appl::TextViewerPlugin *>& getListOnReplace() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
static std::vector<appl::TextViewerPlugin *>& getListOnRemove(void) { static std::vector<appl::TextViewerPlugin *>& getListOnRemove() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
static std::vector<appl::TextViewerPlugin *>& getListOnReceiveMessage(void) { static std::vector<appl::TextViewerPlugin *>& getListOnReceiveMessage() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
static std::vector<appl::TextViewerPlugin *>& getListOnCursorMove(void) { static std::vector<appl::TextViewerPlugin *>& getListOnCursorMove() {
static std::vector<appl::TextViewerPlugin *> s_list; static std::vector<appl::TextViewerPlugin *> s_list;
return s_list; return s_list;
} }
void appl::textPluginManager::init(void) { void appl::textPluginManager::init() {
} }
void appl::textPluginManager::unInit(void) { void appl::textPluginManager::unInit() {
// remove all sub plugin class: // remove all sub plugin class:
getListOnEventEntry().clear(); getListOnEventEntry().clear();
getListOnEventInput().clear(); getListOnEventInput().clear();
@ -76,7 +76,7 @@ void appl::textPluginManager::unInit(void) {
getList().clear(); getList().clear();
} }
void appl::textPluginManager::addDefaultPlugin(void) { void appl::textPluginManager::addDefaultPlugin() {
appl::textPluginManager::addPlugin(new appl::TextPluginCopy()); appl::textPluginManager::addPlugin(new appl::TextPluginCopy());
appl::textPluginManager::addPlugin(new appl::TextPluginMultiLineTab()); appl::textPluginManager::addPlugin(new appl::TextPluginMultiLineTab());
appl::textPluginManager::addPlugin(new appl::TextPluginAutoIndent()); appl::textPluginManager::addPlugin(new appl::TextPluginAutoIndent());

6
sources/appl/TextPluginManager.h
View File

@ -20,15 +20,15 @@ namespace appl {
/** /**
* @brief Init the plugin manager for writer. * @brief Init the plugin manager for writer.
*/ */
void init(void); void init();
/** /**
* @brief UnInit the plugin manager for writer. * @brief UnInit the plugin manager for writer.
*/ */
void unInit(void); void unInit();
/** /**
* @brief Add default plugin list * @brief Add default plugin list
*/ */
void addDefaultPlugin(void); void addDefaultPlugin();
/** /**
* @brief Add a plugin. * @brief Add a plugin.
* @param[in] _plugin Plugin pointer to add. * @param[in] _plugin Plugin pointer to add.

2
sources/appl/TextPluginMultiLineTab.cpp
View File

@ -14,7 +14,7 @@
#undef __class__ #undef __class__
#define __class__ "TextPluginMultiLineTab" #define __class__ "TextPluginMultiLineTab"
appl::TextPluginMultiLineTab::TextPluginMultiLineTab(void) { appl::TextPluginMultiLineTab::TextPluginMultiLineTab() {
m_activateOnEventEntry = true; m_activateOnEventEntry = true;
} }

4
sources/appl/TextPluginMultiLineTab.h
View File

@ -18,8 +18,8 @@
namespace appl { namespace appl {
class TextPluginMultiLineTab : public appl::TextViewerPlugin { class TextPluginMultiLineTab : public appl::TextViewerPlugin {
public: public:
TextPluginMultiLineTab(void); TextPluginMultiLineTab();
~TextPluginMultiLineTab(void) { ~TextPluginMultiLineTab() {
// nothing to do ... // nothing to do ...
}; };
public: public:

2
sources/appl/TextPluginRmLine.cpp
View File

@ -15,7 +15,7 @@
#define __class__ "TextPluginRmLine" #define __class__ "TextPluginRmLine"
appl::TextPluginRmLine::TextPluginRmLine(void) { appl::TextPluginRmLine::TextPluginRmLine() {
m_activateOnReceiveMessage = true; m_activateOnReceiveMessage = true;
} }

4
sources/appl/TextPluginRmLine.h
View File

@ -18,8 +18,8 @@
namespace appl { namespace appl {
class TextPluginRmLine : public appl::TextViewerPlugin { class TextPluginRmLine : public appl::TextViewerPlugin {
public: public:
TextPluginRmLine(void); TextPluginRmLine();
~TextPluginRmLine(void) { ~TextPluginRmLine() {
// nothing to do ... // nothing to do ...
}; };
public: public:

2
sources/appl/TextPluginSelectAll.cpp
View File

@ -15,7 +15,7 @@
#define __class__ "TextPluginSelectAll" #define __class__ "TextPluginSelectAll"
appl::TextPluginSelectAll::TextPluginSelectAll(void) { appl::TextPluginSelectAll::TextPluginSelectAll() {
m_activateOnReceiveMessage = true; m_activateOnReceiveMessage = true;
} }

4
sources/appl/TextPluginSelectAll.h
View File

@ -18,8 +18,8 @@
namespace appl { namespace appl {
class TextPluginSelectAll : public appl::TextViewerPlugin { class TextPluginSelectAll : public appl::TextViewerPlugin {
public: public:
TextPluginSelectAll(void); TextPluginSelectAll();
~TextPluginSelectAll(void) { ~TextPluginSelectAll() {
// nothing to do ... // nothing to do ...
}; };
public: public:

2
sources/appl/ctags/readtags.cpp
View File

@ -846,7 +846,7 @@ static void findTag (const char *const name, const int options)
} }
} }
static void listTags (void) static void listTags ()
{ {
tagFileInfo info; tagFileInfo info;
tagEntry entry; tagEntry entry;

2
sources/appl/debug.cpp
View File

@ -8,7 +8,7 @@
#include <appl/debug.h> #include <appl/debug.h>
int32_t appl::getLogId(void) { int32_t appl::getLogId() {
static int32_t g_val = etk::log::registerInstance("edn"); static int32_t g_val = etk::log::registerInstance("edn");
return g_val; return g_val;
} }

2
sources/appl/debug.h
View File

@ -12,7 +12,7 @@
#include <etk/log.h> #include <etk/log.h>
namespace appl { namespace appl {
int32_t getLogId(void); int32_t getLogId();
}; };
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" // TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define APPL_BASE(info,data) \ #define APPL_BASE(info,data) \

26
sources/appl/global.cpp
View File

@ -28,7 +28,7 @@ class myParamGlobal : public ewol::Object {
bool m_displayTabChar; bool m_displayTabChar;
bool m_displaySpaceChar; bool m_displaySpaceChar;
public : public :
myParamGlobal(void) { myParamGlobal() {
m_static = true; // Note : set the object static notification( Must be set or assert at the end of process) m_static = true; // Note : set the object static notification( Must be set or assert at the end of process)
setName("edn_global_param"); setName("edn_global_param");
m_displayEOL=false; m_displayEOL=false;
@ -104,22 +104,22 @@ const char * const myParamGlobal::configAutoIndent = "auto-indent";
const char * const myParamGlobal::configShowTabChar = "display-tab"; const char * const myParamGlobal::configShowTabChar = "display-tab";
const char * const myParamGlobal::configShowSpaceChar = "display-space"; const char * const myParamGlobal::configShowSpaceChar = "display-space";
static myParamGlobal& l_obj(void) { static myParamGlobal& l_obj() {
static myParamGlobal s_obj; static myParamGlobal s_obj;
return s_obj; return s_obj;
} }
void globals::init(void) { void globals::init() {
//ewol::userConfig::addUserConfig(&l_obj()); //ewol::userConfig::addUserConfig(&l_obj());
} }
void globals::UnInit(void) { void globals::UnInit() {
// nothing to do ... // nothing to do ...
//ewol::userConfig::RmUserConfig(&l_obj()); //ewol::userConfig::RmUserConfig(&l_obj());
} }
// ----------------------------------------------------------- // -----------------------------------------------------------
bool globals::isSetDisplayEndOfLine(void) { bool globals::isSetDisplayEndOfLine() {
return l_obj().m_displayEOL; return l_obj().m_displayEOL;
} }
@ -129,7 +129,7 @@ void globals::setDisplayEndOfLine(bool newVal) {
} }
// ----------------------------------------------------------- // -----------------------------------------------------------
bool globals::isSetDisplaySpaceChar(void) { bool globals::isSetDisplaySpaceChar() {
return l_obj().m_displaySpaceChar; return l_obj().m_displaySpaceChar;
} }
@ -138,7 +138,7 @@ void globals::setDisplaySpaceChar(bool _newVal) {
//ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange); //ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange);
} }
// ----------------------------------------------------------- // -----------------------------------------------------------
bool globals::isSetDisplayTabChar(void) { bool globals::isSetDisplayTabChar() {
return l_obj().m_displayTabChar; return l_obj().m_displayTabChar;
} }
@ -148,7 +148,7 @@ void globals::setDisplayTabChar(bool _newVal) {
} }
// ----------------------------------------------------------- // -----------------------------------------------------------
bool globals::isSetAutoIndent(void) { bool globals::isSetAutoIndent() {
return l_obj().m_AutoIndent; return l_obj().m_AutoIndent;
} }
@ -157,16 +157,16 @@ void globals::setAutoIndent(bool _newVal) {
} }
// ----------------------------------------------------------- // -----------------------------------------------------------
bool globals::OrderTheBufferList(void) { bool globals::OrderTheBufferList() {
return true; return true;
} }
// ----------------------------------------------------------- // -----------------------------------------------------------
int32_t globals::getNbColoneBorder(void) { int32_t globals::getNbColoneBorder() {
return 6; return 6;
} }
int32_t globals::getNbLineBorder(void) { int32_t globals::getNbLineBorder() {
return 3; return 3;
} }
@ -179,7 +179,7 @@ static const char * const l_changeTabulation = "edn-event-change-tabulation";
static const char * const l_changeEndOfLine = "edn-event-change-endOfLine"; static const char * const l_changeEndOfLine = "edn-event-change-endOfLine";
static const char * const l_changeRounded = "edn-event-change-rounded"; static const char * const l_changeRounded = "edn-event-change-rounded";
globals::ParameterGlobalsGui::ParameterGlobalsGui(void) : globals::ParameterGlobalsGui::ParameterGlobalsGui() :
ewol::widget::Sizer(ewol::widget::Sizer::modeVert) { ewol::widget::Sizer(ewol::widget::Sizer::modeVert) {
ewol::widget::CheckBox* myCheckbox = NULL; ewol::widget::CheckBox* myCheckbox = NULL;
ewol::widget::Spacer* mySpacer = NULL; ewol::widget::Spacer* mySpacer = NULL;
@ -238,7 +238,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
} }
} }
globals::ParameterGlobalsGui::~ParameterGlobalsGui(void) { globals::ParameterGlobalsGui::~ParameterGlobalsGui() {
} }

24
sources/appl/global.h
View File

@ -15,31 +15,31 @@
namespace globals namespace globals
{ {
void init(void); void init();
void UnInit(void); void UnInit();
int32_t getNbColoneBorder(void); int32_t getNbColoneBorder();
int32_t getNbLineBorder(void); int32_t getNbLineBorder();
bool isSetDisplayEndOfLine(void); bool isSetDisplayEndOfLine();
void setDisplayEndOfLine(bool _newVal); void setDisplayEndOfLine(bool _newVal);
bool isSetDisplaySpaceChar(void); bool isSetDisplaySpaceChar();
void setDisplaySpaceChar(bool _newVal); void setDisplaySpaceChar(bool _newVal);
bool isSetDisplayTabChar(void); bool isSetDisplayTabChar();
void setDisplayTabChar(bool _newVal); void setDisplayTabChar(bool _newVal);
bool isSetAutoIndent(void); bool isSetAutoIndent();
void setAutoIndent(bool _newVal); void setAutoIndent(bool _newVal);
void init2(void); void init2();
bool OrderTheBufferList(void); bool OrderTheBufferList();
class ParameterGlobalsGui : public ewol::widget::Sizer { class ParameterGlobalsGui : public ewol::widget::Sizer {
public : public :
ParameterGlobalsGui(void); ParameterGlobalsGui();
~ParameterGlobalsGui(void); ~ParameterGlobalsGui();
// herited function // herited function
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
}; };

2
sources/appl/init.cpp
View File

@ -66,7 +66,7 @@ bool APP_Init(ewol::Context& _context, size_t _initId, size_t& _nbInitStep) {
globals::init(); globals::init();
// init ALL Singleton : // init ALL Singleton :
//(void)CTagsManager::getInstance(); //()CTagsManager::getInstance();
bufferManager = appl::BufferManager::keep(); bufferManager = appl::BufferManager::keep();
appl::highlightManager::init(); appl::highlightManager::init();