Skip to content

Commit 79ebd33

Browse files
btzybtzy
authored
GTK, Portal: Fix variable shadowing warnings (#150)
1 parent 2a7440a commit 79ebd33

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install Dependencies
7676
run: sudo apt-get update && sudo apt-get install ${{ matrix.portal.dep }}
7777
- name: Configure
78-
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${{ matrix.compiler.c }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp }} -DCMAKE_CXX_STANDARD=${{ matrix.cppstd }} -DCMAKE_C_FLAGS="-Wall -Wextra -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -pedantic" -DNFD_PORTAL=${{ matrix.portal.flag }} -DNFD_APPEND_EXTENSION=${{ matrix.autoappend.flag }} -DBUILD_SHARED_LIBS=${{ matrix.shared_lib.flag }} -DNFD_BUILD_TESTS=ON ..
78+
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${{ matrix.compiler.c }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp }} -DCMAKE_CXX_STANDARD=${{ matrix.cppstd }} -DCMAKE_C_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DNFD_PORTAL=${{ matrix.portal.flag }} -DNFD_APPEND_EXTENSION=${{ matrix.autoappend.flag }} -DBUILD_SHARED_LIBS=${{ matrix.shared_lib.flag }} -DNFD_BUILD_TESTS=ON ..
7979
- name: Build
8080
run: cmake --build build --target install
8181
- name: Upload test binaries
@@ -100,7 +100,7 @@ jobs:
100100
- name: Checkout
101101
uses: actions/checkout@v4
102102
- name: Configure
103-
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -pedantic" -DBUILD_SHARED_LIBS=${{ matrix.shared_lib.flag }} -DNFD_BUILD_TESTS=ON ..
103+
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DBUILD_SHARED_LIBS=${{ matrix.shared_lib.flag }} -DNFD_BUILD_TESTS=ON ..
104104
- name: Build
105105
run: cmake --build build --target install
106106
- name: Upload test binaries
@@ -176,7 +176,7 @@ jobs:
176176
mingw-w64-x86_64-gcc
177177
mingw-w64-x86_64-cmake
178178
- name: Configure
179-
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -pedantic" -DNFD_BUILD_TESTS=ON ..
179+
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DNFD_BUILD_TESTS=ON ..
180180
- name: Build
181181
run: cmake --build build --target install
182182
- name: Upload test binaries
@@ -202,7 +202,7 @@ jobs:
202202
- name: Install Dependencies
203203
run: sudo apt-get update && sudo apt-get install ${{ matrix.portal.dep }} libsdl2-dev libsdl2-ttf-dev
204204
- name: Configure
205-
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -pedantic" -DNFD_PORTAL=${{ matrix.portal.flag }} -DNFD_APPEND_EXTENSION=OFF -DNFD_BUILD_TESTS=OFF -DNFD_BUILD_SDL2_TESTS=ON ..
205+
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DNFD_PORTAL=${{ matrix.portal.flag }} -DNFD_APPEND_EXTENSION=OFF -DNFD_BUILD_TESTS=OFF -DNFD_BUILD_SDL2_TESTS=ON ..
206206
- name: Build
207207
run: cmake --build build --target install
208208
- name: Upload test binaries
@@ -224,7 +224,7 @@ jobs:
224224
- name: Install Dependencies
225225
run: brew install sdl2 sdl2_ttf
226226
- name: Configure
227-
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -pedantic" -DNFD_BUILD_TESTS=OFF -DNFD_BUILD_SDL2_TESTS=ON ..
227+
run: mkdir build && mkdir install && cd build && cmake -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wshadow -Werror -pedantic" -DNFD_BUILD_TESTS=OFF -DNFD_BUILD_SDL2_TESTS=ON ..
228228
- name: Build
229229
run: cmake --build build --target install
230230
- name: Upload test binaries

‎src/nfd_gtk.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,7 @@ void RealizedSignalHandler(GtkWidget* window, void* userdata) {
447447
}
448448

449449
struct NativeWindowParenter {
450-
NativeWindowParenter(GtkWidget* widget, const nfdwindowhandle_t& parentWindow) noexcept
451-
: widget(widget) {
450+
NativeWindowParenter(GtkWidget* w, const nfdwindowhandle_t& parentWindow) noexcept : widget(w) {
452451
parent = GetAllocNativeWindowHandle(parentWindow);
453452

454453
if (parent) {

‎src/nfd_portal.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,17 +1605,17 @@ nfdresult_t NFD_PickFolderN_With_Impl(nfdversion_t version,
16051605
(void)version;
16061606

16071607
{
1608-
dbus_uint32_t version;
1609-
const nfdresult_t res = NFD_DBus_GetVersion(version);
1608+
dbus_uint32_t portal_version;
1609+
const nfdresult_t res = NFD_DBus_GetVersion(portal_version);
16101610
if (res != NFD_OKAY) {
16111611
return res;
16121612
}
1613-
if (version < 3) {
1613+
if (portal_version < 3) {
16141614
NFDi_SetFormattedError(
16151615
"The xdg-desktop-portal installed on this system does not support a folder picker; "
16161616
"at least version 3 of the org.freedesktop.portal.FileChooser interface is "
16171617
"required but the installed interface version is %u.",
1618-
version);
1618+
portal_version);
16191619
return NFD_ERROR;
16201620
}
16211621
}
@@ -1662,17 +1662,17 @@ nfdresult_t NFD_PickFolderMultipleN_With_Impl(nfdversion_t version,
16621662
(void)version;
16631663

16641664
{
1665-
dbus_uint32_t version;
1666-
const nfdresult_t res = NFD_DBus_GetVersion(version);
1665+
dbus_uint32_t portal_version;
1666+
const nfdresult_t res = NFD_DBus_GetVersion(portal_version);
16671667
if (res != NFD_OKAY) {
16681668
return res;
16691669
}
1670-
if (version < 3) {
1670+
if (portal_version < 3) {
16711671
NFDi_SetFormattedError(
16721672
"The xdg-desktop-portal installed on this system does not support a folder picker; "
16731673
"at least version 3 of the org.freedesktop.portal.FileChooser interface is "
16741674
"required but the installed interface version is %u.",
1675-
version);
1675+
portal_version);
16761676
return NFD_ERROR;
16771677
}
16781678
}

0 commit comments

Comments
 (0)