From 1c2a6e352d2f678484faaf440b43d7cd5efc057a Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv@love2code.net>
Date: Wed, 27 Feb 2019 19:28:47 -0800
Subject: [PATCH] Use c++11 initialization.  Use m_ for class member names.
 (libmythtv 2/7)

Convert classes to use use the new c++11 brace initialization style.
Also update class member names (when needed) so that all member names
start with 'm_'.  This makes it easy to distinguish class members.
---
 mythtv/libs/libmythtv/eitfixup.cpp            | 1558 ++++++++---------
 mythtv/libs/libmythtv/eithelper.cpp           |   10 +-
 mythtv/libs/libmythtv/playgroup.h             |   14 +-
 mythtv/libs/libmythtv/programdata.cpp         |  724 ++++----
 mythtv/libs/libmythtv/programdata.h           |  154 +-
 .../test/test_eitfixups/test_eitfixups.cpp    |  228 +--
 .../programs/mythfilldatabase/xmltvparser.cpp |  176 +-
 7 files changed, 1418 insertions(+), 1446 deletions(-)

diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp
index 7807484ae56..4447986ebdd 100644
--- a/mythtv/libs/libmythtv/eitfixup.cpp
+++ b/mythtv/libs/libmythtv/eitfixup.cpp
@@ -246,137 +246,137 @@ EITFixUp::EITFixUp()
 
 void EITFixUp::Fix(DBEventEIT &event) const
 {
-    if (event.fixup)
+    if (event.m_fixup)
     {
-        if (event.subtitle == event.title)
-            event.subtitle = QString("");
+        if (event.m_subtitle == event.m_title)
+            event.m_subtitle = QString("");
 
-        if (event.description.isEmpty() && !event.subtitle.isEmpty())
+        if (event.m_description.isEmpty() && !event.m_subtitle.isEmpty())
         {
-            event.description = event.subtitle;
-            event.subtitle = QString("");
+            event.m_description = event.m_subtitle;
+            event.m_subtitle = QString("");
         }
     }
 
-    if (kFixHTML & event.fixup)
+    if (kFixHTML & event.m_fixup)
         FixStripHTML(event);
 
-    if (kFixHDTV & event.fixup)
-        event.videoProps |= VID_HDTV;
+    if (kFixHDTV & event.m_fixup)
+        event.m_videoProps |= VID_HDTV;
 
-    if (kFixBell & event.fixup)
+    if (kFixBell & event.m_fixup)
         FixBellExpressVu(event);
 
-    if (kFixDish & event.fixup)
+    if (kFixDish & event.m_fixup)
         FixBellExpressVu(event);
 
-    if (kFixUK & event.fixup)
+    if (kFixUK & event.m_fixup)
         FixUK(event);
 
-    if (kFixPBS & event.fixup)
+    if (kFixPBS & event.m_fixup)
         FixPBS(event);
 
-    if (kFixComHem & event.fixup)
-        FixComHem(event, kFixSubtitle & event.fixup);
+    if (kFixComHem & event.m_fixup)
+        FixComHem(event, kFixSubtitle & event.m_fixup);
 
-    if (kFixAUStar & event.fixup)
+    if (kFixAUStar & event.m_fixup)
         FixAUStar(event);
 
-    if (kFixAUDescription & event.fixup)
+    if (kFixAUDescription & event.m_fixup)
         FixAUDescription(event);
 
-    if (kFixAUFreeview & event.fixup)
+    if (kFixAUFreeview & event.m_fixup)
         FixAUFreeview(event);
 
-    if (kFixAUNine & event.fixup)
+    if (kFixAUNine & event.m_fixup)
         FixAUNine(event);
 
-    if (kFixAUSeven & event.fixup)
+    if (kFixAUSeven & event.m_fixup)
         FixAUSeven(event);
 
-    if (kFixMCA & event.fixup)
+    if (kFixMCA & event.m_fixup)
         FixMCA(event);
 
-    if (kFixRTL & event.fixup)
+    if (kFixRTL & event.m_fixup)
         FixRTL(event);
 
-    if (kFixP7S1 & event.fixup)
+    if (kFixP7S1 & event.m_fixup)
         FixPRO7(event);
 
-    if (kFixATV & event.fixup)
+    if (kFixATV & event.m_fixup)
         FixATV(event);
 
-    if (kFixDisneyChannel & event.fixup)
+    if (kFixDisneyChannel & event.m_fixup)
         FixDisneyChannel(event);
 
-    if (kFixFI & event.fixup)
+    if (kFixFI & event.m_fixup)
         FixFI(event);
 
-    if (kFixPremiere & event.fixup)
+    if (kFixPremiere & event.m_fixup)
         FixPremiere(event);
 
-    if (kFixNL & event.fixup)
+    if (kFixNL & event.m_fixup)
         FixNL(event);
 
-    if (kFixNO & event.fixup)
+    if (kFixNO & event.m_fixup)
         FixNO(event);
 
-    if (kFixNRK_DVBT & event.fixup)
+    if (kFixNRK_DVBT & event.m_fixup)
         FixNRK_DVBT(event);
 
-    if (kFixDK & event.fixup)
+    if (kFixDK & event.m_fixup)
         FixDK(event);
 
-    if (kFixCategory & event.fixup)
+    if (kFixCategory & event.m_fixup)
         FixCategory(event);
 
-    if (kFixGreekSubtitle & event.fixup)
+    if (kFixGreekSubtitle & event.m_fixup)
         FixGreekSubtitle(event);
 
-    if (kFixGreekEIT & event.fixup)
+    if (kFixGreekEIT & event.m_fixup)
         FixGreekEIT(event);
 
-    if (kFixGreekCategories & event.fixup)
+    if (kFixGreekCategories & event.m_fixup)
         FixGreekCategories(event);
 
-    if (kFixUnitymedia & event.fixup)
+    if (kFixUnitymedia & event.m_fixup)
         FixUnitymedia(event);
 
-    if (event.fixup)
+    if (event.m_fixup)
     {
-        if (!event.title.isEmpty())
+        if (!event.m_title.isEmpty())
         {
-            event.title = event.title.replace(QChar('\0'), "");
-            event.title = event.title.trimmed();
+            event.m_title = event.m_title.replace(QChar('\0'), "");
+            event.m_title = event.m_title.trimmed();
         }
 
-        if (!event.subtitle.isEmpty())
+        if (!event.m_subtitle.isEmpty())
         {
-            event.subtitle = event.subtitle.replace(QChar('\0'), "");
-            event.subtitle = event.subtitle.trimmed();
+            event.m_subtitle = event.m_subtitle.replace(QChar('\0'), "");
+            event.m_subtitle = event.m_subtitle.trimmed();
         }
 
-        if (!event.description.isEmpty())
+        if (!event.m_description.isEmpty())
         {
-            event.description = event.description.replace(QChar('\0'), "");
-            event.description = event.description.trimmed();
+            event.m_description = event.m_description.replace(QChar('\0'), "");
+            event.m_description = event.m_description.trimmed();
         }
     }
 
-    if (kFixGenericDVB & event.fixup)
+    if (kFixGenericDVB & event.m_fixup)
     {
-        event.programId = AddDVBEITAuthority(event.chanid, event.programId);
-        event.seriesId  = AddDVBEITAuthority(event.chanid, event.seriesId);
+        event.m_programId = AddDVBEITAuthority(event.m_chanid, event.m_programId);
+        event.m_seriesId  = AddDVBEITAuthority(event.m_chanid, event.m_seriesId);
     }
 
     // Are any items left unhandled? report them to allow fixups improvements
-    if (!event.items.empty())
+    if (!event.m_items.empty())
     {
         QMap<QString,QString>::iterator i;
-        for (i = event.items.begin(); i != event.items.end(); ++i)
+        for (i = event.m_items.begin(); i != event.m_items.end(); ++i)
         {
             LOG(VB_EIT, LOG_DEBUG, QString("Unhandled item in EIT for"
-                " channel id \"%1\", \"%2\": %3").arg(event.chanid)
+                " channel id \"%1\", \"%2\": %3").arg(event.m_chanid)
                 .arg(i.key()).arg(i.value()));
         }
     }
@@ -430,20 +430,20 @@ void EITFixUp::FixBellExpressVu(DBEventEIT &event) const
 
     // A 0x0D character is present between the content
     // and the subtitle if its present
-    int position = event.description.indexOf(0x0D);
+    int position = event.m_description.indexOf(0x0D);
 
     if (position != -1)
     {
         // Subtitle present in the title, so get
         // it and adjust the description
-        event.subtitle = event.description.left(position);
-        event.description = event.description.right(
-            event.description.length() - position - 2);
+        event.m_subtitle = event.m_description.left(position);
+        event.m_description = event.m_description.right(
+            event.m_description.length() - position - 2);
     }
 
     // Take out the content description which is
     // always next with a period after it
-    position = event.description.indexOf(".");
+    position = event.m_description.indexOf(".");
     // Make sure they didn't leave it out and
     // you come up with an odd category
     if (position < 10)
@@ -451,74 +451,74 @@ void EITFixUp::FixBellExpressVu(DBEventEIT &event) const
     }
     else
     {
-        event.category = "Unknown";
+        event.m_category = "Unknown";
     }
 
     // If the content descriptor didn't come up with anything, try parsing the category
     // out of the description.
-    if (event.category.isEmpty())
+    if (event.m_category.isEmpty())
     {
         // Take out the content description which is
         // always next with a period after it
-        position = event.description.indexOf(".");
-        if ((position + 1) < event.description.length())
-            position = event.description.indexOf(". ");
+        position = event.m_description.indexOf(".");
+        if ((position + 1) < event.m_description.length())
+            position = event.m_description.indexOf(". ");
         // Make sure they didn't leave it out and
         // you come up with an odd category
         if ((position > -1) && position < 20)
         {
-            const QString stmp       = event.description;
-            event.description        = stmp.right(stmp.length() - position - 2);
-            event.category = stmp.left(position);
+            const QString stmp  = event.m_description;
+            event.m_description = stmp.right(stmp.length() - position - 2);
+            event.m_category    = stmp.left(position);
 
-            int position_p = event.category.indexOf("(");
+            int position_p = event.m_category.indexOf("(");
             if (position_p == -1)
-                event.description = stmp.right(stmp.length() - position - 2);
+                event.m_description = stmp.right(stmp.length() - position - 2);
             else
-                event.category    = "Unknown";
+                event.m_category    = "Unknown";
         }
         else
         {
-            event.category = "Unknown";
+            event.m_category = "Unknown";
         }
 
         // When a channel is off air the category is "-"
         // so leave the category as blank
-        if (event.category == "-")
-            event.category = "OffAir";
+        if (event.m_category == "-")
+            event.m_category = "OffAir";
 
-        if (event.category.length() > 20)
-            event.category = "Unknown";
+        if (event.m_category.length() > 20)
+            event.m_category = "Unknown";
     }
-    else if (event.categoryType)
+    else if (event.m_categoryType)
     {
-        QString theme = dish_theme_type_to_string(event.categoryType);
-        event.description = event.description.replace(theme, "");
-        if (event.description.startsWith("."))
-            event.description = event.description.right(event.description.length() - 1);
-        if (event.description.startsWith(" "))
-            event.description = event.description.right(event.description.length() - 1);
+        QString theme = dish_theme_type_to_string(event.m_categoryType);
+        event.m_description = event.m_description.replace(theme, "");
+        if (event.m_description.startsWith("."))
+            event.m_description = event.m_description.right(event.m_description.length() - 1);
+        if (event.m_description.startsWith(" "))
+            event.m_description = event.m_description.right(event.m_description.length() - 1);
     }
 
     // See if a year is present as (xxxx)
-    position = event.description.indexOf(m_bellYear);
-    if (position != -1 && !event.category.isEmpty())
+    position = event.m_description.indexOf(m_bellYear);
+    if (position != -1 && !event.m_category.isEmpty())
     {
         tmp = "";
         // Parse out the year
         bool ok;
-        uint y = event.description.mid(position + 1, 4).toUInt(&ok);
+        uint y = event.m_description.mid(position + 1, 4).toUInt(&ok);
         if (ok)
         {
-            event.originalairdate = QDate(y, 1, 1);
-            event.airdate = y;
-            event.previouslyshown = true;
+            event.m_originalairdate = QDate(y, 1, 1);
+            event.m_airdate = y;
+            event.m_previouslyshown = true;
         }
 
         // Get the actors if they exist
         if (position > 3)
         {
-            tmp = event.description.left(position-3);
+            tmp = event.m_description.left(position-3);
             QStringList actors =
                 tmp.split(m_bellActors, QString::SkipEmptyParts);
             QStringList::const_iterator it = actors.begin();
@@ -526,180 +526,180 @@ void EITFixUp::FixBellExpressVu(DBEventEIT &event) const
                 event.AddPerson(DBPerson::kActor, *it);
         }
         // Remove the year and actors from the description
-        event.description = event.description.right(
-            event.description.length() - position - 7);
+        event.m_description = event.m_description.right(
+            event.m_description.length() - position - 7);
     }
 
     // Check for (CC) in the decription and
     // set the <subtitles type="teletext"> flag
-    position = event.description.indexOf("(CC)");
+    position = event.m_description.indexOf("(CC)");
     if (position != -1)
     {
-        event.subtitleType |= SUB_HARDHEAR;
-        event.description = event.description.replace("(CC)", "");
+        event.m_subtitleType |= SUB_HARDHEAR;
+        event.m_description = event.m_description.replace("(CC)", "");
     }
 
     // Check for (Stereo) in the decription and set the <audio> tags
-    position = event.description.indexOf(m_Stereo);
+    position = event.m_description.indexOf(m_Stereo);
     if (position != -1)
     {
-        event.audioProps |= AUD_STEREO;
-        event.description = event.description.replace(m_Stereo, "");
+        event.m_audioProps |= AUD_STEREO;
+        event.m_description = event.m_description.replace(m_Stereo, "");
     }
 
     // Check for "title (All Day, HD)" in the title
-    position = event.title.indexOf(m_bellPPVTitleAllDayHD);
+    position = event.m_title.indexOf(m_bellPPVTitleAllDayHD);
     if (position != -1)
     {
-        event.title = event.title.replace(m_bellPPVTitleAllDayHD, "");
-        event.videoProps |= VID_HDTV;
+        event.m_title = event.m_title.replace(m_bellPPVTitleAllDayHD, "");
+        event.m_videoProps |= VID_HDTV;
      }
 
     // Check for "title (All Day)" in the title
-    position = event.title.indexOf(m_bellPPVTitleAllDay);
+    position = event.m_title.indexOf(m_bellPPVTitleAllDay);
     if (position != -1)
     {
-        event.title = event.title.replace(m_bellPPVTitleAllDay, "");
+        event.m_title = event.m_title.replace(m_bellPPVTitleAllDay, "");
     }
 
     // Check for "HD - title" in the title
-    position = event.title.indexOf(m_bellPPVTitleHD);
+    position = event.m_title.indexOf(m_bellPPVTitleHD);
     if (position != -1)
     {
-        event.title = event.title.replace(m_bellPPVTitleHD, "");
-        event.videoProps |= VID_HDTV;
+        event.m_title = event.m_title.replace(m_bellPPVTitleHD, "");
+        event.m_videoProps |= VID_HDTV;
     }
 
     // Check for (HD) in the decription
-    position = event.description.indexOf("(HD)");
+    position = event.m_description.indexOf("(HD)");
     if (position != -1)
     {
-        event.description = event.description.replace("(HD)", "");
-        event.videoProps |= VID_HDTV;
+        event.m_description = event.m_description.replace("(HD)", "");
+        event.m_videoProps |= VID_HDTV;
     }
 
     // Check for (HD) in the title
-    position = event.title.indexOf("(HD)");
+    position = event.m_title.indexOf("(HD)");
     if (position != -1)
     {
-        event.description = event.title.replace("(HD)", "");
-        event.videoProps |= VID_HDTV;
+        event.m_description = event.m_title.replace("(HD)", "");
+        event.m_videoProps |= VID_HDTV;
     }
 
     // Check for HD at the end of the title
-    position = event.title.indexOf(m_dishPPVTitleHD);
+    position = event.m_title.indexOf(m_dishPPVTitleHD);
     if (position != -1)
     {
-        event.title = event.title.replace(m_dishPPVTitleHD, "");
-        event.videoProps |= VID_HDTV;
+        event.m_title = event.m_title.replace(m_dishPPVTitleHD, "");
+        event.m_videoProps |= VID_HDTV;
     }
 
     // Check for (DD) at the end of the description
-    position = event.description.indexOf("(DD)");
+    position = event.m_description.indexOf("(DD)");
     if (position != -1)
     {
-        event.description = event.description.replace("(DD)", "");
-        event.audioProps |= AUD_DOLBY;
-        event.audioProps |= AUD_STEREO;
+        event.m_description = event.m_description.replace("(DD)", "");
+        event.m_audioProps |= AUD_DOLBY;
+        event.m_audioProps |= AUD_STEREO;
     }
 
     // Remove SAP from Dish descriptions
-    position = event.description.indexOf("(SAP)");
+    position = event.m_description.indexOf("(SAP)");
     if (position != -1)
     {
-        event.description = event.description.replace("(SAP", "");
-        event.subtitleType |= SUB_HARDHEAR;
+        event.m_description = event.m_description.replace("(SAP", "");
+        event.m_subtitleType |= SUB_HARDHEAR;
     }
 
     // Remove any trailing colon in title
-    position = event.title.indexOf(m_dishPPVTitleColon);
+    position = event.m_title.indexOf(m_dishPPVTitleColon);
     if (position != -1)
     {
-        event.title = event.title.replace(m_dishPPVTitleColon, "");
+        event.m_title = event.m_title.replace(m_dishPPVTitleColon, "");
     }
 
     // Remove New at the end of the description
-    position = event.description.indexOf(m_dishDescriptionNew);
+    position = event.m_description.indexOf(m_dishDescriptionNew);
     if (position != -1)
     {
-        event.previouslyshown = false;
-        event.description = event.description.replace(m_dishDescriptionNew, "");
+        event.m_previouslyshown = false;
+        event.m_description = event.m_description.replace(m_dishDescriptionNew, "");
     }
 
     // Remove Series Finale at the end of the desciption
-    position = event.description.indexOf(m_dishDescriptionFinale);
+    position = event.m_description.indexOf(m_dishDescriptionFinale);
     if (position != -1)
     {
-        event.previouslyshown = false;
-        event.description = event.description.replace(m_dishDescriptionFinale, "");
+        event.m_previouslyshown = false;
+        event.m_description = event.m_description.replace(m_dishDescriptionFinale, "");
     }
 
     // Remove Series Finale at the end of the desciption
-    position = event.description.indexOf(m_dishDescriptionFinale2);
+    position = event.m_description.indexOf(m_dishDescriptionFinale2);
     if (position != -1)
     {
-        event.previouslyshown = false;
-        event.description = event.description.replace(m_dishDescriptionFinale2, "");
+        event.m_previouslyshown = false;
+        event.m_description = event.m_description.replace(m_dishDescriptionFinale2, "");
     }
 
     // Remove Series Premiere at the end of the description
-    position = event.description.indexOf(m_dishDescriptionPremiere);
+    position = event.m_description.indexOf(m_dishDescriptionPremiere);
     if (position != -1)
     {
-        event.previouslyshown = false;
-        event.description = event.description.replace(m_dishDescriptionPremiere, "");
+        event.m_previouslyshown = false;
+        event.m_description = event.m_description.replace(m_dishDescriptionPremiere, "");
     }
 
     // Remove Series Premiere at the end of the description
-    position = event.description.indexOf(m_dishDescriptionPremiere2);
+    position = event.m_description.indexOf(m_dishDescriptionPremiere2);
     if (position != -1)
     {
-        event.previouslyshown = false;
-        event.description = event.description.replace(m_dishDescriptionPremiere2, "");
+        event.m_previouslyshown = false;
+        event.m_description = event.m_description.replace(m_dishDescriptionPremiere2, "");
     }
 
     // Remove Dish's PPV code at the end of the description
     QRegExp ppvcode = m_dishPPVCode;
     ppvcode.setCaseSensitivity(Qt::CaseInsensitive);
-    position = event.description.indexOf(ppvcode);
+    position = event.m_description.indexOf(ppvcode);
     if (position != -1)
     {
-        event.description = event.description.replace(ppvcode, "");
+        event.m_description = event.m_description.replace(ppvcode, "");
     }
 
     // Remove trailing garbage
-    position = event.description.indexOf(m_dishPPVSpacePerenEnd);
+    position = event.m_description.indexOf(m_dishPPVSpacePerenEnd);
     if (position != -1)
     {
-        event.description = event.description.replace(m_dishPPVSpacePerenEnd, "");
+        event.m_description = event.m_description.replace(m_dishPPVSpacePerenEnd, "");
     }
 
     // Check for subtitle "All Day (... Eastern)" in the subtitle
-    position = event.subtitle.indexOf(m_bellPPVSubtitleAllDay);
+    position = event.m_subtitle.indexOf(m_bellPPVSubtitleAllDay);
     if (position != -1)
     {
-        event.subtitle = event.subtitle.replace(m_bellPPVSubtitleAllDay, "");
+        event.m_subtitle = event.m_subtitle.replace(m_bellPPVSubtitleAllDay, "");
     }
 
     // Check for description "(... Eastern)" in the description
-    position = event.description.indexOf(m_bellPPVDescriptionAllDay);
+    position = event.m_description.indexOf(m_bellPPVDescriptionAllDay);
     if (position != -1)
     {
-        event.description = event.description.replace(m_bellPPVDescriptionAllDay, "");
+        event.m_description = event.m_description.replace(m_bellPPVDescriptionAllDay, "");
     }
 
     // Check for description "(... ET)" in the description
-    position = event.description.indexOf(m_bellPPVDescriptionAllDay2);
+    position = event.m_description.indexOf(m_bellPPVDescriptionAllDay2);
     if (position != -1)
     {
-        event.description = event.description.replace(m_bellPPVDescriptionAllDay2, "");
+        event.m_description = event.m_description.replace(m_bellPPVDescriptionAllDay2, "");
     }
 
     // Check for description "(nnnnn)" in the description
-    position = event.description.indexOf(m_bellPPVDescriptionEventId);
+    position = event.m_description.indexOf(m_bellPPVDescriptionEventId);
     if (position != -1)
     {
-        event.description = event.description.replace(m_bellPPVDescriptionEventId, "");
+        event.m_description = event.m_description.replace(m_bellPPVDescriptionEventId, "");
     }
 
 }
@@ -709,7 +709,7 @@ void EITFixUp::FixBellExpressVu(DBEventEIT &event) const
  */
 void EITFixUp::SetUKSubtitle(DBEventEIT &event) const
 {
-    QStringList strListColon = event.description.split(":");
+    QStringList strListColon = event.m_description.split(":");
     QStringList strListEnd;
 
     bool fColon = false, fQuotedSubtitle = false;
@@ -721,17 +721,17 @@ void EITFixUp::SetUKSubtitle(DBEventEIT &event) const
          bool fSingleDot = true;
          int nLength = strListColon[0].length();
 
-         nPosition1 = event.description.indexOf("..");
+         nPosition1 = event.m_description.indexOf("..");
          if ((nPosition1 < nLength) && (nPosition1 >= 0))
              fDoubleDot = true;
-         nPosition1 = event.description.indexOf(".");
+         nPosition1 = event.m_description.indexOf(".");
          if (nPosition1==-1)
              fSingleDot = false;
          if (nPosition1 > nLength)
              fSingleDot = false;
          else
          {
-             QString strTmp = event.description.mid(nPosition1+1,
+             QString strTmp = event.m_description.mid(nPosition1+1,
                                      nLength-nPosition1);
 
              QStringList tmp = strTmp.split(" ");
@@ -775,10 +775,10 @@ void EITFixUp::SetUKSubtitle(DBEventEIT &event) const
          }
     }
     QRegExp tmpQuotedSubtitle = m_ukQuotedSubtitle;
-    if (tmpQuotedSubtitle.indexIn(event.description) != -1)
+    if (tmpQuotedSubtitle.indexIn(event.m_description) != -1)
     {
-        event.subtitle = tmpQuotedSubtitle.cap(1);
-        event.description.remove(m_ukQuotedSubtitle);
+        event.m_subtitle = tmpQuotedSubtitle.cap(1);
+        event.m_description.remove(m_ukQuotedSubtitle);
         fQuotedSubtitle = true;
     }
     QStringList strListPeriod;
@@ -786,17 +786,17 @@ void EITFixUp::SetUKSubtitle(DBEventEIT &event) const
     QStringList strListExcl;
     if (!(fColon || fQuotedSubtitle))
     {
-        strListPeriod = event.description.split(".");
+        strListPeriod = event.m_description.split(".");
         if (strListPeriod.count() >1)
         {
-            nPosition1 = event.description.indexOf(".");
-            int nPosition2 = event.description.indexOf("..");
+            nPosition1 = event.m_description.indexOf(".");
+            int nPosition2 = event.m_description.indexOf("..");
             if ((nPosition1 < nPosition2) || (nPosition2==-1))
                 strListEnd = strListPeriod;
         }
 
-        strListQuestion = event.description.split("?");
-        strListExcl = event.description.split("!");
+        strListQuestion = event.m_description.split("?");
+        strListExcl = event.m_description.split("!");
         if ((strListQuestion.size() > 1) &&
             ((uint)strListQuestion.size() <= kMaxQuestionExclamation))
         {
@@ -823,11 +823,11 @@ void EITFixUp::SetUKSubtitle(DBEventEIT &event) const
              return;
         if (strListSpace.filter(m_ukExclusionFromSubtitle).empty())
         {
-             event.subtitle = strListEnd[0]+strEnd;
-             event.subtitle.remove(m_ukSpaceColonStart);
-             event.description=
-                          event.description.mid(strListEnd[0].length()+1);
-             event.description.remove(m_ukSpaceColonStart);
+             event.m_subtitle = strListEnd[0]+strEnd;
+             event.m_subtitle.remove(m_ukSpaceColonStart);
+             event.m_description=
+                          event.m_description.mid(strListEnd[0].length()+1);
+             event.m_description.remove(m_ukSpaceColonStart);
         }
     }
 }
@@ -842,89 +842,89 @@ void EITFixUp::FixUK(DBEventEIT &event) const
     int position2;
     QString strFull;
 
-    bool isMovie = event.category.startsWith("Movie",Qt::CaseInsensitive) ||
-                   event.category.startsWith("Film",Qt::CaseInsensitive);
+    bool isMovie = event.m_category.startsWith("Movie",Qt::CaseInsensitive) ||
+                   event.m_category.startsWith("Film",Qt::CaseInsensitive);
     // BBC three case (could add another record here ?)
-    event.description = event.description.remove(m_ukThen);
-    event.description = event.description.remove(m_ukNew);
-    event.title = event.title.remove(m_ukNewTitle);
+    event.m_description = event.m_description.remove(m_ukThen);
+    event.m_description = event.m_description.remove(m_ukNew);
+    event.m_title = event.m_title.remove(m_ukNewTitle);
 
     // Removal of Class TV, CBBC and CBeebies etc..
-    event.title = event.title.remove(m_ukTitleRemove);
-    event.description = event.description.remove(m_ukDescriptionRemove);
+    event.m_title = event.m_title.remove(m_ukTitleRemove);
+    event.m_description = event.m_description.remove(m_ukDescriptionRemove);
 
     // Removal of BBC FOUR and BBC THREE
-    event.description = event.description.remove(m_ukBBC34);
+    event.m_description = event.m_description.remove(m_ukBBC34);
 
     // BBC 7 [Rpt of ...] case.
-    event.description = event.description.remove(m_ukBBC7rpt);
+    event.m_description = event.m_description.remove(m_ukBBC7rpt);
 
     // "All New To 4Music!
-    event.description = event.description.remove(m_ukAllNew);
+    event.m_description = event.m_description.remove(m_ukAllNew);
 
     // Removal of 'Also in HD' text
- 	event.description = event.description.remove(m_ukAlsoInHD);
+ 	event.m_description = event.m_description.remove(m_ukAlsoInHD);
 
     // Remove [AD,S] etc.
     bool    ccMatched = false;
     QRegExp tmpCC = m_ukCC;
     position1 = 0;
-    while ((position1 = tmpCC.indexIn(event.description, position1)) != -1)
+    while ((position1 = tmpCC.indexIn(event.m_description, position1)) != -1)
     {
         ccMatched = true;
         position1 += tmpCC.matchedLength();
 
         QStringList tmpCCitems = tmpCC.cap(0).remove("[").remove("]").split(",");
         if (tmpCCitems.contains("AD"))
-            event.audioProps |= AUD_VISUALIMPAIR;
+            event.m_audioProps |= AUD_VISUALIMPAIR;
         if (tmpCCitems.contains("HD"))
-            event.videoProps |= VID_HDTV;
+            event.m_videoProps |= VID_HDTV;
         if (tmpCCitems.contains("S"))
-            event.subtitleType |= SUB_NORMAL;
+            event.m_subtitleType |= SUB_NORMAL;
         if (tmpCCitems.contains("SL"))
-            event.subtitleType |= SUB_SIGNED;
+            event.m_subtitleType |= SUB_SIGNED;
         if (tmpCCitems.contains("W"))
-            event.videoProps |= VID_WIDESCREEN;
+            event.m_videoProps |= VID_WIDESCREEN;
     }
 
     if(ccMatched)
-        event.description = event.description.remove(m_ukCC);
+        event.m_description = event.m_description.remove(m_ukCC);
 
-    event.title       = event.title.trimmed();
-    event.description = event.description.trimmed();
+    event.m_title       = event.m_title.trimmed();
+    event.m_description = event.m_description.trimmed();
 
     // Work out the season and episode numbers (if any)
     // Matching pattern "Season 2 Episode|Ep 3 of 14|3/14" etc
     bool    series  = false;
     QRegExp tmpSeries = m_ukSeries;
-    if ((position1 = tmpSeries.indexIn(event.title)) != -1
-            || (position2 = tmpSeries.indexIn(event.description)) != -1)
+    if ((position1 = tmpSeries.indexIn(event.m_title)) != -1
+            || (position2 = tmpSeries.indexIn(event.m_description)) != -1)
     {
         if (!tmpSeries.cap(1).isEmpty())
         {
-            event.season = tmpSeries.cap(1).toUInt();
+            event.m_season = tmpSeries.cap(1).toUInt();
             series = true;
         }
 
         if (!tmpSeries.cap(2).isEmpty())
         {
-            event.episode = tmpSeries.cap(2).toUInt();
+            event.m_episode = tmpSeries.cap(2).toUInt();
             series = true;
         }
         else if (!tmpSeries.cap(5).isEmpty())
         {
-            event.episode = tmpSeries.cap(5).toUInt();
+            event.m_episode = tmpSeries.cap(5).toUInt();
             series = true;
         }
 
         if (!tmpSeries.cap(3).isEmpty())
         {
-            event.totalepisodes = tmpSeries.cap(3).toUInt();
+            event.m_totalepisodes = tmpSeries.cap(3).toUInt();
             series = true;
         }
         else if (!tmpSeries.cap(6).isEmpty())
         {
-            event.totalepisodes = tmpSeries.cap(6).toUInt();
+            event.m_totalepisodes = tmpSeries.cap(6).toUInt();
             series = true;
         }
 
@@ -934,51 +934,51 @@ void EITFixUp::FixUK(DBEventEIT &event) const
         if (position1 != -1)
         {
             LOG(VB_EIT, LOG_DEBUG, QString("Extracted S%1E%2/%3 from title (%4) \"%5\"")
-                .arg(event.season).arg(event.episode).arg(event.totalepisodes)
-                .arg(event.title, event.description));
+                .arg(event.m_season).arg(event.m_episode).arg(event.m_totalepisodes)
+                .arg(event.m_title, event.m_description));
 
-            event.title.remove(tmpSeries.cap(form));
+            event.m_title.remove(tmpSeries.cap(form));
         }
         else
         {
             LOG(VB_EIT, LOG_DEBUG, QString("Extracted S%1E%2/%3 from description (%4) \"%5\"")
-                .arg(event.season).arg(event.episode).arg(event.totalepisodes)
-                .arg(event.title, event.description));
+                .arg(event.m_season).arg(event.m_episode).arg(event.m_totalepisodes)
+                .arg(event.m_title, event.m_description));
 
             if (position2 == 0)
      		    // Remove from the start of the description.
 		        // Otherwise it ends up in the subtitle.
-                event.description.remove(tmpSeries.cap(form));
+                event.m_description.remove(tmpSeries.cap(form));
         }
     }
 
     if (isMovie)
-        event.categoryType = ProgramInfo::kCategoryMovie;
+        event.m_categoryType = ProgramInfo::kCategoryMovie;
     else if (series)
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_categoryType = ProgramInfo::kCategorySeries;
 
     // Multi-part episodes, or films (e.g. ITV film split by news)
     // Matches Part 1, Pt 1/2, Part 1 of 2 etc.
     QRegExp tmpPart = m_ukPart;
-    if ((position1 = tmpPart.indexIn(event.title)) != -1)
+    if ((position1 = tmpPart.indexIn(event.m_title)) != -1)
     {
-        event.partnumber = tmpPart.cap(1).toUInt();
-        event.parttotal  = tmpPart.cap(2).toUInt();
+        event.m_partnumber = tmpPart.cap(1).toUInt();
+        event.m_parttotal  = tmpPart.cap(2).toUInt();
 
         LOG(VB_EIT, LOG_DEBUG, QString("Extracted Part %1/%2 from title (%3)")
-            .arg(event.partnumber).arg(event.parttotal).arg(event.title));
+            .arg(event.m_partnumber).arg(event.m_parttotal).arg(event.m_title));
 
         // Remove from the title
-        event.title = event.title.remove(tmpPart.cap(0));
+        event.m_title = event.m_title.remove(tmpPart.cap(0));
     }
-    else if ((position1 = tmpPart.indexIn(event.description)) != -1)
+    else if ((position1 = tmpPart.indexIn(event.m_description)) != -1)
     {
-        event.partnumber = tmpPart.cap(1).toUInt();
-        event.parttotal  = tmpPart.cap(2).toUInt();
+        event.m_partnumber = tmpPart.cap(1).toUInt();
+        event.m_parttotal  = tmpPart.cap(2).toUInt();
 
         LOG(VB_EIT, LOG_DEBUG, QString("Extracted Part %1/%2 from description (%3) \"%4\"")
-            .arg(event.partnumber).arg(event.parttotal)
-            .arg(event.title, event.description));
+            .arg(event.m_partnumber).arg(event.m_parttotal)
+            .arg(event.m_title, event.m_description));
 
         // Remove from the start of the description.
         // Otherwise it ends up in the subtitle.
@@ -986,12 +986,12 @@ void EITFixUp::FixUK(DBEventEIT &event) const
         {
             // Retain a single colon (subtitle separator) if we remove any
             QString sub = tmpPart.cap(0).contains(":") ? ":" : "";
-            event.description = event.description.replace(tmpPart.cap(0), sub);
+            event.m_description = event.m_description.replace(tmpPart.cap(0), sub);
         }
     }
 
     QRegExp tmpStarring = m_ukStarring;
-    if (tmpStarring.indexIn(event.description) != -1)
+    if (tmpStarring.indexIn(event.m_description) != -1)
     {
         // if we match this we've captured 2 actors and an (optional) airdate
         event.AddPerson(DBPerson::kActor, tmpStarring.cap(1));
@@ -1002,40 +1002,40 @@ void EITFixUp::FixUK(DBEventEIT &event) const
             uint y = tmpStarring.cap(3).toUInt(&ok);
             if (ok)
             {
-                event.airdate = y;
-                event.originalairdate = QDate(y, 1, 1);
+                event.m_airdate = y;
+                event.m_originalairdate = QDate(y, 1, 1);
             }
         }
     }
 
     QRegExp tmp24ep = m_uk24ep;
-    if (!event.title.startsWith("CSI:") && !event.title.startsWith("CD:") &&
-        !event.title.contains(m_ukLaONoSplit) &&
-        !event.title.startsWith("Mission: Impossible"))
+    if (!event.m_title.startsWith("CSI:") && !event.m_title.startsWith("CD:") &&
+        !event.m_title.contains(m_ukLaONoSplit) &&
+        !event.m_title.startsWith("Mission: Impossible"))
     {
-        if (((position1=event.title.indexOf(m_ukDoubleDotEnd)) != -1) &&
-            ((position2=event.description.indexOf(m_ukDoubleDotStart)) != -1))
+        if (((position1=event.m_title.indexOf(m_ukDoubleDotEnd)) != -1) &&
+            ((position2=event.m_description.indexOf(m_ukDoubleDotStart)) != -1))
         {
-            QString strPart=event.title.remove(m_ukDoubleDotEnd)+" ";
-            strFull = strPart + event.description.remove(m_ukDoubleDotStart);
+            QString strPart=event.m_title.remove(m_ukDoubleDotEnd)+" ";
+            strFull = strPart + event.m_description.remove(m_ukDoubleDotStart);
             if (isMovie &&
                 ((position1 = strFull.indexOf(m_ukCEPQ,strPart.length())) != -1))
             {
                  if (strFull[position1] == '!' || strFull[position1] == '?'
                   || (position1>2 && strFull[position1] == '.' && strFull[position1-2] == '.'))
                      position1++;
-                 event.title = strFull.left(position1);
-                 event.description = strFull.mid(position1 + 1);
-                 event.description.remove(m_ukSpaceStart);
+                 event.m_title = strFull.left(position1);
+                 event.m_description = strFull.mid(position1 + 1);
+                 event.m_description.remove(m_ukSpaceStart);
             }
             else if ((position1 = strFull.indexOf(m_ukCEPQ)) != -1)
             {
                  if (strFull[position1] == '!' || strFull[position1] == '?'
                   || (position1>2 && strFull[position1] == '.' && strFull[position1-2] == '.'))
                      position1++;
-                 event.title = strFull.left(position1);
-                 event.description = strFull.mid(position1 + 1);
-                 event.description.remove(m_ukSpaceStart);
+                 event.m_title = strFull.left(position1);
+                 event.m_description = strFull.mid(position1 + 1);
+                 event.m_description.remove(m_ukSpaceStart);
                  SetUKSubtitle(event);
             }
             if ((position1 = strFull.indexOf(m_ukYear)) != -1)
@@ -1043,37 +1043,37 @@ void EITFixUp::FixUK(DBEventEIT &event) const
                 // Looks like they are using the airdate as a delimiter
                 if ((uint)position1 < SUBTITLE_MAX_LEN)
                 {
-                    event.description = event.title.mid(position1);
-                    event.title = event.title.left(position1);
+                    event.m_description = event.m_title.mid(position1);
+                    event.m_title = event.m_title.left(position1);
                 }
             }
         }
-        else if ((position1 = tmp24ep.indexIn(event.description)) != -1)
+        else if ((position1 = tmp24ep.indexIn(event.m_description)) != -1)
         {
             // Special case for episodes of 24.
             // -2 from the length cause we don't want ": " on the end
-            event.subtitle = event.description.mid(position1,
+            event.m_subtitle = event.m_description.mid(position1,
                                 tmp24ep.cap(0).length() - 2);
-            event.description = event.description.remove(tmp24ep.cap(0));
+            event.m_description = event.m_description.remove(tmp24ep.cap(0));
         }
-        else if ((position1 = event.description.indexOf(m_ukTime)) == -1)
+        else if ((position1 = event.m_description.indexOf(m_ukTime)) == -1)
         {
-            if (!isMovie && (event.title.indexOf(m_ukYearColon) < 0))
+            if (!isMovie && (event.m_title.indexOf(m_ukYearColon) < 0))
             {
-                if (((position1 = event.title.indexOf(":")) != -1) &&
-                    (event.description.indexOf(":") < 0 ))
+                if (((position1 = event.m_title.indexOf(":")) != -1) &&
+                    (event.m_description.indexOf(":") < 0 ))
                 {
-                    if (event.title.mid(position1+1).indexOf(m_ukCompleteDots)==0)
+                    if (event.m_title.mid(position1+1).indexOf(m_ukCompleteDots)==0)
                     {
                         SetUKSubtitle(event);
-                        QString strTmp = event.title.mid(position1+1);
-                        event.title.resize(position1);
-                        event.subtitle = strTmp+event.subtitle;
+                        QString strTmp = event.m_title.mid(position1+1);
+                        event.m_title.resize(position1);
+                        event.m_subtitle = strTmp+event.m_subtitle;
                     }
                     else if ((uint)position1 < SUBTITLE_MAX_LEN)
                     {
-                        event.subtitle = event.title.mid(position1 + 1);
-                        event.title = event.title.left(position1);
+                        event.m_subtitle = event.m_title.mid(position1 + 1);
+                        event.m_title = event.m_title.left(position1);
                     }
                 }
                 else
@@ -1082,22 +1082,22 @@ void EITFixUp::FixUK(DBEventEIT &event) const
         }
     }
 
-    if (!isMovie && event.subtitle.isEmpty() &&
-        !event.title.startsWith("The X-Files"))
+    if (!isMovie && event.m_subtitle.isEmpty() &&
+        !event.m_title.startsWith("The X-Files"))
     {
-        if ((position1=event.description.indexOf(m_ukTime)) != -1)
+        if ((position1=event.m_description.indexOf(m_ukTime)) != -1)
         {
-            position2 = event.description.indexOf(m_ukColonPeriod);
+            position2 = event.m_description.indexOf(m_ukColonPeriod);
             if ((position2>=0) && (position2 < (position1-2)))
                 SetUKSubtitle(event);
         }
-        else if ((position1=event.title.indexOf("-")) != -1)
+        else if ((position1=event.m_title.indexOf("-")) != -1)
         {
             if ((uint)position1 < SUBTITLE_MAX_LEN)
             {
-                event.subtitle = event.title.mid(position1 + 1);
-                event.subtitle.remove(m_ukSpaceColonStart);
-                event.title = event.title.left(position1);
+                event.m_subtitle = event.m_title.mid(position1 + 1);
+                event.m_subtitle.remove(m_ukSpaceColonStart);
+                event.m_title = event.m_title.left(position1);
             }
         }
         else
@@ -1106,30 +1106,30 @@ void EITFixUp::FixUK(DBEventEIT &event) const
 
     // Work out the year (if any)
     QRegExp tmpUKYear = m_ukYear;
-    if ((position1 = tmpUKYear.indexIn(event.description)) != -1)
+    if ((position1 = tmpUKYear.indexIn(event.m_description)) != -1)
     {
-        QString stmp = event.description;
+        QString stmp = event.m_description;
         int     itmp = position1 + tmpUKYear.cap(0).length();
-        event.description = stmp.left(position1) + stmp.mid(itmp);
+        event.m_description = stmp.left(position1) + stmp.mid(itmp);
         bool ok;
         uint y = tmpUKYear.cap(1).toUInt(&ok);
         if (ok)
         {
-            event.airdate = y;
-            event.originalairdate = QDate(y, 1, 1);
+            event.m_airdate = y;
+            event.m_originalairdate = QDate(y, 1, 1);
         }
     }
 
     // Trim leading/trailing '.'
-    event.subtitle.remove(m_ukDotSpaceStart);
-    if (event.subtitle.lastIndexOf("..") != (event.subtitle.length()-2))
-        event.subtitle.remove(m_ukDotEnd);
+    event.m_subtitle.remove(m_ukDotSpaceStart);
+    if (event.m_subtitle.lastIndexOf("..") != (event.m_subtitle.length()-2))
+        event.m_subtitle.remove(m_ukDotEnd);
 
     // Reverse the subtitle and empty description
-    if (event.description.isEmpty() && !event.subtitle.isEmpty())
+    if (event.m_description.isEmpty() && !event.m_subtitle.isEmpty())
     {
-        event.description=event.subtitle;
-        event.subtitle.clear();
+        event.m_description=event.m_subtitle;
+        event.m_subtitle.clear();
     }
 }
 
@@ -1139,12 +1139,12 @@ void EITFixUp::FixUK(DBEventEIT &event) const
 void EITFixUp::FixPBS(DBEventEIT &event) const
 {
     /* Used for PBS ATSC Subtitles are separated by a colon */
-    int position = event.description.indexOf(':');
+    int position = event.m_description.indexOf(':');
     if (position != -1)
     {
-        const QString stmp   = event.description;
-        event.subtitle = stmp.left(position);
-        event.description    = stmp.right(stmp.length() - position - 2);
+        const QString stmp   = event.m_description;
+        event.m_subtitle     = stmp.left(position);
+        event.m_description  = stmp.right(stmp.length() - position - 2);
     }
 }
 
@@ -1154,72 +1154,72 @@ void EITFixUp::FixPBS(DBEventEIT &event) const
 void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
 {
     // Reverse what EITFixUp::Fix() did
-    if (event.subtitle.isEmpty() && !event.description.isEmpty())
+    if (event.m_subtitle.isEmpty() && !event.m_description.isEmpty())
     {
-        event.subtitle = event.description;
-        event.description = "";
+        event.m_subtitle = event.m_description;
+        event.m_description = "";
     }
 
     // Remove subtitle, it contains the category and we already know that
-    event.subtitle = "";
+    event.m_subtitle = "";
 
     bool isSeries = false;
     // Try to find episode numbers
     int pos;
     QRegExp tmpSeries1 = m_comHemSeries1;
     QRegExp tmpSeries2 = m_comHemSeries2;
-    if ((pos = tmpSeries2.indexIn(event.title)) != -1)
+    if ((pos = tmpSeries2.indexIn(event.m_title)) != -1)
     {
         QStringList list = tmpSeries2.capturedTexts();
-        event.partnumber = list[2].toUInt();
-        event.title = event.title.replace(list[0],"");
+        event.m_partnumber = list[2].toUInt();
+        event.m_title = event.m_title.replace(list[0],"");
     }
-    else if ((pos = tmpSeries1.indexIn(event.description)) != -1)
+    else if ((pos = tmpSeries1.indexIn(event.m_description)) != -1)
     {
         QStringList list = tmpSeries1.capturedTexts();
         if (!list[1].isEmpty())
         {
-            event.partnumber = list[1].toUInt();
+            event.m_partnumber = list[1].toUInt();
         }
         if (!list[2].isEmpty())
         {
-            event.parttotal = list[2].toUInt();
+            event.m_parttotal = list[2].toUInt();
         }
 
         // Remove the episode numbers, but only if it's not at the begining
         // of the description (subtitle code might use it)
         if(pos > 0)
-            event.description = event.description.replace(list[0],"");
+            event.m_description = event.m_description.replace(list[0],"");
         isSeries = true;
     }
 
     // Add partnumber/parttotal to subtitle
     // This will be overwritten if we find a better subtitle
-    if (event.partnumber > 0)
+    if (event.m_partnumber > 0)
     {
-        event.subtitle = QString("Del %1").arg(event.partnumber);
-        if (event.parttotal > 0)
+        event.m_subtitle = QString("Del %1").arg(event.m_partnumber);
+        if (event.m_parttotal > 0)
         {
-            event.subtitle += QString(" av %1").arg(event.parttotal);
+            event.m_subtitle += QString(" av %1").arg(event.m_parttotal);
         }
     }
 
     // Move subtitle info from title to subtitle
     QRegExp tmpTSub = m_comHemTSub;
-    if (tmpTSub.indexIn(event.title) != -1)
+    if (tmpTSub.indexIn(event.m_title) != -1)
     {
-        event.subtitle = tmpTSub.cap(1);
-        event.title = event.title.replace(tmpTSub.cap(0),"");
+        event.m_subtitle = tmpTSub.cap(1);
+        event.m_title = event.m_title.replace(tmpTSub.cap(0),"");
     }
 
     // No need to continue without a description.
-    if (event.description.length() <= 0)
+    if (event.m_description.length() <= 0)
         return;
 
     // Try to find country category, year and possibly other information
     // from the begining of the description
     QRegExp tmpCountry = m_comHemCountry;
-    pos = tmpCountry.indexIn(event.description);
+    pos = tmpCountry.indexIn(event.m_description);
     if (pos != -1)
     {
         QStringList list = tmpCountry.capturedTexts();
@@ -1244,9 +1244,9 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
         if (list[3].length() > 0)
         {
             replacement += list[3] + ".";
-            if(event.category.isEmpty())
+            if(event.m_category.isEmpty())
             {
-                event.category = list[3];
+                event.m_category = list[3];
             }
 
             if(list[3].indexOf("serie")!=-1)
@@ -1261,7 +1261,7 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
             bool ok;
             uint y = list[4].trimmed().toUInt(&ok);
             if (ok)
-                event.airdate = y;
+                event.m_airdate = y;
         }
 
         // Actors
@@ -1277,15 +1277,15 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
         // Remove year and actors.
         // The reason category is left in the description is because otherwise
         // the country would look wierd like "Amerikansk. Rest of description."
-        event.description = event.description.replace(list[0],replacement);
+        event.m_description = event.m_description.replace(list[0],replacement);
     }
 
     if (isSeries)
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_categoryType = ProgramInfo::kCategorySeries;
 
     // Look for additional persons in the description
     QRegExp tmpPersons = m_comHemPersons;
-    while(pos = tmpPersons.indexIn(event.description),pos!=-1)
+    while(pos = tmpPersons.indexIn(event.m_description),pos!=-1)
     {
         DBPerson::Role role;
         QStringList list = tmpPersons.capturedTexts();
@@ -1307,7 +1307,7 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
         }
         else
         {
-            event.description=event.description.replace(list[0],"");
+            event.m_description=event.m_description.replace(list[0],"");
             continue;
         }
 
@@ -1318,7 +1318,7 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
             event.AddPerson(role, *it);
 
         // Remove it
-        event.description=event.description.replace(list[0],"");
+        event.m_description=event.m_description.replace(list[0],"");
     }
 
     // Is this event on a channel we shoud look for a subtitle?
@@ -1327,40 +1327,40 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
     // shorter than 55 characters or we risk picking up the wrong thing.
     if (process_subtitle)
     {
-        int pos2 = event.description.indexOf(m_comHemSub);
+        int pos2 = event.m_description.indexOf(m_comHemSub);
         bool pvalid = pos2 != -1 && pos2 <= 55;
-        if (pvalid && (event.description.length() - (pos2 + 2)) > 0)
+        if (pvalid && (event.m_description.length() - (pos2 + 2)) > 0)
         {
-            event.subtitle = event.description.left(
-                pos2 + (event.description[pos2] == '?' ? 1 : 0));
-            event.description = event.description.mid(pos2 + 2);
+            event.m_subtitle = event.m_description.left(
+                pos2 + (event.m_description[pos2] == '?' ? 1 : 0));
+            event.m_description = event.m_description.mid(pos2 + 2);
         }
     }
 
     // Teletext subtitles?
-    int position = event.description.indexOf(m_comHemTT);
+    int position = event.m_description.indexOf(m_comHemTT);
     if (position != -1)
     {
-        event.subtitleType |= SUB_NORMAL;
+        event.m_subtitleType |= SUB_NORMAL;
     }
 
     // Try to findout if this is a rerun and if so the date.
     QRegExp tmpRerun1 = m_comHemRerun1;
-    if (tmpRerun1.indexIn(event.description) == -1)
+    if (tmpRerun1.indexIn(event.m_description) == -1)
         return;
 
     // Rerun from today
     QStringList list = tmpRerun1.capturedTexts();
     if (list[1] == "i dag")
     {
-        event.originalairdate = event.starttime.date();
+        event.m_originalairdate = event.m_starttime.date();
         return;
     }
 
     // Rerun from yesterday afternoon
     if (list[1] == "eftermiddagen")
     {
-        event.originalairdate = event.starttime.date().addDays(-1);
+        event.m_originalairdate = event.m_starttime.date().addDays(-1);
         return;
     }
 
@@ -1376,15 +1376,15 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
         //if (datelist[3].length() > 0)
         //    year = datelist[3].toInt();
         //else
-        //    year = event.starttime.date().year();
+        //    year = event.m_starttime.date().year();
 
         if (day > 0 && month > 0)
         {
-            QDate date(event.starttime.date().year(), month, day);
+            QDate date(event.m_starttime.date().year(), month, day);
             // it's a rerun so it must be in the past
-            if (date > event.starttime.date())
+            if (date > event.m_starttime.date())
                 date = date.addYears(-1);
-            event.originalairdate = date;
+            event.m_originalairdate = date;
         }
         return;
     }
@@ -1395,14 +1395,14 @@ void EITFixUp::FixComHem(DBEventEIT &event, bool process_subtitle) const
  */
 void EITFixUp::FixAUStar(DBEventEIT &event) const
 {
-    event.category = event.subtitle;
+    event.m_category = event.m_subtitle;
     /* Used for DVB-S Subtitles are separated by a colon */
-    int position = event.description.indexOf(':');
+    int position = event.m_description.indexOf(':');
     if (position != -1)
     {
-        const QString stmp   = event.description;
-        event.subtitle       = stmp.left(position);
-        event.description    = stmp.right(stmp.length() - position - 2);
+        const QString stmp  = event.m_description;
+        event.m_subtitle    = stmp.left(position);
+        event.m_description = stmp.right(stmp.length() - position - 2);
     }
 }
 
@@ -1411,24 +1411,24 @@ void EITFixUp::FixAUStar(DBEventEIT &event) const
  */
 void EITFixUp::FixAUDescription(DBEventEIT &event) const
 {
-    if (event.description.startsWith("[Program data ") || event.description.startsWith("[Program info "))//TEN
+    if (event.m_description.startsWith("[Program data ") || event.m_description.startsWith("[Program info "))//TEN
     {
-        event.description = "";//event.subtitle;
+        event.m_description = "";//event.m_subtitle;
     }
-    if (event.description.endsWith("Copyright West TV Ltd. 2011)"))
-        event.description.resize(event.description.length()-40);
+    if (event.m_description.endsWith("Copyright West TV Ltd. 2011)"))
+        event.m_description.resize(event.m_description.length()-40);
 
-    if (event.description.isEmpty() && !event.subtitle.isEmpty())//due to ten's copyright info, this won't be caught before
+    if (event.m_description.isEmpty() && !event.m_subtitle.isEmpty())//due to ten's copyright info, this won't be caught before
     {
-        event.description = event.subtitle;
-        event.subtitle.clear();
+        event.m_description = event.m_subtitle;
+        event.m_subtitle.clear();
     }
-    if (event.description.startsWith(event.title+" - "))
-        event.description.remove(0,event.title.length()+3);
-    if (event.title.startsWith("LIVE: ", Qt::CaseInsensitive))
+    if (event.m_description.startsWith(event.m_title+" - "))
+        event.m_description.remove(0,event.m_title.length()+3);
+    if (event.m_title.startsWith("LIVE: ", Qt::CaseInsensitive))
     {
-        event.title.remove(0, 6);
-        event.description.prepend("(Live) ");
+        event.m_title.remove(0, 6);
+        event.m_description.prepend("(Live) ");
     }
 }
 /** \fn EITFixUp::FixAUNine(DBEventEIT&) const
@@ -1437,68 +1437,68 @@ void EITFixUp::FixAUDescription(DBEventEIT &event) const
 void EITFixUp::FixAUNine(DBEventEIT &event) const
 {
     QRegExp rating("\\((G|PG|M|MA)\\)");
-    if (rating.indexIn(event.description) == 0)
+    if (rating.indexIn(event.m_description) == 0)
     {
       EventRating prograting;
-      prograting.system="AU"; prograting.rating = rating.cap(1);
-      event.ratings.push_back(prograting);
-      event.description.remove(0,rating.matchedLength()+1);
+      prograting.m_system="AU"; prograting.m_rating = rating.cap(1);
+      event.m_ratings.push_back(prograting);
+      event.m_description.remove(0,rating.matchedLength()+1);
     }
-    if (event.description.startsWith("[HD]"))
+    if (event.m_description.startsWith("[HD]"))
     {
-      event.videoProps |= VID_HDTV;
-      event.description.remove(0,5);
+      event.m_videoProps |= VID_HDTV;
+      event.m_description.remove(0,5);
     }
-    if (event.description.startsWith("[CC]"))
+    if (event.m_description.startsWith("[CC]"))
     {
-      event.subtitleType |= SUB_NORMAL;
-      event.description.remove(0,5);
+      event.m_subtitleType |= SUB_NORMAL;
+      event.m_description.remove(0,5);
     }
-    if (event.subtitle == "Movie")
+    if (event.m_subtitle == "Movie")
     {
-        event.subtitle.clear();
-        event.categoryType = ProgramInfo::kCategoryMovie;
+        event.m_subtitle.clear();
+        event.m_categoryType = ProgramInfo::kCategoryMovie;
     }
-    if (event.description.startsWith(event.title))
-      event.description.remove(0,event.title.length()+1);
+    if (event.m_description.startsWith(event.m_title))
+      event.m_description.remove(0,event.m_title.length()+1);
 }
 /** \fn EITFixUp::FixAUSeven(DBEventEIT&) const
  *  \brief Use this to standardize DVB-T guide in Australia. (Seven network)
  */
 void EITFixUp::FixAUSeven(DBEventEIT &event) const
 {
-    if (event.description.endsWith(" Rpt"))
+    if (event.m_description.endsWith(" Rpt"))
     {
-        event.previouslyshown = true;
-        event.description.resize(event.description.size()-4);
+        event.m_previouslyshown = true;
+        event.m_description.resize(event.m_description.size()-4);
     }
     QRegExp year("(\\d{4})$");
-    if (year.indexIn(event.description) != -1)
+    if (year.indexIn(event.m_description) != -1)
     {
-        event.airdate = year.cap(3).toUInt();
-        event.description.resize(event.description.size()-5);
+        event.m_airdate = year.cap(3).toUInt();
+        event.m_description.resize(event.m_description.size()-5);
     }
-    if (event.description.endsWith(" CC"))
+    if (event.m_description.endsWith(" CC"))
     {
-      event.subtitleType |= SUB_NORMAL;
-      event.description.resize(event.description.size()-3);
+      event.m_subtitleType |= SUB_NORMAL;
+      event.m_description.resize(event.m_description.size()-3);
     }
     QString advisories;//store the advisories to append later
     QRegExp adv("(\\([A-Z,]+\\))$");
-    if (adv.indexIn(event.description) != -1)
+    if (adv.indexIn(event.m_description) != -1)
     {
         advisories = adv.cap(1);
-        event.description.resize(event.description.size()-(adv.matchedLength()+1));
+        event.m_description.resize(event.m_description.size()-(adv.matchedLength()+1));
     }
     QRegExp rating("(C|G|PG|M|MA)$");
-    if (rating.indexIn(event.description) != -1)
+    if (rating.indexIn(event.m_description) != -1)
     {
         EventRating prograting;
-        prograting.system=""; prograting.rating = rating.cap(1);
+        prograting.m_system=""; prograting.m_rating = rating.cap(1);
         if (!advisories.isEmpty())
-            prograting.rating.append(" ").append(advisories);
-        event.ratings.push_back(prograting);
-        event.description.resize(event.description.size()-(rating.matchedLength()+1));
+            prograting.m_rating.append(" ").append(advisories);
+        event.m_ratings.push_back(prograting);
+        event.m_description.resize(event.m_description.size()-(rating.matchedLength()+1));
     }
 }
 /** \fn EITFixUp::FixAUFreeview(DBEventEIT&) const
@@ -1506,38 +1506,38 @@ void EITFixUp::FixAUSeven(DBEventEIT &event) const
  */
 void EITFixUp::FixAUFreeview(DBEventEIT &event) const
 {
-    if (event.description.endsWith(".."))//has been truncated to fit within the 'subtitle' eit field, so none of the following will work (ABC)
+    if (event.m_description.endsWith(".."))//has been truncated to fit within the 'subtitle' eit field, so none of the following will work (ABC)
         return;
 
-    if (m_AUFreeviewSY.indexIn(event.description.trimmed(), 0) != -1)
+    if (m_AUFreeviewSY.indexIn(event.m_description.trimmed(), 0) != -1)
     {
-        if (event.subtitle.isEmpty())//nine sometimes has an actual subtitle field and the brackets thingo)
-            event.subtitle = m_AUFreeviewSY.cap(2);
-        event.airdate = m_AUFreeviewSY.cap(3).toUInt();
-        event.description = m_AUFreeviewSY.cap(1);
+        if (event.m_subtitle.isEmpty())//nine sometimes has an actual subtitle field and the brackets thingo)
+            event.m_subtitle = m_AUFreeviewSY.cap(2);
+        event.m_airdate = m_AUFreeviewSY.cap(3).toUInt();
+        event.m_description = m_AUFreeviewSY.cap(1);
     }
-    else if (m_AUFreeviewY.indexIn(event.description.trimmed(), 0) != -1)
+    else if (m_AUFreeviewY.indexIn(event.m_description.trimmed(), 0) != -1)
     {
-        event.airdate = m_AUFreeviewY.cap(2).toUInt();
-        event.description = m_AUFreeviewY.cap(1);
+        event.m_airdate = m_AUFreeviewY.cap(2).toUInt();
+        event.m_description = m_AUFreeviewY.cap(1);
     }
-    else if (m_AUFreeviewSYC.indexIn(event.description.trimmed(), 0) != -1)
+    else if (m_AUFreeviewSYC.indexIn(event.m_description.trimmed(), 0) != -1)
     {
-        if (event.subtitle.isEmpty())
-            event.subtitle = m_AUFreeviewSYC.cap(2);
-        event.airdate = m_AUFreeviewSYC.cap(3).toUInt();
+        if (event.m_subtitle.isEmpty())
+            event.m_subtitle = m_AUFreeviewSYC.cap(2);
+        event.m_airdate = m_AUFreeviewSYC.cap(3).toUInt();
         QStringList actors = m_AUFreeviewSYC.cap(4).split("/");
         for (int i = 0; i < actors.size(); ++i)
             event.AddPerson(DBPerson::kActor, actors.at(i));
-        event.description = m_AUFreeviewSYC.cap(1);
+        event.m_description = m_AUFreeviewSYC.cap(1);
     }
-    else if (m_AUFreeviewYC.indexIn(event.description.trimmed(), 0) != -1)
+    else if (m_AUFreeviewYC.indexIn(event.m_description.trimmed(), 0) != -1)
     {
-        event.airdate = m_AUFreeviewYC.cap(2).toUInt();
+        event.m_airdate = m_AUFreeviewYC.cap(2).toUInt();
         QStringList actors = m_AUFreeviewYC.cap(3).split("/");
         for (int i = 0; i < actors.size(); ++i)
             event.AddPerson(DBPerson::kActor, actors.at(i));
-        event.description = m_AUFreeviewYC.cap(1);
+        event.m_description = m_AUFreeviewYC.cap(1);
     }
 }
 
@@ -1552,109 +1552,109 @@ void EITFixUp::FixMCA(DBEventEIT &event) const
     QRegExp    tmpExp1;
 
     // Remove subtitle, it contains category information too specific to use
-    event.subtitle = QString("");
+    event.m_subtitle = QString("");
 
     // No need to continue without a description.
-    if (event.description.length() <= 0)
+    if (event.m_description.length() <= 0)
         return;
 
     // Replace incomplete title if the full one is in the description
     tmpExp1 = m_mcaIncompleteTitle;
-    if (tmpExp1.indexIn(event.title) != -1)
+    if (tmpExp1.indexIn(event.m_title) != -1)
     {
         tmpExp1 = QRegExp( m_mcaCompleteTitlea.pattern() + tmpExp1.cap(1) +
                                    m_mcaCompleteTitleb.pattern());
         tmpExp1.setCaseSensitivity(Qt::CaseInsensitive);
-        if (tmpExp1.indexIn(event.description) != -1)
+        if (tmpExp1.indexIn(event.m_description) != -1)
         {
-            event.title       = tmpExp1.cap(1).trimmed();
-            event.description = tmpExp1.cap(2).trimmed();
+            event.m_title       = tmpExp1.cap(1).trimmed();
+            event.m_description = tmpExp1.cap(2).trimmed();
         }
         tmpExp1.setCaseSensitivity(Qt::CaseSensitive);
     }
 
     // Try to find subtitle in description
     tmpExp1 = m_mcaSubtitle;
-    if ((position = tmpExp1.indexIn(event.description)) != -1)
+    if ((position = tmpExp1.indexIn(event.m_description)) != -1)
     {
         uint tmpExp1Len = tmpExp1.cap(1).length();
-        uint evDescLen = max(event.description.length(), 1);
+        uint evDescLen = max(event.m_description.length(), 1);
 
         if ((tmpExp1Len < lSUBTITLE_MAX_LEN) &&
             ((tmpExp1Len * 100 / evDescLen) < SUBTITLE_PCT))
         {
-            event.subtitle    = tmpExp1.cap(1);
-            event.description = tmpExp1.cap(2);
+            event.m_subtitle    = tmpExp1.cap(1);
+            event.m_description = tmpExp1.cap(2);
         }
     }
 
     // Try to find episode numbers in subtitle
     tmpExp1 = m_mcaSeries;
-    if ((position = tmpExp1.indexIn(event.subtitle)) != -1)
+    if ((position = tmpExp1.indexIn(event.m_subtitle)) != -1)
     {
         uint season    = tmpExp1.cap(1).toUInt();
         uint episode   = tmpExp1.cap(2).toUInt();
-        event.subtitle = tmpExp1.cap(3).trimmed();
-        event.syndicatedepisodenumber =
+        event.m_subtitle = tmpExp1.cap(3).trimmed();
+        event.m_syndicatedepisodenumber =
                 QString("S%1E%2").arg(season).arg(episode);
-        event.season = season;
-        event.episode = episode;
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_season = season;
+        event.m_episode = episode;
+        event.m_categoryType = ProgramInfo::kCategorySeries;
     }
 
     // Close captioned?
-    position = event.description.indexOf(m_mcaCC);
+    position = event.m_description.indexOf(m_mcaCC);
     if (position > 0)
     {
-        event.subtitleType |= SUB_HARDHEAR;
-        event.description.replace(m_mcaCC, "");
+        event.m_subtitleType |= SUB_HARDHEAR;
+        event.m_description.replace(m_mcaCC, "");
     }
 
     // Dolby Digital 5.1?
-    position = event.description.indexOf(m_mcaDD);
-    if ((position > 0) && (position > event.description.length() - 7))
+    position = event.m_description.indexOf(m_mcaDD);
+    if ((position > 0) && (position > event.m_description.length() - 7))
     {
-        event.audioProps |= AUD_DOLBY;
-        event.description.replace(m_mcaDD, "");
+        event.m_audioProps |= AUD_DOLBY;
+        event.m_description.replace(m_mcaDD, "");
     }
 
     // Remove bouquet tags
-    event.description.replace(m_mcaAvail, "");
+    event.m_description.replace(m_mcaAvail, "");
 
     // Try to find year and director from the end of the description
     bool isMovie = false;
     tmpExp1  = m_mcaCredits;
-    position = tmpExp1.indexIn(event.description);
+    position = tmpExp1.indexIn(event.m_description);
     if (position != -1)
     {
         isMovie = true;
-        event.description = tmpExp1.cap(1).trimmed();
+        event.m_description = tmpExp1.cap(1).trimmed();
         bool ok;
         uint y = tmpExp1.cap(2).trimmed().toUInt(&ok);
         if (ok)
-            event.airdate = y;
+            event.m_airdate = y;
         event.AddPerson(DBPerson::kDirector, tmpExp1.cap(3).trimmed());
     }
     else
     {
         // Try to find year only from the end of the description
         tmpExp1  = m_mcaYear;
-        position = tmpExp1.indexIn(event.description);
+        position = tmpExp1.indexIn(event.m_description);
         if (position != -1)
         {
             isMovie = true;
-            event.description = tmpExp1.cap(1).trimmed();
+            event.m_description = tmpExp1.cap(1).trimmed();
             bool ok;
             uint y = tmpExp1.cap(2).trimmed().toUInt(&ok);
             if (ok)
-                event.airdate = y;
+                event.m_airdate = y;
         }
     }
 
     if (isMovie)
     {
         tmpExp1  = m_mcaActors;
-        position = tmpExp1.indexIn(event.description);
+        position = tmpExp1.indexIn(event.m_description);
         if (position != -1)
         {
             const QStringList actors = tmpExp1.cap(2).split(
@@ -1662,9 +1662,9 @@ void EITFixUp::FixMCA(DBEventEIT &event) const
             QStringList::const_iterator it = actors.begin();
             for (; it != actors.end(); ++it)
                 event.AddPerson(DBPerson::kActor, (*it).trimmed());
-            event.description = tmpExp1.cap(1).trimmed();
+            event.m_description = tmpExp1.cap(1).trimmed();
         }
-        event.categoryType = ProgramInfo::kCategoryMovie;
+        event.m_categoryType = ProgramInfo::kCategoryMovie;
     }
 
 }
@@ -1677,16 +1677,16 @@ void EITFixUp::FixRTL(DBEventEIT &event) const
     int        pos;
 
     // No need to continue without a description or with an subtitle.
-    if (event.description.length() <= 0 || event.subtitle.length() > 0)
+    if (event.m_description.length() <= 0 || event.m_subtitle.length() > 0)
         return;
 
     // Repeat
     QRegExp tmpExpRepeat = m_RTLrepeat;
-    if ((pos = tmpExpRepeat.indexIn(event.description)) != -1)
+    if ((pos = tmpExpRepeat.indexIn(event.m_description)) != -1)
     {
         // remove '.' if it matches at the beginning of the description
         int length = tmpExpRepeat.cap(0).length() + (pos ? 0 : 1);
-        event.description = event.description.remove(pos, length).trimmed();
+        event.m_description = event.m_description.remove(pos, length).trimmed();
     }
 
     QRegExp tmpExp1 = m_RTLSubtitle;
@@ -1701,82 +1701,82 @@ void EITFixUp::FixRTL(DBEventEIT &event) const
     QRegExp tmpExpEpisodeNo2 = m_RTLEpisodeNo2;
 
     // subtitle with episode number: "Folge *: 'subtitle'. description
-    if (tmpExpSubtitle1.indexIn(event.description) != -1)
+    if (tmpExpSubtitle1.indexIn(event.m_description) != -1)
     {
-        event.syndicatedepisodenumber = tmpExpSubtitle1.cap(1);
-        event.subtitle    = tmpExpSubtitle1.cap(2);
-        event.description =
-            event.description.remove(0, tmpExpSubtitle1.matchedLength());
+        event.m_syndicatedepisodenumber = tmpExpSubtitle1.cap(1);
+        event.m_subtitle    = tmpExpSubtitle1.cap(2);
+        event.m_description =
+            event.m_description.remove(0, tmpExpSubtitle1.matchedLength());
     }
     // episode number subtitle
-    else if (tmpExpSubtitle2.indexIn(event.description) != -1)
+    else if (tmpExpSubtitle2.indexIn(event.m_description) != -1)
     {
-        event.syndicatedepisodenumber = tmpExpSubtitle2.cap(1);
-        event.subtitle    = tmpExpSubtitle2.cap(2);
-        event.description =
-            event.description.remove(0, tmpExpSubtitle2.matchedLength());
+        event.m_syndicatedepisodenumber = tmpExpSubtitle2.cap(1);
+        event.m_subtitle    = tmpExpSubtitle2.cap(2);
+        event.m_description =
+            event.m_description.remove(0, tmpExpSubtitle2.matchedLength());
     }
     // episode number subtitle
-    else if (tmpExpSubtitle3.indexIn(event.description) != -1)
+    else if (tmpExpSubtitle3.indexIn(event.m_description) != -1)
     {
-        event.syndicatedepisodenumber = tmpExpSubtitle3.cap(1);
-        event.subtitle    = tmpExpSubtitle3.cap(2);
-        event.description =
-            event.description.remove(0, tmpExpSubtitle3.matchedLength());
+        event.m_syndicatedepisodenumber = tmpExpSubtitle3.cap(1);
+        event.m_subtitle    = tmpExpSubtitle3.cap(2);
+        event.m_description =
+            event.m_description.remove(0, tmpExpSubtitle3.matchedLength());
     }
     // "Thema..."
-    else if (tmpExpSubtitle4.indexIn(event.description) != -1)
+    else if (tmpExpSubtitle4.indexIn(event.m_description) != -1)
     {
-        event.subtitle    = tmpExpSubtitle4.cap(1);
-        event.description =
-            event.description.remove(0, tmpExpSubtitle4.matchedLength());
+        event.m_subtitle    = tmpExpSubtitle4.cap(1);
+        event.m_description =
+            event.m_description.remove(0, tmpExpSubtitle4.matchedLength());
     }
     // "'...'"
-    else if (tmpExpSubtitle5.indexIn(event.description) != -1)
+    else if (tmpExpSubtitle5.indexIn(event.m_description) != -1)
     {
-        event.subtitle    = tmpExpSubtitle5.cap(1);
-        event.description =
-            event.description.remove(0, tmpExpSubtitle5.matchedLength());
+        event.m_subtitle    = tmpExpSubtitle5.cap(1);
+        event.m_description =
+            event.m_description.remove(0, tmpExpSubtitle5.matchedLength());
     }
     // episode number
-    else if (tmpExpEpisodeNo1.indexIn(event.description) != -1)
+    else if (tmpExpEpisodeNo1.indexIn(event.m_description) != -1)
     {
-        event.syndicatedepisodenumber = tmpExpEpisodeNo1.cap(2);
-        event.subtitle    = tmpExpEpisodeNo1.cap(1);
-        event.description =
-            event.description.remove(0, tmpExpEpisodeNo1.matchedLength());
+        event.m_syndicatedepisodenumber = tmpExpEpisodeNo1.cap(2);
+        event.m_subtitle    = tmpExpEpisodeNo1.cap(1);
+        event.m_description =
+            event.m_description.remove(0, tmpExpEpisodeNo1.matchedLength());
     }
     // episode number
-    else if (tmpExpEpisodeNo2.indexIn(event.description) != -1)
+    else if (tmpExpEpisodeNo2.indexIn(event.m_description) != -1)
     {
-        event.syndicatedepisodenumber = tmpExpEpisodeNo2.cap(2);
-        event.subtitle    = tmpExpEpisodeNo2.cap(1);
-        event.description =
-            event.description.remove(0, tmpExpEpisodeNo2.matchedLength());
+        event.m_syndicatedepisodenumber = tmpExpEpisodeNo2.cap(2);
+        event.m_subtitle    = tmpExpEpisodeNo2.cap(1);
+        event.m_description =
+            event.m_description.remove(0, tmpExpEpisodeNo2.matchedLength());
     }
 
     /* got an episode title now? (we did not have one at the start of this function) */
-    if (!event.subtitle.isEmpty())
+    if (!event.m_subtitle.isEmpty())
     {
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_categoryType = ProgramInfo::kCategorySeries;
     }
 
     /* if we do not have an episode title by now try some guessing as last resort */
-    if (event.subtitle.length() == 0)
+    if (event.m_subtitle.length() == 0)
     {
         const uint SUBTITLE_PCT = 35; // % of description to allow subtitle up to
         const uint lSUBTITLE_MAX_LEN = 50; // max length of subtitle field in db
 
-        if (tmpExp1.indexIn(event.description) != -1)
+        if (tmpExp1.indexIn(event.m_description) != -1)
         {
             uint tmpExp1Len = tmpExp1.cap(1).length();
-            uint evDescLen = max(event.description.length(), 1);
+            uint evDescLen = max(event.m_description.length(), 1);
 
             if ((tmpExp1Len < lSUBTITLE_MAX_LEN) &&
                 (tmpExp1Len * 100 / evDescLen < SUBTITLE_PCT))
             {
-                event.subtitle    = tmpExp1.cap(1);
-                event.description = tmpExp1.cap(2);
+                event.m_subtitle    = tmpExp1.cap(1);
+                event.m_description = tmpExp1.cap(2);
             }
         }
     }
@@ -1789,19 +1789,19 @@ void EITFixUp::FixPRO7(DBEventEIT &event) const
 {
     QRegExp tmp = m_PRO7Subtitle;
 
-    int pos = tmp.indexIn(event.subtitle);
+    int pos = tmp.indexIn(event.m_subtitle);
     if (pos != -1)
     {
-        if (event.airdate == 0)
+        if (event.m_airdate == 0)
         {
-            event.airdate = tmp.cap(3).toUInt();
+            event.m_airdate = tmp.cap(3).toUInt();
         }
-        event.subtitle.replace(tmp, "");
+        event.m_subtitle.replace(tmp, "");
     }
 
     /* handle cast, the very last in description */
     tmp = m_PRO7Cast;
-    pos = tmp.indexIn(event.description);
+    pos = tmp.indexIn(event.m_description);
     if (pos != -1)
     {
         QStringList cast = tmp.cap(1).split("\n");
@@ -1815,14 +1815,14 @@ void EITFixUp::FixPRO7(DBEventEIT &event) const
                 event.AddPerson (DBPerson::kActor, tmpOne.cap(1).simplified());
             }
         }
-        event.description.replace(tmp, "");
+        event.m_description.replace(tmp, "");
     }
 
     /* handle crew, the new very last in description
      * format: "Role: Name" or "Role: Name1, Name2"
      */
     tmp = m_PRO7Crew;
-    pos = tmp.indexIn(event.description);
+    pos = tmp.indexIn(event.m_description);
     if (pos != -1)
     {
         QStringList crew = tmp.cap(1).split("\n");
@@ -1856,7 +1856,7 @@ void EITFixUp::FixPRO7(DBEventEIT &event) const
                 }
             }
         }
-        event.description.replace(tmp, "");
+        event.m_description.replace(tmp, "");
     }
 
     /* FIXME unless its Jamie Oliver, then there is neither Crew nor Cast only
@@ -1870,22 +1870,22 @@ void EITFixUp::FixPRO7(DBEventEIT &event) const
 void EITFixUp::FixDisneyChannel(DBEventEIT &event) const
 {
     QRegExp tmp = m_DisneyChannelSubtitle;
-    int pos = tmp.indexIn(event.subtitle);
+    int pos = tmp.indexIn(event.m_subtitle);
     if (pos != -1)
     {
-        if (event.airdate == 0)
+        if (event.m_airdate == 0)
         {
-            event.airdate = tmp.cap(3).toUInt();
+            event.m_airdate = tmp.cap(3).toUInt();
         }
-	event.subtitle.replace(tmp, "");
+	event.m_subtitle.replace(tmp, "");
     }
     tmp = QRegExp("\\s[^\\s]+-(Serie)");
-    pos = tmp.indexIn(event.subtitle);
+    pos = tmp.indexIn(event.m_subtitle);
     if (pos != -1)
     {
-        event.categoryType = ProgramInfo::kCategorySeries;
-        event.category=tmp.cap(0).trimmed();
-        event.subtitle.replace(tmp, "");
+        event.m_categoryType = ProgramInfo::kCategorySeries;
+        event.m_category=tmp.cap(0).trimmed();
+        event.m_subtitle.replace(tmp, "");
     }
 }
 
@@ -1894,7 +1894,7 @@ void EITFixUp::FixDisneyChannel(DBEventEIT &event) const
 **/
 void EITFixUp::FixATV(DBEventEIT &event) const
 {
-    event.subtitle.replace(m_ATVSubtitle, "");
+    event.m_subtitle.replace(m_ATVSubtitle, "");
 }
 
 
@@ -1903,26 +1903,26 @@ void EITFixUp::FixATV(DBEventEIT &event) const
  */
 void EITFixUp::FixFI(DBEventEIT &event) const
 {
-    int position = event.description.indexOf(m_fiRerun);
+    int position = event.m_description.indexOf(m_fiRerun);
     if (position != -1)
     {
-        event.previouslyshown = true;
-        event.description = event.description.replace(m_fiRerun, "");
+        event.m_previouslyshown = true;
+        event.m_description = event.m_description.replace(m_fiRerun, "");
     }
 
-    position = event.description.indexOf(m_fiRerun2);
+    position = event.m_description.indexOf(m_fiRerun2);
     if (position != -1)
     {
-        event.previouslyshown = true;
-        event.description = event.description.replace(m_fiRerun2, "");
+        event.m_previouslyshown = true;
+        event.m_description = event.m_description.replace(m_fiRerun2, "");
     }
 
     // Check for (Stereo) in the decription and set the <audio> tags
-    position = event.description.indexOf(m_Stereo);
+    position = event.m_description.indexOf(m_Stereo);
     if (position != -1)
     {
-        event.audioProps |= AUD_STEREO;
-        event.description = event.description.replace(m_Stereo, "");
+        event.m_audioProps |= AUD_STEREO;
+        event.m_description = event.m_description.replace(m_Stereo, "");
     }
 }
 
@@ -1938,19 +1938,19 @@ void EITFixUp::FixPremiere(DBEventEIT &event) const
     QRegExp tmpairdate =  m_dePremiereAirdate;
     QRegExp tmpcredits =  m_dePremiereCredits;
 
-    event.description = event.description.replace(tmplength, "");
+    event.m_description = event.m_description.replace(tmplength, "");
 
-    if (tmpairdate.indexIn(event.description) != -1)
+    if (tmpairdate.indexIn(event.m_description) != -1)
     {
         country = tmpairdate.cap(1).trimmed();
         bool ok;
         uint y = tmpairdate.cap(2).toUInt(&ok);
         if (ok)
-            event.airdate = y;
-        event.description = event.description.replace(tmpairdate, "");
+            event.m_airdate = y;
+        event.m_description = event.m_description.replace(tmpairdate, "");
     }
 
-    if (tmpcredits.indexIn(event.description) != -1)
+    if (tmpcredits.indexIn(event.m_description) != -1)
     {
         event.AddPerson(DBPerson::kDirector, tmpcredits.cap(1));
         const QStringList actors = tmpcredits.cap(2).split(
@@ -1958,27 +1958,27 @@ void EITFixUp::FixPremiere(DBEventEIT &event) const
         QStringList::const_iterator it = actors.begin();
         for (; it != actors.end(); ++it)
             event.AddPerson(DBPerson::kActor, *it);
-        event.description = event.description.replace(tmpcredits, "");
+        event.m_description = event.m_description.replace(tmpcredits, "");
     }
 
-    event.description = event.description.replace("\u000A$", "");
-    event.description = event.description.replace("\u000A", " ");
+    event.m_description = event.m_description.replace("\u000A$", "");
+    event.m_description = event.m_description.replace("\u000A", " ");
 
     // move the original titel from the title to subtitle
     QRegExp tmpOTitle = m_dePremiereOTitle;
-    if (tmpOTitle.indexIn(event.title) != -1)
+    if (tmpOTitle.indexIn(event.m_title) != -1)
     {
-        event.subtitle = QString("%1, %2").arg(tmpOTitle.cap(1)).arg(country);
-        event.title = event.title.replace(tmpOTitle, "");
+        event.m_subtitle = QString("%1, %2").arg(tmpOTitle.cap(1)).arg(country);
+        event.m_title = event.m_title.replace(tmpOTitle, "");
     }
 
     // Find infos about season and episode number
     QRegExp tmpSeasonEpisode =  m_deSkyDescriptionSeasonEpisode;
-    if (tmpSeasonEpisode.indexIn(event.description) != -1)
+    if (tmpSeasonEpisode.indexIn(event.m_description) != -1)
     {
-        event.season = tmpSeasonEpisode.cap(1).trimmed().toUInt();
-        event.episode = tmpSeasonEpisode.cap(2).trimmed().toUInt();
-        event.description.replace(tmpSeasonEpisode, "");
+        event.m_season = tmpSeasonEpisode.cap(1).trimmed().toUInt();
+        event.m_episode = tmpSeasonEpisode.cap(2).trimmed().toUInt();
+        event.m_description.replace(tmpSeasonEpisode, "");
     }
 }
 
@@ -1988,104 +1988,104 @@ void EITFixUp::FixPremiere(DBEventEIT &event) const
 void EITFixUp::FixNL(DBEventEIT &event) const
 {
     QString fullinfo = "";
-    fullinfo.append (event.subtitle);
-    fullinfo.append (event.description);
-    event.subtitle = "";
+    fullinfo.append (event.m_subtitle);
+    fullinfo.append (event.m_description);
+    event.m_subtitle = "";
 
     // Convert categories to Dutch categories Myth knows.
     // nog invoegen: comedy, sport, misdaad
 
-    if (event.category == "Documentary")
+    if (event.m_category == "Documentary")
     {
-        event.category = "Documentaire";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Documentaire";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "News")
+    if (event.m_category == "News")
     {
-        event.category = "Nieuws/actualiteiten";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Nieuws/actualiteiten";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Kids")
+    if (event.m_category == "Kids")
     {
-        event.category = "Jeugd";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Jeugd";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Show/game Show")
+    if (event.m_category == "Show/game Show")
     {
-        event.category = "Amusement";
-        event.categoryType = ProgramInfo::kCategoryTVShow;
+        event.m_category = "Amusement";
+        event.m_categoryType = ProgramInfo::kCategoryTVShow;
     }
-    if (event.category == "Music/Ballet/Dance")
+    if (event.m_category == "Music/Ballet/Dance")
     {
-        event.category = "Muziek";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Muziek";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "News magazine")
+    if (event.m_category == "News magazine")
     {
-        event.category = "Informatief";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Informatief";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Movie")
+    if (event.m_category == "Movie")
     {
-        event.category = "Film";
-        event.categoryType = ProgramInfo::kCategoryMovie;
+        event.m_category = "Film";
+        event.m_categoryType = ProgramInfo::kCategoryMovie;
     }
-    if (event.category == "Nature/animals/Environment")
+    if (event.m_category == "Nature/animals/Environment")
     {
-        event.category = "Natuur";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Natuur";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Movie - Adult")
+    if (event.m_category == "Movie - Adult")
     {
-        event.category = "Erotiek";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Erotiek";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Movie - Soap/melodrama/folkloric")
+    if (event.m_category == "Movie - Soap/melodrama/folkloric")
     {
-        event.category = "Serie/soap";
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_category = "Serie/soap";
+        event.m_categoryType = ProgramInfo::kCategorySeries;
     }
-    if (event.category == "Arts/Culture")
+    if (event.m_category == "Arts/Culture")
     {
-        event.category = "Kunst/Cultuur";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Kunst/Cultuur";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Sports")
+    if (event.m_category == "Sports")
     {
-        event.category = "Sport";
-        event.categoryType = ProgramInfo::kCategorySports;
+        event.m_category = "Sport";
+        event.m_categoryType = ProgramInfo::kCategorySports;
     }
-    if (event.category == "Cartoons/Puppets")
+    if (event.m_category == "Cartoons/Puppets")
     {
-        event.category = "Animatie";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Animatie";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Movie - Comedy")
+    if (event.m_category == "Movie - Comedy")
     {
-        event.category = "Comedy";
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_category = "Comedy";
+        event.m_categoryType = ProgramInfo::kCategorySeries;
     }
-    if (event.category == "Movie - Detective/Thriller")
+    if (event.m_category == "Movie - Detective/Thriller")
     {
-        event.category = "Misdaad";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Misdaad";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
-    if (event.category == "Social/Spiritual Sciences")
+    if (event.m_category == "Social/Spiritual Sciences")
     {
-        event.category = "Religieus";
-        event.categoryType = ProgramInfo::kCategoryNone;
+        event.m_category = "Religieus";
+        event.m_categoryType = ProgramInfo::kCategoryNone;
     }
 
     // Film - categories are usually not Films
-    if (event.category.startsWith("Film -"))
+    if (event.m_category.startsWith("Film -"))
     {
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_categoryType = ProgramInfo::kCategorySeries;
     }
 
     // Get stereo info
     if (fullinfo.indexOf(m_Stereo) != -1)
     {
-        event.audioProps |= AUD_STEREO;
+        event.m_audioProps |= AUD_STEREO;
         fullinfo = fullinfo.replace(m_Stereo, ".");
     }
 
@@ -2104,15 +2104,15 @@ void EITFixUp::FixNL(DBEventEIT &event) const
     // Get teletext subtitle info
     if (fullinfo.indexOf(m_nlTxt) != -1)
     {
-        event.subtitleType |= SUB_NORMAL;
+        event.m_subtitleType |= SUB_NORMAL;
         fullinfo = fullinfo.replace("txt", ".");
     }
 
     // Get HDTV information
-    if (event.title.indexOf(m_nlHD) != -1)
+    if (event.m_title.indexOf(m_nlHD) != -1)
     {
-        event.videoProps |= VID_HDTV;
-        event.title = event.title.replace(m_nlHD, "");
+        event.m_videoProps |= VID_HDTV;
+        event.m_title = event.m_title.replace(m_nlHD, "");
     }
 
     // Try to make subtitle from Afl.:
@@ -2122,7 +2122,7 @@ void EITFixUp::FixNL(DBEventEIT &event) const
     {
         tmpSubString = tmpSub.cap(0);
         tmpSubString = tmpSubString.right(tmpSubString.length() - 7);
-        event.subtitle = tmpSubString.left(tmpSubString.length() -1);
+        event.m_subtitle = tmpSubString.left(tmpSubString.length() -1);
         fullinfo = fullinfo.replace(tmpSub.cap(0), "");
     }
 
@@ -2133,7 +2133,7 @@ void EITFixUp::FixNL(DBEventEIT &event) const
     {
         tmpSubString = tmpSub2.cap(0);
         tmpSubString = tmpSubString.right(tmpSubString.length() - 2);
-        event.subtitle = tmpSubString.left(tmpSubString.length() -1);
+        event.m_subtitle = tmpSubString.left(tmpSubString.length() -1);
         fullinfo = fullinfo.replace(tmpSub2.cap(0), "");
     }
 
@@ -2141,12 +2141,12 @@ void EITFixUp::FixNL(DBEventEIT &event) const
     // This is trying to catch the case where the subtitle is in the main title
     // but avoid cases where it isn't a subtitle e.g cd:uk
     int position;
-    if (((position = event.title.indexOf(":")) != -1) &&
-        (event.title[position + 1].toUpper() == event.title[position + 1]) &&
-        (event.subtitle.isEmpty()))
+    if (((position = event.m_title.indexOf(":")) != -1) &&
+        (event.m_title[position + 1].toUpper() == event.m_title[position + 1]) &&
+        (event.m_subtitle.isEmpty()))
     {
-        event.subtitle = event.title.mid(position + 1);
-        event.title = event.title.left(position);
+        event.m_subtitle = event.m_title.mid(position + 1);
+        event.m_title = event.m_title.left(position);
     }
 
 
@@ -2188,7 +2188,7 @@ void EITFixUp::FixNL(DBEventEIT &event) const
         bool ok;
         uint y = tmpYear1.cap(0).toUInt(&ok);
         if (ok)
-            event.originalairdate = QDate(y, 1, 1);
+            event.m_originalairdate = QDate(y, 1, 1);
     }
 
     if (tmpYear2.indexIn(fullinfo) != -1)
@@ -2196,7 +2196,7 @@ void EITFixUp::FixNL(DBEventEIT &event) const
         bool ok;
         uint y = tmpYear2.cap(2).toUInt(&ok);
         if (ok)
-            event.originalairdate = QDate(y, 1, 1);
+            event.m_originalairdate = QDate(y, 1, 1);
     }
 
     // Try to find director
@@ -2221,28 +2221,28 @@ void EITFixUp::FixNL(DBEventEIT &event) const
     }
 
     // Remove omroep from title
-    if (event.title.indexOf(m_nlOmroep) != -1)
+    if (event.m_title.indexOf(m_nlOmroep) != -1)
     {
-        event.title = event.title.replace(m_nlOmroep, "");
+        event.m_title = event.m_title.replace(m_nlOmroep, "");
     }
 
     // Put information back in description
 
-    event.description = fullinfo;
-    event.description = event.description.trimmed();
-    event.title       = event.title.trimmed();
-    event.subtitle    = event.subtitle.trimmed();
+    event.m_description = fullinfo;
+    event.m_description = event.m_description.trimmed();
+    event.m_title       = event.m_title.trimmed();
+    event.m_subtitle    = event.m_subtitle.trimmed();
 
 }
 
 void EITFixUp::FixCategory(DBEventEIT &event) const
 {
     // remove category movie from short events
-    if (event.categoryType == ProgramInfo::kCategoryMovie &&
-        event.starttime.secsTo(event.endtime) < kMinMovieDuration)
+    if (event.m_categoryType == ProgramInfo::kCategoryMovie &&
+        event.m_starttime.secsTo(event.m_endtime) < kMinMovieDuration)
     {
         /* default taken from ContentDescriptor::GetMythCategory */
-        event.categoryType = ProgramInfo::kCategoryTVShow;
+        event.m_categoryType = ProgramInfo::kCategoryTVShow;
     }
 }
 
@@ -2252,25 +2252,25 @@ void EITFixUp::FixCategory(DBEventEIT &event) const
 void EITFixUp::FixNO(DBEventEIT &event) const
 {
     // Check for "title (R)" in the title
-    int position = event.title.indexOf(m_noRerun);
+    int position = event.m_title.indexOf(m_noRerun);
     if (position != -1)
     {
-      event.previouslyshown = true;
-      event.title = event.title.replace(m_noRerun, "");
+      event.m_previouslyshown = true;
+      event.m_title = event.m_title.replace(m_noRerun, "");
     }
     // Check for "subtitle (HD)" in the subtitle
-    position = event.subtitle.indexOf(m_noHD);
+    position = event.m_subtitle.indexOf(m_noHD);
     if (position != -1)
     {
-      event.videoProps |= VID_HDTV;
-      event.subtitle = event.subtitle.replace(m_noHD, "");
+      event.m_videoProps |= VID_HDTV;
+      event.m_subtitle = event.m_subtitle.replace(m_noHD, "");
     }
    // Check for "description (HD)" in the description
-    position = event.description.indexOf(m_noHD);
+    position = event.m_description.indexOf(m_noHD);
     if (position != -1)
     {
-      event.videoProps |= VID_HDTV;
-      event.description = event.description.replace(m_noHD, "");
+      event.m_videoProps |= VID_HDTV;
+      event.m_description = event.m_description.replace(m_noHD, "");
     }
 }
 
@@ -2281,48 +2281,48 @@ void EITFixUp::FixNRK_DVBT(DBEventEIT &event) const
 {
     QRegExp    tmpExp1;
     // Check for "title (R)" in the title
-    if (event.title.indexOf(m_noRerun) != -1)
+    if (event.m_title.indexOf(m_noRerun) != -1)
     {
-      event.previouslyshown = true;
-      event.title = event.title.replace(m_noRerun, "");
+      event.m_previouslyshown = true;
+      event.m_title = event.m_title.replace(m_noRerun, "");
     }
     // Check for "(R)" in the description
-    if (event.description.indexOf(m_noRerun) != -1)
+    if (event.m_description.indexOf(m_noRerun) != -1)
     {
-      event.previouslyshown = true;
+      event.m_previouslyshown = true;
     }
     // Move colon separated category from program-titles into description
     // Have seen "NRK2s historiekveld: Film: bla-bla"
     tmpExp1 =  m_noNRKCategories;
-    while ((tmpExp1.indexIn(event.title) != -1) &&
+    while ((tmpExp1.indexIn(event.m_title) != -1) &&
            (tmpExp1.cap(2).length() > 1))
     {
-        event.title  = tmpExp1.cap(2);
-        event.description = "(" + tmpExp1.cap(1) + ") " + event.description;
+        event.m_title  = tmpExp1.cap(2);
+        event.m_description = "(" + tmpExp1.cap(1) + ") " + event.m_description;
     }
     // Remove season premiere markings
     tmpExp1 = m_noPremiere;
-    if (tmpExp1.indexIn(event.title) >= 3)
+    if (tmpExp1.indexIn(event.m_title) >= 3)
     {
-        event.title.remove(m_noPremiere);
+        event.m_title.remove(m_noPremiere);
     }
     // Try to find colon-delimited subtitle in title, only tested for NRK channels
     tmpExp1 = m_noColonSubtitle;
-    if (!event.title.startsWith("CSI:") &&
-        !event.title.startsWith("CD:") &&
-        !event.title.startsWith("Distriktsnyheter: fra"))
+    if (!event.m_title.startsWith("CSI:") &&
+        !event.m_title.startsWith("CD:") &&
+        !event.m_title.startsWith("Distriktsnyheter: fra"))
     {
-        if (tmpExp1.indexIn(event.title) != -1)
+        if (tmpExp1.indexIn(event.m_title) != -1)
         {
 
-            if (event.subtitle.length() <= 0)
+            if (event.m_subtitle.length() <= 0)
             {
-                event.title    = tmpExp1.cap(1);
-                event.subtitle = tmpExp1.cap(2);
+                event.m_title    = tmpExp1.cap(1);
+                event.m_subtitle = tmpExp1.cap(2);
             }
-            else if (event.subtitle == tmpExp1.cap(2))
+            else if (event.m_subtitle == tmpExp1.cap(2))
             {
-                event.title    = tmpExp1.cap(1);
+                event.m_title    = tmpExp1.cap(1);
             }
         }
     }
@@ -2341,46 +2341,46 @@ void EITFixUp::FixDK(DBEventEIT &event) const
     // Title search
     // episode and part/part total
     tmpRegEx = m_dkEpisode;
-    int position = event.title.indexOf(tmpRegEx);
+    int position = event.m_title.indexOf(tmpRegEx);
     if (position != -1)
     {
       episode = tmpRegEx.cap(1).toInt();
-      event.partnumber = tmpRegEx.cap(1).toInt();
-      event.title = event.title.replace(tmpRegEx, "");
+      event.m_partnumber = tmpRegEx.cap(1).toInt();
+      event.m_title = event.m_title.replace(tmpRegEx, "");
     }
 
     tmpRegEx = m_dkPart;
-    position = event.title.indexOf(tmpRegEx);
+    position = event.m_title.indexOf(tmpRegEx);
     if (position != -1)
     {
       episode = tmpRegEx.cap(1).toInt();
-      event.partnumber = tmpRegEx.cap(1).toInt();
-      event.parttotal = tmpRegEx.cap(2).toInt();
-      event.title = event.title.replace(tmpRegEx, "");
+      event.m_partnumber = tmpRegEx.cap(1).toInt();
+      event.m_parttotal = tmpRegEx.cap(2).toInt();
+      event.m_title = event.m_title.replace(tmpRegEx, "");
     }
 
     // subtitle delimiters
     tmpRegEx = m_dkSubtitle1;
-    position = event.title.indexOf(tmpRegEx);
+    position = event.m_title.indexOf(tmpRegEx);
     if (position != -1)
     {
-      event.title = tmpRegEx.cap(1);
-      event.subtitle = tmpRegEx.cap(2);
+      event.m_title = tmpRegEx.cap(1);
+      event.m_subtitle = tmpRegEx.cap(2);
     }
     else
     {
         tmpRegEx = m_dkSubtitle2;
-        if(event.title.indexOf(tmpRegEx) != -1)
+        if(event.m_title.indexOf(tmpRegEx) != -1)
         {
-            event.title = tmpRegEx.cap(1);
-            event.subtitle = tmpRegEx.cap(2);
+            event.m_title = tmpRegEx.cap(1);
+            event.m_subtitle = tmpRegEx.cap(2);
         }
     }
     // Description search
     // Season (Sæson [:digit:]+.) => episode = season episode number
     // or year (- år [:digit:]+(\\)|:) ) => episode = total episode number
     tmpRegEx = m_dkSeason1;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
       season = tmpRegEx.cap(1).toInt();
@@ -2388,46 +2388,46 @@ void EITFixUp::FixDK(DBEventEIT &event) const
     else
     {
         tmpRegEx = m_dkSeason2;
-        if(event.description.indexOf(tmpRegEx) !=  -1)
+        if(event.m_description.indexOf(tmpRegEx) !=  -1)
         {
             season = tmpRegEx.cap(1).toInt();
         }
     }
 
     if (episode > 0)
-        event.episode = episode;
+        event.m_episode = episode;
 
     if (season > 0)
-        event.season = season;
+        event.m_season = season;
 
     //Feature:
     tmpRegEx = m_dkFeatures;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         QString features = tmpRegEx.cap(1);
-        event.description = event.description.replace(tmpRegEx, "");
+        event.m_description = event.m_description.replace(tmpRegEx, "");
         // 16:9
         if (features.indexOf(m_dkWidescreen) !=  -1)
-            event.videoProps |= VID_WIDESCREEN;
+            event.m_videoProps |= VID_WIDESCREEN;
         // HDTV
         if (features.indexOf(m_dkHD) !=  -1)
-            event.videoProps |= VID_HDTV;
+            event.m_videoProps |= VID_HDTV;
         // Dolby Digital surround
         if (features.indexOf(m_dkDolby) !=  -1)
-            event.audioProps |= AUD_DOLBY;
+            event.m_audioProps |= AUD_DOLBY;
         // surround
         if (features.indexOf(m_dkSurround) !=  -1)
-            event.audioProps |= AUD_SURROUND;
+            event.m_audioProps |= AUD_SURROUND;
         // stereo
         if (features.indexOf(m_dkStereo) !=  -1)
-            event.audioProps |= AUD_STEREO;
+            event.m_audioProps |= AUD_STEREO;
         // (G)
         if (features.indexOf(m_dkReplay) !=  -1)
-            event.previouslyshown = true;
+            event.m_previouslyshown = true;
         // TTV
         if (features.indexOf(m_dkTxt) !=  -1)
-            event.subtitleType |= SUB_NORMAL;
+            event.m_subtitleType |= SUB_NORMAL;
     }
 
     // Series and program id
@@ -2435,43 +2435,43 @@ void EITFixUp::FixDK(DBEventEIT &event) const
     // YouSee doesn't use a default authority but uses the first byte after
     // the / to indicate if the seriesid is global unique or unique on the
     // service id
-    if (event.seriesId.length() >= 1 && event.seriesId[0] == '/')
+    if (event.m_seriesId.length() >= 1 && event.m_seriesId[0] == '/')
     {
         QString newid;
-        if (event.seriesId[1] == '1')
-            newid = QString("%1%2").arg(event.chanid).
-                    arg(event.seriesId.mid(2,8));
+        if (event.m_seriesId[1] == '1')
+            newid = QString("%1%2").arg(event.m_chanid).
+                    arg(event.m_seriesId.mid(2,8));
         else
-            newid = event.seriesId.mid(2,8);
-        event.seriesId = newid;
+            newid = event.m_seriesId.mid(2,8);
+        event.m_seriesId = newid;
     }
 
-    if (event.programId.length() >= 1 && event.programId[0] == '/')
-        event.programId[0]='_';
+    if (event.m_programId.length() >= 1 && event.m_programId[0] == '/')
+        event.m_programId[0]='_';
 
     // Add season and episode number to subtitle
     if (episode > 0)
     {
-        event.subtitle = QString("%1 (%2").arg(event.subtitle).arg(episode);
-        if (event.parttotal >0)
-            event.subtitle = QString("%1:%2").arg(event.subtitle).
-                    arg(event.parttotal);
+        event.m_subtitle = QString("%1 (%2").arg(event.m_subtitle).arg(episode);
+        if (event.m_parttotal >0)
+            event.m_subtitle = QString("%1:%2").arg(event.m_subtitle).
+                    arg(event.m_parttotal);
         if (season > 0)
         {
-            event.season = season;
-            event.episode = episode;
-            event.syndicatedepisodenumber =
+            event.m_season = season;
+            event.m_episode = episode;
+            event.m_syndicatedepisodenumber =
                     QString("S%1E%2").arg(season).arg(episode);
-            event.subtitle = QString("%1 S\xE6son %2").arg(event.subtitle).
+            event.m_subtitle = QString("%1 S\xE6son %2").arg(event.m_subtitle).
                     arg(season);
         }
-        event.subtitle = QString("%1)").arg(event.subtitle);
+        event.m_subtitle = QString("%1)").arg(event.m_subtitle);
     }
 
     // Find actors and director in description
     tmpRegEx = m_dkDirector;
     bool directorPresent = false;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         QString tmpDirectorsString = tmpRegEx.cap(1);
@@ -2489,7 +2489,7 @@ void EITFixUp::FixDK(DBEventEIT &event) const
     }
 
     tmpRegEx = m_dkActors;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         QString tmpActorsString = tmpRegEx.cap(1);
@@ -2508,18 +2508,18 @@ void EITFixUp::FixDK(DBEventEIT &event) const
     }
     //find year
     tmpRegEx = m_dkYear;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         bool ok;
         uint y = tmpRegEx.cap(1).toUInt(&ok);
         if (ok)
-            event.originalairdate = QDate(y, 1, 1);
+            event.m_originalairdate = QDate(y, 1, 1);
     }
     // Remove white spaces
-    event.description = event.description.trimmed();
-    event.title       = event.title.trimmed();
-    event.subtitle    = event.subtitle.trimmed();
+    event.m_description = event.m_description.trimmed();
+    event.m_title       = event.m_title.trimmed();
+    event.m_subtitle    = event.m_subtitle.trimmed();
 }
 
 /** \fn EITFixUp::FixStripHTML(DBEventEIT&) const
@@ -2527,8 +2527,8 @@ void EITFixUp::FixDK(DBEventEIT &event) const
  */
 void EITFixUp::FixStripHTML(DBEventEIT &event) const
 {
-    LOG(VB_EIT, LOG_INFO, QString("Applying html strip to %1").arg(event.title));
-    event.title.remove(m_HTML);
+    LOG(VB_EIT, LOG_INFO, QString("Applying html strip to %1").arg(event.m_title));
+    event.m_title.remove(m_HTML);
 }
 
 // Moves the subtitle field into the description since it's just used
@@ -2537,16 +2537,16 @@ void EITFixUp::FixStripHTML(DBEventEIT &event) const
 // we remove it.
 void EITFixUp::FixGreekSubtitle(DBEventEIT &event) const
 {
-    if (event.title == event.description)
+    if (event.m_title == event.m_description)
     {
-        event.description = QString("");
+        event.m_description = QString("");
     }
-    if (!event.subtitle.isEmpty())
+    if (!event.m_subtitle.isEmpty())
     {
-        if (event.subtitle.trimmed().right(1) != ".'" )
-            event.subtitle = event.subtitle.trimmed() + ".";
-        event.description = event.subtitle.trimmed() + QString(" ") + event.description;
-        event.subtitle = QString("");
+        if (event.m_subtitle.trimmed().right(1) != ".'" )
+            event.m_subtitle = event.m_subtitle.trimmed() + ".";
+        event.m_description = event.m_subtitle.trimmed() + QString(" ") + event.m_description;
+        event.m_subtitle = QString("");
     }
 }
 
@@ -2555,44 +2555,44 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
     //Live show
     int position;
     QRegExp tmpRegEx;
-    position = event.title.indexOf("(Ζ)");
+    position = event.m_title.indexOf("(Ζ)");
     if (position != -1)
     {
-        event.title = event.title.replace("(Ζ)", "");
-        event.description.prepend("Ζωντανή Μετάδοση. ");
+        event.m_title = event.m_title.replace("(Ζ)", "");
+        event.m_description.prepend("Ζωντανή Μετάδοση. ");
     }
 
     // Greek not previously Shown
-    position = event.title.indexOf(m_grNotPreviouslyShown);
+    position = event.m_title.indexOf(m_grNotPreviouslyShown);
     if (position != -1)
     {
-        event.previouslyshown = false;
-        event.title = event.title.replace(m_grNotPreviouslyShown.cap(0), "");
+        event.m_previouslyshown = false;
+        event.m_title = event.m_title.replace(m_grNotPreviouslyShown.cap(0), "");
     }
 
     // Greek Replay (Ε)
     // it might look redundant compared to previous check but at least it helps
     // remove the (Ε) From the title.
     tmpRegEx = m_grReplay;
-    if (event.title.indexOf(tmpRegEx) !=  -1)
+    if (event.m_title.indexOf(tmpRegEx) !=  -1)
     {
-        event.previouslyshown = true;
-        event.title = event.title.replace(tmpRegEx, "");
+        event.m_previouslyshown = true;
+        event.m_title = event.m_title.replace(tmpRegEx, "");
     }
 
     tmpRegEx = m_grFixnofullstopActors;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
-        event.description.insert(position + 1, ".");
+        event.m_description.insert(position + 1, ".");
     }
 
     // If they forgot the "." at the end of the sentence before the actors/directors begin, let's insert it.
     tmpRegEx = m_grFixnofullstopDirectors;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
-        event.description.insert(position + 1, ".");
+        event.m_description.insert(position + 1, ".");
     }
 
     // Find actors and director in description
@@ -2602,7 +2602,7 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
     // before actors in the description field.). So removing the text after
     // adding the actors AND THEN looking for dir/pres helps to clear things up.
     tmpRegEx = m_grActors;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         QString tmpActorsString = tmpRegEx.cap(1);
@@ -2616,11 +2616,11 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
             if (tmpActorsString != "")
                 event.AddPerson(DBPerson::kActor, tmpActorsString);
         }
-        event.description.replace(tmpRegEx.cap(0), "");
+        event.m_description.replace(tmpRegEx.cap(0), "");
     }
     // Director
     tmpRegEx = m_grDirector;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         QString tmpDirectorsString = tmpRegEx.cap(1);
@@ -2636,13 +2636,13 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
                 event.AddPerson(DBPerson::kDirector, tmpDirectorsString);
             }
         }
-        event.description.replace(tmpRegEx.cap(0), "");
+        event.m_description.replace(tmpRegEx.cap(0), "");
     }
 
 /*
 
     tmpRegEx = m_grDirector;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         // director is captured in cap(1).Due to sometimes miswritten data in
@@ -2666,13 +2666,13 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
                 event.AddPerson(DBPerson::kDirector, tmpDirectorsString);
 
         }
-        event.description.replace(tmpRegEx.cap(0), "");
+        event.m_description.replace(tmpRegEx.cap(0), "");
        // directorPresent = true;
     }
 */
     //Try to find presenter
     tmpRegEx = m_grPres;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         QString tmpPresentersString = tmpRegEx.cap(1);
@@ -2688,34 +2688,34 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
                 event.AddPerson(DBPerson::kPresenter, tmpPresentersString);
             }
         }
-        event.description.replace(tmpRegEx.cap(0), "");
+        event.m_description.replace(tmpRegEx.cap(0), "");
     }
 
     //find year e.g Παραγωγής 1966 ή ΝΤΟΚΙΜΑΝΤΕΡ - 1998 Κατάλληλο για όλους
     // Used in Private channels (not 'secret', just not owned by Government!)
     tmpRegEx = m_grYear;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
         bool ok;
         uint y = tmpRegEx.cap(1).toUInt(&ok);
         if (ok)
         {
-            event.originalairdate = QDate(y, 1, 1);
-            event.description.replace(tmpRegEx, "");
+            event.m_originalairdate = QDate(y, 1, 1);
+            event.m_description.replace(tmpRegEx, "");
         }
     }
     // Remove white spaces
-    event.description = event.description.trimmed();
-    event.title       = event.title.trimmed();
-    event.subtitle    = event.subtitle.trimmed();
+    event.m_description = event.m_description.trimmed();
+    event.m_title       = event.m_title.trimmed();
+    event.m_subtitle    = event.m_subtitle.trimmed();
 
     //find country of origin and remove it from description.
     tmpRegEx = m_grCountry;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
-        event.description.replace(tmpRegEx, "");
+        event.m_description.replace(tmpRegEx, "");
     }
 
     // Work out the season and episode numbers (if any)
@@ -2724,8 +2724,8 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
     QRegExp tmpSeries = m_grSeason;
     // cap(2) is the season for ΑΒΓΔ
     // cap(3) is the season for 1234
-    int position1 = tmpSeries.indexIn(event.title);
-    int position2 = tmpSeries.indexIn(event.description);
+    int position1 = tmpSeries.indexIn(event.m_title);
+    int position2 = tmpSeries.indexIn(event.m_description);
     if ((position1 != -1) || (position2 != -1))
     {
         if (!tmpSeries.cap(2).isEmpty()) // we found a letter representing a number
@@ -2736,44 +2736,44 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
             if (tmpinteger < 1)
             {
                 if (tmpSeries.cap(2) == "ΣΤ") // 6, don't ask!
-                    event.season = 6;
+                    event.m_season = 6;
                 else
                 {
                     QString LettToNumber = "0ΑΒΓΔΕ6ΖΗΘΙΚΛΜΝ";
                     tmpinteger = LettToNumber.indexOf(tmpSeries.cap(2));
                     if (tmpinteger != -1)
-                        event.season = tmpinteger;
+                        event.m_season = tmpinteger;
                 }
             }
         }
         else if (!tmpSeries.cap(3).isEmpty()) //number
         {
-            event.season = tmpSeries.cap(3).toUInt();
+            event.m_season = tmpSeries.cap(3).toUInt();
         }
         series = true;
         if (position1 != -1)
-            event.title.replace(tmpSeries.cap(0),"");
+            event.m_title.replace(tmpSeries.cap(0),"");
         if (position2 != -1)
-            event.description.replace(tmpSeries.cap(0),"");
+            event.m_description.replace(tmpSeries.cap(0),"");
     }
 
     QRegExp tmpEpisode = m_grlongEp;
     //tmpEpisode.setMinimal(true);
     // cap(1) is the Episode No.
-    if ((position1 = tmpEpisode.indexIn(event.title)) != -1
-            || (position2 = tmpEpisode.indexIn(event.description)) != -1)
+    if ((position1 = tmpEpisode.indexIn(event.m_title)) != -1
+            || (position2 = tmpEpisode.indexIn(event.m_description)) != -1)
     {
         if (!tmpEpisode.cap(1).isEmpty())
         {
-            event.episode = tmpEpisode.cap(1).toUInt();
+            event.m_episode = tmpEpisode.cap(1).toUInt();
             series = true;
             if (position1 != -1)
-                event.title.replace(tmpEpisode.cap(0),"");
+                event.m_title.replace(tmpEpisode.cap(0),"");
             if (position2 != -1)
-                event.description.replace(tmpEpisode.cap(0),"");
+                event.m_description.replace(tmpEpisode.cap(0),"");
             // Sometimes description omits Season if it's 1. We fix this
-            if (0 == event.season)
-                event.season = 1;
+            if (0 == event.m_season)
+                event.m_season = 1;
         }
     }
 
@@ -2785,154 +2785,154 @@ void EITFixUp::FixGreekEIT(DBEventEIT &event) const
     // retrieval. The old title will be moved in the description.
     QRegExp tmptitle = m_grRealTitleinDescription;
     tmptitle.setMinimal(true);
-    position = event.description.indexOf(tmptitle);
+    position = event.m_description.indexOf(tmptitle);
     if (position != -1)
     {
-        event.description = event.description.replace(tmptitle, "");
-        if (tmptitle.cap(0) != event.title.trimmed())
+        event.m_description = event.m_description.replace(tmptitle, "");
+        if (tmptitle.cap(0) != event.m_title.trimmed())
         {
-            event.description = "(" + event.title.trimmed() + "). " + event.description;
+            event.m_description = "(" + event.m_title.trimmed() + "). " + event.m_description;
         }
-        event.title = tmptitle.cap(1);
+        event.m_title = tmptitle.cap(1);
         // Remove the real title from the description
     }
     else // search in title
     {
         tmptitle = m_grRealTitleinTitle;
-        position = event.title.indexOf(tmptitle);
+        position = event.m_title.indexOf(tmptitle);
         if (position != -1) // found in title instead
         {
-            event.title.replace(tmptitle.cap(0),"");
-            QString tmpTranslTitle = event.title;
-            //QString tmpTranslTitle = event.title.replace(tmptitle.cap(0),"");
-            event.title = tmptitle.cap(1);
-            event.description = "(" + tmpTranslTitle.trimmed() + "). " + event.description;
+            event.m_title.replace(tmptitle.cap(0),"");
+            QString tmpTranslTitle = event.m_title;
+            //QString tmpTranslTitle = event.m_title.replace(tmptitle.cap(0),"");
+            event.m_title = tmptitle.cap(1);
+            event.m_description = "(" + tmpTranslTitle.trimmed() + "). " + event.m_description;
         }
     }
 
     // Description field: "^Episode: Lion in the cage. (Description follows)"
     tmpRegEx = m_grEpisodeAsSubtitle;
-    position = event.description.indexOf(tmpRegEx);
+    position = event.m_description.indexOf(tmpRegEx);
     if (position != -1)
     {
-        event.subtitle = tmpRegEx.cap(1).trimmed();
-        event.description.replace(tmpRegEx, "");
+        event.m_subtitle = tmpRegEx.cap(1).trimmed();
+        event.m_description.replace(tmpRegEx, "");
     }
     QRegExp m_grMovie("\\bταιν[ιί]α\\b",Qt::CaseInsensitive);
-    bool isMovie = (event.description.indexOf(m_grMovie) !=-1) ;
+    bool isMovie = (event.m_description.indexOf(m_grMovie) !=-1) ;
     if (isMovie)
     {
-        event.categoryType = ProgramInfo::kCategoryMovie;
+        event.m_categoryType = ProgramInfo::kCategoryMovie;
     }
     else if (series)
     {
-        event.categoryType = ProgramInfo::kCategorySeries;
+        event.m_categoryType = ProgramInfo::kCategorySeries;
     }
     // just for luck, retrim fields.
-    event.description = event.description.trimmed();
-    event.title       = event.title.trimmed();
-    event.subtitle    = event.subtitle.trimmed();
+    event.m_description = event.m_description.trimmed();
+    event.m_title       = event.m_title.trimmed();
+    event.m_subtitle    = event.m_subtitle.trimmed();
 
 // να σβήσω τα κομμάτια που περισσεύουν από την περιγραφή πχ παραγωγής χχχχ
 }
 
 void EITFixUp::FixGreekCategories(DBEventEIT &event) const
 {
-    if (event.description.indexOf(m_grCategComedy) != -1)
+    if (event.m_description.indexOf(m_grCategComedy) != -1)
     {
-        event.category = "Κωμωδία";
+        event.m_category = "Κωμωδία";
     }
-    else if (event.description.indexOf(m_grCategTeleMag) != -1)
+    else if (event.m_description.indexOf(m_grCategTeleMag) != -1)
     {
-        event.category = "Τηλεπεριοδικό";
+        event.m_category = "Τηλεπεριοδικό";
     }
-    else if (event.description.indexOf(m_grCategNature) != -1)
+    else if (event.m_description.indexOf(m_grCategNature) != -1)
     {
-        event.category = "Επιστήμη/Φύση";
+        event.m_category = "Επιστήμη/Φύση";
     }
-    else if (event.description.indexOf(m_grCategHealth) != -1)
+    else if (event.m_description.indexOf(m_grCategHealth) != -1)
     {
-        event.category = "Υγεία";
+        event.m_category = "Υγεία";
     }
-    else if (event.description.indexOf(m_grCategReality) != -1)
+    else if (event.m_description.indexOf(m_grCategReality) != -1)
     {
-        event.category = "Ριάλιτι";
+        event.m_category = "Ριάλιτι";
     }
-    else if (event.description.indexOf(m_grCategDrama) != -1)
+    else if (event.m_description.indexOf(m_grCategDrama) != -1)
     {
-        event.category = "Κοινωνικό";
+        event.m_category = "Κοινωνικό";
     }
-    else if (event.description.indexOf(m_grCategChildren) != -1)
+    else if (event.m_description.indexOf(m_grCategChildren) != -1)
     {
-        event.category = "Παιδικό";
+        event.m_category = "Παιδικό";
     }
-    else if (event.description.indexOf(m_grCategSciFi) != -1)
+    else if (event.m_description.indexOf(m_grCategSciFi) != -1)
     {
-        event.category = "Επιστ.Φαντασίας";
+        event.m_category = "Επιστ.Φαντασίας";
     }
-    else if ((event.description.indexOf(m_grCategFantasy) != -1)
-             && (event.description.indexOf(m_grCategMystery) != -1))
+    else if ((event.m_description.indexOf(m_grCategFantasy) != -1)
+             && (event.m_description.indexOf(m_grCategMystery) != -1))
     {
-        event.category = "Φαντασίας/Μυστηρίου";
+        event.m_category = "Φαντασίας/Μυστηρίου";
     }
-    else if (event.description.indexOf(m_grCategMystery) != -1)
+    else if (event.m_description.indexOf(m_grCategMystery) != -1)
     {
-        event.category = "Μυστηρίου";
+        event.m_category = "Μυστηρίου";
     }
-    else if (event.description.indexOf(m_grCategFantasy) != -1)
+    else if (event.m_description.indexOf(m_grCategFantasy) != -1)
     {
-        event.category = "Φαντασίας";
+        event.m_category = "Φαντασίας";
     }
-    else if (event.description.indexOf(m_grCategHistory) != -1)
+    else if (event.m_description.indexOf(m_grCategHistory) != -1)
     {
-        event.category = "Ιστορικό";
+        event.m_category = "Ιστορικό";
     }
-    else if (event.description.indexOf(m_grCategTeleShop) != -1
-            || event.title.indexOf(m_grCategTeleShop) != -1)
+    else if (event.m_description.indexOf(m_grCategTeleShop) != -1
+            || event.m_title.indexOf(m_grCategTeleShop) != -1)
     {
-        event.category = "Τηλεπωλήσεις";
+        event.m_category = "Τηλεπωλήσεις";
     }
-    else if (event.description.indexOf(m_grCategFood) != -1)
+    else if (event.m_description.indexOf(m_grCategFood) != -1)
     {
-        event.category = "Γαστρονομία";
+        event.m_category = "Γαστρονομία";
     }
-    else if (event.description.indexOf(m_grCategGameShow) != -1
-             || event.title.indexOf(m_grCategGameShow) != -1)
+    else if (event.m_description.indexOf(m_grCategGameShow) != -1
+             || event.m_title.indexOf(m_grCategGameShow) != -1)
     {
-        event.category = "Τηλεπαιχνίδι";
+        event.m_category = "Τηλεπαιχνίδι";
     }
-    else if (event.description.indexOf(m_grCategBiography) != -1)
+    else if (event.m_description.indexOf(m_grCategBiography) != -1)
     {
-        event.category = "Βιογραφία";
+        event.m_category = "Βιογραφία";
     }
-    else if (event.title.indexOf(m_grCategNews) != -1)
+    else if (event.m_title.indexOf(m_grCategNews) != -1)
     {
-        event.category = "Ειδήσεις";
+        event.m_category = "Ειδήσεις";
     }
-    else if (event.description.indexOf(m_grCategSports) != -1)
+    else if (event.m_description.indexOf(m_grCategSports) != -1)
     {
-        event.category = "Αθλητικά";
+        event.m_category = "Αθλητικά";
     }
-    else if (event.description.indexOf(m_grCategMusic) != -1
-            || event.title.indexOf(m_grCategMusic) != -1)
+    else if (event.m_description.indexOf(m_grCategMusic) != -1
+            || event.m_title.indexOf(m_grCategMusic) != -1)
     {
-        event.category = "Μουσική";
+        event.m_category = "Μουσική";
     }
-    else if (event.description.indexOf(m_grCategDocumentary) != -1)
+    else if (event.m_description.indexOf(m_grCategDocumentary) != -1)
     {
-        event.category = "Ντοκιμαντέρ";
+        event.m_category = "Ντοκιμαντέρ";
     }
-    else if (event.description.indexOf(m_grCategReligion) != -1)
+    else if (event.m_description.indexOf(m_grCategReligion) != -1)
     {
-        event.category = "Θρησκεία";
+        event.m_category = "Θρησκεία";
     }
-    else if (event.description.indexOf(m_grCategCulture) != -1)
+    else if (event.m_description.indexOf(m_grCategCulture) != -1)
     {
-        event.category = "Τέχνες/Πολιτισμός";
+        event.m_category = "Τέχνες/Πολιτισμός";
     }
-    else if (event.description.indexOf(m_grCategSpecial) != -1)
+    else if (event.m_description.indexOf(m_grCategSpecial) != -1)
     {
-        event.category = "Αφιέρωμα";
+        event.m_category = "Αφιέρωμα";
     }
 
 }
@@ -2943,50 +2943,50 @@ void EITFixUp::FixUnitymedia(DBEventEIT &event) const
     // TODO remove short description (stored as episode title) which is just the beginning of the long description (actual description)
 
     // drop the short description if its copy the start of the long description
-    if (event.description.startsWith (event.subtitle))
+    if (event.m_description.startsWith (event.m_subtitle))
     {
-        event.subtitle = "";
+        event.m_subtitle = "";
     }
 
     // handle cast and crew in items in the DVB Extended Event Descriptor
     // remove handled items from the map, so the left overs can be reported
-    QMap<QString,QString>::iterator i = event.items.begin();
-    while (i != event.items.end())
+    QMap<QString,QString>::iterator i = event.m_items.begin();
+    while (i != event.m_items.end())
     {
         if (QString::compare (i.key(), "Role Player") == 0)
         {
             event.AddPerson (DBPerson::kActor, i.value());
-            i = event.items.erase (i);
+            i = event.m_items.erase (i);
         }
         else if (QString::compare (i.key(), "Director") == 0)
         {
             event.AddPerson (DBPerson::kDirector, i.value());
-            i = event.items.erase (i);
+            i = event.m_items.erase (i);
         }
         else if (QString::compare (i.key(), "Commentary or Commentator") == 0)
         {
             event.AddPerson (DBPerson::kCommentator, i.value());
-            i = event.items.erase (i);
+            i = event.m_items.erase (i);
         }
         else if (QString::compare (i.key(), "Performing Artist") == 0)
         {
             event.AddPerson (DBPerson::kActor, i.value());
-            i = event.items.erase (i);
+            i = event.m_items.erase (i);
         }
         else if (QString::compare (i.key(), "Presenter") == 0)
         {
             event.AddPerson (DBPerson::kPresenter, i.value());
-            i = event.items.erase (i);
+            i = event.m_items.erase (i);
         }
         else if (QString::compare (i.key(), "Producer") == 0)
         {
             event.AddPerson (DBPerson::kProducer, i.value());
-            i = event.items.erase (i);
+            i = event.m_items.erase (i);
         }
         else if (QString::compare (i.key(), "Scriptwriter") == 0)
         {
             event.AddPerson (DBPerson::kWriter, i.value());
-            i = event.items.erase (i);
+            i = event.m_items.erase (i);
         }
         else
         {
@@ -2996,10 +2996,10 @@ void EITFixUp::FixUnitymedia(DBEventEIT &event) const
 
     // handle star rating in the description
     QRegExp tmp = m_unitymediaImdbrating;
-    if (event.description.indexOf (tmp) != -1)
+    if (event.m_description.indexOf (tmp) != -1)
     {
         float stars = tmp.cap(1).toFloat();
-        event.stars = stars / 10.0f;
-        event.description.replace (m_unitymediaImdbrating, "");
+        event.m_stars = stars / 10.0f;
+        event.m_description.replace (m_unitymediaImdbrating, "");
     }
 }
diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp
index 8cdf01aa9b9..ccaeaa04ea9 100644
--- a/mythtv/libs/libmythtv/eithelper.cpp
+++ b/mythtv/libs/libmythtv/eithelper.cpp
@@ -80,7 +80,7 @@ uint EITHelper::ProcessEvents(void)
         eitfixup->Fix(*event);
 
         insertCount += event->UpdateDB(query, 1000);
-        maxStarttime = max (maxStarttime, event->starttime);
+        maxStarttime = max (maxStarttime, event->m_starttime);
 
         delete event;
         eitList_lock.lock();
@@ -106,11 +106,11 @@ uint EITHelper::ProcessEvents(void)
     return insertCount;
 }
 
-void EITHelper::SetFixup(uint atsc_major, uint atsc_minor, FixupValue eitfixup)
+void EITHelper::SetFixup(uint atsc_major, uint atsc_minor, FixupValue drheitfixup)
 {
     QMutexLocker locker(&eitList_lock);
     FixupKey atsc_key = (atsc_major << 16) | atsc_minor;
-    fixup[atsc_key] = eitfixup;
+    fixup[atsc_key] = drheitfixup;
 }
 
 void EITHelper::SetLanguagePreferences(const QStringList &langPref)
@@ -693,7 +693,7 @@ void EITHelper::AddEIT(const DVBEventInformationTable *eit)
             video_props, stars,
             seriesId,  programId,
             season, episode, totalepisodes);
-        event->items = items;
+        event->m_items = items;
 
         db_events.enqueue(event);
     }
@@ -808,7 +808,7 @@ void EITHelper::AddEIT(const PremiereContentInformationTable *cit)
                 video_props, 0.0,
                 "",  "",
                 season, episode, totalepisodes);
-            event->items = items;
+            event->m_items = items;
 
             db_events.enqueue(event);
         }
diff --git a/mythtv/libs/libmythtv/playgroup.h b/mythtv/libs/libmythtv/playgroup.h
index d4d38e63ed9..2d394167444 100644
--- a/mythtv/libs/libmythtv/playgroup.h
+++ b/mythtv/libs/libmythtv/playgroup.h
@@ -31,7 +31,7 @@ class MTV_PUBLIC PlayGroupEditor : public GroupSetting
     void CreateNewPlayBackGroupSlot(const QString&);
 
   private:
-    ButtonStandardSetting *m_addGroupButton;
+    ButtonStandardSetting *m_addGroupButton {nullptr};
 };
 
 class MTV_PUBLIC PlayGroupConfig : public GroupSetting
@@ -46,12 +46,12 @@ class MTV_PUBLIC PlayGroupConfig : public GroupSetting
     void deleteEntry(void) override; // GroupSetting
 
   private:
-    StandardSetting            *m_titleMatch;
-    MythUISpinBoxSetting       *m_skipAhead;
-    MythUISpinBoxSetting       *m_skipBack;
-    MythUISpinBoxSetting       *m_jumpMinutes;
-    MythUISpinBoxSetting       *m_timeStrech;
-    bool                        m_isNew;
+    StandardSetting            *m_titleMatch  {nullptr};
+    MythUISpinBoxSetting       *m_skipAhead   {nullptr};
+    MythUISpinBoxSetting       *m_skipBack    {nullptr};
+    MythUISpinBoxSetting       *m_jumpMinutes {nullptr};
+    MythUISpinBoxSetting       *m_timeStrech  {nullptr};
+    bool                        m_isNew       {false};
 };
 
 #endif
diff --git a/mythtv/libs/libmythtv/programdata.cpp b/mythtv/libs/libmythtv/programdata.cpp
index b46a15d64b8..43dfdb330b4 100644
--- a/mythtv/libs/libmythtv/programdata.cpp
+++ b/mythtv/libs/libmythtv/programdata.cpp
@@ -58,36 +58,36 @@ static void add_genres(MSqlQuery &query, const QStringList &genres,
 }
 
 DBPerson::DBPerson(const DBPerson &other) :
-    role(other.role), name(other.name)
+    m_role(other.m_role), m_name(other.m_name)
 {
-    name.squeeze();
+    m_name.squeeze();
 }
 
-DBPerson::DBPerson(Role _role, const QString &_name) :
-    role(_role), name(_name)
+DBPerson::DBPerson(Role role, const QString &name) :
+    m_role(role), m_name(name)
 {
-    name.squeeze();
+    m_name.squeeze();
 }
 
-DBPerson::DBPerson(const QString &_role, const QString &_name) :
-    role(kUnknown), name(_name)
+DBPerson::DBPerson(const QString &role, const QString &name) :
+    m_role(kUnknown), m_name(name)
 {
-    if (!_role.isEmpty())
+    if (!role.isEmpty())
     {
         for (uint i = 0; i < sizeof(roles) / sizeof(char *); i++)
         {
-            if (_role == QString(roles[i]))
-                role = (Role) i;
+            if (role == QString(roles[i]))
+                m_role = (Role) i;
         }
     }
-    name.squeeze();
+    m_name.squeeze();
 }
 
 QString DBPerson::GetRole(void) const
 {
-    if ((role < kActor) || (role > kGuest))
+    if ((m_role < kActor) || (m_role > kGuest))
         return "guest";
-    return roles[role];
+    return roles[m_role];
 }
 
 uint DBPerson::InsertDB(MSqlQuery &query, uint chanid,
@@ -106,7 +106,7 @@ uint DBPerson::GetPersonDB(MSqlQuery &query) const
         "SELECT person "
         "FROM people "
         "WHERE name = :NAME");
-    query.bindValue(":NAME", name);
+    query.bindValue(":NAME", m_name);
 
     if (!query.exec())
         MythDB::DBError("get_person", query);
@@ -121,7 +121,7 @@ uint DBPerson::InsertPersonDB(MSqlQuery &query) const
     query.prepare(
         "INSERT IGNORE INTO people (name) "
         "VALUES (:NAME);");
-    query.bindValue(":NAME", name);
+    query.bindValue(":NAME", m_name);
 
     if (query.exec())
         return 1;
@@ -157,50 +157,50 @@ DBEvent &DBEvent::operator=(const DBEvent &other)
     if (this == &other)
         return *this;
 
-    title           = other.title;
-    subtitle        = other.subtitle;
-    description     = other.description;
-    category        = other.category;
-    starttime       = other.starttime;
-    endtime         = other.endtime;
-    airdate         = other.airdate;
-    originalairdate = other.originalairdate;
+    m_title           = other.m_title;
+    m_subtitle        = other.m_subtitle;
+    m_description     = other.m_description;
+    m_category        = other.m_category;
+    m_starttime       = other.m_starttime;
+    m_endtime         = other.m_endtime;
+    m_airdate         = other.m_airdate;
+    m_originalairdate = other.m_originalairdate;
 
-    if (credits != other.credits)
+    if (m_credits != other.m_credits)
     {
-        if (credits)
+        if (m_credits)
         {
-            delete credits;
-            credits = nullptr;
+            delete m_credits;
+            m_credits = nullptr;
         }
 
-        if (other.credits)
+        if (other.m_credits)
         {
-            credits = new DBCredits;
-            credits->insert(credits->end(),
-                            other.credits->begin(),
-                            other.credits->end());
+            m_credits = new DBCredits;
+            m_credits->insert(m_credits->end(),
+                            other.m_credits->begin(),
+                            other.m_credits->end());
         }
     }
 
-    partnumber      = other.partnumber;
-    parttotal       = other.parttotal;
-    syndicatedepisodenumber = other.syndicatedepisodenumber;
-    subtitleType    = other.subtitleType;
-    audioProps      = other.audioProps;
-    videoProps      = other.videoProps;
-    stars           = other.stars;
-    categoryType    = other.categoryType;
-    seriesId        = other.seriesId;
-    programId       = other.programId;
-    inetref         = other.inetref;
-    previouslyshown = other.previouslyshown;
-    ratings         = other.ratings;
-    listingsource   = other.listingsource;
-    season          = other.season;
-    episode         = other.episode;
-    totalepisodes   = other.totalepisodes;
-    genres          = other.genres;
+    m_partnumber              = other.m_partnumber;
+    m_parttotal               = other.m_parttotal;
+    m_syndicatedepisodenumber = other.m_syndicatedepisodenumber;
+    m_subtitleType            = other.m_subtitleType;
+    m_audioProps              = other.m_audioProps;
+    m_videoProps              = other.m_videoProps;
+    m_stars                   = other.m_stars;
+    m_categoryType            = other.m_categoryType;
+    m_seriesId                = other.m_seriesId;
+    m_programId               = other.m_programId;
+    m_inetref                 = other.m_inetref;
+    m_previouslyshown         = other.m_previouslyshown;
+    m_ratings                 = other.m_ratings;
+    m_listingsource           = other.m_listingsource;
+    m_season                  = other.m_season;
+    m_episode                 = other.m_episode;
+    m_totalepisodes           = other.m_totalepisodes;
+    m_genres                  = other.m_genres;
 
     Squeeze();
 
@@ -209,36 +209,36 @@ DBEvent &DBEvent::operator=(const DBEvent &other)
 
 void DBEvent::Squeeze(void)
 {
-    title.squeeze();
-    subtitle.squeeze();
-    description.squeeze();
-    category.squeeze();
-    syndicatedepisodenumber.squeeze();
-    seriesId.squeeze();
-    programId.squeeze();
-    inetref.squeeze();
+    m_title.squeeze();
+    m_subtitle.squeeze();
+    m_description.squeeze();
+    m_category.squeeze();
+    m_syndicatedepisodenumber.squeeze();
+    m_seriesId.squeeze();
+    m_programId.squeeze();
+    m_inetref.squeeze();
 }
 
 void DBEvent::AddPerson(DBPerson::Role role, const QString &name)
 {
-    if (!credits)
-        credits = new DBCredits;
+    if (!m_credits)
+        m_credits = new DBCredits;
 
-    credits->push_back(DBPerson(role, name.simplified()));
+    m_credits->push_back(DBPerson(role, name.simplified()));
 }
 
 void DBEvent::AddPerson(const QString &role, const QString &name)
 {
-    if (!credits)
-        credits = new DBCredits;
+    if (!m_credits)
+        m_credits = new DBCredits;
 
-    credits->push_back(DBPerson(role, name.simplified()));
+    m_credits->push_back(DBPerson(role, name.simplified()));
 }
 
 bool DBEvent::HasTimeConflict(const DBEvent &o) const
 {
-    return ((starttime <= o.starttime && o.starttime < endtime) ||
-            (o.endtime <= endtime     && starttime   < o.endtime));
+    return ((m_starttime <= o.m_starttime && o.m_starttime < m_endtime) ||
+            (o.m_endtime <= m_endtime     && m_starttime   < o.m_endtime));
 }
 
 // Processing new EIT entry starts here
@@ -248,18 +248,18 @@ uint DBEvent::UpdateDB(
     // List the program that we are going to add
     LOG(VB_EIT, LOG_DEBUG,
         QString("EIT: new program: %1 %2 '%3' chanid %4")
-                .arg(starttime.toString(Qt::ISODate))
-                .arg(endtime.toString(Qt::ISODate))
-                .arg(title.left(35))
+                .arg(m_starttime.toString(Qt::ISODate))
+                .arg(m_endtime.toString(Qt::ISODate))
+                .arg(m_title.left(35))
                 .arg(chanid));
 
     // Do not insert or update when the program is in the past
     QDateTime now = QDateTime::currentDateTimeUtc();
-    if (endtime < now)
+    if (m_endtime < now)
     {
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: skip '%1' endtime is in the past")
-                    .arg(title.left(35)));
+                    .arg(m_title.left(35)));
         return 0;
     }
 
@@ -281,9 +281,9 @@ uint DBEvent::UpdateDB(
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: overlap[%1] : %2 %3 '%4'")
                 .arg(j)
-                .arg(programs[j].starttime.toString(Qt::ISODate))
-                .arg(programs[j].endtime.toString(Qt::ISODate))
-                .arg(programs[j].title.left(35)));
+                .arg(programs[j].m_starttime.toString(Qt::ISODate))
+                .arg(programs[j].m_endtime.toString(Qt::ISODate))
+                .arg(programs[j].m_title.left(35)));
     }
 
     // Determine which of the overlapping programs is a match with
@@ -300,8 +300,8 @@ uint DBEvent::UpdateDB(
         // out of the way.
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: accept match[%1]: %2 '%3' vs. '%4'")
-                .arg(i).arg(match).arg(title.left(35))
-                .arg(programs[i].title.left(35)));
+                .arg(i).arg(match).arg(m_title.left(35))
+                .arg(programs[i].m_title.left(35)));
         return UpdateDB(query, chanid, programs, i);
     }
     else
@@ -313,8 +313,8 @@ uint DBEvent::UpdateDB(
         {
             LOG(VB_EIT, LOG_DEBUG,
                 QString("EIT: reject match[%1]: %2 '%3' vs. '%4'")
-                    .arg(i).arg(match).arg(title.left(35))
-                    .arg(programs[i].title.left(35)));
+                    .arg(i).arg(match).arg(m_title.left(35))
+                    .arg(programs[i].m_title.left(35)));
         }
 
         // Move the overlapping programs out of the way and
@@ -370,12 +370,12 @@ uint DBEvent::GetOverlappingPrograms(
         "        ( endtime   >  :STIME2 AND endtime   <= :ETIME2 ) OR "
         "        ( starttime <  :STIME3 AND endtime   >  :ETIME3 ) )");
     query.bindValue(":CHANID", chanid);
-    query.bindValue(":STIME1", starttime);
-    query.bindValue(":ETIME1", endtime);
-    query.bindValue(":STIME2", starttime);
-    query.bindValue(":ETIME2", endtime);
-    query.bindValue(":STIME3", starttime);
-    query.bindValue(":ETIME3", endtime);
+    query.bindValue(":STIME1", m_starttime);
+    query.bindValue(":ETIME1", m_endtime);
+    query.bindValue(":STIME2", m_starttime);
+    query.bindValue(":ETIME2", m_endtime);
+    query.bindValue(":STIME3", m_starttime);
+    query.bindValue(":ETIME3", m_endtime);
 
     if (!query.exec())
     {
@@ -407,13 +407,13 @@ uint DBEvent::GetOverlappingPrograms(
             query.value(21).toUInt(),  // Episode
             query.value(22).toUInt()); // Total Episodes
 
-        prog.inetref    = query.value(23).toString();
-        prog.partnumber = query.value(12).toUInt();
-        prog.parttotal  = query.value(13).toUInt();
-        prog.syndicatedepisodenumber = query.value(14).toString();
-        prog.airdate    = query.value(15).toUInt();
-        prog.originalairdate  = query.value(16).toDate();
-        prog.previouslyshown  = query.value(17).toBool();
+        prog.m_inetref    = query.value(23).toString();
+        prog.m_partnumber = query.value(12).toUInt();
+        prog.m_parttotal  = query.value(13).toUInt();
+        prog.m_syndicatedepisodenumber = query.value(14).toString();
+        prog.m_airdate    = query.value(15).toUInt();
+        prog.m_originalairdate  = query.value(16).toDate();
+        prog.m_previouslyshown  = query.value(17).toBool();
 
         programs.push_back(prog);
         count++;
@@ -488,32 +488,32 @@ int DBEvent::GetMatch(const vector<DBEvent> &programs, int &bestmatch) const
     bestmatch = -1;
     int match_val = INT_MIN;
     int overlap = 0;
-    int duration = starttime.secsTo(endtime);
+    int duration = m_starttime.secsTo(m_endtime);
 
     for (uint i = 0; i < programs.size(); i++)
     {
         int mv = 0;
-        int duration_loop = programs[i].starttime.secsTo(programs[i].endtime);
+        int duration_loop = programs[i].m_starttime.secsTo(programs[i].m_endtime);
 
-        mv -= qAbs(starttime.secsTo(programs[i].starttime));
-        mv -= qAbs(endtime.secsTo(programs[i].endtime));
+        mv -= qAbs(m_starttime.secsTo(programs[i].m_starttime));
+        mv -= qAbs(m_endtime.secsTo(programs[i].m_endtime));
         mv -= qAbs(duration - duration_loop);
-        mv += score_match(title, programs[i].title) * 10;
-        mv += score_match(subtitle, programs[i].subtitle);
-        mv += score_match(description, programs[i].description);
+        mv += score_match(m_title, programs[i].m_title) * 10;
+        mv += score_match(m_subtitle, programs[i].m_subtitle);
+        mv += score_match(m_description, programs[i].m_description);
 
         /* determine overlap of both programs
          * we don't know which one starts first */
-        if (starttime < programs[i].starttime)
-            overlap = programs[i].starttime.secsTo(endtime);
-        else if (starttime > programs[i].starttime)
-            overlap = starttime.secsTo(programs[i].endtime);
+        if (m_starttime < programs[i].m_starttime)
+            overlap = programs[i].m_starttime.secsTo(m_endtime);
+        else if (m_starttime > programs[i].m_starttime)
+            overlap = m_starttime.secsTo(programs[i].m_endtime);
         else
         {
-            if (endtime <= programs[i].endtime)
-                overlap = starttime.secsTo(endtime);
+            if (m_endtime <= programs[i].m_endtime)
+                overlap = m_starttime.secsTo(m_endtime);
             else
-                overlap = starttime.secsTo(programs[i].endtime);
+                overlap = m_starttime.secsTo(programs[i].m_endtime);
         }
 
         /* scale the score depending on the overlap length
@@ -534,12 +534,12 @@ int DBEvent::GetMatch(const vector<DBEvent> &programs, int &bestmatch) const
             LOG(VB_GENERAL, LOG_ERR,
                 QString("Unexpected result: shows don't "
                         "overlap\n\t%1: %2 - %3\n\t%4: %5 - %6")
-                    .arg(title.left(35))
-                    .arg(starttime.toString(Qt::ISODate))
-                    .arg(endtime.toString(Qt::ISODate))
-                    .arg(programs[i].title.left(35), 35)
-                    .arg(programs[i].starttime.toString(Qt::ISODate))
-                    .arg(programs[i].endtime.toString(Qt::ISODate))
+                    .arg(m_title.left(35))
+                    .arg(m_starttime.toString(Qt::ISODate))
+                    .arg(m_endtime.toString(Qt::ISODate))
+                    .arg(programs[i].m_title.left(35), 35)
+                    .arg(programs[i].m_starttime.toString(Qt::ISODate))
+                    .arg(programs[i].m_endtime.toString(Qt::ISODate))
                 );
         }
 
@@ -547,8 +547,8 @@ int DBEvent::GetMatch(const vector<DBEvent> &programs, int &bestmatch) const
         {
             LOG(VB_EIT, LOG_DEBUG,
                 QString("GM : '%1' new best match '%2' with score %3")
-                    .arg(title.left(35))
-                    .arg(programs[i].title.left(35)).arg(mv));
+                    .arg(m_title.left(35))
+                    .arg(programs[i].m_title.left(35)).arg(mv));
             bestmatch = i;
             match_val = mv;
         }
@@ -573,7 +573,7 @@ uint DBEvent::UpdateDB(
     {
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: cannot insert '%1' MoveOutOfTheWayDB failed")
-                    .arg(title.left(35)));
+                    .arg(m_title.left(35)));
         return 0;
     }
 
@@ -582,7 +582,7 @@ uint DBEvent::UpdateDB(
     {
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: insert '%1'")
-                    .arg(title.left(35)));
+                    .arg(m_title.left(35)));
         return InsertDB(q, chanid);
     }
 
@@ -590,14 +590,14 @@ uint DBEvent::UpdateDB(
     // start another recording of the same program.
     // Therefore we skip updates that change a starttime in the past
     // unless the endtime is later.
-    if (starttime != p[match].starttime)
+    if (m_starttime != p[match].m_starttime)
     {
         QDateTime now = QDateTime::currentDateTimeUtc();
-        if (starttime < now && endtime <= p[match].endtime)
+        if (m_starttime < now && m_endtime <= p[match].m_endtime)
         {
             LOG(VB_EIT, LOG_DEBUG,
                 QString("EIT:  skip '%1' starttime is in the past")
-                        .arg(title.left(35)));
+                        .arg(m_title.left(35)));
             return 0;
         }
     }
@@ -605,8 +605,8 @@ uint DBEvent::UpdateDB(
     // Update matched item with current data
     LOG(VB_EIT, LOG_DEBUG,
          QString("EIT: update '%1' with '%2'")
-                 .arg(p[match].title.left(35))
-                 .arg(title.left(35)));
+                 .arg(p[match].m_title.left(35))
+                 .arg(m_title.left(35)));
     return UpdateDB(q, chanid, p[match]);
 }
 
@@ -615,81 +615,81 @@ uint DBEvent::UpdateDB(
 uint DBEvent::UpdateDB(
     MSqlQuery &query, uint chanid, const DBEvent &match)  const
 {
-    QString  ltitle     = title;
-    QString  lsubtitle  = subtitle;
-    QString  ldesc      = description;
-    QString  lcategory  = category;
-    uint16_t lairdate   = airdate;
-    QString  lprogramId = programId;
-    QString  lseriesId  = seriesId;
-    QString  linetref   = inetref;
-    QDate loriginalairdate = originalairdate;
+    QString  ltitle           = m_title;
+    QString  lsubtitle        = m_subtitle;
+    QString  ldesc            = m_description;
+    QString  lcategory        = m_category;
+    uint16_t lairdate         = m_airdate;
+    QString  lprogramId       = m_programId;
+    QString  lseriesId        = m_seriesId;
+    QString  linetref         = m_inetref;
+    QDate    loriginalairdate = m_originalairdate;
 
-    if (match.title.length() >= ltitle.length())
-        ltitle = match.title;
+    if (match.m_title.length() >= ltitle.length())
+        ltitle = match.m_title;
 
-    if (match.subtitle.length() >= lsubtitle.length())
-        lsubtitle = match.subtitle;
+    if (match.m_subtitle.length() >= lsubtitle.length())
+        lsubtitle = match.m_subtitle;
 
-    if (match.description.length() >= ldesc.length())
-        ldesc = match.description;
+    if (match.m_description.length() >= ldesc.length())
+        ldesc = match.m_description;
 
-    if (lcategory.isEmpty() && !match.category.isEmpty())
-        lcategory = match.category;
+    if (lcategory.isEmpty() && !match.m_category.isEmpty())
+        lcategory = match.m_category;
 
-    if (!lairdate && !match.airdate)
-        lairdate = match.airdate;
+    if (!lairdate && !match.m_airdate)
+        lairdate = match.m_airdate;
 
-    if (!loriginalairdate.isValid() && match.originalairdate.isValid())
-        loriginalairdate = match.originalairdate;
+    if (!loriginalairdate.isValid() && match.m_originalairdate.isValid())
+        loriginalairdate = match.m_originalairdate;
 
-    if (lprogramId.isEmpty() && !match.programId.isEmpty())
-        lprogramId = match.programId;
+    if (lprogramId.isEmpty() && !match.m_programId.isEmpty())
+        lprogramId = match.m_programId;
 
-    if (lseriesId.isEmpty() && !match.seriesId.isEmpty())
-        lseriesId = match.seriesId;
+    if (lseriesId.isEmpty() && !match.m_seriesId.isEmpty())
+        lseriesId = match.m_seriesId;
 
-    if (linetref.isEmpty() && !match.inetref.isEmpty())
-        linetref= match.inetref;
+    if (linetref.isEmpty() && !match.m_inetref.isEmpty())
+        linetref= match.m_inetref;
 
-    ProgramInfo::CategoryType tmp = categoryType;
-    if (!categoryType && match.categoryType)
-        tmp = match.categoryType;
+    ProgramInfo::CategoryType tmp = m_categoryType;
+    if (!m_categoryType && match.m_categoryType)
+        tmp = match.m_categoryType;
 
     QString lcattype = myth_category_type_to_string(tmp);
 
-    unsigned char lsubtype = subtitleType | match.subtitleType;
-    unsigned char laudio   = audioProps   | match.audioProps;
-    unsigned char lvideo   = videoProps   | match.videoProps;
+    unsigned char lsubtype = m_subtitleType | match.m_subtitleType;
+    unsigned char laudio   = m_audioProps   | match.m_audioProps;
+    unsigned char lvideo   = m_videoProps   | match.m_videoProps;
 
-    uint lseason = match.season;
-    uint lepisode = match.episode;
-    uint lepisodeTotal = match.totalepisodes;
+    uint lseason = match.m_season;
+    uint lepisode = match.m_episode;
+    uint lepisodeTotal = match.m_totalepisodes;
 
-    if (season || episode || totalepisodes)
+    if (m_season || m_episode || m_totalepisodes)
     {
-        lseason = season;
-        lepisode = episode;
-        lepisodeTotal = totalepisodes;
+        lseason = m_season;
+        lepisode = m_episode;
+        lepisodeTotal = m_totalepisodes;
     }
 
-    uint lpartnumber = match.partnumber;
-    uint lparttotal = match.parttotal;
+    uint lpartnumber = match.m_partnumber;
+    uint lparttotal = match.m_parttotal;
 
-    if (partnumber || parttotal)
+    if (m_partnumber || m_parttotal)
     {
-        lpartnumber = partnumber;
-        lparttotal  = parttotal;
+        lpartnumber = m_partnumber;
+        lparttotal  = m_parttotal;
     }
 
-    bool lpreviouslyshown = previouslyshown | match.previouslyshown;
+    bool lpreviouslyshown = m_previouslyshown | match.m_previouslyshown;
 
-    uint32_t llistingsource = listingsource | match.listingsource;
+    uint32_t llistingsource = m_listingsource | match.m_listingsource;
 
-    QString lsyndicatedepisodenumber = syndicatedepisodenumber;
+    QString lsyndicatedepisodenumber = m_syndicatedepisodenumber;
     if (lsyndicatedepisodenumber.isEmpty() &&
-        !match.syndicatedepisodenumber.isEmpty())
-        lsyndicatedepisodenumber = match.syndicatedepisodenumber;
+        !match.m_syndicatedepisodenumber.isEmpty())
+        lsyndicatedepisodenumber = match.m_syndicatedepisodenumber;
 
     query.prepare(
         "UPDATE program "
@@ -713,14 +713,14 @@ uint DBEvent::UpdateDB(
         "      starttime = :OLDSTART ");
 
     query.bindValue(":CHANID",      chanid);
-    query.bindValue(":OLDSTART",    match.starttime);
+    query.bindValue(":OLDSTART",    match.m_starttime);
     query.bindValue(":TITLE",       denullify(ltitle));
     query.bindValue(":SUBTITLE",    denullify(lsubtitle));
     query.bindValue(":DESC",        denullify(ldesc));
     query.bindValue(":CATEGORY",    denullify(lcategory));
     query.bindValue(":CATTYPE",     lcattype);
-    query.bindValue(":STARTTIME",   starttime);
-    query.bindValue(":ENDTIME",     endtime);
+    query.bindValue(":STARTTIME",   m_starttime);
+    query.bindValue(":ENDTIME",     m_endtime);
     query.bindValue(":CC",          (lsubtype & SUB_HARDHEAR) ? true : false);
     query.bindValue(":HASSUBTITLES",(lsubtype & SUB_NORMAL)   ? true : false);
     query.bindValue(":STEREO",      (laudio   & AUD_STEREO)   ? true : false);
@@ -748,29 +748,29 @@ uint DBEvent::UpdateDB(
         return 0;
     }
 
-    if (credits)
+    if (m_credits)
     {
-        for (uint i = 0; i < credits->size(); i++)
-            (*credits)[i].InsertDB(query, chanid, starttime);
+        for (uint i = 0; i < m_credits->size(); i++)
+            (*m_credits)[i].InsertDB(query, chanid, m_starttime);
     }
 
-    QList<EventRating>::const_iterator j = ratings.begin();
-    for (; j != ratings.end(); ++j)
+    QList<EventRating>::const_iterator j = m_ratings.begin();
+    for (; j != m_ratings.end(); ++j)
     {
         query.prepare(
             "INSERT IGNORE INTO programrating "
             "       ( chanid, starttime, system, rating) "
             "VALUES (:CHANID, :START,    :SYS,  :RATING)");
         query.bindValue(":CHANID", chanid);
-        query.bindValue(":START",  starttime);
-        query.bindValue(":SYS",    (*j).system);
-        query.bindValue(":RATING", (*j).rating);
+        query.bindValue(":START",  m_starttime);
+        query.bindValue(":SYS",    (*j).m_system);
+        query.bindValue(":RATING", (*j).m_rating);
 
         if (!query.exec())
             MythDB::DBError("programrating insert", query);
     }
 
-    add_genres(query, genres, chanid, starttime);
+    add_genres(query, m_genres, chanid, m_starttime);
 
     return 1;
 }
@@ -932,18 +932,18 @@ static bool change_program(MSqlQuery &query, uint chanid, const QDateTime &st,
 bool DBEvent::MoveOutOfTheWayDB(
     MSqlQuery &query, uint chanid, const DBEvent &prog) const
 {
-    if (prog.starttime >= starttime && prog.endtime <= endtime)
+    if (prog.m_starttime >= m_starttime && prog.m_endtime <= m_endtime)
     {
         // Old program completely inside our new program.
         // Delete the old program completely.
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: delete '%1' %2 - %3")
-                    .arg(prog.title.left(35))
-                    .arg(prog.starttime.toString(Qt::ISODate))
-                    .arg(prog.endtime.toString(Qt::ISODate)));
-        return delete_program(query, chanid, prog.starttime);
+                    .arg(prog.m_title.left(35))
+                    .arg(prog.m_starttime.toString(Qt::ISODate))
+                    .arg(prog.m_endtime.toString(Qt::ISODate)));
+        return delete_program(query, chanid, prog.m_starttime);
     }
-    else if (prog.starttime < starttime && prog.endtime > starttime)
+    else if (prog.m_starttime < m_starttime && prog.m_endtime > m_starttime)
     {
         // Old program starts before, but ends during or after our new program.
         // Adjust the end time of the old program to the start time
@@ -952,13 +952,13 @@ bool DBEvent::MoveOutOfTheWayDB(
         // the old program was after the end time of the new program!!
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: change '%1' endtime to %2")
-                    .arg(prog.title.left(35))
-                    .arg(starttime.toString(Qt::ISODate)));
-        return change_program(query, chanid, prog.starttime,
-                              prog.starttime, // Keep the start time
-                              starttime);     // New end time is our start time
+                    .arg(prog.m_title.left(35))
+                    .arg(m_starttime.toString(Qt::ISODate)));
+        return change_program(query, chanid, prog.m_starttime,
+                              prog.m_starttime, // Keep the start time
+                              m_starttime);     // New end time is our start time
     }
-    else if (prog.starttime < endtime && prog.endtime > endtime)
+    else if (prog.m_starttime < m_endtime && prog.m_endtime > m_endtime)
     {
         // Old program starts during, but ends after our new program.
         // Adjust the starttime of the old program to the end time
@@ -966,23 +966,23 @@ bool DBEvent::MoveOutOfTheWayDB(
         // If there is already a program starting just when our
         // new program ends we cannot move the old program
         // so then we have to delete the old program.
-        if (program_exists(query, chanid, endtime))
+        if (program_exists(query, chanid, m_endtime))
         {
             LOG(VB_EIT, LOG_DEBUG,
                 QString("EIT: delete '%1' %2 - %3")
-                        .arg(prog.title.left(35))
-                        .arg(prog.starttime.toString(Qt::ISODate))
-                        .arg(prog.endtime.toString(Qt::ISODate)));
-            return delete_program(query, chanid, prog.starttime);
+                        .arg(prog.m_title.left(35))
+                        .arg(prog.m_starttime.toString(Qt::ISODate))
+                        .arg(prog.m_endtime.toString(Qt::ISODate)));
+            return delete_program(query, chanid, prog.m_starttime);
         }
         LOG(VB_EIT, LOG_DEBUG,
             QString("EIT: change '%1' starttime to %2")
-                    .arg(prog.title.left(35))
-                    .arg(endtime.toString(Qt::ISODate)));
+                    .arg(prog.m_title.left(35))
+                    .arg(m_endtime.toString(Qt::ISODate)));
 
-        return change_program(query, chanid, prog.starttime,
-                              endtime,        // New start time is our endtime
-                              prog.endtime);  // Keep the end time
+        return change_program(query, chanid, prog.m_starttime,
+                              m_endtime,        // New start time is our endtime
+                              prog.m_endtime);  // Keep the end time
     }
     // must be non-conflicting...
     return true;
@@ -1019,37 +1019,37 @@ uint DBEvent::InsertDB(MSqlQuery &query, uint chanid) const
         " :SEASON,        :EPISODE,       :TOTALEPISODES, "
         " :INETREF ) ");
 
-    QString cattype = myth_category_type_to_string(categoryType);
+    QString cattype = myth_category_type_to_string(m_categoryType);
     QString empty("");
     query.bindValue(":CHANID",      chanid);
-    query.bindValue(":TITLE",       denullify(title));
-    query.bindValue(":SUBTITLE",    denullify(subtitle));
-    query.bindValue(":DESCRIPTION", denullify(description));
-    query.bindValue(":CATEGORY",    denullify(category));
+    query.bindValue(":TITLE",       denullify(m_title));
+    query.bindValue(":SUBTITLE",    denullify(m_subtitle));
+    query.bindValue(":DESCRIPTION", denullify(m_description));
+    query.bindValue(":CATEGORY",    denullify(m_category));
     query.bindValue(":CATTYPE",     cattype);
-    query.bindValue(":STARTTIME",   starttime);
-    query.bindValue(":ENDTIME",     endtime);
-    query.bindValue(":CC",          (subtitleType & SUB_HARDHEAR) ? true : false);
-    query.bindValue(":STEREO",      (audioProps   & AUD_STEREO)   ? true : false);
-    query.bindValue(":HDTV",        (videoProps   & VID_HDTV)     ? true : false);
-    query.bindValue(":HASSUBTITLES",(subtitleType & SUB_NORMAL)   ? true : false);
-    query.bindValue(":SUBTYPES",    subtitleType);
-    query.bindValue(":AUDIOPROP",   audioProps);
-    query.bindValue(":VIDEOPROP",   videoProps);
-    query.bindValue(":STARS",       stars);
-    query.bindValue(":PARTNUMBER",  partnumber);
-    query.bindValue(":PARTTOTAL",   parttotal);
-    query.bindValue(":SYNDICATENO", denullify(syndicatedepisodenumber));
-    query.bindValue(":AIRDATE",     airdate ? QString::number(airdate) : "0000");
-    query.bindValue(":ORIGAIRDATE", originalairdate);
-    query.bindValue(":LSOURCE",     listingsource);
-    query.bindValue(":SERIESID",    denullify(seriesId));
-    query.bindValue(":PROGRAMID",   denullify(programId));
-    query.bindValue(":PREVSHOWN",   previouslyshown);
-    query.bindValue(":SEASON",      season);
-    query.bindValue(":EPISODE",     episode);
-    query.bindValue(":TOTALEPISODES", totalepisodes);
-    query.bindValue(":INETREF",     inetref);
+    query.bindValue(":STARTTIME",   m_starttime);
+    query.bindValue(":ENDTIME",     m_endtime);
+    query.bindValue(":CC",          (m_subtitleType & SUB_HARDHEAR) ? true : false);
+    query.bindValue(":STEREO",      (m_audioProps   & AUD_STEREO)   ? true : false);
+    query.bindValue(":HDTV",        (m_videoProps   & VID_HDTV)     ? true : false);
+    query.bindValue(":HASSUBTITLES",(m_subtitleType & SUB_NORMAL)   ? true : false);
+    query.bindValue(":SUBTYPES",    m_subtitleType);
+    query.bindValue(":AUDIOPROP",   m_audioProps);
+    query.bindValue(":VIDEOPROP",   m_videoProps);
+    query.bindValue(":STARS",       m_stars);
+    query.bindValue(":PARTNUMBER",  m_partnumber);
+    query.bindValue(":PARTTOTAL",   m_parttotal);
+    query.bindValue(":SYNDICATENO", denullify(m_syndicatedepisodenumber));
+    query.bindValue(":AIRDATE",     m_airdate ? QString::number(m_airdate) : "0000");
+    query.bindValue(":ORIGAIRDATE", m_originalairdate);
+    query.bindValue(":LSOURCE",     m_listingsource);
+    query.bindValue(":SERIESID",    denullify(m_seriesId));
+    query.bindValue(":PROGRAMID",   denullify(m_programId));
+    query.bindValue(":PREVSHOWN",   m_previouslyshown);
+    query.bindValue(":SEASON",      m_season);
+    query.bindValue(":EPISODE",     m_episode);
+    query.bindValue(":TOTALEPISODES", m_totalepisodes);
+    query.bindValue(":INETREF",     m_inetref);
 
     if (!query.exec())
     {
@@ -1057,35 +1057,35 @@ uint DBEvent::InsertDB(MSqlQuery &query, uint chanid) const
         return 0;
     }
 
-    QList<EventRating>::const_iterator j = ratings.begin();
-    for (; j != ratings.end(); ++j)
+    QList<EventRating>::const_iterator j = m_ratings.begin();
+    for (; j != m_ratings.end(); ++j)
     {
         query.prepare(
             "INSERT IGNORE INTO programrating "
             "       ( chanid, starttime, system, rating) "
             "VALUES (:CHANID, :START,    :SYS,  :RATING)");
         query.bindValue(":CHANID", chanid);
-        query.bindValue(":START",  starttime);
-        query.bindValue(":SYS",    (*j).system);
-        query.bindValue(":RATING", (*j).rating);
+        query.bindValue(":START",  m_starttime);
+        query.bindValue(":SYS",    (*j).m_system);
+        query.bindValue(":RATING", (*j).m_rating);
 
         if (!query.exec())
             MythDB::DBError("programrating insert", query);
     }
 
-    if (credits)
+    if (m_credits)
     {
-        for (uint i = 0; i < credits->size(); i++)
-            (*credits)[i].InsertDB(query, chanid, starttime);
+        for (uint i = 0; i < m_credits->size(); i++)
+            (*m_credits)[i].InsertDB(query, chanid, m_starttime);
     }
 
-    add_genres(query, genres, chanid, starttime);
+    add_genres(query, m_genres, chanid, m_starttime);
 
     return 1;
 }
 
 ProgInfo::ProgInfo(const ProgInfo &other) :
-    DBEvent(other.listingsource)
+    DBEvent(other.m_listingsource)
 {
     *this = other;
 }
@@ -1097,23 +1097,23 @@ ProgInfo &ProgInfo::operator=(const ProgInfo &other)
 
     DBEvent::operator=(other);
 
-    channel         = other.channel;
-    startts         = other.startts;
-    endts           = other.endts;
-    title_pronounce = other.title_pronounce;
-    showtype        = other.showtype;
-    colorcode       = other.colorcode;
-    clumpidx        = other.clumpidx;
-    clumpmax        = other.clumpmax;
-
-    channel.squeeze();
-    startts.squeeze();
-    endts.squeeze();
-    title_pronounce.squeeze();
-    showtype.squeeze();
-    colorcode.squeeze();
-    clumpidx.squeeze();
-    clumpmax.squeeze();
+    m_channel         = other.m_channel;
+    m_startts         = other.m_startts;
+    m_endts           = other.m_endts;
+    m_title_pronounce = other.m_title_pronounce;
+    m_showtype        = other.m_showtype;
+    m_colorcode       = other.m_colorcode;
+    m_clumpidx        = other.m_clumpidx;
+    m_clumpmax        = other.m_clumpmax;
+
+    m_channel.squeeze();
+    m_startts.squeeze();
+    m_endts.squeeze();
+    m_title_pronounce.squeeze();
+    m_showtype.squeeze();
+    m_colorcode.squeeze();
+    m_clumpidx.squeeze();
+    m_clumpmax.squeeze();
 
     return *this;
 }
@@ -1121,14 +1121,14 @@ ProgInfo &ProgInfo::operator=(const ProgInfo &other)
 void ProgInfo::Squeeze(void)
 {
     DBEvent::Squeeze();
-    channel.squeeze();
-    startts.squeeze();
-    endts.squeeze();
-    title_pronounce.squeeze();
-    showtype.squeeze();
-    colorcode.squeeze();
-    clumpidx.squeeze();
-    clumpmax.squeeze();
+    m_channel.squeeze();
+    m_startts.squeeze();
+    m_endts.squeeze();
+    m_title_pronounce.squeeze();
+    m_showtype.squeeze();
+    m_colorcode.squeeze();
+    m_clumpidx.squeeze();
+    m_clumpmax.squeeze();
 }
 
 /**
@@ -1147,10 +1147,10 @@ uint ProgInfo::InsertDB(MSqlQuery &query, uint chanid) const
 {
     LOG(VB_XMLTV, LOG_INFO,
         QString("Inserting new program    : %1 - %2 %3 %4")
-            .arg(starttime.toString(Qt::ISODate))
-            .arg(endtime.toString(Qt::ISODate))
-            .arg(channel)
-            .arg(title));
+            .arg(m_starttime.toString(Qt::ISODate))
+            .arg(m_endtime.toString(Qt::ISODate))
+            .arg(m_channel)
+            .arg(m_title));
 
     query.prepare(
         "REPLACE INTO program ("
@@ -1181,44 +1181,44 @@ uint ProgInfo::InsertDB(MSqlQuery &query, uint chanid) const
         " :SEASON,        :EPISODE,       :TOTALEPISODES, "
         " :INETREF )");
 
-    QString cattype = myth_category_type_to_string(categoryType);
+    QString cattype = myth_category_type_to_string(m_categoryType);
 
     query.bindValue(":CHANID",      chanid);
-    query.bindValue(":TITLE",       denullify(title));
-    query.bindValue(":SUBTITLE",    denullify(subtitle));
-    query.bindValue(":DESCRIPTION", denullify(description));
-    query.bindValue(":CATEGORY",    denullify(category));
+    query.bindValue(":TITLE",       denullify(m_title));
+    query.bindValue(":SUBTITLE",    denullify(m_subtitle));
+    query.bindValue(":DESCRIPTION", denullify(m_description));
+    query.bindValue(":CATEGORY",    denullify(m_category));
     query.bindValue(":CATTYPE",     cattype);
-    query.bindValue(":STARTTIME",   starttime);
-    query.bindValue(":ENDTIME",     denullify(endtime));
+    query.bindValue(":STARTTIME",   m_starttime);
+    query.bindValue(":ENDTIME",     denullify(m_endtime));
     query.bindValue(":CC",
-                    (subtitleType & SUB_HARDHEAR) ? true : false);
+                    (m_subtitleType & SUB_HARDHEAR) ? true : false);
     query.bindValue(":STEREO",
-                    (audioProps   & AUD_STEREO)   ? true : false);
+                    (m_audioProps   & AUD_STEREO)   ? true : false);
     query.bindValue(":HDTV",
-                    (videoProps   & VID_HDTV)     ? true : false);
+                    (m_videoProps   & VID_HDTV)     ? true : false);
     query.bindValue(":HASSUBTITLES",
-                    (subtitleType & SUB_NORMAL)   ? true : false);
-    query.bindValue(":SUBTYPES",    subtitleType);
-    query.bindValue(":AUDIOPROP",   audioProps);
-    query.bindValue(":VIDEOPROP",   videoProps);
-    query.bindValue(":PARTNUMBER",  partnumber);
-    query.bindValue(":PARTTOTAL",   parttotal);
-    query.bindValue(":SYNDICATENO", denullify(syndicatedepisodenumber));
-    query.bindValue(":AIRDATE",     airdate ? QString::number(airdate):"0000");
-    query.bindValue(":ORIGAIRDATE", originalairdate);
-    query.bindValue(":LSOURCE",     listingsource);
-    query.bindValue(":SERIESID",    denullify(seriesId));
-    query.bindValue(":PROGRAMID",   denullify(programId));
-    query.bindValue(":PREVSHOWN",   previouslyshown);
-    query.bindValue(":STARS",       stars);
-    query.bindValue(":SHOWTYPE",    showtype);
-    query.bindValue(":TITLEPRON",   title_pronounce);
-    query.bindValue(":COLORCODE",   colorcode);
-    query.bindValue(":SEASON",      season);
-    query.bindValue(":EPISODE",     episode);
-    query.bindValue(":TOTALEPISODES", totalepisodes);
-    query.bindValue(":INETREF",     inetref);
+                    (m_subtitleType & SUB_NORMAL)   ? true : false);
+    query.bindValue(":SUBTYPES",    m_subtitleType);
+    query.bindValue(":AUDIOPROP",   m_audioProps);
+    query.bindValue(":VIDEOPROP",   m_videoProps);
+    query.bindValue(":PARTNUMBER",  m_partnumber);
+    query.bindValue(":PARTTOTAL",   m_parttotal);
+    query.bindValue(":SYNDICATENO", denullify(m_syndicatedepisodenumber));
+    query.bindValue(":AIRDATE",     m_airdate ? QString::number(m_airdate):"0000");
+    query.bindValue(":ORIGAIRDATE", m_originalairdate);
+    query.bindValue(":LSOURCE",     m_listingsource);
+    query.bindValue(":SERIESID",    denullify(m_seriesId));
+    query.bindValue(":PROGRAMID",   denullify(m_programId));
+    query.bindValue(":PREVSHOWN",   m_previouslyshown);
+    query.bindValue(":STARS",       m_stars);
+    query.bindValue(":SHOWTYPE",    m_showtype);
+    query.bindValue(":TITLEPRON",   m_title_pronounce);
+    query.bindValue(":COLORCODE",   m_colorcode);
+    query.bindValue(":SEASON",      m_season);
+    query.bindValue(":EPISODE",     m_episode);
+    query.bindValue(":TOTALEPISODES", m_totalepisodes);
+    query.bindValue(":INETREF",     m_inetref);
 
     if (!query.exec())
     {
@@ -1226,29 +1226,29 @@ uint ProgInfo::InsertDB(MSqlQuery &query, uint chanid) const
         return 0;
     }
 
-    QList<EventRating>::const_iterator j = ratings.begin();
-    for (; j != ratings.end(); ++j)
+    QList<EventRating>::const_iterator j = m_ratings.begin();
+    for (; j != m_ratings.end(); ++j)
     {
         query.prepare(
             "INSERT IGNORE INTO programrating "
             "       ( chanid, starttime, system, rating) "
             "VALUES (:CHANID, :START,    :SYS,  :RATING)");
         query.bindValue(":CHANID", chanid);
-        query.bindValue(":START",  starttime);
-        query.bindValue(":SYS",    (*j).system);
-        query.bindValue(":RATING", (*j).rating);
+        query.bindValue(":START",  m_starttime);
+        query.bindValue(":SYS",    (*j).m_system);
+        query.bindValue(":RATING", (*j).m_rating);
 
         if (!query.exec())
             MythDB::DBError("programrating insert", query);
     }
 
-    if (credits)
+    if (m_credits)
     {
-        for (uint i = 0; i < credits->size(); ++i)
-            (*credits)[i].InsertDB(query, chanid, starttime);
+        for (uint i = 0; i < m_credits->size(); ++i)
+            (*m_credits)[i].InsertDB(query, chanid, m_starttime);
     }
 
-    add_genres(query, genres, chanid, starttime);
+    add_genres(query, m_genres, chanid, m_starttime);
 
     return 1;
 }
@@ -1315,7 +1315,7 @@ bool ProgramData::ClearDataBySource(
 
 static bool start_time_less_than(const DBEvent *a, const DBEvent *b)
 {
-    return (a->starttime < b->starttime);
+    return (a->m_starttime < b->m_starttime);
 }
 
 void ProgramData::FixProgramList(QList<ProgInfo*> &fixlist)
@@ -1329,12 +1329,12 @@ void ProgramData::FixProgramList(QList<ProgInfo*> &fixlist)
         ++it;
 
         // fill in miss stop times
-        if ((*cur)->endts.isEmpty() || (*cur)->startts > (*cur)->endts)
+        if ((*cur)->m_endts.isEmpty() || (*cur)->m_startts > (*cur)->m_endts)
         {
             if (it != fixlist.end())
             {
-                (*cur)->endts   = (*it)->startts;
-                (*cur)->endtime = (*it)->starttime;
+                (*cur)->m_endts   = (*it)->m_startts;
+                (*cur)->m_endtime = (*it)->m_starttime;
             }
             /* if its the last programme in the file then leave its
                endtime as 0000-00-00 00:00:00 so we can find it easily in
@@ -1349,18 +1349,18 @@ void ProgramData::FixProgramList(QList<ProgInfo*> &fixlist)
         {
             QList<ProgInfo*>::iterator tokeep, todelete;
 
-            if ((*cur)->endtime <= (*cur)->starttime)
+            if ((*cur)->m_endtime <= (*cur)->m_starttime)
                 tokeep = it, todelete = cur;
-            else if ((*it)->endtime <= (*it)->starttime)
+            else if ((*it)->m_endtime <= (*it)->m_starttime)
                 tokeep = cur, todelete = it;
-            else if (!(*cur)->subtitle.isEmpty() &&
-                     (*it)->subtitle.isEmpty())
+            else if (!(*cur)->m_subtitle.isEmpty() &&
+                     (*it)->m_subtitle.isEmpty())
                 tokeep = cur, todelete = it;
-            else if (!(*it)->subtitle.isEmpty()  &&
-                     (*cur)->subtitle.isEmpty())
+            else if (!(*it)->m_subtitle.isEmpty()  &&
+                     (*cur)->m_subtitle.isEmpty())
                 tokeep = it, todelete = cur;
-            else if (!(*cur)->description.isEmpty() &&
-                     (*it)->description.isEmpty())
+            else if (!(*cur)->m_description.isEmpty() &&
+                     (*it)->m_description.isEmpty())
                 tokeep = cur, todelete = it;
             else
                 tokeep = it, todelete = cur;
@@ -1368,17 +1368,17 @@ void ProgramData::FixProgramList(QList<ProgInfo*> &fixlist)
 
             LOG(VB_XMLTV, LOG_INFO,
                 QString("Removing conflicting program: %1 - %2 %3 %4")
-                    .arg((*todelete)->starttime.toString(Qt::ISODate))
-                    .arg((*todelete)->endtime.toString(Qt::ISODate))
-                    .arg((*todelete)->channel)
-                    .arg((*todelete)->title));
+                    .arg((*todelete)->m_starttime.toString(Qt::ISODate))
+                    .arg((*todelete)->m_endtime.toString(Qt::ISODate))
+                    .arg((*todelete)->m_channel)
+                    .arg((*todelete)->m_title));
 
             LOG(VB_XMLTV, LOG_INFO,
                 QString("Conflicted with            : %1 - %2 %3 %4")
-                    .arg((*tokeep)->starttime.toString(Qt::ISODate))
-                    .arg((*tokeep)->endtime.toString(Qt::ISODate))
-                    .arg((*tokeep)->channel)
-                    .arg((*tokeep)->title));
+                    .arg((*tokeep)->m_starttime.toString(Qt::ISODate))
+                    .arg((*tokeep)->m_endtime.toString(Qt::ISODate))
+                    .arg((*tokeep)->m_channel)
+                    .arg((*tokeep)->m_title));
 
             bool step_back = todelete == it;
             it = fixlist.erase(todelete);
@@ -1578,33 +1578,33 @@ bool ProgramData::IsUnchanged(
         "      programid       = :PROGRAMID  AND "
         "      inetref         = :INETREF");
 
-    QString cattype = myth_category_type_to_string(pi.categoryType);
+    QString cattype = myth_category_type_to_string(pi.m_categoryType);
 
     query.bindValue(":CHANID",     chanid);
-    query.bindValue(":START",      pi.starttime);
-    query.bindValue(":END",        pi.endtime);
-    query.bindValue(":TITLE",      denullify(pi.title));
-    query.bindValue(":SUBTITLE",   denullify(pi.subtitle));
-    query.bindValue(":DESC",       denullify(pi.description));
-    query.bindValue(":CATEGORY",   denullify(pi.category));
+    query.bindValue(":START",      pi.m_starttime);
+    query.bindValue(":END",        pi.m_endtime);
+    query.bindValue(":TITLE",      denullify(pi.m_title));
+    query.bindValue(":SUBTITLE",   denullify(pi.m_subtitle));
+    query.bindValue(":DESC",       denullify(pi.m_description));
+    query.bindValue(":CATEGORY",   denullify(pi.m_category));
     query.bindValue(":CATEGORY_TYPE", cattype);
-    query.bindValue(":AIRDATE",    pi.airdate);
-    query.bindValue(":STARS1",     pi.stars);
-    query.bindValue(":STARS2",     pi.stars);
-    query.bindValue(":PREVIOUSLYSHOWN", pi.previouslyshown);
-    query.bindValue(":TITLE_PRONOUNCE", pi.title_pronounce);
-    query.bindValue(":AUDIOPROP",  pi.audioProps);
-    query.bindValue(":VIDEOPROP",  pi.videoProps);
-    query.bindValue(":SUBTYPES",   pi.subtitleType);
-    query.bindValue(":PARTNUMBER", pi.partnumber);
-    query.bindValue(":PARTTOTAL",  pi.parttotal);
-    query.bindValue(":SERIESID",   denullify(pi.seriesId));
-    query.bindValue(":SHOWTYPE",   pi.showtype);
-    query.bindValue(":COLORCODE",  pi.colorcode);
+    query.bindValue(":AIRDATE",    pi.m_airdate);
+    query.bindValue(":STARS1",     pi.m_stars);
+    query.bindValue(":STARS2",     pi.m_stars);
+    query.bindValue(":PREVIOUSLYSHOWN", pi.m_previouslyshown);
+    query.bindValue(":TITLE_PRONOUNCE", pi.m_title_pronounce);
+    query.bindValue(":AUDIOPROP",  pi.m_audioProps);
+    query.bindValue(":VIDEOPROP",  pi.m_videoProps);
+    query.bindValue(":SUBTYPES",   pi.m_subtitleType);
+    query.bindValue(":PARTNUMBER", pi.m_partnumber);
+    query.bindValue(":PARTTOTAL",  pi.m_parttotal);
+    query.bindValue(":SERIESID",   denullify(pi.m_seriesId));
+    query.bindValue(":SHOWTYPE",   pi.m_showtype);
+    query.bindValue(":COLORCODE",  pi.m_colorcode);
     query.bindValue(":SYNDICATEDEPISODENUMBER",
-                    denullify(pi.syndicatedepisodenumber));
-    query.bindValue(":PROGRAMID",  denullify(pi.programId));
-    query.bindValue(":INETREF",    pi.inetref);
+                    denullify(pi.m_syndicatedepisodenumber));
+    query.bindValue(":PROGRAMID",  denullify(pi.m_programId));
+    query.bindValue(":INETREF",    pi.m_inetref);
 
     if (query.exec() && query.next())
         return query.value(0).toUInt() > 0;
@@ -1625,8 +1625,8 @@ bool ProgramData::DeleteOverlaps(
             "      starttime >= :START AND "
             "      starttime <  :END;");
         query.bindValue(":CHANID", chanid);
-        query.bindValue(":START",  pi.starttime);
-        query.bindValue(":END",    pi.endtime);
+        query.bindValue(":START",  pi.m_starttime);
+        query.bindValue(":END",    pi.m_endtime);
 
         if (!query.exec())
             return false;
@@ -1640,19 +1640,19 @@ bool ProgramData::DeleteOverlaps(
                 QString("Removing existing program: %1 - %2 %3 %4")
                 .arg(MythDate::as_utc(query.value(1).toDateTime()).toString(Qt::ISODate))
                 .arg(MythDate::as_utc(query.value(2).toDateTime()).toString(Qt::ISODate))
-                .arg(pi.channel)
+                .arg(pi.m_channel)
                 .arg(query.value(0).toString()));
         } while (query.next());
     }
 
-    if (!ClearDataByChannel(chanid, pi.starttime, pi.endtime, false))
+    if (!ClearDataByChannel(chanid, pi.m_starttime, pi.m_endtime, false))
     {
         LOG(VB_XMLTV, LOG_ERR,
             QString("Program delete failed    : %1 - %2 %3 %4")
-                .arg(pi.starttime.toString(Qt::ISODate))
-                .arg(pi.endtime.toString(Qt::ISODate))
-                .arg(pi.channel)
-                .arg(pi.title));
+                .arg(pi.m_starttime.toString(Qt::ISODate))
+                .arg(pi.m_endtime.toString(Qt::ISODate))
+                .arg(pi.m_channel)
+                .arg(pi.m_title));
         return false;
     }
 
diff --git a/mythtv/libs/libmythtv/programdata.h b/mythtv/libs/libmythtv/programdata.h
index 4b4b0731b33..da5eb3616c4 100644
--- a/mythtv/libs/libmythtv/programdata.h
+++ b/mythtv/libs/libmythtv/programdata.h
@@ -56,45 +56,23 @@ class MTV_PUBLIC DBPerson
                          const QDateTime &starttime) const;
 
   private:
-    Role    role;
-    QString name;
+    Role    m_role;
+    QString m_name;
 };
 typedef vector<DBPerson> DBCredits;
 
 class MTV_PUBLIC EventRating
 {
   public:
-    QString system;
-    QString rating;
+    QString m_system;
+    QString m_rating;
 };
 
 class MTV_PUBLIC DBEvent
 {
   public:
-    explicit DBEvent(uint _listingsource) :
-        title(),
-        subtitle(),
-        description(),
-        category(),
-        /*starttime, endtime,*/
-        airdate(0),
-        credits(nullptr),
-        partnumber(0),
-        parttotal(0),
-        syndicatedepisodenumber(),
-        subtitleType(0),
-        audioProps(0),
-        videoProps(0),
-        stars(0.0),
-        categoryType(ProgramInfo::kCategoryNone),
-        seriesId(),
-        programId(),
-        inetref(),
-        previouslyshown(false),
-        listingsource(_listingsource),
-        season(0),
-        episode(0),
-        totalepisodes(0) {}
+    explicit DBEvent(uint listingsource) :
+        m_listingsource(listingsource) {}
 
     DBEvent(const QString   &_title,     const QString   &_subtitle,
             const QString   &_desc,
@@ -108,37 +86,31 @@ class MTV_PUBLIC DBEvent
             uint32_t         _listingsource,
             uint _season,                uint _episode,
             uint _totalepisodes ) :
-        title(_title),           subtitle(_subtitle),
-        description(_desc),
-        category(_category),
-        starttime(_start),       endtime(_end),
-        airdate(0),
-        credits(nullptr),
-        partnumber(0),           parttotal(0),
-        syndicatedepisodenumber(),
-        subtitleType(_subtitleType),
-        audioProps(_audioProps), videoProps(_videoProps),
-        stars(_stars),
-        categoryType(_category_type),
-        seriesId(_seriesId),
-        programId(_programId),
-        inetref(),
-        previouslyshown(false),
-        listingsource(_listingsource),
-        season(_season),
-        episode(_episode),
-        totalepisodes(_totalepisodes)
+        m_title(_title),           m_subtitle(_subtitle),
+        m_description(_desc),
+        m_category(_category),
+        m_starttime(_start),       m_endtime(_end),
+        m_subtitleType(_subtitleType),
+        m_audioProps(_audioProps), m_videoProps(_videoProps),
+        m_stars(_stars),
+        m_categoryType(_category_type),
+        m_seriesId(_seriesId),
+        m_programId(_programId),
+        m_listingsource(_listingsource),
+        m_season(_season),
+        m_episode(_episode),
+        m_totalepisodes(_totalepisodes)
     {
     }
 
-    virtual ~DBEvent() { delete credits; }
+    virtual ~DBEvent() { delete m_credits; }
 
     void AddPerson(DBPerson::Role, const QString &name);
     void AddPerson(const QString &role, const QString &name);
 
     uint UpdateDB(MSqlQuery &query, uint chanid, int match_threshold) const;
 
-    bool HasCredits(void) const { return credits; }
+    bool HasCredits(void) const { return m_credits; }
     bool HasTimeConflict(const DBEvent &other) const;
 
     DBEvent &operator=(const DBEvent&);
@@ -158,33 +130,33 @@ class MTV_PUBLIC DBEvent
     virtual void Squeeze(void);
 
   public:
-    QString       title;
-    QString       subtitle;
-    QString       description;
-    QString       category;
-    QDateTime     starttime;
-    QDateTime     endtime;
-    uint16_t      airdate;          ///< movie year / production year
-    QDate         originalairdate;  ///< origial broadcast date
-    DBCredits    *credits;
-    uint16_t      partnumber;
-    uint16_t      parttotal;
-    QString       syndicatedepisodenumber;
-    unsigned char subtitleType;
-    unsigned char audioProps;
-    unsigned char videoProps;
-    float         stars;
-    ProgramInfo::CategoryType categoryType;
-    QString       seriesId;
-    QString       programId;
-    QString       inetref;
-    bool          previouslyshown;
-    uint32_t      listingsource;
-    QList<EventRating> ratings;
-    QStringList   genres;
-    uint          season;
-    uint          episode;
-    uint          totalepisodes;
+    QString                   m_title;
+    QString                   m_subtitle;
+    QString                   m_description;
+    QString                   m_category;
+    QDateTime                 m_starttime;
+    QDateTime                 m_endtime;
+    uint16_t                  m_airdate         {0}; ///< movie year / production year
+    QDate                     m_originalairdate;     ///< origial broadcast date
+    DBCredits                *m_credits         {nullptr};
+    uint16_t                  m_partnumber      {0};
+    uint16_t                  m_parttotal       {0};
+    QString                   m_syndicatedepisodenumber;
+    unsigned char             m_subtitleType    {0};
+    unsigned char             m_audioProps      {0};
+    unsigned char             m_videoProps      {0};
+    float                     m_stars           {0.0};
+    ProgramInfo::CategoryType m_categoryType    {ProgramInfo::kCategoryNone};
+    QString                   m_seriesId;
+    QString                   m_programId;
+    QString                   m_inetref;
+    bool                      m_previouslyshown {false};
+    uint32_t                  m_listingsource;
+    QList<EventRating>        m_ratings;
+    QStringList               m_genres;
+    uint                      m_season          {0};
+    uint                      m_episode         {0};
+    uint                      m_totalepisodes   {0};
 };
 
 class MTV_PUBLIC DBEventEIT : public DBEvent
@@ -207,7 +179,7 @@ class MTV_PUBLIC DBEventEIT : public DBEvent
                 _start, _end, _subtitleType, _audioProps, _videoProps,
                 _stars, _seriesId, _programId, kListingSourceEIT,
                 _season, _episode, _totalepisodes),
-        chanid(_chanid), fixup(_fixup)
+        m_chanid(_chanid), m_fixup(_fixup)
     {
     }
 
@@ -221,19 +193,19 @@ class MTV_PUBLIC DBEventEIT : public DBEvent
         DBEvent(_title, QString(), _desc, QString(), ProgramInfo::kCategoryNone,
                 _start, _end, _subtitleType, _audioProps, _videoProps,
                 0.0, QString(), QString(), kListingSourceEIT, 0, 0, 0), // Season, Episode and Total Episodes are not set with this constructor!
-        chanid(_chanid), fixup(_fixup)
+        m_chanid(_chanid), m_fixup(_fixup)
     {
     }
 
     uint UpdateDB(MSqlQuery &query, int match_threshold) const
     {
-        return DBEvent::UpdateDB(query, chanid, match_threshold);
+        return DBEvent::UpdateDB(query, m_chanid, match_threshold);
     }
 
   public:
-    uint32_t      chanid;
-    FixupValue    fixup;
-    QMap<QString,QString> items;
+    uint32_t              m_chanid;
+    FixupValue            m_fixup;
+    QMap<QString,QString> m_items;
 };
 
 class MTV_PUBLIC ProgInfo : public DBEvent
@@ -252,14 +224,14 @@ class MTV_PUBLIC ProgInfo : public DBEvent
 
   public:
     // extra XMLTV stuff
-    QString       channel;
-    QString       startts;
-    QString       endts;
-    QString       title_pronounce;
-    QString       showtype;
-    QString       colorcode;
-    QString       clumpidx;
-    QString       clumpmax;
+    QString       m_channel;
+    QString       m_startts;
+    QString       m_endts;
+    QString       m_title_pronounce;
+    QString       m_showtype;
+    QString       m_colorcode;
+    QString       m_clumpidx;
+    QString       m_clumpmax;
 };
 
 class MTV_PUBLIC ProgramData
diff --git a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp
index bd3427a0b51..f6712636fcf 100644
--- a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp
+++ b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp
@@ -132,24 +132,24 @@ QString getVideoProps(unsigned char props)
 void printEvent(const DBEventEIT& event, const QString& name)
 {
     printf("\n------------Event - %s------------\n", name.toLocal8Bit().constData());
-    printf("Title          %s\n",  event.title.toLocal8Bit().constData());
-    printf("Subtitle       %s\n",  event.subtitle.toLocal8Bit().constData());
-    printf("Description    %s\n",  event.description.toLocal8Bit().constData());
-    printf("Season         %3u\n", event.season);
-    printf("Episode        %3u\n", event.episode);
-    printf("Total episodes %3u\n", event.totalepisodes);
-    printf("Part number    %3u\n", event.partnumber);
-    printf("Part total     %3u\n", event.parttotal);
-    printf("SubtitleType   %s\n",  getSubtitleType(event.subtitleType).toLocal8Bit().constData());
-    printf("Audio props    %s\n",  getAudioProps(event.audioProps).toLocal8Bit().constData());
-    printf("Video props    %s\n",  getVideoProps(event.videoProps).toLocal8Bit().constData());
-    if (event.credits && !event.credits->empty())
+    printf("Title          %s\n",  event.m_title.toLocal8Bit().constData());
+    printf("Subtitle       %s\n",  event.m_subtitle.toLocal8Bit().constData());
+    printf("Description    %s\n",  event.m_description.toLocal8Bit().constData());
+    printf("Season         %3u\n", event.m_season);
+    printf("Episode        %3u\n", event.m_episode);
+    printf("Total episodes %3u\n", event.m_totalepisodes);
+    printf("Part number    %3u\n", event.m_partnumber);
+    printf("Part total     %3u\n", event.m_parttotal);
+    printf("SubtitleType   %s\n",  getSubtitleType(event.m_subtitleType).toLocal8Bit().constData());
+    printf("Audio props    %s\n",  getAudioProps(event.m_audioProps).toLocal8Bit().constData());
+    printf("Video props    %s\n",  getVideoProps(event.m_videoProps).toLocal8Bit().constData());
+    if (event.m_credits && !event.m_credits->empty())
     {
-        printf("Credits      %3zu\n", event.credits->size());
+        printf("Credits      %3zu\n", event.m_credits->size());
     }
-    if (!event.items.isEmpty())
+    if (!event.m_items.isEmpty())
     {
-        printf("Items        %3d\n", event.items.count());
+        printf("Items        %3d\n", event.m_items.count());
     }
     printf("\n");
 }
@@ -171,8 +171,8 @@ void TestEITFixups::testUKFixups1()
     fixup.Fix(event1);
 
     PRINT_EVENT(event1);
-    QCOMPARE(event1.episode,       3u);
-    QCOMPARE(event1.totalepisodes, 5u);
+    QCOMPARE(event1.m_episode,       3u);
+    QCOMPARE(event1.m_totalepisodes, 5u);
 }
 
 void TestEITFixups::testUKFixups2()
@@ -191,8 +191,8 @@ void TestEITFixups::testUKFixups2()
 
     fixup.Fix(event2);
     PRINT_EVENT(event2);
-    QCOMPARE(event2.season,  3u);
-    QCOMPARE(event2.episode, 1u);
+    QCOMPARE(event2.m_season,  3u);
+    QCOMPARE(event2.m_episode, 1u);
 }
 
 void TestEITFixups::testUKFixups3()
@@ -211,10 +211,10 @@ void TestEITFixups::testUKFixups3()
 
     fixup.Fix(event3);
     PRINT_EVENT(event3);
-    QCOMPARE(event3.season,     1u);
-    QCOMPARE(event3.episode,    2u);
-    QCOMPARE(event3.partnumber, (uint16_t)2u);
-    QCOMPARE(event3.parttotal,  (uint16_t)2u);
+    QCOMPARE(event3.m_season,     1u);
+    QCOMPARE(event3.m_episode,    2u);
+    QCOMPARE(event3.m_partnumber, (uint16_t)2u);
+    QCOMPARE(event3.m_parttotal,  (uint16_t)2u);
 }
 
 void TestEITFixups::testUKFixups4()
@@ -233,8 +233,8 @@ void TestEITFixups::testUKFixups4()
 
     fixup.Fix(event4);
     PRINT_EVENT(event4);
-    QCOMPARE(event4.season,  1u);
-    QCOMPARE(event4.episode, 39u);
+    QCOMPARE(event4.m_season,  1u);
+    QCOMPARE(event4.m_episode, 39u);
 }
 
 void TestEITFixups::testUKFixups5()
@@ -253,11 +253,11 @@ void TestEITFixups::testUKFixups5()
 
     fixup.Fix(event5);
     PRINT_EVENT(event5);
-    QCOMPARE(event5.episode,       12u);
-    QCOMPARE(event5.totalepisodes, 26u);
-    QCOMPARE(event5.subtitleType,  (unsigned char)SUB_NORMAL);
-    QCOMPARE(event5.subtitle,      QString("Whirlwind"));
-    QCOMPARE(event5.description,   QString("Acclaimed documentary series about World War II. This episode focuses on the Allied bombing campaign which inflicted grievous damage upon Germany, both day and night."));
+    QCOMPARE(event5.m_episode,       12u);
+    QCOMPARE(event5.m_totalepisodes, 26u);
+    QCOMPARE(event5.m_subtitleType,  (unsigned char)SUB_NORMAL);
+    QCOMPARE(event5.m_subtitle,      QString("Whirlwind"));
+    QCOMPARE(event5.m_description,   QString("Acclaimed documentary series about World War II. This episode focuses on the Allied bombing campaign which inflicted grievous damage upon Germany, both day and night."));
 }
 
 void TestEITFixups::testUKFixups6()
@@ -276,11 +276,11 @@ void TestEITFixups::testUKFixups6()
 
     fixup.Fix(event6);
     PRINT_EVENT(event6);
-    QCOMPARE(event6.season,       4u);
-    QCOMPARE(event6.episode,      3u);
-    QCOMPARE(event6.subtitleType, (unsigned char)SUB_SIGNED);
-    QCOMPARE(event6.subtitle,     QString("The Things We Do for Love"));
-    QCOMPARE(event6.description,  QString("When a beautiful woman is found dead in a car park, the list of suspects leads Jack Frost (David Jason) into the heart of a religious community.  S4 Ep3"));
+    QCOMPARE(event6.m_season,       4u);
+    QCOMPARE(event6.m_episode,      3u);
+    QCOMPARE(event6.m_subtitleType, (unsigned char)SUB_SIGNED);
+    QCOMPARE(event6.m_subtitle,     QString("The Things We Do for Love"));
+    QCOMPARE(event6.m_description,  QString("When a beautiful woman is found dead in a car park, the list of suspects leads Jack Frost (David Jason) into the heart of a religious community.  S4 Ep3"));
 }
 
 void TestEITFixups::testUKFixups7()
@@ -299,13 +299,13 @@ void TestEITFixups::testUKFixups7()
 
     fixup.Fix(event7);
     PRINT_EVENT(event7);
-    QCOMPARE(event7.episode,       2u);
-    QCOMPARE(event7.totalepisodes, 3u);
-    QCOMPARE(event7.subtitleType,  (unsigned char)SUB_NORMAL);
-    QCOMPARE(event7.audioProps,    (unsigned char)(AUD_STEREO | AUD_VISUALIMPAIR));
-    QCOMPARE(event7.title,         QString("Suffragettes Forever!"));
-    QCOMPARE(event7.subtitle,      QString("The Story of Women and Power"));
-    QCOMPARE(event7.description,   QString("2/3. Documentary series presented by Amanda Vickery. During Victoria's reign extraordinary women gradually changed the lives and opportunities of their sex."));
+    QCOMPARE(event7.m_episode,       2u);
+    QCOMPARE(event7.m_totalepisodes, 3u);
+    QCOMPARE(event7.m_subtitleType,  (unsigned char)SUB_NORMAL);
+    QCOMPARE(event7.m_audioProps,    (unsigned char)(AUD_STEREO | AUD_VISUALIMPAIR));
+    QCOMPARE(event7.m_title,         QString("Suffragettes Forever!"));
+    QCOMPARE(event7.m_subtitle,      QString("The Story of Women and Power"));
+    QCOMPARE(event7.m_description,   QString("2/3. Documentary series presented by Amanda Vickery. During Victoria's reign extraordinary women gradually changed the lives and opportunities of their sex."));
 }
 
 void TestEITFixups::testUKFixups8()
@@ -324,10 +324,10 @@ void TestEITFixups::testUKFixups8()
 
     fixup.Fix(event8);
     PRINT_EVENT(event8);
-    QCOMPARE(event8.subtitleType, (unsigned char)SUB_NORMAL);
-    QCOMPARE(event8.audioProps,   (unsigned char)(AUD_STEREO | AUD_VISUALIMPAIR));
-    QCOMPARE(event8.description,  QString("Three unconnected Brooklyn cops wind up at the same deadly location. Contains very strong language, sexual content and some violence."));
-    QCOMPARE(event8.airdate,      (uint16_t)2009u);
+    QCOMPARE(event8.m_subtitleType, (unsigned char)SUB_NORMAL);
+    QCOMPARE(event8.m_audioProps,   (unsigned char)(AUD_STEREO | AUD_VISUALIMPAIR));
+    QCOMPARE(event8.m_description,  QString("Three unconnected Brooklyn cops wind up at the same deadly location. Contains very strong language, sexual content and some violence."));
+    QCOMPARE(event8.m_airdate,      (uint16_t)2009u);
 }
 
 void TestEITFixups::testUKFixups9()
@@ -347,8 +347,8 @@ void TestEITFixups::testUKFixups9()
 
     fixup.Fix(event9);
     PRINT_EVENT(event9);
-    QCOMPARE(event9.title,       QString("Channel 4 News"));
-    QCOMPARE(event9.description, QString("Includes sport and weather"));
+    QCOMPARE(event9.m_title,       QString("Channel 4 News"));
+    QCOMPARE(event9.m_description, QString("Includes sport and weather"));
 }
 
 void TestEITFixups::testUKLawAndOrder()
@@ -363,8 +363,8 @@ void TestEITFixups::testUKLawAndOrder()
     PRINT_EVENT(*event);
     fixup.Fix(*event);
     PRINT_EVENT(*event);
-    QCOMPARE(event->title,    QString("Law & Order: Special Victims Unit"));
-    QCOMPARE(event->subtitle, QString(""));
+    QCOMPARE(event->m_title,    QString("Law & Order: Special Victims Unit"));
+    QCOMPARE(event->m_subtitle, QString(""));
 
     delete event;
 
@@ -376,9 +376,9 @@ void TestEITFixups::testUKLawAndOrder()
     PRINT_EVENT(*event2);
     fixup.Fix(*event2);
     PRINT_EVENT(*event2);
-    QCOMPARE(event2->title,    QString("Law & Order: Special Victims Unit"));
-    QCOMPARE(event2->subtitle, QString("Sugar"));
-    QCOMPARE(event2->description, QString("Police drama series about an elite sex crime  ..."));
+    QCOMPARE(event2->m_title,    QString("Law & Order: Special Victims Unit"));
+    QCOMPARE(event2->m_subtitle, QString("Sugar"));
+    QCOMPARE(event2->m_description, QString("Police drama series about an elite sex crime  ..."));
 
     delete event2;
 }
@@ -395,8 +395,8 @@ void TestEITFixups::testUKMarvel()
     PRINT_EVENT(*event);
     fixup.Fix(*event);
     PRINT_EVENT(*event);
-    QCOMPARE(event->title,    QString("Marvel's Agents of S.H.I.E.L.D."));
-    QCOMPARE(event->subtitle, QString("Maveth"));
+    QCOMPARE(event->m_title,    QString("Marvel's Agents of S.H.I.E.L.D."));
+    QCOMPARE(event->m_subtitle, QString("Maveth"));
 
     delete event;
 
@@ -409,8 +409,8 @@ void TestEITFixups::testUKMarvel()
     PRINT_EVENT(*event2);
     fixup.Fix(*event2);
     PRINT_EVENT(*event2);
-    QCOMPARE(event2->title,    QString("Marvel's Agents of S.H.I.E.L.D."));
-    QCOMPARE(event2->subtitle, QString("Bouncing Back"));
+    QCOMPARE(event2->m_title,    QString("Marvel's Agents of S.H.I.E.L.D."));
+    QCOMPARE(event2->m_subtitle, QString("Bouncing Back"));
 
     delete event2;
 }
@@ -456,8 +456,8 @@ void TestEITFixups::testUKXFiles()
 
     fixup.Fix(event);
     PRINT_EVENT(event);
-    QCOMPARE(event.title,       QString("The X-Files"));
-    QCOMPARE(event.description, QString("Hit sci-fi drama series returns. Mulder and Scully are reunited after the collapse of their relationship when a TV host contacts them, believing he has uncovered a significant conspiracy. (Ep 1)"));
+    QCOMPARE(event.m_title,       QString("The X-Files"));
+    QCOMPARE(event.m_description, QString("Hit sci-fi drama series returns. Mulder and Scully are reunited after the collapse of their relationship when a TV host contacts them, believing he has uncovered a significant conspiracy. (Ep 1)"));
 }
 
 void TestEITFixups::testDEPro7Sat1()
@@ -472,9 +472,9 @@ void TestEITFixups::testDEPro7Sat1()
     PRINT_EVENT(*event);
     fixup.Fix(*event);
     PRINT_EVENT(*event);
-    QCOMPARE(event->title,    QString("Titel"));
-    QCOMPARE(event->subtitle, QString("Folgentitel"));
-    QCOMPARE(event->airdate,  (unsigned short) 2011);
+    QCOMPARE(event->m_title,    QString("Titel"));
+    QCOMPARE(event->m_subtitle, QString("Folgentitel"));
+    QCOMPARE(event->m_airdate,  (unsigned short) 2011);
 
     delete event;
 
@@ -485,8 +485,8 @@ void TestEITFixups::testDEPro7Sat1()
     PRINT_EVENT(*event2);
     fixup.Fix(*event2);
     PRINT_EVENT(*event2);
-    QCOMPARE(event2->subtitle, QString(""));
-    QCOMPARE(event2->airdate,  (unsigned short) 2015);
+    QCOMPARE(event2->m_subtitle, QString(""));
+    QCOMPARE(event2->m_airdate,  (unsigned short) 2015);
 
     delete event2;
 
@@ -497,8 +497,8 @@ void TestEITFixups::testDEPro7Sat1()
     PRINT_EVENT(*event3);
     fixup.Fix(*event3);
     PRINT_EVENT(*event3);
-    QCOMPARE(event3->subtitle, QString("Folgentitel"));
-    QCOMPARE(event3->airdate,  (unsigned short) 0);
+    QCOMPARE(event3->m_subtitle, QString("Folgentitel"));
+    QCOMPARE(event3->m_airdate,  (unsigned short) 0);
 
     delete event3;
 
@@ -509,8 +509,8 @@ void TestEITFixups::testDEPro7Sat1()
     PRINT_EVENT(*event4);
     fixup.Fix(*event4);
     PRINT_EVENT(*event4);
-    QCOMPARE(event4->subtitle, QString("\"Lokal\", Ort"));
-    QCOMPARE(event4->airdate,  (unsigned short) 2015);
+    QCOMPARE(event4->m_subtitle, QString("\"Lokal\", Ort"));
+    QCOMPARE(event4->m_airdate,  (unsigned short) 2015);
 
     delete event4;
 
@@ -521,8 +521,8 @@ void TestEITFixups::testDEPro7Sat1()
     PRINT_EVENT(*event5);
     fixup.Fix(*event5);
     PRINT_EVENT(*event5);
-    QCOMPARE(event5->subtitle, QString("In Morpheus' Armen"));
-    QCOMPARE(event5->airdate,  (unsigned short) 2006);
+    QCOMPARE(event5->m_subtitle, QString("In Morpheus' Armen"));
+    QCOMPARE(event5->m_airdate,  (unsigned short) 2006);
 
     delete event5;
 
@@ -533,8 +533,8 @@ void TestEITFixups::testDEPro7Sat1()
     PRINT_EVENT(*event6);
     fixup.Fix(*event6);
     PRINT_EVENT(*event6);
-    QCOMPARE(event6->subtitle, QString("Drei Kleintiere durchschneiden (1)"));
-    QCOMPARE(event6->airdate,  (unsigned short) 2014);
+    QCOMPARE(event6->m_subtitle, QString("Drei Kleintiere durchschneiden (1)"));
+    QCOMPARE(event6->m_airdate,  (unsigned short) 2014);
 
     delete event6;
 
@@ -551,9 +551,9 @@ void TestEITFixups::testDEPro7Sat1()
     PRINT_EVENT(*event7);
     fixup.Fix(*event7);
     PRINT_EVENT(*event7);
-    QCOMPARE(event7->subtitle, QString("<episode title>"));
-    QCOMPARE(event7->airdate,  (unsigned short) 2011);
-    QCOMPARE(event7->description, QString("<plot summary>"));
+    QCOMPARE(event7->m_subtitle, QString("<episode title>"));
+    QCOMPARE(event7->m_airdate,  (unsigned short) 2011);
+    QCOMPARE(event7->m_description, QString("<plot summary>"));
 
     delete event7;
 }
@@ -575,10 +575,10 @@ void TestEITFixups::testHTMLFixup()
 
     fixup.Fix(event);
     PRINT_EVENT(event);
-    QCOMPARE(event.title,       QString("CSI: Crime Scene Investigation"));
-    QCOMPARE(event.subtitle,    QString("Double-Cross"));
+    QCOMPARE(event.m_title,       QString("CSI: Crime Scene Investigation"));
+    QCOMPARE(event.m_subtitle,    QString("Double-Cross"));
 // FIXME: Need to fix the capturing of (S7 Ep 5) for this to properly validate.
-//    QCOMPARE(event.description, QString("Las Vegas-based forensic drama. The team investigates when two nuns find a woman crucified in the rafters of their church - and clues implicate the priest."));
+//    QCOMPARE(event.m_description, QString("Las Vegas-based forensic drama. The team investigates when two nuns find a woman crucified in the rafters of their church - and clues implicate the priest."));
 
     DBEventEIT event2(9311,
                       "<EM>New: Redneck Island</EM>",
@@ -592,7 +592,7 @@ void TestEITFixups::testHTMLFixup()
 
     fixup.Fix(event2);
     PRINT_EVENT(event2);
-    QCOMPARE(event2.title,       QString("Redneck Island"));
+    QCOMPARE(event2.m_title,       QString("Redneck Island"));
 
     DBEventEIT event3(14101,
                       "New: Jericho",
@@ -606,8 +606,8 @@ void TestEITFixups::testHTMLFixup()
 
     fixup.Fix(event3);
     PRINT_EVENT(event3);
-    QCOMPARE(event3.title,       QString("Jericho"));
-    QCOMPARE(event3.description, QString("Drama set in 1870s Yorkshire. In her desperation to protect her son, Annie unwittingly opens the door for Bamford the railway detective, who has returned to Jericho."));
+    QCOMPARE(event3.m_title,       QString("Jericho"));
+    QCOMPARE(event3.m_description, QString("Drama set in 1870s Yorkshire. In her desperation to protect her son, Annie unwittingly opens the door for Bamford the railway detective, who has returned to Jericho."));
 }
 
 void TestEITFixups::testSkyEpisodes()
@@ -622,9 +622,9 @@ void TestEITFixups::testSkyEpisodes()
     PRINT_EVENT(*event);
     fixup.Fix(*event);
     PRINT_EVENT(*event);
-    QCOMPARE(event->description, QString("Viele Mitglieder einer christlichen Gemeinde erkranken nach einem Giftanschlag tödlich. Doch die fanatisch Gläubigen lassen weder polizeiliche, noch ärztliche Hilfe zu. Don (Rob Morrow) und Charlie (David Krumholtz) gelingt es jedoch durch einen Nebeneingang ins Gebäude zu kommen. Bei ihren Ermittlungen finden sie heraus, dass der Anführer der Sekte ein Betrüger war. Auch sein Sohn wusste von den Machenschaften des Vaters. War der Giftanschlag ein Racheakt? Ab 12 Jahren"));
-    QCOMPARE(event->season,   4u);
-    QCOMPARE(event->episode, 16u);
+    QCOMPARE(event->m_description, QString("Viele Mitglieder einer christlichen Gemeinde erkranken nach einem Giftanschlag tödlich. Doch die fanatisch Gläubigen lassen weder polizeiliche, noch ärztliche Hilfe zu. Don (Rob Morrow) und Charlie (David Krumholtz) gelingt es jedoch durch einen Nebeneingang ins Gebäude zu kommen. Bei ihren Ermittlungen finden sie heraus, dass der Anführer der Sekte ein Betrüger war. Auch sein Sohn wusste von den Machenschaften des Vaters. War der Giftanschlag ein Racheakt? Ab 12 Jahren"));
+    QCOMPARE(event->m_season,   4u);
+    QCOMPARE(event->m_episode, 16u);
     /* FixPremiere should scrape the credits, too! */
     QVERIFY(event->HasCredits());
 
@@ -638,9 +638,9 @@ void TestEITFixups::testSkyEpisodes()
     PRINT_EVENT(*event2);
     fixup.Fix(*event2);
     PRINT_EVENT(*event2);
-    QCOMPARE(event2->description, QString("Washington, 1971: Vor dem Obersten Gerichtshof wird über die Kriegsdienstverweigerung von Box-Ikone Cassius Clay aka Muhammad Ali verhandelt. Während draußen Tausende gegen den Vietnamkrieg protestieren, verteidigen acht weiße, alte Bundesrichter unter dem Vorsitzenden Warren Burger (Frank Langella) die harte Linie der Regierung Nixon. Doch Kevin Connolly (Benjamin Walker), ein idealistischer junger Mitarbeiter von Richter Harlan (Christopher Plummer), gibt nicht auf. - Muhammad Alis Kiegsdienst-Verweigerungsprozess, als Mix aus Kammerspiel und Archivaufnahmen starbesetzt verfilmt. Ab 12 Jahren"));
-    QCOMPARE(event2->season,  0u);
-    QCOMPARE(event2->episode, 0u);
+    QCOMPARE(event2->m_description, QString("Washington, 1971: Vor dem Obersten Gerichtshof wird über die Kriegsdienstverweigerung von Box-Ikone Cassius Clay aka Muhammad Ali verhandelt. Während draußen Tausende gegen den Vietnamkrieg protestieren, verteidigen acht weiße, alte Bundesrichter unter dem Vorsitzenden Warren Burger (Frank Langella) die harte Linie der Regierung Nixon. Doch Kevin Connolly (Benjamin Walker), ein idealistischer junger Mitarbeiter von Richter Harlan (Christopher Plummer), gibt nicht auf. - Muhammad Alis Kiegsdienst-Verweigerungsprozess, als Mix aus Kammerspiel und Archivaufnahmen starbesetzt verfilmt. Ab 12 Jahren"));
+    QCOMPARE(event2->m_season,  0u);
+    QCOMPARE(event2->m_episode, 0u);
 
     delete event2;
 
@@ -652,9 +652,9 @@ void TestEITFixups::testSkyEpisodes()
     PRINT_EVENT(*event3);
     fixup.Fix(*event3);
     PRINT_EVENT(*event3);
-    QCOMPARE(event3->description, QString("Ab 12 Jahren"));
-    QCOMPARE(event3->season,  0u);
-    QCOMPARE(event3->episode, 0u);
+    QCOMPARE(event3->m_description, QString("Ab 12 Jahren"));
+    QCOMPARE(event3->m_season,  0u);
+    QCOMPARE(event3->m_episode, 0u);
 
     delete event3;
 
@@ -665,10 +665,10 @@ void TestEITFixups::testSkyEpisodes()
 
     fixup.Fix(*event4);
     PRINT_EVENT(*event4);
-    QCOMPARE(event4->description, QString("Ex-Marine und Kampfsportlehrer Granger (Dolph Lundgren) ... Star Dolph Lundgren. Ab 16 Jahren"));
-    QCOMPARE(event4->season,  0u);
-    QCOMPARE(event4->episode, 0u);
-    QCOMPARE(event4->airdate,  (unsigned short) 2011);
+    QCOMPARE(event4->m_description, QString("Ex-Marine und Kampfsportlehrer Granger (Dolph Lundgren) ... Star Dolph Lundgren. Ab 16 Jahren"));
+    QCOMPARE(event4->m_season,  0u);
+    QCOMPARE(event4->m_episode, 0u);
+    QCOMPARE(event4->m_airdate,  (unsigned short) 2011);
     QVERIFY(event4->HasCredits());
 
     delete event4;
@@ -680,10 +680,10 @@ void TestEITFixups::testSkyEpisodes()
 
     fixup.Fix(*event5);
     PRINT_EVENT(*event5);
-    QCOMPARE(event5->description, QString("Lauries Auszug setzt Red zu, denn er hat ... ist."));
-    QCOMPARE(event5->season,  2u);
-    QCOMPARE(event5->episode, 11u);
-    QCOMPARE(event5->airdate,  (unsigned short) 1999);
+    QCOMPARE(event5->m_description, QString("Lauries Auszug setzt Red zu, denn er hat ... ist."));
+    QCOMPARE(event5->m_season,  2u);
+    QCOMPARE(event5->m_episode, 11u);
+    QCOMPARE(event5->m_airdate,  (unsigned short) 1999);
     QVERIFY(event5->HasCredits());
 
     delete event5;
@@ -702,21 +702,21 @@ void TestEITFixups::testUnitymedia()
     cast.insertMulti ("Role Player", "Other Actor");
     cast.insertMulti ("Director", "Great Director");
     cast.insertMulti ("Unhandled", "lets fix it up");
-    event->items = cast;
+    event->m_items = cast;
 
     QVERIFY(!event->HasCredits());
-    QCOMPARE(event->items.count(), 4);
+    QCOMPARE(event->m_items.count(), 4);
 
     PRINT_EVENT(*event);
     fixup.Fix(*event);
     PRINT_EVENT(*event);
 
     QVERIFY(event->HasCredits());
-    QCOMPARE(event->credits->size(), (size_t)3);
-    QVERIFY(event->subtitle.isEmpty());
-    QCOMPARE(event->description, QString("Beschreibung ..."));
-    QCOMPARE(event->stars, 0.89f);
-    QCOMPARE(event->items.count(), 1);
+    QCOMPARE(event->m_credits->size(), (size_t)3);
+    QVERIFY(event->m_subtitle.isEmpty());
+    QCOMPARE(event->m_description, QString("Beschreibung ..."));
+    QCOMPARE(event->m_stars, 0.89f);
+    QCOMPARE(event->m_items.count(), 1);
 
     delete event;
 
@@ -730,7 +730,7 @@ void TestEITFixups::testUnitymedia()
     fixup.Fix(*event);
     PRINT_EVENT(*event);
 
-    QCOMPARE(event->stars, 0.89f);
+    QCOMPARE(event->m_stars, 0.89f);
 
     delete event;
 }
@@ -747,10 +747,10 @@ void TestEITFixups::testDeDisneyChannel()
     PRINT_EVENT(*event);
     fixup.Fix(*event);
     PRINT_EVENT(*event);
-    QCOMPARE(event->title,    QString("Meine Schwester Charlie"));
-    QCOMPARE(event->subtitle, QString("Das Ablenkungsmanöver"));
-    QCOMPARE(event->category, QString("Familien-Serie"));
-    QCOMPARE(event->categoryType, ProgramInfo::kCategorySeries);
+    QCOMPARE(event->m_title,    QString("Meine Schwester Charlie"));
+    QCOMPARE(event->m_subtitle, QString("Das Ablenkungsmanöver"));
+    QCOMPARE(event->m_category, QString("Familien-Serie"));
+    QCOMPARE(event->m_categoryType, ProgramInfo::kCategorySeries);
 
     delete event;
 
@@ -762,8 +762,8 @@ void TestEITFixups::testDeDisneyChannel()
     PRINT_EVENT(*event2);
     fixup.Fix(*event2);
     PRINT_EVENT(*event2);
-    QCOMPARE(event2->title,    QString("Phineas und Ferb"));
-    QCOMPARE(event2->subtitle, QString("Das Achterbahn - Musical"));
+    QCOMPARE(event2->m_title,    QString("Phineas und Ferb"));
+    QCOMPARE(event2->m_subtitle, QString("Das Achterbahn - Musical"));
 
     delete event2;
 }
@@ -780,8 +780,8 @@ void TestEITFixups::testATV()
     PRINT_EVENT(*event);
     fixup.Fix(*event);
     PRINT_EVENT(*event);
-    QCOMPARE(event->title,    QString("Gilmore Girls"));
-    QCOMPARE(event->subtitle, QString("Eine Hochzeit und ein Todesfall"));
+    QCOMPARE(event->m_title,    QString("Gilmore Girls"));
+    QCOMPARE(event->m_subtitle, QString("Eine Hochzeit und ein Todesfall"));
 
     delete event;
 }
diff --git a/mythtv/programs/mythfilldatabase/xmltvparser.cpp b/mythtv/programs/mythfilldatabase/xmltvparser.cpp
index 8296d8eda52..e354a08c517 100644
--- a/mythtv/programs/mythfilldatabase/xmltvparser.cpp
+++ b/mythtv/programs/mythfilldatabase/xmltvparser.cpp
@@ -270,12 +270,12 @@ static void parseVideo(QDomElement &element, ProgInfo *pginfo)
             if (info.tagName() == "quality")
             {
                 if (getFirstText(info) == "HDTV")
-                    pginfo->videoProps |= VID_HDTV;
+                    pginfo->m_videoProps |= VID_HDTV;
             }
             else if (info.tagName() == "aspect")
             {
                 if (getFirstText(info) == "16:9")
-                    pginfo->videoProps |= VID_WIDESCREEN;
+                    pginfo->m_videoProps |= VID_WIDESCREEN;
             }
         }
     }
@@ -293,20 +293,20 @@ static void parseAudio(QDomElement &element, ProgInfo *pginfo)
             {
                 if (getFirstText(info) == "mono")
                 {
-                    pginfo->audioProps |= AUD_MONO;
+                    pginfo->m_audioProps |= AUD_MONO;
                 }
                 else if (getFirstText(info) == "stereo")
                 {
-                    pginfo->audioProps |= AUD_STEREO;
+                    pginfo->m_audioProps |= AUD_STEREO;
                 }
                 else if (getFirstText(info) == "dolby" ||
                         getFirstText(info) == "dolby digital")
                 {
-                    pginfo->audioProps |= AUD_DOLBY;
+                    pginfo->m_audioProps |= AUD_DOLBY;
                 }
                 else if (getFirstText(info) == "surround")
                 {
-                    pginfo->audioProps |= AUD_SURROUND;
+                    pginfo->m_audioProps |= AUD_SURROUND;
                 }
             }
         }
@@ -319,24 +319,24 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
     ProgInfo *pginfo = new ProgInfo();
 
     QString text = element.attribute("start", "");
-    fromXMLTVDate(text, pginfo->starttime);
-    pginfo->startts = text;
+    fromXMLTVDate(text, pginfo->m_starttime);
+    pginfo->m_startts = text;
 
     text = element.attribute("stop", "");
-    fromXMLTVDate(text, pginfo->endtime);
-    pginfo->endts = text;
+    fromXMLTVDate(text, pginfo->m_endtime);
+    pginfo->m_endts = text;
 
     text = element.attribute("channel", "");
     QStringList split = text.split(" ");
 
-    pginfo->channel = split[0];
+    pginfo->m_channel = split[0];
 
     text = element.attribute("clumpidx", "");
     if (!text.isEmpty())
     {
         split = text.split('/');
-        pginfo->clumpidx = split[0];
-        pginfo->clumpmax = split[1];
+        pginfo->m_clumpidx = split[0];
+        pginfo->m_clumpmax = split[1];
     }
 
     for (QDomNode child = element.firstChild(); !child.isNull();
@@ -349,56 +349,56 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
             {
                 if (info.attribute("lang") == "ja_JP")
                 {
-                    pginfo->title = getFirstText(info);
+                    pginfo->m_title = getFirstText(info);
                 }
                 else if (info.attribute("lang") == "ja_JP@kana")
                 {
-                    pginfo->title_pronounce = getFirstText(info);
+                    pginfo->m_title_pronounce = getFirstText(info);
                 }
-                else if (pginfo->title.isEmpty())
+                else if (pginfo->m_title.isEmpty())
                 {
-                    pginfo->title = getFirstText(info);
+                    pginfo->m_title = getFirstText(info);
                 }
             }
             else if (info.tagName() == "sub-title" &&
-                     pginfo->subtitle.isEmpty())
+                     pginfo->m_subtitle.isEmpty())
             {
-                pginfo->subtitle = getFirstText(info);
+                pginfo->m_subtitle = getFirstText(info);
             }
-            else if (info.tagName() == "desc" && pginfo->description.isEmpty())
+            else if (info.tagName() == "desc" && pginfo->m_description.isEmpty())
             {
-                pginfo->description = getFirstText(info);
+                pginfo->m_description = getFirstText(info);
             }
             else if (info.tagName() == "category")
             {
                 const QString cat = getFirstText(info);
 
-                if (ProgramInfo::kCategoryNone == pginfo->categoryType &&
+                if (ProgramInfo::kCategoryNone == pginfo->m_categoryType &&
                     string_to_myth_category_type(cat) != ProgramInfo::kCategoryNone)
                 {
-                    pginfo->categoryType = string_to_myth_category_type(cat);
+                    pginfo->m_categoryType = string_to_myth_category_type(cat);
                 }
-                else if (pginfo->category.isEmpty())
+                else if (pginfo->m_category.isEmpty())
                 {
-                    pginfo->category = cat;
+                    pginfo->m_category = cat;
                 }
 
                 if ((cat.compare(QObject::tr("movie"),Qt::CaseInsensitive) == 0) ||
                     (cat.compare(QObject::tr("film"),Qt::CaseInsensitive) == 0))
                 {
                     // Hack for tv_grab_uk_rt
-                    pginfo->categoryType = ProgramInfo::kCategoryMovie;
+                    pginfo->m_categoryType = ProgramInfo::kCategoryMovie;
                 }
 
-                pginfo->genres.append(cat);
+                pginfo->m_genres.append(cat);
             }
-            else if (info.tagName() == "date" && !pginfo->airdate)
+            else if (info.tagName() == "date" && !pginfo->m_airdate)
             {
                 // Movie production year
                 QString date = getFirstText(info);
-                pginfo->airdate = date.left(4).toUInt();
+                pginfo->m_airdate = date.left(4).toUInt();
             }
-            else if (info.tagName() == "star-rating" && pginfo->stars == 0.0f)
+            else if (info.tagName() == "star-rating" && pginfo->m_stars == 0.0f)
             {
                 QDomNodeList values = info.elementsByTagName("value");
                 QDomElement item;
@@ -432,7 +432,7 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
                         rating = num/den;
                 }
 
-                pginfo->stars = rating;
+                pginfo->m_stars = rating;
             }
             else if (info.tagName() == "rating")
             {
@@ -443,20 +443,20 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
                 if (item.isNull())
                     continue;
                 EventRating rating;
-                rating.system = info.attribute("system", "");
-                rating.rating = getFirstText(item);
-                pginfo->ratings.append(rating);
+                rating.m_system = info.attribute("system", "");
+                rating.m_rating = getFirstText(item);
+                pginfo->m_ratings.append(rating);
             }
             else if (info.tagName() == "previously-shown")
             {
-                pginfo->previouslyshown = true;
+                pginfo->m_previouslyshown = true;
 
                 QString prevdate = info.attribute("start");
                 if (!prevdate.isEmpty())
                 {
                     QDateTime date;
                     fromXMLTVDate(prevdate, date);
-                    pginfo->originalairdate = date.date();
+                    pginfo->m_originalairdate = date.date();
                 }
             }
             else if (info.tagName() == "credits")
@@ -466,11 +466,11 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
             else if (info.tagName() == "subtitles")
             {
                 if (info.attribute("type") == "teletext")
-                    pginfo->subtitleType |= SUB_NORMAL;
+                    pginfo->m_subtitleType |= SUB_NORMAL;
                 else if (info.attribute("type") == "onscreen")
-                    pginfo->subtitleType |= SUB_ONSCREEN;
+                    pginfo->m_subtitleType |= SUB_ONSCREEN;
                 else if (info.attribute("type") == "deaf-signed")
-                    pginfo->subtitleType |= SUB_SIGNED;
+                    pginfo->m_subtitleType |= SUB_SIGNED;
             }
             else if (info.tagName() == "audio")
             {
@@ -493,7 +493,7 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
                     /* Only EPisodes and SHows are part of a series for SD */
                     if (programid.startsWith(QString("EP")) ||
                         programid.startsWith(QString("SH")))
-                        pginfo->seriesId = QString("EP") + programid.mid(2,8);
+                        pginfo->m_seriesId = QString("EP") + programid.mid(2,8);
                 }
                 else if (info.attribute("system") == "xmltv_ns")
                 {
@@ -508,27 +508,27 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
                     QString partnumber(part.section('/',0,0).trimmed());
                     QString parttotal(part.section('/',1,1).trimmed());
 
-                    pginfo->categoryType = ProgramInfo::kCategorySeries;
+                    pginfo->m_categoryType = ProgramInfo::kCategorySeries;
 
                     if (!season.isEmpty())
                     {
                         tmp = season.toUInt() + 1;
-                        pginfo->season = tmp;
+                        pginfo->m_season = tmp;
                         season = QString::number(tmp);
-                        pginfo->syndicatedepisodenumber = 'S' + season;
+                        pginfo->m_syndicatedepisodenumber = 'S' + season;
                     }
 
                     if (!episode.isEmpty())
                     {
                         tmp = episode.toUInt() + 1;
-                        pginfo->episode = tmp;
+                        pginfo->m_episode = tmp;
                         episode = QString::number(tmp);
-                        pginfo->syndicatedepisodenumber.append('E' + episode);
+                        pginfo->m_syndicatedepisodenumber.append('E' + episode);
                     }
 
                     if (!totalepisodes.isEmpty())
                     {
-                        pginfo->totalepisodes = totalepisodes.toUInt();
+                        pginfo->m_totalepisodes = totalepisodes.toUInt();
                     }
 
                     uint partno = 0;
@@ -545,17 +545,17 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
                         uint partto = parttotal.toUInt(&ok);
                         if (ok && partnumber <= parttotal)
                         {
-                            pginfo->parttotal  = partto;
-                            pginfo->partnumber = partno;
+                            pginfo->m_parttotal  = partto;
+                            pginfo->m_partnumber = partno;
                         }
                     }
                 }
                 else if (info.attribute("system") == "onscreen")
                 {
-                    pginfo->categoryType = ProgramInfo::kCategorySeries;
-                    if (pginfo->subtitle.isEmpty())
+                    pginfo->m_categoryType = ProgramInfo::kCategorySeries;
+                    if (pginfo->m_subtitle.isEmpty())
                     {
-                        pginfo->subtitle = getFirstText(info);
+                        pginfo->m_subtitle = getFirstText(info);
                     }
                 }
                 else if ((info.attribute("system") == "themoviedb.org") &&
@@ -565,7 +565,7 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
                     QString inetrefRaw(getFirstText(info));
                     if (inetrefRaw.startsWith(QString("movie/"))) {
                         QString inetref(QString ("tmdb3.py_") + inetrefRaw.section('/',1,1).trimmed());
-                        pginfo->inetref = inetref;
+                        pginfo->m_inetref = inetref;
                     }
                 }
                 else if ((info.attribute("system") == "thetvdb.com") &&
@@ -575,7 +575,7 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
                     QString inetrefRaw(getFirstText(info));
                     if (inetrefRaw.startsWith(QString("series/"))) {
                         QString inetref(QString ("ttvdb.py_") + inetrefRaw.section('/',1,1).trimmed());
-                        pginfo->inetref = inetref;
+                        pginfo->m_inetref = inetref;
                         /* ProgInfo does not have a collectionref, so we don't set any */
                     }
                 }
@@ -583,30 +583,30 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
         }
     }
 
-    if (pginfo->category.isEmpty() &&
-        pginfo->categoryType != ProgramInfo::kCategoryNone)
-        pginfo->category = myth_category_type_to_string(pginfo->categoryType);
+    if (pginfo->m_category.isEmpty() &&
+        pginfo->m_categoryType != ProgramInfo::kCategoryNone)
+        pginfo->m_category = myth_category_type_to_string(pginfo->m_categoryType);
 
-    if (!pginfo->airdate
-        && ProgramInfo::kCategorySeries != pginfo->categoryType)
-        pginfo->airdate = m_current_year;
+    if (!pginfo->m_airdate
+        && ProgramInfo::kCategorySeries != pginfo->m_categoryType)
+        pginfo->m_airdate = m_current_year;
 
     if (programid.isEmpty())
     {
 
         /* Let's build ourself a programid */
 
-        if (ProgramInfo::kCategoryMovie == pginfo->categoryType)
+        if (ProgramInfo::kCategoryMovie == pginfo->m_categoryType)
             programid = "MV";
-        else if (ProgramInfo::kCategorySeries == pginfo->categoryType)
+        else if (ProgramInfo::kCategorySeries == pginfo->m_categoryType)
             programid = "EP";
-        else if (ProgramInfo::kCategorySports == pginfo->categoryType)
+        else if (ProgramInfo::kCategorySports == pginfo->m_categoryType)
             programid = "SP";
         else
             programid = "SH";
 
-        QString seriesid = QString::number(ELFHash(pginfo->title.toUtf8()));
-        pginfo->seriesId = seriesid;
+        QString seriesid = QString::number(ELFHash(pginfo->m_title.toUtf8()));
+        pginfo->m_seriesId = seriesid;
         programid.append(seriesid);
 
         if (!episode.isEmpty() && !season.isEmpty())
@@ -620,17 +620,17 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
             {
                 // Cannot represent season as a single base-36 character, so
                 // remove the programid and fall back to normal dup matching.
-                if (ProgramInfo::kCategoryMovie != pginfo->categoryType)
+                if (ProgramInfo::kCategoryMovie != pginfo->m_categoryType)
                     programid.clear();
             }
             else
             {
                 programid.append(episode);
                 programid.append(QString::number(season_int, 36));
-                if (pginfo->partnumber && pginfo->parttotal)
+                if (pginfo->m_partnumber && pginfo->m_parttotal)
                 {
-                    programid += QString::number(pginfo->partnumber);
-                    programid += QString::number(pginfo->parttotal);
+                    programid += QString::number(pginfo->m_partnumber);
+                    programid += QString::number(pginfo->m_parttotal);
                 }
             }
         }
@@ -638,12 +638,12 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
         {
             /* No ep/season info? Well then remove the programid and rely on
                normal dupchecking methods instead. */
-            if (ProgramInfo::kCategoryMovie != pginfo->categoryType)
+            if (ProgramInfo::kCategoryMovie != pginfo->m_categoryType)
                 programid.clear();
         }
     }
 
-    pginfo->programId = programid;
+    pginfo->m_programId = programid;
 
     return pginfo;
 }
@@ -702,59 +702,59 @@ bool XMLTVParser::parseFile(
             {
                 ProgInfo *pginfo = parseProgram(e);
 
-                if (!(pginfo->starttime.isValid()))
+                if (!(pginfo->m_starttime.isValid()))
                 {
                     LOG(VB_GENERAL, LOG_WARNING, QString("Invalid programme (%1), "
                                                         "invalid start time, "
                                                         "skipping")
-                                                        .arg(pginfo->title));
+                                                        .arg(pginfo->m_title));
                 }
-                else if (pginfo->channel.isEmpty())
+                else if (pginfo->m_channel.isEmpty())
                 {
                     LOG(VB_GENERAL, LOG_WARNING, QString("Invalid programme (%1), "
                                                         "missing channel, "
                                                         "skipping")
-                                                        .arg(pginfo->title));
+                                                        .arg(pginfo->m_title));
                 }
-                else if (pginfo->startts == pginfo->endts)
+                else if (pginfo->m_startts == pginfo->m_endts)
                 {
                     LOG(VB_GENERAL, LOG_WARNING, QString("Invalid programme (%1), "
                                                         "identical start and end "
                                                         "times, skipping")
-                                                        .arg(pginfo->title));
+                                                        .arg(pginfo->m_title));
                 }
                 else
                 {
-                    if (pginfo->clumpidx.isEmpty())
-                        (*proglist)[pginfo->channel].push_back(*pginfo);
+                    if (pginfo->m_clumpidx.isEmpty())
+                        (*proglist)[pginfo->m_channel].push_back(*pginfo);
                     else
                     {
                         /* append all titles/descriptions from one clump */
-                        if (pginfo->clumpidx.toInt() == 0)
+                        if (pginfo->m_clumpidx.toInt() == 0)
                         {
                             aggregatedTitle.clear();
                             aggregatedDesc.clear();
                         }
 
-                        if (!pginfo->title.isEmpty())
+                        if (!pginfo->m_title.isEmpty())
                         {
                             if (!aggregatedTitle.isEmpty())
                                 aggregatedTitle.append(" | ");
-                            aggregatedTitle.append(pginfo->title);
+                            aggregatedTitle.append(pginfo->m_title);
                         }
 
-                        if (!pginfo->description.isEmpty())
+                        if (!pginfo->m_description.isEmpty())
                         {
                             if (!aggregatedDesc.isEmpty())
                                 aggregatedDesc.append(" | ");
-                            aggregatedDesc.append(pginfo->description);
+                            aggregatedDesc.append(pginfo->m_description);
                         }
-                        if (pginfo->clumpidx.toInt() ==
-                            pginfo->clumpmax.toInt() - 1)
+                        if (pginfo->m_clumpidx.toInt() ==
+                            pginfo->m_clumpmax.toInt() - 1)
                         {
-                            pginfo->title = aggregatedTitle;
-                            pginfo->description = aggregatedDesc;
-                            (*proglist)[pginfo->channel].push_back(*pginfo);
+                            pginfo->m_title = aggregatedTitle;
+                            pginfo->m_description = aggregatedDesc;
+                            (*proglist)[pginfo->m_channel].push_back(*pginfo);
                         }
                     }
                 }