Drop trailing semicolons

[vlc] / modules / gui / qt4 / dialogs / help.hpp

diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index 0bde93414370f18fe3db0acc409d418e02e42ffe..0f1a2b2366a794fe2bf49d68f4c593e4b881bf2e 100644 (file)
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -21,48 +21,82 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _HELP_DIALOG_H_
-#define _HELP_DIALOG_H_
+#ifndef QVLC_HELP_DIALOG_H_
+#define QVLC_HELP_DIALOG_H_ 1
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "qt4.hpp"
 
 #include "util/qvlcframe.hpp"
+#include "util/singleton.hpp"
 
-class HelpDialog : public QVLCFrame
+class QPushButton;
+class QTextBrowser;
+class QLabel;
+class QEvent;
+class QPushButton;
+class QTextEdit;
+
+class HelpDialog : public QVLCFrame, public Singleton<HelpDialog>
 {
-    Q_OBJECT;
-public:
-    static HelpDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance)
-            instance = new HelpDialog( p_intf );
-        return instance;
-    }
+    Q_OBJECT
+private:
+    HelpDialog( intf_thread_t * );
     virtual ~HelpDialog();
 
+public slots:
+    void close();
+
+    friend class    Singleton<HelpDialog>;
+};
+
+
+class AboutDialog : public QVLCDialog, public Singleton<AboutDialog>
+{
+    Q_OBJECT
+
 private:
-    HelpDialog( intf_thread_t *);
-    static HelpDialog *instance;
+    AboutDialog( intf_thread_t * );
+    virtual ~AboutDialog();
+
 public slots:
     void close();
+
+    friend class    Singleton<AboutDialog>;
 };
 
+#ifdef UPDATE_CHECK
+
+static const int UDOkEvent = QEvent::User + DialogEventType + 21;
+static const int UDErrorEvent = QEvent::User + DialogEventType + 22;
 
-class AboutDialog : public QVLCFrame
+class UpdateDialog : public QVLCFrame, public Singleton<UpdateDialog>
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
-    static AboutDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance)
-            instance = new AboutDialog( p_intf);
-        return instance;
-    }
-    virtual ~AboutDialog();
+    void updateNotify( bool );
 
 private:
-    AboutDialog( intf_thread_t *);
-    static AboutDialog *instance;
-public slots:
+    UpdateDialog( intf_thread_t * );
+    virtual ~UpdateDialog();
+
+    update_t *p_update;
+    QPushButton *updateButton;
+    QLabel *updateLabelTop;
+    QLabel *updateLabelDown;
+    QTextEdit *updateText;
+    void customEvent( QEvent * );
+    bool b_checked;
+
+private slots:
     void close();
+    void UpdateOrDownload();
+
+    friend class    Singleton<UpdateDialog>;
 };
+#endif
 
 #endif