libmyth: prepare rss* and net* for moving to libmythbase

replacing mythcontext.h with mythcorecontext.h
MythTV · Nov 24, 2022 · 9186a60 · 9186a60
1 parent fe880b0
commit 9186a60
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/mythtv/libs/libmyth/mythrssmanager.cpp b/mythtv/libs/libmyth/mythrssmanager.cpp
@@ -1,15 +1,16 @@
+#include "mythrssmanager.h"
+
 // qt
 #include <QDir>
 #include <QFile>
 #include <QString>
 
+#include "libmythbase/mythcorecontext.h" // for GetDurSetting TODO: excise database from MythCoreContext
 #include "libmythbase/mythdate.h"
 #include "libmythbase/mythdirs.h"
 #include "libmythbase/mythlogging.h"
 #include "libmythbase/mythsorthelper.h"
 
-#include "mythcontext.h"
-#include "mythrssmanager.h"
 #include "netutils.h"
 #include "rssparse.h"
 

diff --git a/mythtv/libs/libmyth/netgrabbermanager.cpp b/mythtv/libs/libmyth/netgrabbermanager.cpp
@@ -1,3 +1,5 @@
+#include "netgrabbermanager.h"
+
 // qt
 #include <QCoreApplication>
 #include <QDir>
@@ -6,13 +8,12 @@
 #include <utility>
 
 #include "libmythbase/exitcodes.h"
+#include "libmythbase/mythcorecontext.h" // for GetDurSetting TODO: excise database from MythCoreContext
 #include "libmythbase/mythdate.h"
 #include "libmythbase/mythdirs.h"
 #include "libmythbase/mythlogging.h"
 #include "libmythbase/mythsystemlegacy.h"
 
-#include "mythcontext.h"
-#include "netgrabbermanager.h"
 #include "netutils.h"
 
 #define LOC      QString("NetContent: ")

diff --git a/mythtv/libs/libmyth/netutils.cpp b/mythtv/libs/libmyth/netutils.cpp
@@ -1,13 +1,13 @@
+#include "netutils.h"
+
 #include <QDir>
 #include <QFileInfo>
 
+#include "libmythbase/mythcorecontext.h" // for GetHostName
 #include "libmythbase/mythdate.h"
 #include "libmythbase/mythdb.h"
 #include "libmythbase/mythdirs.h"
 
-#include "mythcontext.h"
-#include "netutils.h"
-
 bool findTreeGrabberInDB(const QString& commandline,
                          ArticleType type)
 {

diff --git a/mythtv/libs/libmyth/rssparse.cpp b/mythtv/libs/libmyth/rssparse.cpp
@@ -1,3 +1,5 @@
+#include "rssparse.h"
+
 #include <QFile>
 #include <QDataStream>
 #include <QDomDocument>
@@ -9,12 +11,10 @@
 
 #include "libmythbase/mythdate.h"
 #include "libmythbase/mythdirs.h"
+#include "libmythbase/mythlogging.h"
 #include "libmythbase/mythsorthelper.h"
 #include "libmythbase/stringutil.h"
 
-#include "mythcontext.h"
-#include "rssparse.h"
-
 #if QT_VERSION < QT_VERSION_CHECK(5,15,2)
 #define capturedView capturedRef
 #endif