tidy: Convert HAS_PARAM macros into a static inline functions.

MythTV · Jul 10, 2022 · 6f46a22 · 6f46a22
1 parent 2d642bd
commit 6f46a22
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/mythtv/libs/libmythbase/http/mythhttpservice.h b/mythtv/libs/libmythbase/http/mythhttpservice.h
@@ -33,6 +33,8 @@ class MBASE_PUBLIC MythHTTPService : public QObject
     QString m_name;
     MythHTTPMetaService* m_staticMetaService { nullptr };
     HTTPRequest2 m_request{nullptr};
+    bool HAS_PARAMv2(const QString& p)
+        { return m_request->m_queries.contains(p.toLower()); }
 };
 
 class MBASE_PUBLIC V2HttpRedirectException

diff --git a/mythtv/libs/libmythservicecontracts/service.h b/mythtv/libs/libmythservicecontracts/service.h
@@ -64,6 +64,7 @@ class SERVICE_PUBLIC Service : public QObject
 
     public:
 
+        bool HAS_PARAM(const QString& p) const { return m_parsedParams.contains(p); }
         QList<QString> m_parsedParams; // lowercased
 };
 

diff --git a/mythtv/programs/mythbackend/services/serviceUtil.h b/mythtv/programs/mythbackend/services/serviceUtil.h
@@ -52,8 +52,6 @@
     (bindvar)[QString(":").append(api_param)] = val; \
     }
 
-#define HAS_PARAM(p) m_parsedParams.contains(p)
-
 const QStringList KnownServices = { "Capture", "Channel", "Content", \
                                     "Dvr",     "Guide",   "Music",   \
                                     "Myth",    "Video" };

diff --git a/mythtv/programs/mythbackend/servicesv2/v2serviceUtil.h b/mythtv/programs/mythbackend/servicesv2/v2serviceUtil.h
@@ -25,8 +25,6 @@
     (bindvar)[QString(":").append(api_param)] = val; \
     }
 
-#define HAS_PARAMv2(p) m_request->m_queries.contains(QString(p).toLower())
-
 const QStringList KnownServicesV2 = { "Capture", "Channel", "Content", \
                                       "Dvr",     "Guide",   "Music",   \
                                       "Myth",    "Video",   "Config" };