From 440ff9500bc74cc278e0b66f528cfdf624547240 Mon Sep 17 00:00:00 2001
From: Dmitry Gamza <gamzad@yahoo.com>
Date: Mon, 12 May 2014 09:59:24 +0400
Subject: [PATCH] =?UTF-8?q?qeditor:=20on=20Windows=20it=E2=80=99s=20not=20?=
 =?UTF-8?q?impossible=20to=20create=20a=20file=20with=20AUX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic7ef01328eccbed4afddb0a09d2afbb6c1f6a28f
Reviewed-on: http://gerrit.rockbox.org/811
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
---
 utils/regtools/qeditor/qeditor.pro            | 4 ++--
 utils/regtools/qeditor/regdisplaypanel.h      | 2 +-
 utils/regtools/qeditor/regedit.h              | 2 +-
 utils/regtools/qeditor/{aux.cpp => utils.cpp} | 2 +-
 utils/regtools/qeditor/{aux.h => utils.h}     | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename utils/regtools/qeditor/{aux.cpp => utils.cpp} (99%)
 rename utils/regtools/qeditor/{aux.h => utils.h} (100%)

diff --git a/utils/regtools/qeditor/qeditor.pro b/utils/regtools/qeditor/qeditor.pro
index 279b3532c0..3cf0148971 100644
--- a/utils/regtools/qeditor/qeditor.pro
+++ b/utils/regtools/qeditor/qeditor.pro
@@ -1,9 +1,9 @@
 QT += widgets
 
 HEADERS += mainwindow.h backend.h regtab.h analyser.h settings.h \
-    std_analysers.h aux.h regdisplaypanel.h regedit.h
+    std_analysers.h utils.h regdisplaypanel.h regedit.h
 SOURCES += main.cpp mainwindow.cpp regtab.cpp backend.cpp analyser.cpp \
-    std_analysers.cpp settings.cpp aux.cpp regdisplaypanel.cpp regedit.cpp
+    std_analysers.cpp settings.cpp utils.cpp regdisplaypanel.cpp regedit.cpp
 LIBS += -L../lib/ -lsocdesc -lxml2
 INCLUDEPATH += ../lib/ ../../hwstub/lib
 
diff --git a/utils/regtools/qeditor/regdisplaypanel.h b/utils/regtools/qeditor/regdisplaypanel.h
index b8b9729887..a000fa5611 100644
--- a/utils/regtools/qeditor/regdisplaypanel.h
+++ b/utils/regtools/qeditor/regdisplaypanel.h
@@ -12,7 +12,7 @@
 #include <soc_desc.hpp>
 #include "backend.h"
 #include "settings.h"
-#include "aux.h"
+#include "utils.h"
 #include "regtab.h"
 
 class RegItemEditorCreator : public QItemEditorCreatorBase
diff --git a/utils/regtools/qeditor/regedit.h b/utils/regtools/qeditor/regedit.h
index b5ccd249fa..cec92d7c03 100644
--- a/utils/regtools/qeditor/regedit.h
+++ b/utils/regtools/qeditor/regedit.h
@@ -21,7 +21,7 @@
 #include "backend.h"
 #include "settings.h"
 #include "mainwindow.h"
-#include "aux.h"
+#include "utils.h"
 
 class AbstractRegEditPanel
 {
diff --git a/utils/regtools/qeditor/aux.cpp b/utils/regtools/qeditor/utils.cpp
similarity index 99%
rename from utils/regtools/qeditor/aux.cpp
rename to utils/regtools/qeditor/utils.cpp
index de45f6c438..1662169bdb 100644
--- a/utils/regtools/qeditor/aux.cpp
+++ b/utils/regtools/qeditor/utils.cpp
@@ -1,4 +1,4 @@
-#include "aux.h"
+#include "utils.h"
 #include <QFontMetrics>
 #include <QPainter>
 #include <QTextDocument>
diff --git a/utils/regtools/qeditor/aux.h b/utils/regtools/qeditor/utils.h
similarity index 100%
rename from utils/regtools/qeditor/aux.h
rename to utils/regtools/qeditor/utils.h