Remove more unused old ui code from libmyth. There are only a few pla…

…ces where old dialogs are still used now
MythTV · Jan 31, 2012 · 77df65b · 77df65b
1 parent 6ce2585
commit 77df65b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/mythplugins/mythweather/mythweather/main.cpp b/mythplugins/mythweather/mythweather/main.cpp
@@ -119,9 +119,6 @@ static void WeatherCallback(void *data, QString &selection)
             mainStack->AddScreen(srcsetup);
         else
             delete srcsetup;
-//             MythPopupBox::showOkPopup(GetMythMainWindow(), "no sources",
-//                     QObject::tr("No Sources defined, Sources are defined by"
-//                                 " adding screens in Screen Setup."));
     }
 }
 

diff --git a/mythtv/libs/libmyth/mythdialogs.cpp b/mythtv/libs/libmyth/mythdialogs.cpp
@@ -713,28 +713,6 @@ bool MythPopupBox::showOkPopup(
     return ret;
 }
 
-bool MythPopupBox::showOkCancelPopup(MythMainWindow *parent, QString title,
-                                     QString message, bool focusOk)
-{
-    MythPopupBox *popup = new MythPopupBox(parent, title.toAscii().constData());
-
-    popup->addLabel(message, Medium, true);
-    QAbstractButton *okButton     = popup->addButton(tr("OK"),     popup, SLOT(accept()));
-    QAbstractButton *cancelButton = popup->addButton(tr("Cancel"), popup, SLOT(reject()));
-
-    if (focusOk)
-        okButton->setFocus();
-    else
-        cancelButton->setFocus();
-
-    bool ok = (Accepted == popup->ExecPopup());
-
-    popup->hide();
-    popup->deleteLater();
-
-    return ok;
-}
-
 bool MythPopupBox::showGetTextPopup(MythMainWindow *parent, QString title,
                                     QString message, QString& text)
 {

diff --git a/mythtv/libs/libmyth/mythdialogs.h b/mythtv/libs/libmyth/mythdialogs.h
@@ -153,9 +153,6 @@ class MPUBLIC MythPopupBox : public MythDialog
                             const QString  &message,
                             QString         button_msg = QString());
 
-    static bool showOkCancelPopup(MythMainWindow *parent, QString title,
-                                  QString message, bool focusOk);
-
     static DialogCode Show2ButtonPopup(
         MythMainWindow *parent,
         const QString &title, const QString &message,

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