mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue 362

Browse Source 
Here are some small changes from CPPCheck and also in some places I seen that some parameters could be declared const as they are not being changed.
This commit is contained in:
Shamari Campbell 2018-12-16 23:43:39 +00:00
parent dbd8a4a691
commit ddc38c3998
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nana/datetime.hpp
View File

@ -27,7 +27,7 @@ namespace nana
}; };
date(); ///< the initialized date is today. date(); ///< the initialized date is today.
date(const std::tm&); explicit date(const std::tm&);
date(int year, int month, int day); date(int year, int month, int day);
date operator - (int off) const; date operator - (int off) const;
@ -44,8 +44,8 @@ namespace nana
void set(const std::tm&); void set(const std::tm&);
static int day_of_week(int year, int month, int day); static int day_of_week(int year, int month, int day);
static unsigned year_days(unsigned year); ///< the number of days in the specified year. static unsigned year_days(const unsigned year); ///< the number of days in the specified year.
static unsigned month_days(unsigned year, unsigned month); ///< the number of days in the specified month. static unsigned month_days(const unsigned year, const unsigned month); ///< the number of days in the specified month.
static unsigned day_in_year(unsigned y, unsigned m, unsigned d); ///< Returns the index of the specified day in this year, at range[1, 365] or [1, 366] static unsigned day_in_year(unsigned y, unsigned m, unsigned d); ///< Returns the index of the specified day in this year, at range[1, 365] or [1, 366]
private: private:
date _m_add(unsigned x) const; date _m_add(unsigned x) const;

2
include/nana/gui/detail/drawer.hpp
View File

@ -91,7 +91,7 @@ namespace nana
virtual void shortkey(graph_reference, const arg_keyboard&); virtual void shortkey(graph_reference, const arg_keyboard&);
void filter_event(const event_code evt_code, const bool bDisabled); void filter_event(const event_code evt_code, const bool bDisabled);
void filter_event(const std::vector<event_code> evt_codes, const bool bDisabled); void filter_event(const std::vector<event_code>& evt_codes, const bool bDisabled);
void filter_event(const event_filter_status& evt_all_states); void filter_event(const event_filter_status& evt_all_states);
bool filter_event(const event_code evt_code); bool filter_event(const event_code evt_code);
event_filter_status filter_event(); event_filter_status filter_event();

2
include/nana/gui/effects.hpp
View File

@ -45,7 +45,7 @@ namespace nana
: public bground_factory_interface : public bground_factory_interface
{ {
public: public:
bground_transparent(std::size_t percent); explicit bground_transparent(std::size_t percent);
private: private:
bground_interface* create() const override; bground_interface* create() const override;
private: private:

13
source/datetime.cpp
View File

@ -15,6 +15,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include <cassert> #include <cassert>
#include <array>
namespace { namespace {
std::tm localtime() std::tm localtime()
@ -239,18 +240,20 @@ namespace nana
return days + d; return days + d;
} }
unsigned date::month_days(unsigned year, unsigned month) unsigned date::month_days(const unsigned year, const unsigned month)
{ {
unsigned num[] = {31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; if (month != 2)
if(month != 2) {
return num[month - 1]; const std::array<unsigned, 12> days_in_month = { 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
return days_in_month[month - 1];
}
if(((year % 4 == 0) && (year % 100)) || (year % 400 == 0)) if(((year % 4 == 0) && (year % 100)) || (year % 400 == 0))
return 29; return 29;
return 28; return 28;
} }
unsigned date::year_days(unsigned year) unsigned date::year_days(const unsigned year)
{ {
if(((year % 4 == 0) && (year % 100)) || (year % 400 == 0)) if(((year % 4 == 0) && (year % 100)) || (year % 400 == 0))
return 366; return 366;

9
source/gui/detail/drawer.cpp
View File

@ -136,11 +136,12 @@ namespace nana
evt_disabled_ &= ~(1 << static_cast<int>(evt_code)); // clear evt_disabled_ &= ~(1 << static_cast<int>(evt_code)); // clear
} }
void drawer_trigger::filter_event(const std::vector<event_code> evt_codes, const bool bDisabled) void drawer_trigger::filter_event(const std::vector<event_code>& evt_codes, const bool bDisabled)
{ {
const auto it_end = evt_codes.end(); for (const auto& evt_code : evt_codes)
for (auto it = evt_codes.begin(); it != it_end; it++) {
filter_event(*it, bDisabled); filter_event(evt_code, bDisabled);
}
} }
void drawer_trigger::filter_event(const event_filter_status& evt_all_states) void drawer_trigger::filter_event(const event_filter_status& evt_all_states)