Qt: includes barrier fix.

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

diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index e32930ac21ad57740513bccbc301456142cb6c93..af4ea4fd9e82d7c41e860e841a832f02442d07a0 100644 (file)
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -21,13 +21,15 @@
  * 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"
 
 class QPushButton;
@@ -35,50 +37,56 @@ class QTextBrowser;
 class QLabel;
 class QEvent;
 class QPushButton;
+class QTextEdit;
 
-class HelpDialog : public QVLCDialog
+class HelpDialog : public QVLCFrame
 {
     Q_OBJECT;
 public:
     static HelpDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance)
-            instance = new HelpDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
+            instance = new HelpDialog( p_intf );
         return instance;
     }
+    static void killInstance()
+    { if( instance ) delete instance; instance = NULL;}
     virtual ~HelpDialog();
 
 private:
-    HelpDialog( QWidget *, intf_thread_t * );
+    HelpDialog( intf_thread_t * );
     static HelpDialog *instance;
 public slots:
     void close();
 };
 
 
-class AboutDialog : public QVLCFrame
+class AboutDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
     static AboutDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance)
-            instance = new AboutDialog( p_intf );
+            instance = new AboutDialog( (QWidget *)p_intf->p_sys->p_mi,
+                                        p_intf );
         return instance;
     }
-    virtual ~AboutDialog();
 
 private:
-    AboutDialog( intf_thread_t * );
+    AboutDialog( QWidget *, intf_thread_t * );
+    virtual ~AboutDialog();
+
     static AboutDialog *instance;
+
 public slots:
     void close();
 };
 
 #ifdef UPDATE_CHECK
 
-static int UDOkEvent = QEvent::User + 1;
-static int UDErrorEvent = QEvent::User + 2;
+static const int UDOkEvent = QEvent::User + DialogEventType + 21;
+static const int UDErrorEvent = QEvent::User + DialogEventType + 22;
 
 class UpdateDialog : public QVLCFrame
 {
@@ -90,15 +98,22 @@ public:
             instance = new UpdateDialog( p_intf );
         return instance;
     }
-    virtual ~UpdateDialog();
+    static void killInstance()
+    { if( instance ) delete instance; instance = NULL;}
+
     void updateNotify( bool );
 
 private:
     UpdateDialog( intf_thread_t * );
+    virtual ~UpdateDialog();
+
     static UpdateDialog *instance;
+
     update_t *p_update;
     QPushButton *updateButton;
-    QLabel *updateLabel;
+    QLabel *updateLabelTop;
+    QLabel *updateLabelDown;
+    QTextEdit *updateText;
     void customEvent( QEvent * );
     bool b_checked;