Merge docml changes and fix for bug 2169.
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h Fri Jun 11 14:38:00 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h Thu Jun 24 14:34:47 2010 +0100
@@ -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
--- a/usbengines/usbwatcher/inc/debug.h Fri Jun 11 14:38:00 2010 +0300
+++ b/usbengines/usbwatcher/inc/debug.h Thu Jun 24 14:34:47 2010 +0100
@@ -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