← Back to branch summary

~ubuntu-branches/debian/squeeze/vlc/squeeze

« back to all changes in this revision

Viewing changes to modules/gui/qt4/dialogs/external.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Mutricy
  • Date: 2009-09-20 01:08:41 UTC
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20090920010841-vc6vme91a70r5w0t
Tags: upstream-1.0.2
Import upstream version 1.0.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/dialogs/external.cpp
60
60
 
61
61
 
62
62
DialogHandler::DialogHandler (intf_thread_t *intf, QObject *_parent)
63
 
    : intf (intf), QObject( _parent ),
 
63
    : QObject( _parent ), intf (intf),
64
64
      critical (VLC_OBJECT(intf), "dialog-critical", VLC_VAR_ADDRESS),
65
65
      login (VLC_OBJECT(intf), "dialog-login", VLC_VAR_ADDRESS),
66
66
      question (VLC_OBJECT(intf), "dialog-question", VLC_VAR_ADDRESS),
180
180
        ? box->addButton ("&" + qfu(data->yes), QMessageBox::YesRole) : NULL;
181
181
    QAbstractButton *no = (data->no != NULL)
182
182
        ? box->addButton ("&" + qfu(data->no), QMessageBox::NoRole) : NULL;
183
 
    QAbstractButton *cancel = (data->cancel != NULL)
184
 
        ? box->addButton ("&" + qfu(data->cancel), QMessageBox::RejectRole)
185
 
        : NULL;
 
183
    if (data->cancel != NULL)
 
184
        box->addButton ("&" + qfu(data->cancel), QMessageBox::RejectRole);
186
185
 
187
186
    box->exec ();
188
187
 
204
203
                                        struct dialog_progress_bar_t *data)
205
204
    : QProgressDialog (qfu(data->message),
206
205
                       data->cancel ? ("&" + qfu(data->cancel)) : 0, 0, 1000),
207
 
      cancelled (false),
208
 
      handler (parent)
 
206
      handler (parent),
 
207
      cancelled (false)
209
208
{
210
209
    if (data->title != NULL)
211
210
        setWindowTitle (qfu(data->title));