[Qt] Remove QTimer wher we can.

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 2d0090373875f652d440af1a6933789050cfe183..4f78b21cd5501b883f2ef1b25f92757cb05d86a8 100644 (file)
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -49,6 +49,7 @@
 #include <QResizeEvent>
 #include <QDate>
 #include <QSignalMapper>
+#include <QTimer>
 
 #define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
 

diff --git a/modules/gui/qt4/components/controller.hpp b/modules/gui/qt4/components/controller.hpp
index bfd536228dfdc0912b9b04735bde215c83c7ba28..e5cec3c938cf917e6ecf08c958590206edf5f370 100644 (file)
--- a/modules/gui/qt4/components/controller.hpp
+++ b/modules/gui/qt4/components/controller.hpp
@@ -53,6 +53,8 @@ class QAbstractButton;
 class VolumeClickHandler;
 class QSignalMapper;
 
+class QTimer;
+
 typedef enum buttonType_e
 {
     PLAY_BUTTON,

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index 35e784cafb3411c10aae59d88f2c73eb48986080..b46e36869dd10a3bba6154f4ad163bc1b6d9f490 100644 (file)
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -546,6 +546,7 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
     StatsTree->setColumnWidth( 1 , 200 );
 
     layout->addWidget(StatsTree, 1, 0 );
+
     CONNECT( THEMIM->getIM() , statisticsUpdated( input_item_t* ),
             this, update( input_item_t* ) );
 }

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index a5c12a07a172d73cd154a4eaf2e85bd32e0709d9..606603dc72f78b937e9b56a7a51cc84a634a1a97 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -111,10 +111,6 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
     if( p_item )
         update( p_item, true, true );
 
-    if( stats )
-        CONNECT( THEMIM->getIM(), statisticsUpdated( input_item_t*),
-                this, updateStats( input_item_t*));
-
     readSettings( "Mediainfo", QSize( 600 , 480 ) );
 }
 
@@ -161,11 +157,6 @@ void MediaInfoDialog::update( input_thread_t *p_input )
     vlc_object_release( p_input );
 }
 
-void MediaInfoDialog::updateStats( input_item_t *p_input)
-{
-    update( p_input, false, false);
-}
-
 void MediaInfoDialog::update( input_item_t *p_item,
                               bool update_info,
                               bool update_meta )

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index b161042cf2dd98f8fcd1ebe798920d5e0ece11a1..b6a4a0b3d86ec0a454fbf9ce9c9a3e84b5d487dc 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -86,7 +86,6 @@ public slots:
     void update( input_item_t *, bool, bool );
 
 private slots:
-    void updateStats( input_item_t *);
     void close();
     void clear();
     void saveMeta();

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 57f6b1c4a4e83602d2985214070ee9b4397be602..6de4b86e3827fdb688af8272ad7767b4ae64b4e1 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -64,7 +64,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
 
     msgLayout->addWidget( messages, 0, 0, 1, 0 );
     mainTab->addTab( msgWidget, qtr( "Messages" ) );
-    ON_TIMEOUT( updateLog() );
+    //    ON_TIMEOUT( updateLog() );
 
 
     /* Modules tree */

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 761f3bc605d99359947a33280047a8b6cc5047b1..5a6fef469222a87ed084500614e73c68ef78e21d 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -58,8 +58,6 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
                                   QObject( NULL ), p_intf( _p_intf )
 {
     b_isDying = false;
-    fixed_timer = new QTimer( this );
-    fixed_timer->start( 150 /* milliseconds */ );
 
     menusMapper = new QSignalMapper();
     CONNECT( menusMapper, mapped(QObject *), this, menuAction( QObject *) );
@@ -85,7 +83,6 @@ DialogsProvider::~DialogsProvider()
     UpdateDialog::killInstance();
 #endif
 
-    fixed_timer->stop();
     delete menusMapper;
     delete menusUpdateMapper;
     delete SDMapper;

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index fe7d02b0df8694f88a8a4a992d59e2ebec4dd7e6..5a1b6c0f1b78331b92d53258bfbe6873428cc8c0 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -38,7 +38,6 @@
 #include "dialogs/open.hpp"
 
 #include <QObject>
-#include <QTimer>
 #include <QApplication>
 
 #define ADD_FILTER_MEDIA( string )     \
@@ -109,7 +108,6 @@ public:
         return ( instance != NULL );
     }
     virtual ~DialogsProvider();
-    QTimer *fixed_timer;
 
     QStringList showSimpleOpen( QString help = QString(),
                                 int filters = EXT_FILTER_MEDIA |

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 7a75028c6a9e1761bca0597ec7f2ef8b91d2b506..fb58ba64a7a438cdf4597a4dfaa4e15cf1429c32 100755 (executable)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -94,7 +94,6 @@ struct intf_sys_t
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
-#define ON_TIMEOUT( act ) CONNECT( THEDP->fixed_timer, timeout(), this, act )
 
 #define BUTTON_SET( button, text, tooltip )  \
     button->setText( text );                 \