[Refactor] Coding rule fixes

Change-Id: Iff9fd2e469bb08bb471351694fc7574a1bab89c5

diff --git a/clock/inc/Model/Counter.h b/clock/inc/Model/Counter.h
index f828aeb4382a1ff8c74a0db889dee5e4c615ae19..9e5aed343af79d5353591ceba74d0abd4bc01d04 100644 (file)
--- a/clock/inc/Model/Counter.h
+++ b/clock/inc/Model/Counter.h
@@ -35,7 +35,6 @@ namespace model {
         */
        template <typename Type>
        struct isDuration {
-
                /**
                 * @brief Is duration flag
                 *
@@ -53,7 +52,6 @@ namespace model {
         */
        template <typename Rep, typename Period>
        struct isDuration <duration<Rep, Period>>{
-
                /**
                 * @brief Is duration flag
                 *

diff --git a/clock/inc/Model/Timer.h b/clock/inc/Model/Timer.h
index 0f6034cbc7466cc0c7e81427679457ce7e5aea33..215212b8fa2f2efa6f1e87181f459d494ea198dc 100644 (file)
--- a/clock/inc/Model/Timer.h
+++ b/clock/inc/Model/Timer.h
@@ -138,7 +138,6 @@ namespace model {
                int alarm_id_;
 
                static app_control_h CreateAppControl(void);
-
        };
 } /* model */
 

diff --git a/clock/inc/Utils/Accessibility.h b/clock/inc/Utils/Accessibility.h
index 95921caa7b83f98582af210d561e74f563b955b8..2c0f839dd2b379844a93079a48f2320b56dd5379 100644 (file)
--- a/clock/inc/Utils/Accessibility.h
+++ b/clock/inc/Utils/Accessibility.h
@@ -22,7 +22,6 @@
 namespace utils {
 
 class Accessibility {
-
 public:
        /**
         * @brief Sets text to read of the label part in layout object

diff --git a/clock/inc/Utils/Notifier.h b/clock/inc/Utils/Notifier.h
index 2d5f4278f67b1c85216b30a47bf84cac3cba7a59..98c1ce2da2c44b6d787df7947e4d5cedb6d0afbd 100644 (file)
--- a/clock/inc/Utils/Notifier.h
+++ b/clock/inc/Utils/Notifier.h
@@ -13,7 +13,7 @@ namespace utils {
         */
        class Notifier {
        public:
-               virtual ~Notifier ();
+               virtual ~Notifier();
 
                /**
                 * @brief Gets instance of the Notifier
@@ -64,7 +64,6 @@ namespace utils {
 
                static Eina_Bool IdlePostCb(void *data);
                static Eina_Bool IdleDeleteCb(void *data);
-
        };
 
 } /* utils */

diff --git a/clock/inc/Utils/SoundManager.h b/clock/inc/Utils/SoundManager.h
index 2c64e0a7604022956495479abb921311eae8c4e1..737928a971ef9bbe7fce82d17c31b0c15de74bb1 100644 (file)
--- a/clock/inc/Utils/SoundManager.h
+++ b/clock/inc/Utils/SoundManager.h
@@ -30,7 +30,6 @@ namespace utils {
         * Class managing sound during alarm's ring call.
         */
        class SoundManager {
-
        public:
                /**
                 * @brief Creates sound stream
@@ -103,7 +102,6 @@ namespace utils {
                 * @brief Releases player and sound stream handler.
                 */
                static void PlayerRelease(void);
-
        };
 } //namespace utils
 

diff --git a/clock/inc/View/RingView.h b/clock/inc/View/RingView.h
index 0b96bdba96926a7312e9da37877e46a35489618f..3837d52081cf0c52e6756b8fddbc061e44769696 100644 (file)
--- a/clock/inc/View/RingView.h
+++ b/clock/inc/View/RingView.h
@@ -200,7 +200,6 @@ namespace view {
                 * @return Evas_Object of the button
                 */
                Evas_Object *CreateSwipeButton(const char *group);
-
        };
 
 } //namespace view

diff --git a/clock/inc/View/WorldClockDeleteItemsView.h b/clock/inc/View/WorldClockDeleteItemsView.h
index c46c1117edb0d6fc0ef4b918ea55a4830dc9f5ed..5906f6534459e19d8ce8027f62e8faa01ef64ac0 100644 (file)
--- a/clock/inc/View/WorldClockDeleteItemsView.h
+++ b/clock/inc/View/WorldClockDeleteItemsView.h
@@ -32,7 +32,6 @@ namespace view {
         * not touch any external resources directly except utils.
         */
        class WorldClockDeleteItemsView: public PageView {
-
                public:
 
                        /**

diff --git a/clock/inc/View/WorldClockMap.h b/clock/inc/View/WorldClockMap.h
index 84298756c09794ffd6a321f366235dc40d81904b..e5d113f41c2d2de743a4a260c57cb3d86d36c266 100644 (file)
--- a/clock/inc/View/WorldClockMap.h
+++ b/clock/inc/View/WorldClockMap.h
@@ -167,7 +167,6 @@ namespace view {
                 * @brief Callback called on time or timezone change.
                 */
                static void TimeChangedCb(system_settings_key_e key, void *user_data);
-
        };
 
 }

diff --git a/clock/inc/View/WorldClockReorderView.h b/clock/inc/View/WorldClockReorderView.h
index aefcae87f143e4b5b6e563be743fe6466c745f12..049add6302ff18e4786d8d6fd004e74ae99e8c42 100644 (file)
--- a/clock/inc/View/WorldClockReorderView.h
+++ b/clock/inc/View/WorldClockReorderView.h
@@ -33,7 +33,6 @@ namespace view {
         * not touch any external resources directly except utils.
         */
        class WorldClockReorderView: public PageView {
-
                public:
 
                        /**

diff --git a/clock/src/Clock.cpp b/clock/src/Clock.cpp
index 5b56d6b278392a6c7a7e69aafb8d5fce8514800e..e0ca8e4af9ec4790e0151b71da47eb8023749535 100644 (file)
--- a/clock/src/Clock.cpp
+++ b/clock/src/Clock.cpp
@@ -92,7 +92,6 @@ void ClockApp::OnService(app_control_h app_control)
        if (!strcmp(opData, APP_CONTROL_OPERATION_DEFAULT)) {
                main_ctrl_->Init();
        } else if (!strcmp(opData, APP_CONTROL_OPERATION_ALARM)) {
-
                char *alarmID = NULL;
 
                ret = app_control_get_extra_data(app_control, APP_CONTROL_DATA_ALARM_ID, &alarmID);

diff --git a/clock/src/Controller/MainController.cpp b/clock/src/Controller/MainController.cpp
index 39df13dc72077ba8c445792305c41da5bafcd866..ed576a0810a853099e5e722fdf8fe436fa01489b 100644 (file)
--- a/clock/src/Controller/MainController.cpp
+++ b/clock/src/Controller/MainController.cpp
@@ -55,17 +55,14 @@ MainController::MainController(model::AlarmProvider *provider) :
 
 MainController::~MainController()
 {
-
 }
 
 void MainController::Pause()
 {
-
 }
 
 void MainController::Resume()
 {
-
 }
 
 Eina_Bool MainController::IdlerCb(void *data)
@@ -144,7 +141,6 @@ void MainController::Deinit()
 
 void MainController::CreateNewAlarmPage(Event &e)
 {
-
        delete edit_presenter_;
 
        edit_presenter_ = new EditAlarmPresenter(provider_->GetAlarms(), edit_page_);

diff --git a/clock/src/Model/StopWatch.cpp b/clock/src/Model/StopWatch.cpp
index b9982a07afe92576261f812074a25a5575825ae7..1dc44cc274808c745fc540cbbaa93c8970624f65 100644 (file)
--- a/clock/src/Model/StopWatch.cpp
+++ b/clock/src/Model/StopWatch.cpp
@@ -29,8 +29,9 @@ void StopWatch::AddLap()
        if (!laps_.empty()) {
                Lap *last = laps_.back();
                lap->SetTime(lap->GetSplitTime() - last->GetSplitTime());
-       } else
+       } else {
                lap->SetTime(lap->GetSplitTime());
+       }
 
        lap->SetNo(laps_.size() + 1);
        laps_.push_back(lap);

diff --git a/clock/src/Model/WorldClock.cpp b/clock/src/Model/WorldClock.cpp
index 97e57d72137c3cdc69e2e9a56dd702b916b612d0..1c24ec963aed9bd5c734e9d3d0d4c6fb78fb5124 100644 (file)
--- a/clock/src/Model/WorldClock.cpp
+++ b/clock/src/Model/WorldClock.cpp
@@ -157,17 +157,17 @@ WorldClock::WorldClock()
 
        int ret = preference_get_int("WORLD_CLOCK_MAP_CURRENT_TIMEZONE", &current_tz);
        if (ret != PREFERENCE_ERROR_NONE) {
-
                ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, &tz);
                if (ret == SYSTEM_SETTINGS_ERROR_NONE) {
                        int offset = utils::Time::GetTimezoneOffset(tz);
                        SetCurrentTimezone(GetTimezoneByOffset(offset));
                        DBG("Current timezone set to:%s", tz);
-               }
-               else
+               } else {
                        SetCurrentTimezone(&time_zones_.at(current_tz));
-       } else
+               }
+       } else {
                SetCurrentTimezone(&time_zones_.at(current_tz));
+       }
 }
 
 WorldClock::~WorldClock()
@@ -272,7 +272,6 @@ bool WorldClock::AddUserLocation(const model::Location *l)
 {
        if (!user_locations_.empty()) {
                for (auto it = user_locations_.begin(); it != user_locations_.end(); it++) {
-
                        if (!(*it)->name.compare(l->name) && !(*it)->country.compare(l->country)) {
                                DBG("Location already exists in custom list");
                                return false;
@@ -286,9 +285,7 @@ bool WorldClock::AddUserLocation(const model::Location *l)
 void WorldClock::RemoveUserLocations(const std::vector<const model::Location *> &deleted)
 {
        for (auto d_it: deleted) {
-
                for (auto it = user_locations_.begin(); it != user_locations_.end(); ++it) {
-
                        if (!((*it)->name.compare(d_it->name)) && !((*it)->country.compare(d_it->country))) {
                                OnUserLocationRemoved(**it);
                                user_locations_.erase(it);

diff --git a/clock/src/Presenter/AlarmListPresenter.cpp b/clock/src/Presenter/AlarmListPresenter.cpp
index ce1360ca4e8e42394642b0956739c0de64162b33..537fe31ff1b5e751217ee8d6fe60b4a0953b185a 100644 (file)
--- a/clock/src/Presenter/AlarmListPresenter.cpp
+++ b/clock/src/Presenter/AlarmListPresenter.cpp
@@ -62,7 +62,7 @@ void AlarmListPresenter::AddItem(AlarmList::Iterator it)
                        it->GetWeekFlags(),
                        it->IsActivated(),
                        it->IsSnoozed());
-       alarms_.insert(std::map<int, AlarmList::Iterator>::value_type (id, it));
+       alarms_.insert(std::map<int, AlarmList::Iterator>::value_type(id, it));
        object_connections_.push_back(it->OnChanged.Connect(
                                std::bind(&AlarmListPresenter::OnAlarmEditedEvent, this, it)));
 }
@@ -111,12 +111,12 @@ void AlarmListPresenter::OnItemActiveStatusChanged(int idx)
 
        auto &alarm_it = it->second;
 
-       if (alarm_it->IsSnoozed())
+       if (alarm_it->IsSnoozed()) {
                alarm_it->Dismiss();
-       else {
-               if (alarm_it->IsActivated())
+       } else {
+               if (alarm_it->IsActivated()) {
                        alarm_it->Deactivate();
-               else {
+               } else {
                        alarm_it->Activate();
                        if (alarm_it->GetWeekFlags().Empty()) {
                                alarm_it->SetTime(Time::GetUpcoming(alarm_it->GetTime()));

diff --git a/clock/src/Presenter/DeleteAlarmPresenter.cpp b/clock/src/Presenter/DeleteAlarmPresenter.cpp
index 33caa90a4a1d7f2bc0d093a11285f5effa5a40fd..c08a9387baef152a04d6932fb8e7e15364d854d9 100644 (file)
--- a/clock/src/Presenter/DeleteAlarmPresenter.cpp
+++ b/clock/src/Presenter/DeleteAlarmPresenter.cpp
@@ -25,12 +25,10 @@ DeleteAlarmPresenter::DeleteAlarmPresenter(DeleteAlarmView *view, AlarmList &mod
 {
        connections_.push_back(
                        view->OnCancelButtonClicked.Connect(
-                       std::bind(&DeleteAlarmPresenter::OnCancelButtonClicked, this)
-                       ));
+                       std::bind(&DeleteAlarmPresenter::OnCancelButtonClicked, this)));
        connections_.push_back(
                        view->OnDeleteButtonClicked.Connect(
-                       std::bind(&DeleteAlarmPresenter::OnDeleteButtonClicked, this)
-                       ));
+                       std::bind(&DeleteAlarmPresenter::OnDeleteButtonClicked, this)));
 
        view_->PushPage();
 
@@ -40,7 +38,7 @@ DeleteAlarmPresenter::DeleteAlarmPresenter(DeleteAlarmView *view, AlarmList &mod
                                it->GetName().c_str(),
                                it->GetWeekFlags(),
                                it->IsActivated());
-               alarms_.insert(std::map<int, AlarmList::Iterator>::value_type (id, --(it.base())));
+               alarms_.insert(std::map<int, AlarmList::Iterator>::value_type(id, --(it.base())));
        }
 }
 
@@ -61,7 +59,6 @@ void DeleteAlarmPresenter::OnDeleteButtonClicked()
                        alarm_it->Deactivate();
                        model_.Remove(alarm_it);
                }
-
        }
        view_->PopPage();
 }

diff --git a/clock/src/Presenter/EditAlarmPresenter.cpp b/clock/src/Presenter/EditAlarmPresenter.cpp
index e404f57b10df4e5b61743daa25f5f6365da6c373..dacd77ea5b28b65af557cae3c1117c7c79636feb 100644 (file)
--- a/clock/src/Presenter/EditAlarmPresenter.cpp
+++ b/clock/src/Presenter/EditAlarmPresenter.cpp
@@ -183,8 +183,9 @@ void EditAlarmPresenter::OnEditDone()
                if (update_target != model_.End()) {
                        UpdateAlarm(update_target);
                        ShowAlarmUpdatedPopup(update_target->GetTime());
-               } else
+               } else {
                        CreateNewAlarm();
+               }
        }
 
        view_.PopPage();

diff --git a/clock/src/Presenter/WorldClockPresenter.cpp b/clock/src/Presenter/WorldClockPresenter.cpp
index e87d145aaee11523c84427a41025fc2e79fbf0ef..fbfecb1b4b893e2a7e2235c57afbf16468ef9edb 100644 (file)
--- a/clock/src/Presenter/WorldClockPresenter.cpp
+++ b/clock/src/Presenter/WorldClockPresenter.cpp
@@ -93,7 +93,6 @@ void WorldClockPresenter::OnCustomListItemClicked()
 
        model_->SetCurrentTimezone(model_->GetTimezoneByOffset(location->gmt_offset_));
        OnMapViewUpdateRequest();
-
 }
 
 void WorldClockPresenter::OnMapViewUpdateRequest()
@@ -104,7 +103,6 @@ void WorldClockPresenter::OnMapViewUpdateRequest()
 void WorldClockPresenter::OnItemAdded()
 {
        if (model_->user_locations_.size() >= USER_LOCATIONS_LIMIT) {
-
                std::string message = Translate::Sprintf("IDS_CLOCK_TPOP_CANT_ADD_MORE_THAN_PD_CITIES",
                                USER_LOCATIONS_LIMIT);
 

diff --git a/clock/src/Utils/Accessibility.cpp b/clock/src/Utils/Accessibility.cpp
index 2bccad60e471dfcb255bcc40912843023308e046..186c2515d43ab0d0caf3667d11efa19f7c29719a 100644 (file)
--- a/clock/src/Utils/Accessibility.cpp
+++ b/clock/src/Utils/Accessibility.cpp
@@ -47,7 +47,6 @@ void Accessibility::SetReadingOrder(int count, ...)
        }
 
        for (int i = 0; i < count - 1; ++i) {
-
                next = va_arg(args, Evas_Object *);
 
                elm_atspi_accessible_relationship_append(current, ELM_ATSPI_RELATION_FLOWS_TO, next);

diff --git a/clock/src/Utils/Time.cpp b/clock/src/Utils/Time.cpp
index 09e07f615c67f78c7093da56781016860fc305d5..a7f505f435802a947beecba37a68fbd043a406d5 100644 (file)
--- a/clock/src/Utils/Time.cpp
+++ b/clock/src/Utils/Time.cpp
@@ -537,15 +537,14 @@ Time Time::GetUpcoming(const Time &time)
                        time.GetHour(),
                        time.GetMinute(),
                        0,
-                       0
-                       );
+                       0);
 
        return up;
 }
 
 std::tm Time::GetTmStruct() const
 {
-       std::tm tmstruct = {0,};
+       std::tm tmstruct = {0, };
        i18n_ucalendar_h calendar;
        I18nString u_zone(timezone_);
        int32_t value;

diff --git a/clock/src/Utils/TizenApp.cpp b/clock/src/Utils/TizenApp.cpp
index b12c82917bd46418eba42b55e63c3db298dfee85..30df297450eef3f9025476c1de47d3e862bddc4d 100644 (file)
--- a/clock/src/Utils/TizenApp.cpp
+++ b/clock/src/Utils/TizenApp.cpp
@@ -51,7 +51,7 @@ int TizenApp::Run(int argc, char **argv)
 {
        int ret = 0;
 
-       ui_app_lifecycle_callback_s event_callback = {0,};
+       ui_app_lifecycle_callback_s event_callback = {0, };
        app_event_handler_h handler;
 
        event_callback.create = app_create;

diff --git a/clock/src/Utils/WorldClockHelpers.cpp b/clock/src/Utils/WorldClockHelpers.cpp
index 314738b0975bbf1860d3e1eb860b730c40d4fc6e..48abd2bd3fa5415df3f7790b3e68e551a216900a 100644 (file)
--- a/clock/src/Utils/WorldClockHelpers.cpp
+++ b/clock/src/Utils/WorldClockHelpers.cpp
@@ -31,9 +31,8 @@ std::string GetTimezoneDiffDescription(int local_timezone_offset, int timezone_o
                if (offset_remainder > 0)
                        relative = Translate::Sprintf("IDS_CLOCK_BODY_PS1D_H_P2SD_M_BEHIND_ABB",
                                        offset_integer, offset_remainder);
-               else {
+               else
                        relative = Translate::Sprintf("IDS_CLOCK_BODY_PD_H_BEHIND_ABB", offset_integer);
-               }
        } else if (timezone_offset > local_timezone_offset) {
                if (offset_remainder > 0)
                        relative = Translate::Sprintf("IDS_CLOCK_BODY_PS1D_H_P2SD_M_AHEAD_ABB",

diff --git a/clock/src/View/AlarmListView.cpp b/clock/src/View/AlarmListView.cpp
index be129905faf9e194364e8e4cb92e834186398293..4de2940707ae3dd0b7e742cde78a5e83e910f871 100644 (file)
--- a/clock/src/View/AlarmListView.cpp
+++ b/clock/src/View/AlarmListView.cpp
@@ -237,12 +237,10 @@ static char *Ampm2FormattedString(const Time &time)
 {
        std::stringstream formatted_time;
 
-       if (SystemSettings::Is24HourFormatPrefered()) {
+       if (SystemSettings::Is24HourFormatPrefered())
                return nullptr;
-       }
-       else {
+       else
                formatted_time << time.Format(Time::FORMAT_TIME_AMPM);
-       }
 
        return strdup(formatted_time.str().c_str());
 }

diff --git a/clock/src/View/CounterView.cpp b/clock/src/View/CounterView.cpp
index f79dccb5cff2b4396195def28db11433fe1b2411..946fcad9a6b2032f4ff0c321dd190a68763ab932 100644 (file)
--- a/clock/src/View/CounterView.cpp
+++ b/clock/src/View/CounterView.cpp
@@ -108,9 +108,9 @@ void CounterView::DisplayTime(int hour, int min, int sec, int msec)
        std::stringstream text;
        std::stringstream subtext;
 
-       if (type_ == CounterType::COUNTER_TYPE_TIMER && hour <= 0)
+       if (type_ == CounterType::COUNTER_TYPE_TIMER && hour <= 0) {
                text << "00:";
-       else if (hour > 0) {
+       } else if (hour > 0) {
                text << (hour < 10 ? "0" : "") << hour << ":";
                Expand();
        }

diff --git a/clock/src/View/DeleteAlarmView.cpp b/clock/src/View/DeleteAlarmView.cpp
index f58c779c8ae802e5f21901b218bde6c14d7bd664..398711f39db0bd539b5d3a1621f551aec3371fa3 100644 (file)
--- a/clock/src/View/DeleteAlarmView.cpp
+++ b/clock/src/View/DeleteAlarmView.cpp
@@ -116,12 +116,10 @@ static char *Ampm2FormattedString(const Time &time)
 {
        std::stringstream formatted_time;
 
-       if (SystemSettings::Is24HourFormatPrefered()) {
+       if (SystemSettings::Is24HourFormatPrefered())
                return nullptr;
-       }
-       else {
+       else
                formatted_time << time.Format(Time::FORMAT_TIME_AMPM);
-       }
 
        return strdup(formatted_time.str().c_str());
 }
@@ -170,7 +168,7 @@ void DeleteAlarmView::CreateContent(Evas_Object *parent)
 
        // left toolbar button
        left_btn_ = elm_button_add(parent);
-       elm_object_translatable_text_set(left_btn_,"IDS_COM_SK_CANCEL");
+       elm_object_translatable_text_set(left_btn_, "IDS_COM_SK_CANCEL");
        elm_object_style_set(left_btn_, "naviframe/title_left");
        evas_object_smart_callback_add(left_btn_, "clicked", OnCancelButtonClickedCb, this);
        evas_object_show(left_btn_);

diff --git a/clock/src/View/EditAlarmView.cpp b/clock/src/View/EditAlarmView.cpp
index e383e4f6f29e720774dc0cdf566b27b52f39e05d..bcdb2631c177ec6ddfc8657294354fc3971a3173 100644 (file)
--- a/clock/src/View/EditAlarmView.cpp
+++ b/clock/src/View/EditAlarmView.cpp
@@ -223,7 +223,6 @@ void EditAlarmView::DateTimeChangedCallback(void *data, Evas_Object *obj, void *
        Elm_Datetime_Time edt;
 
        if (elm_datetime_value_get(obj, &edt)) {
-
                auto time = ConvertElmDatetimeTimeToTime(edt);
                view->data_.time = Time(
                        view->data_.time.GetYear(),
@@ -232,8 +231,7 @@ void EditAlarmView::DateTimeChangedCallback(void *data, Evas_Object *obj, void *
                        time.GetHour(),
                        time.GetMinute(),
                        0,
-                       0
-                       );
+                       0);
 
                view->data_.time = Time::GetUpcoming(view->data_.time);
                view->UpdateView();
@@ -244,13 +242,10 @@ void EditAlarmView::DateTimeChangedCallback(void *data, Evas_Object *obj, void *
 
 void EditAlarmView::UpdateAlarmType(bool mute)
 {
-       if (mute)
-       {
+       if (mute) {
                if (data_.type == model::Alarm::Type::SOUND_ONLY)
                        data_.type = model::Alarm::Type::VIBRATION;
-       }
-       else
-       {
+       } else {
                if (data_.type == model::Alarm::Type::VIBRATION)
                        data_.type = model::Alarm::Type::SOUND_ONLY;
        }
@@ -383,7 +378,6 @@ void EditAlarmView::PopupDatePickerDateChanged(void *data, Evas_Object *obj, voi
 }
 
 void EditAlarmView::PopupDatePickerCreateCalendar() {
-
        if (!datepicker_popup_)
                return;
 
@@ -427,8 +421,7 @@ void EditAlarmView::PopupDatePickerSetClicked(void *data, Evas_Object *obj, void
                        view->data_.time.GetHour(),
                        view->data_.time.GetMinute(),
                        0,
-                       0
-                       );
+                       0);
 
        view->data_.flags.Clear();
 
@@ -441,9 +434,9 @@ void EditAlarmView::PopupDatePickerSetClicked(void *data, Evas_Object *obj, void
 void EditAlarmView::UpdateTime(Time time)
 {
        if (data_.flags.Empty()) {
-               if (time > Time::Now())
+               if (time > Time::Now()) {
                        data_.time = time;
-               else {
+               } else {
                        data_.time = Time::GetUpcoming(time);
                        PopupManager::CreatePopup(*this,
                                        "Can't set alarms for time in past. Tomorrow's date set.", 3.0);
@@ -458,13 +451,11 @@ void EditAlarmView::UpdateTime(Time time)
                        data_.time.GetHour(),
                        data_.time.GetMinute(),
                        0,
-                       0
-                       );
+                       0);
        }
 }
 
 void EditAlarmView::ShowDatePickerPopup() {
-
        if (datepicker_popup_)
                return;
 
@@ -492,7 +483,6 @@ void EditAlarmView::ShowDatePickerPopup() {
 }
 
 void EditAlarmView::HideDatePickerPopup() {
-
        if (!datepicker_popup_)
                return;
 
@@ -545,7 +535,6 @@ void EditAlarmView::CreateGenlistItems()
        itc->func.text_get = [](void *data, Evas_Object *o, const char *part) -> char * {
                EditAlarmView *view = static_cast<EditAlarmView*>(data);
                if (!strcmp(part, "elm.text.date")) {
-
                        if (view->data_.flags.Empty())
                                return strdup(view->GetDate().c_str());
                        else
@@ -558,7 +547,6 @@ void EditAlarmView::CreateGenlistItems()
                EditAlarmView *view = static_cast<EditAlarmView*>(data);
 
                if (!strcmp(part, "elm.swallow.btn")) {
-
                        Evas_Object *btn = elm_button_add(o);
 
                        if (!elm_object_style_set(btn, "resizable"))
@@ -585,7 +573,6 @@ void EditAlarmView::CreateGenlistItems()
        itc->item_style = "full";
        itc->func.text_get = nullptr;
        itc->func.content_get = [](void *data, Evas_Object *o, const char *part) -> Evas_Object* {
-
                EditAlarmView *view = static_cast<EditAlarmView*>(data);
 
                Evas_Object *dt = elm_datetime_add(o);

diff --git a/clock/src/View/StopWatchView.cpp b/clock/src/View/StopWatchView.cpp
index 355eed7402c81ff4d104773ed79717e88363c94e..6cac2a7a7b7b97530f73ed2a5a536a0a7bc9d3f9 100644 (file)
--- a/clock/src/View/StopWatchView.cpp
+++ b/clock/src/View/StopWatchView.cpp
@@ -156,7 +156,6 @@ void StopWatchView::LapButtonClicked(void *data, Evas_Object *obj, void *event_i
 
 void StopWatchView::ResumeButtonClicked(void *data, Evas_Object *obj, void *event_info)
 {
-
        StopWatchView *object = static_cast<StopWatchView *>(data);
        object->OnResumeButtonClicked();
 }

diff --git a/clock/src/View/TimerView.cpp b/clock/src/View/TimerView.cpp
index c53758a8ecca006026d9b96a0839d76362b5f6ec..4ba652909bd96f05c322c91f1787f1b2f4be9679 100644 (file)
--- a/clock/src/View/TimerView.cpp
+++ b/clock/src/View/TimerView.cpp
@@ -318,9 +318,9 @@ void TimerView::EntryUnfocusedCb(void *data, Evas_Object *obj, void *event_info)
        const char *part = static_cast<const char *>(data);
 
        int val = std::atoi(text);
-       if (val > (strcmp(part, "sw.entry.hour") ? 59 : 99))
+       if (val > (strcmp(part, "sw.entry.hour") ? 59 : 99)) {
                elm_entry_entry_set(obj, std::to_string(59).c_str());
-       else if (val < 10) {
+       } else if (val < 10) {
                std::stringstream stream;
                stream << "0" << val;
                elm_entry_entry_set(obj, stream.str().c_str());
@@ -344,8 +344,7 @@ void TimerView::EntryChangedCb(void *data, Evas_Object *obj, void *event_info)
        object->counter_->DisplayTime(
                        object->set_time_.Hour,
                        object->set_time_.Min,
-                       object->set_time_.Sec
-                       );
+                       object->set_time_.Sec);
 
        Evas_Object *entry = static_cast<Evas_Object *>(obj);
 

diff --git a/clock/src/View/WeekFlagsView.cpp b/clock/src/View/WeekFlagsView.cpp
index d35576941944fe91c1f5d3fe87a25fd32fc1fb9a..5a18ae08b586267c7c43be60807b497b6d4ecafe 100644 (file)
--- a/clock/src/View/WeekFlagsView.cpp
+++ b/clock/src/View/WeekFlagsView.cpp
@@ -85,7 +85,6 @@ void WeekFlagsView::AppendCheckableListItem(WeekDay val)
        elm_atspi_accessible_relationship_append(desc->check, ELM_ATSPI_RELATION_DESCRIPTION_FOR, it);
        elm_atspi_accessible_relationship_append(it, ELM_ATSPI_RELATION_DESCRIBED_BY, desc->check);
        check_boxes_.push_back(desc);
-
 }
 
 const char *WeekFlagsView::GetLabelForWeekDay(WeekDay day)

diff --git a/clock/src/View/WorldClockDeleteItemsView.cpp b/clock/src/View/WorldClockDeleteItemsView.cpp
index e3c0ace0aa046d84e336dbfea7624ccf54d570b3..eaad2c1d70dfec668bbd1eafa37220366b1881c8 100644 (file)
--- a/clock/src/View/WorldClockDeleteItemsView.cpp
+++ b/clock/src/View/WorldClockDeleteItemsView.cpp
@@ -60,7 +60,7 @@ struct LocationDeleteItemData {
 
 /* Delete list View */
 
-Elm_Genlist_Item_Class WorldClockDeleteItemsView::world_clock_delete_view_itc_= {
+Elm_Genlist_Item_Class WorldClockDeleteItemsView::world_clock_delete_view_itc_ = {
        0, 0, EINA_FALSE, EINA_TRUE,
        "worldclock.delete/reorder.list", nullptr, nullptr,
        { WorldClockDeleteItemsView::TextGet,
@@ -241,7 +241,7 @@ void WorldClockDeleteItemsView::CreateContent(Evas_Object *parent)
                                "edje/WorldClockDeleteReorderList.edj"));
 
        left_button_ = elm_button_add(parent);
-       elm_object_translatable_text_set(left_button_,"IDS_COM_SK_CANCEL");
+       elm_object_translatable_text_set(left_button_, "IDS_COM_SK_CANCEL");
        elm_object_style_set(left_button_, "naviframe/title_left");
        evas_object_smart_callback_add(left_button_, "clicked",
                        WorldClockDeleteItemsView::CancelButtonClicked, this);

diff --git a/clock/src/View/WorldClockMap.cpp b/clock/src/View/WorldClockMap.cpp
index 3ca39c17866f8fd62627ac842c26dc3e89aea500..e615c794a858ae3bb47f809f2630577b0c4c89ee 100644 (file)
--- a/clock/src/View/WorldClockMap.cpp
+++ b/clock/src/View/WorldClockMap.cpp
@@ -250,8 +250,9 @@ void WorldClockMap::LineDraw()
                        }
                        cairo_move_to(line_cairo_, (mapW - *it)/2.0,
                                                ((it - day_times_.begin())/180.0 * mapH));
-               } else
+               } else {
                        cairo_line_to(line_cairo_, (mapW - *it)/2.0, ((it - day_times_.begin())/180.0 * mapH));
+               }
        }
 
 
@@ -264,8 +265,9 @@ void WorldClockMap::LineDraw()
                                break;
                        }
                        cairo_move_to(line_cairo_, (mapW + *it)/2.0, (idx/180.0 * mapH));
-               } else
+               } else {
                        cairo_line_to(line_cairo_, (mapW + *it)/2.0, (idx/180.0 * mapH));
+               }
        }
 
        cairo_stroke(line_cairo_);

diff --git a/clock/src/View/WorldClockView.cpp b/clock/src/View/WorldClockView.cpp
index 26441ac495d13b0eda3ab126bd92f08c975a5d8a..47768162ac36d303faac973aa8e060911432e5ca 100644 (file)
--- a/clock/src/View/WorldClockView.cpp
+++ b/clock/src/View/WorldClockView.cpp
@@ -42,7 +42,7 @@ using namespace utils;
 
 /* Custom list View */
 
-Elm_Genlist_Item_Class WorldClockView::world_clock_itc_= {
+Elm_Genlist_Item_Class WorldClockView::world_clock_itc_ = {
        0, 0, EINA_FALSE, EINA_TRUE,
        "worldclock.custom.list", nullptr, nullptr,
        { WorldClockView::TextGet,
@@ -145,7 +145,6 @@ char *WorldClockView::TextGet(void *data, Evas_Object *obj, const char *part)
        if (!strcmp(part, "gmt.offset.desc"))
                return strdup(lid->gmt_offset_relative);
        if (!strcmp(part, "time")) {
-
                Time t = Time::Now().InTimezone(lid->location->tzpath.c_str());
 
                std::string timezone_time;
@@ -498,16 +497,16 @@ void WorldClockView::AddLocationReplayCb(app_control_h request, app_control_h re
 
        timezone_splited = eina_str_split_full(&timezone[1], ":", 2, &elements);
 
-       if (elements == 1)
+       if (elements == 1) {
                h = atoi(timezone_splited[0]);
-       else if (elements == 2) {
+       } else if (elements == 2) {
                h = atoi(timezone_splited[0]);
                min = atoi(timezone_splited[1]);
        }
 
        int gmt_offset = (60*h + min) * ((timezone[0] == '-') ? (-1) : (1));
        model::Location *l = new model::Location{ std::string(city_name),
-               std::string(country_name), gmt_offset, 0, 0, false, std::string(tzpath),};
+               std::string(country_name), gmt_offset, 0, 0, false, std::string(tzpath), };
 
        WorldClockView *view = static_cast<WorldClockView *>(user_data);
        view->SetItemToAdd(l);
@@ -583,7 +582,6 @@ void WorldClockView::UpdateTimezoneLocationsDots(const model::Timezone *timezone
        msg->count = 4;
 
        for (unsigned int i = 0; i < 8; i++) {
-
                if (i >= timezone->places.size()) {
                        msg->val[0] = 100;
                        msg->val[1] = 100;
@@ -748,7 +746,7 @@ void WorldClockView::CreateTimezoneCitiesList()
        evas_object_size_hint_align_set(timezone_cities_, EVAS_HINT_FILL, 0.0);
        elm_label_ellipsis_set(timezone_cities_, EINA_TRUE);
 
-       evas_object_show (timezone_cities_);
+       evas_object_show(timezone_cities_);
 
        elm_layout_content_set(world_clock_, TIMEZONE_DETAILS_SECOND_LINE_PART,
                timezone_cities_);