Convert includes to specify directory. (mythmetadatalookup)

MythTV · May 3, 2022 · e5c91c3 · e5c91c3
1 parent c58f214
commit e5c91c3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/mythtv/programs/mythmetadatalookup/lookup.cpp b/mythtv/programs/mythmetadatalookup/lookup.cpp
@@ -1,18 +1,20 @@
-
-#include "lookup.h"
-
+// C++
 #include <vector>
 
+// Qt
 #include <QList>
 
-#include "programinfo.h"
-#include "recordingrule.h"
-#include "mythlogging.h"
-#include "jobqueue.h"
-#include "remoteutil.h"
-#include "mythcorecontext.h"
+// MythTV
+#include "libmyth/programinfo.h"
+#include "libmyth/remoteutil.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythtv/jobqueue.h"
+#include "libmythtv/metadataimagehelper.h"
+#include "libmythtv/recordingrule.h"
 
-#include "metadataimagehelper.h"
+// MythMetadataLookup
+#include "lookup.h"
 
 LookerUpper::LookerUpper()
 {

diff --git a/mythtv/programs/mythmetadatalookup/lookup.h b/mythtv/programs/mythmetadatalookup/lookup.h
@@ -4,8 +4,8 @@
 #include <QObject>
 #include <QList>
 
-#include "programinfo.h"
-#include "metadatafactory.h"
+#include "libmyth/programinfo.h"
+#include "libmythmetadata/metadatafactory.h"
 
 class LookerUpper : public QObject
 {

diff --git a/mythtv/programs/mythmetadatalookup/mythmetadatalookup.cpp b/mythtv/programs/mythmetadatalookup/mythmetadatalookup.cpp
@@ -13,21 +13,22 @@
 #include <QProcessEnvironment>
 #endif
 
-// libmyth headers
-#include "exitcodes.h"
-#include "mythcontext.h"
-#include "mythdb.h"
-#include "mythversion.h"
-#include "mythmiscutil.h"
-#include "jobqueue.h"
-#include "mythtranslation.h"
-#include "mythconfig.h"
-#include "mythmetadatalookup_commandlineparser.h"
-#include "mythlogging.h"
-#include "signalhandling.h"
-#include "cleanupguard.h"
-
+// MythTV
+#include "libmyth/mythcontext.h"
+#include "libmythbase/cleanupguard.h"
+#include "libmythbase/exitcodes.h"
+#include "libmythbase/mythconfig.h"
+#include "libmythbase/mythdb.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythmiscutil.h"
+#include "libmythbase/mythtranslation.h"
+#include "libmythbase/mythversion.h"
+#include "libmythbase/signalhandling.h"
+#include "libmythtv/jobqueue.h"
+
+// MythMetadataLookup
 #include "lookup.h"
+#include "mythmetadatalookup_commandlineparser.h"
 
 namespace
 {

diff --git a/mythtv/programs/mythmetadatalookup/mythmetadatalookup_commandlineparser.cpp b/mythtv/programs/mythmetadatalookup/mythmetadatalookup_commandlineparser.cpp
@@ -1,7 +1,7 @@
-#include <QString>
 #include <QList>
+#include <QString>
 
-#include "mythcorecontext.h"
+#include "libmythbase/mythcorecontext.h"
 #include "mythmetadatalookup_commandlineparser.h"
 
 MythMetadataLookupCommandLineParser::MythMetadataLookupCommandLineParser() :

diff --git a/mythtv/programs/mythmetadatalookup/mythmetadatalookup_commandlineparser.h b/mythtv/programs/mythmetadatalookup/mythmetadatalookup_commandlineparser.h
@@ -1,5 +1,5 @@
 
-#include "mythcommandlineparser.h"
+#include "libmythbase/mythcommandlineparser.h"
 
 class MythMetadataLookupCommandLineParser : public MythCommandLineParser
 {