Skip to content

Commit e66cfc7

Browse files
committed
rename maximize param
[ 72%] Building CXX object vncviewer/CMakeFiles/vncviewer.dir/DesktopWindow.cxx.o /Users/fedo/repos/tigervnc/vncviewer/DesktopWindow.cxx:177:7: error: reference to non-static member function must be called; did you mean to call it with no arguments? 177 | if (maximize) { | ^~~~~~~~ | () /Users/fedo/repos/tigervnc/vncviewer/DesktopWindow.cxx:177:7: error: value of type 'void' is not contextually convertible to 'bool' 177 | if (maximize) { | ^~~~~~~~ 2 errors generated. make[2]: *** [vncviewer/CMakeFiles/vncviewer.dir/DesktopWindow.cxx.o] Error 1 make[1]: *** [vncviewer/CMakeFiles/vncviewer.dir/all] Error 2 make: *** [all] Error 2
1 parent 24a8909 commit e66cfc7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

vncviewer/DesktopWindow.cxx

+4-4
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name,
172172
}
173173

174174
#ifdef __APPLE__
175-
// On OS X we can do the maximize thing properly before the
176-
// window is showned. Other platforms handled further down...
177-
if (maximize) {
175+
// On OS X we can do the maximizeParam thing properly before the
176+
// window is shown. Other platforms handled further down...
177+
if (maximizeWindow) {
178178
int dummy;
179179
Fl::screen_work_area(dummy, dummy, w, h, geom_x, geom_y);
180180
}
@@ -208,7 +208,7 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name,
208208
// maximized property on Windows and X11 before showing the window.
209209
// See STR #2083 and STR #2178
210210
#ifndef __APPLE__
211-
if (maximize) {
211+
if (maximizeParam) {
212212
maximizeWindow();
213213
}
214214
#endif

vncviewer/parameters.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ IntParameter qualityLevel("QualityLevel",
106106
"JPEG quality level. 0 = Low, 9 = High",
107107
8);
108108

109-
BoolParameter maximize("Maximize", "Maximize viewer window", false);
109+
BoolParameter maximizeParam("Maximize", "Maximize viewer window", false);
110110
BoolParameter fullScreen("FullScreen", "Enable full screen", false);
111111
StringParameter fullScreenMode("FullScreenMode", "Specify which monitors to use when in full screen. "
112112
"Should be either Current, Selected or All",

vncviewer/parameters.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extern rfb::IntParameter compressLevel;
4848
extern rfb::BoolParameter noJpeg;
4949
extern rfb::IntParameter qualityLevel;
5050

51-
extern rfb::BoolParameter maximize;
51+
extern rfb::BoolParameter maximizeParam;
5252
extern rfb::BoolParameter fullScreen;
5353
extern rfb::StringParameter fullScreenMode;
5454
extern rfb::BoolParameter fullScreenAllMonitors; // deprecated

0 commit comments

Comments
 (0)