Qt: use __MIN when applicable

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

diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp
index 3b311dbf5c96fed68e19016412c1fff5a7b16790..3b9f66cd754df8e2d5bc315b3f40a17195ed3d57 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.hpp
+++ b/modules/gui/qt4/dialogs/messages.hpp
@@ -25,6 +25,8 @@
 #define QVLC_MESSAGES_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
+#include "util/singleton.hpp"
+#include "ui/messages_panel.h"
 
 class QTabWidget;
 class QPushButton;
@@ -34,49 +36,36 @@ class QLabel;
 class QTextEdit;
 class QTreeWidget;
 class QTreeWidgetItem;
+class QLineEdit;
+class MsgEvent;
 
-class MessagesDialog : public QVLCFrame
+class MessagesDialog : public QVLCFrame, public Singleton<MessagesDialog>
 {
-    Q_OBJECT;
-public:
-    static MessagesDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance)
-            instance = new MessagesDialog( p_intf );
-        return instance;
-    }
-    static void killInstance()
-    {
-        if( instance ) delete instance;
-        instance = NULL;
-    }
-
-    virtual ~MessagesDialog();
-
+    Q_OBJECT
 private:
     MessagesDialog( intf_thread_t * );
-    static MessagesDialog *instance;
-    QTabWidget *mainTab;
-    QSpinBox *verbosityBox;
-    QLabel *verbosityLabel;
-    QTextEdit *messages;
-    QTreeWidget *modulesTree;
-    QPushButton *clearUpdateButton;
-    QPushButton *saveLogButton;
+    virtual ~MessagesDialog();
+
+    Ui::messagesPanelWidget ui;
     msg_subscription_t *sub;
     msg_cb_data_t *cbData;
     static void sinkMessage( msg_cb_data_t *, msg_item_t *, unsigned );
     void customEvent( QEvent * );
-    void sinkMessage( msg_item_t *item );
+    void sinkMessage( MsgEvent * );
 
 private slots:
-    void updateTab( int );
-    void clearOrUpdate();
     bool save();
-private:
+    void updateConfig();
+    void changeVerbosity( int );
     void clear();
     void updateTree();
+    void tabChanged( int );
+
+private:
     void buildTree( QTreeWidgetItem *, vlc_object_t * );
+
+    friend class    Singleton<MessagesDialog>;
+    QPushButton *updateButton;
 };
 
 #endif