Skip to content

Commit 2b2aefc

Browse files
Riksu9000Avamander
authored andcommitted
Fix InfiniTime compiler warnings
1 parent 95ff285 commit 2b2aefc

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

src/BootloaderVersion.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ using namespace Pinetime;
99
uint32_t BootloaderVersion::version = 0;
1010
char BootloaderVersion::versionString[BootloaderVersion::VERSION_STR_LEN] = "0.0.0";
1111

12-
const uint32_t BootloaderVersion::Major() {
12+
uint32_t BootloaderVersion::Major() {
1313
return (BootloaderVersion::version >> 16u) & 0xff;
1414
}
1515

16-
const uint32_t BootloaderVersion::Minor() {
16+
uint32_t BootloaderVersion::Minor() {
1717
return (BootloaderVersion::version >> 8u) & 0xff;
1818
}
1919

20-
const uint32_t BootloaderVersion::Patch() {
20+
uint32_t BootloaderVersion::Patch() {
2121
return BootloaderVersion::version & 0xff;
2222
}
2323

2424
const char* BootloaderVersion::VersionString() {
2525
return BootloaderVersion::versionString;
2626
}
2727

28-
const bool BootloaderVersion::IsValid() {
28+
bool BootloaderVersion::IsValid() {
2929
return BootloaderVersion::version >= 0x00010000;
3030
}
3131

src/BootloaderVersion.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
namespace Pinetime {
77
class BootloaderVersion {
88
public:
9-
static const uint32_t Major();
10-
static const uint32_t Minor();
11-
static const uint32_t Patch();
9+
static uint32_t Major();
10+
static uint32_t Minor();
11+
static uint32_t Patch();
1212
static const char* VersionString();
13-
static const bool IsValid();
13+
static bool IsValid();
1414
static void SetVersion(uint32_t v);
1515

1616
private:

src/displayapp/screens/WatchFacePineTimeStyle.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ namespace {
4242
auto* screen = static_cast<WatchFacePineTimeStyle*>(obj->user_data);
4343
screen->UpdateSelected(obj, event);
4444
}
45-
46-
bool IsBleIconVisible(bool isRadioEnabled, bool isConnected) {
47-
if (!isRadioEnabled) {
48-
return true;
49-
}
50-
return isConnected;
51-
}
5245
}
5346

5447
WatchFacePineTimeStyle::WatchFacePineTimeStyle(DisplayApp* app,

0 commit comments

Comments
 (0)