move guistartup.* from libmythui to libmyth

It is only used by MythContext so move the files to be with mythcontext.*.

Author: ulmus-scott

mythtv/libs/libmyth/CMakeLists.txt

@@ -12,7 +12,11 @@ set(LIBMYTH_HEADERS
     mythexp.h
     )
 
-set(LIBMYTH_HEADERS_NOT_INSTALLED backendselect.h dbsettings.h)
+set(LIBMYTH_HEADERS_NOT_INSTALLED
+    backendselect.h
+    dbsettings.h
+    guistartup.h
+    )
 
 #
 # Declare the library
@@ -25,6 +29,7 @@ add_library(
   ${LIBMYTH_HEADERS}
   backendselect.cpp
   dbsettings.cpp
+  guistartup.cpp
   mythcontext.cpp
   )
 

mythtv/libs/libmythui/guistartup.cpp renamed to mythtv/libs/libmyth/guistartup.cpp

@@ -22,9 +22,6 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-
-#include "langsettings.h"
-
 // C++
 #include <chrono>
 
@@ -44,6 +41,7 @@
 #include "libmythbase/mythtranslation.h"
 
 // libmythui
+#include "libmythui/langsettings.h"
 #include "libmythui/mythdialogbox.h"
 #include "libmythui/mythmainwindow.h"
 #include "libmythui/mythscreenstack.h"

mythtv/libs/libmythui/guistartup.h renamed to mythtv/libs/libmyth/guistartup.h

@@ -31,9 +31,6 @@
 #include <QEventLoop>
 #include <QTimer>
 
-// MythDB headers
-#include "mythuiexp.h"
-
 // MythBase headers
 #include "libmythbase/mythchrono.h"
 
@@ -48,7 +45,7 @@ class MythUIStateType;
 class MythUIProgressBar;
 class MythTimer;
 
-class MUI_PUBLIC GUIStartup : public MythScreenType
+class GUIStartup : public MythScreenType
 {
     Q_OBJECT
 

mythtv/libs/libmyth/libmyth.pro

@@ -29,10 +29,12 @@ contains(INCLUDEPATH, /usr/X11R6/include) {
 
 # Input
 HEADERS += backendselect.h dbsettings.h
+HEADERS += guistartup.h
 HEADERS += mythcontext.h
 HEADERS += mythexp.h
 
 SOURCES += backendselect.cpp dbsettings.cpp
+SOURCES += guistartup.cpp
 SOURCES += mythcontext.cpp
 
 INCLUDEPATH += ..

mythtv/libs/libmyth/mythcontext.cpp

@@ -51,7 +51,6 @@
 #include "libmythbase/referencecounter.h"
 #include "libmythbase/remotefile.h"
 #include "libmythbase/signalhandling.h"
-#include "libmythui/guistartup.h"
 #include "libmythui/langsettings.h"
 #include "libmythui/mediamonitor.h"
 #include "libmythui/mythdialogbox.h"
@@ -66,6 +65,7 @@
 
 #include "backendselect.h"
 #include "dbsettings.h"
+#include "guistartup.h"
 
 #define LOC      QString("MythContext: ")
 static const QString sLocation = "MythContext";

mythtv/libs/libmythui/CMakeLists.txt

@@ -75,7 +75,6 @@ set(HEADERS_TO_INSTALL
 
 set(LIBMYTHUI_HEADERS_NOT_INSTALLED
     devices/mythinputdevicehandler.h
-    guistartup.h
     mythdisplay.h
     mythdisplaymode.h
     mythedid.h
@@ -100,7 +99,6 @@ add_library(
   ${HEADERS_TO_INSTALL}
   ${LIBMYTHUI_HEADERS_NOT_INSTALLED}
   devices/mythinputdevicehandler.cpp
-  guistartup.cpp
   langsettings.cpp
   mediamonitor.cpp
   mythcolourspace.cpp

mythtv/libs/libmythui/libmythui.pro

@@ -50,7 +50,6 @@ HEADERS += mythvrr.h
 HEADERS += mythcolourspace.h
 HEADERS += devices/mythinputdevicehandler.h
 HEADERS += mythuiprocedural.h
-HEADERS += guistartup.h
 HEADERS += langsettings.h
 HEADERS += mediamonitor.h
 HEADERS += mythterminal.h
@@ -93,7 +92,6 @@ SOURCES += mythvrr.cpp
 SOURCES += mythcolourspace.cpp
 SOURCES += devices/mythinputdevicehandler.cpp
 SOURCES += mythuiprocedural.cpp
-SOURCES += guistartup.cpp
 SOURCES += langsettings.cpp
 SOURCES += mediamonitor.cpp
 SOURCES += mythterminal.cpp