Fix "declaration shadows a global declaration" warning.

The variable name "Display" conflicts with a typedef in /usr/include/X11/Xlib.h.
MythTV · Jul 5, 2020 · 5617763 · 5617763
1 parent 48ee55b
commit 5617763
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mythtv/libs/libmythui/mythdisplay.cpp b/mythtv/libs/libmythui/mythdisplay.cpp
@@ -1047,7 +1047,7 @@ void MythDisplay::DebugModes(void) const
  * \note This function must be called before Qt/QPA is initialised i.e. before
  * any call to QApplication.
 */
-void MythDisplay::ConfigureQtGUI(int SwapInterval, QString Display)
+void MythDisplay::ConfigureQtGUI(int SwapInterval, QString _Display)
 {
     // Set the default surface format. Explicitly required on some platforms.
     QSurfaceFormat format;
@@ -1102,8 +1102,8 @@ void MythDisplay::ConfigureQtGUI(int SwapInterval, QString Display)
     QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
 
 #ifdef USING_X11
-    MythXDisplay::SetQtX11Display(Display);
+    MythXDisplay::SetQtX11Display(_Display);
 #else
-    (void)Display;
+    (void)_Display;
 #endif
 }
diff --git a/mythtv/libs/libmythui/platforms/mythxdisplay.cpp b/mythtv/libs/libmythui/platforms/mythxdisplay.cpp
@@ -61,9 +61,9 @@ MythXDisplay* MythXDisplay::OpenMythXDisplay(bool Warn /*= true*/)
     return nullptr;
 }
 
-void MythXDisplay::SetQtX11Display(const QString &Display)
+void MythXDisplay::SetQtX11Display(const QString &_Display)
 {
-    s_QtX11Display = Display;
+    s_QtX11Display = _Display;
 }
 
 MythXDisplay::~MythXDisplay()