From 2d8c5d588d3ef097dfcec44682012c3e71573d6e Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 15 May 2014 21:37:39 +0200 Subject: [PATCH] [STYLE] remove (void) in () to be c++ coherent --- sources/appl/Buffer.cpp | 34 +++++----- sources/appl/Buffer.h | 66 +++++++++--------- sources/appl/BufferManager.cpp | 8 +-- sources/appl/BufferManager.h | 12 ++-- sources/appl/GlyphDecoration.h | 16 ++--- sources/appl/GlyphPainting.cpp | 4 +- sources/appl/GlyphPainting.h | 4 +- sources/appl/Gui/BufferView.cpp | 12 ++-- sources/appl/Gui/BufferView.h | 14 ++-- sources/appl/Gui/MainWindows.cpp | 90 ++++++++++++------------- sources/appl/Gui/MainWindows.h | 4 +- sources/appl/Gui/Search.cpp | 8 +-- sources/appl/Gui/Search.h | 8 +-- sources/appl/Gui/TagFileList.cpp | 10 +-- sources/appl/Gui/TagFileList.h | 12 ++-- sources/appl/Gui/TagFileSelection.cpp | 4 +- sources/appl/Gui/TagFileSelection.h | 4 +- sources/appl/Gui/TextViewer.cpp | 26 +++---- sources/appl/Gui/TextViewer.h | 46 ++++++------- sources/appl/Gui/ViewerManager.cpp | 6 +- sources/appl/Gui/ViewerManager.h | 8 +-- sources/appl/Gui/WorkerCloseAllFile.cpp | 4 +- sources/appl/Gui/WorkerCloseAllFile.h | 4 +- sources/appl/Gui/WorkerCloseFile.cpp | 2 +- sources/appl/Gui/WorkerCloseFile.h | 2 +- sources/appl/Gui/WorkerSaveAllFile.cpp | 4 +- sources/appl/Gui/WorkerSaveAllFile.h | 4 +- sources/appl/Gui/WorkerSaveFile.cpp | 2 +- sources/appl/Gui/WorkerSaveFile.h | 2 +- sources/appl/Highlight.cpp | 4 +- sources/appl/Highlight.h | 8 +-- sources/appl/HighlightManager.cpp | 8 +-- sources/appl/HighlightManager.h | 6 +- sources/appl/HighlightPattern.cpp | 4 +- sources/appl/HighlightPattern.h | 10 +-- sources/appl/TextPlugin.cpp | 4 +- sources/appl/TextPlugin.h | 24 +++---- sources/appl/TextPluginAutoIndent.cpp | 2 +- sources/appl/TextPluginAutoIndent.h | 4 +- sources/appl/TextPluginCopy.cpp | 2 +- sources/appl/TextPluginCopy.h | 4 +- sources/appl/TextPluginCtags.cpp | 6 +- sources/appl/TextPluginCtags.h | 6 +- sources/appl/TextPluginData.h | 4 +- sources/appl/TextPluginHistory.cpp | 2 +- sources/appl/TextPluginHistory.h | 6 +- sources/appl/TextPluginManager.cpp | 22 +++--- sources/appl/TextPluginManager.h | 6 +- sources/appl/TextPluginMultiLineTab.cpp | 2 +- sources/appl/TextPluginMultiLineTab.h | 4 +- sources/appl/TextPluginRmLine.cpp | 2 +- sources/appl/TextPluginRmLine.h | 4 +- sources/appl/TextPluginSelectAll.cpp | 2 +- sources/appl/TextPluginSelectAll.h | 4 +- sources/appl/ctags/readtags.cpp | 2 +- sources/appl/debug.cpp | 2 +- sources/appl/debug.h | 2 +- sources/appl/global.cpp | 26 +++---- sources/appl/global.h | 24 +++---- sources/appl/init.cpp | 2 +- 60 files changed, 314 insertions(+), 314 deletions(-) diff --git a/sources/appl/Buffer.cpp b/sources/appl/Buffer.cpp index f769acb..0a42d35 100644 --- a/sources/appl/Buffer.cpp +++ b/sources/appl/Buffer.cpp @@ -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::eventChangeName = "edn-buffer-name-change"; -appl::Buffer::Iterator& appl::Buffer::Iterator::operator++ (void) { +appl::Buffer::Iterator& appl::Buffer::Iterator::operator++ () { m_value = u32char::Null; if (m_current < 0) { m_current = 0; @@ -43,7 +43,7 @@ appl::Buffer::Iterator& appl::Buffer::Iterator::operator++ (void) { return *this; } -appl::Buffer::Iterator& appl::Buffer::Iterator::operator-- (void) { +appl::Buffer::Iterator& appl::Buffer::Iterator::operator-- () { m_value = u32char::Null; if (m_data != NULL) { if (m_current > 0) { @@ -64,7 +64,7 @@ appl::Buffer::Iterator& appl::Buffer::Iterator::operator-- (void) { return *this; } -char32_t appl::Buffer::Iterator::operator* (void) { +char32_t appl::Buffer::Iterator::operator* () { if (m_value != u32char::Null) { return m_value; } @@ -94,32 +94,32 @@ appl::Buffer::Iterator appl::Buffer::position(int64_t _pos) { return appl::Buffer::Iterator(this, _pos); } -appl::Buffer::Iterator appl::Buffer::begin(void) { +appl::Buffer::Iterator appl::Buffer::begin() { return position(0); } -appl::Buffer::Iterator appl::Buffer::end(void) { +appl::Buffer::Iterator appl::Buffer::end() { // TODO : chek the validity of the char ... return position( m_data.size() ); } -appl::Buffer::Iterator appl::Buffer::cursor(void) { +appl::Buffer::Iterator appl::Buffer::cursor() { if (m_cursorPos<= 0) { return begin(); } return position( m_cursorPos ); } -appl::Buffer::Iterator appl::Buffer::selectStart(void) { +appl::Buffer::Iterator appl::Buffer::selectStart() { return position( getStartSelectionPos() ); } -appl::Buffer::Iterator appl::Buffer::selectStop(void) { +appl::Buffer::Iterator appl::Buffer::selectStop() { return position( getStopSelectionPos() ); } -appl::Buffer::Buffer(void) : +appl::Buffer::Buffer() : m_hasFileName(false), m_fileName(""), m_isModify(false), @@ -138,7 +138,7 @@ appl::Buffer::Buffer(void) : addEventId(eventChangeName); } -appl::Buffer::~Buffer(void) { +appl::Buffer::~Buffer() { if (m_highlight == NULL) { appl::Highlight::release(m_highlight); } @@ -177,7 +177,7 @@ void appl::Buffer::setFileName(const std::string& _name) { setModification(true); } -bool appl::Buffer::storeFile(void) { +bool appl::Buffer::storeFile() { if (m_data.dumpIn(m_fileName) == true) { APPL_INFO("saving file : " << m_fileName); setModification(false); @@ -199,7 +199,7 @@ void appl::Buffer::setModification(bool _status) { } // TODO : Naming error -void appl::Buffer::countNumberofLine(void) { +void appl::Buffer::countNumberofLine() { m_nbLines = 1; for (Iterator it = begin(); (bool)it == true; @@ -519,7 +519,7 @@ void appl::Buffer::setSelectionPos(const appl::Buffer::Iterator& _pos) { generateEventId(eventSelectChange); } -void appl::Buffer::unSelect(void) { +void appl::Buffer::unSelect() { m_cursorSelectPos = -1; generateEventId(eventSelectChange); } @@ -667,7 +667,7 @@ bool appl::Buffer::replace(const std::string& _data, const appl::Buffer::Iterato return true; } -void appl::Buffer::removeSelection(void) { +void appl::Buffer::removeSelection() { if (hasTextSelected() == false) { return; } @@ -681,7 +681,7 @@ void appl::Buffer::removeSelection(void) { setModification(true); } -void appl::Buffer::tryFindHighlightType(void) { +void appl::Buffer::tryFindHighlightType() { etk::FSNode file(m_fileName); std::string type = appl::highlightManager::getTypeExtention(file.fileGetExtention()); 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); } -void appl::Buffer::cleanHighLight(void) { +void appl::Buffer::cleanHighLight() { // remove all element in the list... m_HLDataPass1.clear(); } @@ -980,7 +980,7 @@ appl::HighlightInfo* appl::Buffer::getElementColorAtPosition(appl::DisplayHLData return getElementColorAtPosition(_pos, _MData.posHLPass1); } -uint32_t appl::Buffer::getCursorLinesId(void) { +uint32_t appl::Buffer::getCursorLinesId() { if (m_data.size() == 0) { return 0; } diff --git a/sources/appl/Buffer.h b/sources/appl/Buffer.h index c25dab3..edf82b7 100644 --- a/sources/appl/Buffer.h +++ b/sources/appl/Buffer.h @@ -38,7 +38,7 @@ namespace appl { /** * @brief Basic itarator constructor with no link. */ - Iterator(void): + Iterator(): m_current(0), m_data(NULL), m_value(u32char::Null) { @@ -68,7 +68,7 @@ namespace appl { /** * @brief Basic destructor */ - ~Iterator(void) { + ~Iterator() { m_current = 0; m_data = NULL; m_value = u32char::Null; @@ -77,7 +77,7 @@ namespace appl { * @brief basic boolean cast * @return true if the element is present in buffer */ - operator bool (void) const { + operator bool () const { if (m_data == NULL) { return false; } @@ -93,7 +93,7 @@ namespace appl { * @brief basic boolean cast * @return true if the element is present in buffer */ - operator int64_t (void) const { + operator int64_t () const { if (m_data == NULL) { return 0; } @@ -109,12 +109,12 @@ namespace appl { * @brief Incremental operator * @return Reference on the current iterator incremented */ - Iterator& operator++ (void); + Iterator& operator++ (); /** * @brief Decremental operator * @return Reference on the current iterator decremented */ - Iterator& operator-- (void); + Iterator& operator-- (); /** * @brief Incremental operator * @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 * @return The request element value */ - char32_t operator* (void); + char32_t operator* (); /** * @brief Get the position in the buffer * @return The requested position. */ - int64_t getPos(void) const { + int64_t getPos() const { if (m_data == NULL) { return 0; } @@ -293,8 +293,8 @@ namespace appl { static const char* const eventSelectChange; static const char* const eventChangeName; public: - Buffer(void); - ~Buffer(void); + Buffer(); + ~Buffer(); private: 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) @@ -302,14 +302,14 @@ namespace appl { /** * @brief get the curent filename of the Buffer */ - const std::string& getFileName(void) { + const std::string& getFileName() { return m_fileName; } /** * @brief Check if the buffer has a real filename. * @return the status of the existance of a name. */ - bool hasFileName(void) { + bool hasFileName() { return m_hasFileName; } /** @@ -327,7 +327,7 @@ namespace appl { * @brief save the file in the specify path. * @return true is saving well done */ - bool storeFile(void); + bool storeFile(); protected: bool m_isModify; //!< true if the file is modify public: @@ -335,7 +335,7 @@ namespace appl { * @breif get the status of file modification. * @return true if file is modify. */ - bool isModify(void) { + bool isModify() { return m_isModify; } /** @@ -346,7 +346,7 @@ namespace appl { protected: etk::Buffer m_data; //!< copy of the file buffer public: - etk::Buffer& getData(void) { + etk::Buffer& getData() { return m_data; }; protected: @@ -364,30 +364,30 @@ namespace appl { /** * @brief Remove Selection of the buffer. */ - void unSelect(void); + void unSelect(); /** * @brief Remove the selection of the buffer. (do nothing if no secection) */ - void removeSelection(void); + void removeSelection(); /** * @brief Get the status of selection. * @return true if we have a curent selection, false otherwise. */ - bool hasTextSelected(void) { + bool hasTextSelected() { return m_cursorSelectPos >= 0; } /** * @brief Get the Start position of the selection. * @return position of the start selection. */ - int64_t getStartSelectionPos(void) { + int64_t getStartSelectionPos() { return etk_min(m_cursorPos, m_cursorSelectPos); } /** * @brief Get the Stop position of the selection. * @return position of the stop selection. */ - int64_t getStopSelectionPos(void) { + int64_t getStopSelectionPos() { return etk_max(m_cursorPos, m_cursorSelectPos); } protected: @@ -404,7 +404,7 @@ namespace appl { * @brief Get the favorite distance from the left screen (For up and down moving). * @return The distance in pixels. */ - float getFavoriteUpDownPos(void) { + float getFavoriteUpDownPos() { return m_cursorPreferredCol; } protected: @@ -421,7 +421,7 @@ namespace appl { * @brief Get the selection mode (if true, the move event creata a selection) * @return The selecting mode. */ - bool getSelectMode(void) { + bool getSelectMode() { return m_selectMode; } public: @@ -544,27 +544,27 @@ namespace appl { * @brief Get an Iterator on the start position. * @return The Iterator */ - Iterator begin(void); + Iterator begin(); /** * @brief Get an Iterator on the end position. * @return The Iterator */ - Iterator end(void); + Iterator end(); /** * @brief Get an Iterator on the cursor position. * @return The Iterator */ - Iterator cursor(void); + Iterator cursor(); /** * @brief Get an Iterator on the start selection. * @return The Iterator */ - Iterator selectStart(void); + Iterator selectStart(); /** * @brief Get an Iterator on the stop selection. * @return The Iterator */ - Iterator selectStop(void); + Iterator selectStop(); protected: int32_t m_nbLines; //!< number of line in the buffer public: @@ -572,19 +572,19 @@ namespace appl { * @brief Get the number of line in the buffer. * @return number of line in the Buffer. */ - int32_t getNumberOfLines(void) { + int32_t getNumberOfLines() { return m_nbLines; } /** * @brief Get the cursor line numberin the buffer. * @return the line id in the Buffer. */ - uint32_t getCursorLinesId(void); + uint32_t getCursorLinesId(); protected: /** * @brief Count the number of line in the buffer */ - void countNumberofLine(void); + void countNumberofLine(); protected: std::string m_highlightType; //!< Name of the highlight type @@ -594,7 +594,7 @@ namespace appl { /** * @brief Find the Highligh capability */ - void tryFindHighlightType(void); + void tryFindHighlightType(); /** * @brief Set type of highlight * @param[in] _type type of the highlight @@ -604,7 +604,7 @@ namespace appl { * @brief Get type of highlight * @return Type of the highlight */ - const std::string& setHighlightType(void) { + const std::string& setHighlightType() { return m_highlightType; }; @@ -615,7 +615,7 @@ namespace appl { int64_t& _stopId, bool _backPreviousNotEnded); 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); void hightlightGenerateLines(appl::DisplayHLData& _MData, const appl::Buffer::Iterator& _HLStart, int64_t _nbLines); appl::HighlightInfo* getElementColorAtPosition(appl::DisplayHLData& _MData, int64_t _pos); diff --git a/sources/appl/BufferManager.cpp b/sources/appl/BufferManager.cpp index ea51a65..5351ddd 100644 --- a/sources/appl/BufferManager.cpp +++ b/sources/appl/BufferManager.cpp @@ -18,13 +18,13 @@ #undef __class__ #define __class__ "BufferManager" -appl::BufferManager::BufferManager(void) : +appl::BufferManager::BufferManager() : ewol::Resource("???BufferManager???"), m_bufferSelected(NULL) { addObjectType("appl::BufferManager"); } -appl::BufferManager::~BufferManager(void) { +appl::BufferManager::~BufferManager() { int32_t previousCount = m_list.size(); for (int32_t iii = m_list.size()-1; iii >= 0 ; --iii) { 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(); if (tmp == NULL) { 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::BufferManager* appl::BufferManager::keep(void) { +appl::BufferManager* appl::BufferManager::keep() { //EWOL_INFO("KEEP : appl::GlyphPainting : file : \"" << _filename << "\""); appl::BufferManager* object = static_cast(getManager().localKeep("???BufferManager???")); if (NULL != object) { diff --git a/sources/appl/BufferManager.h b/sources/appl/BufferManager.h index 9b58c11..293b296 100644 --- a/sources/appl/BufferManager.h +++ b/sources/appl/BufferManager.h @@ -17,8 +17,8 @@ namespace appl { class BufferManager : public ewol::Resource { protected: - BufferManager(void); - ~BufferManager(void); + BufferManager(); + ~BufferManager(); private: std::vector m_list; // list of all buffer curently open public: @@ -44,7 +44,7 @@ namespace appl { * @brief Get count of all buffer availlable. * @return Number of buffer */ - int32_t size(void) const { + int32_t size() const { return m_list.size(); } /** @@ -59,7 +59,7 @@ namespace appl { * @brief Create a new buffer empty. * @return Created buffer or NULL. */ - appl::Buffer* createNewBuffer(void); + appl::Buffer* createNewBuffer(); private: appl::Buffer* m_bufferSelected; public: @@ -72,7 +72,7 @@ namespace appl { * @brief Get the current buffer selected * @return Pointer on the buffer selected */ - appl::Buffer* getBufferSelected(void) { + appl::Buffer* getBufferSelected() { return m_bufferSelected; }; public: // herited function @@ -85,7 +85,7 @@ namespace appl { * @param[in] _filename Name of the configuration file. * @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 * @param[in,out] reference on the object pointer diff --git a/sources/appl/GlyphDecoration.h b/sources/appl/GlyphDecoration.h index 28137f4..7b0c222 100644 --- a/sources/appl/GlyphDecoration.h +++ b/sources/appl/GlyphDecoration.h @@ -17,7 +17,7 @@ namespace appl { public: // Constructeur GlyphDecoration(const std::string& _newColorName = "no_name"); - ~GlyphDecoration(void) { + ~GlyphDecoration() { // nothing to do ... }; private: @@ -34,7 +34,7 @@ namespace appl { * @brief Get the color name. * @return The name of the color. */ - const std::string& getName(void) const { + const std::string& getName() const { return m_colorName; }; private: @@ -51,14 +51,14 @@ namespace appl { * @brief Get the foreground color. * @return The color. */ - const etk::Color<>& getForeground(void) const { + const etk::Color<>& getForeground() const { return m_colorFG; }; /** * @brief Get the foreground color status. * @return true if the color is visible. */ - bool haveFg(void) const { + bool haveFg() const { return m_colorFG.a() != 0; }; private: @@ -75,14 +75,14 @@ namespace appl { * @brief Get the background color. * @return The color. */ - const etk::Color<>& getBackground(void) const { + const etk::Color<>& getBackground() const { return m_colorBG; }; /** * @brief Get the background color status. * @return true if the color is visible. */ - bool haveBackground(void) const { + bool haveBackground() const { return m_colorBG.a()!=0; }; private: @@ -97,7 +97,7 @@ namespace appl { * @brief Get the italic status. * @return true if the glyph might be display in italic. */ - bool getItalic(void) const { + bool getItalic() const { return m_italic; }; private: @@ -112,7 +112,7 @@ namespace appl { * @brief Get the bold status. * @return true if the glyph might be display in bold. */ - bool getBold(void) const { + bool getBold() const { return m_bold; }; }; diff --git a/sources/appl/GlyphPainting.cpp b/sources/appl/GlyphPainting.cpp index 741baa6..1377030 100644 --- a/sources/appl/GlyphPainting.cpp +++ b/sources/appl/GlyphPainting.cpp @@ -25,11 +25,11 @@ appl::GlyphPainting::GlyphPainting(const std::string& _filename) : reload(); } -appl::GlyphPainting::~GlyphPainting(void) { +appl::GlyphPainting::~GlyphPainting() { } -void appl::GlyphPainting::reload(void) { +void appl::GlyphPainting::reload() { ejson::Document doc; if (false == doc.load(m_name)) { APPL_ERROR("Can not load file : '" << m_name << "' = " << etk::FSNode(m_name).getFileSystemName()); diff --git a/sources/appl/GlyphPainting.h b/sources/appl/GlyphPainting.h index 61f7ea2..08a20a4 100644 --- a/sources/appl/GlyphPainting.h +++ b/sources/appl/GlyphPainting.h @@ -20,12 +20,12 @@ namespace appl { std::vector m_list; protected: GlyphPainting(const std::string& _filename); - virtual ~GlyphPainting(void); + virtual ~GlyphPainting(); public: /** * @brief Load or reload data from config */ - void reload(void); + void reload(); /** * @brief Register a decoration with his name and get the ref id. * @param[in] _name Name of the deco. diff --git a/sources/appl/Gui/BufferView.cpp b/sources/appl/Gui/BufferView.cpp index 4290a28..a34616a 100644 --- a/sources/appl/Gui/BufferView.cpp +++ b/sources/appl/Gui/BufferView.cpp @@ -39,7 +39,7 @@ static void SortElementList(std::vector& _list) { } } -BufferView::BufferView(void) : +BufferView::BufferView() : m_openOrderMode(false) { addObjectType("appl::BufferView"); setCanHaveFocus(true); @@ -63,11 +63,11 @@ BufferView::BufferView(void) : m_colorTextModify = m_paintingProperties->request("textModify"); } -BufferView::~BufferView(void) { +BufferView::~BufferView() { removeAllElement(); } -void BufferView::removeAllElement(void) { +void BufferView::removeAllElement() { for(int32_t iii=0; iii BufferView::getBasicBG(void) { +etk::Color<> BufferView::getBasicBG() { return (*m_paintingProperties)[m_colorBackground1].getForeground(); } -uint32_t BufferView::getNuberOfColomn(void) { +uint32_t BufferView::getNuberOfColomn() { return 1; } @@ -250,7 +250,7 @@ bool BufferView::getTitle(int32_t _colomn, std::string &_myTitle, etk::Color<> & return true; } -uint32_t BufferView::getNuberOfRaw(void) { +uint32_t BufferView::getNuberOfRaw() { return m_list.size(); } diff --git a/sources/appl/Gui/BufferView.h b/sources/appl/Gui/BufferView.h index 11fd2d2..1e33974 100644 --- a/sources/appl/Gui/BufferView.h +++ b/sources/appl/Gui/BufferView.h @@ -27,7 +27,7 @@ namespace appl m_buffer(_buffer) { }; - ~dataBufferStruct(void) { }; + ~dataBufferStruct() { }; }; }; @@ -53,8 +53,8 @@ class BufferView : public ewol::widget::List void insertAlphabetic(appl::dataBufferStruct* _dataStruct, bool _selectNewPosition = false); public: // Constructeur - BufferView(void); - ~BufferView(void); + BufferView(); + ~BufferView(); // Derived function virtual void onReceiveMessage(const ewol::object::Message& _msg); 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 protected: // function call to display the list : - virtual etk::Color<> getBasicBG(void); - void removeAllElement(void); + virtual etk::Color<> getBasicBG(); + void removeAllElement(); // 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 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 onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); }; diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp index 5d1b199..49a24e1 100644 --- a/sources/appl/Gui/MainWindows.cpp +++ b/sources/appl/Gui/MainWindows.cpp @@ -38,7 +38,7 @@ #include namespace appl { - std::string getVersion(void) { + std::string getVersion() { #define FIRST_YEAR (2010) std::string tmpOutput = std::to_string(date::getYear()-FIRST_YEAR); tmpOutput += "."; @@ -59,7 +59,7 @@ namespace appl { class ParameterAboutGui : public ewol::widget::Sizer { public : - ParameterAboutGui(void) : + ParameterAboutGui() : ewol::widget::Sizer(ewol::widget::Sizer::modeVert) { 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__ #define __class__ "MainWindows" -MainWindows::MainWindows(void) { +MainWindows::MainWindows() { addObjectType("appl::MainWindows"); APPL_DEBUG("CREATE WINDOWS ... "); ewol::widget::Sizer * mySizerVert = NULL; @@ -172,51 +172,51 @@ MainWindows::MainWindows(void) { myMenu = new ewol::widget::Menu(); mySizerHori->subWidgetAdd(myMenu); int32_t idMenuFile = myMenu->addTitle("File"); - (void)myMenu->add(idMenuFile, "New", "", ednMsgGuiNew); - (void)myMenu->addSpacer(); - (void)myMenu->add(idMenuFile, "Open", "THEME:GUI:Load.edf", ednMsgGuiOpen); - (void)myMenu->add(idMenuFile, "Close", "THEME:GUI:Close.edf", ednMsgGuiClose, "current"); - (void)myMenu->add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All"); - (void)myMenu->add(idMenuFile, "Save", "THEME:GUI:Save.edf", ednMsgGuiSave, "current"); - (void)myMenu->add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs); - (void)myMenu->addSpacer(); - //(void)myMenu->add(idMenuFile, "Exit", "", ednMsgGuiExit); - (void)myMenu->addSpacer(); - (void)myMenu->add(idMenuFile, "Properties", "THEME:GUI:Parameter.edf", ednMsgProperties); + myMenu->add(idMenuFile, "New", "", ednMsgGuiNew); + myMenu->addSpacer(); + myMenu->add(idMenuFile, "Open", "THEME:GUI:Load.edf", ednMsgGuiOpen); + myMenu->add(idMenuFile, "Close", "THEME:GUI:Close.edf", ednMsgGuiClose, "current"); + myMenu->add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All"); + myMenu->add(idMenuFile, "Save", "THEME:GUI:Save.edf", ednMsgGuiSave, "current"); + myMenu->add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs); + myMenu->addSpacer(); + //myMenu->add(idMenuFile, "Exit", "", ednMsgGuiExit); + myMenu->addSpacer(); + myMenu->add(idMenuFile, "Properties", "THEME:GUI:Parameter.edf", ednMsgProperties); int32_t idMenuEdit = myMenu->addTitle("Edit"); - (void)myMenu->add(idMenuEdit, "Undo", "THEME:GUI:Undo.edf", ednMsgGuiUndo); - (void)myMenu->add(idMenuEdit, "Redo", "THEME:GUI:Redo.edf", ednMsgGuiRedo); - (void)myMenu->addSpacer(); - (void)myMenu->add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD"); - (void)myMenu->add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD"); - (void)myMenu->add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD"); - (void)myMenu->add(idMenuEdit, "Remove", "", ednMsgGuiRm); - (void)myMenu->addSpacer(); - (void)myMenu->add(idMenuEdit, "Select All","", ednMsgGuiSelect, "ALL"); - (void)myMenu->add(idMenuEdit, "Un-Select","", ednMsgGuiSelect, "NONE"); - (void)myMenu->add(idMenuEdit, "Goto line ...","", ednMsgGuiGotoLine, "???"); + myMenu->add(idMenuEdit, "Undo", "THEME:GUI:Undo.edf", ednMsgGuiUndo); + myMenu->add(idMenuEdit, "Redo", "THEME:GUI:Redo.edf", ednMsgGuiRedo); + myMenu->addSpacer(); + myMenu->add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD"); + myMenu->add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD"); + myMenu->add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD"); + myMenu->add(idMenuEdit, "Remove", "", ednMsgGuiRm); + myMenu->addSpacer(); + myMenu->add(idMenuEdit, "Select All","", ednMsgGuiSelect, "ALL"); + myMenu->add(idMenuEdit, "Un-Select","", ednMsgGuiSelect, "NONE"); + myMenu->add(idMenuEdit, "Goto line ...","", ednMsgGuiGotoLine, "???"); int32_t idMenuSearch = myMenu->addTitle("Search"); - (void)myMenu->add(idMenuSearch, "Search", "THEME:GUI:Search.edf", ednMsgGuiSearch); - (void)myMenu->add(idMenuSearch, "Replace", "THEME:GUI:Replace.edf", ednMsgGuiReplace); - (void)myMenu->addSpacer(); - (void)myMenu->add(idMenuSearch, "Find (previous)","", ednMsgGuiFind, "Previous"); - (void)myMenu->add(idMenuSearch, "Find (next)", "", ednMsgGuiFind, "Next"); - (void)myMenu->add(idMenuSearch, "Find (all)", "", ednMsgGuiFind, "All"); - (void)myMenu->add(idMenuSearch, "Un-Select", "", ednMsgGuiFind, "None"); + myMenu->add(idMenuSearch, "Search", "THEME:GUI:Search.edf", ednMsgGuiSearch); + myMenu->add(idMenuSearch, "Replace", "THEME:GUI:Replace.edf", ednMsgGuiReplace); + myMenu->addSpacer(); + myMenu->add(idMenuSearch, "Find (previous)","", ednMsgGuiFind, "Previous"); + myMenu->add(idMenuSearch, "Find (next)", "", ednMsgGuiFind, "Next"); + myMenu->add(idMenuSearch, "Find (all)", "", ednMsgGuiFind, "All"); + myMenu->add(idMenuSearch, "Un-Select", "", ednMsgGuiFind, "None"); /* ==> must be in the pluggin list control ... int32_t idMenuCTags = myMenu->addTitle("C-tags"); - (void)myMenu->add(idMenuCTags, "Load", "", ednMsgGuiCtags, "Load"); - (void)myMenu->add(idMenuCTags, "ReLoad", "", ednMsgGuiCtags, "ReLoad"); - (void)myMenu->add(idMenuCTags, "Jump", "", ednMsgGuiCtags, "Jump"); - (void)myMenu->add(idMenuCTags, "Back", "", ednMsgGuiCtags, "Back"); + myMenu->add(idMenuCTags, "Load", "", ednMsgGuiCtags, "Load"); + myMenu->add(idMenuCTags, "ReLoad", "", ednMsgGuiCtags, "ReLoad"); + myMenu->add(idMenuCTags, "Jump", "", ednMsgGuiCtags, "Jump"); + myMenu->add(idMenuCTags, "Back", "", ednMsgGuiCtags, "Back"); */ int32_t idMenugDisplay = myMenu->addTitle("Display"); - (void)myMenu->add(idMenugDisplay, "Color Black", "", appl::MsgNameGuiChangeColor, "color/black/"); - (void)myMenu->add(idMenugDisplay, "Color White", "", appl::MsgNameGuiChangeColor, "color/white/"); - (void)myMenu->add(idMenugDisplay, "Shape square", "", l_MsgNameGuiChangeShape, "shape/square/"); - (void)myMenu->add(idMenugDisplay, "Shape round", "", l_MsgNameGuiChangeShape, "shape/round/"); - (void)myMenu->addSpacer(); - (void)myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader); + myMenu->add(idMenugDisplay, "Color Black", "", appl::MsgNameGuiChangeColor, "color/black/"); + myMenu->add(idMenugDisplay, "Color White", "", appl::MsgNameGuiChangeColor, "color/white/"); + myMenu->add(idMenugDisplay, "Shape square", "", l_MsgNameGuiChangeShape, "shape/square/"); + myMenu->add(idMenugDisplay, "Shape round", "", l_MsgNameGuiChangeShape, "shape/round/"); + myMenu->addSpacer(); + myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader); m_widgetLabelFileName = new ewol::widget::Label("FileName"); m_widgetLabelFileName->setExpand(bvec2(true,false)); @@ -264,7 +264,7 @@ MainWindows::MainWindows(void) { } -MainWindows::~MainWindows(void) { +MainWindows::~MainWindows() { appl::BufferManager::release(m_bufferManager); } @@ -393,7 +393,7 @@ void MainWindows::onReceiveMessage(const ewol::object::Message& _msg) { } else if (_msg.getMessage() == ednMsgGuiNew) { - (void)m_bufferManager->createNewBuffer(); + m_bufferManager->createNewBuffer(); } else if (_msg.getMessage() == ednEventPopUpFileSelected) { APPL_DEBUG("Request opening the file : " << _msg.getData()); m_bufferManager->open(_msg.getData()); diff --git a/sources/appl/Gui/MainWindows.h b/sources/appl/Gui/MainWindows.h index baca2cb..e96f068 100644 --- a/sources/appl/Gui/MainWindows.h +++ b/sources/appl/Gui/MainWindows.h @@ -22,8 +22,8 @@ class MainWindows : public ewol::widget::Windows { ewol::widget::Label* m_widgetLabelFileName; public: // Constructeur - MainWindows(void); - ~MainWindows(void); + MainWindows(); + ~MainWindows(); private: appl::BufferManager* m_bufferManager; //!< handle on the buffer manager /** diff --git a/sources/appl/Gui/Search.cpp b/sources/appl/Gui/Search.cpp index f5b15ba..c21a0cd 100644 --- a/sources/appl/Gui/Search.cpp +++ b/sources/appl/Gui/Search.cpp @@ -28,7 +28,7 @@ const char* const l_eventWrapCb = "appl-wrap-CheckBox"; const char* const l_eventForwardCb = "appl-forward-CheckBox"; const char* const l_eventHideBt = "appl-hide-button"; -Search::Search(void) : +Search::Search() : ewol::widget::Composer(ewol::widget::Composer::file, "DATA:GUI-Search.xml"), m_viewerManager(NULL), m_forward(true), @@ -63,11 +63,11 @@ Search::Search(void) : hide(); } -Search::~Search(void) { +Search::~Search() { appl::ViewerManager::release(m_viewerManager); } -void Search::find(void) { +void Search::find() { if (m_viewerManager == NULL) { APPL_WARNING("No viewer manager selected!!!"); return; @@ -103,7 +103,7 @@ void Search::find(void) { } } -void Search::replace(void) { +void Search::replace() { if (m_viewerManager == NULL) { APPL_WARNING("No viewer manager selected!!!"); return; diff --git a/sources/appl/Gui/Search.h b/sources/appl/Gui/Search.h index 8b83354..f2b20f6 100644 --- a/sources/appl/Gui/Search.h +++ b/sources/appl/Gui/Search.h @@ -27,17 +27,17 @@ class Search : public ewol::widget::Composer { std::u32string m_replaceData; public: // Constructeur - Search(void); - ~Search(void); + Search(); + ~Search(); private: /** * @brief Find the next element that corespond at the search */ - void find(void); + void find(); /** * @brief Replace the current selected text. */ - void replace(void); + void replace(); public: // derived function virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onObjectRemove(ewol::Object * _removeObject); diff --git a/sources/appl/Gui/TagFileList.cpp b/sources/appl/Gui/TagFileList.cpp index f2b714f..a50efa1 100644 --- a/sources/appl/Gui/TagFileList.cpp +++ b/sources/appl/Gui/TagFileList.cpp @@ -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 applEventCtagsListValidate = "appl-event-ctags-list-validate"; -appl::TagFileList::TagFileList(void) { +appl::TagFileList::TagFileList() { addObjectType("appl::TagFileList"); m_selectedLine = -1; addEventId(applEventCtagsListSelect); @@ -33,7 +33,7 @@ appl::TagFileList::TagFileList(void) { } -appl::TagFileList::~TagFileList(void) { +appl::TagFileList::~TagFileList() { for (int32_t iii=0; iii appl::TagFileList::getBasicBG(void) { +etk::Color<> appl::TagFileList::getBasicBG() { return 0x00000010; } -uint32_t appl::TagFileList::getNuberOfColomn(void) { +uint32_t appl::TagFileList::getNuberOfColomn() { return 2; } @@ -54,7 +54,7 @@ bool appl::TagFileList::getTitle(int32_t _colomn, std::string& _myTitle, etk::Co return true; } -uint32_t appl::TagFileList::getNuberOfRaw(void) { +uint32_t appl::TagFileList::getNuberOfRaw() { return m_list.size(); } diff --git a/sources/appl/Gui/TagFileList.h b/sources/appl/Gui/TagFileList.h index f3e177a..41f3f93 100644 --- a/sources/appl/Gui/TagFileList.h +++ b/sources/appl/Gui/TagFileList.h @@ -28,7 +28,7 @@ namespace appl { fileLine(_line) { }; - ~TagListElement(void) { + ~TagListElement() { }; }; @@ -43,13 +43,13 @@ namespace appl { int32_t m_colorIdBackground2; //!< Color of the Background 2. int32_t m_colorIdBackgroundSelected; //!< Color of line selected. public: - TagFileList(void); - ~TagFileList(void); + TagFileList(); + ~TagFileList(); // display API : - virtual etk::Color<> getBasicBG(void); - uint32_t getNuberOfColomn(void); + virtual etk::Color<> getBasicBG(); + uint32_t getNuberOfColomn(); 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 onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); public: diff --git a/sources/appl/Gui/TagFileSelection.cpp b/sources/appl/Gui/TagFileSelection.cpp index 0e488ba..224ce3e 100644 --- a/sources/appl/Gui/TagFileSelection.cpp +++ b/sources/appl/Gui/TagFileSelection.cpp @@ -30,7 +30,7 @@ extern const char * const applEventctagsSelection = "appl-event-ctags-validate"; extern const char * const applEventctagsCancel = "appl-event-ctags-cancel"; -appl::TagFileSelection::TagFileSelection(void) { +appl::TagFileSelection::TagFileSelection() { addObjectType("appl::TagFileSelection"); addEventId(applEventctagsSelection); addEventId(applEventctagsCancel); @@ -98,7 +98,7 @@ appl::TagFileSelection::TagFileSelection(void) { } -appl::TagFileSelection::~TagFileSelection(void) { +appl::TagFileSelection::~TagFileSelection() { } diff --git a/sources/appl/Gui/TagFileSelection.h b/sources/appl/Gui/TagFileSelection.h index c3c3645..e7a1e30 100644 --- a/sources/appl/Gui/TagFileSelection.h +++ b/sources/appl/Gui/TagFileSelection.h @@ -22,8 +22,8 @@ namespace appl { appl::TagFileList* m_listTag; std::string m_eventNamed; public: - TagFileSelection(void); - virtual ~TagFileSelection(void); + TagFileSelection(); + virtual ~TagFileSelection(); /** * @brief add a Ctags item on the curent list * @param[in] file Compleate file name diff --git a/sources/appl/Gui/TextViewer.cpp b/sources/appl/Gui/TextViewer.cpp index 65c8ce4..e3fe4ab 100644 --- a/sources/appl/Gui/TextViewer.cpp +++ b/sources/appl/Gui/TextViewer.cpp @@ -63,14 +63,14 @@ appl::TextViewer::TextViewer(const std::string& _fontName, int32_t _fontSize) : setCurrentSelect(); } -appl::TextViewer::~TextViewer(void) { +appl::TextViewer::~TextViewer() { appl::textPluginManager::disconnect(*this); appl::GlyphPainting::release(m_paintingProperties); appl::BufferManager::release(m_bufferManager); appl::ViewerManager::release(m_viewerManager); } -std::string appl::TextViewer::getBufferPath(void) { +std::string appl::TextViewer::getBufferPath() { if (m_buffer == NULL) { return ""; } @@ -87,19 +87,19 @@ void appl::TextViewer::changeZoom(float _range) { markToRedraw(); } -bool appl::TextViewer::calculateMinSize(void) { +bool appl::TextViewer::calculateMinSize() { m_minSize.setValue(50,50); return true; } -void appl::TextViewer::onDraw(void) { +void appl::TextViewer::onDraw() { m_displayDrawing.draw(); m_displayText.draw(); WidgetScrolled::onDraw(); } -void appl::TextViewer::onRegenerateDisplay(void) { +void appl::TextViewer::onRegenerateDisplay() { if (false == needRedraw()) { 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; appl::Buffer::Iterator 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; moveCursor(m_buffer->getEndLine(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(); APPL_INFO("Focus - In"); setCurrentSelect(); markToRedraw(); } -void appl::TextViewer::onLostFocus(void) { +void appl::TextViewer::onLostFocus() { hideKeyboard(); APPL_INFO("Focus - out"); 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 -void appl::TextViewer::updateScrolling(void) { +void appl::TextViewer::updateScrolling() { if (m_buffer == NULL) { return; } @@ -828,7 +828,7 @@ bool appl::TextViewer::replace(const std::string& _data) { return replace(_data, m_buffer->selectStart(), m_buffer->selectStop()); } -void appl::TextViewer::remove(void) { +void appl::TextViewer::remove() { if (m_buffer == NULL) { return; } @@ -998,13 +998,13 @@ float appl::TextViewer::getScreenSize(const appl::Buffer::Iterator& _startLinePo return ret; } -void appl::TextViewer::setCurrentSelect(void) { +void appl::TextViewer::setCurrentSelect() { if (m_viewerManager != NULL) { m_viewerManager->setViewerSelected(this, m_buffer); } } -bool appl::TextViewer::isSelectedLast(void) { +bool appl::TextViewer::isSelectedLast() { if (m_viewerManager != NULL) { return m_viewerManager->isLastSelected(this); } diff --git a/sources/appl/Gui/TextViewer.h b/sources/appl/Gui/TextViewer.h index 07c43b8..38d5204 100644 --- a/sources/appl/Gui/TextViewer.h +++ b/sources/appl/Gui/TextViewer.h @@ -37,7 +37,7 @@ namespace appl { appl::ViewerManager* m_viewerManager; //!< handle on the buffer manager public: TextViewer(const std::string& _fontName="", int32_t _fontSize=-1); - virtual ~TextViewer(void); + virtual ~TextViewer(); 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) public: @@ -45,7 +45,7 @@ namespace appl { * @brief Get the buffer property (only for the class : template class TextViewerPluginData) * @return pointer on buffer */ - appl::Buffer* internalGetBuffer(void) { + appl::Buffer* internalGetBuffer() { return m_buffer; } private: @@ -56,17 +56,17 @@ namespace appl { void setFontSize(int32_t _size); void setFontName(const std::string& _fontName); protected: // derived function - virtual void onDraw(void); + virtual void onDraw(); public: // Derived function - virtual bool calculateMinSize(void); - virtual void onRegenerateDisplay(void); + virtual bool calculateMinSize(); + virtual void onRegenerateDisplay(); virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onObjectRemove(ewol::Object* _removeObject); virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventEntry(const ewol::event::Entry& _event); virtual void onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID); - virtual void onGetFocus(void); - virtual void onLostFocus(void); + virtual void onGetFocus(); + virtual void onLostFocus(); virtual void changeZoom(float _range); private: float m_lastOffsetDisplay; //!< Line number ofssed in the display @@ -77,7 +77,7 @@ namespace appl { * @brief Update the scrolling position from the cursor position, * it might be be all time in the display screen. */ - void updateScrolling(void); + void updateScrolling(); // TODO : Doc : write data on buffer bool moveCursor(const appl::Buffer::Iterator& _pos); bool write(const std::string& _data); @@ -90,11 +90,11 @@ namespace appl { /** * @brief Remove selected data ... */ - void remove(void); + void remove(); /** * @brief Remove selected data ... (No plugin call) */ - void removeDirect(void) { + void removeDirect() { if (m_buffer==NULL) { return; } @@ -156,8 +156,8 @@ namespace appl { } appl::Buffer::Iterator getMousePosition(const vec2& _relativePos); - void mouseEventDouble(void); - void mouseEventTriple(void); + void mouseEventDouble(); + void mouseEventTriple(); private: enum moveMode { moveLetter, @@ -191,30 +191,30 @@ namespace appl { /** * @brief Set the current buffer selected */ - void setCurrentSelect(void); + void setCurrentSelect(); /** * @brief Check if the current buffer is last selected * @return true if selected last */ - bool isSelectedLast(void); + bool isSelectedLast(); public: /** * @brief get the path of the current buffer * @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 * @return true if a display buffer is present, false otherwise. */ - virtual bool hasBuffer(void) { + virtual bool hasBuffer() { return m_buffer != NULL; } /** * @brief Get the status of selection. * @return true if we have a current selection, false otherwise. */ - virtual bool hasTextSelected(void) { + virtual bool hasTextSelected() { if (m_buffer==NULL) { return false; } @@ -223,7 +223,7 @@ namespace appl { /** * @brief Remove Selection of the buffer. */ - virtual void unSelect(void) { + virtual void unSelect() { if (m_buffer==NULL) { return; } @@ -317,7 +317,7 @@ namespace appl { * @brief Get the cursor position. * @return The iterator on the cursor position */ - appl::Buffer::Iterator cursor(void) { + appl::Buffer::Iterator cursor() { if (m_buffer==NULL) { return appl::Buffer::Iterator(); } @@ -327,7 +327,7 @@ namespace appl { * @brief Get the begin position. * @return The iterator on the begin position */ - appl::Buffer::Iterator begin(void) { + appl::Buffer::Iterator begin() { if (m_buffer==NULL) { return appl::Buffer::Iterator(); } @@ -337,7 +337,7 @@ namespace appl { * @brief Get the end position. * @return The iterator on the end position */ - appl::Buffer::Iterator end(void) { + appl::Buffer::Iterator end() { if (m_buffer==NULL) { return appl::Buffer::Iterator(); } @@ -347,7 +347,7 @@ namespace appl { * @brief Get an Iterator on the start selection. * @return The Iterator */ - appl::Buffer::Iterator selectStart(void) { + appl::Buffer::Iterator selectStart() { if (m_buffer==NULL) { return appl::Buffer::Iterator(); } @@ -357,7 +357,7 @@ namespace appl { * @brief Get an Iterator on the stop selection. * @return The Iterator */ - appl::Buffer::Iterator selectStop(void) { + appl::Buffer::Iterator selectStop() { if (m_buffer==NULL) { return appl::Buffer::Iterator(); } diff --git a/sources/appl/Gui/ViewerManager.cpp b/sources/appl/Gui/ViewerManager.cpp index 71c2940..cb0c681 100644 --- a/sources/appl/Gui/ViewerManager.cpp +++ b/sources/appl/Gui/ViewerManager.cpp @@ -17,7 +17,7 @@ #undef __class__ #define __class__ "ViewerManager" -appl::ViewerManager::ViewerManager(void) : +appl::ViewerManager::ViewerManager() : ewol::Resource("???ViewerManager???"), m_viewer(NULL) { addObjectType("appl::ViewerManager"); @@ -25,7 +25,7 @@ appl::ViewerManager::ViewerManager(void) : m_bufferManager = appl::BufferManager::keep(); } -appl::ViewerManager::~ViewerManager(void) { +appl::ViewerManager::~ViewerManager() { 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 << "\""); appl::ViewerManager* object = static_cast(getManager().localKeep("???ViewerManager???")); if (NULL != object) { diff --git a/sources/appl/Gui/ViewerManager.h b/sources/appl/Gui/ViewerManager.h index 2fcfc58..32bd811 100644 --- a/sources/appl/Gui/ViewerManager.h +++ b/sources/appl/Gui/ViewerManager.h @@ -19,8 +19,8 @@ namespace appl { class TextViewer; class ViewerManager : public ewol::Resource { protected: - ViewerManager(void); - ~ViewerManager(void); + ViewerManager(); + ~ViewerManager(); private: appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::TextViewer* m_viewer; @@ -34,7 +34,7 @@ namespace appl { * @brief Get the current buffer selected * @return Pointer on the buffer selected */ - appl::TextViewer* getViewerSelected(void) { + appl::TextViewer* getViewerSelected() { return m_viewer; }; /** @@ -55,7 +55,7 @@ namespace appl { * @param[in] _filename Name of the configuration file. * @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 * @param[in,out] reference on the object pointer diff --git a/sources/appl/Gui/WorkerCloseAllFile.cpp b/sources/appl/Gui/WorkerCloseAllFile.cpp index d7a793d..5afac3a 100644 --- a/sources/appl/Gui/WorkerCloseAllFile.cpp +++ b/sources/appl/Gui/WorkerCloseAllFile.cpp @@ -15,7 +15,7 @@ static const char* s_closeDone = "close-done"; -appl::WorkerCloseAllFile::WorkerCloseAllFile(void) : +appl::WorkerCloseAllFile::WorkerCloseAllFile() : m_worker(NULL), m_bufferManager(NULL) { addObjectType("appl::WorkerCloseAllFile"); @@ -55,7 +55,7 @@ appl::WorkerCloseAllFile::WorkerCloseAllFile(void) : m_worker->registerOnEvent(this, appl::WorkerCloseFile::eventCloseDone, s_closeDone); } -appl::WorkerCloseAllFile::~WorkerCloseAllFile(void) { +appl::WorkerCloseAllFile::~WorkerCloseAllFile() { appl::BufferManager::release(m_bufferManager); } diff --git a/sources/appl/Gui/WorkerCloseAllFile.h b/sources/appl/Gui/WorkerCloseAllFile.h index b0ab664..ab1aea2 100644 --- a/sources/appl/Gui/WorkerCloseAllFile.h +++ b/sources/appl/Gui/WorkerCloseAllFile.h @@ -15,8 +15,8 @@ namespace appl { class WorkerCloseAllFile : public ewol::Object { public: - WorkerCloseAllFile(void); - virtual ~WorkerCloseAllFile(void); + WorkerCloseAllFile(); + virtual ~WorkerCloseAllFile(); private: std::vector m_bufferNameList; appl::WorkerCloseFile* m_worker; //! pop-up element that is open... diff --git a/sources/appl/Gui/WorkerCloseFile.cpp b/sources/appl/Gui/WorkerCloseFile.cpp index 5291173..86e9921 100644 --- a/sources/appl/Gui/WorkerCloseFile.cpp +++ b/sources/appl/Gui/WorkerCloseFile.cpp @@ -96,7 +96,7 @@ appl::WorkerCloseFile::WorkerCloseFile(const std::string& _bufferName) : tmpWindows->popUpWidgetPush(tmpPopUp); } -appl::WorkerCloseFile::~WorkerCloseFile(void) { +appl::WorkerCloseFile::~WorkerCloseFile() { appl::BufferManager::release(m_bufferManager); } diff --git a/sources/appl/Gui/WorkerCloseFile.h b/sources/appl/Gui/WorkerCloseFile.h index f2de6a8..0b948bd 100644 --- a/sources/appl/Gui/WorkerCloseFile.h +++ b/sources/appl/Gui/WorkerCloseFile.h @@ -20,7 +20,7 @@ namespace appl { public: // note : if == "" ==> current ... WorkerCloseFile(const std::string& _bufferName); - virtual ~WorkerCloseFile(void); + virtual ~WorkerCloseFile(); private: std::string m_bufferName; appl::Buffer* m_buffer; //!< reference on the buffer (when rename, we have no more reference on the buffer diff --git a/sources/appl/Gui/WorkerSaveAllFile.cpp b/sources/appl/Gui/WorkerSaveAllFile.cpp index 6a29142..a759db7 100644 --- a/sources/appl/Gui/WorkerSaveAllFile.cpp +++ b/sources/appl/Gui/WorkerSaveAllFile.cpp @@ -15,7 +15,7 @@ static const char* s_saveAsDone = "save-as-done"; -appl::WorkerSaveAllFile::WorkerSaveAllFile(void) : +appl::WorkerSaveAllFile::WorkerSaveAllFile() : m_worker(NULL), m_bufferManager(NULL) { addObjectType("appl::WorkerSaveAllFile"); @@ -58,7 +58,7 @@ appl::WorkerSaveAllFile::WorkerSaveAllFile(void) : m_worker->registerOnEvent(this, appl::WorkerSaveFile::eventSaveDone, s_saveAsDone); } -appl::WorkerSaveAllFile::~WorkerSaveAllFile(void) { +appl::WorkerSaveAllFile::~WorkerSaveAllFile() { appl::BufferManager::release(m_bufferManager); } diff --git a/sources/appl/Gui/WorkerSaveAllFile.h b/sources/appl/Gui/WorkerSaveAllFile.h index 15e89b6..1ab8a21 100644 --- a/sources/appl/Gui/WorkerSaveAllFile.h +++ b/sources/appl/Gui/WorkerSaveAllFile.h @@ -15,8 +15,8 @@ namespace appl { class WorkerSaveAllFile : public ewol::Object { public: - WorkerSaveAllFile(void); - virtual ~WorkerSaveAllFile(void); + WorkerSaveAllFile(); + virtual ~WorkerSaveAllFile(); private: std::vector m_bufferNameList; appl::WorkerSaveFile* m_worker; //! pop-up element that is open... diff --git a/sources/appl/Gui/WorkerSaveFile.cpp b/sources/appl/Gui/WorkerSaveFile.cpp index be3252d..f245dc5 100644 --- a/sources/appl/Gui/WorkerSaveFile.cpp +++ b/sources/appl/Gui/WorkerSaveFile.cpp @@ -81,7 +81,7 @@ appl::WorkerSaveFile::WorkerSaveFile(const std::string& _bufferName, bool _force m_chooser->registerOnEvent(this, ewol::widget::FileChooser::eventValidate, s_saveAsValidate); } -appl::WorkerSaveFile::~WorkerSaveFile(void) { +appl::WorkerSaveFile::~WorkerSaveFile() { appl::BufferManager::release(m_bufferManager); } diff --git a/sources/appl/Gui/WorkerSaveFile.h b/sources/appl/Gui/WorkerSaveFile.h index f90c60f..f652515 100644 --- a/sources/appl/Gui/WorkerSaveFile.h +++ b/sources/appl/Gui/WorkerSaveFile.h @@ -18,7 +18,7 @@ namespace appl { static const char* eventSaveDone; public: WorkerSaveFile(const std::string& _bufferName, bool _forceSaveAs=true); - virtual ~WorkerSaveFile(void); + virtual ~WorkerSaveFile(); private: std::string m_bufferName; ewol::widget::FileChooser* m_chooser; //! pop-up element that is open... diff --git a/sources/appl/Highlight.cpp b/sources/appl/Highlight.cpp index 9410c12..f3fb5f7 100644 --- a/sources/appl/Highlight.cpp +++ b/sources/appl/Highlight.cpp @@ -99,7 +99,7 @@ appl::Highlight::Highlight(const std::string& _xmlFilename, const std::string& _ } } -appl::Highlight::~Highlight(void) { +appl::Highlight::~Highlight() { // clean all Element for (int32_t iii = 0; iii < m_listHighlightPass1.size(); ++iii) { 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 : "); for (int32_t iii=0; iii< m_listExtentions.size(); iii++) { APPL_INFO(" Extention : " << iii << " : " << m_listExtentions[iii] ); diff --git a/sources/appl/Highlight.h b/sources/appl/Highlight.h index 40f3bd3..01b9374 100644 --- a/sources/appl/Highlight.h +++ b/sources/appl/Highlight.h @@ -38,17 +38,17 @@ namespace appl { protected: // Constructeur Highlight(const std::string& _xmlFilename, const std::string& _colorFile); - ~Highlight(void); + ~Highlight(); private: std::string m_typeName; //!< descriptive string type like "C/C++" public: - const std::string& getTypeName(void) { + const std::string& getTypeName() { return m_typeName; } public: bool hasExtention(const std::string& _ext); bool fileNameCompatible(const std::string& _fileName); - void display(void); + void display(); void parse(int64_t _start, int64_t _stop, std::vector &_metaData, @@ -80,7 +80,7 @@ namespace appl { */ static void release(appl::Highlight*& _object); public: // herited function : - virtual void updateContext(void) { + virtual void updateContext() { // no upfate to do ... }; }; diff --git a/sources/appl/HighlightManager.cpp b/sources/appl/HighlightManager.cpp index df8aeb8..c2c4b68 100644 --- a/sources/appl/HighlightManager.cpp +++ b/sources/appl/HighlightManager.cpp @@ -15,13 +15,13 @@ #undef __class__ #define __class__ "highlightManager" -static std::vector& s_list(void) { +static std::vector& s_list() { static std::vector list; return list; } -void appl::highlightManager::init(void) { +void appl::highlightManager::init() { std::vector& hlList = s_list(); if (hlList.size() != 0) { 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& hlList = s_list(); if (hlList.size() == 0) { APPL_DEBUG("HighlightManager ==> no highlight"); @@ -111,7 +111,7 @@ std::string appl::highlightManager::getFileWithTypeType(const std::string& _type return ""; } -std::vector appl::highlightManager::getTypeList(void) { +std::vector appl::highlightManager::getTypeList() { std::vector ret; return ret; } diff --git a/sources/appl/HighlightManager.h b/sources/appl/HighlightManager.h index 3f8fe00..d77de66 100644 --- a/sources/appl/HighlightManager.h +++ b/sources/appl/HighlightManager.h @@ -20,11 +20,11 @@ namespace appl { /** * @brief Init the Highlight manager */ - void init(void); + void init(); /** * @brief Un-Init the Highlight manager */ - void unInit(void); + void unInit(); /** * @brief Un-Init the Highlight manager * @param[in] extention of the file @@ -41,7 +41,7 @@ namespace appl { * @brief Get the list of extention type * @return the requested list. */ - std::vector getTypeList(void); + std::vector getTypeList(); }; }; diff --git a/sources/appl/HighlightPattern.cpp b/sources/appl/HighlightPattern.cpp index 2d86d29..4767602 100644 --- a/sources/appl/HighlightPattern.cpp +++ b/sources/appl/HighlightPattern.cpp @@ -25,7 +25,7 @@ appl::HighlightPattern::HighlightPattern(appl::GlyphPainting*& _glyphPainting) : m_regExpStart = new etk::RegExp(); } -appl::HighlightPattern::~HighlightPattern(void) { +appl::HighlightPattern::~HighlightPattern() { if (m_regExpStart != NULL) { delete(m_regExpStart); m_regExpStart = NULL; @@ -68,7 +68,7 @@ void appl::HighlightPattern::setColorGlyph(std::string& _colorName) { 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(" == > colorName \"" << m_colorName << "\""); APPL_INFO(" == > regExpStart \"" << m_regExpStart->getRegExp() << "\""); diff --git a/sources/appl/HighlightPattern.h b/sources/appl/HighlightPattern.h index e3fee80..fd8a702 100644 --- a/sources/appl/HighlightPattern.h +++ b/sources/appl/HighlightPattern.h @@ -33,14 +33,14 @@ namespace appl { public: // Constructeur HighlightPattern(appl::GlyphPainting*& _glyphPainting); - ~HighlightPattern(void); + ~HighlightPattern(); private: std::string m_paternName; //!< Current style name (like "c++" or "c" or "script Bash") public: void setName(std::string& _name) { m_paternName = _name; }; - std::string getName(void) { + std::string getName() { return m_paternName; }; private: @@ -56,7 +56,7 @@ namespace appl { int32_t m_colorId; //!< Id of the the glyph painting public: void setColorGlyph(std::string& _colorName); - const appl::GlyphDecoration& getColorGlyph(void) { + const appl::GlyphDecoration& getColorGlyph() { return (*m_glyphPainting)[m_colorId]; }; private: @@ -75,13 +75,13 @@ namespace appl { void setLevel(int32_t _newLevel) { m_level = _newLevel; }; - int32_t getLevel(void) { + int32_t getLevel() { return m_level; }; private: public: - void display(void); + void display(); /** * @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) diff --git a/sources/appl/TextPlugin.cpp b/sources/appl/TextPlugin.cpp index 3468fce..4458569 100644 --- a/sources/appl/TextPlugin.cpp +++ b/sources/appl/TextPlugin.cpp @@ -14,7 +14,7 @@ #define __class__ "TextViewerPlugin" -appl::TextViewerPlugin::TextViewerPlugin(void) : +appl::TextViewerPlugin::TextViewerPlugin() : m_isEnable(true), m_activateOnEventEntry(false), m_activateOnEventInput(false), @@ -26,7 +26,7 @@ appl::TextViewerPlugin::TextViewerPlugin(void) : } -appl::TextViewerPlugin::~TextViewerPlugin(void) { +appl::TextViewerPlugin::~TextViewerPlugin() { if (m_isEnable == false) { return; } diff --git a/sources/appl/TextPlugin.h b/sources/appl/TextPlugin.h index b2c50b5..a3627b2 100644 --- a/sources/appl/TextPlugin.h +++ b/sources/appl/TextPlugin.h @@ -18,8 +18,8 @@ namespace appl { class TextViewerPlugin : public ewol::Object { friend class appl::TextViewer; public: - TextViewerPlugin(void); - virtual ~TextViewerPlugin(void); + TextViewerPlugin(); + virtual ~TextViewerPlugin(); private: bool m_isEnable; //!< The plugin is enable or not (for all viewer). public: @@ -32,20 +32,20 @@ namespace appl { * @brief Get the activity status. * @return true if the plugin is active, false otherwise. */ - bool isEnable(void) { + bool isEnable() { return m_isEnable; }; public: /** * @brief On plugin global enable. */ - virtual void onPluginEnable(void) { + virtual void onPluginEnable() { // nothing to do here ... }; /** * @brief On plugin global disable. */ - virtual void onPluginDisable(void) { + virtual void onPluginDisable() { // nothing to do here ... }; /** @@ -69,7 +69,7 @@ namespace appl { * @brief Get the availlability of a callback * @return true if availlable */ - bool isAvaillableOnEventEntry(void) { + bool isAvaillableOnEventEntry() { return m_activateOnEventEntry; } /** @@ -89,7 +89,7 @@ namespace appl { * @brief Get the availlability of a callback * @return true if availlable */ - bool isAvaillableOnEventInput(void) { + bool isAvaillableOnEventInput() { return m_activateOnEventInput; } /** @@ -109,7 +109,7 @@ namespace appl { * @brief Get the availlability of a callback * @return true if availlable */ - bool isAvaillableOnWrite(void) { + bool isAvaillableOnWrite() { return m_activateOnWrite; } /** @@ -131,7 +131,7 @@ namespace appl { * @brief Get the availlability of a callback * @return true if availlable */ - bool isAvaillableOnReplace(void) { + bool isAvaillableOnReplace() { return m_activateOnReplace; } /** @@ -155,7 +155,7 @@ namespace appl { * @brief Get the availlability of a callback * @return true if availlable */ - bool isAvaillableOnRemove(void) { + bool isAvaillableOnRemove() { return m_activateOnRemove; } /** @@ -177,7 +177,7 @@ namespace appl { * @brief Get the availlability of a callback * @return true if availlable */ - bool isAvaillableOnReceiveMessage(void) { + bool isAvaillableOnReceiveMessage() { return m_activateOnReceiveMessage; } /** @@ -197,7 +197,7 @@ namespace appl { * @brief Get the availlability of a callback * @return true if availlable */ - bool isAvaillableOnCursorMove(void) { + bool isAvaillableOnCursorMove() { return m_activateOnCursorMove; } /** diff --git a/sources/appl/TextPluginAutoIndent.cpp b/sources/appl/TextPluginAutoIndent.cpp index fe34a44..d6ea185 100644 --- a/sources/appl/TextPluginAutoIndent.cpp +++ b/sources/appl/TextPluginAutoIndent.cpp @@ -15,7 +15,7 @@ #define __class__ "TextPluginAutoIndent" -appl::TextPluginAutoIndent::TextPluginAutoIndent(void) { +appl::TextPluginAutoIndent::TextPluginAutoIndent() { m_activateOnEventEntry = true; } diff --git a/sources/appl/TextPluginAutoIndent.h b/sources/appl/TextPluginAutoIndent.h index 78f1edc..c95f632 100644 --- a/sources/appl/TextPluginAutoIndent.h +++ b/sources/appl/TextPluginAutoIndent.h @@ -18,8 +18,8 @@ namespace appl { class TextPluginAutoIndent : public appl::TextViewerPlugin { public: - TextPluginAutoIndent(void); - ~TextPluginAutoIndent(void) { + TextPluginAutoIndent(); + ~TextPluginAutoIndent() { // nothing to do ... }; public: diff --git a/sources/appl/TextPluginCopy.cpp b/sources/appl/TextPluginCopy.cpp index d470fa5..439c908 100644 --- a/sources/appl/TextPluginCopy.cpp +++ b/sources/appl/TextPluginCopy.cpp @@ -15,7 +15,7 @@ #define __class__ "TextPluginCopy" -appl::TextPluginCopy::TextPluginCopy(void) { +appl::TextPluginCopy::TextPluginCopy() { m_activateOnReceiveMessage = true; } diff --git a/sources/appl/TextPluginCopy.h b/sources/appl/TextPluginCopy.h index c4c2767..3a88432 100644 --- a/sources/appl/TextPluginCopy.h +++ b/sources/appl/TextPluginCopy.h @@ -18,8 +18,8 @@ namespace appl { class TextPluginCopy : public appl::TextViewerPlugin { public: - TextPluginCopy(void); - ~TextPluginCopy(void) { + TextPluginCopy(); + ~TextPluginCopy() { // nothing to do ... }; public: diff --git a/sources/appl/TextPluginCtags.cpp b/sources/appl/TextPluginCtags.cpp index 4936830..202e84b 100644 --- a/sources/appl/TextPluginCtags.cpp +++ b/sources/appl/TextPluginCtags.cpp @@ -18,7 +18,7 @@ #define __class__ "TextPluginCtags" -appl::TextPluginCtags::TextPluginCtags(void) : +appl::TextPluginCtags::TextPluginCtags() : m_tagFilename(""), m_tagFolderBase(""), m_ctagFile(NULL) { @@ -26,7 +26,7 @@ appl::TextPluginCtags::TextPluginCtags(void) : // load buffer manager: m_bufferManager = appl::BufferManager::keep(); } -appl::TextPluginCtags::~TextPluginCtags(void) { +appl::TextPluginCtags::~TextPluginCtags() { 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)); } -void appl::TextPluginCtags::loadTagFile(void) { +void appl::TextPluginCtags::loadTagFile() { tagFileInfo info; // close previous tag file if (NULL != m_ctagFile) { diff --git a/sources/appl/TextPluginCtags.h b/sources/appl/TextPluginCtags.h index 4e1464c..1aa479d 100644 --- a/sources/appl/TextPluginCtags.h +++ b/sources/appl/TextPluginCtags.h @@ -29,14 +29,14 @@ namespace appl { std::string m_tagFolderBase; std::string m_tagFilename; tagFile* m_ctagFile; - void loadTagFile(void); + void loadTagFile(); void printTag(const tagEntry *_entry); void jumpTo(const std::string& _name); void jumpFile(const std::string& _filename, int64_t _lineId); appl::BufferManager* m_bufferManager; //!< handle on the buffer manager public: - TextPluginCtags(void); - ~TextPluginCtags(void); + TextPluginCtags(); + ~TextPluginCtags(); public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer); diff --git a/sources/appl/TextPluginData.h b/sources/appl/TextPluginData.h index af27913..0766786 100644 --- a/sources/appl/TextPluginData.h +++ b/sources/appl/TextPluginData.h @@ -18,10 +18,10 @@ namespace appl { template class TextViewerPluginData : public appl::TextViewerPlugin { public: - TextViewerPluginData(void) { + TextViewerPluginData() { // nothing to do ... } - virtual ~TextViewerPluginData(void) { + virtual ~TextViewerPluginData() { for (size_t iii = 0; iii < m_specificData.size() ; ++iii) { if (m_specificData[iii].second != NULL) { remove(*m_specificData[iii].second); diff --git a/sources/appl/TextPluginHistory.cpp b/sources/appl/TextPluginHistory.cpp index beddbb7..00bcf4c 100644 --- a/sources/appl/TextPluginHistory.cpp +++ b/sources/appl/TextPluginHistory.cpp @@ -15,7 +15,7 @@ #undef __class__ #define __class__ "TextPluginHistory" -appl::TextPluginHistory::TextPluginHistory(void) { +appl::TextPluginHistory::TextPluginHistory() { m_activateOnReceiveMessage = true; m_activateOnWrite = true; m_activateOnReplace = true; diff --git a/sources/appl/TextPluginHistory.h b/sources/appl/TextPluginHistory.h index a447b7d..33922d7 100644 --- a/sources/appl/TextPluginHistory.h +++ b/sources/appl/TextPluginHistory.h @@ -18,7 +18,7 @@ namespace appl { class History { public: - History(void) : + History() : m_posAdded(0), m_endPosAdded(0), m_endPosRemoved(0) { @@ -37,8 +37,8 @@ namespace appl { }; class TextPluginHistory : public appl::TextViewerPluginData { public: - TextPluginHistory(void); - virtual ~TextPluginHistory(void) { }; + TextPluginHistory(); + virtual ~TextPluginHistory() { }; private: public: virtual void onPluginEnable(appl::TextViewer& _textDrawer); diff --git a/sources/appl/TextPluginManager.cpp b/sources/appl/TextPluginManager.cpp index f190219..d906f58 100644 --- a/sources/appl/TextPluginManager.cpp +++ b/sources/appl/TextPluginManager.cpp @@ -19,44 +19,44 @@ #undef __class__ #define __class__ "textPluginManager" -static std::vector& getList(void) { +static std::vector& getList() { static std::vector s_list; return s_list; } -static std::vector& getListOnEventEntry(void) { +static std::vector& getListOnEventEntry() { static std::vector s_list; return s_list; } -static std::vector& getListOnEventInput(void) { +static std::vector& getListOnEventInput() { static std::vector s_list; return s_list; } -static std::vector& getListOnWrite(void) { +static std::vector& getListOnWrite() { static std::vector s_list; return s_list; } -static std::vector& getListOnReplace(void) { +static std::vector& getListOnReplace() { static std::vector s_list; return s_list; } -static std::vector& getListOnRemove(void) { +static std::vector& getListOnRemove() { static std::vector s_list; return s_list; } -static std::vector& getListOnReceiveMessage(void) { +static std::vector& getListOnReceiveMessage() { static std::vector s_list; return s_list; } -static std::vector& getListOnCursorMove(void) { +static std::vector& getListOnCursorMove() { static std::vector 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: getListOnEventEntry().clear(); getListOnEventInput().clear(); @@ -76,7 +76,7 @@ void appl::textPluginManager::unInit(void) { getList().clear(); } -void appl::textPluginManager::addDefaultPlugin(void) { +void appl::textPluginManager::addDefaultPlugin() { appl::textPluginManager::addPlugin(new appl::TextPluginCopy()); appl::textPluginManager::addPlugin(new appl::TextPluginMultiLineTab()); appl::textPluginManager::addPlugin(new appl::TextPluginAutoIndent()); diff --git a/sources/appl/TextPluginManager.h b/sources/appl/TextPluginManager.h index 59b22d0..1230206 100644 --- a/sources/appl/TextPluginManager.h +++ b/sources/appl/TextPluginManager.h @@ -20,15 +20,15 @@ namespace appl { /** * @brief Init the plugin manager for writer. */ - void init(void); + void init(); /** * @brief UnInit the plugin manager for writer. */ - void unInit(void); + void unInit(); /** * @brief Add default plugin list */ - void addDefaultPlugin(void); + void addDefaultPlugin(); /** * @brief Add a plugin. * @param[in] _plugin Plugin pointer to add. diff --git a/sources/appl/TextPluginMultiLineTab.cpp b/sources/appl/TextPluginMultiLineTab.cpp index 960cf88..a4f0798 100644 --- a/sources/appl/TextPluginMultiLineTab.cpp +++ b/sources/appl/TextPluginMultiLineTab.cpp @@ -14,7 +14,7 @@ #undef __class__ #define __class__ "TextPluginMultiLineTab" -appl::TextPluginMultiLineTab::TextPluginMultiLineTab(void) { +appl::TextPluginMultiLineTab::TextPluginMultiLineTab() { m_activateOnEventEntry = true; } diff --git a/sources/appl/TextPluginMultiLineTab.h b/sources/appl/TextPluginMultiLineTab.h index f6c41a7..692ce16 100644 --- a/sources/appl/TextPluginMultiLineTab.h +++ b/sources/appl/TextPluginMultiLineTab.h @@ -18,8 +18,8 @@ namespace appl { class TextPluginMultiLineTab : public appl::TextViewerPlugin { public: - TextPluginMultiLineTab(void); - ~TextPluginMultiLineTab(void) { + TextPluginMultiLineTab(); + ~TextPluginMultiLineTab() { // nothing to do ... }; public: diff --git a/sources/appl/TextPluginRmLine.cpp b/sources/appl/TextPluginRmLine.cpp index 3abee07..d2694b2 100644 --- a/sources/appl/TextPluginRmLine.cpp +++ b/sources/appl/TextPluginRmLine.cpp @@ -15,7 +15,7 @@ #define __class__ "TextPluginRmLine" -appl::TextPluginRmLine::TextPluginRmLine(void) { +appl::TextPluginRmLine::TextPluginRmLine() { m_activateOnReceiveMessage = true; } diff --git a/sources/appl/TextPluginRmLine.h b/sources/appl/TextPluginRmLine.h index 5b97d03..ce31ac8 100644 --- a/sources/appl/TextPluginRmLine.h +++ b/sources/appl/TextPluginRmLine.h @@ -18,8 +18,8 @@ namespace appl { class TextPluginRmLine : public appl::TextViewerPlugin { public: - TextPluginRmLine(void); - ~TextPluginRmLine(void) { + TextPluginRmLine(); + ~TextPluginRmLine() { // nothing to do ... }; public: diff --git a/sources/appl/TextPluginSelectAll.cpp b/sources/appl/TextPluginSelectAll.cpp index 66c4d03..2871dea 100644 --- a/sources/appl/TextPluginSelectAll.cpp +++ b/sources/appl/TextPluginSelectAll.cpp @@ -15,7 +15,7 @@ #define __class__ "TextPluginSelectAll" -appl::TextPluginSelectAll::TextPluginSelectAll(void) { +appl::TextPluginSelectAll::TextPluginSelectAll() { m_activateOnReceiveMessage = true; } diff --git a/sources/appl/TextPluginSelectAll.h b/sources/appl/TextPluginSelectAll.h index 4f3f8b3..8278af0 100644 --- a/sources/appl/TextPluginSelectAll.h +++ b/sources/appl/TextPluginSelectAll.h @@ -18,8 +18,8 @@ namespace appl { class TextPluginSelectAll : public appl::TextViewerPlugin { public: - TextPluginSelectAll(void); - ~TextPluginSelectAll(void) { + TextPluginSelectAll(); + ~TextPluginSelectAll() { // nothing to do ... }; public: diff --git a/sources/appl/ctags/readtags.cpp b/sources/appl/ctags/readtags.cpp index d392312..a9e867b 100644 --- a/sources/appl/ctags/readtags.cpp +++ b/sources/appl/ctags/readtags.cpp @@ -846,7 +846,7 @@ static void findTag (const char *const name, const int options) } } -static void listTags (void) +static void listTags () { tagFileInfo info; tagEntry entry; diff --git a/sources/appl/debug.cpp b/sources/appl/debug.cpp index 250d0a9..45dffc0 100644 --- a/sources/appl/debug.cpp +++ b/sources/appl/debug.cpp @@ -8,7 +8,7 @@ #include -int32_t appl::getLogId(void) { +int32_t appl::getLogId() { static int32_t g_val = etk::log::registerInstance("edn"); return g_val; } diff --git a/sources/appl/debug.h b/sources/appl/debug.h index 2d7c007..2b07d37 100644 --- a/sources/appl/debug.h +++ b/sources/appl/debug.h @@ -12,7 +12,7 @@ #include namespace appl { - int32_t getLogId(void); + int32_t getLogId(); }; // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define APPL_BASE(info,data) \ diff --git a/sources/appl/global.cpp b/sources/appl/global.cpp index 58c53f8..b1083bc 100644 --- a/sources/appl/global.cpp +++ b/sources/appl/global.cpp @@ -28,7 +28,7 @@ class myParamGlobal : public ewol::Object { bool m_displayTabChar; bool m_displaySpaceChar; public : - myParamGlobal(void) { + myParamGlobal() { m_static = true; // Note : set the object static notification( Must be set or assert at the end of process) setName("edn_global_param"); 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::configShowSpaceChar = "display-space"; -static myParamGlobal& l_obj(void) { +static myParamGlobal& l_obj() { static myParamGlobal s_obj; return s_obj; } -void globals::init(void) { +void globals::init() { //ewol::userConfig::addUserConfig(&l_obj()); } -void globals::UnInit(void) { +void globals::UnInit() { // nothing to do ... //ewol::userConfig::RmUserConfig(&l_obj()); } // ----------------------------------------------------------- -bool globals::isSetDisplayEndOfLine(void) { +bool globals::isSetDisplayEndOfLine() { 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; } @@ -138,7 +138,7 @@ void globals::setDisplaySpaceChar(bool _newVal) { //ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange); } // ----------------------------------------------------------- -bool globals::isSetDisplayTabChar(void) { +bool globals::isSetDisplayTabChar() { 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; } @@ -157,16 +157,16 @@ void globals::setAutoIndent(bool _newVal) { } // ----------------------------------------------------------- -bool globals::OrderTheBufferList(void) { +bool globals::OrderTheBufferList() { return true; } // ----------------------------------------------------------- -int32_t globals::getNbColoneBorder(void) { +int32_t globals::getNbColoneBorder() { return 6; } -int32_t globals::getNbLineBorder(void) { +int32_t globals::getNbLineBorder() { 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_changeRounded = "edn-event-change-rounded"; -globals::ParameterGlobalsGui::ParameterGlobalsGui(void) : +globals::ParameterGlobalsGui::ParameterGlobalsGui() : ewol::widget::Sizer(ewol::widget::Sizer::modeVert) { ewol::widget::CheckBox* myCheckbox = NULL; ewol::widget::Spacer* mySpacer = NULL; @@ -238,7 +238,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) : } } -globals::ParameterGlobalsGui::~ParameterGlobalsGui(void) { +globals::ParameterGlobalsGui::~ParameterGlobalsGui() { } diff --git a/sources/appl/global.h b/sources/appl/global.h index 512753c..536e234 100644 --- a/sources/appl/global.h +++ b/sources/appl/global.h @@ -15,31 +15,31 @@ namespace globals { - void init(void); - void UnInit(void); - int32_t getNbColoneBorder(void); - int32_t getNbLineBorder(void); + void init(); + void UnInit(); + int32_t getNbColoneBorder(); + int32_t getNbLineBorder(); - bool isSetDisplayEndOfLine(void); + bool isSetDisplayEndOfLine(); void setDisplayEndOfLine(bool _newVal); - bool isSetDisplaySpaceChar(void); + bool isSetDisplaySpaceChar(); void setDisplaySpaceChar(bool _newVal); - bool isSetDisplayTabChar(void); + bool isSetDisplayTabChar(); void setDisplayTabChar(bool _newVal); - bool isSetAutoIndent(void); + bool isSetAutoIndent(); void setAutoIndent(bool _newVal); - void init2(void); + void init2(); - bool OrderTheBufferList(void); + bool OrderTheBufferList(); class ParameterGlobalsGui : public ewol::widget::Sizer { public : - ParameterGlobalsGui(void); - ~ParameterGlobalsGui(void); + ParameterGlobalsGui(); + ~ParameterGlobalsGui(); // herited function virtual void onReceiveMessage(const ewol::object::Message& _msg); }; diff --git a/sources/appl/init.cpp b/sources/appl/init.cpp index 19c8b59..1498909 100644 --- a/sources/appl/init.cpp +++ b/sources/appl/init.cpp @@ -66,7 +66,7 @@ bool APP_Init(ewol::Context& _context, size_t _initId, size_t& _nbInitStep) { globals::init(); // init ALL Singleton : - //(void)CTagsManager::getInstance(); + //()CTagsManager::getInstance(); bufferManager = appl::BufferManager::keep(); appl::highlightManager::init();