[vlc-commits] Qt: s/Qt4/Qt

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 19 14:54:22 2014 +0200| [b70cb5b95189cf0a69bccf974600cd4e578cc19f] | committer: Jean-Baptiste Kempf

Qt: s/Qt4/Qt

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

 modules/gui/qt4/HACKING                                |    6 +++---
 modules/gui/qt4/components/playlist/playlist_model.hpp |    2 +-
 modules/gui/qt4/main_interface.cpp                     |    6 +++---
 modules/gui/qt4/qt4.cpp                                |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt4/HACKING b/modules/gui/qt4/HACKING
index 4201902..bb642ca 100644
--- a/modules/gui/qt4/HACKING
+++ b/modules/gui/qt4/HACKING
@@ -1,6 +1,6 @@
 Small Hacking file for the Qt Interface
 
-If you ever code for Qt4 interface, please read this before.
+If you ever code for Qt interface, please read this before.
 
 ** Code Convetions **
 
@@ -18,7 +18,7 @@ Refer to http://wiki.videolan.org/Code_Conventions it should be up to date
 
 - VLC include/*.h includes
 - Other VLC .h includes (gruiking :D)
-- Qt4 module includes
+- Qt module includes
 - Qt includes
 
 ** Naming **
@@ -43,7 +43,7 @@ So if your dialog is a dialog you are used to keep during a playing of a video,
 QVLCFrame: extended panel, messages...
 QVLCDialog: preferences, open...
 
-** HIG for Qt4 **
+** HIG for Qt **
 We tend to use GNOME/KDE specs over Vista ones for capitalizations:
 We use Header for:
  - Menu
diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index 3739c63..1369eec 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -56,7 +56,7 @@ public:
              playlist_item_t *, QObject *parent = 0 );
     virtual ~PLModel();
 
-    /* Qt4 main PLModel */
+    /* Qt main PLModel */
     static PLModel* getPLModel( intf_thread_t *p_intf )
     {
         if(!p_intf->p_sys->pl_model )
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 98908c3..e60c445 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -640,8 +640,8 @@ void MainInterface::toggleFSC()
 
 /**
  * NOTE:
- * You must not change the state of this object or other Qt4 UI objects,
- * from the video output thread - only from the Qt4 UI main loop thread.
+ * You must not change the state of this object or other Qt UI objects,
+ * from the video output thread - only from the Qt UI main loop thread.
  * All window provider queries must be handled through signals or events.
  * That's why we have all those emit statements...
  */
@@ -691,7 +691,7 @@ void MainInterface::releaseVideoSlot( void )
 {
     /* This function is called when the embedded video window is destroyed,
      * or in the rare case that the embedded window is still here but the
-     * Qt4 interface exits. */
+     * Qt interface exits. */
     assert( videoWidget );
     videoWidget->release();
     setVideoOnTop( false );
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index b27bb81..a28b0fa 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -704,9 +704,9 @@ static void WindowClose( vout_window_t *p_wnd )
     QMutexLocker locker (&lock);
 
     /* Normally, the interface terminates after the video. In the contrary, the
-     * Qt4 main loop is gone, so we cannot send any event to the user interface
-     * widgets. Ideally, we would keep the Qt4 main loop running until after
-     * the video window is released. But it is far simpler to just have the Qt4
+     * Qt main loop is gone, so we cannot send any event to the user interface
+     * widgets. Ideally, we would keep the Qt main loop running until after
+     * the video window is released. But it is far simpler to just have the Qt
      * thread destroy the window early, and to turn this function into a stub.
      *
      * That assumes the video output will behave sanely if it window is
diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp
old mode 100755
new mode 100644