From 5eea62f4f4c113b6bbd30dea20d7f6068ff17791 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Sat, 15 Sep 2018 11:40:11 +0530 Subject: [PATCH] Fix build break by renaming xlocale.h to avoid name clash --- client/portswindow.cpp | 2 +- client/streamconfigdialog.cpp | 2 +- client/{xlocale.h => xqlocale.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename client/{xlocale.h => xqlocale.h} (100%) diff --git a/client/portswindow.cpp b/client/portswindow.cpp index 77178d9..6fe781b 100644 --- a/client/portswindow.cpp +++ b/client/portswindow.cpp @@ -28,7 +28,7 @@ along with this program. If not, see #include "fileformat.pb.h" -#include "xlocale.h" +#include "xqlocale.h" #include #include diff --git a/client/streamconfigdialog.cpp b/client/streamconfigdialog.cpp index a78dfc0..a38a77d 100644 --- a/client/streamconfigdialog.cpp +++ b/client/streamconfigdialog.cpp @@ -30,7 +30,7 @@ along with this program. If not, see #include "../common/protocolmanager.h" #include "../common/protocolwidgetfactory.h" -#include "xlocale.h" +#include "xqlocale.h" #include #include diff --git a/client/xlocale.h b/client/xqlocale.h similarity index 100% rename from client/xlocale.h rename to client/xqlocale.h