[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2586: Whitespace cleanups on some of the UPnP code. (in vidalia: . branches/upnp/src/vidalia/config)



Author: edmanm
Date: 2008-05-19 21:52:22 -0400 (Mon, 19 May 2008)
New Revision: 2586

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h
Log:
 r331@thebe:  edmanm | 2008-05-19 21:53:02 -0400
 Whitespace cleanups on some of the UPnP code.



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

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-05-20 00:19:23 UTC (rev 2585)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-05-20 01:52:22 UTC (rev 2586)
@@ -24,6 +24,7 @@
 
 #include "upnpcontrolthread.h"
 
+
 UPNPControl* UPNPControl::pInstance = 0;
 UPNPControl* UPNPControl::Instance()
 {
@@ -47,13 +48,17 @@
   delete controlThread;
 }
 
-void UPNPControl::cleanup(){
+void
+UPNPControl::cleanup()
+{
   pInstance->controlThread->stop();
   delete pInstance;
   pInstance = 0;
 }  
 
-void UPNPControl::getDesiredState(quint16 *desiredDirPort, quint16 *desiredOrPort) {
+void
+UPNPControl::getDesiredState(quint16 *desiredDirPort, quint16 *desiredOrPort)
+{
   mutex->lock();
   *desiredDirPort = _forwardedDirPort;
   *desiredOrPort = _forwardedORPort;
@@ -61,7 +66,9 @@
   controlThread->wakeup();
 }
 
-void UPNPControl::setDesiredState(quint16 desiredDirPort, quint16 desiredOrPort) {
+void
+UPNPControl::setDesiredState(quint16 desiredDirPort, quint16 desiredOrPort)
+{
   mutex->lock();
   _forwardedDirPort = desiredDirPort;
   _forwardedORPort = desiredOrPort;

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h	2008-05-20 00:19:23 UTC (rev 2585)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.h	2008-05-20 01:52:22 UTC (rev 2586)
@@ -32,6 +32,7 @@
   static void cleanup();
   void getDesiredState(quint16 *desiredDirPort, quint16 *desiredOrPort);
   void setDesiredState(quint16 desiredDirPort, quint16 desiredOrPort);
+
 protected:
   UPNPControl();
   ~UPNPControl();
@@ -46,4 +47,5 @@
   UPNPControlThread *controlThread;
 };
 
-#endif 
+#endif
+