[vlc-devel] [PATCH 13/14] Qt: rename intf to p_intf

[Thomas Guillem]

Since helpers use p_intf.
---
 modules/gui/qt4/dialogs/external.cpp | 16 ++++++++--------
 modules/gui/qt4/dialogs/external.hpp |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp
index 39164a9..6a5d94f 100644
--- a/modules/gui/qt4/dialogs/external.cpp
+++ b/modules/gui/qt4/dialogs/external.cpp
@@ -39,14 +39,14 @@
 #include <QTimer>
 
 DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent)
-    : QObject( _parent ), intf (p_intf),
+    : QObject( _parent ), p_intf (p_intf),
       critical (VLC_OBJECT(p_intf), "dialog-critical"),
       login (VLC_OBJECT(p_intf), "dialog-login"),
       question (VLC_OBJECT(p_intf), "dialog-question"),
       progressBar (VLC_OBJECT(p_intf), "dialog-progress-bar")
 {
-    var_Create (intf, "dialog-error", VLC_VAR_ADDRESS);
-    var_AddCallback (intf, "dialog-error", error, this);
+    var_Create (p_intf, "dialog-error", VLC_VAR_ADDRESS);
+    var_AddCallback (p_intf, "dialog-error", error, this);
     connect (this, SIGNAL(error(const QString &, const QString &)),
              SLOT(displayError(const QString &, const QString &)));
 
@@ -59,15 +59,15 @@ DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent)
     progressBar.addCallback(this, SLOT(startProgressBar(void *)),
                             Qt::BlockingQueuedConnection);
 
-    dialog_Register (intf);
+    dialog_Register (p_intf);
 }
 
 DialogHandler::~DialogHandler (void)
 {
-    dialog_Unregister (intf);
+    dialog_Unregister (p_intf);
 
-    var_DelCallback (intf, "dialog-error", error, this);
-    var_Destroy (intf, "dialog-error");
+    var_DelCallback (p_intf, "dialog-error", error, this);
+    var_Destroy (p_intf, "dialog-error");
 }
 
 int DialogHandler::error (vlc_object_t *obj, const char *,
@@ -83,7 +83,7 @@ int DialogHandler::error (vlc_object_t *obj, const char *,
 
 void DialogHandler::displayError (const QString& title, const QString& message)
 {
-    ErrorsDialog::getInstance (intf)->addError(title, message);
+    ErrorsDialog::getInstance (p_intf)->addError(title, message);
 }
 
 void DialogHandler::displayCritical (void *value)
diff --git a/modules/gui/qt4/dialogs/external.hpp b/modules/gui/qt4/dialogs/external.hpp
index 99fe60f..1a8fe68 100644
--- a/modules/gui/qt4/dialogs/external.hpp
+++ b/modules/gui/qt4/dialogs/external.hpp
@@ -43,7 +43,7 @@ public:
     virtual ~DialogHandler (void);
 
 private:
-    intf_thread_t *intf;
+    intf_thread_t *p_intf;
     static int error (vlc_object_t *, const char *, vlc_value_t, vlc_value_t,
                       void *);
     QVLCPointer critical;
-- 
2.1.4