Skip to content

Commit 0a964f8

Browse files
authored
Merge pull request #107 from NuiCpp/new-warning-fixes
New warning fixes
2 parents e4a8146 + 50bc778 commit 0a964f8

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

cmake/dependencies/fmt.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
option(NUI_FETCH_FMT "Fetch fmt" ON)
22
set(NUI_FMT_GIT_REPOSITORY "https://github.com/fmtlib/fmt.git" CACHE STRING "fmt git repository")
3-
set(NUI_FMT_GIT_TAG "5f774c0aed4af6494b412cd3883e0f09295bd79d" CACHE STRING "fmt git tag")
3+
set(NUI_FMT_GIT_TAG "4e8640ed90ac8751d4a8ca500b893cc8c4bb9668" CACHE STRING "fmt git tag")
44

55
if (NUI_FETCH_FMT)
66
include(FetchContent)

cmake/dependencies/roar.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
option(NUI_FETCH_ROAR "Fetch roar" ON)
22
set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository")
3-
set(NUI_ROAR_TAG "4fe66b20d9d99d1fe2953048a7a6c65ce9a751c7" CACHE STRING "roar tag")
3+
set(NUI_ROAR_TAG "f88b5f46e145376d392c43dc621690f58278582c" CACHE STRING "roar tag")
44

55
if(NUI_FETCH_ROAR)
66
include(FetchContent)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#pragma once
2+
3+
#include <nui/backend/filesystem/special_paths.hpp>
4+
#include <nui/backend/filesystem/file_dialog.hpp>
5+
#include <nui/backend/rpc_hub.hpp>
6+
#include <nui/backend/url.hpp>

nui/include/nui/frontend/attributes/style.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,33 +156,33 @@ namespace Nui::Attributes
156156
auto operator=(char const* value)
157157
{
158158
return StylePropertyImpl{
159-
[name = std::string{name}, value = std::string{value}]() {
160-
return name + ":" + value;
159+
[name_ = std::string{name}, value = std::string{value}]() {
160+
return name_ + ":" + value;
161161
},
162162
nullptr};
163163
}
164164
auto operator=(std::string value)
165165
{
166166
return StylePropertyImpl{
167-
[name = std::string{name}, value = std::move(value)]() {
168-
return name + ":" + value;
167+
[name_ = std::string{name}, value = std::move(value)]() {
168+
return name_ + ":" + value;
169169
},
170170
nullptr};
171171
}
172172
auto operator=(Observed<std::string>& observedValue)
173173
{
174174
return StylePropertyImpl{
175-
[name = std::string{name}, &observedValue]() {
176-
return name + ":" + observedValue.value();
175+
[name_ = std::string{name}, &observedValue]() {
176+
return name_ + ":" + observedValue.value();
177177
},
178178
observedValue};
179179
}
180180
template <typename FunctionT, typename... ArgsT>
181181
auto operator=(ObservedValueCombinatorWithGenerator<FunctionT, ArgsT...>&& combinator)
182182
{
183183
return StylePropertyImpl{
184-
[name = std::string{name}, gen = combinator.generator()]() {
185-
return name + ":" + gen();
184+
[name_ = std::string{name}, gen = combinator.generator()]() {
185+
return name_ + ":" + gen();
186186
},
187187
std::move(combinator)};
188188
}

nui/include/nui/frontend/elements/impl/materialize.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ namespace Nui
4444
};
4545
struct Renderer
4646
{
47-
RendererType type;
48-
std::size_t metadata;
47+
RendererType type{RendererType::Append};
48+
std::size_t metadata{0};
4949
};
5050
auto renderElement(Renderer const& gen, auto& element, auto const& htmlElement)
5151
{

0 commit comments

Comments
 (0)