[vlc-commits] Qt4: use qlonglong instead of int64_t for cross-thread connections

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul 19 21:18:06 2012 +0300| [fdb50775af6b86d22cb4024dc190d62c8e9ce4aa] | committer: Rémi Denis-Courmont

Qt4: use qlonglong instead of int64_t for cross-thread connections

int64_t is not supported natively by the Qt object system.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fdb50775af6b86d22cb4024dc190d62c8e9ce4aa
---

 modules/gui/qt4/input_manager.cpp |    4 ++--
 modules/gui/qt4/input_manager.hpp |    2 +-
 modules/gui/qt4/variables.cpp     |    3 ++-
 modules/gui/qt4/variables.hpp     |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 9dc5ac7..83a722e 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -958,7 +958,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     repeat.addCallback( this, SLOT(notifyRepeatLoop(bool)) );
     loop.addCallback( this, SLOT(notifyRepeatLoop(bool)) );
 
-    volume.addCallback( this, SLOT(notifyVolume(int64_t)) );
+    volume.addCallback( this, SLOT(notifyVolume(qlonglong)) );
     mute.addCallback( this, SLOT(notifyMute(bool)) );
 
     /* Warn our embedded IM about input changes */
@@ -1217,7 +1217,7 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
     return VLC_SUCCESS;
 }
 
-void MainInputManager::notifyVolume( int64_t volume )
+void MainInputManager::notifyVolume( qlonglong volume )
 {
     emit volumeChanged( volume / (float)AOUT_VOLUME_DEFAULT );
 }
diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index ee41b4c..dd857a0 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -292,7 +292,7 @@ public slots:
 private slots:
     void notifyRandom( bool );
     void notifyRepeatLoop( bool );
-    void notifyVolume( int64_t );
+    void notifyVolume( qlonglong );
     void notifyMute( bool );
 signals:
     void inputChanged( input_thread_t * );
diff --git a/modules/gui/qt4/variables.cpp b/modules/gui/qt4/variables.cpp
index e0270d3..c927a42 100644
--- a/modules/gui/qt4/variables.cpp
+++ b/modules/gui/qt4/variables.cpp
@@ -86,7 +86,8 @@ void QVLCInteger::trigger (vlc_value_t, vlc_value_t cur)
 bool QVLCInteger::addCallback (QObject *tgt, const char *method,
                                Qt::ConnectionType type)
 {
-    return tgt->connect (this, SIGNAL(integerChanged(int64_t)), method, type);
+    return tgt->connect (this, SIGNAL(integerChanged(qlonglong)), method,
+                         type);
 }
 
 QVLCBool::QVLCBool (vlc_object_t *obj, const char *varname, bool inherit)
diff --git a/modules/gui/qt4/variables.hpp b/modules/gui/qt4/variables.hpp
index 096048e..dd511d9 100644
--- a/modules/gui/qt4/variables.hpp
+++ b/modules/gui/qt4/variables.hpp
@@ -70,7 +70,7 @@ public:
                       Qt::ConnectionType type = Qt::AutoConnection);
 
 signals:
-    void integerChanged (int64_t);
+    void integerChanged (qlonglong);
 };
 
 class QVLCBool : public QVLCVariable