move programinfo* and remoteutil.* from libmyth to libmythbase (needs…

… distclean)

Coalesce the program* files in libmythbase.

mythplugins/mytharchive/mytharchive/archiveutil.cpp

@@ -12,11 +12,11 @@
 
 // myth
 #include <libmyth/mythcontext.h>
-#include <libmyth/programinfo.h>
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
+#include <libmythbase/programinfo.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
 

mythplugins/mytharchive/mytharchive/exportnative.cpp

@@ -11,11 +11,11 @@
 
 // myth
 #include <libmyth/mythcontext.h>
-#include <libmyth/programinfo.h>
-#include <libmyth/remoteutil.h>
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythsystemlegacy.h>
+#include <libmythbase/programinfo.h>
+#include <libmythbase/remoteutil.h>
 #include <libmythbase/stringutil.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>

mythplugins/mytharchive/mytharchive/recordingselector.cpp

@@ -11,13 +11,13 @@
 
 // mythtv
 #include <libmyth/mythcontext.h>
-#include <libmyth/programinfo.h>
-#include <libmyth/remoteutil.h>
 #include <libmythbase/mthread.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythbase/mythtimer.h>
+#include <libmythbase/programinfo.h>
+#include <libmythbase/remoteutil.h>
 #include <libmythbase/stringutil.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>

mythplugins/mytharchive/mytharchive/thumbfinder.cpp

@@ -41,11 +41,11 @@
 // myth
 #include <mythconfig.h>
 #include <libmyth/mythcontext.h>
-#include <libmyth/programinfo.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythmiscutil.h> // for MythFile::copy
+#include <libmythbase/programinfo.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythimage.h>
 #include <libmythui/mythmainwindow.h>

mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp

@@ -51,7 +51,6 @@
 // MythTV headers
 #include <mythconfig.h>
 #include <libmyth/mythcontext.h>
-#include <libmyth/programinfo.h>
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythcommandlineparser.h>
 #include <libmythbase/mythcoreutil.h>
@@ -63,6 +62,7 @@
 #include <libmythbase/mythpluginexport.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythbase/mythversion.h>
+#include <libmythbase/programinfo.h>
 #include <libmythtv/mythavutil.h>
 
 extern "C" {

mythplugins/mythgame/mythgame/gamescan.cpp

@@ -10,9 +10,9 @@
 
 // MythTV
 #include <libmyth/mythcontext.h>
-#include <libmyth/remoteutil.h>
 #include <libmythbase/mythevent.h>
 #include <libmythbase/mythlogging.h>
+#include <libmythbase/remoteutil.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythprogressdialog.h>

mythplugins/mythnetvision/mythfillnetvision/mythfillnetvision.cpp

@@ -14,7 +14,6 @@
 #include <libmyth/mythrssmanager.h>
 #include <libmyth/netgrabbermanager.h>
 #include <libmyth/netutils.h>
-#include <libmyth/remoteutil.h>
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythcommandlineparser.h>
 #include <libmythbase/mythdb.h>
@@ -23,6 +22,7 @@
 #include <libmythbase/mythpluginexport.h>
 #include <libmythbase/mythtranslation.h>
 #include <libmythbase/mythversion.h>
+#include <libmythbase/remoteutil.h>
 
 GrabberDownloadThread *gdt = nullptr;
 RSSManager *rssMan = nullptr;

mythtv/libs/libmyth/libmyth.pro

@@ -48,9 +48,7 @@ HEADERS += standardsettings.h
 HEADERS += visual.h
 HEADERS += storagegroupeditor.h
 HEADERS += mythterminal.h
-HEADERS += remoteutil.h
 HEADERS += rawsettingseditor.h
-HEADERS += programinfo.h          programinfoupdater.h
 HEADERS += rssparse.h
 HEADERS += guistartup.h
 
@@ -73,9 +71,7 @@ SOURCES +=
 SOURCES += standardsettings.cpp
 SOURCES += storagegroupeditor.cpp
 SOURCES += mythterminal.cpp
-SOURCES += remoteutil.cpp
 SOURCES += rawsettingseditor.cpp
-SOURCES += programinfo.cpp        programinfoupdater.cpp
 SOURCES += rssparse.cpp
 SOURCES += guistartup.cpp
 
@@ -121,8 +117,7 @@ inc.files += inetcomms.h schemawizard.h
 inc.files += mythaverror.h mythmediamonitor.h
 inc.files += visual.h output.h langsettings.h
 inc.files += mythexp.h storagegroupeditor.h
-inc.files += mythterminal.h       remoteutil.h
-inc.files += programinfo.h
+inc.files += mythterminal.h
 inc.files += rssparse.h
 inc.files += standardsettings.h
 inc.files += mythrssmanager.h     netutils.h

mythtv/libs/libmyth/rawsettingseditor.cpp

@@ -1,14 +1,14 @@
 
 #include "libmythbase/mythcorecontext.h"
 #include "libmythbase/mythlogging.h"
+#include "libmythbase/remoteutil.h"
 #include "libmythui/mythuibutton.h"
 #include "libmythui/mythuibuttonlist.h"
 #include "libmythui/mythuishape.h"
 #include "libmythui/mythuitext.h"
 #include "libmythui/mythuitextedit.h"
 
 #include "rawsettingseditor.h"
-#include "remoteutil.h"
 
 /**
   * \brief Raw Settings Editor constructor

mythtv/libs/libmythbase/libmythbase.pro

@@ -42,10 +42,13 @@ HEADERS += cleanupguard.h portchecker.h
 HEADERS += mythsorthelper.h mythdbcheck.h
 HEADERS += mythpower.h
 HEADERS += configuration.h
+HEADERS += programinfo.h
+HEADERS += programinfoupdater.h
 HEADERS += programtypes.h
 HEADERS += programtypeflags.h
 HEADERS += recordingstatus.h
 HEADERS += recordingtypes.h
+HEADERS += remoteutil.h
 HEADERS += unziputil.h
 HEADERS += sizetliteral.h
 HEADERS += qtuplift.h
@@ -76,9 +79,12 @@ SOURCES += mythsorthelper.cpp dbcheckcommon.cpp
 SOURCES += mythpower.cpp
 SOURCES += configuration.cpp
 SOURCES += mythversion.cpp
+SOURCES += programinfo.cpp
+SOURCES += programinfoupdater.cpp
 SOURCES += programtypes.cpp
 SOURCES += recordingstatus.cpp
 SOURCES += recordingtypes.cpp
+SOURCES += remoteutil.cpp
 SOURCES += unziputil.cpp
 
 HEADERS += http/mythhttpcommon.h
@@ -188,10 +194,12 @@ inc.files += remotefile.h mythsystemlegacy.h mythtypes.h
 inc.files += threadedfilewriter.h mythsingledownload.h mythsession.h
 inc.files += mythsorthelper.h mythdbcheck.h
 inc.files += mythrandom.h
+inc.files += programinfo.h
 inc.files += programtypes.h
 inc.files += programtypeflags.h
 inc.files += recordingstatus.h
 inc.files += recordingtypes.h
+inc.files += remoteutil.h
 inc.files += stringutil.h
 inc.files += unziputil.h
 inc.files += sizetliteral.h

mythtv/libs/libmyth/programinfo.h → mythtv/libs/libmythbase/programinfo.h

@@ -12,8 +12,8 @@
 #include <QDateTime>
 
 // MythTV headers
-#include "libmyth/mythexp.h"
 #include "libmythbase/autodeletedeque.h"
+#include "libmythbase/mythbaseexp.h"
 #include "libmythbase/mythdate.h"
 #include "libmythbase/mythdbcon.h"
 #include "libmythbase/mythtypes.h"
@@ -64,7 +64,7 @@ class MSqlQuery;
 class ProgramInfoUpdater;
 class PMapDBReplacement;
 
-class MPUBLIC ProgramInfo
+class MBASE_PUBLIC ProgramInfo
 {
     friend int pginfo_init_statics(void);
     friend class TestRecordingExtender;
@@ -858,21 +858,21 @@ class MPUBLIC ProgramInfo
     QDateTime       m_previewUpdate;
 };
 
-MPUBLIC bool LoadFromProgram(
+MBASE_PUBLIC bool LoadFromProgram(
     ProgramList        &destination,
     const QString      &where,
     const QString      &groupBy,
     const QString      &orderBy,
     const MSqlBindings &bindings,
     const ProgramList  &schedList);
 
-MPUBLIC bool LoadFromProgram(
+MBASE_PUBLIC bool LoadFromProgram(
     ProgramList        &destination,
     const QString      &sql,
     const MSqlBindings &bindings,
     const ProgramList  &schedList);
 
-MPUBLIC bool LoadFromProgram(
+MBASE_PUBLIC bool LoadFromProgram(
     ProgramList        &destination,
     const QString      &sql,
     const MSqlBindings &bindings,
@@ -881,23 +881,23 @@ MPUBLIC bool LoadFromProgram(
     uint               limit,
     uint               &count);
 
-MPUBLIC ProgramInfo*  LoadProgramFromProgram(
+MBASE_PUBLIC ProgramInfo*  LoadProgramFromProgram(
         uint chanid, const QDateTime &starttime);
 
-MPUBLIC bool LoadFromOldRecorded(
+MBASE_PUBLIC bool LoadFromOldRecorded(
     ProgramList        &destination,
     const QString      &sql,
     const MSqlBindings &bindings);
 
-MPUBLIC bool LoadFromOldRecorded(
+MBASE_PUBLIC bool LoadFromOldRecorded(
     ProgramList        &destination,
     const QString      &sql,
     const MSqlBindings &bindings,
     uint               start,
     uint               limit,
     uint               &count);
 
-MPUBLIC bool LoadFromRecorded(
+MBASE_PUBLIC bool LoadFromRecorded(
     ProgramList        &destination,
     bool                possiblyInProgressRecordingsOnly,
     const QMap<QString,uint32_t> &inUseMap,
@@ -956,12 +956,12 @@ bool LoadFromScheduler(AutoDeleteDeque<T> &destination)
 
 // Moved from programdetails.cpp/h, used by MythWelcome/MythShutdown
 // could be factored out
-MPUBLIC bool GetNextRecordingList(QDateTime &nextRecordingStart,
+MBASE_PUBLIC bool GetNextRecordingList(QDateTime &nextRecordingStart,
                                   bool *hasConflicts = nullptr,
                                   std::vector<ProgramInfo> *list = nullptr);
 
 class QMutex;
-class MPUBLIC PMapDBReplacement
+class MBASE_PUBLIC PMapDBReplacement
 {
   public:
     PMapDBReplacement();
@@ -970,8 +970,8 @@ class MPUBLIC PMapDBReplacement
     QMap<MarkTypes,frm_pos_map_t> map;
 };
 
-MPUBLIC QString myth_category_type_to_string(ProgramInfo::CategoryType category_type);
-MPUBLIC ProgramInfo::CategoryType string_to_myth_category_type(const QString &type);
+MBASE_PUBLIC QString myth_category_type_to_string(ProgramInfo::CategoryType category_type);
+MBASE_PUBLIC ProgramInfo::CategoryType string_to_myth_category_type(const QString &type);
 
 Q_DECLARE_METATYPE(ProgramInfo*)
 Q_DECLARE_METATYPE(ProgramInfo::CategoryType)