# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268571125 0
# Node ID 3346ae8c7c53b943017a4c8c8c9a266e32e385d2
# Parent  32e38c512cabd92d78478711461238d5f0174608# Parent  1e6bfc80a381c554f9bb580c7630dece67d9e6c2
Catch up from PDK_3.0.h

diff -r 1e6bfc80a381 -r 3346ae8c7c53 usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h	Sat Feb 27 16:52:41 2010 +0000
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h	Sun Mar 14 12:52:05 2010 +0000
@@ -50,8 +50,8 @@
 	* @param aOwner
 	* @return Instance of CPamEngine
 	*/
-	static CPamEngine* CPamEngine::NewL( CPamPlugin* aOwner );
-						   
+	static CPamEngine* NewL( CPamPlugin* aOwner );
+
 	/**
 	* Two-phased contructor
 	* @param aOwner
diff -r 1e6bfc80a381 -r 3346ae8c7c53 usbengines/usbdevcon/inc/cusbdevcon.h
--- a/usbengines/usbdevcon/inc/cusbdevcon.h	Sat Feb 27 16:52:41 2010 +0000
+++ b/usbengines/usbdevcon/inc/cusbdevcon.h	Sun Mar 14 12:52:05 2010 +0000
@@ -136,6 +136,8 @@
      */ 
      TInt RunError( TInt /*aError*/ );
 
+    void Destroy();
+
 private: // data
 
     /**
diff -r 1e6bfc80a381 -r 3346ae8c7c53 usbengines/usbdevcon/src/cusbdevcon.cpp
--- a/usbengines/usbdevcon/src/cusbdevcon.cpp	Sat Feb 27 16:52:41 2010 +0000
+++ b/usbengines/usbdevcon/src/cusbdevcon.cpp	Sun Mar 14 12:52:05 2010 +0000
@@ -114,7 +114,7 @@
 // Destruction
 // ---------------------------------------------------------------------------
 //
-CUsbDevCon::~CUsbDevCon()
+void CUsbDevCon::Destroy()
     {
         FLOG( _L( "[USBDEVCON]\tCUsbDevCon::~CUsbDevCon" ) );
         
@@ -152,6 +152,11 @@
     
     }   
 
+CUsbDevCon::~CUsbDevCon()
+    {
+       Destroy();
+    }
+
 // ---------------------------------------------------------------------------
 // Acts accordingly to USB state
 // ---------------------------------------------------------------------------
@@ -261,7 +266,7 @@
         FLOG( _L( "[USBDEVCON]\tCUsbDevCon::RunL Exiting usbdevcon" ) );      
         
         // Shutdown timer is finished, exit program
-        CUsbDevCon:: ~CUsbDevCon(); // destruct resources
+        Destroy(); // destruct resources
         User::Exit(KErrNone);
         }
     }
diff -r 1e6bfc80a381 -r 3346ae8c7c53 usbengines/usbwatcher/inc/debug.h
--- a/usbengines/usbwatcher/inc/debug.h	Sat Feb 27 16:52:41 2010 +0000
+++ b/usbengines/usbwatcher/inc/debug.h	Sun Mar 14 12:52:05 2010 +0000
@@ -109,13 +109,13 @@
 #define LOG( str ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] %s",\
         TUint(RThread().Id()), str  ); }
 
-#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s ,\
+#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s ,\
         TUint(RThread().Id()), v ); }
 
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s , \
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s , \
         TUint(RThread().Id()), v1, v2 ); }
 
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s, \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s, \
         TUint(RThread().Id()), v1, v2, v3); }
 
 class TFuncLogger