01/01: [USETUP] Get rid of the interface directory because we support text-mode only

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ce0c5d48b6f149a15e7e…

commit 3ce0c5d48b6f149a15e7eb9694e31a221546da5c
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Tue May 15 19:47:52 2018 +0200
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Tue May 15 19:47:52 2018 +0200

    [USETUP] Get rid of the interface directory because we support text-mode only
---
 base/setup/usetup/CMakeLists.txt            | 6 +++---
 base/setup/usetup/{interface => }/consup.c  | 2 +-
 base/setup/usetup/{interface => }/consup.h  | 2 +-
 base/setup/usetup/{interface => }/devinst.c | 2 +-
 base/setup/usetup/{interface => }/usetup.c  | 2 +-
 base/setup/usetup/usetup.h                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index 46034af752..8ca8471f5e 100644
--- a/base/setup/usetup/CMakeLists.txt
+++ b/base/setup/usetup/CMakeLists.txt
@@ -8,9 +8,6 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
 
 list(APPEND SOURCE
-    interface/usetup.c
-    interface/devinst.c
-    interface/consup.c
     native/utils/keytrans.c
     native/utils/console.c
     native/fslist.c
@@ -19,6 +16,8 @@ list(APPEND SOURCE
     cabinet.c
     chkdsk.c
     cmdcons.c
+    consup.c
+    devinst.c
     drivesup.c
     filesup.c
     filequeue.c
@@ -32,6 +31,7 @@ list(APPEND SOURCE
     progress.c
     registry.c
     settings.c
+    usetup.c
     usetup.h)
 
 add_executable(usetup ${SOURCE} usetup.rc)
diff --git a/base/setup/usetup/interface/consup.c b/base/setup/usetup/consup.c
similarity index 99%
rename from base/setup/usetup/interface/consup.c
rename to base/setup/usetup/consup.c
index d682a73959..0fbf4daf9f 100644
--- a/base/setup/usetup/interface/consup.c
+++ b/base/setup/usetup/consup.c
@@ -19,7 +19,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/consup.c
+ * FILE:            base/setup/usetup/consup.c
  * PURPOSE:         Console support functions
  * PROGRAMMER:      Eric Kohl
  */
diff --git a/base/setup/usetup/interface/consup.h b/base/setup/usetup/consup.h
similarity index 98%
rename from base/setup/usetup/interface/consup.h
rename to base/setup/usetup/consup.h
index 44d3eab80b..546e78864a 100644
--- a/base/setup/usetup/interface/consup.h
+++ b/base/setup/usetup/consup.h
@@ -19,7 +19,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/consup.h
+ * FILE:            base/setup/usetup/consup.h
  * PURPOSE:         Console support functions
  * PROGRAMMER:      Eric Kohl
  */
diff --git a/base/setup/usetup/interface/devinst.c b/base/setup/usetup/devinst.c
similarity index 99%
rename from base/setup/usetup/interface/devinst.c
rename to base/setup/usetup/devinst.c
index 354be13075..ef4c6840a8 100644
--- a/base/setup/usetup/interface/devinst.c
+++ b/base/setup/usetup/devinst.c
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/devinst.c
+ * FILE:            base/setup/usetup/devinst.c
  * PURPOSE:         Device installation
  * PROGRAMMER:      Herv� Poussineau (hpoussin(a)reactos.org)
  */
diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/usetup.c
similarity index 99%
rename from base/setup/usetup/interface/usetup.c
rename to base/setup/usetup/usetup.c
index 2cbab22f0e..5b5ac583d3 100644
--- a/base/setup/usetup/interface/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -19,7 +19,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            base/setup/usetup/interface/usetup.c
+ * FILE:            base/setup/usetup/usetup.c
  * PURPOSE:         Text-mode setup
  * PROGRAMMER:      Eric Kohl
  *                  Casper S. Hornstrup (chorns(a)users.sourceforge.net)
diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h
index a640728b05..181c1b40a3 100644
--- a/base/setup/usetup/usetup.h
+++ b/base/setup/usetup/usetup.h
@@ -59,7 +59,7 @@
 // #include <fslib/ntfslib.h>
 
 /* Internal Headers */
-#include "interface/consup.h"
+#include "consup.h"
 #include "inffile.h"
 #include "inicache.h"
 #include "progress.h"