Ticket #5875: mythui_mythweather.2.diff

mythweather/mythweather/weatherSetup.cpp

@@ -572 +572 @@
 
     menuPopup->SetReturnEvent(this, "units");
 
-    menuPopup->AddButton(tr("English Units"), si);
-    menuPopup->AddButton(tr("SI Units"), si);
+    menuPopup->AddButton(tr("English Units"), qVariantFromValue(si));
+    menuPopup->AddButton(tr("SI Units"), qVariantFromValue(si));
 }
 
 void ScreenSetup::deleteScreen()
@@ -602 +602 @@
 
         if (resultid == "options")
         {
-            MythUIButtonListItem *item = (MythUIButtonListItem *)dce->GetResultData();
-            ScreenListInfo *si = (ScreenListInfo *) item->getData();
+            MythUIButtonListItem *item = qVariantValue<MythUIButtonListItem *>(dce->GetData()); 
+            ScreenListInfo *si = qVariantValue<ScreenListInfo *>(item->GetData()); 
 
             if (buttonnum == 0)
             {
@@ -629 +629 @@
         }
         else if (resultid == "units")
         {
-            ScreenListInfo *si = (ScreenListInfo *)dce->GetResultData();
-            if (buttonnum == 0)
+            if (buttonnum > -1)
             {
-                si->units = ENG_UNITS;
+                ScreenListInfo *si = qVariantValue<ScreenListInfo *>(dce->GetData()); 
+                if (buttonnum == 0)
+                {
+                    si->units = ENG_UNITS;
+                }
+                else if (buttonnum == 1)
+                {
+                    si->units = SI_UNITS;
+                }
+                doLocationDialog(si);
             }
-            else if (buttonnum == 1)
-            {
-                si->units = SI_UNITS;
-            }
-            doLocationDialog(si);
         }
         else if (resultid == "location")
         {
-            ScreenListInfo *si = (ScreenListInfo *)dce->GetResultData();
+            ScreenListInfo *si = qVariantValue<ScreenListInfo *>(dce->GetData());
             Q3DictIterator<TypeListInfo> it(si->types);
             for (; it.current(); ++it)
             {