summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gamza <gamzad@yahoo.com>2014-05-12 09:59:24 +0400
committerAmaury Pouly <amaury.pouly@gmail.com>2014-05-12 19:05:19 +0200
commit440ff9500bc74cc278e0b66f528cfdf624547240 (patch)
treeeed9c67fa3d282e33821267ca0d7d94bb97dc7e7
parent7b590a953639714cf8ea4b550dd7f6558698e23f (diff)
downloadrockbox-440ff9500bc74cc278e0b66f528cfdf624547240.tar.gz
rockbox-440ff9500bc74cc278e0b66f528cfdf624547240.tar.bz2
rockbox-440ff9500bc74cc278e0b66f528cfdf624547240.zip
qeditor: on Windows it’s not impossible to create a file with AUX
Change-Id: Ic7ef01328eccbed4afddb0a09d2afbb6c1f6a28f Reviewed-on: http://gerrit.rockbox.org/811 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
-rw-r--r--utils/regtools/qeditor/qeditor.pro4
-rw-r--r--utils/regtools/qeditor/regdisplaypanel.h2
-rw-r--r--utils/regtools/qeditor/regedit.h2
-rw-r--r--utils/regtools/qeditor/utils.cpp (renamed from utils/regtools/qeditor/aux.cpp)2
-rw-r--r--utils/regtools/qeditor/utils.h (renamed from utils/regtools/qeditor/aux.h)0
5 files changed, 5 insertions, 5 deletions
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
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
index ee08f1f31b..ee08f1f31b 100644
--- a/utils/regtools/qeditor/aux.h
+++ b/utils/regtools/qeditor/utils.h