nico/NickelMenu-custom
1
0
Fork 0
Code Releases 1 Activity

Fixed some warnings

Browse Source
This commit is contained in:
Patrick Gaskin
2020-04-22 13:06:39 -04:00
parent 4b45731adf
commit 28386d3eee
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -32,8 +32,8 @@ endef
$(call pkgconf,QT5CORE,Qt5Core) $(call pkgconf,QT5CORE,Qt5Core)
$(call pkgconf,QT5WIDGETS,Qt5Widgets) $(call pkgconf,QT5WIDGETS,Qt5Widgets)
CFLAGS ?= -Wall -Wextra CFLAGS ?= -Wall -Wextra -Werror
CXXFLAGS ?= -Wall -Wextra CXXFLAGS ?= -Wall -Wextra -Werror
LDFLAGS ?= LDFLAGS ?=
# temporary workaround for broken cflags in kobo-toolchain Docker image: # temporary workaround for broken cflags in kobo-toolchain Docker image:

3
src/dlhook.c
View File

@@ -25,6 +25,9 @@
#endif #endif
#endif #endif
// prevent GCC from giving us warnings everywhere about the format specifiers for the ELF typedefs
#pragma GCC diagnostic ignored "-Wformat"
void *nmi_dlhook(void *handle, const char *symname, void *target, char **err_out) { void *nmi_dlhook(void *handle, const char *symname, void *target, char **err_out) {
#define NMI_ERR_RET NULL #define NMI_ERR_RET NULL

2
src/menu.cc
View File

@@ -86,7 +86,7 @@ extern "C" MenuTextItem* _nmi_menu_hook(void* _this, QMenu* menu, QString const&
QAction* action = AbstractNickelMenuController_createAction(_this, menu, item, true, true, true); QAction* action = AbstractNickelMenuController_createAction(_this, menu, item, true, true, true);
// note: we're capturing by value, i.e. the pointer to the global variable, rather then the stack variable, so this is safe // note: we're capturing by value, i.e. the pointer to the global variable, rather then the stack variable, so this is safe
QObject::connect(action, &QAction::triggered, std::function<void(bool)>([it](bool checked){ QObject::connect(action, &QAction::triggered, std::function<void(bool)>([it](bool){
NMI_LOG("Item '%s' pressed...", it->lbl); NMI_LOG("Item '%s' pressed...", it->lbl);
char *err; char *err;
if (it->act(it->arg, &err) && err) { if (it->act(it->arg, &err) && err) {