remove build warnings 33/101933/1
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Fri, 2 Dec 2016 11:08:37 +0000 (12:08 +0100)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Fri, 2 Dec 2016 11:08:37 +0000 (12:08 +0100)
Change-Id: Ie04af372305c1e73df2269014d456b20d70b7c5b

13 files changed:
clock/inc/Controller/RingController.h
clock/inc/Model/Timer.h
clock/src/Clock.cpp
clock/src/Controller/MainController.cpp
clock/src/Controller/RingController.cpp
clock/src/Model/Ring.cpp
clock/src/Presenter/TimerPresenter.cpp
clock/src/Presenter/WorldClockDeletePresenter.cpp
clock/src/Presenter/WorldClockReorderPresenter.cpp
clock/src/Utils/Translate.cpp
clock/src/Utils/WorldClock.cpp
clock/src/View/PageView.cpp
clock/src/View/TimerView.cpp

index fb0a7f2..9081e56 100644 (file)
@@ -53,7 +53,6 @@ namespace controller {
 
                void RingCreate(void);
                void RingDestroy(utils::Event &e);
-               bool isInitialized;
 
                RingController();
        };
index 9135f26..7d0d340 100644 (file)
@@ -43,7 +43,6 @@ namespace model {
 
                seconds GetRemainingTime(void);
        private:
-               seconds time_;
                unsigned hour_;
                unsigned minute_;
                unsigned second_;
index f484138..19d7455 100644 (file)
@@ -54,8 +54,6 @@ app_control(app_control_h app_control, void *data)
        }
        DBG("Operation: %s", opData);
 
-       char *alarmID = NULL;
-
        if (!strcmp(opData, APP_CONTROL_OPERATION_DEFAULT))
                MainController::GetInstance().Init();
        else if (!strcmp(opData, APP_CONTROL_OPERATION_ALARM)) {
index 4b3e1fb..98f5322 100644 (file)
@@ -45,10 +45,16 @@ MainController &MainController::GetInstance()
 }
 
 MainController::MainController() :
-       edit_page_(main_view_), delete_page_(main_view_), world_clock_delete_page_(main_view_),
-       world_clock_reorder_page_(main_view_), delete_presenter_(nullptr),
-       edit_presenter_(nullptr), world_clock_delete_presenter_(nullptr),
-       world_clock_reorder_presenter_(nullptr), initialized_(false)
+       world_clock_model_(nullptr), stop_watch_model_(nullptr), timer_model_(nullptr),
+
+       alarm_presenter_(nullptr), world_clock_presenter_(nullptr), stop_watch_presenter_(nullptr),
+       timer_presenter_(nullptr), edit_presenter_(nullptr), delete_presenter_(nullptr),
+       world_clock_delete_presenter_(nullptr), world_clock_reorder_presenter_(nullptr),
+
+       edit_page_(main_view_), delete_page_(main_view_),
+       world_clock_delete_page_(main_view_), world_clock_reorder_page_(main_view_),
+
+       initialized_(false)
 {
 }
 
index 982b7ae..a4e1fef 100644 (file)
@@ -31,7 +31,6 @@ RingController &RingController::GetInstance()
 }
 
 RingController::RingController()
-       : isInitialized(false)
 {
        listener_ = utils::EventBus::AddListener<model::RingDismissEvent>(std::bind(&RingController::RingDestroy,
                                this, std::placeholders::_1));
index f261d6e..e056c58 100644 (file)
@@ -20,7 +20,7 @@
 
 namespace model {
 
-       Ring::Ring() : ring_type_(RingType::RING_TYPE_NONE), alarm_(NULL)
+       Ring::Ring() : alarm_(NULL), ring_type_(RingType::RING_TYPE_NONE)
        {
        }
 
index 94eb6a7..f5dd309 100644 (file)
@@ -22,7 +22,7 @@ namespace presenter {
 using namespace std::chrono;
 
 TimerPresenter::TimerPresenter(view::TimerView *view, model::Timer *model)
-       : model_(model), view_(view)
+       : view_(view), model_(model)
 {
 
        view_->RegisterSignal(std::bind(&TimerPresenter::StartButtonClicked, this),
index d6ddc1d..98cf99d 100644 (file)
@@ -25,7 +25,7 @@ using namespace model;
 
 WorldClockDeletePresenter::WorldClockDeletePresenter(
         WorldClockDeleteItemsView *view, WorldClock *model) :
-               delete_view_(view), model_(model)
+                model_(model), delete_view_(view)
 {
        DBG("");
        delete_view_->RegisterSignal(view::WorldClockDeleteItemsView::SignalType::BUTTON_CANCEL_CLICKED,
index eccc78a..c37b548 100644 (file)
@@ -23,7 +23,7 @@ using namespace view;
 
 WorldClockReorderPresenter::WorldClockReorderPresenter(
         WorldClockReorderView *view, model::WorldClock *model) :
-                       reorder_view_(view), model_(model)
+               model_(model), reorder_view_(view)
 {
        reorder_view_->RegisterSignalHandler(WorldClockReorderView::Signals::LIST_REORDERED,
                        std::bind(&WorldClockReorderPresenter::OnListReordered, this));
index 457be8c..23450b9 100644 (file)
@@ -41,7 +41,7 @@ std::string Translate::Sprintf(const char *msgid, ...)
 std::string Translate::Sprintf(int count, const char *singularForm, const char *pluralForm, ...)
 {
        char *result = NULL;
-       va_list args, copy;
+       va_list args;
        va_start(args, pluralForm);
 
        int ret = vasprintf(&result, ngettext(singularForm, pluralForm, count), args);
index bbe2f90..e9c3f53 100644 (file)
@@ -22,7 +22,6 @@ namespace utils {
 // local_timezone_offset and timezone_offset should be relative to GMT
 std::string GetTimezoneDiffDescription(int local_timezone_offset, int timezone_offset)
 {
-       char *pattern;
        std::string relative;
 
        int offset_integer = (abs(timezone_offset - local_timezone_offset)) / 60;
index c927c01..7eac52c 100644 (file)
@@ -34,7 +34,7 @@ PageView::~PageView()
 }
 
 PageView::PageView(ui::IView &main)
-       : naviframe_(main.GetEvasObject()), navi_item_(nullptr)
+       : navi_item_(nullptr), naviframe_(main.GetEvasObject())
 {
 }
 
index 46da873..d5e37f2 100644 (file)
@@ -331,8 +331,6 @@ void TimerView::CreateEntry(Evas_Object *parent, const char *part)
 
 void TimerView::EntryFocusedCb(void *data, Evas_Object *obj, void *event_info)
 {
-       TimerView *object = static_cast<TimerView *>(data);
-
        elm_entry_select_all(obj);
 }