[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2635: Touch up the upnp code to be more consistent with the rest o (in vidalia: . branches/upnp/src/vidalia branches/upnp/src/vidalia/config)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2635: Touch up the upnp code to be more consistent with the rest o (in vidalia: . branches/upnp/src/vidalia branches/upnp/src/vidalia/config)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Sun, 1 Jun 2008 11:39:33 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Sun, 01 Jun 2008 11:39:38 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2008-06-01 11:39:32 -0400 (Sun, 01 Jun 2008)
New Revision: 2635

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/serversettings.cpp
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h
   vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
   vidalia/branches/upnp/src/vidalia/config/upnptestdialog.cpp
   vidalia/branches/upnp/src/vidalia/mainwindow.cpp
Log:
 r408@thebe:  edmanm | 2008-06-01 11:40:11 -0400
 Touch up the upnp code to be more consistent with the rest of Vidalia in
 terms of variable and method naming.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r408] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/src/vidalia/config/serversettings.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serversettings.cpp	2008-06-01 00:52:13 UTC (rev 2634)
+++ vidalia/branches/upnp/src/vidalia/config/serversettings.cpp	2008-06-01 15:39:32 UTC (rev 2635)
@@ -187,7 +187,7 @@
   if (!isServerEnabled() || !isDirectoryMirror())
     DirPort = 0;
 
-  UPNPControl *control = UPNPControl::Instance();
+  UPNPControl *control = UPNPControl::instance();
   control->setDesiredState(DirPort, ORPort);
 #endif
 }

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-06-01 00:52:13 UTC (rev 2634)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-06-01 15:39:32 UTC (rev 2635)
@@ -26,14 +26,14 @@
 #include "upnpcontrolthread.h"
 
 /** UPNPControl singleton instance. */
-UPNPControl* UPNPControl::pInstance = 0;
+UPNPControl* UPNPControl::_instance = 0;
 
 /** Returns a pointer to this object's singleton instance. */
-UPNPControl* UPNPControl::Instance()
+UPNPControl* UPNPControl::instance()
 {
-  if (0 == pInstance)
-    pInstance = new UPNPControl;
-  return pInstance;
+  if (0 == _instance)
+    _instance = new UPNPControl;
+  return _instance;
 }
 
 /** Constructor. Initializes and starts a thread in which all blocking UPnP
@@ -48,9 +48,9 @@
   qRegisterMetaType<UPNPControl::UPNPError>("UPNPControl::UPNPError");
   qRegisterMetaType<UPNPControl::UPNPState>("UPNPControl::UPNPState");
 
-  mutex = new QMutex();
-  controlThread = new UPNPControlThread(this);
-  controlThread->start();
+  _mutex = new QMutex();
+  _controlThread = new UPNPControlThread(this);
+  _controlThread->start();
 }
 
 /** Destructor. cleanup() should be called before the object is destroyed.
@@ -58,8 +58,8 @@
  */
 UPNPControl::~UPNPControl()
 {
-  delete mutex;
-  delete controlThread;
+  delete _mutex;
+  delete _controlThread;
 }
 
 /** Terminates the UPnP control thread and frees memory allocated to this
@@ -67,9 +67,9 @@
 void
 UPNPControl::cleanup()
 {
-  pInstance->controlThread->stop();
-  delete pInstance;
-  pInstance = 0;
+  _instance->_controlThread->stop();
+  delete _instance;
+  _instance = 0;
 }  
 
 /** Sets <b>desiredDirPort</b> and <b>desiredOrPort</b> to the currently
@@ -77,10 +77,10 @@
 void
 UPNPControl::getDesiredState(quint16 *desiredDirPort, quint16 *desiredOrPort)
 {
-  mutex->lock();
+  _mutex->lock();
   *desiredDirPort = _forwardedDirPort;
   *desiredOrPort = _forwardedORPort;
-  mutex->unlock();
+  _mutex->unlock();
 }
 
 /** Sets the desired DirPort and ORPort port mappings to <b>desiredDirPort</b>
@@ -88,11 +88,12 @@
 void
 UPNPControl::setDesiredState(quint16 desiredDirPort, quint16 desiredOrPort)
 {
-  mutex->lock();
+  _mutex->lock();
   _forwardedDirPort = desiredDirPort;
   _forwardedORPort = desiredOrPort;
-  mutex->unlock();
-  controlThread->wakeup();
+  _mutex->unlock();
+  
+  _controlThread->wakeup();
 }
 
 /** Sets the most recent UPnP-related error to <b>error</b> and emits the
@@ -100,9 +101,9 @@
 void
 UPNPControl::setError(UPNPError upnpError)
 {
-  mutex->lock();
+  _mutex->lock();
   _error = upnpError;
-  mutex->unlock();
+  _mutex->unlock();
   
   emit error(upnpError);
 }
@@ -112,9 +113,9 @@
 void
 UPNPControl::setState(UPNPState state)
 {
-  mutex->lock();
+  _mutex->lock();
   _state = state;
-  mutex->unlock();
+  _mutex->unlock();
 
   emit stateChanged(state);
 }
@@ -123,7 +124,7 @@
 UPNPControl::UPNPError
 UPNPControl::error() const
 {
-  QMutexLocker locker(mutex);
+  QMutexLocker locker(_mutex);
   return _error;
 }
 

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h	2008-06-01 00:52:13 UTC (rev 2634)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h	2008-06-01 15:39:32 UTC (rev 2635)
@@ -51,7 +51,7 @@
   };
 
   /** Returns a pointer to this object's singleton instance. */
-  static UPNPControl* Instance();
+  static UPNPControl* instance();
   /** Terminates the UPnP control thread and frees memory allocated to this
    * object's singleton instance. */
   static void cleanup();
@@ -98,16 +98,16 @@
   void setState(UPNPState state);
 
 private:
-  static UPNPControl* pInstance; /**< UPNPControl singleton instance. */
+  static UPNPControl* _instance; /**< UPNPControl singleton instance. */
 
   quint16 _forwardedORPort; /**< Currently forwarded ORPort. */
   quint16 _forwardedDirPort; /**< Currently forwarded DirPort. */
-  QMutex *mutex; /**< Mutex around variables shared with UPNPControlThread. */
+  QMutex* _mutex; /**< Mutex around variables shared with UPNPControlThread. */
   UPNPError _error; /**< Most recent UPNP error. */
   UPNPState _state; /**< Current UPNP status. */
 
   friend class UPNPControlThread;
-  UPNPControlThread *controlThread; /**< Thread used for UPnP operations. */
+  UPNPControlThread* _controlThread; /**< Thread used for UPnP operations. */
 };
 
 #endif

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-06-01 00:52:13 UTC (rev 2634)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-06-01 15:39:32 UTC (rev 2635)
@@ -77,7 +77,7 @@
     _waitMutex->lock();
     if (_keepRunning) {
       /* We should continue */
-      UPNPControl::Instance()->setState(UPNPControl::IdleState);
+      UPNPControl::instance()->setState(UPNPControl::IdleState);
       _waitCondition->wait(_waitMutex, UPNPCONTROL_MAX_WAIT_MSEC);
 
       /* Maybe we were asked to exit while waiting */
@@ -124,7 +124,7 @@
   if (!force_init) {
     /* Configure DirPort */
     if (desiredDirPort != _dirPort) {
-      UPNPControl::Instance()->setState(UPNPControl::UpdatingDirPortState);
+      UPNPControl::instance()->setState(UPNPControl::UpdatingDirPortState);
       retval = updatePort(_dirPort, desiredDirPort);
       if (retval == UPNPControl::Success)
         _dirPort = desiredDirPort;
@@ -134,7 +134,7 @@
 
     /* Configure ORPort */
     if (desiredOrPort != _orPort) {
-      UPNPControl::Instance()->setState(UPNPControl::UpdatingORPortState);
+      UPNPControl::instance()->setState(UPNPControl::UpdatingORPortState);
       retval = updatePort(_orPort, desiredOrPort);
       if (retval == UPNPControl::Success)
         _orPort = desiredOrPort;
@@ -143,26 +143,26 @@
     }
   } else {
     /* Add the mapping even if they exist already */
-    UPNPControl::Instance()->setState(UPNPControl::UpdatingDirPortState);
+    UPNPControl::instance()->setState(UPNPControl::UpdatingDirPortState);
     retval = updatePort(0, desiredDirPort);
     if (retval == UPNPControl::Success)
       _dirPort = desiredDirPort;
     else
       goto err;
 
-    UPNPControl::Instance()->setState(UPNPControl::UpdatingORPortState);
+    UPNPControl::instance()->setState(UPNPControl::UpdatingORPortState);
     retval = updatePort(0, desiredOrPort);
     if (retval == UPNPControl::Success)
       _orPort = desiredOrPort;
     else goto err;
   }
 
-  UPNPControl::Instance()->setState(UPNPControl::ForwardingCompleteState);
+  UPNPControl::instance()->setState(UPNPControl::ForwardingCompleteState);
   return;
 
 err:
-  UPNPControl::Instance()->setError(retval);
-  UPNPControl::Instance()->setState(UPNPControl::ErrorState);
+  UPNPControl::instance()->setError(retval);
+  UPNPControl::instance()->setState(UPNPControl::ErrorState);
 }
 
 /** Terminates the UPnP control thread's run() loop.
@@ -249,7 +249,7 @@
   memset(&urls, 0, sizeof(struct UPNPUrls));
   memset(&data, 0, sizeof(struct IGDdatas));
 
-  UPNPControl::Instance()->setState(UPNPControl::DiscoverState);
+  UPNPControl::instance()->setState(UPNPControl::DiscoverState);
 
   devlist = upnpDiscover(UPNPCONTROL_DISCOVER_TIMEOUT, NULL, NULL);
   if (NULL == devlist) {

Modified: vidalia/branches/upnp/src/vidalia/config/upnptestdialog.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnptestdialog.cpp	2008-06-01 00:52:13 UTC (rev 2634)
+++ vidalia/branches/upnp/src/vidalia/config/upnptestdialog.cpp	2008-06-01 15:39:32 UTC (rev 2635)
@@ -24,7 +24,7 @@
   : QDialog(parent), _orPort(orPort), _dirPort(dirPort)
 {
   ui.setupUi(this);
-  _upnp = UPNPControl::Instance();
+  _upnp = UPNPControl::instance();
 
   ui.buttonBox->setStandardButtons(QDialogButtonBox::Close);
   
@@ -61,10 +61,10 @@
   ui.buttonBox->setEnabled(false);
   ui.progressBar->setValue(0);
 
-  connect(UPNPControl::Instance(), SIGNAL(stateChanged(UPNPControl::UPNPState)),
+  connect(UPNPControl::instance(), SIGNAL(stateChanged(UPNPControl::UPNPState)),
           this, SLOT(upnpStateChanged(UPNPControl::UPNPState)));
   
-  UPNPControl::Instance()->setDesiredState(_dirPort, _orPort);  
+  UPNPControl::instance()->setDesiredState(_dirPort, _orPort);  
 }
 
 /** Called when the UPnP test successfully enables port forwarding. Enables
@@ -75,7 +75,7 @@
   ui.buttonBox->setEnabled(true);
   ui.buttonBox->setStandardButtons(QDialogButtonBox::Close);
 
-  disconnect(UPNPControl::Instance(), 0, this, 0);
+  disconnect(UPNPControl::instance(), 0, this, 0);
 }
 
 /** Called when the UPnP test fails due to an error. Enables the Close and
@@ -87,7 +87,7 @@
   ui.buttonBox->setStandardButtons(QDialogButtonBox::Retry
                                      | QDialogButtonBox::Close);
   
-  disconnect(UPNPControl::Instance(), 0, this, 0);
+  disconnect(UPNPControl::instance(), 0, this, 0);
 }
 
 /** Updates the progress bar to indicate the device discovery portion of the
@@ -127,7 +127,7 @@
 
     case UPNPControl::ErrorState:
       ui.progressBar->setValue(ui.progressBar->maximum());
-      ui.lblCurrentState->setText(UPNPControl::Instance()->errorString());
+      ui.lblCurrentState->setText(UPNPControl::instance()->errorString());
       testFailed();
       break;
 

Modified: vidalia/branches/upnp/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-06-01 00:52:13 UTC (rev 2634)
+++ vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-06-01 15:39:32 UTC (rev 2635)
@@ -143,7 +143,7 @@
 
 #if defined(USE_MINIUPNPC)
   /* Catch UPnP-related signals */
-  connect(UPNPControl::Instance(), SIGNAL(error(UPNPControl::UPNPError)),
+  connect(UPNPControl::instance(), SIGNAL(error(UPNPControl::UPNPError)),
          this, SLOT(upnpError(UPNPControl::UPNPError)));
 #endif
Prev by Author: [vidalia-svn] r2807: Updated Finnish help (vidalia/trunk/src/vidalia/help/content/fi)
Next by Author: [vidalia-svn] r2636: Merge the built-in miniupnpc source from the upnp branch to (in vidalia: . trunk/src)
Next by thread: [vidalia-svn] r2636: Merge the built-in miniupnpc source from the upnp branch to (in vidalia: . trunk/src)
Index(es):
- Author
- Thread