Update the rest of the Common Metadata variable names.

Should be more in line with project practice (though I still don't know what the k prefix means... Konstant?
MythTV · Jul 14, 2011 · 402affc · 402affc
1 parent 533f514
commit 402affc
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 106 deletions.
diff --git a/mythplugins/mythgame/mythgame/gameui.cpp b/mythplugins/mythgame/mythgame/gameui.cpp
@@ -880,8 +880,8 @@ void GameUI::gameSearch(MythGenericTree *node,
         return;
 
     MetadataLookup *lookup = new MetadataLookup();
-    lookup->SetStep(SEARCH);
-    lookup->SetType(GAME);
+    lookup->SetStep(kLookupSearch);
+    lookup->SetType(kMetadataGame);
     lookup->SetData(qVariantFromValue(node));
 
     if (automode)
@@ -923,7 +923,7 @@ void GameUI::OnGameSearchListSelection(MetadataLookup *lookup)
     if (!lookup)
         return;
 
-    lookup->SetStep(GETDATA);
+    lookup->SetStep(kLookupData);
     m_query->prependLookup(lookup);
 }
 
@@ -1023,7 +1023,7 @@ void GameUI::StartGameImageSet(MythGenericTree *node, QStringList coverart,
     lookup->SetTitle(metadata->Gamename());
     lookup->SetSystem(metadata->System());
     lookup->SetInetref(metadata->Inetref());
-    lookup->SetType(GAME);
+    lookup->SetType(kMetadataGame);
     lookup->SetDownloads(map);
     lookup->SetData(qVariantFromValue(node));
 

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.25.20110713-3"
+#define MYTH_BINARY_VERSION "0.25.20110713-4"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *

diff --git a/mythtv/libs/libmythmetadata/metadatacommon.cpp b/mythtv/libs/libmythmetadata/metadatacommon.cpp
@@ -7,10 +7,10 @@
 
 // null constructor
 MetadataLookup::MetadataLookup(void) :
-    m_type(VID),
+    m_type(kMetadataVideo),
     m_subtype(kUnknownVideo),
     m_data(),
-    m_step(SEARCH),
+    m_step(kLookupSearch),
     m_automatic(false),
     m_handleimages(false),
     m_allowoverwrites(false),
@@ -674,7 +674,7 @@ MetadataLookup* ParseMetadataMovieNFO(const QDomElement& item,
             info.name = actor.firstChildElement("name").text();
             info.role = actor.firstChildElement("role").text();
             info.thumbnail = actor.firstChildElement("thumb").text();
-            people.insert(ACTOR, info);
+            people.insert(kPersonActor, info);
             actor = actor.nextSiblingElement("actor");
         }
     }
@@ -684,7 +684,7 @@ MetadataLookup* ParseMetadataMovieNFO(const QDomElement& item,
     {
         PersonInfo info;
         info.name = director;
-        people.insert(DIRECTOR, info);
+        people.insert(kPersonDirector, info);
     }
 
     return new MetadataLookup(lookup->GetType(), lookup->GetSubtype(),
@@ -711,31 +711,31 @@ PeopleMap ParsePeople(QDomElement people)
                 QString jobstring = person.attribute("job");
                 PeopleType type;
                 if (jobstring.toLower() == "actor")
-                    type = ACTOR;
+                    type = kPersonActor;
                 else if (jobstring.toLower() == "author")
-                    type = AUTHOR;
+                    type = kPersonAuthor;
                 else if (jobstring.toLower() == "producer")
-                    type = PRODUCER;
+                    type = kPersonProducer;
                 else if (jobstring.toLower() == "executive producer")
-                    type = EXECPRODUCER;
+                    type = kPersonExecProducer;
                 else if (jobstring.toLower() == "director")
-                    type = DIRECTOR;
+                    type = kPersonDirector;
                 else if (jobstring.toLower() == "cinematographer")
-                    type = CINEMATOGRAPHER;
+                    type = kPersonCinematographer;
                 else if (jobstring.toLower() == "composer")
-                    type = COMPOSER;
+                    type = kPersonComposer;
                 else if (jobstring.toLower() == "editor")
-                    type = EDITOR;
+                    type = kPersonEditor;
                 else if (jobstring.toLower() == "casting")
-                    type = CASTINGDIRECTOR;
+                    type = kPersonCastingDirector;
                 else if (jobstring.toLower() == "artist")
-                    type = ARTIST;
+                    type = kPersonArtist;
                 else if (jobstring.toLower() == "album artist")
-                    type = ALBUMARTIST;
+                    type = kPersonAlbumArtist;
                 else if (jobstring.toLower() == "guest star")
-                    type = GUESTSTAR;
+                    type = kPersonGuestStar;
                 else
-                    type = ACTOR;
+                    type = kPersonActor;
 
                 PersonInfo info;
                 if (person.hasAttribute("name"))
@@ -955,7 +955,7 @@ MetaGrabberScript* ParseGrabberVersion(const QDomElement& item)
 {
     QString name, author, thumbnail, command, description, typestring;
     float version = 0;
-    GrabberType type = GRAB_MOVIE;
+    GrabberType type = kGrabberMovie;
 
     name = item.firstChildElement("name").text();
     author = item.firstChildElement("author").text();
@@ -968,13 +968,13 @@ MetaGrabberScript* ParseGrabberVersion(const QDomElement& item)
     if (!typestring.isEmpty())
     {
         if (typestring.toLower() == "movie")
-            type = GRAB_MOVIE;
+            type = kGrabberMovie;
         else if (typestring.toLower() == "television")
-            type = GRAB_TELEVISION;
+            type = kGrabberTelevision;
         else if (typestring.toLower() == "game")
-            type = GRAB_GAME;
+            type = kGrabberGame;
         else if (typestring.toLower() == "music")
-            type = GRAB_MUSIC;
+            type = kGrabberMusic;
     }
 
     return new MetaGrabberScript(name, author, thumbnail, command,

diff --git a/mythtv/libs/libmythmetadata/metadatacommon.h b/mythtv/libs/libmythmetadata/metadatacommon.h
@@ -14,8 +14,8 @@
 #include "mythmetaexp.h"
 
 enum LookupStep {
-    SEARCH = 0,
-    GETDATA = 1
+    kLookupSearch = 0,
+    kLookupData = 1
 };
 
 enum VideoArtworkType {
@@ -49,10 +49,10 @@ struct ArtworkInfo
 Q_DECLARE_METATYPE(ArtworkInfo)
 
 enum MetadataType {
-    VID = 0,
-    RECDNG = 1,
-    MUSIC = 2,
-    GAME = 3
+    kMetadataVideo = 0,
+    kMetadataRecording = 1,
+    kMetadataMusic = 2,
+    kMetadataGame = 3
 };
 
 enum LookupType {
@@ -65,18 +65,18 @@ enum LookupType {
 };
 
 enum PeopleType {
-    ACTOR = 0,
-    AUTHOR = 1,
-    DIRECTOR = 2,
-    PRODUCER = 3,
-    EXECPRODUCER = 4,
-    CINEMATOGRAPHER = 5,
-    COMPOSER = 6,
-    EDITOR = 7,
-    CASTINGDIRECTOR = 8,
-    ARTIST = 9,
-    ALBUMARTIST = 10,
-    GUESTSTAR = 11
+    kPersonActor = 0,
+    kPersonAuthor = 1,
+    kPersonDirector = 2,
+    kPersonProducer = 3,
+    kPersonExecProducer = 4,
+    kPersonCinematographer = 5,
+    kPersonComposer = 6,
+    kPersonEditor = 7,
+    kPersonCastingDirector = 8,
+    kPersonArtist = 9,
+    kPersonAlbumArtist = 10,
+    kPersonGuestStar = 11
 };
 
 typedef QList< ArtworkInfo > ArtworkList;
@@ -449,10 +449,10 @@ META_PUBLIC QString nearestName(const QString& actual,
 META_PUBLIC QDateTime RFC822TimeToQDateTime(const QString& t);
 
 enum GrabberType {
-    GRAB_MOVIE = 0,
-    GRAB_TELEVISION = 1,
-    GRAB_MUSIC = 2,
-    GRAB_GAME = 3
+    kGrabberMovie = 0,
+    kGrabberTelevision = 1,
+    kGrabberMusic = 2,
+    kGrabberGame = 3
 };
 
 class META_PUBLIC MetaGrabberScript : public QObject