← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vlc/maverick

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/dialogs/external.hpp
23
23
 
24
24
#include <QObject>
25
25
#include <vlc_common.h>
26
 
 
27
 
class QVLCVariable : public QObject
28
 
{
29
 
    Q_OBJECT
30
 
private:
31
 
    static int callback (vlc_object_t *, const char *,
32
 
                         vlc_value_t, vlc_value_t, void *);
33
 
    vlc_object_t *object;
34
 
    QString name;
35
 
 
36
 
public:
37
 
    QVLCVariable (vlc_object_t *, const char *, int);
38
 
    virtual ~QVLCVariable (void);
39
 
 
40
 
signals:
41
 
    void pointerChanged (vlc_object_t *, void *);
42
 
};
 
26
#include "variables.hpp"
43
27
 
44
28
struct intf_thread_t;
45
29
class QProgressDialog;
58
42
    intf_thread_t *intf;
59
43
    static int error (vlc_object_t *, const char *, vlc_value_t, vlc_value_t,
60
44
                      void *);
61
 
    QVLCVariable critical;
62
 
    QVLCVariable login;
63
 
    QVLCVariable question;
64
 
    QVLCVariable progressBar;
 
45
    QVLCPointer critical;
 
46
    QVLCPointer login;
 
47
    QVLCPointer question;
 
48
    QVLCPointer progressBar;
65
49
signals:
66
50
    void progressBarDestroyed (QWidget *);
67
51
    void error (const QString&, const QString&);
84
68
public:
85
69
    QVLCProgressDialog (DialogHandler *parent,
86
70
                        struct dialog_progress_bar_t *);
87
 
    virtual ~QVLCProgressDialog (void);
88
 
 
89
71
private:
90
72
    DialogHandler *handler;
91
73
    bool cancelled;