Separate basic functionality from GUI parts by moving it into a separate folder. Some files still need to get cleaned up prior moving them too.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18788 a1c6a512-1295-4272-9138-f99709370657

23 files changed, 36 insertions, 34 deletions

diff --git a/rbutil/rbutilqt/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index 7c830b17c2..67e95b998d 100644
--- a/rbutil/rbutilqt/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -17,6 +17,7 @@
  *
  ****************************************************************************/
 
+#include <QtCore>
 #include "autodetection.h"
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
diff --git a/rbutil/rbutilqt/autodetection.h b/rbutil/rbutilqt/base/autodetection.h
index 1fbe47f9a7..1fbe47f9a7 100644
--- a/rbutil/rbutilqt/autodetection.h
+++ b/rbutil/rbutilqt/base/autodetection.h
diff --git a/rbutil/rbutilqt/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
index 0af30c4e93..d0abffa44d 100644
--- a/rbutil/rbutilqt/bootloaderinstallbase.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallbase.h b/rbutil/rbutilqt/base/bootloaderinstallbase.h
index 4f0d279229..0916935208 100644
--- a/rbutil/rbutilqt/bootloaderinstallbase.h
+++ b/rbutil/rbutilqt/base/bootloaderinstallbase.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallfile.cpp b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp
index 7e4d6e81ea..daa1ad8af7 100644
--- a/rbutil/rbutilqt/bootloaderinstallfile.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallfile.cpp
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallfile.h b/rbutil/rbutilqt/base/bootloaderinstallfile.h
index 6ffc03b037..075f047ed2 100644
--- a/rbutil/rbutilqt/bootloaderinstallfile.h
+++ b/rbutil/rbutilqt/base/bootloaderinstallfile.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallhex.cpp b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp
index e4cc4cc08a..aa42beb994 100644
--- a/rbutil/rbutilqt/bootloaderinstallhex.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallhex.h b/rbutil/rbutilqt/base/bootloaderinstallhex.h
index 2fa5246c7f..04b657a193 100644
--- a/rbutil/rbutilqt/bootloaderinstallhex.h
+++ b/rbutil/rbutilqt/base/bootloaderinstallhex.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
index 211b864b06..e47c96b239 100644
--- a/rbutil/rbutilqt/bootloaderinstallipod.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallipod.h b/rbutil/rbutilqt/base/bootloaderinstallipod.h
index 1e464a228b..5867b754f1 100644
--- a/rbutil/rbutilqt/bootloaderinstallipod.h
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
index b106836262..fa0ebb2f02 100644
--- a/rbutil/rbutilqt/bootloaderinstallmi4.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallmi4.h b/rbutil/rbutilqt/base/bootloaderinstallmi4.h
index 12529f2811..c746b0c87f 100644
--- a/rbutil/rbutilqt/bootloaderinstallmi4.h
+++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
index 170cfd5905..9294cdd497 100644
--- a/rbutil/rbutilqt/bootloaderinstallsansa.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/bootloaderinstallsansa.h b/rbutil/rbutilqt/base/bootloaderinstallsansa.h
index d8544cf01e..a3911057a0 100644
--- a/rbutil/rbutilqt/bootloaderinstallsansa.h
+++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  *
  *   Copyright (C) 2008 by Dominik Riebeling
- *   $Id:$
+ *   $Id$
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/rbutil/rbutilqt/httpget.cpp b/rbutil/rbutilqt/base/httpget.cpp
index 129545d158..129545d158 100644
--- a/rbutil/rbutilqt/httpget.cpp
+++ b/rbutil/rbutilqt/base/httpget.cpp
diff --git a/rbutil/rbutilqt/httpget.h b/rbutil/rbutilqt/base/httpget.h
index ba4cbc821e..ba4cbc821e 100644
--- a/rbutil/rbutilqt/httpget.h
+++ b/rbutil/rbutilqt/base/httpget.h
diff --git a/rbutil/rbutilqt/rbunzip.cpp b/rbutil/rbutilqt/base/rbunzip.cpp
index 49d12156ea..49d12156ea 100644
--- a/rbutil/rbutilqt/rbunzip.cpp
+++ b/rbutil/rbutilqt/base/rbunzip.cpp
diff --git a/rbutil/rbutilqt/rbunzip.h b/rbutil/rbutilqt/base/rbunzip.h
index 133437a4e2..133437a4e2 100644
--- a/rbutil/rbutilqt/rbunzip.h
+++ b/rbutil/rbutilqt/base/rbunzip.h
diff --git a/rbutil/rbutilqt/rbzip.cpp b/rbutil/rbutilqt/base/rbzip.cpp
index b5cfb22416..b5cfb22416 100644
--- a/rbutil/rbutilqt/rbzip.cpp
+++ b/rbutil/rbutilqt/base/rbzip.cpp
diff --git a/rbutil/rbutilqt/rbzip.h b/rbutil/rbutilqt/base/rbzip.h
index d7cf05f3de..d7cf05f3de 100644
--- a/rbutil/rbutilqt/rbzip.h
+++ b/rbutil/rbutilqt/base/rbzip.h
diff --git a/rbutil/rbutilqt/utils.cpp b/rbutil/rbutilqt/base/utils.cpp
index a6a80c6eef..a6a80c6eef 100644
--- a/rbutil/rbutilqt/utils.cpp
+++ b/rbutil/rbutilqt/base/utils.cpp
diff --git a/rbutil/rbutilqt/utils.h b/rbutil/rbutilqt/base/utils.h
index 19cdca92c9..19cdca92c9 100644
--- a/rbutil/rbutilqt/utils.h
+++ b/rbutil/rbutilqt/base/utils.h
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 0135a87261..759f834ce4 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -46,7 +46,7 @@ QMAKE_EXTRA_TARGETS += lrelease
 SOURCES += rbutilqt.cpp \
            main.cpp \
  install.cpp \
- httpget.cpp \
+ base/httpget.cpp \
  configure.cpp \
  zip/zip.cpp \
  zip/unzip.cpp \
@@ -54,14 +54,14 @@ SOURCES += rbutilqt.cpp \
  progressloggergui.cpp \
  installtalkwindow.cpp \
  talkfile.cpp \
- autodetection.cpp \
+ base/autodetection.cpp \
  ../ipodpatcher/ipodpatcher.c \
  ../sansapatcher/sansapatcher.c \
  browsedirtree.cpp \
  installthemes.cpp \
  uninstall.cpp \
  uninstallwindow.cpp \
- utils.cpp \
+ base/utils.cpp \
  preview.cpp \
  encoders.cpp \
  encodersgui.cpp \
@@ -72,22 +72,22 @@ SOURCES += rbutilqt.cpp \
  voicefile.cpp \
  createvoicewindow.cpp \
  rbsettings.cpp \
- rbunzip.cpp \
- rbzip.cpp \
+ base/rbunzip.cpp \
+ base/rbzip.cpp \
  detect.cpp \
  sysinfo.cpp \
- bootloaderinstallbase.cpp \
- bootloaderinstallmi4.cpp \
- bootloaderinstallhex.cpp \
- bootloaderinstallipod.cpp \
- bootloaderinstallsansa.cpp \
- bootloaderinstallfile.cpp \
+ base/bootloaderinstallbase.cpp \
+ base/bootloaderinstallmi4.cpp \
+ base/bootloaderinstallhex.cpp \
+ base/bootloaderinstallipod.cpp \
+ base/bootloaderinstallsansa.cpp \
+ base/bootloaderinstallfile.cpp \
  ../../tools/mkboot.c \
  ../../tools/iriver.c
 
 HEADERS += rbutilqt.h \
  install.h \
- httpget.h \
+ base/httpget.h \
  configure.h \
  zip/zip.h \
  zip/unzip.h \
@@ -98,7 +98,7 @@ HEADERS += rbutilqt.h \
  installzip.h \
  installtalkwindow.h \
  talkfile.h \
- autodetection.h \
+ base/autodetection.h \
  progressloggerinterface.h \
  progressloggergui.h \
  ../ipodpatcher/ipodpatcher.h \
@@ -113,7 +113,7 @@ HEADERS += rbutilqt.h \
  installthemes.h \
  uninstall.h \
  uninstallwindow.h \
- utils.h \
+ base/utils.h \
  preview.h \
  encoders.h \
  encodersgui.h \
@@ -124,21 +124,22 @@ HEADERS += rbutilqt.h \
  voicefile.h \
  createvoicewindow.h \
  rbsettings.h \
- rbunzip.h \
- rbzip.h \
+ base/rbunzip.h \
+ base/rbzip.h \
  sysinfo.h \
  detect.h \
- bootloaderinstallbase.h \
- bootloaderinstallmi4.h \
- bootloaderinstallhex.h \
- bootloaderinstallipod.h \
- bootloaderinstallsansa.h \
- bootloaderinstallfile.h \
+ base/bootloaderinstallbase.h \
+ base/bootloaderinstallmi4.h \
+ base/bootloaderinstallhex.h \
+ base/bootloaderinstallipod.h \
+ base/bootloaderinstallsansa.h \
+ base/bootloaderinstallfile.h \
  ../../tools/mkboot.h \
  ../../tools/iriver.h
 
 # Needed by QT on Win
 INCLUDEPATH = . irivertools zip zlib ../ipodpatcher ../sansapatcher ../../tools/rbspeex ../../tools
+INCLUDEPATH += base
 
 LIBS += -L../../tools/rbspeex -lrbspeex