From e721aed2715e90fc33da98e22d176e985f660b54 Mon Sep 17 00:00:00 2001 From: rkubiak01 Date: Tue, 28 Jan 2020 12:00:10 +0100 Subject: [PATCH] [FIX] warning fixes this alsow fixes the release build warnings for the audio decoder those did not pop-up when building in debug mode --- .../windows/MenuWindow.cpp | 6 ++--- .../windows/ThreadViewWindow.cpp | 6 ----- .../models/SearchResultsModel.cpp | 2 +- module-audio/Audio/decoder/decoder.hpp | 24 +++++++++---------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp index 0245d5d62..79f0fa509 100644 --- a/module-apps/application-desktop/windows/MenuWindow.cpp +++ b/module-apps/application-desktop/windows/MenuWindow.cpp @@ -194,9 +194,9 @@ bool MenuWindow::onInput( const InputEvent& inputEvent ) { if(( inputEvent.state == InputEvent::State::keyReleasedShort ) || ( inputEvent.state == InputEvent::State::keyReleasedLong )) { // putsh enter on tile number on key press (press 9 to enter 9th tile) - int num = gui::toNumeric(inputEvent.keyCode) - 1; - /// size is unsigned, creating int() to avoid warning - if((num > 0) && int(num < (pages[currentPage]->tiles.size()))) { + size_t num = gui::toNumeric(inputEvent.keyCode) - 1; + // size is unsigned, creating int() to avoid warning + if((num > 0) && int(num < (pages[currentPage]->tiles.size()))) { LOG_ERROR("RUN tile with enter -> %d %d", num,pages[currentPage]->tiles.size()); auto el = Item(); return pages[currentPage]->tiles[num]->activatedCallback(el); diff --git a/module-apps/application-messages/windows/ThreadViewWindow.cpp b/module-apps/application-messages/windows/ThreadViewWindow.cpp index 9a93d468a..5dae4ce65 100644 --- a/module-apps/application-messages/windows/ThreadViewWindow.cpp +++ b/module-apps/application-messages/windows/ThreadViewWindow.cpp @@ -209,12 +209,6 @@ namespace gui } } } - { - if (auto pdata = dynamic_cast(data)) - { - LOG_INFO("PhonebookSearchRequest data"); - } - } } bool ThreadViewWindow::onInput(const InputEvent &inputEvent) diff --git a/module-apps/application-phonebook/models/SearchResultsModel.cpp b/module-apps/application-phonebook/models/SearchResultsModel.cpp index e9ddfd85a..9eb259b0d 100644 --- a/module-apps/application-phonebook/models/SearchResultsModel.cpp +++ b/module-apps/application-phonebook/models/SearchResultsModel.cpp @@ -16,7 +16,7 @@ SearchResultsModel::~SearchResultsModel() gui::ListItem *SearchResultsModel::getItem(int index, int firstElement, int prevIndex, uint32_t count, int remaining, bool topDown) { auto o = *results.get(); - if (index >= o.size()) + if (index >= (int)o.size()) { LOG_ERROR("getItem error: index %d >= results size %d", index, o.size()); return nullptr; diff --git a/module-audio/Audio/decoder/decoder.hpp b/module-audio/Audio/decoder/decoder.hpp index 3072b6d3f..db84555db 100644 --- a/module-audio/Audio/decoder/decoder.hpp +++ b/module-audio/Audio/decoder/decoder.hpp @@ -23,25 +23,25 @@ namespace audio { struct Tags { /* Total audio duration in seconds */ - uint32_t total_duration_s; + uint32_t total_duration_s = 0; /* Audio duration - hours part */ - uint32_t duration_hour; + uint32_t duration_hour = 0; /* Audio duration - minutes part */ - uint32_t duration_min; + uint32_t duration_min = 0; /* Audio duration - seconds part */ - uint32_t duration_sec; + uint32_t duration_sec = 0; /* Sample rate */ - uint32_t sample_rate; + uint32_t sample_rate = 0; /* Number of channels */ - uint32_t num_channel; + uint32_t num_channel = 0; - std::string artist; - std::string genre; - std::string title; - std::string album; - std::string year; - std::string filePath; + std::string artist = ""; + std::string genre = ""; + std::string title = ""; + std::string album = ""; + std::string year = ""; + std::string filePath = ""; Tags() {}