Ticket #4132: 4132-dbg-v7.patch

mythplugins/mythmusic/mythmusic/playbackbox.cpp

@@ -251 +251 @@
     if (progress)
     {
         progress->Close();
-        delete progress;
+        progress->deleteLater();
         progress = NULL;
     }
 
@@ -645 +645 @@
         return;
 
     playlist_popup->hide();
-    delete playlist_popup;
+    playlist_popup->deleteLater();
     playlist_popup = NULL;
 }
 
@@ -680 +680 @@
     SmartPlaylistDialog dialog(gContext->GetMainWindow(), "smartplaylistdialog");
     dialog.setSmartPlaylist(curSmartPlaylistCategory, curSmartPlaylistName);
 
-    int res = dialog.ExecPopup();
+    DialogCode res = dialog.ExecPopup();
 
-    if (res > 0)
+    if (kDialogCodeRejected != res)
     {
         dialog.getSmartPlaylist(curSmartPlaylistCategory, curSmartPlaylistName);
         updatePlaylistFromSmartPlaylist();
@@ -698 +698 @@
 
     SearchDialog dialog(gContext->GetMainWindow(), "searchdialog");
 
-    int res = dialog.ExecPopupAtXY(-1, 20);
+    DialogCode res = dialog.ExecPopupAtXY(-1, 20);
 
-    if (res != -1)
+    if (kDialogCodeRejected != res)
     {
           QString whereClause;
           dialog.getWhereClause(whereClause);
@@ -999 +999 @@
 
     EditMetadataDialog editDialog(editMeta, gContext->GetMainWindow(),
                       "edit_metadata", "music-", "edit metadata");
-    if (editDialog.exec())
+    if (kDialogCodeRejected != editDialog.exec())
     {
         // update the metadata copy stored in all_music
         if (all_music->updateMetadata(editMeta->ID(), editMeta))
@@ -1020 +1020 @@
            }
         }
 
-        MythBusyDialog busy(QObject::tr("Rebuilding music tree"));
-        busy.start();
+        MythBusyDialog *busy = new MythBusyDialog(
+            QObject::tr("Rebuilding music tree"));
+        busy->start();
 
         // Get a reference to the current track
         QValueList <int> branches_to_current_node;
@@ -1065 +1066 @@
 
         music_tree_list->refresh();
 
-        busy.Close();
+        busy->Close();
+        busy->deleteLater();
     }
 }
 
@@ -1086 +1088 @@
             if (progress)
             {
                 progress->Close();
-                delete progress;
+                progress->deleteLater();
                 progress = NULL;
                 progress_type = kProgressNone;
             }
@@ -1147 +1149 @@
                 if (progress)
                 {
                     progress->Close();
-                    delete progress;
+                    progress->deleteLater();
                 }
                 progress = NULL;
                 progress_type = kProgressNone;
@@ -2363 +2365 @@
     dupsCheck->setBackgroundOrigin(ParentOrigin);
     popup->addWidget(dupsCheck);
 
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
     switch (res)
     {
-        case 0:
+        case kDialogCodeButton0:
             insertOption = PL_REPLACE;
             break;
-        case 1:
+        case kDialogCodeButton1:
             insertOption = PL_INSERTAFTERCURRENT;
             break;
-        case 2:
+        case kDialogCodeButton2:
             insertOption = PL_INSERTATEND;
             break;
+        case kDialogCodeRejected:
+        default:
+            popup->deleteLater();
+            return false;
     }
 
     bRemoveDups = dupsCheck->isChecked();
@@ -2402 +2408 @@
     else
         playOption = PL_CURRENT;
 
-    delete popup;
+    popup->deleteLater();
 
-    return (res >= 0);
+    return true;
 }
 
 QString PlaybackBoxMusic::getTimeString(int exTime, int maxTime)

mythplugins/mythmusic/mythmusic/search.cpp

@@ -46 +46 @@
     addWidget(listbox);
 
     // buttons
-    okButton = addButton(tr("OK"), this, SLOT(okPressed()));
-    cancelButton = addButton(tr("Cancel"), this, SLOT(cancelPressed()));
+    okButton = addButton(tr("OK"), this, SLOT(accept()));
+    cancelButton = addButton(tr("Cancel"), this, SLOT(reject()));
 
     // Initially, fill list with all music
     runQuery("");
@@ -223 +223 @@
 {
     unsigned int id = ((SearchListBoxItem*)listbox->item(i))->getId();
     whereClause = QString("WHERE song_id='%1';").arg(id);
-    done(0);
+    accept();
 }
 
 
@@ -236 +236 @@
 {
 }
 
-void SearchDialog::okPressed(void)
-{
-    done(0);
-}
-
-void SearchDialog::cancelPressed(void)
-{
-    done(-1);
-}
-
 void SearchListBoxItem::paint(QPainter *p)
 {
     int itemHeight = height(listBox());

mythplugins/mythmusic/mythmusic/globalsettings.cpp

@@ -673 +673 @@
 {
     VisualizationsEditor *dialog = new VisualizationsEditor(visModesEdit->getValue(),
             gContext->GetMainWindow(), "viseditor");
-    if (dialog->exec() == 1)
+    if (kDialogCodeAccepted == dialog->exec())
         visModesEdit->setValue(dialog->getSelectedModes());
 
     delete dialog;

mythplugins/mythmusic/mythmusic/directoryfinder.cpp

@@ -171 +171 @@
          || !m_cancelButton || !m_homeButton)
     {
         cout << "DirectoryFinder: Your theme is missing some UI elements! Bailing out." << endl;
-        QTimer::singleShot(100, this, SLOT(done(int)));
+        QTimer::singleShot(100, this, SLOT(reject()));
     }
 
     // load pixmaps

mythplugins/mythmusic/mythmusic/playlist.cpp

@@ -1790 +1790 @@
     }
 
     progress->Close();
-    delete progress;
+    progress->deleteLater();
 
     progress = new MythProgressDialog(QObject::tr("Burning CD"), 100);
     progress->setProgress(2);
@@ -1868 +1868 @@
     }
 
     progress->Close();
-    delete progress;
+    progress->deleteLater();
 
     QFile::remove(tmprecordlist);
     QFile::remove(tmprecordisofs);

mythplugins/mythmusic/mythmusic/cdrip.cpp

@@ -720 +720 @@
                     }
                     else
                     {
-                        DialogBox dialog(gContext->GetMainWindow(),
-                                         tr("Artist: %1\n"
-                                         "Album: %2\n"
-                                         "Track: %3\n\n"
-                                         "This track is already in the database. \n"
-                                         "Do you want to remove the existing track?")
-                                         .arg(m_artistName).arg(m_albumName).arg(title));
-                        dialog.AddButton("No");
-                        dialog.AddButton("No To All");
-                        dialog.AddButton("Yes");
-                        dialog.AddButton("Yes To All");
-                        int res = dialog.exec();
+                        DialogBox *dlg = new DialogBox(
+                            gContext->GetMainWindow(),
+                            tr("Artist: %1\n"
+                               "Album: %2\n"
+                               "Track: %3\n\n"
+                               "This track is already in the database. \n"
+                               "Do you want to remove the existing track?")
+                            .arg(m_artistName).arg(m_albumName).arg(title));
 
-                        if (res == 1)
+                        dlg->AddButton("No");
+                        dlg->AddButton("No To All");
+                        dlg->AddButton("Yes");
+                        dlg->AddButton("Yes To All");
+                        DialogCode res = dlg->exec();
+                        dlg->deleteLater();
+                        dlg = NULL;
+
+                        if (kDialogCodeButton0 == res)
                         {
                             delete ripTrack;
                             delete metadata;
                         }
-                        else if (res == 2)
+                        else if (kDialogCodeButton1 == res)
                         {
                             noToAll = true;
                             delete ripTrack;
                             delete metadata;
                         }
-                        else if (res == 3)
+                        else if (kDialogCodeButton2 == res)
                         {
                             deleteTrack(m_artistName, m_albumName, title);
                             m_tracks->push_back(ripTrack);
                         }
-                        else if (res == 4)
+                        else if (kDialogCodeButton3 == res)
                         {
                             yesToAll = true;
                             deleteTrack(m_artistName, m_albumName, title);
                             m_tracks->push_back(ripTrack);
                         }
+                        else // treat cancel as no
+                        {
+                            delete ripTrack;
+                            delete metadata;
+                        }
                     }
                 }
             }
@@ -779 +788 @@
     buildFocusList();
     updateTrackList();
 
-    delete busy;
+    busy->deleteLater();
 }
 
 void Ripper::scanCD(void)
@@ -1167 +1176 @@
 
     RipStatus statusDialog(m_CDdevice, m_tracks, m_qualitySelector->getCurrentInt(),
                            gContext->GetMainWindow(), "edit metadata");
-    int res = statusDialog.exec();
-    if (res == Accepted)
+    DialogCode rescode = statusDialog.exec();
+    if (kDialogCodeAccepted == rescode)
     {
         bool EjectCD = gContext->GetNumSetting("EjectCDAfterRipping", 1);
         if (EjectCD) 
@@ -1196 +1205 @@
     }
 
     delete ejector;
-    delete busy;
+    busy->deleteLater();
 }
 
 void Ripper::ejectCD()
@@ -1375 +1384 @@
     searchDialog->setCaption(caption);
     searchDialog->setSearchText(value);
     searchDialog->setItems(m_searchList);
-    if (searchDialog->ExecPopupAtXY(-1, 8) == 0)
+    DialogCode rescode = searchDialog->ExecPopupAtXY(-1, 8);
+    if (kDialogCodeRejected != rescode)
     {
         value = searchDialog->getResult();
         res = true;
     }
 
-    delete searchDialog;
+    searchDialog->deleteLater();
+    searchDialog = NULL;
     setActiveWindow();
 
     return res;
@@ -1395 +1406 @@
                                   "edit_metadata", "music-", "edit metadata");
     editDialog.setSaveMetadataOnly();
 
-    if (editDialog.exec())
+    if (kDialogCodeRejected != editDialog.exec())
     {
         updateTrackList();
     }

mythplugins/mythmusic/mythmusic/smartplaylist.cpp

@@ -624 +624 @@
     
     SmartPLDateDialog *dateDialog = new SmartPLDateDialog(gContext->GetMainWindow(), "");
     dateDialog->setDate(combo->currentText());
-    if (dateDialog->ExecPopup() == 0)
+    if (kDialogCodeAccepted == dateDialog->ExecPopup())
     {
         combo->insertItem(dateDialog->getDate());
         combo->setCurrentText(dateDialog->getDate());
         res = true;
     }
-    
-    delete dateDialog;
+
+    dateDialog->hide();
+    dateDialog->deleteLater();
 }
           
 bool SmartPLCriteriaRow::showList(QString caption, QString &value)
@@ -642 +643 @@
     searchDialog->setCaption(caption);
     searchDialog->setSearchText(value);
     searchDialog->setItems(searchList);
-    if (searchDialog->ExecPopup() == 0)
+    if (kDialogCodeAccepted == searchDialog->ExecPopup())
     {
         value = searchDialog->getResult();
         res = true;
     }
 
-    delete searchDialog;
+    searchDialog->deleteLater();
 
     return res;
 }
@@ -1089 +1090 @@
     connect(titleEdit, SIGNAL(textChanged(void)), this, SLOT(titleChanged(void)));
     connect(categoryButton, SIGNAL(clicked()), this, SLOT(categoryClicked()));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(saveClicked()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancelClicked()));
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
     connect(showResultsButton, SIGNAL(clicked()), this, SLOT(showResultsClicked()));
     connect(orderByButton, SIGNAL(clicked()), this, SLOT(orderByClicked()));
     
@@ -1211 +1212 @@
         row->saveToDatabase(ID);
     }
     
-    done(0);        
+    reject();        
 }
 
 void SmartPlaylistEditor::newSmartPlaylist(QString category)
@@ -1308 +1309 @@
     }
 }
 
-void SmartPlaylistEditor::cancelClicked(void)
-{
-    done(-1);
-}
-
 void SmartPlaylistEditor::categoryClicked(void)
 {
    showCategoryPopup();
@@ -1370 +1366 @@
         return;
 
     category_popup->hide();
-    delete category_popup;
+    category_popup->deleteLater();
     category_popup = NULL;
     categoryButton->setFocus();
 }
@@ -1515 +1511 @@
     
     orderByDialog->setFieldList(orderByCombo->currentText());
     
-    if (orderByDialog->ExecPopup() == 0)
+    if (kDialogCodeAccepted == orderByDialog->ExecPopup())
         orderByCombo->setCurrentText(orderByDialog->getFieldList());
     
     delete orderByDialog;
@@ -1875 +1871 @@
             if (action == "ESCAPE")
             {
                 handled = true;
-                done(-1);        
+                reject();
             }
             else if (action == "LEFT")
             {
@@ -2177 +2173 @@
     connect(moveDownButton, SIGNAL(clicked()), this, SLOT(moveDownPressed()));
     connect(ascendingButton, SIGNAL(clicked()), this, SLOT(ascendingPressed()));
     connect(descendingButton, SIGNAL(clicked()), this, SLOT(descendingPressed()));
-    connect(okButton, SIGNAL(clicked()), this, SLOT(okPressed()));
+    connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
     
     connect(listbox, SIGNAL(selectionChanged(QListBoxItem*)), this, 
             SLOT(listBoxSelectionChanged(QListBoxItem*)));
@@ -2244 +2240 @@
             if (action == "ESCAPE")
             {
                 handled = true;
-                done(-1);        
+                reject();
             }
             else if (action == "LEFT")
             {
@@ -2299 +2295 @@
             else if (action == "7")
             {
                 handled = true;
-                okPressed();
+                accept();
             }
         }
     }
@@ -2368 +2364 @@
     listbox->setSelected(listbox->selectedItem()->next(), true);
 }
 
-void SmartPLOrderByDialog::okPressed(void)
-{
-    done(0);
-}
-
 void SmartPLOrderByDialog::orderByChanged(void)
 {
     bool found = false;
@@ -2552 +2543 @@
 
     addLayout(vbox, 0);
     
-    connect(okButton, SIGNAL(clicked()), this, SLOT(okPressed()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancelPressed()));
+    connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
 
     connect(fixedRadio, SIGNAL(toggled(bool)), this, SLOT(fixedCheckToggled(bool)));
     connect(nowRadio, SIGNAL(toggled(bool)), this, SLOT(nowCheckToggled(bool)));
@@ -2662 +2653 @@
             if (action == "ESCAPE")
             {
                 handled = true;
-                done(-1);        
+                reject();
             }
             else if (action == "LEFT")
             {
@@ -2690 +2681 @@
         MythPopupBox::keyPressEvent(e);
 }
 
-void SmartPLDateDialog::okPressed(void)
-{
-    done(0);
-}
-
-void SmartPLDateDialog::cancelPressed(void)
-{
-    done(-1);
-}
-
 void SmartPLDateDialog::fixedCheckToggled(bool on)
 {
     daySpinEdit->setEnabled(on);

mythplugins/mythmusic/mythmusic/editmetadata.cpp

@@ -521 +521 @@
     searchDialog->setCaption(caption);
     searchDialog->setSearchText(value);
     searchDialog->setItems(searchList);
-    if (searchDialog->ExecPopupAtXY(-1, 8) == 0)
+    DialogCode rescode = searchDialog->ExecPopupAtXY(-1, 8);
+    if (kDialogCodeRejected != rescode)
     {
         value = searchDialog->getResult();
         res = true;
     }
 
-    delete searchDialog;
+    searchDialog->deleteLater();
     setActiveWindow();
 
     return res;
@@ -600 +601 @@
 void EditMetadataDialog::closeDialog()
 {
     cancelPopup();
-    done(1);  
+    accept();
 }
 
 void EditMetadataDialog::showSaveMenu()
@@ -646 +647 @@
 
   popup->hide();
 
-  delete popup;
+  popup->deleteLater();
   popup = NULL;
   setActiveWindow();
 }
@@ -656 +657 @@
     cancelPopup();
 
     *m_sourceMetadata = m_metadata;
-    done(1);
+    accept();
 }
 
 void EditMetadataDialog::saveToDatabase()
@@ -665 +666 @@
 
     m_metadata->dumpToDatabase();
     *m_sourceMetadata = m_metadata;
-    done(1);
+    accept();
 }
 
 void EditMetadataDialog::saveToFile()
@@ -687 +688 @@
         decoder->commitMetadata(m_metadata);
         delete decoder;
     }
-    done(1);
+    accept();
 }
 
 void EditMetadataDialog::saveAll()
@@ -729 +730 @@
     menu->addButton(albumArt->getTypeName(IT_CD));
     menu->addButton(albumArt->getTypeName(IT_INLAY));
 
-    int res = menu->ExecPopup();
+    DialogCode ret = menu->ExecPopup();
+    int res = MythDialog::CalcItemIndex(ret);
 
-    if ( res != -1)
+    if ((IT_UNKNOWN <= res) && (res < IT_LAST))
     {
         // get selected image in grid
         ImageGridItem *item = coverart_grid->getCurrentItem();
@@ -752 +754 @@
         }
     }
 
-    delete menu;
+    menu->deleteLater();
 }
 
 void EditMetadataDialog::setSaveMetadataOnly()

mythplugins/mythmusic/mythmusic/databasebox.cpp

@@ -56 +56 @@
     tree = getUIListTreeType("musictree");
     if (!tree)
     {
-        DialogBox diag(gContext->GetMainWindow(), tr("The theme you are using "
-                       "does not contain a 'musictree' element.  "
-                       "Please contact the theme creator and ask if they could "
-                       "please update it.<br><br>The next screen will be empty."
-                       "  Escape out of it to return to the menu."));
-        diag.AddButton(tr("OK"));
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(),
+            tr("The theme you are using "
+               "does not contain a 'musictree' element.  "
+               "Please contact the theme creator and ask if they could "
+               "please update it.<br><br>The next screen will be empty."
+               "  Escape out of it to return to the menu."));
+        dlg->AddButton(tr("OK"));
+        dlg->exec();
+        dlg->deleteLater();
 
         return;
     }
@@ -78 +81 @@
 
     if (m_lines.count() < 3)
     {
-        DialogBox diag(gContext->GetMainWindow(), tr("The theme you are using "
-                       "does not contain any info lines in the music element.  "
-                       "Please contact the theme creator and ask if they could "
-                       "please update it."));
-        diag.AddButton(tr("OK"));
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(),
+            tr("The theme you are using "
+               "does not contain any info lines in the music element.  "
+               "Please contact the theme creator and ask if they could "
+               "please update it."));
+        dlg->AddButton(tr("OK"));
+        dlg->exec();
+        dlg->deleteLater();
     }
 
     connect(tree, SIGNAL(itemEntered(UIListTreeType *, UIListGenericTree *)),
@@ -387 +393 @@
         return;
 
     error_popup->hide();
-    delete error_popup;
+    error_popup->deleteLater();
     error_popup = NULL;
 }
 
@@ -430 +436 @@
     system(command);
 
     record_progress->Close();
-    delete record_progress;
+    record_progress->deleteLater();
 }
 
 void DatabaseBox::deletePlaylist()
@@ -820 +826 @@
         return;
 
     playlist_popup->hide();
-    delete playlist_popup;
+    playlist_popup->deleteLater();
     playlist_popup = NULL;
 }
 
@@ -928 +934 @@
         return;
 
     active_popup->hide();
-    delete active_popup;
+    active_popup->deleteLater();
     active_popup = NULL;
 }
 

mythplugins/mythmusic/mythmusic/smartplaylist.h

@@ -112 +112 @@
     void updateMatches(void);
     void categoryClicked(void);
     void saveClicked(void);
-    void cancelClicked(void);
     void showResultsClicked(void);
     
     // category popup
@@ -232 +231 @@
     void descendingPressed(void);
     void orderByChanged(void);
     void listBoxSelectionChanged(QListBoxItem *item);
-    void okPressed(void);
     
  protected:
     void keyPressEvent(QKeyEvent *e);
@@ -271 +269 @@
     void addDaysCheckToggled(bool on);
     void valueChanged(void);
     
-    void okPressed(void);
-    void cancelPressed(void);
-        
  protected:
     void keyPressEvent(QKeyEvent *e);
 

mythplugins/mythmusic/mythmusic/importmusic.h

@@ -150 +150 @@
     void copyPressed(void);
     void prevPressed(void);
     void nextPressed(void);
-    void exitPressed(void);
     void selectorChanged(int item);
 
   private:

mythplugins/mythmusic/mythmusic/main.cpp

@@ -206 +206 @@
 
 void RebuildMusicTree(MusicData *mdata)
 {
-    MythBusyDialog busy(QObject::tr("Rebuilding music tree"));
-    busy.start();
+    MythBusyDialog *busy = new MythBusyDialog(
+        QObject::tr("Rebuilding music tree"));
+
+    busy->start();
     mdata->all_music->startLoading();
     while (!mdata->all_music->doneLoading())
     {
@@ -215 +217 @@
         usleep(50000);
     }
     mdata->all_playlists->postLoad();
-    busy.Close();
+    busy->Close();
+    busy->deleteLater();
 }
 
 static void postMusic(MusicData *mdata);

mythplugins/mythmusic/mythmusic/search.h

@@ -33 +33 @@
 
     void searchTextChanged(const QString &searchText);
     void itemSelected(int i);
-    void okPressed(void);
-    void cancelPressed(void);
 
   private:
 

mythplugins/mythmusic/mythmusic/importmusic.cpp

@@ -359 +359 @@
 {
     DirectoryFinder finder(m_location_edit->getText(),
                            gContext->GetMainWindow(), "directory finder");
-    bool res = finder.exec();
+    DialogCode res = finder.exec();
 
-    if (res)
+    if (kDialogCodeRejected != res)
     {
         m_location_edit->setText(finder.getSelected());
         editLostFocus();
@@ -607 +607 @@
     fillWidgets();
 
     busy->close();
-    delete busy;
+    busy->deleteLater();
 }
 
 void ImportMusicDialog::doScan()
@@ -674 +674 @@
                                   "edit_metadata", "music-", "edit metadata");
     editDialog.setSaveMetadataOnly();
 
-    if (editDialog.exec())
+    if (kDialogCodeRejected != editDialog.exec())
     {
         m_tracks->at(m_currentTrack)->metadataHasChanged = true;
         m_tracks->at(m_currentTrack)->isNewTune = Ripper::isNewTune(
@@ -736 +736 @@
         return;
 
     m_popupMenu->hide();
-    delete m_popupMenu;
+    m_popupMenu->deleteLater();
     m_popupMenu = NULL;
 }
 
@@ -1010 +1010 @@
     if (m_exit_button)
     {
         m_exit_button->setText(tr("Exit"));
-        connect(m_exit_button, SIGNAL(pushed()), this, SLOT(exitPressed()));
+        connect(m_exit_button, SIGNAL(pushed()), this, SLOT(reject()));
     }
 
     m_prev_button = getUIPushButtonType("prev_button");
@@ -1045 +1045 @@
     updateStatus();
 }
 
-void ImportCoverArtDialog::exitPressed()
-{
-    done(0);
-}
-
 void ImportCoverArtDialog::copyPressed()
 {
     if (m_filelist.size() > 0)

mythplugins/mythmusic/mythmusic/filescanner.cpp

@@ -369 +369 @@
     clean_progress->setProgress(++counter);
 
     clean_progress->Close();
-    delete clean_progress;
+    clean_progress->deleteLater();
 }
 
 /*!
@@ -506 +506 @@
     busy->start();
     BuildFileList(m_startdir, music_files, 0);
     busy->Close();
-    delete busy;
+    busy->deleteLater();
 
     ScanMusic(music_files);
     ScanArtwork(music_files);
@@ -540 +540 @@
         file_checking->setProgress(++counter);
     }
     file_checking->Close();
-    delete file_checking;
+    file_checking->deleteLater();
 
     // Cleanup orphaned entries from the database
     cleanDB();
@@ -602 +602 @@
     }
 
     file_checking->Close();
-    delete file_checking;
+    file_checking->deleteLater();
 }
 
 /*!
@@ -659 +659 @@
     }
 
     file_checking->Close();
-    delete file_checking;
+    file_checking->deleteLater();
 }

mythplugins/mytharchive/mytharchive/thumbfinder.cpp

@@ -899 +899 @@
         return;
 
     m_popupMenu->hide();
-    delete m_popupMenu;
+    m_popupMenu->deleteLater();
     m_popupMenu = NULL;
 }
 

mythplugins/mytharchive/mytharchive/videoselector.cpp

@@ -55 +55 @@
 
         if (action == "ESCAPE")
         {
-            done(0);
+            reject();
         }
         else if (action == "DOWN")
         {
@@ -165 +165 @@
         return;
 
     popupMenu->hide();
-    delete popupMenu;
+    popupMenu->deleteLater();
     popupMenu = NULL;
 }
 
@@ -603 +603 @@
                 password,
                 gContext->GetMainWindow());
         pwd->exec();
-        delete pwd;
+        pwd->deleteLater();
         if (ok)
         {
             //  All is good

mythplugins/mytharchive/mytharchive/logviewer.h

@@ -21 +21 @@
     void setFilenames(const QString &progressLog, const QString &fullLog);
 
   protected slots:
-    void exitClicked(void);
     void cancelClicked(void);
     void updateClicked(void);
     void updateTimerTimeout(void);

mythplugins/mytharchive/mytharchive/archiveutil.cpp

@@ -260 +260 @@
     DialogBox *dialog = new DialogBox(gContext->GetMainWindow(), msg);
     dialog->AddButton(QObject::tr("OK"));
     dialog->exec();
-    delete dialog;
+    dialog->deleteLater();
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

mythplugins/mytharchive/mytharchive/fileselector.cpp

@@ -206 +206 @@
          || !m_cancelButton || !m_homeButton)
     {
         cout << "FileSelector: Your theme is missing some UI elements! Bailing out." << endl;
-        QTimer::singleShot(100, this, SLOT(done(int)));
+        QTimer::singleShot(100, this, SLOT(reject()));
     }
 
     // load pixmaps

mythplugins/mytharchive/mytharchive/main.cpp

@@ -103 +103 @@
 void runCreateDVD(void)
 {
 #ifdef CREATE_DVD 
-    int res;
-
     QString commandline;
     QString tempDir = getTempDirectory(true);
 
@@ -132 +130 @@
     burnWiz = new MythburnWizard(gContext->GetMainWindow(),
                              "mythburn_wizard", "mythburn-");
     qApp->unlock();
-    res = burnWiz->exec();
+    DialogCode res = burnWiz->exec();
     qApp->lock();
     qApp->processEvents();
     delete burnWiz;
 
-    if (res == 0)
+    if (kDialogCodeRejected == res)
         return;
 
     // now show the log viewer
@@ -152 +150 @@
 void runCreateArchive(void)
 {
 #ifdef CREATE_NATIVE
-    int res;
-
     QString commandline;
     QString tempDir = getTempDirectory(true);
 
@@ -181 +177 @@
     nativeWiz = new ExportNativeWizard(gContext->GetMainWindow(),
                                  "exportnative_wizard", "mythnative-");
     qApp->unlock();
-    res = nativeWiz->exec();
+    DialogCode res = nativeWiz->exec();
     qApp->lock();
     qApp->processEvents();
     delete nativeWiz;
 
-    if (res == 0)
+    if (kDialogCodeRejected == res)
         return;
 
     // now show the log viewer
@@ -231 +227 @@
     ImportNativeWizard wiz("/", filter, gContext->GetMainWindow(),
                           "import_native_wizard", "mythnative-", "import native wizard");
     qApp->unlock();
-    int res = wiz.exec();
+    DialogCode res = wiz.exec();
     qApp->lock();
 
-    if (res == 0)
+    if (kDialogCodeRejected == res)
         return;
 
     // now show the log viewer
@@ -311 +307 @@
         return;
     }
 
-    int res;
-
     // ask the user what type of disk to burn to
     DialogBox *dialog = new DialogBox(gContext->GetMainWindow(),
             QObject::tr("\nPlace a blank DVD in the drive and select an option below."));
@@ -322 +316 @@
     dialog->AddButton(QObject::tr("Burn DVD Rewritable (Force Erase)"));
     dialog->AddButton(QObject::tr("Cancel"));
 
-    res = dialog->exec();
-    delete dialog;
+    DialogCode res = dialog->exec();
+    dialog->deleteLater();
 
-    // cancel pressed?
-    if (res == 4)
+    // cancel pressed or escape hit?
+    if ((kDialogCodeButton3 == res) || (kDialogCodeRejected == res))
         return;
 
+    int fmt = MythDialog::CalcItemIndex(res);
+    if ((fmt < 0) || (fmt > 2))
+        return;
+
     QString tempDir = getTempDirectory(true);
 
     if (tempDir == "")
@@ -346 +344 @@
     if (QFile::exists(logDir + "/mythburncancel.lck"))
         QFile::remove(logDir + "/mythburncancel.lck");
 
-    QString sArchiveFormat = QString::number(res - 1);
-    QString sEraseDVDRW = (res == 3 ? "1" : "0");
+    QString sArchiveFormat = QString::number(fmt);
+    QString sEraseDVDRW = (kDialogCodeButton2 == res) ? "1" : "0";
     QString sNativeFormat = (gContext->GetSetting("MythArchiveLastRunType").startsWith("Native") ? "1" : "0");
 
     commandline = "mytharchivehelper -b " + sArchiveFormat + " " + sEraseDVDRW  + " " + sNativeFormat;

mythplugins/mytharchive/mytharchive/editmetadata.h

@@ -32 +32 @@
     void closeDialog();
     void showSaveMenu();
     void savePressed();
-    void cancelPressed();
     void editLostFocus();
 
   private:

mythplugins/mytharchive/mytharchive/importnativewizard.cpp

@@ -259 +259 @@
          || !m_prevButton || !m_cancelButton || !m_homeButton)
     {
         cout << "ImportNativeWizard: Your theme is missing some UI elements! Bailing out." << endl;
-        QTimer::singleShot(100, this, SLOT(done(int)));
+        QTimer::singleShot(100, this, SLOT(reject()));
     }
 
     // load pixmaps
@@ -718 +718 @@
     searchDialog->setCaption(caption);
     searchDialog->setSearchText(value);
     searchDialog->setItems(m_searchList);
-    if (searchDialog->ExecPopupAtXY(-1, 8) == 0)
+    DialogCode rescode = searchDialog->ExecPopupAtXY(-1, 8);
+    if (kDialogCodeRejected != rescode)
     {
         value = searchDialog->getResult();
         res = true;
     }
 
-    delete searchDialog;
+    searchDialog->deleteLater();
     setActiveWindow();
 
     return res;

mythplugins/mytharchive/mytharchive/logviewer.cpp

@@ -100 +100 @@
 
     hbox->addWidget(m_exitButton);
 
-    connect(m_exitButton, SIGNAL(clicked()), this, SLOT(exitClicked()));
+    connect(m_exitButton, SIGNAL(clicked()), this, SLOT(reject()));
     connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(cancelClicked()));
     connect(m_updateButton, SIGNAL(clicked()), this, SLOT(updateClicked()));
     connect(m_autoupdateCheck, SIGNAL(toggled(bool)), this, SLOT(toggleAutoUpdate(bool)));
@@ -150 +150 @@
     m_updateTimer->changeInterval(value * 1000);
 }
 
-void LogViewer::exitClicked(void)
-{
-    done(-1);
-}
-
 void LogViewer::cancelClicked(void)
 {
     QString tempDir = gContext->GetSetting("MythArchiveTempDir", "");
@@ -368 +363 @@
         return;
 
     m_popupMenu->hide();
-    delete m_popupMenu;
+    m_popupMenu->deleteLater();
     m_popupMenu = NULL;
 }

mythplugins/mytharchive/mytharchive/exportnativewizard.cpp

@@ -529 +529 @@
         return;
 
     popupMenu->hide();
-    delete popupMenu;
+    popupMenu->deleteLater();
     popupMenu = NULL;
 }
 
@@ -680 +680 @@
     FileSelector selector(FSTYPE_FILE, "/", "*.*", gContext->GetMainWindow(),
                           "file_selector", "mytharchive-", "file selector");
     qApp->unlock();
-    bool res = selector.exec();
+    bool res = (kDialogCodeRejected != selector.exec());
 
     if (res)
     {

mythplugins/mytharchive/mytharchive/recordingselector.cpp

@@ -56 +56 @@
 
         if (action == "ESCAPE")
         {
-            done(0);
+            done(kDialogCodeRejected);
         }
         else if (action == "DOWN")
         {
@@ -150 +150 @@
         return;
 
     popupMenu->hide();
-    delete popupMenu;
+    popupMenu->deleteLater();
     popupMenu = NULL;
 }
 

mythplugins/mytharchive/mytharchive/editmetadata.cpp

@@ -146 +146 @@
     if (cancel_button)
     {
         cancel_button->setText(tr("Cancel"));
-        connect(cancel_button, SIGNAL(pushed()), this, SLOT(cancelPressed()));
+        connect(cancel_button, SIGNAL(pushed()), this, SLOT(reject()));
     }
 
     buildFocusList();
@@ -182 +182 @@
 {
     *sourceMetadata = workMetadata;
     sourceMetadata->editedDetails = true;
-    done(1);
+    done(kDialogCodeAccepted);
 }
 
-void EditMetadataDialog::cancelPressed()
-{
-    done(Rejected);
-}
-
 EditMetadataDialog::~EditMetadataDialog()
 {
 }

mythplugins/mytharchive/mytharchive/mythburnwizard.cpp

@@ -1353 +1353 @@
         return;
 
     popupMenu->hide();
-    delete popupMenu;
+    popupMenu->deleteLater();
     popupMenu = NULL;
 }
 
@@ -1403 +1403 @@
 
     EditMetadataDialog editDialog(curItem, gContext->GetMainWindow(),
                                   "edit_metadata", "mythburn-", "edit metadata");
-    if (editDialog.exec())
+    if (kDialogCodeRejected != editDialog.exec())
     {
         // update widgets to reflect any changes
         titleChanged(item);
@@ -1477 +1477 @@
     FileSelector selector(FSTYPE_FILE, "/", "*.*", gContext->GetMainWindow(),
                           "file_selector", "mytharchive-", "file selector");
     qApp->unlock();
-    bool res = selector.exec();
+    bool res = (kDialogCodeRejected != selector.exec());
 
     if (res)
     {

mythplugins/mythbrowser/mythbrowser/tabview.cpp

@@ -38 +38 @@
 #include "mythtv/mythdbcon.h"
 #include "mythtv/mythwidgets.h"
 #include "mythtv/virtualkeyboard.h"
+#include "mythtv/mythdialogs.h"
 
-
 using namespace std;
 
 TabView::TabView(MythMainWindow *parent, const char *name, QStringList urls, 
@@ -173 +173 @@
     if (menuIsOpen)
     {
         menu->hide();
-        delete menu;
+        menu->deleteLater();
         menu = NULL;
         menuIsOpen = false;
         hadFocus->setFocus();
@@ -322 +322 @@
     url->setText(((WebPage*)mytab->currentPage())->browser->baseURL().htmlURL());
     popup->addWidget(url);
 
-    popup->addButton(tr("OK"));
-    popup->addButton(tr("Cancel"));
+    popup->addButton(tr("OK"),     popup, SLOT(accept()));
+    popup->addButton(tr("Cancel"), popup, SLOT(reject()));
 
     qApp->removeEventFilter(this);
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
     qApp->installEventFilter(this);
 
-    if (res == 0)
+    if (kDialogCodeAccepted == res)
     {
         QString sGroup = group->text();
         QString sDesc = desc->text();
@@ -338 +338 @@
         finishAddBookmark(sGroup, sDesc, sUrl);
     }
 
-    delete popup;
+    popup->deleteLater();
 
     hadFocus->setFocus();
 }
@@ -391 +391 @@
     popup->addWidget(editor);
     editor->setFocus(); 
 
-    popup->addButton(tr("OK"));
-    popup->addButton(tr("Cancel"));
+    popup->addButton(tr("OK"),     popup, SLOT(accept()));
+    popup->addButton(tr("Cancel"), popup, SLOT(reject()));
 
     qApp->removeEventFilter(this);
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
     qApp->installEventFilter(this);
 
-    if (res == 0)
+    if (kDialogCodeAccepted == res)
     {
         QString sURL = editor->text();
         if (!sURL.startsWith("http://") && !sURL.startsWith("https://") &&
@@ -408 +408 @@
         newPage(sURL);
     }
 
-    delete popup;
+    popup->deleteLater();
 
     hadFocus->setFocus();
 }

mythplugins/mythweather/mythweather/sourceManager.h

@@ -28 +28 @@
     bool findScripts();
     bool findScriptsDB();
     void setupSources();
-    void connectScreen(uint id, WeatherScreen *screen);
-    void disconnectScreen(WeatherScreen *screen);
+    bool connectScreen(uint id, WeatherScreen *screen);
+    bool disconnectScreen(WeatherScreen *screen);
     ScriptInfo *getSourceByName(const QString &name);
 
   private slots:

mythplugins/mythweather/mythweather/weatherSetup.cpp

@@ -518 +518 @@
     }
 }
 
+inline QString format_msg(
+    const QStringList &notDefined, uint rows, uint columns)
+{
+    const QString etc = QObject::tr("etc...");
+    uint elen = etc.length();
+    QStringList lines;
+    lines += "";
+    QStringList::iterator oit = lines.begin();
+    QStringList::const_iterator iit = notDefined.begin();
+    while (iit != notDefined.end())
+    {
+        QStringList::const_iterator nit = iit;
+        nit++;
+
+        uint olen = (*oit).length();
+        uint ilen = (*iit).length();
+
+        if (lines.size() >= rows)
+        {
+            if (((olen + 2 + ilen + 2 + elen) < columns) ||
+                (((olen + 2 + ilen) < columns) && (nit == notDefined.end())))
+            {
+                *oit += ", " + *iit;
+            }
+            else
+            {
+                *oit += ", " + etc;
+                nit = notDefined.end();
+            }
+        }
+        else
+        {
+            if ((olen + 2 + ilen) < columns)
+            {
+                *oit += ", " + *iit;
+            }
+            else
+            {
+                *oit += ",";
+                lines += "";
+                oit++;
+                *oit += *iit;
+            }
+        }
+
+        iit = nit;
+    }
+
+    return lines.join("\n").mid(2);
+}
+
 void ScreenSetup::saveData()
 {
     // check if all active screens have sources/locations defined
@@ -547 +598 @@
 
     if (notDefined.size())
     {
-        QString msg = tr("Cannot proceed, the following data items do not have sources defined:\n");
-        msg += notDefined.join("\n");
+        QString msg = tr("Can not proceed, the following data "
+                         "items do not have sources defined:\n");
+        msg += format_msg(notDefined, 1, 400);
         MythPopupBox::showOkPopup(gContext->GetMainWindow(),
                                   "Undefined Sources", msg);
         return;
@@ -627 +679 @@
     accept();
 }
 
-void ScreenSetup::doListSelect(UIListBtnType *list, UIListBtnTypeItem *selected)
+typedef QMap<DialogCode, QString> CommandMap;
+
+static DialogCode add_button(QStringList   &buttons,
+                             CommandMap    &commands,
+                             const QString &button_text,
+                             const QString &command)
 {
+    int idx = buttons.size();
+    buttons += button_text;
+    commands[(DialogCode)((int)kDialogCodeButton0 + idx)] = command;
+
+    return (DialogCode)((int)kDialogCodeButton0 + idx);
+}
+
+void ScreenSetup::doListSelect(UIListBtnType *list,
+                               UIListBtnTypeItem *selected)
+{
     QString txt = selected->text();
     if (list == m_active_list)
     {
         ScreenListInfo *si = (ScreenListInfo *) selected->getData();
         QStringList buttons;
+        CommandMap commands;
+
         if (!si->multiLoc)
-            buttons << tr("Change Location");
+            add_button(buttons, commands, tr("Change Location"), "change_loc");
 
         if (si->hasUnits)
-            buttons << tr("Change Units");
+            add_button(buttons, commands, tr("Change Units"), "change_units");
 
-        buttons << tr("Move Up") << tr("Move Down") << tr("Remove") <<
-                tr("Cancel");
-        QString result = buttons[MythPopupBox::showButtonPopup(
-                    gContext->GetMainWindow(), "Manipulate Screen",
-                    tr("Action to take on screen ") + selected->text(),
-                    buttons, buttons.count() - 1)];
-        if (result == tr ("Change Location"))
+        add_button(buttons, commands, tr("Move Up"),   "move_up");
+        add_button(buttons, commands, tr("Move Down"), "move_down");
+        add_button(buttons, commands, tr("Remove"),    "remove");
+
+        DialogCode cancelbtn =
+            add_button(buttons, commands, tr("Cancel"), "cancel");
+        commands[kDialogCodeRejected] = "cancel";
+
+        DialogCode res = MythPopupBox::ShowButtonPopup(
+            gContext->GetMainWindow(), "Manipulate Screen",
+            tr("Action to take on screen ") + selected->text(),
+            buttons, cancelbtn);
+
+        QString cmd = commands[res];
+        if (cmd == "change_loc")
         {
             doLocationDialog(si, true);
         }
-        else if (result == tr("Change Units"))
+        else if (cmd == "change_units")
         {
             showUnitsPopup(selected->text(),
                            (ScreenListInfo *) selected->getData());
             updateHelpText();
         }
-        else if (result == tr("Move Up"))
+        else if (cmd == "move_up")
         {
             list->MoveItemUpDown(selected, true);
         }
-        else if (result == tr("Move Down"))
+        else if (cmd == "move_down")
         {
             list->MoveItemUpDown(selected, false);
         }
-        else if (result == tr("Remove"))
+        else if (cmd == "remove")
         {
             deleteScreen(list);
         }
@@ -798 +875 @@
     units_t *units = &si->units;
     QStringList unitsBtns;
     unitsBtns << tr("English Units") << tr("SI Units");
-    int ret = MythPopupBox::showButtonPopup(
-            gContext->GetMainWindow(), "Change Units",
-            tr("Select units for screen ") + name, unitsBtns,
-            *units == ENG_UNITS ? 0 : 1);
+    DialogCode ret = MythPopupBox::ShowButtonPopup(
+        gContext->GetMainWindow(), "Change Units",
+        tr("Select units for screen ") + name, unitsBtns,
+        *units == ENG_UNITS ? kDialogCodeButton0 : kDialogCodeButton1);
+
     switch (ret)
     {
-        case 0:
+        case kDialogCodeButton0:
             *units = ENG_UNITS;
             break;
-        case 1:
+        case kDialogCodeButton1:
             *units = SI_UNITS;
             break;
         default:

mythplugins/mythweather/mythweather/sourceManager.cpp

@@ -73 +73 @@
     QDir dir(path);
     dir.setFilter(QDir::Executable | QDir::Files);
     // this kinda goes against idea of keeping ui separate, but oh well
-    MythProgressDialog bsydlg(tr("Searching for scripts"), dir.count());
+    MythProgressDialog *busyd = new MythProgressDialog(
+        tr("Searching for scripts"), dir.count());
     int progress = 0;
 
     if (!dir.exists())
@@ -100 +101 @@
                 VERBOSE(VB_GENERAL, "found script " + file->absFilePath());
             }
         }
-        bsydlg.setProgress(++progress);
+        busyd->setProgress(++progress);
     }
     // run through and see if any scripts have been deleted
     MSqlQuery db(MSqlQuery::InitCon());
@@ -129 +130 @@
             VERBOSE(VB_IMPORTANT,  db.lastError().text());
         }
     }
-    bsydlg.Close();
+    busyd->Close();
+    busyd->deleteLater();
 
     return m_scripts.count() > 0;
 }
@@ -296 +298 @@
         return false;
 }
 
-void SourceManager::connectScreen(uint id, WeatherScreen *screen)
+bool SourceManager::connectScreen(uint id, WeatherScreen *screen)
 {
+    if (!screen)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "Can not connect nonexistent screen "<<screen);
+
+        return false;
+    }
+
     WeatherSource *ws = m_sourcemap[id];
+    if (!ws)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "Can not connect nonexistent source "<<id);
+
+        return false;
+    }
     ws->connectScreen(screen);
+    return true;
 }
 
-void SourceManager::disconnectScreen(WeatherScreen *screen)
+bool SourceManager::disconnectScreen(WeatherScreen *screen)
 {
+    if (!screen)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "Can not disconnect nonexistent screen "<<screen);
+
+        return false;
+    }
+
     WeatherSource *ws = m_sourcemap[screen->getId()];
+    if (!ws)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "Can not disconnect nonexistent source "<<screen->getId());
+
+        return false;
+    }
     ws->disconnectScreen(screen);
+    return true;
 }

mythplugins/mythgallery/mythgallery/iconview.cpp

@@ -155 +155 @@
         }
         else 
         {
-            DialogBox dialog(gContext->GetMainWindow(),
+            DialogBox *dlg = new DialogBox(gContext->GetMainWindow(),
                              tr("Failed to mount device: ") + 
                              m_currDevice->getDevicePath() + "\n\n" +
                              tr("Showing the default MythGallery directory."));
-            dialog.AddButton(tr("OK"));
-            dialog.exec();
+            dlg->AddButton(tr("OK"));
+            dlg->exec();
+            dlg->deleteLater();
             mon->Unlock(m_currDevice);
         }
     }
@@ -1329 +1330 @@
     QFileInfo path;
     QDir importdir;
 
-    DialogBox importDiag(gContext->GetMainWindow(), tr("Import pictures?"));
-    importDiag.AddButton(tr("No"));
-    importDiag.AddButton(tr("Yes"));
-    if (importDiag.exec() != 2)
+    DialogBox *importDlg = new DialogBox(
+        gContext->GetMainWindow(), tr("Import pictures?"));
+
+    importDlg->AddButton(tr("No"));
+    importDlg->AddButton(tr("Yes"));
+    DialogCode code = importDlg->exec();
+    importDlg->deleteLater();
+    if (kDialogCodeButton1 != code)
         return;
 
     // Makes import directory samba/windows friendly (no colon)
@@ -1371 +1376 @@
         // (QT < 3.1) rely on automatic fail if dir not empty
         if (importdir.rmdir(importdir.absPath()))
         {
-            DialogBox nopicsDiag(gContext->GetMainWindow(),
-                                 tr("Nothing found to import"));
-            nopicsDiag.AddButton(tr("OK"));
-            nopicsDiag.exec();
+            DialogBox *nopicsDlg = new DialogBox(
+                gContext->GetMainWindow(), tr("Nothing found to import"));
+
+            nopicsDlg->AddButton(tr("OK"));
+            nopicsDlg->exec();
+            nopicsDlg->deleteLater();
+
             return;
         }
 
@@ -1554 +1562 @@
                 msg = tr("Failed to rename directory");
             else
                 msg = tr("Failed to rename file");
-            DialogBox dialog(gContext->GetMainWindow(), msg);
-            dialog.AddButton(tr("OK"));
-            dialog.exec();
 
+            DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), msg);
+            dlg->AddButton(tr("OK"));
+            dlg->exec();
+            dlg->deleteLater();
+
             return;
         }
 
@@ -1639 +1649 @@
     }
 
     progress->Close();
-    delete progress;
+    progress->deleteLater();
 
     LoadDirectory(m_currDir, true);
 }

mythplugins/mythgallery/mythgallery/main.cpp

@@ -25 +25 @@
         icv.exec();
     else
     {
-        DialogBox diag(gContext->GetMainWindow(), icv.GetError());
-        diag.AddButton(QObject::tr("Ok"));
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(), icv.GetError());
+
+        dlg->AddButton(QObject::tr("Ok"));
+        dlg->exec();
+        dlg->deleteLater();
     }
 }
 

mythplugins/mythmovies/mythmovies/moviesui.cpp

@@ -346 +346 @@
     updateDataTrees();
     drawDisplayTree();
     menuPopup->hide();
-    delete menuPopup;
+    menuPopup->deleteLater();
     menuPopup = NULL;
 }
 
@@ -355 +355 @@
     if (!menuPopup)
         return;
     menuPopup->hide();
-    delete menuPopup;
+    menuPopup->deleteLater();
     menuPopup = NULL;
 }
 
@@ -383 +383 @@
         return;
 
     aboutPopup->hide();
-    delete aboutPopup;
+    aboutPopup->deleteLater();
     aboutPopup = NULL;
 }
 

mythplugins/mythflix/mythflix/mythflix.cpp

@@ -643 +643 @@
     popup->hide();
     expectingPopup = false;
 
-    delete popup;
+    popup->deleteLater();
     popup = NULL;
 
     setActiveWindow();

mythplugins/mythflix/mythflix/mythflixqueue.cpp

@@ -569 +569 @@
     popup->hide();
     expectingPopup = false;
 
-    delete popup;
+    popup->deleteLater();
     popup = NULL;
 
     setActiveWindow();

mythplugins/mythcontrols/mythcontrols/keygrabber.h

@@ -46 +46 @@
     ///        modifier keys. (note: result not thread-safe)
     QString GetCapturedKey(void) const { return m_capturedKey; }
 
-  public slots:
-    void Accept(void) { done(1); }
-    void Cancel(void) { done(0); }
-
   protected:
     void keyPressEvent(QKeyEvent *e);
     void keyReleaseEvent(QKeyEvent *e);
@@ -82 +78 @@
                         const QString  &context);
 
     /// \brief Execute the error popup
-    int GetOption(void) { return ExecPopup(this, SLOT(Finish())); }
+    DialogCode GetOption(void) { return ExecPopup(this, SLOT(Finish())); }
 
   protected slots:
-    void Finish(void) { done(0); }
+    void Finish(void) { reject(); }
 };
 
 
@@ -97 +93 @@
     Q_OBJECT
 
   public:
-    enum actions { kSave, kChangeView, kCancel, };
+    static const DialogCode kSave       = kDialogCodeButton0;
+    static const DialogCode kChangeView = kDialogCodeButton1;
+    static const DialogCode kCancel     = kDialogCodeRejected;
 
     /// \brief Create a new action window. Does not pop-up menu.
     OptionsMenu(MythMainWindow *window);
 
     /// \brief Execute the option popup.
-    int GetOption(void) { return ExecPopup(this,SLOT(Cancel())); }
+    DialogCode GetOption(void) { return ExecPopup(this,SLOT(Cancel())); }
 
   public slots:
-    void Save(void)       { done(OptionsMenu::kSave);       }
-    void ChangeView(void) { done(OptionsMenu::kChangeView); }
-    void Cancel(void)     { done(OptionsMenu::kCancel);     }
+    void Save(void)       { done(kSave);       }
+    void ChangeView(void) { done(kChangeView); }
+    void Cancel(void)     { done(kCancel);     }
 };
 
 
@@ -120 +118 @@
     Q_OBJECT
 
   public:
-    enum actions { kSet, kRemove, kCancel, };
+    static const DialogCode kSet        = kDialogCodeButton0;
+    static const DialogCode kRemove     = kDialogCodeButton1;
+    static const DialogCode kCancel     = kDialogCodeRejected;
 
     /// \brief Create a new action window. Does not pop-up menu.
     ActionMenu(MythMainWindow *window);
 
     /// \brief Execute the option popup.
-    int GetOption(void) { return ExecPopup(this, SLOT(Cancel())); }
+    DialogCode GetOption(void) { return ExecPopup(this, SLOT(Cancel())); }
 
   public slots:
-    void Set(void)      { done(ActionMenu::kSet);    }
-    void Remove(void)   { done(ActionMenu::kRemove); }
-    void Cancel(void)   { done(ActionMenu::kCancel); }
+    void Set(void)      { done(kSet);    }
+    void Remove(void)   { done(kRemove); }
+    void Cancel(void)   { done(kCancel); }
 };
 
 
@@ -143 +143 @@
     Q_OBJECT
 
   public:
-    enum actions { kSave, kExit, };
+    static const DialogCode kSave       = kDialogCodeAccepted;
+    static const DialogCode kExit       = kDialogCodeRejected;
 
     /// \brief Create a new action window. Does not pop-up menu.
     UnsavedMenu(MythMainWindow *window);
 
     /// \brief Execute the option popup.
-    int GetOption(void) { return ExecPopup(this, SLOT(Cancel())); }
+    DialogCode GetOption(void) { return ExecPopup(this, SLOT(Cancel())); }
 
   public slots:
-    void Save(void)     { done(UnsavedMenu::kSave); }
-    void Cancel(void)   { done(UnsavedMenu::kExit); }
+    void Save(void)     { done(kSave); }
+    void Cancel(void)   { done(kExit); }
 };
 
 /** \class ConfirmMenu
@@ -164 +165 @@
     Q_OBJECT
 
   public:
-    enum actions { kConfirm, kCancel, };
+    static const DialogCode kConfirm    = kDialogCodeAccepted;
+    static const DialogCode kCancel     = kDialogCodeRejected;
 
     /// \brief Create a new action window. Does not pop-up menu.
     ConfirmMenu(MythMainWindow *window, const QString &msg);
 
     /// \brief Execute the option popup.
-    int GetOption(void) { return ExecPopup(this,SLOT(Cancel())); }
+    DialogCode GetOption(void) { return ExecPopup(this,SLOT(Cancel())); }
 
   public slots:
-    void Confirm(void)  { done(ConfirmMenu::kConfirm); }
-    void Cancel(void)   { done(ConfirmMenu::kCancel);  }
+    void Confirm(void)  { done(kConfirm); }
+    void Cancel(void)   { done(kCancel);  }
 };
 
 #endif // KEYGRABBER_H_

mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp

@@ -233 +233 @@
     QStringList contents;
     QString leftcaption, rightcaption;
 
-    switch(popup.GetOption())
+    switch (popup.GetOption())
     {
         case ViewMenu::kContextAction:
             leftcaption = tr(CAPTION_CONTEXT);
@@ -290 +290 @@
 
             OptionsMenu popup(gContext->GetMainWindow());
 
-            switch(popup.GetOption())
+            switch (popup.GetOption())
             {
                 case OptionsMenu::kSave:
                     Save();
@@ -321 +321 @@
                 if (!key.isEmpty())
                 {
                     ActionMenu popup(gContext->GetMainWindow());
-                    int result = popup.GetOption();
+                    DialogCode result = popup.GetOption();
                     if (result == ActionMenu::kSet)
                         AddKeyToAction();
                     else if (result == ActionMenu::kRemove)
@@ -698 +698 @@
            "Do you want to bind it anyway?")
         .arg(conflict->GetAction()).arg(conflict->GetContext());
 
-    if (MythPopupBox::show2ButtonPopup(
-            gContext->GetMainWindow(), tr("Conflict Warning"),
-            msg, tr("Bind Key"), QObject::tr("Cancel"), 0))
-    {
-        return false;
-    }
+    DialogCode res = MythPopupBox::Show2ButtonPopup(
+        gContext->GetMainWindow(), tr("Conflict Warning"),
+        msg, tr("Bind Key"), QObject::tr("Cancel"), kDialogCodeButton1);
 
-    return true;
+    return (kDialogCodeButton0 == res);
 }
 
 /** \fn MythControls::AddKeyToAction(void)
@@ -720 +717 @@
 {
     /* grab a key from the user */
     KeyGrabPopupBox getkey(gContext->GetMainWindow());
-    if (0 == getkey.ExecPopup(&getkey, SLOT(Cancel())))
+    if (kDialogCodeRejected == getkey.ExecPopup(&getkey, SLOT(Cancel())))
         return; // user hit Cancel button
 
     QString     key     = getkey.GetCapturedKey();

mythplugins/mythcontrols/mythcontrols/mythcontrols.h

@@ -43 +43 @@
     ViewMenu(MythMainWindow *window);
 
     /// \brief Execute the option popup.
-    int GetOption(void) { return ExecPopup(this, SLOT(Cancel())); }
+    DialogCode GetOption(void) { return ExecPopup(this, SLOT(Cancel())); }
 
     /// \brief The available views
-    enum actions { kContextAction, kContextKey, kKeyContext, kCancel, };
+    static const DialogCode kContextAction = kDialogCodeButton0;
+    static const DialogCode kContextKey    = kDialogCodeButton1;
+    static const DialogCode kKeyContext    = kDialogCodeButton2;
+    static const DialogCode kCancel        = kDialogCodeRejected;
 
   public slots:
-    void ActionsByContext(void) { done(ViewMenu::kContextAction); }
-    void KeysByContext(void)    { done(ViewMenu::kContextKey);    }
-    void ContextsByKey(void)    { done(ViewMenu::kKeyContext);    }
-    void Cancel(void)           { done(ViewMenu::kCancel);        }
+    void ActionsByContext(void) { done(kContextAction); }
+    void KeysByContext(void)    { done(kContextKey);    }
+    void ContextsByKey(void)    { done(kKeyContext);    }
+    void Cancel(void)           { done(kCancel);        }
 };
 
 /** \class MythControls

mythplugins/mythcontrols/mythcontrols/keygrabber.cpp

@@ -36 +36 @@
 {
     addLabel(tr("Press A Key"), Large, false);
     m_label  = addLabel(tr("Waiting for key press"), Small, false);
-    m_ok     = addButton(QObject::tr("OK"),     this, SLOT(Accept()));
-    m_cancel = addButton(QObject::tr("Cancel"), this, SLOT(Cancel()));
+    m_ok     = addButton(QObject::tr("OK"),     this, SLOT(accept()));
+    m_cancel = addButton(QObject::tr("Cancel"), this, SLOT(reject()));
 
     grabKeyboard();
 }
@@ -127 +127 @@
     addLabel(tr("Options"), Large, false);
     addButton(QObject::tr("Save"),   this, SLOT(Save()));
     addButton(QObject::tr("Change View"), this, SLOT(ChangeView()));
-    addButton(QObject::tr("Cancel"), this, SLOT(Cancel()))->setFocus();
+    addButton(QObject::tr("Cancel"), this, SLOT(reject()))->setFocus();
 }
     
 //////////////////////////////////////////////////////////////////////
@@ -138 +138 @@
     addLabel(tr("Modify Action"), Large, false);
     addButton(tr("Set Binding"),     this, SLOT(Set()));
     addButton(tr("Remove Binding"),  this, SLOT(Remove()));
-    addButton(QObject::tr("Cancel"), this, SLOT(Cancel()))->setFocus();
+    addButton(QObject::tr("Cancel"), this, SLOT(reject()))->setFocus();
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -149 +149 @@
     addLabel(tr("Unsaved Changes"), Large, false);
     addLabel(tr("Exiting...") + "\n\n" + tr("Save Changes?"));
     addButton(QObject::tr("Yes"), this, SLOT(Save()))->setFocus();
-    addButton(QObject::tr("No"),  this, SLOT(Cancel()));
+    addButton(QObject::tr("No"),  this, SLOT(reject()));
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -160 +160 @@
     addLabel(tr("Confirm"), Large, false);
     addLabel(msg);
     addButton(tr("Confirm"),         this, SLOT(Confirm()))->setFocus();
-    addButton(QObject::tr("Cancel"), this, SLOT(Cancel()));
+    addButton(QObject::tr("Cancel"), this, SLOT(reject()));
 }

mythplugins/mythvideo/mythvideo/main.cpp

@@ -249 +249 @@
             no_player_dialog->AddButton(QObject::tr("OK, I'll go run Setup"));
             no_player_dialog->exec();
 
-            delete no_player_dialog;
+            no_player_dialog->deleteLater();
             gContext->removeCurrentLocation();
             return;
         }

mythplugins/mythvideo/mythvideo/videotree.cpp

@@ -296 +296 @@
             {
                 if (m_imp->m_use_arrow_accel)
                 {
-                    done(1);
+                    accept();
                 }
                 else
                     handled = false;
@@ -499 +499 @@
     if (popup)
     {
         popup->hide();
-        delete popup;
+        popup->deleteLater();
 
         popup = NULL;
 
@@ -522 +522 @@
                                               MythPopupBox::Small,true);
         plotLabel->setAlignment(Qt::AlignJustify | Qt::WordBreak);
 
-        QButton * okButton = plotbox->addButton(tr("Ok"));
+        QButton *okButton = plotbox->addButton(
+            tr("OK"), plotbox, SLOT(accept()));
         okButton->setFocus();
 
         plotbox->ExecPopup();
-        delete plotbox;
+        plotbox->deleteLater();
         //allowPaint = true;
     }
     else

mythplugins/mythvideo/mythvideo/videodlg.cpp

@@ -97 +97 @@
     if (popup)
     {
         popup->hide();
-        delete popup;
+        popup->deleteLater();
 
         popup = NULL;
 
@@ -159 +159 @@
                                               MythPopupBox::Small,true);
         plotLabel->setAlignment(Qt::AlignJustify | Qt::WordBreak);
 
-        QButton * okButton = plotbox->addButton(tr("Ok"));
+        QButton *okButton = plotbox->addButton(
+            tr("OK"), plotbox, SLOT(accept()));
         okButton->setFocus();
 
         plotbox->ExecPopup();
-        delete plotbox;
+        plotbox->deleteLater();
         allowPaint = true;
     }
     else

mythplugins/mythvideo/mythvideo/videomanager.cpp

@@ -1553 +1553 @@
     if (curitem && m_state == SHOWING_MAINWINDOW)
     {
         bool okcancel;
-        MythPopupBox *ConfirmationDialog =
+        MythPopupBox *confirmationDialog =
                 new MythPopupBox(gContext->GetMainWindow());
-        okcancel = ConfirmationDialog->showOkCancelPopup(
+        okcancel = confirmationDialog->showOkCancelPopup(
                 gContext->GetMainWindow(), "", tr("Delete this file?"), false);
 
         if (okcancel)
@@ -1563 +1563 @@
             if (m_video_list->Delete(curitem->ID()))
                 RefreshMovieList(false);
             else
-                ConfirmationDialog->showOkPopup(gContext->GetMainWindow(), "",
+                confirmationDialog->showOkPopup(gContext->GetMainWindow(), "",
                                                 tr("delete failed"));
         }
 
-        delete ConfirmationDialog;
+        confirmationDialog->deleteLater();
     }
 }
 
@@ -1586 +1586 @@
     if (popup)
     {
         popup->hide();
-        delete popup;
+        popup->deleteLater();
 
         popup = NULL;
 

mythplugins/mythvideo/mythvideo/titledialog.cpp

@@ -440 +440 @@
             os << job_string << "\n" ;
         }
     }
-    done(0);
+    reject();
 }
 
 void TitleDialog::takeFocusAwayFromEditor(bool up_or_down)
@@ -534 +534 @@
 
 TitleDialog::~TitleDialog()
 {
-    if(name_editor)
+    if (name_editor)
     {
-        delete name_editor;
+        name_editor->deleteLater();
+        name_editor = NULL;
     }
 }
 

mythplugins/mythvideo/mythvideo/fileassoc.cpp

@@ -330 +330 @@
 void FileAssocDialog::saveAndExit()
 {
     saveFileAssociations();
-    done(0);
+    reject();
 }
 
 void FileAssocDialog::toggleDefault(bool yes_or_no)
@@ -410 +410 @@
 void FileAssocDialog::removeExtensionPopup()
 {
     new_extension_popup->close();
-    delete new_extension_editor;
+    new_extension_editor->deleteLater();
     new_extension_editor = NULL;
-    delete new_extension_popup;
+    new_extension_popup->deleteLater();
     new_extension_popup = NULL;
 
     //
@@ -503 +503 @@
     file_associations.clear();
     if (command_editor)
     {
-        delete command_editor;
+        command_editor->deleteLater();
+        command_editor = NULL;
     }
 }

mythplugins/mythvideo/mythvideo/videoscan.cpp

@@ -73 +73 @@
 
 void VideoScannerImp::doScan(const QStringList &dirs)
 {
-    MythProgressDialog progressDlg(QObject::tr("Searching for video files"),
-                                   dirs.size());
+    MythProgressDialog *progressDlg =
+        new MythProgressDialog(QObject::tr("Searching for video files"),
+                               dirs.size());
 
     QStringList imageExtensions = QImage::inputFormatList();
     int counter = 0;
@@ -85 +86 @@
          ++iter)
     {
         buildFileList(*iter, imageExtensions, fs_files);
-        progressDlg.setProgress(++counter);
+        progressDlg->setProgress(++counter);
     }
 
-    progressDlg.close();
+    progressDlg->close();
 
     PurgeList db_remove;
     verifyFiles(fs_files, db_remove);
@@ -110 +111 @@
     buttonText += QObject::tr("Yes");
     buttonText += QObject::tr("Yes to all");
 
-    int result = MythPopupBox::showButtonPopup(gContext->GetMainWindow(),
-            QObject::tr("File Missing"),
-            QString(QObject::tr("%1 appears to be missing.\nRemove it "
-                                "from the database?")).arg(filename),
-            buttonText, 1);
+    DialogCode result = MythPopupBox::ShowButtonPopup(
+        gContext->GetMainWindow(),
+        QObject::tr("File Missing"),
+        QObject::tr("%1 appears to be missing.\n"
+                    "Remove it from the database?").arg(filename),
+        buttonText, kDialogCodeButton0);
+
     switch (result)
     {
-        case 1:
+        case kDialogCodeRejected:
+        case kDialogCodeButton0:
+        default:
+            break;
+        case kDialogCodeButton1:
             m_KeepAll = true;
             break;
-        case 2:
+        case kDialogCodeButton2:
             m_dbmetadata->purgeByID(id);
             break;
-        case 3:
+        case kDialogCodeButton3:
             m_RemoveAll = true;
             m_dbmetadata->purgeByID(id);
             break;
@@ -134 +141 @@
                                const PurgeList &remove)
 {
     int counter = 0;
-    MythProgressDialog progressDlg(QObject::tr("Updating video database"),
-                                   add.size() + remove.size());
+    MythProgressDialog *progressDlg = new MythProgressDialog(
+        QObject::tr("Updating video database"), add.size() + remove.size());
 
     for (FileCheckList::const_iterator p = add.begin(); p != add.end(); ++p)
     {
@@ -152 +159 @@
             newFile.dumpToDatabase();
         }
 
-        progressDlg.setProgress(++counter);
+        progressDlg->setProgress(++counter);
     }
 
     for (PurgeList::const_iterator p = remove.begin(); p != remove.end(); ++p)
     {
         promptForRemoval(p->first, p->second);
 
-        progressDlg.setProgress(++counter);
+        progressDlg->setProgress(++counter);
     }
 
-    progressDlg.Close();
+    progressDlg->Close();
+    progressDlg->deleteLater();
 }
 
 void VideoScannerImp::verifyFiles(FileCheckList &files, PurgeList &remove)
@@ -170 +178 @@
     int counter = 0;
     FileCheckList::iterator iter;
 
-    MythProgressDialog progressDlg(QObject::tr("Verifying video files"),
-                                   m_dbmetadata->getList().size());
+    MythProgressDialog *progressDlg = new MythProgressDialog(
+        QObject::tr("Verifying video files"), m_dbmetadata->getList().size());
 
     // For every file we know about, check to see if it still exists.
     for (MetadataListManager::metadata_list::const_iterator p =
@@ -195 +203 @@
             }
         }
 
-        progressDlg.setProgress(++counter);
+        progressDlg->setProgress(++counter);
     }
 
-    progressDlg.Close();
+    progressDlg->Close();
+    progressDlg->deleteLater();
 }
 
 namespace

mythplugins/mythvideo/mythvideo/videofilter.cpp

@@ -671 +671 @@
 void VideoFilterDialog::saveAndExit()
 {
     m_fsp->setSettings(m_settings);
-    done(0);
+    reject();
 }
 
 void VideoFilterDialog::setYear(int new_year)

mythplugins/mythvideo/mythvideo/editmetadata.cpp

@@ -367 +367 @@
     //  All done
     //
 
-    done(0);
+    reject();
 }
 
 void EditMetadataDialog::setTitle(QString new_title)
@@ -437 +437 @@
         checkedSetText(coverart_text, new_coverart_file);
     }
 
-    delete nca;
+    nca->deleteLater();
 }
 
 void EditMetadataDialog::wireUpTheme()
@@ -532 +532 @@
 {
     if (title_editor)
     {
-        delete title_editor;
+        title_editor->deleteLater();
+        title_editor = NULL;
     }
+
     if (player_editor)
     {
-        delete player_editor;
+        player_editor->deleteLater();
+        player_editor = NULL;
     }
+
     if (working_metadata)
     {
         delete working_metadata;
+        working_metadata = NULL;
     }
 }

mythplugins/mythvideo/mythvideo/parentalcontrols.cpp

@@ -228 +228 @@
          ++p)
     {
         if (password == *p)
-            done(1);
+            accept();
     }
 }
 
@@ -363 +363 @@
             new MythMultiPasswordDialog(QObject::tr("Parental Pin:"),
                                         valid_passwords,
                                         gContext->GetMainWindow());
-    bool ok = pwd->exec();
+    bool ok = (kDialogCodeRejected != pwd->exec());
     delete pwd;
 
     if (ok)

mythplugins/mythgame/mythgame/gamesettings.h

@@ -121 +121 @@
     virtual MythDialog *dialogWidget(MythMainWindow *parent,
                                      const char     *widgetName=0);
 
-    virtual int exec();
+    virtual DialogCode exec(void);
     virtual void load();
     virtual void save() { };
 

mythplugins/mythgame/mythgame/gamehandler.cpp

@@ -206 +206 @@
     buttonText += QObject::tr("Yes to all");
 
 
-    int result = MythPopupBox::showButtonPopup(gContext->GetMainWindow(), 
-                               QObject::tr("File Missing"),
-                               QString(QObject::tr("%1 appears to be missing.\nRemove it"
-                                                   " from the database?")).arg(filename),
-                                                    buttonText, 0 );
+    DialogCode result = MythPopupBox::ShowButtonPopup(
+        gContext->GetMainWindow(), 
+        QObject::tr("File Missing"),
+        QString(QObject::tr("%1 appears to be missing.\nRemove it"
+                            " from the database?")).arg(filename),
+        buttonText, kDialogCodeButton0);
+
     switch (result)
     {
-        case 1:
+        case kDialogCodeButton0:
+        case kDialogCodeRejected:
+        default:
+            break;
+        case kDialogCodeButton1:
             m_KeepAll = true;
             break;
-        case 2:
+        case kDialogCodeButton2:
             purgeGameDB(filename , RomPath);
             break;
-        case 3:
+        case kDialogCodeButton3:
             m_RemoveAll = true;
             purgeGameDB(filename , RomPath);
             break;
@@ -354 +360 @@
     int counter = 0;
     MSqlQuery query(MSqlQuery::InitCon());
 
-    MythProgressDialog progressDlg(QString("Updating %1(%2) Rom database")
+    MythProgressDialog *progressDlg =
+        new MythProgressDialog(QObject::tr("Updating %1(%2) ROM database")
                                    .arg(handler->SystemName())
                                    .arg(handler->GameType()),
                                    m_GameMap.size());
@@ -428 +435 @@
             promptForRemoval( iter.data().Rom() , iter.data().RomPath() );
         }
 
-        progressDlg.setProgress(++counter);
+        progressDlg->setProgress(++counter);
     }
 
-    progressDlg.Close();
+    progressDlg->Close();
+    progressDlg->deleteLater();
 }
 
 void GameHandler::VerifyGameDB(GameHandler *handler)
@@ -442 +450 @@
     MSqlQuery query(MSqlQuery::InitCon());
     query.exec("SELECT romname,rompath,gamename FROM gamemetadata WHERE system = '" + handler->SystemName() + "';");
 
-    MythProgressDialog progressDlg(QObject::tr("Verifying " + handler->SystemName() + " files"),
-                                   query.numRowsAffected());
+    MythProgressDialog *progressDlg = new MythProgressDialog(
+        QObject::tr("Verifying %1 files").arg(handler->SystemName()),
+        query.numRowsAffected());
 
     // For every file we know about, check to see if it still exists.
     if (query.isActive() && query.size() > 0)
@@ -468 +477 @@
                                          GameName,RomPath);
                 }
             }
-            progressDlg.setProgress(++counter);
+            progressDlg->setProgress(++counter);
         }
     }
-    progressDlg.Close();
+    progressDlg->Close();
+    progressDlg->deleteLater();
 }
 
 // Recurse through the directory and gather a count on how many files there are to process.
@@ -529 +539 @@
     buttonText += QObject::tr("No");
     buttonText += QObject::tr("Yes");
 
-    int result = MythPopupBox::showButtonPopup(gContext->GetMainWindow(),
-                               QObject::tr("Are you sure?"),
-                               QString(QObject::tr("This will clear all Game Meta Data\n"
-                                                   "from the database. Are you sure you\n"
-                                                   "want to do this?" )),
-                                                    buttonText, 0 );
+    DialogCode result = MythPopupBox::ShowButtonPopup(
+        gContext->GetMainWindow(),
+        QObject::tr("Are you sure?"),
+        QString(QObject::tr("This will clear all Game Meta Data\n"
+                            "from the database. Are you sure you\n"
+                            "want to do this?" )),
+        buttonText, kDialogCodeButton0);
+
     switch (result)
     {
-        case 0:
+        case kDialogCodeRejected:
+        case kDialogCodeButton0:
+        default:
             // Do Nothing
             break;
-        case 1:
+        case kDialogCodeButton1:
             MSqlQuery query(MSqlQuery::InitCon());
             QString thequery = "DELETE FROM gamemetadata;";
             query.exec(thequery);
@@ -621 +635 @@
     else
         maxcount = 100;
 
-    MythProgressDialog pdial(QObject::tr("Scanning for " + handler->SystemName() + " game(s)..."), maxcount);
-    pdial.setProgress(0);
+    MythProgressDialog *pdial = new MythProgressDialog(
+        QObject::tr("Scanning for %1 game(s)...").arg(handler->SystemName()),
+        maxcount);
+    pdial->setProgress(0);
 
     if (handler->GameType() == "PC") 
     {
@@ -633 +649 @@
                                                        handler->SystemCmdLine().left(handler->SystemCmdLine().findRev(QRegExp("/"))));
 
 
-        pdial.setProgress(maxcount);
+        pdial->setProgress(maxcount);
         cout << "PC Game " << handler->SystemName() << endl;
     }
     else
     {   
         int filecount = 0;
-        buildFileList(handler->SystemRomPath(),handler,&pdial, &filecount);
+        buildFileList(handler->SystemRomPath(), handler, pdial, &filecount);
     }
 
     VerifyGameDB(handler);
@@ -658 +674 @@
         handler->setRebuild(false);
 
 
-    pdial.Close();
+    pdial->Close();
+    pdial->deleteLater();
 }
 
 void GameHandler::processAllGames(void)

mythplugins/mythgame/mythgame/rominfo.cpp

@@ -20 +20 @@
     QString rom_ver = Version();
 
     GameEditDialog romeditdlg(Romname().latin1());
-    int res = romeditdlg.exec();
 
-    if (res) {
+    DialogCode res = romeditdlg.exec();
+
+    if (kDialogCodeRejected == res)
+        return;
+
+    {
         MSqlQuery query(MSqlQuery::InitCon());
         QString thequery = QString("SELECT gamename,genre,year,country,publisher,favorite FROM gamemetadata "
                                        " WHERE gametype = '%1' AND romname = '%2'; ")

mythplugins/mythgame/mythgame/gametree.cpp

@@ -360 +360 @@
                 GameHandler::Launchgame(item->getRomInfo(),NULL);
             else if (item->getRomInfo()->RomCount() > 1)
             {
-                QStringList players = QStringList::split(",", item->getRomInfo()->AllSystems());
-                players += "Cancel";
+                QString all_systems = item->getRomInfo()->AllSystems();
+                QStringList players = QStringList::split(",", all_systems);
+                players += QObject::tr("Cancel");
 
-                int val = MythPopupBox::showButtonPopup(gContext->GetMainWindow(), "", tr("Players Available. \n\n Please pick one."), players,0);
+                DialogCode val = MythPopupBox::ShowButtonPopup(
+                    gContext->GetMainWindow(),
+                    "", tr("Players Available. \n\n Please pick one."),
+                    players, kDialogCodeButton0);
 
-                if (val != -1) {
-                    QString systemname = getElement(players,val);
-                    if ((systemname) && (systemname != "Cancel"))
+                int idx = MythDialog::CalcItemIndex(val);
+                if ((0 <= idx) && (idx < ((int)players.size() - 1)))
+                {
+                    QString systemname = getElement(players, idx);
+                    if (!systemname.isEmpty())
                         GameHandler::Launchgame(item->getRomInfo(),systemname);
                 }
             } 
@@ -423 +429 @@
         return;
 
     info_popup->hide();
-    delete info_popup;
+    info_popup->deleteLater();
     info_popup = NULL;
 }
 
@@ -438 +444 @@
         return;
 
     info_popup->hide();
-    delete info_popup;
+    info_popup->deleteLater();
     info_popup = NULL;
 }
 

mythplugins/mythgame/mythgame/gamesettings.cpp

@@ -251 +251 @@
     addChild(listbox);
 }
 
-int MythGamePlayerEditor::exec() {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+DialogCode MythGamePlayerEditor::exec(void)
+{
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         edit();
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void MythGamePlayerEditor::load(void)
@@ -284 +285 @@
     }
     else
     {   
-        int val = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
-                                                 "",
-                                                 tr("Game Player Menu"),
-                                                 tr("Edit.."),                                                                   tr("Delete.."), 1);
-
-        if (val == 0)
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
+            gContext->GetMainWindow(),
+            "", tr("Game Player Menu"),
+            tr("Edit.."), tr("Delete.."), kDialogCodeButton1);
+        
+        if (kDialogCodeButton0 == val)
             edit();
-        else if (val == 1)
+        else if (kDialogCodeButton1 == val)
             del();
     }
 }
@@ -309 +310 @@
 
 void MythGamePlayerEditor::del(void)
 {
-    int val = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(), "",
-                                          tr("Are you sure you want to delete "
-                                             "this item?"),
-                                             tr("Yes, delete It"),
-                                             tr("No, don't"), 2);
+    DialogCode val = MythPopupBox::Show2ButtonPopup(
+        gContext->GetMainWindow(), "",
+        tr("Are you sure you want to delete "
+           "this item?"),
+        tr("Yes, delete It"),
+        tr("No, don't"), kDialogCodeButton1);
 
-    if (val == 0)
+    if (kDialogCodeButton0 == val)
     {
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare("DELETE FROM gameplayers "

mythplugins/mythphone/mythphone/phoneui.cpp

@@ -617 +617 @@
 {
     if ((!loopbackMode) && (rtpAudio == 0) && (rtpVideo == 0))
     {
-        int loop = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(), "AskLoopback", "Loopback Audio and video at ...", "Socket on this machine", "NAT Device", 1);
+        DialogCode loop = MythPopupBox::Show2ButtonPopup(
+            gContext->GetMainWindow(),
+            "AskLoopback", tr("Loopback Audio and video at ..."),
+            tr("Socket on this machine"), tr("NAT Device"),
+            kDialogCodeButton0);
         QString loopIp;
         switch (loop)
         {
-        default:
-        case -1:
-            return;
-        case 0:
-            loopIp = sipStack->getLocalIpAddress();
-            break;
-        case 1:
-            loopIp = sipStack->getNatIpAddress();
-            break;
+            default:
+            case kDialogCodeRejected:
+                return;
+            case kDialogCodeButton0:
+                loopIp = sipStack->getLocalIpAddress();
+                break;
+            case kDialogCodeButton1:
+                loopIp = sipStack->getNatIpAddress();
+                break;
         }
         phoneUIStatusBar->DisplayCallState(QString(tr("Audio and Video Looped to ") + loopIp));
         int lvPort = atoi((const char *)gContext->GetSetting("VideoLocalPort"));
@@ -1088 +1092 @@
         menuPopup->addButton(tr("Delete all Voicemails"), this, SLOT(vmailEntryDeleteAll()));
         break;
     default:
-        delete menuPopup;
+        menuPopup->deleteLater();
         menuPopup = NULL;
         return;
         break;
@@ -1149 +1153 @@
                                                   "\n\n" + QObject::tr("A directory entry already exists with this URL."));
                 NoDeviceDialog->AddButton(QObject::tr("OK"));
                 NoDeviceDialog->exec();
-                delete NoDeviceDialog;
+                NoDeviceDialog->deleteLater();
                 closeMenuPopup();
             }
             else
@@ -1272 +1276 @@
         return;
 
     menuPopup->hide();
-    delete menuPopup;
+    menuPopup->deleteLater();
     menuPopup = NULL;
 }
 
@@ -1318 +1322 @@
         return;
 
     urlPopup->hide();
-    delete urlPopup;
+    urlPopup->deleteLater();
     urlPopup = NULL;
 }
 
@@ -1417 +1421 @@
         return;
 
     imPopup->hide();
-    delete imPopup;
+    imPopup->deleteLater();
     imPopup = NULL;
 }
 
@@ -1553 +1557 @@
         return;
 
     addEntryPopup->hide();
-    delete addEntryPopup;
+    addEntryPopup->deleteLater();
     addEntryPopup = NULL;
 }
 
@@ -1645 +1649 @@
         return;
 
     addDirectoryPopup->hide();
-    delete addDirectoryPopup;
+    addDirectoryPopup->deleteLater();
     addDirectoryPopup = NULL;
 }
 
@@ -1749 +1753 @@
         return;
 
     incallPopup->hide();
-    delete incallPopup;
+    incallPopup->deleteLater();
     incallPopup = NULL;
 }
 
@@ -1915 +1919 @@
         return;
 
     statsPopup->hide();
-    delete statsPopup;
+    statsPopup->deleteLater();
     statsPopup = NULL;
     audioPkInOutLabel = audioPlayoutLabel = audioPkRtcpLabel = 0;
     videoResLabel = videoPkOutLabel = videoPkInLabel = videoPkRtcpLabel = videoFramesInOutDiscLabel = videoAvgFpsLabel = 0;

mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp

@@ -611 +611 @@
 
     popup->addButton(tr("Delete All"));
 
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
     switch (res)
     {
-        case 0:
+        case kDialogCodeButton0:
             // refresh event list;
                 getEventList();
             break;
-        case 1:
+        case kDialogCodeButton1:
             if (getContext() == 1)
             {
                 // switch to grid view;
@@ -630 +630 @@
                 setView(false);
             }
             break;
-        case 2:
+        case kDialogCodeButton2:
             //delete all events
             if (class ZMClient *zm = ZMClient::get())
             {
@@ -645 +645 @@
                 zm->deleteEventList(m_eventList);
 
                 getEventList();
-                busy->close();
-                delete busy;
+                busy->Close();
+                busy->deleteLater();
             }
             break;
+        case kDialogCodeRejected:
+        default:
+            break;
     }
 
-    delete popup;
+    popup->deleteLater();
 }

mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp

@@ -74 +74 @@
     {
         MythPopupBox::showOkPopup(gContext->GetMainWindow(), "No monitors",
                                   tr("Cannot find any monitors. Bailing out!"));
-        done(0);
+        reject();
         return;
     }
 

mythplugins/mythnews/mythnews/mythnews.cpp

@@ -1038 +1038 @@
 
     popup->addLayout(vbox, 0);
 
-    popup->addButton(tr("OK"));
-    popup->addButton(tr("Cancel"));
+    popup->addButton(tr("OK"),     popup, SLOT(accept()));
+    popup->addButton(tr("Cancel"), popup, SLOT(reject()));
 
     QString siteName = "";
     if (edit)
@@ -1058 +1058 @@
         }
     }
 
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
 
-    if (res == 0)
+    if (kDialogCodeAccepted == res)
     {
         if (edit && siteName != "")
             removeFromDB(siteName);
@@ -1068 +1068 @@
         loadSites();
     }
 
-    delete popup;
+    popup->deleteLater();
 
-    return (res == 0);
+    return (kDialogCodeAccepted == res);
 }
 
 void MythNews::showMenu()
@@ -1091 +1091 @@
     if (menu) 
     {
         menu->hide();
-        delete menu;
+        menu->deleteLater();
         menu=NULL;
     }
 }

mythtv/libs/libmythtv/channeleditor.cpp

@@ -326 +326 @@
          tr("Are you sure you would like to delete the channels on %1?")
          .arg(currentLabel));
 
-    int val = MythPopupBox::show2ButtonPopup(
-        gContext->GetMainWindow(), "",
-        chan_msg,
+    DialogCode val = MythPopupBox::Show2ButtonPopup(
+        gContext->GetMainWindow(), "", chan_msg,
         tr("Yes, delete the channels"),
-        tr("No, don't"), 2);
+        tr("No, don't"), kDialogCodeButton1);
 
-    if (val != 0) 
+    if (kDialogCodeButton0 != val)
         return;
 
     MSqlQuery query(MSqlQuery::InitCon());
@@ -389 +388 @@
     return dialog;
 }
 
-int ChannelEditor::exec()
+DialogCode ChannelEditor::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)  {}
-    return QDialog::Rejected;
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)  {}
+    return kDialogCodeRejected;
 }
 
 void ChannelEditor::edit()
@@ -414 +413 @@
 {
     id = list->getValue().toInt();
 
-    int val = MythPopupBox::show2ButtonPopup(
-        gContext->GetMainWindow(), "",
-        tr("Are you sure you would like to delete this channel?"),
+    DialogCode val = MythPopupBox::Show2ButtonPopup(
+        gContext->GetMainWindow(),
+        "", tr("Are you sure you would like to delete this channel?"),
         tr("Yes, delete the channel"),
-        tr("No, don't"), 2);
+        tr("No, don't"), kDialogCodeButton1);
 
-    if (val == 0) 
+    if (kDialogCodeButton0 == val)
     {
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare("DELETE FROM channel WHERE chanid = :CHID ;");
@@ -439 +438 @@
        edit();
     else
     {
-        int val = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
-                                                 "",
-                                                 tr("Channel Menu"),
-                                                 tr("Edit.."),
-                                                 tr("Delete.."), 1);
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
+            gContext->GetMainWindow(),
+            "", tr("Channel Menu"),
+            tr("Edit.."), tr("Delete.."), kDialogCodeButton0);
 
-        if (val == 0)
+        if (kDialogCodeButton0 == val)
             emit edit();
-        else if (val == 1)
+        else if (kDialogCodeButton1 == val)
             emit del();
         else
             list->setFocus();

mythtv/libs/libmythtv/customedit.cpp

@@ -570 +570 @@
     msg += m_description->text();
 
     DialogBox *storediag = new DialogBox(gContext->GetMainWindow(), msg);
-    int button = 1, sebtn = -1, exbtn = -1, deletebtn = -1, cancelbtn = -1;
+    int button = 0, sebtn = -1, exbtn = -1, deletebtn = -1, cancelbtn = -1;
 
     QString action = QObject::tr("Store");
     if (nameExists)
@@ -600 +600 @@
     storediag->AddButton(QObject::tr("Cancel"));
     cancelbtn = button++;
 
-    int ret = storediag->exec();
-    delete storediag;
+    DialogCode code = storediag->exec();
+    storediag->deleteLater();
+    storediag = NULL;
+    int ret = MythDialog::CalcItemIndex(code);
 
     if (ret == sebtn || ret == exbtn)
     {
@@ -709 +711 @@
         }
     }
 
-    if (msg > "")
+    if (!msg.isEmpty())
     {
         DialogBox *errdiag = new DialogBox(gContext->GetMainWindow(), msg);
         errdiag->AddButton(QObject::tr("OK"));
         errdiag->exec();
 
-        delete errdiag;
+        errdiag->deleteLater();
         ret = false;
     }
     return ret;

mythtv/libs/libmythtv/progdetails.h

@@ -21 +21 @@
 
   protected slots:
     virtual void keyPressEvent(QKeyEvent *e);
-    void done(void);
 
   private:
     void wireUpTheme(void);

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -679 +679 @@
         if (!using_null_videoout)
         {
             qApp->lock();
-            DialogBox dialog(gContext->GetMainWindow(),
-                             QObject::tr("Failed to Reinit Video."));
-            dialog.AddButton(QObject::tr("Return to menu."));
-            dialog.exec();
+            DialogBox *dlg = new DialogBox(
+                gContext->GetMainWindow(),
+                QObject::tr("Failed to Reinit Video."));
+
+            dlg->AddButton(QObject::tr("Return to menu."));
+            dlg->exec();
+            dlg->deleteLater();
             qApp->unlock();
         }
         errored = true;
@@ -3146 +3149 @@
          !gContext->GetNumSetting("PVR350InternalAudioOnly")))
     {
         QString errMsg = ReinitAudio();
-        int ret = 1;
+        DialogCode ret = kDialogCodeButton0;
         if ((errMsg != QString::null) && !using_null_videoout &&
             gContext->GetNumSetting("AudioNag", 1))
         {
-            DialogBox dialog(gContext->GetMainWindow(), errMsg);
+            DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), errMsg);
 
             QString noaudio  = QObject::tr("Continue WITHOUT AUDIO!");
             QString dontask  = noaudio + " " + 
@@ -3159 +3162 @@
                 QObject::tr("And, don't ask again in this session.");
             QString quit     = QObject::tr("Return to menu.");
 
-            dialog.AddButton(noaudio);
-            dialog.AddButton(dontask);
-            dialog.AddButton(neverask);
-            dialog.AddButton(quit);
+            dlg->AddButton(noaudio);
+            dlg->AddButton(dontask);
+            dlg->AddButton(neverask);
+            dlg->AddButton(quit);
 
             qApp->lock();
-            ret = dialog.exec();
+            ret = dlg->exec();
+            dlg->deleteLater();
             qApp->unlock();
         }
             
-        if (ret == 2)
+        if (kDialogCodeButton1 == ret)
             gContext->SaveSetting("AudioNag", 0);
-        if (ret == 3)
+        if (kDialogCodeButton2 == ret)
             gContext->SetSetting("AudioNag", 0);
-        else if (ret == 4)
+        else if ((kDialogCodeButton3 == ret) || (kDialogCodeRejected == ret))
             return;
     }
 
@@ -3197 +3201 @@
                 QObject::tr("Unable to initialize video."));
             dialog->AddButton(QObject::tr("Return to menu."));
             dialog->exec();
-            delete dialog;
+            dialog->deleteLater();
             qApp->unlock();
         }
 
@@ -3580 +3584 @@
                           QObject::tr("Error was encountered while displaying video."));
         dialog->AddButton(QObject::tr("Return to Menu"));
         dialog->exec();
-        delete dialog;
+        dialog->deleteLater();
 
         qApp->unlock();
     }

mythtv/libs/libmythtv/previouslist.cpp

@@ -58 +58 @@
 
     if (!theme->LoadTheme(xmldata, "programlist"))
     {
-        DialogBox diag(gContext->GetMainWindow(), "The theme you are using "
-                       "does not contain a 'programlist' element.  Please "
-                       "contact the theme creator and ask if they could "
-                       "please update it.<br><br>The next screen will be empty."
-                       "  Escape out of it to return to the menu.");
-        diag.AddButton("OK");
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(),
+            QObject::tr(
+                "The theme you are using does not contain a 'programlist'"
+                "element.  Please contact the theme creator and ask if they "
+                "could please update it.<br><br>The next screen will be "
+                "empty. Escape out of it to return to the menu."));
+        dlg->AddButton("OK");
+        dlg->exec();
+        dlg->deleteLater();
 
         return;
     }
@@ -330 +333 @@
 
     int view = chooseListBox->currentItem();
 
-    choosePopup->done(0);
+    choosePopup->AcceptItem(view);
 
     if (view == curView)
         return;
@@ -705 +708 @@
     message += "\n\n\n" + tr("NOTE: removing items from this list will not "
                              "delete any recordings.");
     
-    DialogBox diag(gContext->GetMainWindow(), message);
-    int button = 1, ok = -1, cleardup = -1, setdup = -1, rm_episode = -1,
+    DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), message);
+    int button = 0, ok = -1, cleardup = -1, setdup = -1, rm_episode = -1,
         rm_title = -1;
     // int rm_generics = -1;
 
-    diag.AddButton(tr("OK"));
+    dlg->AddButton(tr("OK"));
     ok = button++;
 
     if (pi->duplicate)
     {
-        diag.AddButton(tr("Allow this episode to re-record"));
+        dlg->AddButton(tr("Allow this episode to re-record"));
         cleardup = button++;
     }
     else
     {
-        diag.AddButton(tr("Never record this episode"));
+        dlg->AddButton(tr("Never record this episode"));
         setdup = button++;
     }
-    diag.AddButton(tr("Remove this episode from the list"));
+    dlg->AddButton(tr("Remove this episode from the list"));
     rm_episode = button++;
 
-    diag.AddButton(tr("Remove all episodes for this title"));
+    dlg->AddButton(tr("Remove all episodes for this title"));
     rm_title = button++;
 
-    // diag.AddButton(tr("Remove all that cannot be used for duplicate matching"));
+    // dlg->AddButton(tr("Remove all that cannot be used for duplicate matching"));
     // rm_generics = button++;
 
-    int ret = diag.exec();
+    DialogCode code = dlg->exec();
+    dlg->deleteLater();
+    dlg = NULL;
+    int ret = MythDialog::CalcItemIndex(code);
 
     if (ret == rm_episode)
     {

mythtv/libs/libmythtv/proglist.h

@@ -40 +40 @@
     void cursorUp(bool page = false);
     void prevView(void);
     void nextView(void);
-    void setViewFromList(void);
+    void setViewFromList(int);
     void chooseEditChanged(void);
     void chooseListBoxChanged(void);
     void setViewFromEdit(void);

mythtv/libs/libmythtv/playgroup.cpp

@@ -262 +262 @@
     QString message = tr("Delete playback group:") +
         QString("\n'%1'?").arg(name);
 
-    int value = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
-                                               "", message,
-                                               tr("Yes, delete group"),
-                                               tr("No, Don't delete group"), 2);
+    DialogCode value = MythPopupBox::Show2ButtonPopup(
+        gContext->GetMainWindow(),
+        "", message,
+        tr("Yes, delete group"),
+        tr("No, Don't delete group"), kDialogCodeButton1);
 
-    if (value == 0)
+    if (kDialogCodeButton0 == value)
     {
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare("DELETE FROM playgroup WHERE name = :NAME;");
@@ -302 +303 @@
     listbox->setValue(lastValue);
 }
 
-int PlayGroupEditor::exec(void)
+DialogCode PlayGroupEditor::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         open(listbox->getValue());
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 MythDialog* PlayGroupEditor::dialogWidget(MythMainWindow* parent,

mythtv/libs/libmythtv/videosource.h

@@ -542 +542 @@
 
     virtual MythDialog* dialogWidget(MythMainWindow* parent,
                                      const char* widgetName=0);
-    virtual int exec();
+    virtual DialogCode exec(void);
     virtual void load();
     virtual void save() { };
 
@@ -568 +568 @@
     bool cardTypesInclude(const int& SourceID, 
                           const QString& thecardtype);
 
-    virtual int exec();
+    virtual DialogCode exec(void);
     virtual void load();
     virtual void save() { };
 
@@ -588 +588 @@
   public:
     CardInputEditor();
 
-    virtual int exec();
+    virtual DialogCode exec(void);
     virtual void load();
     virtual void save() { };
 

mythtv/libs/libmythtv/viewschdiff.cpp

@@ -45 +45 @@
     theme->SetHMult(hmult);
     if (!theme->LoadTheme(xmldata, "schdiff"))
     {
-        DialogBox diag(gContext->GetMainWindow(), tr("The theme you are using "
-                       "does not contain a 'schdiff' element. Please contact "
-                       "the theme creator and ask if they could please update "
-                       "it.<br><br>The next screen will be empty. "
-                       "Escape out of it to return to the menu."));
-        diag.AddButton(tr("OK"));
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(),
+            tr("The theme you are using does not contain a 'schdiff' element. "
+               "Please contact the theme creator and ask if they could please "
+               "update it.<br><br>The next screen will be empty. Escape out "
+               "of it to return to the menu."));
 
+        dlg->AddButton(tr("OK"));
+        dlg->exec();
+        dlg->deleteLater();
+
         return;
     }
 
@@ -308 +311 @@
             pa = recListAfter.next();
         }
     }
-    DialogBox diag(gContext->GetMainWindow(), message);
-    diag.AddButton(QObject::tr("OK"));
-    diag.exec();
+
+    DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), message);
+    dlg->AddButton(QObject::tr("OK"));
+    dlg->exec();
+    dlg->deleteLater();
+
     return;
 }
 

mythtv/libs/libmythtv/proglist.cpp

@@ -71 +71 @@
 
     if (!theme->LoadTheme(xmldata, "programlist"))
     {
-        DialogBox diag(gContext->GetMainWindow(), "The theme you are using "
-                       "does not contain a 'programlist' element.  Please "
-                       "contact the theme creator and ask if they could "
-                       "please update it.<br><br>The next screen will be empty."
-                       "  Escape out of it to return to the menu.");
-        diag.AddButton("OK");
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(), "The theme you are using "
+            "does not contain a 'programlist' element.  Please "
+            "contact the theme creator and ask if they could "
+            "please update it.<br><br>The next screen will be empty."
+            "  Escape out of it to return to the menu.");
 
+        dlg->AddButton("OK");
+        dlg->exec();
+        dlg->deleteLater();
+
         return;
     }
 
@@ -391 +394 @@
     refillAll = true;
 }
 
-void ProgLister::setViewFromList(void)
+void ProgLister::setViewFromList(int item)
 {
+    int view = item;
+
     if (!choosePopup || (!chooseListBox && !chooseEditButton))
         return;
 
-    int view = chooseListBox->currentItem();
-
     if (type == plTitleSearch || type == plKeywordSearch || 
         type == plPeopleSearch)
     {
@@ -420 +423 @@
         }
     }
 
-    choosePopup->done(0);
+    choosePopup->AcceptItem(item);
 
     if (view == curView)
         return;
@@ -511 +514 @@
 
     updateKeywordInDB(text);
   
-    choosePopup->done(0);
+    choosePopup->accept();
 
     fillViewList(text);
 
@@ -543 +546 @@
 
     updateKeywordInDB(text);
 
-    powerPopup->done(0);
+    powerPopup->accept();
 
     fillViewList(text);
 
@@ -670 +673 @@
     viewList[curView] = searchTime.toString(fullDateFormat);
     viewTextList[curView] = viewList[curView];
 
-    choosePopup->done(0);
+    choosePopup->accept();
 
     curItem = -1;
     refillAll = true;
@@ -710 +713 @@
             chooseListBox->setCurrentItem(curView);
         choosePopup->addWidget(chooseListBox);
 
-        connect(chooseListBox, SIGNAL(accepted(int)), this, SLOT(setViewFromList()));
+        connect(chooseListBox, SIGNAL(accepted(int)),
+                this,          SLOT(setViewFromList(int)));
 
         chooseListBox->setFocus();
         choosePopup->ExecPopup();
@@ -765 +769 @@
         chooseRecordButton->setEnabled(chooseLineEdit->text()
                                        .stripWhiteSpace().length() > 0);
 
-        connect(chooseListBox, SIGNAL(accepted(int)), this, SLOT(setViewFromList()));
+        connect(chooseListBox, SIGNAL(accepted(int)),
+                this,          SLOT(setViewFromList(int)));
         connect(chooseListBox, SIGNAL(menuButtonPressed(int)), chooseLineEdit, SLOT(setFocus()));
         connect(chooseListBox, SIGNAL(selectionChanged()), this, SLOT(chooseListBoxChanged()));
         connect(chooseLineEdit, SIGNAL(textChanged()), this, SLOT(chooseEditChanged()));
@@ -831 +836 @@
         chooseDeleteButton->setEnabled(curView >= 0);
         chooseRecordButton->setEnabled(curView >= 0);
 
-        connect(chooseListBox, SIGNAL(accepted(int)), this,
-                               SLOT(setViewFromList()));
+        connect(chooseListBox, SIGNAL(accepted(int)),
+                this,          SLOT(setViewFromList(int)));
         connect(chooseListBox, SIGNAL(menuButtonPressed(int)),chooseEditButton,
                                SLOT(setFocus()));
         connect(chooseListBox, SIGNAL(selectionChanged()), this,
@@ -1028 +1033 @@
     powerDescEdit->setText(field[2]);
 
     powerTitleEdit->setFocus();
-    choosePopup->done(0);
+    choosePopup->accept();
     powerPopup->ExecPopup();
 
     powerTitleEdit    = NULL; // deleted by popup delete

mythtv/libs/libmythtv/playgroup.h

@@ -29 +29 @@
 
   public:
     PlayGroupEditor(void);
-    virtual int exec(void);
+    virtual DialogCode exec(void);
     virtual void load(void);
     virtual void save(void) { };
     virtual void save(QString) { };

mythtv/libs/libmythtv/scanwizardhelpers.h

@@ -65 +65 @@
   public:
     ScanProgressPopup(bool lock, bool strength, bool snr);
 
-    virtual int exec(void);
+    virtual DialogCode exec(void);
 
     void SetStatusSignalToNoise(int value);
     void SetStatusSignalStrength(int value);

mythtv/libs/libmythtv/progdetails.cpp

@@ -94 +94 @@
             QString action = actions[i];
             handled = true;
             if (action == "ESCAPE" || action == "SELECT")
-                done();
+                reject();
             else if (action == "UP")
             {
                 if (getCurrentFocusWidget() == m_richText)
@@ -144 +144 @@
     if (m_okButton)
     {
         m_okButton->setText(tr("OK"));
-        connect(m_okButton, SIGNAL(pushed()), this, SLOT(done()));
+        connect(m_okButton, SIGNAL(pushed()), this, SLOT(accept()));
     }
 
     m_richText = getUIRichTextType("richtext");
 
     buildFocusList();
 }
-
-void ProgDetails::done()
-{
-    MythDialog::done(0);
-}

mythtv/libs/libmythtv/scanwizardscanner.cpp

@@ -634 +634 @@
 
 void ScanWizardScanner::RunPopup(void)
 {
-    int ret = popupProgress->exec();
+    DialogCode ret = popupProgress->exec();
 
     popupLock.lock();
     popupProgress->deleteLater();

mythtv/libs/libmythtv/profilegroup.h

@@ -119 +119 @@
         listbox(new ListBoxSetting(this)), dialog(NULL), redraw(true)
         { addChild(listbox); }
 
-    virtual int exec();
+    virtual DialogCode exec(void);
     virtual void load();
     virtual void save() {};
 

mythtv/libs/libmythtv/channeleditor.h

@@ -12 +12 @@
     Q_OBJECT
 public:
     ChannelEditor();
-    virtual int exec();
+    virtual DialogCode exec(void);
 
     MythDialog* dialogWidget(MythMainWindow *parent, const char* name);
 

mythtv/libs/libmythtv/scheduledrecording.h

@@ -111 +111 @@
     virtual void modifyPowerSearchByID(int rid, QString textname,
                                        QString from, QString forwhat);
 
-    virtual int exec(bool saveOnExec = true, bool doLoad = false);
+    virtual DialogCode exec(bool saveOnExec = true, bool doLoad = false);
         
     void remove();
     int getRecordID(void) const { return id->intValue(); };
@@ -275 +275 @@
     ScheduledRecordingEditor() : listbox(new ListBoxSetting(this))
         { addChild(listbox); }
 
-    virtual int exec();
+    virtual DialogCode exec(void);
     virtual void load();
     virtual void save() { };
 

mythtv/libs/libmythtv/recordingprofile.h

@@ -85 +85 @@
     virtual void loadByID(int id);
     virtual bool loadByType(QString name, QString cardtype);
     virtual bool loadByGroup(QString name, QString group);
-    virtual int exec();
+    virtual DialogCode exec(void);
 
     // sets
     void setCodecTypes();
@@ -135 +135 @@
   public:
     RecordingProfileEditor(int id, QString profName);
 
-    virtual int exec();
+    virtual DialogCode exec(void);
     virtual void load();
     virtual void save() { };
     virtual void save(QString /*destination*/) { }

mythtv/libs/libmythtv/tv_play.cpp

@@ -145 +145 @@
                         recTitles.append(buttonTitle);
                         it++;
                     }
-                    int ret = MythPopupBox::showButtonPopup(
-                                    gContext->GetMainWindow(),
-                                    "",
-                                    tr("All Tuners are Busy.\n"
-                                       "Select a Current Recording"),
-                                    recTitles, 1);
-                    if ((0 < ret) && (ret <= (int)reclist->size()))
+                    DialogCode ret = MythPopupBox::ShowButtonPopup(
+                        gContext->GetMainWindow(),
+                        "",
+                        tr("All Tuners are Busy.\n"
+                           "Select a Current Recording"),
+                        recTitles, kDialogCodeButton1);
+
+                    int idx = MythDialog::CalcItemIndex(ret) - 1;
+                    if ((0 <= idx) && (idx < (int)reclist->size()))
                     {
-                        p = reclist->at(ret - 1);
+                        p = reclist->at(idx);
                         curProgram = new ProgramInfo(*p);
                     }
                     else
@@ -7766 +7768 @@
                                                 recGroupPassword,
                                                 gContext->GetMainWindow());
         pwd->exec();
-        delete pwd;
+        pwd->deleteLater();
+        pwd = NULL;
+
         qApp->unlock();
         if (!ok)
         {

mythtv/libs/libmythtv/storagegroup.cpp

@@ -418 +418 @@
     QString message =
         tr("Remove '%1'\nDirectory From Storage Group?").arg(name);
 
-    int value =
-        MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(), "", message,
-                                       tr("Yes, remove directory"),
-                                       tr("No, Don't remove directory"), 2);
+    DialogCode value = MythPopupBox::Show2ButtonPopup(
+        gContext->GetMainWindow(), "", message,
+        tr("Yes, remove directory"),
+        tr("No, Don't remove directory"),
+        kDialogCodeButton1);
 
-    if (value == 0)
+    if (kDialogCodeButton0 == value)
     {
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare("DELETE FROM storagegroup "
@@ -476 +477 @@
     listbox->setValue(lastValue);
 }
 
-int StorageGroupEditor::exec() {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+DialogCode StorageGroupEditor::exec(void)
+{
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         open(listbox->getValue());
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 MythDialog* StorageGroupEditor::dialogWidget(MythMainWindow* parent,
@@ -557 +559 @@
 
     QString message = tr("Delete '%1' Storage Group?").arg(dispGroup);
 
-    int value = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
-                                               "", message,
-                                               tr("Yes, delete group"),
-                                               tr("No, Don't delete group"), 2);
+    DialogCode value = MythPopupBox::Show2ButtonPopup(
+        gContext->GetMainWindow(),
+        "", message,
+        tr("Yes, delete group"),
+        tr("No, Don't delete group"), kDialogCodeButton1);
 
-    if (value == 0)
+    if (kDialogCodeButton0 == value)
     {
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare("DELETE FROM storagegroup "
@@ -673 +676 @@
     listbox->setValue(lastValue);
 }
 
-int StorageGroupListEditor::exec() {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+DialogCode StorageGroupListEditor::exec(void)
+{
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         open(listbox->getValue());
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 MythDialog* StorageGroupListEditor::dialogWidget(MythMainWindow* parent,

mythtv/libs/libmythtv/videosource.cpp

@@ -323 +323 @@
         .arg(ddp.GetListingsProviderName());
         
     VERBOSE(VB_GENERAL, waitMsg);
-    MythProgressDialog pdlg(waitMsg, 2);
+    MythProgressDialog *pdlg = new MythProgressDialog(waitMsg, 2);
 
     clearSelections();
 
-    pdlg.setProgress(1);
+    pdlg->setProgress(1);
 
     if (!ddp.GrabLineupsOnly())
     {
@@ -341 +341 @@
     for (it = lineups.begin(); it != lineups.end(); ++it)
         addSelection((*it).displayname, (*it).lineupid);
 
-    pdlg.setProgress(2);
-    pdlg.Close();
+    pdlg->setProgress(2);
+    pdlg->Close();
+    pdlg->deleteLater();
 #else // USING_BACKEND
     VERBOSE(VB_IMPORTANT, "You must compile the backend "
             "to set up a DataDirect line-up");
@@ -419 +420 @@
                                 "might want to check the output as it\n"
                                 "runs by switching to the terminal from "
                                 "which you started\nthis program."));
-    MythProgressDialog pdlg( waitMsg, 2 );
+    MythProgressDialog *pdlg = new MythProgressDialog(waitMsg, 2);
     VERBOSE(VB_GENERAL, QString("Please wait while MythTV retrieves the "
                                 "list of available channels"));
-    pdlg.show();
+    pdlg->show();
 
     QString command;
     QString filename = QString("%1/%2.xmltv")
@@ -431 +432 @@
     command = QString("%1 --config-file '%2' --configure")
         .arg(grabber).arg(filename);
 
-    pdlg.setProgress(1);
+    pdlg->setProgress(1);
 
     int ret = system(command);
     if (ret != 0)
@@ -461 +462 @@
             gContext->GetMainWindow(), QObject::tr("Warning."), err_msg);
     }
 
-    pdlg.setProgress( 2 );    
-    pdlg.Close();
+    pdlg->setProgress( 2 );    
+    pdlg->Close();
+    pdlg->deleteLater();
 }
 
 EITOnly_config::EITOnly_config(const VideoSource& _parent) :
@@ -569 +571 @@
         }
 
         find_grabbers_dialog->Close();
-        delete find_grabbers_dialog;
+        find_grabbers_dialog->deleteLater();
     }
     else {
         VERBOSE(VB_IMPORTANT, "Failed to run tv_find_grabbers");
@@ -2009 +2011 @@
     addChild(listbox);
 }
 
-int CaptureCardEditor::exec(void)
+DialogCode CaptureCardEditor::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         edit();
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void CaptureCardEditor::load(void)
@@ -2046 +2048 @@
     } 
     else 
     {
-        int val = MythPopupBox::show2ButtonPopup(
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
             gContext->GetMainWindow(),
             "",
             tr("Capture Card Menu"),
             tr("Edit.."),
             tr("Delete.."),
-            1);
+            kDialogCodeButton0);
 
-        if (val == 0)
+        if (kDialogCodeButton0 == val)
             edit();
-        else if (val == 1)
+        else if (kDialogCodeButton1 == val)
             del();
     }
 }
@@ -2066 +2068 @@
     const int cardid = listbox->getValue().toInt();
     if (-1 == cardid)
     {
-        int val = MythPopupBox::show2ButtonPopup(
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
             gContext->GetMainWindow(), "",
             tr("Are you sure you want to delete "
                "ALL capture cards on %1?").arg(gContext->GetHostName()),
             tr("Yes, delete capture cards"),
-            tr("No, don't"), 2);
+            tr("No, don't"), kDialogCodeButton1);
 
-        if (0 == val)
+        if (kDialogCodeButton0 == val)
         {
             MSqlQuery cards(MSqlQuery::InitCon());
 
@@ -2102 +2104 @@
     }
     else if (-2 == cardid)
     {
-        int val = MythPopupBox::show2ButtonPopup(
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
             gContext->GetMainWindow(), "",
             tr("Are you sure you want to delete "
                "ALL capture cards?"),
             tr("Yes, delete capture cards"),
-            tr("No, don't"), 2);
+            tr("No, don't"), kDialogCodeButton1);
 
-        if (0 == val)
+        if (kDialogCodeButton0 == val)
         {
             MSqlQuery query(MSqlQuery::InitCon());
             query.exec("TRUNCATE TABLE capturecard;");
@@ -2128 +2130 @@
 
 void CaptureCardEditor::del(void)
 {
-    int val = MythPopupBox::show2ButtonPopup(
+    DialogCode val = MythPopupBox::Show2ButtonPopup(
         gContext->GetMainWindow(), "",
         tr("Are you sure you want to delete this capture card?"),
         tr("Yes, delete capture card"),
-        tr("No, don't"), 2);
+        tr("No, don't"), kDialogCodeButton1);
 
-    if (val == 0)
+    if (kDialogCodeButton0 == val)
     {
         CardUtil::DeleteCard(listbox->getValue().toUInt());
         load();
@@ -2157 +2159 @@
     return dialog;
 }
 
-int VideoSourceEditor::exec() {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+DialogCode VideoSourceEditor::exec(void)
+{
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         edit();
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void VideoSourceEditor::load(void)
@@ -2181 +2184 @@
     } 
     else 
     {
-        int val = MythPopupBox::show2ButtonPopup(
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
             gContext->GetMainWindow(),
             "",
             tr("Video Source Menu"),
             tr("Edit.."),
             tr("Delete.."),
-            1);
+            kDialogCodeButton0);
 
-        if (val == 0)
+        if (kDialogCodeButton0 == val)
             edit();
-        else if (val == 1)
+        else if (kDialogCodeButton1 == val)
             del();
     }
 }
@@ -2201 +2204 @@
     const int sourceid = listbox->getValue().toInt();
     if (-1 == sourceid)
     {
-        int val = MythPopupBox::show2ButtonPopup(
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
             gContext->GetMainWindow(), "",
             tr("Are you sure you want to delete "
                "ALL video sources?"),
             tr("Yes, delete video sources"),
-            tr("No, don't"), 2);
+            tr("No, don't"), kDialogCodeButton1);
 
-        if (0 == val)
+        if (kDialogCodeButton0 == val)
         {
             MSqlQuery query(MSqlQuery::InitCon());
             query.exec("TRUNCATE TABLE channel;");
@@ -2233 +2236 @@
 
 void VideoSourceEditor::del() 
 {
-    int val = MythPopupBox::show2ButtonPopup(
+    DialogCode val = MythPopupBox::Show2ButtonPopup(
         gContext->GetMainWindow(), "",
         tr("Are you sure you want to delete "
            "this video source?"),
         tr("Yes, delete video source"),
         tr("No, don't"),
-        2);
+        kDialogCodeButton1);
 
-    if (val == 0)
+    if (kDialogCodeButton0 == val)
     {
         MSqlQuery query(MSqlQuery::InitCon());
 
@@ -2285 +2288 @@
     addChild(listbox);
 }
 
-int CardInputEditor::exec(void)
+DialogCode CardInputEditor::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         cardinputs[listbox->getValue().toInt()]->exec();
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void CardInputEditor::load() 

mythtv/libs/libmythtv/diseqcsettings.cpp

@@ -461 +461 @@
         addChild(new RotorPosMap(rotor));
     }
 
-    virtual int exec(void)
+    virtual DialogCode exec(void)
     {
-        while (ConfigurationDialog::exec() == QDialog::Accepted);
-        return QDialog::Rejected;
+        while (ConfigurationDialog::exec() == kDialogCodeAccepted);
+        return kDialogCodeRejected;
     }
 };
 
@@ -944 +944 @@
 
     popup->addWidget(list);
     connect(list,  SIGNAL(accepted(int)),
-            popup, SLOT(  done(    int)));
+            popup, SLOT(  AcceptItem(int)));
     list->setFocus();
 
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
     type = (DiSEqCDevDevice::dvbdev_t)list->currentItem();
 
     popup->hide();
     popup->deleteLater();
 
-    return res >= 0;
+    return kDialogCodeRejected != res;
 }
 
 void DeviceTree::CreateRootNodeDialog(void)
@@ -1084 +1084 @@
     addChild(new DeviceTree(tree));
 }
 
-int DTVDeviceTreeWizard::exec(void)
+DialogCode DTVDeviceTreeWizard::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted);
-    return QDialog::Rejected;
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted);
+    return kDialogCodeRejected;
 }
 
 //////////////////////////////////////// SwitchSetting

mythtv/libs/libmythtv/profilegroup.cpp

@@ -244 +244 @@
     listbox->addSelection(QObject::tr("(Create new profile group)"), "0");
 }
 
-int ProfileGroupEditor::exec() 
+DialogCode ProfileGroupEditor::exec(void)
 {
-    int ret = QDialog::Accepted;
+    DialogCode ret = kDialogCodeAccepted;
     redraw = true;
 
     while ((QDialog::Accepted == ret) || redraw)
@@ -278 +278 @@
             open(listbox->getValue().toInt());
     }
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void ProfileGroupEditor::callDelete(void)
@@ -296 +296 @@
         QString message = QObject::tr("Delete profile group:") + 
                           QString("\n'%1'?").arg(ProfileGroup::getName(id));
 
-        int value = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
-                                                   "", message, 
-                                     QObject::tr("Yes, delete group"),
-                                     QObject::tr("No, Don't delete group"), 2);
+        DialogCode value = MythPopupBox::Show2ButtonPopup(
+            gContext->GetMainWindow(),
+            "", message, 
+            QObject::tr("Yes, delete group"),
+            QObject::tr("No, Don't delete group"), kDialogCodeButton1);
 
-        if (value == 0)
+        if (kDialogCodeButton0 == value)
         {
             querystr = QString("DELETE codecparams FROM codecparams, "
                             "recordingprofiles WHERE " 

mythtv/libs/libmythtv/transporteditor.h

@@ -74 +74 @@
   public:
     TransportListEditor(uint initial_sourceid);
 
-    virtual int exec(void);
+    virtual DialogCode exec(void);
 
   public slots:
     void Menu(void);

mythtv/libs/libmythtv/programinfo.cpp

@@ -4167 +4167 @@
     message += "\n\n";
     message += RecStatusDesc();
 
-    DialogBox diag(gContext->GetMainWindow(), message);
-    int button = 1, ok = -1, react = -1, stop = -1, addov = -1, forget = -1,
+    DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), message);
+    int button = 0, ok = -1, react = -1, stop = -1, addov = -1, forget = -1,
         clearov = -1, edend = -1, ednorm = -1, edcust = -1;
 
-    diag.AddButton(QObject::tr("OK"));
+    dlg->AddButton(QObject::tr("OK"));
     ok = button++;
 
     if (recstartts < now && recendts > now)
     {
         if (recstatus != rsRecording)
         {
-            diag.AddButton(QObject::tr("Reactivate"));
+            dlg->AddButton(QObject::tr("Reactivate"));
             react = button++;
         }
         else
         {
-            diag.AddButton(QObject::tr("Stop recording"));
+            dlg->AddButton(QObject::tr("Stop recording"));
             stop = button++;
         }
     }
@@ -4193 +4193 @@
         {
             if (recstartts > now)
             {
-                diag.AddButton(QObject::tr("Don't record"));
+                dlg->AddButton(QObject::tr("Don't record"));
                 addov = button++;
             }
             if (recstatus != rsRecording && rectype != kFindOneRecord &&
@@ -4206 +4206 @@
                  ((dupmethod & kDupCheckDesc) && description != "") ||
                  ((dupmethod & kDupCheckSubThenDesc) && (subtitle != "" || description != "")) ))
             {
-                diag.AddButton(QObject::tr("Never record"));
+                dlg->AddButton(QObject::tr("Never record"));
                 forget = button++;
             }
         }
@@ -4215 +4215 @@
         {
             if (recstatus == rsRecording)
             {
-                diag.AddButton(QObject::tr("Change Ending Time"));
+                dlg->AddButton(QObject::tr("Change Ending Time"));
                 edend = button++;
             }
             else
             {
-                diag.AddButton(QObject::tr("Edit Options"));
+                dlg->AddButton(QObject::tr("Edit Options"));
                 ednorm = button++;
 
                 if (rectype != kSingleRecord && rectype != kFindOneRecord)
                 {
-                    diag.AddButton(QObject::tr("Add Override"));
+                    dlg->AddButton(QObject::tr("Add Override"));
                     edcust = button++;
                 }
             }
@@ -4235 +4235 @@
         {
             if (recstatus == rsRecording)
             {
-                diag.AddButton(QObject::tr("Change Ending Time"));
+                dlg->AddButton(QObject::tr("Change Ending Time"));
                 edend = button++;
             }
             else
             {
-                diag.AddButton(QObject::tr("Edit Override"));
+                dlg->AddButton(QObject::tr("Edit Override"));
                 ednorm = button++;
-                diag.AddButton(QObject::tr("Clear Override"));
+                dlg->AddButton(QObject::tr("Clear Override"));
                 clearov = button++;
             }
         }
     }
 
-    int ret = diag.exec();
+    DialogCode code = dlg->exec();
+    dlg->deleteLater();
+    dlg = NULL;
+    int ret = MythDialog::CalcItemIndex(code);
 
     if (ret == react)
         ReactivateRecording();
@@ -4335 +4338 @@
         delete confList;
     }
 
-    DialogBox diag(gContext->GetMainWindow(), message);
-    int button = 1, ok = -1, react = -1, addov = -1, clearov = -1,
+    DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), message);
+    int button = 0, ok = -1, react = -1, addov = -1, clearov = -1,
         ednorm = -1, edcust = -1, forget = -1, addov1 = -1, forget1 = -1;
 
-    diag.AddButton(QObject::tr("OK"));
+    dlg->AddButton(QObject::tr("OK"));
     ok = button++;
 
     QDateTime now = QDateTime::currentDateTime();
@@ -4347 +4350 @@
     if (recstartts < now && recendts > now &&
         recstatus != rsDontRecord && recstatus != rsNotListed)
     {
-        diag.AddButton(QObject::tr("Reactivate"));
+        dlg->AddButton(QObject::tr("Reactivate"));
         react = button++;
     }
 
@@ -4365 +4368 @@
              recstatus == rsInactive ||
              recstatus == rsLaterShowing))
         {
-            diag.AddButton(QObject::tr("Record anyway"));
+            dlg->AddButton(QObject::tr("Record anyway"));
             addov = button++;
             if (recstatus == rsPreviousRecording || recstatus == rsNeverRecord)
             {
-                diag.AddButton(QObject::tr("Forget Previous"));
+                dlg->AddButton(QObject::tr("Forget Previous"));
                 forget = button++;
             }
         }
@@ -4384 +4387 @@
             {
                 if (recstartts > now)
                 {
-                    diag.AddButton(QObject::tr("Don't record"));
+                    dlg->AddButton(QObject::tr("Don't record"));
                     addov1 = button++;
                 }
                 if (rectype != kFindOneRecord &&
@@ -4396 +4399 @@
                      ((dupmethod & kDupCheckSub) && subtitle != "") ||
                      ((dupmethod & kDupCheckDesc) && description != "")))
                 {
-                    diag.AddButton(QObject::tr("Never record"));
+                    dlg->AddButton(QObject::tr("Never record"));
                     forget1 = button++;
                 }
             }
 
-            diag.AddButton(QObject::tr("Edit Options"));
+            dlg->AddButton(QObject::tr("Edit Options"));
             ednorm = button++;
 
             if (rectype != kSingleRecord && rectype != kFindOneRecord &&
                 recstatus != rsNotListed)
             {
-                diag.AddButton(QObject::tr("Add Override"));
+                dlg->AddButton(QObject::tr("Add Override"));
                 edcust = button++;
             }
         }
 
         if (rectype == kOverrideRecord || rectype == kDontRecord)
         {
-            diag.AddButton(QObject::tr("Edit Override"));
+            dlg->AddButton(QObject::tr("Edit Override"));
             ednorm = button++;
 
-            diag.AddButton(QObject::tr("Clear Override"));
+            dlg->AddButton(QObject::tr("Clear Override"));
             clearov = button++;
         }
     }
 
-    int ret = diag.exec();
+    DialogCode code = dlg->exec();
+    dlg->deleteLater();
+    dlg = NULL;
+    int ret = MythDialog::CalcItemIndex(code);
 
     if (ret == react)
         ReactivateRecording();

mythtv/libs/libmythtv/scheduledrecording.cpp

@@ -721 +721 @@
 }
 
 
-int ScheduledRecordingEditor::exec(void) 
+DialogCode ScheduledRecordingEditor::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         open(listbox->getValue().toInt());
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void ScheduledRecordingEditor::open(int id) {
@@ -743 +743 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int ScheduledRecording::exec(bool saveOnExec, bool doLoad)
+DialogCode ScheduledRecording::exec(bool saveOnExec, bool doLoad)
 {
     if (!dialog)
         dialog = new ScheduledRecordingDialog(this);

mythtv/libs/libmythtv/recordingprofile.cpp

@@ -1319 +1319 @@
         audioSettings->selectCodecs(groupType());
 }
 
-int RecordingProfile::exec(void)
+DialogCode RecordingProfile::exec(void)
 {
     MythDialog *dialog = dialogWidget(
         gContext->GetMainWindow(), "Recording Profile");
@@ -1333 +1333 @@
     if (tr_filters)
         FiltersChanged(tr_filters->getValue());
     
-    int ret = dialog->exec();
+    DialogCode ret = dialog->exec();
 
     dialog->deleteLater();
 
@@ -1414 +1414 @@
     RecordingProfile::fillSelections(listbox, group);
 }
 
-int RecordingProfileEditor::exec(void)
+DialogCode RecordingProfileEditor::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted)
         open(listbox->getValue().toInt());
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void RecordingProfile::fillSelections(SelectSetting *setting, int group,

mythtv/libs/libmythtv/transporteditor.cpp

@@ -288 +288 @@
     connect(m_list, SIGNAL(deleteButtonPressed(int)), this, SLOT(Delete()));
 }
 
-int TransportListEditor::exec(void)
+DialogCode TransportListEditor::exec(void)
 {
-    while (ConfigurationDialog::exec() == QDialog::Accepted);
+    while (ConfigurationDialog::exec() == kDialogCodeAccepted);
 
-    return QDialog::Rejected;
+    return kDialogCodeRejected;
 }
 
 void TransportListEditor::Edit(void)
@@ -315 +315 @@
 {
     uint mplexid = m_list->getValue().toInt();
 
-    int val = MythPopupBox::show2ButtonPopup(
+    DialogCode val = MythPopupBox::Show2ButtonPopup(
         gContext->GetMainWindow(), "", 
         tr("Are you sure you would like to delete this transport?"), 
         tr("Yes, delete the transport"), 
-        tr("No, don't"), 2);
+        tr("No, don't"), kDialogCodeButton1);
 
-    if (val == 1)
+    if (kDialogCodeButton0 != val)
         return;
 
     MSqlQuery query(MSqlQuery::InitCon());
@@ -350 +350 @@
        return;
     }
 
-    int val = MythPopupBox::show2ButtonPopup(
+    DialogCode val = MythPopupBox::Show2ButtonPopup(
         gContext->GetMainWindow(), 
         "", 
         tr("Transport Menu"), 
         tr("Edit.."), 
-        tr("Delete.."), 1);
+        tr("Delete.."), kDialogCodeButton0);
 
-    if (val == 0)
+    if (kDialogCodeButton0 == val)
         emit Edit();
-    else if (val == 1)
+    else if (kDialogCodeButton1 == val)
         emit Delete();
     else
         m_list->setFocus();

mythtv/libs/libmythtv/storagegroup.h

@@ -36 +36 @@
     Q_OBJECT
   public:
     StorageGroupEditor(QString group);
-    virtual int exec(void);
+    virtual DialogCode exec(void);
     virtual void load(void);
     virtual void save(void) { };
     virtual void save(QString) { };
@@ -59 +59 @@
     Q_OBJECT
   public:
     StorageGroupListEditor(void);
-    virtual int exec(void);
+    virtual DialogCode exec(void);
     virtual void load(void);
     virtual void save(void) { };
     virtual void save(QString) { };

mythtv/libs/libmythtv/scanwizardhelpers.cpp

@@ -165 +165 @@
     setLabel(msg);
 }
 
-int ScanProgressPopup::exec(void)
+DialogCode ScanProgressPopup::exec(void)
 {
     if (!dialog)
     {
@@ -173 +173 @@
             dialogWidget(gContext->GetMainWindow(),
                          "ConfigurationPopupDialog");
     }
-    dialog->setResult(0);
+    dialog->setResult(kDialogCodeRejected);
 
     done = false;
     dialog->ShowPopup(this, SLOT(PopupDone(int)));

mythtv/libs/libmythtv/diseqcsettings.h

@@ -130 +130 @@
   public:
     DTVDeviceTreeWizard(DiSEqCDevTree &tree);
 
-    virtual int exec(void);
+    virtual DialogCode exec(void);
 };
 
 class DTVDeviceConfigGroup : public VerticalConfigurationGroup

mythtv/libs/libmythui/myththemedmenu.cpp

@@ -2405 +2405 @@
         MythPasswordDialog *pwd = new MythPasswordDialog(text, &ok, password,
                                                      gContext->GetMainWindow());
         pwd->exec();
-        delete pwd;
+        pwd->deleteLater();
 
         if (ok)
         {

mythtv/libs/libmyth/settings.cpp

@@ -1488 +1488 @@
     return dialog;
 }
 
-int ConfigurationDialog::exec(bool saveOnAccept, bool doLoad) 
+DialogCode ConfigurationDialog::exec(bool saveOnAccept, bool doLoad) 
 {
     if (doLoad)
         load();
@@ -1498 +1498 @@
 
     dialog->Show();
 
-    int ret = dialog->exec();
+    DialogCode ret = dialog->exec();
 
     if ((QDialog::Accepted == ret) && saveOnAccept)
         save();
@@ -2086 +2086 @@
         label->setText(str);
 }
 
-int ConfigurationPopupDialog::exec(bool saveOnAccept)
+DialogCode ConfigurationPopupDialog::exec(bool saveOnAccept)
 {
     storage->load();
 
@@ -2094 +2094 @@
         dialogWidget(gContext->GetMainWindow(), "ConfigurationPopupDialog");
     dialog->ShowPopup(this);
 
-    int ret = dialog->exec();
+    DialogCode ret = dialog->exec();
 
     if ((QDialog::Accepted == ret) && saveOnAccept)
         storage->save();

mythtv/libs/libmyth/mythdialogs.cpp

@@ -39 +39 @@
 #include "screensaver.h"
 #include "mythdbcon.h"
 
+/** \class MythDialog
+ *  \brief Base dialog for most dialogs in MythTV using the old UI
+ */
+
 MythDialog::MythDialog(MythMainWindow *parent, const char *name, bool setsize)
-          : QFrame(parent, name)
+    : QFrame(parent, name), rescode(kDialogCodeAccepted)
 {
-    rescode = 0;
-
     if (!parent)
     {
         cerr << "Trying to create a dialog without a parent.\n";
@@ -79 +81 @@
 
 void MythDialog::deleteLater(void)
 {
+    hide();
     TeardownAll();
     QFrame::deleteLater();
 }
@@ -114 +117 @@
     show();
 }
 
+void MythDialog::setResult(DialogCode r)
+{
+    if ((r < kDialogCodeRejected) ||
+        ((kDialogCodeAccepted < r) && (r < kDialogCodeListStart)))
+    {
+        VERBOSE(VB_IMPORTANT, "Programmer Error: MythDialog::setResult("
+                <<r<<") called with invalid DialogCode");
+    }
+
+    rescode = r;
+}
+
 void MythDialog::done(int r)
 {
     hide();
-    setResult(r);
+    setResult((DialogCode) r);
     close();
 }
 
 void MythDialog::AcceptItem(int i)
 {
-    done(ListStart + i);
+    if (i < 0)
+    {
+        VERBOSE(VB_IMPORTANT, "Programmer Error: MythDialog::AcceptItem("
+                <<i<<") called with negative index");
+        reject();
+        return;
+    }
+
+    done((DialogCode)((int)kDialogCodeListStart + (int)i));
 }
 
+int MythDialog::CalcItemIndex(DialogCode code)
+{
+    return (int)code - (int)kDialogCodeListStart;
+}
+
 void MythDialog::accept()
 {
     done(Accepted);
@@ -136 +164 @@
     done(Rejected);
 }
 
-int MythDialog::exec()
+DialogCode MythDialog::exec(void)
 {
     if (in_loop) 
     {
         qWarning("MythDialog::exec: Recursive call detected.");
-        return -1;
+        return kDialogCodeRejected;
     }
 
-    setResult(Rejected);
+    setResult(kDialogCodeRejected);
 
     Show();
 
     in_loop = TRUE;
     qApp->enter_loop();
 
-    int res = result();
+    DialogCode res = result();
 
     return res;
 }
@@ -212 +240 @@
     }
 }
 
+/** \class MythPopupBox
+ *  \brief Child of MythDialog used for most popup menus in MythTV
+ *
+ *  Most users of this class just call one of the static functions
+ *  These create a dialog and block until it returns with a DialogCode.
+ *
+ *  When creating an instance yourself and using ExecPopup() or
+ *  ShowPopup() you can optionally pass it a target and slot for
+ *  the popupDone(int) signal. It will be sent with the DialogCode
+ *  that the exec function returns, except it is cast to an int.
+ *  This is most useful for ShowPopup() which doesn't block or
+ *  return the result() when the popup is finished.
+ */
+
 MythPopupBox::MythPopupBox(MythMainWindow *parent, const char *name)
             : MythDialog(parent, name, false)
 {
@@ -464 +506 @@
         MythDialog::keyPressEvent(e);
 }
 
+void MythPopupBox::AcceptItem(int i)
+{
+    MythDialog::AcceptItem(i);
+    emit popupDone(rescode);
+}
+
 void MythPopupBox::accept(void)
 {
     MythDialog::done(MythDialog::Accepted);
@@ -476 +524 @@
     emit popupDone(MythDialog::Rejected);
 }
 
-int MythPopupBox::ExecPopup(QObject *target, const char *slot)
+DialogCode MythPopupBox::ExecPopup(QObject *target, const char *slot)
 {
     if (!target)
-        ShowPopup(this, SLOT(defaultExitHandler(int)));
+        ShowPopup(this, SLOT(done(int)));
     else
         ShowPopup(target, slot);
 
     return exec();
 }
 
-int MythPopupBox::ExecPopupAtXY(int destx, int desty,
-                            QObject *target, const char *slot)
+DialogCode MythPopupBox::ExecPopupAtXY(int destx, int desty,
+                                       QObject *target, const char *slot)
 {
     if (!target)
-        ShowPopupAtXY(destx, desty, this, SLOT(defaultExitHandler(int)));
+        ShowPopupAtXY(destx, desty, this, SLOT(done(int)));
     else
         ShowPopupAtXY(destx, desty, target, slot);
 
@@ -525 +573 @@
     }
     if (foundbutton)
     {
-        done(i);
+        AcceptItem(i);
         return;
     }
 
@@ -552 +600 @@
     }
     if (foundbutton)
     {
-        done(i);
+        AcceptItem(i);
         return;
     }
 
     VERBOSE(VB_IMPORTANT, "MythPopupBox::defaultButtonPressedHandler(void)"
             "\n\t\t\tWe should never get here!");
-    done(Rejected);
+    done(kDialogCodeRejected);
 }
 
-void MythPopupBox::defaultExitHandler(int r)
-{
-    done(r);
-}
-
-static int show_ok_popup(
+bool MythPopupBox::showOkPopup(
     MythMainWindow *parent,
     const QString  &title,
     const QString  &message,
-    QString         button_msg = QString::null)
+    QString         button_msg)
 {
     if (button_msg.isEmpty())
         button_msg = QObject::tr("OK");
@@ -580 +623 @@
     popup->addLabel(message, MythPopupBox::Medium, true);
     QButton *okButton = popup->addButton(button_msg, popup, SLOT(accept()));
     okButton->setFocus();
-    int ret = popup->ExecPopup();
+    bool ret = (kDialogCodeAccepted == popup->ExecPopup());
 
     popup->hide();
     popup->deleteLater();
@@ -588 +631 @@
     return ret;
 }
 
-void MythPopupBox::showOkPopup(MythMainWindow *parent, QString title,
-                               QString message)
-{
-    show_ok_popup(parent, title, message);
-}
-
-void MythPopupBox::showExitPopup(MythMainWindow *parent, QString title,
-                                 QString message)
-{
-    show_ok_popup(parent, title, message, tr("Exit"));
-}
-
 bool MythPopupBox::showOkCancelPopup(MythMainWindow *parent, QString title,
                                      QString message, bool focusOk)
 {
@@ -651 +682 @@
     return ok;
 }
 
-
-int MythPopupBox::show2ButtonPopup(MythMainWindow *parent, QString title,
-                                   QString message, QString button1msg,
-                                   QString button2msg, int defvalue)
+DialogCode MythPopupBox::ShowButtonPopup(
+    MythMainWindow    *parent,
+    const QString     &title,
+    const QString     &message,
+    const QStringList &buttonmsgs,
+    DialogCode         default_button)
 {
     MythPopupBox *popup = new MythPopupBox(parent, title);
 
     popup->addLabel(message, Medium, true);
     popup->addLabel("");
 
-    QButton *but1 = popup->addButton(button1msg);
-    QButton *but2 = popup->addButton(button2msg);
-
-    if (defvalue == 1)
-        but1->setFocus();
-    else
-        but2->setFocus();
-
-    int ret = popup->ExecPopup();
-
-    popup->hide();
-    popup->deleteLater();
-
-    return ret;
-}
-
-int MythPopupBox::showButtonPopup(MythMainWindow *parent, QString title,
-                                  QString message, QStringList buttonmsgs,
-                                  int defvalue)
-{
-    MythPopupBox *popup = new MythPopupBox(parent, title);
-
-    popup->addLabel(message, Medium, true);
-    popup->addLabel("");
-
+    const uint def = CalcItemIndex(default_button);
     for (unsigned int i = 0; i < buttonmsgs.size(); i++ )
     {
         QButton *but = popup->addButton(buttonmsgs[i]);
-        if (defvalue == (int)i)
+        if (def == i)
             but->setFocus();
     }
 
-    int ret = popup->ExecPopup();
+    DialogCode ret = popup->ExecPopup();
 
     popup->hide();
     popup->deleteLater();
@@ -757 +766 @@
     qApp->processEvents();
 }
 
+MythProgressDialog::~MythProgressDialog()
+{
+    Teardown();
+}
+
+void MythProgressDialog::deleteLater(void)
+{
+    hide();
+    Teardown();
+    MythDialog::deleteLater();
+}
+
+void MythProgressDialog::Teardown(void)
+{
+    if (textItems)
+    {
+        delete textItems;
+        textItems = NULL;
+    }
+}
+
 void MythProgressDialog::Close(void)
 {
     accept();
 
-    if (textItems)
+    LCD *lcddev = LCD::Get();
+    if (lcddev)
     {
-        LCD * lcddev = LCD::Get();
         lcddev->switchToNothing();
         lcddev->switchToTime();
-        delete textItems;
     }
 }
 
@@ -817 +846 @@
 
 MythBusyDialog::~MythBusyDialog()
 {
+    Teardown();
+}
+
+void MythBusyDialog::deleteLater(void)
+{
+    Teardown();
+    MythProgressDialog::deleteLater();
+}
+
+void MythBusyDialog::Teardown(void)
+{
     if (timer)
     {
         timer->disconnect();
         timer->deleteLater();
         timer = NULL;
     }
-
-    if (LCD *lcddev = LCD::Get())
-        lcddev->switchToTime();
 }
 
 void MythBusyDialog::start(int interval)
@@ -881 +918 @@
             .arg(window_name).arg(theme_filename);
         MythPopupBox::showOkPopup(gContext->GetMainWindow(),
                                   tr("Missing UI Element"), msg);
-        done(-1);
+        reject();
         return;
     }
 }
@@ -1895 +1932 @@
     if (the_text == target_text)
     {
         *success_flag = true;
-        done(0);
+        accept();
     }
     else
     {
@@ -1926 +1963 @@
     listbox = new MythListBox(this);
     listbox->setScrollBar(false);
     listbox->setBottomScrollBar(false);
-    connect(listbox, SIGNAL(accepted(int)), this, SLOT(itemSelected(int)));
+    connect(listbox, SIGNAL(accepted(int)), this, SLOT(AcceptItem(int)));
     addWidget(listbox);
-    
-    ok_button = addButton(tr("OK"), this, SLOT(okPressed()));
-    cancel_button = addButton(tr("Cancel"), this, SLOT(cancelPressed()));
+
+    ok_button     = addButton(tr("OK"),     this, SLOT(accept()));
+    cancel_button = addButton(tr("Cancel"), this, SLOT(reject()));
 }
 
 void MythSearchDialog::keyPressEvent(QKeyEvent *e)
@@ -1945 +1982 @@
             if (action == "ESCAPE")
             {
                 handled = true;
-                done(-1);        
+                reject();
             }
             if (action == "LEFT")
             {
@@ -1960 +1997 @@
             if (action == "SELECT")
             {
                 handled = true;
-                done(0);
+                accept();
             }
         }
     }
@@ -1968 +2005 @@
         MythPopupBox::keyPressEvent(e);
 }
 
-void MythSearchDialog::itemSelected(int index)
-{
-    (void)index;
-    done(0);
-}
-
 void MythSearchDialog::setCaption(QString text)
 {
     caption->setText(text);
@@ -2002 +2033 @@
    searchTextChanged();
 }
 
-void MythSearchDialog::okPressed(void)
+MythSearchDialog::~MythSearchDialog()
 {
-    done(0);  
+    Teardown();
 }
 
-void MythSearchDialog::cancelPressed(void)
+void MythSearchDialog::deleteLater(void)
 {
-    done(-1);
+    Teardown();
 }
 
-MythSearchDialog::~MythSearchDialog()
+void MythSearchDialog::Teardown(void)
 {
-    if (listbox)
-    {
-        delete listbox;
-        listbox = NULL;
-    }    
-    
-    if (editor)
-    {
-        delete editor;
-        editor = NULL;
-    }    
+    listbox = NULL; // deleted by Qt
+    editor  = NULL; // deleted by Qt
 }
 
 /*
@@ -2074 +2096 @@
                        "element. \n\nReturning to the previous menu."));
         MythPopupBox::showOkPopup(gContext->GetMainWindow(),
                                   tr("Missing UI Element"), msg);
-        done(-1);
+        reject();
         return;
     }
 
@@ -2109 +2131 @@
                        "\n\nReturning to the previous menu."));
         MythPopupBox::showOkPopup(gContext->GetMainWindow(),
                                   tr("Missing UI Element"), msg);
-        done(-1);
+        reject();
         return;
     }    
     
@@ -2316 +2338 @@
     if (type > -1)
     {
         *selected_file = image_files[type];
-        done(0);
+        accept();
     }   
 }
 
@@ -2342 +2364 @@
         VERBOSE(VB_IMPORTANT, 
                 "MythScrollDialog: Programmer error, trying to create "
                 "a dialog without a parent.");
-        done(-1);
+        done(kDialogCodeRejected);
         return;
     }
 
     m_parent     = parent;
     m_scrollMode = mode;
         
-    m_resCode    = 0;
+    m_resCode    = kDialogCodeRejected;
     m_inLoop     = false;
     
     gContext->GetScreenSettings(m_xbase, m_screenWidth, m_wmult,
@@ -2444 +2466 @@
                    m_screenHeight*areaHTimes);
 }
 
-int MythScrollDialog::result() const
+DialogCode MythScrollDialog::result(void) const
 {
     return m_resCode;    
 }
@@ -2468 +2490 @@
     }
 }
 
-int MythScrollDialog::exec()
+DialogCode MythScrollDialog::exec(void)
 {
     if (m_inLoop) 
     {
         std::cerr << "MythScrollDialog::exec: Recursive call detected."
                   << std::endl;
-        return -1;
+        return kDialogCodeRejected;
     }
 
-    setResult(Rejected);
+    setResult(kDialogCodeRejected);
 
     show();
 
     m_inLoop = true;
     qApp->enter_loop();
 
-    int res = result();
+    DialogCode res = result();
 
     return res;
 }
@@ -2492 +2514 @@
 void MythScrollDialog::done(int r)
 {
     hide();
-    setResult(r);
+    setResult((DialogCode)r);
     close();
 }
 
 void MythScrollDialog::accept()
 {
-    done(Accepted);
+    done(kDialogCodeAccepted);
 }
 
 void MythScrollDialog::reject()
 {
-    done(Rejected);
+    done(kDialogCodeRejected);
 }
 
-void MythScrollDialog::setResult(int r)
+void MythScrollDialog::setResult(DialogCode r)
 {
     m_resCode = r;    
 }

mythtv/libs/libmyth/mythwidgets.cpp

@@ -16 +16 @@
 #include "virtualkeyboard.h"
 #include "libmythui/mythmainwindow.h"
 
+typedef VirtualKeyboard* QWidgetP;
+static void qt_delete(QWidgetP &widget)
+{
+    if (widget)
+    {
+        widget->disconnect();
+        widget->hide();
+        widget->deleteLater();
+        widget = NULL;
+    }
+}
+
+MythComboBox::MythComboBox(bool rw, QWidget *parent, const char *name) :
+    QComboBox(rw, parent, name),
+    popup(NULL), helptext(QString::null), AcceptOnSelect(false),
+    useVirtualKeyboard(true), allowVirtualKeyboard(rw),
+    popupPosition(VK_POSBELOWEDIT), step(1)
+{
+    useVirtualKeyboard = gContext->GetNumSetting("UseVirtualKeyboard", 1);
+}
+
 MythComboBox::~MythComboBox()
 {
-    if (popup)
-        delete popup;
+    Teardown();
 }
 
-void MythComboBox::Init()
+void MythComboBox::deleteLater(void)
 {
-    popup = NULL;
-    popupPosition = VK_POSBELOWEDIT;
+    Teardown();
+    QComboBox::deleteLater();
 }
 
+void MythComboBox::Teardown(void)
+{
+    qt_delete(popup);
+}
+
+void MythComboBox::popupVirtualKeyboard(void)
+{
+    qt_delete(popup);
+
+    popup = new VirtualKeyboard(gContext->GetMainWindow(), this);
+    gContext->GetMainWindow()->detach(popup);
+    popup->exec();
+
+    qt_delete(popup);
+}
+
+
 void MythComboBox::keyPressEvent(QKeyEvent *e)
 {
     bool handled = false;
@@ -73 +110 @@
             else if (action == "SELECT" && AcceptOnSelect)
                 emit accepted(currentItem());
             else if (action == "SELECT" && 
-                    (e->text().isNull() ||
+                    (e->text().isEmpty() ||
                     (e->key() == Qt::Key_Enter) ||
                     (e->key() == Qt::Key_Return) ||
                     (e->key() == Qt::Key_Space)))
             {
-                if ((allowVirtualKeyboard) &&  (gContext->GetNumSetting("UseVirtualKeyboard", 1) == 1))
-                {
-                    popup = new VirtualKeyboard(gContext->GetMainWindow(), this);
-                    gContext->GetMainWindow()->detach(popup);
-                    popup->exec();
-                    delete popup;
-                    popup = NULL;
-                }
+                if (useVirtualKeyboard && allowVirtualKeyboard)
+                    popupVirtualKeyboard();
                 else
                    handled = true;
             }
@@ -354 +385 @@
     QSlider::focusOutEvent(e);
 }
 
+MythLineEdit::MythLineEdit(QWidget *parent, const char* widgetName) :
+    QLineEdit(parent, widgetName),
+    popup(NULL), helptext(QString::null), rw(true),
+    useVirtualKeyboard(true),
+    allowVirtualKeyboard(true),
+    popupPosition(VK_POSBELOWEDIT)
+{
+    useVirtualKeyboard = gContext->GetNumSetting("UseVirtualKeyboard", 1);
+}
+
+MythLineEdit::MythLineEdit(
+    const QString &contents, QWidget *parent, const char* widgetName) :
+    QLineEdit(contents, parent, widgetName),
+    popup(NULL), helptext(QString::null), rw(true),
+    useVirtualKeyboard(true),
+    allowVirtualKeyboard(true),
+    popupPosition(VK_POSBELOWEDIT)
+{
+    useVirtualKeyboard = gContext->GetNumSetting("UseVirtualKeyboard", 1);
+}
+
 MythLineEdit::~MythLineEdit()
 {
-    if (popup)
-        delete popup;
+    Teardown();
 }
 
-void MythLineEdit::Init()
+void MythLineEdit::deleteLater(void)
 {
-    popup = NULL;
-    popupPosition = VK_POSBELOWEDIT;
+    Teardown();
+    QLineEdit::deleteLater();
 }
 
+void MythLineEdit::Teardown(void)
+{
+    qt_delete(popup);
+}
+
+void MythLineEdit::popupVirtualKeyboard(void)
+{
+    qt_delete(popup);
+
+    popup = new VirtualKeyboard(gContext->GetMainWindow(), this);
+    gContext->GetMainWindow()->detach(popup);
+    popup->exec();
+
+    qt_delete(popup);
+}
+
 void MythLineEdit::keyPressEvent(QKeyEvent *e)
 {
     bool handled = false;
@@ -383 +450 @@
             else if (action == "DOWN")
                 focusNextPrevChild(true);
             else if (action == "SELECT" && 
-                    (e->text().isNull() ||
+                    (e->text().isEmpty() ||
                     (e->key() == Qt::Key_Enter) ||
                     (e->key() == Qt::Key_Return)))
             {
-                if ((allowVirtualKeyboard) && rw &&
-                    (gContext->GetNumSetting("UseVirtualKeyboard", 1) == 1))
-                {
-                    popup = new VirtualKeyboard(gContext->GetMainWindow(), this);
-                    gContext->GetMainWindow()->detach(popup);
-                    popup->exec();
-                    delete popup;
-                    popup = NULL;
-                }
+                if (useVirtualKeyboard && allowVirtualKeyboard && rw)
+                    popupVirtualKeyboard();
             }
-            else if (action == "SELECT" && e->text().isNull() )
+            else if (action == "SELECT" && e->text().isEmpty() )
                 e->ignore();
             else
                 handled = false;
@@ -409 +469 @@
             QLineEdit::keyPressEvent(e);
 }
 
-void MythLineEdit::setText(const QString& text) 
+void MythLineEdit::setText(const QString &text)
 {
     // Don't mess with the cursor position; it causes
     // counter-intuitive behaviour due to interactions with the
     // communication with the settings stuff
 
     int pos = cursorPosition();
-    QLineEdit::setText(text);
+    QLineEdit::setText(QDeepCopy<QString>(text));
     setCursorPosition(pos);
 }
 
+QString MythLineEdit::text(void)
+{
+    return QDeepCopy<QString>(QLineEdit::text());
+}
+
 void MythLineEdit::focusInEvent(QFocusEvent *e)
 {
     emit changeHelpText(helptext);
@@ -531 +596 @@
     connect(cycle_timer, SIGNAL(timeout()), this, SLOT(endCycle()));
     
     popup = NULL;
+    useVirtualKeyboard = gContext->GetNumSetting("UseVirtualKeyboard", 1);
     popupPosition = VK_POSBELOWEDIT;
 }
 
@@ -728 +794 @@
     //  of MythLineEdit, and I'm sure he had
     //  a reason ...
     getCursorPosition(&para, &pos);
-    QTextEdit::setText(text);
+    QTextEdit::setText(QDeepCopy<QString>(text));
     setCursorPosition(para, pos);
 }
 
+QString MythRemoteLineEdit::text(void)
+{
+    return QDeepCopy<QString>(QTextEdit::text());
+}
+
 void MythRemoteLineEdit::keyPressEvent(QKeyEvent *e)
 {
     bool handled = false;
@@ -763 +834 @@
             }
             else if ((action == "SELECT") &&
                      (!active_cycle) &&
-                     ((e->text().isNull()) ||
+                     ((e->text().isEmpty()) ||
                       (e->key() == Qt::Key_Enter) || 
                       (e->key() == Qt::Key_Return)))
             {
-                if (gContext->GetNumSetting("UseVirtualKeyboard", 1) == 1)
-                {
-                    popup = new VirtualKeyboard(gContext->GetMainWindow(), this);
-                    gContext->GetMainWindow()->detach(popup);
-                    popup->exec();
-                    delete popup;
-                    popup = NULL;
-                }
- 
+                if (useVirtualKeyboard)
+                    popupVirtualKeyboard();
             }
             else
                 handled = false;
@@ -973 +1037 @@
     QTextEdit::focusOutEvent(e);
 }
 
-
 MythRemoteLineEdit::~MythRemoteLineEdit()
 {
+    Teardown();
+}
+
+void MythRemoteLineEdit::deleteLater(void)
+{
+    Teardown();
+    QTextEdit::deleteLater();
+}
+
+void MythRemoteLineEdit::Teardown(void)
+{
     if (cycle_timer)
     {
-        delete cycle_timer;
+        cycle_timer->disconnect();
+        cycle_timer->deleteLater();
+        cycle_timer = NULL;
     }
 
-    if (popup)
-        delete popup;
+    qt_delete(popup);
 }
 
+void MythRemoteLineEdit::popupVirtualKeyboard(void)
+{
+    qt_delete(popup);
+
+    popup = new VirtualKeyboard(gContext->GetMainWindow(), this);
+    gContext->GetMainWindow()->detach(popup);
+    popup->exec();
+
+    qt_delete(popup);
+}
+
 void MythRemoteLineEdit::insert(QString text)
 {
     QTextEdit::insert(text);

mythtv/libs/libmyth/dialogbox.cpp

@@ -59 +59 @@
 void DialogBox::buttonPressed(int which)
 {
     if (buttongroup->find(which) != checkbox)
-        done(which + 1);
+        AcceptItem(which);
 }

mythtv/libs/libmyth/uilistbtntype.cpp

@@ -1503 +1503 @@
     searchEdit->setFocus();
 
     popup->addButton(tr("Search"));
-    popup->addButton(tr("Cancel"));
+    popup->addButton(tr("Cancel"), popup, SLOT(reject()));
 
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
 
-    if (res == 0)
+    if (kDialogCodeButton0 == res)
     {
         m_incSearch = searchEdit->text();
         m_bIncSearchContains = (modeCombo->currentItem() == 1);
@@ -1517 +1517 @@
     popup->hide();
     popup->deleteLater();
 
-    return (res == 0);
+    return (kDialogCodeButton0 == res);
 }
 
 bool UIListBtnType::incSearchNext(void)

mythtv/libs/libmyth/uitypes.cpp

@@ -2850 +2850 @@
 {
     if (edit)
     {
-        delete edit;
+        edit->hide();
+        edit->deleteLater();
         edit = NULL;
     }    
 }
@@ -4334 +4335 @@
     popup->addButton(tr("Search"));
     popup->addButton(tr("Cancel"));
 
-    int res = popup->ExecPopup();
+    DialogCode res = popup->ExecPopup();
 
-    if (res == 0)
+    if (kDialogCodeButton0 == res)
     {
         incSearch = searchEdit->text();
         bIncSearchContains = (modeCombo->currentItem() == 1);
@@ -4346 +4347 @@
     popup->hide();
     popup->deleteLater();
 
-    return (res == 0);
+    return (kDialogCodeButton0 == res);
 }
 
 bool UIManagedTreeListType::incSearchNext(void)
@@ -5947 +5948 @@
     if (!m_parentDialog)
         return;
 
-    m_parentDialog->done(0);
+    m_parentDialog->done(kDialogCodeAccepted);
 }
 
 void UIKeyboardType::updateButtons()

mythtv/libs/libmyth/mythcontext.cpp

@@ -1767 +1767 @@
     if (caching)
     {
         caching->Close();
-        delete caching;
+        caching->deleteLater();        
     }
 }
 
@@ -3060 +3060 @@
         }
 
         if (returnValue == MYTH_SCHEMA_ERROR)
-            MythPopupBox::showExitPopup(d->mainWindow,
-                                        "Database Upgrade Error", message);
+        {
+            MythPopupBox::showOkPopup(
+                d->mainWindow, "Database Upgrade Error",
+                message, QObject::tr("Exit"));
+        }
         else
         {
             QStringList buttonNames;
-            int         selected;
 
             buttonNames += QObject::tr("Exit");
             buttonNames += QObject::tr("Upgrade");
             if (expertMode)
                 buttonNames += QObject::tr("Use current schema");
 
-            selected = MythPopupBox::showButtonPopup(d->mainWindow,
-                                                     "Database Upgrade",
-                                                     message, buttonNames, -1);
+            DialogCode selected = MythPopupBox::ShowButtonPopup(
+                d->mainWindow, "Database Upgrade", message,
+                buttonNames, kDialogCodeButton0);
+
             // The annoying extra confirmation:
-            if (selected == 1)
+            if (kDialogCodeButton1 == selected)
             {
                 message = tr("This cannot be un-done, so having a"
                              " database backup would be a good idea.");
                 if (connections)
                     message += "\n\n" + warnOtherCl;
 
-                selected = MythPopupBox::showButtonPopup(d->mainWindow,
-                                                         "Database Upgrade",
-                                                         message,
-                                                         buttonNames, -1);
+                selected = MythPopupBox::ShowButtonPopup(
+                    d->mainWindow, "Database Upgrade", message,
+                    buttonNames, kDialogCodeButton0);
             }
 
             switch (selected)
             {
-                case 0:  returnValue = MYTH_SCHEMA_EXIT;         break;
-                case 1:  returnValue = MYTH_SCHEMA_UPGRADE;      break;
-                case 2:  returnValue = MYTH_SCHEMA_USE_EXISTING; break;
-                default: returnValue = MYTH_SCHEMA_ERROR;
+                case kDialogCodeRejected:
+                case kDialogCodeButton0:
+                    returnValue = MYTH_SCHEMA_EXIT;         break;
+                case kDialogCodeButton1:
+                    returnValue = MYTH_SCHEMA_UPGRADE;      break;
+                case kDialogCodeButton2:
+                    returnValue = MYTH_SCHEMA_USE_EXISTING; break;
+                default:
+                    returnValue = MYTH_SCHEMA_ERROR;
             }
         }
 
@@ -3162 +3169 @@
 
     if (GetMainWindow() && !d->disablelibrarypopup)
     {    
-        DialogBox dbox(gContext->GetMainWindow(), err);
-        dbox.AddButton("OK");
-        dbox.exec();
+        DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), err);
+        dlg->AddButton("OK");
+        dlg->exec();
+        dlg->deleteLater();
     }
 
     return false;

mythtv/libs/libmyth/mythcontext.h

@@ -209 +209 @@
 
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythtv class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.21.20071107-2"
+#define MYTH_BINARY_VERSION "0.21.20071110-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *

mythtv/libs/libmyth/settings.h

@@ -1153 +1153 @@
     virtual MythDialog *dialogWidget(
         MythMainWindow *parent, const char* widgetName);
 
-    int exec(bool saveOnAccept = true);
+    virtual DialogCode exec(bool saveOnAccept = true);
 
     virtual void setLabel(QString str);
 
@@ -1206 +1206 @@
                                      const char     *widgetName);
 
     // Show a dialogWidget, and save if accepted
-    virtual int exec(bool saveOnExec = true, bool doLoad = true);
+    virtual DialogCode exec(bool saveOnExec = true, bool doLoad = true);
 
     virtual void load(void) { cfgGrp->load(); }
     virtual void save(void) { cfgGrp->save(); }

mythtv/libs/libmyth/mythmediamonitor.cpp

@@ -144 +144 @@
         return drives.front();
     }
 
-    MythPopupBox *popup = new MythPopupBox(
-        gContext->GetMainWindow(), "select drive");
-
-    popup->addLabel(label);
+    QStringList buttonmsgs;
     for (it = drives.begin(); it != drives.end(); ++it)
-        popup->addButton(DevName(*it));
+        buttonmsgs += DevName(*it);
+    buttonmsgs += tr("Cancel");
+    const DialogCode cancelbtn = (DialogCode)
+        (((int)kDialogCodeButton0) + buttonmsgs.size() - 1);
 
-    popup->addButton(tr("Cancel"))->setFocus();
+    DialogCode ret = MythPopupBox::ShowButtonPopup(
+        gContext->GetMainWindow(), "select drive", label,
+        buttonmsgs, cancelbtn);
 
-    int ret = popup->ExecPopup();
-    popup->hide();
-    popup->deleteLater();
-
     // If the user cancelled, return a special value
-    if (ret < 0)
+    if ((kDialogCodeRejected == ret) || (cancelbtn == ret))
         return (MythMediaDevice *)-1;
 
-    if ((uint)ret < drives.count())
-        return drives[ret];
+    uint idx = MythDialog::CalcItemIndex(ret);
+    if (idx < drives.count())
+        return drives[idx];
 
     return NULL;
 }

mythtv/libs/libmyth/mythdialogs.h

@@ -50 +50 @@
 
 #include "libmythui/mythmainwindow.h"
 
+typedef enum DialogCode
+{
+    kDialogCodeRejected  = QDialog::Rejected,
+    kDialogCodeAccepted  = QDialog::Accepted,
+    kDialogCodeListStart = 0x10,
+    kDialogCodeButton0   = 0x10,
+    kDialogCodeButton1   = 0x11,
+    kDialogCodeButton2   = 0x12,
+    kDialogCodeButton3   = 0x13,
+    kDialogCodeButton4   = 0x14,
+    kDialogCodeButton5   = 0x15,
+    kDialogCodeButton6   = 0x16,
+    kDialogCodeButton7   = 0x17,
+    kDialogCodeButton8   = 0x18,
+    kDialogCodeButton9   = 0x19,
+} DialogCode;
+
+inline bool operator==(const DialogCode &a, const QDialog::DialogCode &b)
+{ return ((int)a) == ((int)b); }
+inline bool operator==(const QDialog::DialogCode &a, const DialogCode &b)
+{ return ((int)a) == ((int)b); }
+inline bool operator!=(const DialogCode &a, const QDialog::DialogCode &b)
+{ return ((int)a) == ((int)b); }
+inline bool operator!=(const QDialog::DialogCode &a, const DialogCode &b)
+{ return ((int)a) == ((int)b); }
+
 class MPUBLIC MythDialog : public QFrame
 {
     Q_OBJECT
@@ -57 +83 @@
     MythDialog(MythMainWindow *parent, const char *name = 0, 
                bool setsize = true);
 
-    enum DialogCode
-    {
-        Rejected  = 0,
-        Accepted  = 1,
-        ListStart = 0x10,
-    };
+    // these are for backward compatibility..
+    static const DialogCode Rejected  = kDialogCodeRejected;
+    static const DialogCode Accepted  = kDialogCodeAccepted;
+    static const DialogCode ListStart = kDialogCodeListStart;
 
-    int result(void) const { return rescode; }
+    DialogCode result(void) const { return rescode; }
 
     virtual void Show(void);
 
@@ -74 +98 @@
    
     virtual bool onMediaEvent(MythMediaDevice * mediadevice); 
     
-    void setResult(int r) { rescode = r; }
+    void setResult(DialogCode r);
 
     virtual void deleteLater(void);
 
+    static int CalcItemIndex(DialogCode code);
+
  signals:
     void menuButtonPressed();
 
   public slots:
-    int exec();
-    virtual void done( int );
-
-  protected slots:
+    DialogCode exec(void);
+    virtual void done(int); // Must be given a valid DialogCode
     virtual void AcceptItem(int);
     virtual void accept();
     virtual void reject();
@@ -102 +126 @@
  
     MythMainWindow *m_parent;
 
-    int rescode;
+    DialogCode rescode;
 
     bool in_loop;
 
@@ -133 +157 @@
     void ShowPopupAtXY(int destx, int desty, 
                        QObject *target = NULL, const char *slot = NULL);
 
-    int ExecPopup(QObject *target = NULL, const char *slot = NULL);
-    int ExecPopupAtXY(int destx, int desty,
-                      QObject *target = NULL, const char *slot = NULL);
+    DialogCode ExecPopup(QObject *target = NULL, const char *slot = NULL);
+    DialogCode ExecPopupAtXY(int destx, int desty,
+                             QObject *target = NULL, const char *slot = NULL);
 
-    static void showOkPopup(MythMainWindow *parent, QString title,
-                            QString message);
-    static void showExitPopup(MythMainWindow *parent, QString title,
-                              QString message);
+    static bool showOkPopup(MythMainWindow *parent,
+                            const QString  &title,
+                            const QString  &message,
+                            QString         button_msg = QString::null);
+
     static bool showOkCancelPopup(MythMainWindow *parent, QString title,
                                   QString message, bool focusOk);
-    static int show2ButtonPopup(MythMainWindow *parent, QString title,
-                                QString message, QString button1msg,
-                                QString button2msg, int defvalue);
-    static int showButtonPopup(MythMainWindow *parent, QString title,
-                               QString message, QStringList buttonmsgs,
-                               int defvalue);
 
+    static DialogCode Show2ButtonPopup(
+        MythMainWindow *parent,
+        const QString &title, const QString &message,
+        const QString &button1msg, const QString &button2msg,
+        DialogCode default_button)
+    {
+        QStringList buttonmsgs;
+        buttonmsgs += (button1msg.isEmpty()) ?
+            QString("Button 1") : button1msg;
+        buttonmsgs += (button2msg.isEmpty()) ?
+            QString("Button 2") : button2msg;
+        return ShowButtonPopup(
+            parent, title, message, buttonmsgs, default_button);
+    }
+
+    static DialogCode ShowButtonPopup(
+        MythMainWindow *parent,
+        const QString &title, const QString &message,
+        const QStringList &buttonmsgs,
+        DialogCode default_button);
+
     static bool showGetTextPopup(MythMainWindow *parent, QString title,
                                  QString message, QString& text);
 
+  public slots:
+    virtual void AcceptItem(int);
     virtual void accept(void);
     virtual void reject(void);
 
@@ -160 +202 @@
     virtual void popupDone(int);
 
   protected:
+    ~MythPopupBox() {} // use deleteLater() instead for thread safety
     bool focusNextPrevChild(bool next);
     void keyPressEvent(QKeyEvent *e);
 
   protected slots:
     void defaultButtonPressedHandler(void);
-    void defaultExitHandler(int);
 
   private:
     QVBoxLayout *vbox;
@@ -214 +256 @@
 
     void keyPressEvent(QKeyEvent *);
 
+    virtual void deleteLater(void);
+
   protected:
+    void Teardown(void);
+    ~MythProgressDialog(); // use deleteLater() instead for thread safety
     QProgressBar *progress;
 
   private:
@@ -243 +289 @@
     */
     MythBusyDialog(const QString &title);
 
-    ~MythBusyDialog();
-
     /** \brief Setup a timer to 'move' the spinner
 
         This will create a \p QTimer object that will update the
@@ -260 +304 @@
     */
     void Close();
 
+  public slots:
+    virtual void deleteLater(void);
+
   protected slots:
     void setProgress();
     void timeout();
 
+  protected:
+    void Teardown(void);
+    ~MythBusyDialog();
+
   private:
     QTimer *timer;
 };
@@ -278 +329 @@
     MythThemedDialog(MythMainWindow *parent, const char *name = 0,
                      bool setsize = true);
 
-   ~MythThemedDialog();
-
     virtual bool loadThemedWindow(QString window_name, QString theme_filename);
     virtual void loadWindow(QDomElement &);
     virtual void parseContainer(QDomElement &);
@@ -328 +377 @@
     virtual void activateCurrent();
 
   protected:
+    ~MythThemedDialog(); // use deleteLater() instead for thread safety
 
     void paintEvent(QPaintEvent* e);
     UIType *widget_with_current_focus;
@@ -369 +419 @@
                         MythMainWindow *parent, 
                         const char *name = 0, 
                         bool setsize = true);
-    ~MythPasswordDialog();
-
   public slots:
   
     void checkPassword(const QString &);
 
- protected:
- 
+  protected:
+    ~MythPasswordDialog(); // use deleteLater() instead for thread safety
     void keyPressEvent(QKeyEvent *e);
 
   private:
@@ -393 +441 @@
   public:
 
     MythSearchDialog(MythMainWindow *parent, const char *name = 0); 
-    ~MythSearchDialog();
 
   public: 
     void setCaption(QString text);
     void setSearchText(QString text);
     void setItems(QStringList items); 
     QString getResult(void);
-    
- protected slots:
-    void okPressed(void);
-    void cancelPressed(void);   
+
+  public slots:
+    virtual void deleteLater(void);
+
+  protected slots:
     void searchTextChanged(void);
-    void itemSelected(int index);
      
- protected:
+  protected:
+    void Teardown(void);
+    ~MythSearchDialog(); // use deleteLater() instead for thread safety
     void keyPressEvent(QKeyEvent *e);
 
   private:
@@ -439 +488 @@
                         QString theme_filename = "", 
                         const char *name = 0,
                         bool setsize=true);
-    ~MythImageFileDialog();
-
   public slots:
   
     void handleTreeListSelection(int, IntVector*);
@@ -449 +496 @@
     void buildFileList(QString directory);
 
   protected:
-  
+    ~MythImageFileDialog(); // use deleteLater() instead for thread safety
     void keyPressEvent(QKeyEvent *e);
 
   private:
@@ -472 +519 @@
     
   public:
 
-    enum DialogCode {
-        Rejected,
-        Accepted
-    };
-
     enum ScrollMode {
         HScroll=0,
         VScroll
@@ -484 +526 @@
 
     MythScrollDialog(MythMainWindow *parent, ScrollMode mode=HScroll,
                      const char *name = 0);
-    ~MythScrollDialog();
 
     void setArea(int w, int h);
     void setAreaMultiplied(int areaWTimes, int areaHTimes);
 
-    int  result() const;
+    DialogCode result(void) const;
 
   public slots:
 
-    int  exec();
+    DialogCode exec(void);
     virtual void done(int);
     virtual void show();
     virtual void hide();
@@ -505 +546 @@
     virtual void reject();
 
   protected:
-
+    ~MythScrollDialog(); // use deleteLater() instead for thread safety
     void         keyPressEvent(QKeyEvent *e);
     virtual void paintEvent(QRegion& region, int x, int y, int w, int h);
 
-    void setResult(int r);
+    void setResult(DialogCode r);
     void viewportPaintEvent(QPaintEvent *pe);
 
     MythMainWindow *m_parent;
@@ -523 +564 @@
     QFont           m_defaultMediumFont;
     QFont           m_defaultSmallFont;
 
-    int             m_resCode;
+    DialogCode      m_resCode;
     bool            m_inLoop;
     
     QPixmap        *m_bgPixmap;

mythtv/libs/libmyth/virtualkeyboard.cpp

@@ -51 +51 @@
         if (!loadThemedWindow("keyboard", "keyboard/en_us_"))
         {
             VERBOSE(VB_IMPORTANT, "VirtualKeyboard: cannot find layout for US English");
-            done(-1);
+            reject();
             return;
         }
     }
@@ -63 +63 @@
     {
         cerr << "VirtualKeyboard: cannot find the 'keyboard_container'"
                 " in your theme" << endl;
-        done(-1);
+        reject();
         return;
     }
 
@@ -162 +162 @@
     if (!m_keyboard)
     {
         cerr << "VirtualKeyboard: cannot find the UIKeyboardType in your theme" << endl;
-        done(-1);
+        reject();
         return;
     }
 
@@ -212 +212 @@
             QString action = actions[i];
             handled = true;
             if (action == "ESCAPE")
-                done(0);
+                accept();
             else
                 handled = false;
         }

mythtv/libs/libmyth/dialogbox.h

@@ -23 +23 @@
   protected slots:
     void buttonPressed(int which);
 
+  protected:
+    ~DialogBox() {} // use deleteLater() for thread safety
+
   private:
     QVBoxLayout *box;
     QButtonGroup *buttongroup;

mythtv/libs/libmyth/mythwidgets.h

@@ -41 +41 @@
 {
     Q_OBJECT
   public:
-    MythComboBox(bool rw, QWidget* parent=0, const char* name=0):
-        QComboBox(rw, parent, name) { AcceptOnSelect = false; step = 1; 
-            allowVirtualKeyboard = rw; Init(); };
+    MythComboBox(bool rw, QWidget* parent=0, const char* name=0);
 
-    virtual ~MythComboBox();
-
     void setHelpText(QString help) { helptext = help; }
     void setAcceptOnSelect(bool Accept) { AcceptOnSelect = Accept; }
     void setStep(int _step = 1) { step = _step; }
@@ -61 +57 @@
     void gotFocus();
 
   public slots:
+    virtual void deleteLater(void);
     void insertItem(const QString& item) {
         QComboBox::insertItem(item);
     };
 
   protected:
+    void Teardown(void);
+    virtual ~MythComboBox(); // use deleteLater for thread safety
     virtual void keyPressEvent (QKeyEvent *e);
     virtual void focusInEvent(QFocusEvent *e);
     virtual void focusOutEvent(QFocusEvent *e);
     void Init(void);
+    virtual void popupVirtualKeyboard(void);
 
   private:
     VirtualKeyboard *popup;
     QString helptext;
     bool AcceptOnSelect;
+    bool useVirtualKeyboard;
     bool allowVirtualKeyboard;
     PopupPosition popupPosition;
     int step;
@@ -133 +134 @@
 {
     Q_OBJECT
   public:
-    MythLineEdit(QWidget *parent=NULL, const char* widgetName=0) :
-      QLineEdit(parent, widgetName)
-            { rw = true; allowVirtualKeyboard = true; Init(); };
+    MythLineEdit(QWidget *parent=NULL, const char* widgetName=0);
+    MythLineEdit(const QString &text, QWidget *p=NULL, const char *name=0);
 
-    MythLineEdit(const QString& contents, QWidget *parent=NULL, 
-                 const char* widgetName=0) :
-      QLineEdit(contents, parent, widgetName)
-            { rw = true; allowVirtualKeyboard = true; Init(); };
-
-    virtual ~MythLineEdit();
-
     void setHelpText(QString help) { helptext = help; };
     void setRW(bool readwrite = true) { rw = readwrite; };
     void setRO() { rw = false; };
@@ -152 +145 @@
     void setPopupPosition(PopupPosition pos) { popupPosition = pos; }
     PopupPosition getPopupPosition(void) { return popupPosition; }
 
- public slots:
-     virtual void setText(const QString& text);
+    virtual QString text();
 
+  public slots:
+    virtual void deleteLater(void);
+    virtual void setText(const QString &text);
+
   signals:
     void changeHelpText(QString);
 
   protected:
+    void Teardown(void);
+    virtual ~MythLineEdit(); // use deleteLater for thread safety
+
     virtual void keyPressEvent(QKeyEvent *e);
     virtual void focusInEvent(QFocusEvent *e); 
     virtual void focusOutEvent(QFocusEvent *e);
     virtual void hideEvent(QHideEvent *e);
     virtual void mouseDoubleClickEvent(QMouseEvent *e);
-    void Init(void);
+    virtual void popupVirtualKeyboard(void);
 
   private:
     VirtualKeyboard *popup;
     QString helptext;
     bool rw;
+    bool useVirtualKeyboard;
     bool allowVirtualKeyboard;
     PopupPosition popupPosition;
 };
@@ -187 +187 @@
     MythRemoteLineEdit( const QString & contents, QWidget * parent, const char * name = 0 );    
     MythRemoteLineEdit( QFont *a_font, QWidget * parent, const char * name = 0 );    
     MythRemoteLineEdit( int lines, QWidget * parent, const char * name = 0 );
-   ~MythRemoteLineEdit();
+
     void setHelpText(QString help) { helptext = help; }
     void setCycleTime(float desired_interval); // in seconds
     void setCharacterColors(QColor unselected, QColor selected, QColor special);
@@ -197 +197 @@
     void setPopupPosition(PopupPosition pos) { popupPosition = pos; };
     PopupPosition getPopupPosition(void) { return popupPosition; };
 
+    virtual QString text();
+
   signals:
 
     void    shiftState(bool);
@@ -208 +210 @@
     void    textChanged(QString);
 
   public slots:
-    
+    virtual void deleteLater(void);
     virtual void setText(const QString& text);
     
   protected:
-    
+    void Teardown(void);
+    virtual ~MythRemoteLineEdit(); // use deleteLater for thread safety
     virtual void focusInEvent(QFocusEvent *e);
     virtual void focusOutEvent(QFocusEvent *e);
     virtual void keyPressEvent(QKeyEvent *e);
+    virtual void popupVirtualKeyboard(void);
 
   private slots:
 
@@ -255 +259 @@
     int m_lines;
 
     VirtualKeyboard *popup;
-    PopupPosition popupPosition;
+    bool             useVirtualKeyboard;
+    PopupPosition    popupPosition;
 };
 
 class MPUBLIC MythTable : public QTable

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -485 +485 @@
     }
 }
 
-int PlaybackBox::exec(void)
+DialogCode PlaybackBox::exec(void)
 {
     if (recGroup != "")
         return MythDialog::exec();
@@ -496 +496 @@
         return MythDialog::exec();
     }
 
-    return 0;
+    return kDialogCodeRejected;
 }
 
 /* blocks until playing has stopped */
@@ -4557 +4557 @@
 
     iconhelp->addLayout(grid);
 
-    QButton *button = iconhelp->addButton(tr("Ok"));
+    QButton *button = iconhelp->addButton(
+        QObject::tr("OK"), iconhelp, SLOT(accept()));
     button->setFocus();
 
     iconhelp->ExecPopup();
@@ -4687 +4688 @@
     recGroupPopup->addWidget(exitbutton);
     connect(exitbutton, SIGNAL(clicked()), recGroupPopup, SLOT(reject()));
 
-    int result = recGroupPopup->ExecPopup();
+    DialogCode result = recGroupPopup->ExecPopup();
 
     if (result != MythDialog::Rejected)
     {
@@ -4853 +4854 @@
     connect(recGroupListBox, SIGNAL(currentChanged(QListBoxItem *)), this,
             SLOT(recGroupChooserListBoxChanged()));
 
-    int result = recGroupPopup->ExecPopup();
+    DialogCode result = recGroupPopup->ExecPopup();
 
     if (result != MythDialog::Rejected)
         setGroupFilter();
@@ -4913 +4914 @@
                                                      recGroupPassword,
                                                      gContext->GetMainWindow());
         pwd->exec();
-        delete pwd;
+        pwd->deleteLater();
         if (!ok)
         {
             recGroupPassword = savedPW;
@@ -5055 +5056 @@
             SLOT(recGroupChangerListBoxChanged()));
     connect(recGroupOkButton, SIGNAL(clicked()), recGroupPopup, SLOT(accept()));
 
-    int result = recGroupPopup->ExecPopup();
+    DialogCode result = recGroupPopup->ExecPopup();
 
     if (result != MythDialog::Rejected)
         setRecGroup();
@@ -5106 +5107 @@
     connect(recGroupListBox, SIGNAL(accepted(int)),
             recGroupPopup,   SLOT(AcceptItem(int)));
 
-    int result = recGroupPopup->ExecPopup();
+    DialogCode result = recGroupPopup->ExecPopup();
 
     if (result != MythDialog::Rejected)
         setPlayGroup();
@@ -5143 +5144 @@
 
     connect(recGroupOkButton, SIGNAL(clicked()), recGroupPopup, SLOT(accept()));
 
-    int result = recGroupPopup->ExecPopup();
+    DialogCode result = recGroupPopup->ExecPopup();
 
     if (result == MythDialog::Accepted)
         setRecTitle();

mythtv/programs/mythfrontend/channelrecpriority.cpp

@@ -45 +45 @@
     theme->SetHMult(hmult);
     if (!theme->LoadTheme(xmldata, "recprioritychannels"))
     {
-        DialogBox diag(gContext->GetMainWindow(), tr("The theme you are using "
-                       "does not contain a 'recprioritychannels' element.  "
-                       "Please contact the theme creator and ask if they could "
-                       "please update it.<br><br>The next screen will be empty."
-                       "  Escape out of it to return to the menu."));
-        diag.AddButton(tr("OK"));
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(),
+            tr("The theme you are using "
+               "does not contain a 'recprioritychannels' element.  "
+               "Please contact the theme creator and ask if they could "
+               "please update it.<br><br>The next screen will be empty."
+               "  Escape out of it to return to the menu."));
 
+        dlg->AddButton(tr("OK"));
+        dlg->exec();
+        dlg->deleteLater();
+
         return;
     }
 

mythtv/programs/mythfrontend/custompriority.cpp

@@ -475 +475 @@
         errdiag->AddButton(QObject::tr("OK"));
         errdiag->exec();
 
-        delete errdiag;
+        errdiag->deleteLater();
     }
     return ret;
 }

mythtv/programs/mythfrontend/main.cpp

@@ -359 +359 @@
     else if (sel == "settings appearance") 
     {
         AppearanceSettings *settings = new AppearanceSettings();
-        int res = settings->exec();
+        DialogCode res = settings->exec();
         delete settings;
 
-        if (res)
+        if (kDialogCodeRejected != res)
         {
             qApp->processEvents();
             GetMythMainWindow()->JumpTo("Reload Theme");
@@ -455 +455 @@
 
     QString title = QObject::tr("Do you really want to exit MythTV?");
 
-    DialogBox diag(gContext->GetMainWindow(), title);
+    DialogBox *dlg = new DialogBox(gContext->GetMainWindow(), title);
 
-    diag.AddButton(QObject::tr("No"));
-    int result;
+    dlg->AddButton(QObject::tr("No"));
+    DialogCode result = kDialogCodeRejected;
 
+    int ret = NO_EXIT;
     switch (exitMenuStyle)
     {
         case 0:
-            diag.AddButton(QObject::tr("Yes, Exit now"));
+            dlg->AddButton(QObject::tr("Yes, Exit now"));
             if (frontendOnly)
-                diag.AddButton(QObject::tr("Yes, Exit and Shutdown"));
-            result = diag.exec();
+                dlg->AddButton(QObject::tr("Yes, Exit and Shutdown"));
+            result = dlg->exec();
             switch (result)
             {
-                case 1: return NO_EXIT;
-                case 2: return QUIT;
-                case 3: return HALT;
-                default: return NO_EXIT;
+                case kDialogCodeButton0: ret = NO_EXIT; break;
+                case kDialogCodeButton1: ret = QUIT;    break;
+                case kDialogCodeButton2: ret = HALT;    break;
+                default:                 ret = NO_EXIT; break;
             }
+            break;
         case 1:
-            diag.AddButton(QObject::tr("Yes, Exit now"));
-            result = diag.exec();
+            dlg->AddButton(QObject::tr("Yes, Exit now"));
+            result = dlg->exec();
             switch (result)
             {
-                case 1: return NO_EXIT;
-                case 2: return QUIT;
-                default: return NO_EXIT;
+                case kDialogCodeButton0: ret = NO_EXIT; break;
+                case kDialogCodeButton1: ret = QUIT;    break;
+                default:                 ret = NO_EXIT; break;
             }
+            break;
         case 2:
-            diag.AddButton(QObject::tr("Yes, Exit now"));
-            diag.AddButton(QObject::tr("Yes, Exit and Shutdown"));
-            result = diag.exec();
+            dlg->AddButton(QObject::tr("Yes, Exit now"));
+            dlg->AddButton(QObject::tr("Yes, Exit and Shutdown"));
+            result = dlg->exec();
             switch (result)
             {
-                case 1: return NO_EXIT;
-                case 2: return QUIT;
-                case 3: return HALT;
-                default: return NO_EXIT;
+                case kDialogCodeButton0: ret = NO_EXIT; break;
+                case kDialogCodeButton1: ret = QUIT;    break;
+                case kDialogCodeButton2: ret = HALT;    break;
+                default:                 ret = NO_EXIT; break;
             }
+            break;
         case 3:
-            diag.AddButton(QObject::tr("Yes, Exit now"));
-            diag.AddButton(QObject::tr("Yes, Exit and Reboot"));
-            diag.AddButton(QObject::tr("Yes, Exit and Shutdown"));
-            result = diag.exec();
+            dlg->AddButton(QObject::tr("Yes, Exit now"));
+            dlg->AddButton(QObject::tr("Yes, Exit and Reboot"));
+            dlg->AddButton(QObject::tr("Yes, Exit and Shutdown"));
+            result = dlg->exec();
             switch (result)
             {
-                case 1: return NO_EXIT;
-                case 2: return QUIT;
-                case 3: return REBOOT;
-                case 4: return HALT;
-                default: return NO_EXIT;
+                case kDialogCodeButton0: ret = NO_EXIT; break;
+                case kDialogCodeButton1: ret = QUIT;    break;
+                case kDialogCodeButton2: ret = REBOOT;  break;
+                case kDialogCodeButton3: ret = HALT;    break;
+                default:                 ret = NO_EXIT; break;
             }
+            break;
         case 4:
-            diag.AddButton(QObject::tr("Yes, Exit and Shutdown"));
-            result = diag.exec();
+            dlg->AddButton(QObject::tr("Yes, Exit and Shutdown"));
+            result = dlg->exec();
             switch (result)
             {
-                case 1: return NO_EXIT;
-                case 2: return HALT;
-                default: return NO_EXIT;
+                case kDialogCodeButton0: ret = NO_EXIT; break;
+                case kDialogCodeButton1: ret = HALT;    break;
+                default:                 ret = NO_EXIT; break;
             }
+            break;
         case 5:
-            diag.AddButton(QObject::tr("Yes, Exit and Reboot"));
-            result = diag.exec();
+            dlg->AddButton(QObject::tr("Yes, Exit and Reboot"));
+            result = dlg->exec();
             switch (result)
             {
-                case 1: return NO_EXIT;
-                case 2: return REBOOT;
-                default: return NO_EXIT;
+                case kDialogCodeButton0: ret = NO_EXIT; break;
+                case kDialogCodeButton1: ret = REBOOT;  break;
+                default:                 ret = NO_EXIT; break;
             }
+            break;
         case 6:
-            diag.AddButton(QObject::tr("Yes, Exit and Reboot"));
-            diag.AddButton(QObject::tr("Yes, Exit and Shutdown"));
-            result = diag.exec();
+            dlg->AddButton(QObject::tr("Yes, Exit and Reboot"));
+            dlg->AddButton(QObject::tr("Yes, Exit and Shutdown"));
+            result = dlg->exec();
             switch (result)
             {
-                case 1: return NO_EXIT;
-                case 2: return REBOOT;
-                case 3: return HALT;
-                default: return NO_EXIT;
+                case kDialogCodeButton0: ret = NO_EXIT; break;
+                case kDialogCodeButton1: ret = REBOOT;  break;
+                case kDialogCodeButton2: ret = HALT;    break;
+                default:                 ret = NO_EXIT; break;
             }
+            break;
     }
 
-    return NO_EXIT;
+    dlg->deleteLater();
+    dlg = NULL;
+
+    return ret;
 }
 
 void haltnow()
@@ -701 +712 @@
                     long long pos = (long long)(atoi((*++it).ascii()) & 0xffffffffLL);
                     if (pos > 0)
                     {
-                        QString msg = QString("DVD contains a bookmark");
-                        QString button1msg = QString("Play from bookmark");
-                        QString button2msg = QString("Play from beginning");
+                        QString msg = QObject::tr("DVD contains a bookmark");
+                        QString btn0msg = QObject::tr("Play from bookmark");
+                        QString btn1msg = QObject::tr("Play from beginning");
         
-                        int ret = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
-                                                            "", msg,
-                                                            button1msg,
-                                                            button2msg,
-                                                            1);
-                        if (ret == 1)
+                        DialogCode ret = MythPopupBox::Show2ButtonPopup(
+                            gContext->GetMainWindow(),
+                            "", msg,
+                            btn0msg,
+                            btn1msg,
+                            kDialogCodeButton0);
+                        if (kDialogCodeButton1 == ret)
                             pginfo->setIgnoreBookmark(true);
-                        else if (ret == -1)
+                        else if (kDialogCodeRejected == ret)
                         {
                             delete tmprbuf;
                             delete pginfo;

mythtv/programs/mythfrontend/statusbox.cpp

@@ -361 +361 @@
             if ((inContent) &&
                 (currentItem == QObject::tr("Log Entries")))
             {
-                int retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                 QString("AckLogEntry"),
-                                 QObject::tr("Acknowledge all log entries at "
-                                             "this priority level or lower?"),
-                                 QObject::tr("Yes"), QObject::tr("No"), 0);
-                if (retval == 0)
+                DialogCode retval = MythPopupBox::Show2ButtonPopup(
+                    my_parent, QString("AckLogEntry"),
+                    QObject::tr("Acknowledge all log entries at "
+                                "this priority level or lower?"),
+                    QObject::tr("Yes"), QObject::tr("No"),
+                    kDialogCodeButton0);
+
+                if (kDialogCodeButton0 == retval)
                 {
                     MSqlQuery query(MSqlQuery::InitCon());
                     query.prepare("UPDATE mythlog SET acknowledged = 1 "
@@ -552 +554 @@
     {
         if (currentItem == QObject::tr("Log Entries"))
         {
-            int retval;
+            DialogCode retval = MythPopupBox::Show2ButtonPopup(
+                my_parent,
+                QString("AckLogEntry"),
+                QObject::tr("Acknowledge this log entry?"),
+                QObject::tr("Yes"), QObject::tr("No"), kDialogCodeButton0);
 
-            retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                   QString("AckLogEntry"),
-                                   QObject::tr("Acknowledge this log entry?"),
-                                   QObject::tr("Yes"), QObject::tr("No"), 0);
-            if (retval == 0)
+            if (kDialogCodeButton0 == retval)
             {
                 MSqlQuery query(MSqlQuery::InitCon());
                 query.prepare("UPDATE mythlog SET acknowledged = 1 "
@@ -572 +574 @@
         {
             QStringList msgs;
             int jobStatus;
-            int retval;
 
             jobStatus = JobQueue::GetJobStatus(
                                 contentData[contentPos].toInt());
 
             if (jobStatus == JOB_QUEUED)
             {
-                retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Delete Job?"),
-                                       QObject::tr("Yes"),
-                                       QObject::tr("No"), 2);
-                cout << "Popup result = " << retval << endl;
-                if (retval == 0)
+                DialogCode retval = MythPopupBox::Show2ButtonPopup(
+                    my_parent,
+                    QString("JobQueuePopup"), QObject::tr("Delete Job?"),
+                    QObject::tr("Yes"), QObject::tr("No"), kDialogCodeButton1);
+                if (kDialogCodeButton0 == retval)
                 {
                     JobQueue::DeleteJob(contentData[contentPos].toInt());
                     doJobQueueStatus();
@@ -598 +597 @@
                 msgs << QObject::tr("Pause");
                 msgs << QObject::tr("Stop");
                 msgs << QObject::tr("No Change");
-                retval = MythPopupBox::showButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Job Queue Actions:"),
-                                       msgs, 2);
-                if (retval == 0)
+                DialogCode retval = MythPopupBox::ShowButtonPopup(
+                    my_parent,
+                    QString("JobQueuePopup"),
+                    QObject::tr("Job Queue Actions:"),
+                    msgs, kDialogCodeButton2);
+                if (kDialogCodeButton0 == retval)
                 {
                     JobQueue::PauseJob(contentData[contentPos].toInt());
                     doJobQueueStatus();
                 }
-                else if (retval == 1)
+                else if (kDialogCodeButton1 == retval)
                 {
                     JobQueue::StopJob(contentData[contentPos].toInt());
                     doJobQueueStatus();
@@ -618 +618 @@
                 msgs << QObject::tr("Resume");
                 msgs << QObject::tr("Stop");
                 msgs << QObject::tr("No Change");
-                retval = MythPopupBox::showButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Job Queue Actions:"),
-                                       msgs, 2);
-                if (retval == 0)
+                DialogCode retval = MythPopupBox::ShowButtonPopup(
+                    my_parent,
+                    QString("JobQueuePopup"),
+                    QObject::tr("Job Queue Actions:"),
+                    msgs, kDialogCodeButton2);
+
+                if (kDialogCodeButton0 == retval)
                 {
                     JobQueue::ResumeJob(contentData[contentPos].toInt());
                     doJobQueueStatus();
                 }
-                else if (retval == 1)
+                else if (kDialogCodeButton1 == retval)
                 {
                     JobQueue::StopJob(contentData[contentPos].toInt());
                     doJobQueueStatus();
@@ -635 +637 @@
             }
             else if (jobStatus & JOB_DONE)
             {
-                retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Requeue Job?"),
-                                       QObject::tr("Yes"),
-                                       QObject::tr("No"), 1);
-                if (retval == 0)
+                DialogCode retval = MythPopupBox::Show2ButtonPopup(
+                    my_parent,
+                    QString("JobQueuePopup"),
+                    QObject::tr("Requeue Job?"),
+                    QObject::tr("Yes"), QObject::tr("No"), kDialogCodeButton0);
+
+                if (kDialogCodeButton0 == retval)
                 {
                     JobQueue::ChangeJobStatus(contentData[contentPos].toInt(),
                                               JOB_QUEUED);
@@ -657 +660 @@
             if (rec) 
             {
                 QStringList msgs;
-                int retval;
 
                 msgs << QObject::tr("Delete Now");
                 msgs << QObject::tr("Disable AutoExpire");
                 msgs << QObject::tr("No Change");
                 
-                retval = MythPopupBox::showButtonPopup(my_parent,
-                             QString("AutoExpirePopup"),
-                             QObject::tr("AutoExpire Actions:"),
-                             msgs, 2);
+                DialogCode retval = MythPopupBox::ShowButtonPopup(
+                    my_parent,
+                    QString("AutoExpirePopup"),
+                    QObject::tr("AutoExpire Actions:"),
+                    msgs, kDialogCodeButton2);
 
-                if (retval == 0 && REC_CAN_BE_DELETED(rec))
+                if ((kDialogCodeButton0 == retval) && REC_CAN_BE_DELETED(rec))
                 {
                     RemoteDeleteRecording(rec, false, false);
                 }
-                else if (retval == 1)
+                else if (kDialogCodeButton1 == retval)
                 {
                     rec->SetAutoExpire(0);
                     if ((rec)->recgroup == "LiveTV")

mythtv/programs/mythfrontend/programrecpriority.cpp

@@ -103 +103 @@
     theme->SetHMult(hmult);
     if (!theme->LoadTheme(xmldata, "recpriorityprograms"))
     {
-        DialogBox diag(gContext->GetMainWindow(), tr("The theme you are using "
-                       "does not contain a 'recpriorityprograms' element.  "
-                       "Please contact the theme creator and ask if they could "
-                       "please update it.<br><br>The next screen will be empty."
-                       "  Escape out of it to return to the menu."));
-        diag.AddButton(tr("OK"));
-        diag.exec();
+        DialogBox *dlg = new DialogBox(
+            gContext->GetMainWindow(),
+            tr("The theme you are using does not contain a "
+               "'recpriorityprograms' element.  Please contact the theme "
+               "creator and ask if they could please update it.<br><br>The "
+               "next screen will be empty.  Escape out of it to return to "
+               "the menu."));
 
+        dlg->AddButton(tr("OK"));
+        dlg->exec();
+        dlg->deleteLater();
+
         return;
     }
 

mythtv/programs/mythfrontend/playbackbox.h

@@ -106 +106 @@
     static ProgramInfo *RunPlaybackBox(void *player);
 
   public slots:
-    int exec();
+    DialogCode exec();
 
   protected slots:
     void timeout(void);

mythtv/programs/mythtv-setup/main.cpp

@@ -310 +310 @@
 
     if (backendIsRunning)
     {
-        int val = MythPopupBox::show2ButtonPopup(
+        DialogCode val = MythPopupBox::Show2ButtonPopup(
             gContext->GetMainWindow(), QObject::tr("WARNING"),
             warn,
             QObject::tr("Continue"),
-            QObject::tr("Exit"), 1);
-        if (1 == val)
-            return 0;
+            QObject::tr("Exit"), kDialogCodeButton0);
 
-        backendIsRunning = true;
+        if (kDialogCodeButton1 == val)
+            return 0;
     }
 
     REG_KEY("qt", "DELETE", "Delete", "D");
@@ -348 +347 @@
             dia->AddButton(QObject::tr("Yes please"));
             dia->AddButton(QObject::tr("No, I know what I am doing"));
 
-            if (dia->exec() == 2)
+            if (kDialogCodeButton1 == dia->exec())
                 haveProblems = false;
-            delete dia;
+            dia->deleteLater();
         }
 
         delete problems;
@@ -368 +367 @@
                                         "with channel information."));
         dia->AddButton(QObject::tr("OK"));
         dia->exec();
-        delete dia;
+        dia->deleteLater();
     }
 
     if (backendIsRunning)

mythtv/programs/mythwelcome/welcomedialog.h

@@ -23 +23 @@
     void keyPressEvent(QKeyEvent *e);
     void customEvent(QCustomEvent *e);
     void wireUpTheme();
-    int exec(void);
+    DialogCode exec(void);
     
   protected slots:
     void startFrontendClick(void);

mythtv/programs/mythwelcome/welcomedialog.cpp

@@ -84 +84 @@
     QTimer::singleShot(500, this, SLOT(startFrontend()));
 }
 
-int WelcomeDialog::exec()
+DialogCode WelcomeDialog::exec(void)
 {
     // mythshutdown --startup returns 0 for automatic startup
     //                                1 for manual startup 
@@ -203 +203 @@
         else if (action == "INFO")
         {
             MythWelcomeSettings settings;
-            if (settings.exec() == 1)
+            if (kDialogCodeAccepted == settings.exec())
             {
                 RemoteSendMessage("CLEAR_SETTINGS_CACHE");
                 updateStatus();
@@ -213 +213 @@
         else if (action == "SHOWSETTINGS")
         {
             MythShutdownSettings settings;
-            if (settings.exec() == 1)
+            if (kDialogCodeAccepted == settings.exec())
                 RemoteSendMessage("CLEAR_SETTINGS_CACHE");
         }
         else if (action == "0")
@@ -296 +296 @@
 
 void WelcomeDialog::closeDialog()
 {
-    done(1);
+    done(kDialogCodeAccepted);
 }
 
 WelcomeDialog::~WelcomeDialog()
@@ -703 +703 @@
                          SLOT(shutdownNow()));
     popup->addButton(tr("Exit"), this,
                          SLOT(closeDialog()));
-    popup->addButton(tr("Cancel"), this, SLOT(cancelPopup()));
+    popup->addButton(tr("Cancel"), popup, SLOT(reject()));
 
     popup->ShowPopup(this, SLOT(donePopup(int)));