# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1288301232 -3600
# Node ID 56d23cf607953ec4715dd089740f8096aa121e38
# Parent  41f8256eb376ea36cc9c070e7a9bf0df0fc93674
Fixes for issues using #define with raptor

diff -r 41f8256eb376 -r 56d23cf60795 application/group/Podcast.mmp
--- a/application/group/Podcast.mmp	Thu Oct 28 18:44:18 2010 +0100
+++ b/application/group/Podcast.mmp	Thu Oct 28 22:27:12 2010 +0100
@@ -16,8 +16,7 @@
  *
  */
   
-// MPX integration can not be enabled for self signed versions 
-#define ENABLE_MPX_INTEGRATION
+#include "..\..\group\defines.h"
 
 TARGET			Podcast.exe
 TARGETTYPE  	exe
@@ -25,7 +24,6 @@
 
 #ifdef ENABLE_MPX_INTEGRATION
 CAPABILITY NetworkServices UserEnvironment WriteUserData ReadDeviceData WriteDeviceData MultimediaDD
-MACRO ENABLE_MPX_INTEGRATION
 #else
 CAPABILITY NetworkServices UserEnvironment
 #endif
@@ -43,6 +41,7 @@
 USERINCLUDE ..\..\engine\inc
 USERINCLUDE . 
 USERINCLUDE ..\inc
+USERINCLUDE ..\..\group
 
 SOURCEPATH ..\src
 SOURCE  Podcast.cpp
@@ -57,7 +56,6 @@
 SOURCE  PodcastFeedViewUpdater.cpp 
 SOURCE  PodcastQueueView.cpp
 
-
 SOURCEPATH ..\data
 
 START RESOURCE Podcast.rss
diff -r 41f8256eb376 -r 56d23cf60795 application/sis/make_s3_sis.cmd
--- a/application/sis/make_s3_sis.cmd	Thu Oct 28 18:44:18 2010 +0100
+++ b/application/sis/make_s3_sis.cmd	Thu Oct 28 22:27:12 2010 +0100
@@ -1,3 +1,3 @@
 del *.sis
-makesis -d\symbian\pdk3.0.2\ podcatcher_udeb.pkg
+makesis -d\symbian\3.0.3\ podcatcher_udeb.pkg
 signsis podcatcher_udeb.sis podcatcher_udeb_signed.sis podcast.cer podcast.key
diff -r 41f8256eb376 -r 56d23cf60795 engine/eabi/podcastengineu.def
--- a/engine/eabi/podcastengineu.def	Thu Oct 28 18:44:18 2010 +0100
+++ b/engine/eabi/podcastengineu.def	Thu Oct 28 22:27:12 2010 +0100
@@ -201,4 +201,8 @@
 	_ZN12PodcastUtils11IsVideoShowER7TDesC16 @ 200 NONAME
 	_ZN11CShowEngine15MoveDownloadUpLEj @ 201 NONAME
 	_ZN11CShowEngine17MoveDownloadDownLEj @ 202 NONAME
+	_ZN13CPodcastModelD0Ev @ 203 NONAME
+	_ZN13CPodcastModelD1Ev @ 204 NONAME
+	_ZN13CPodcastModelD2Ev @ 205 NONAME
+	_ZN17CConnectionEngine14RemoveObserverEP19MConnectionObserver @ 206 NONAME
 
diff -r 41f8256eb376 -r 56d23cf60795 engine/group/engine.mmp
--- a/engine/group/engine.mmp	Thu Oct 28 18:44:18 2010 +0100
+++ b/engine/group/engine.mmp	Thu Oct 28 22:27:12 2010 +0100
@@ -16,8 +16,7 @@
  *
  */
  
-// MPX integration can not be enabled for self signed versions 
-#define ENABLE_MPX_INTEGRATION
+#include "..\..\group\defines.h"
  
 TARGET podcastengine.dll
 TARGETTYPE DLL
@@ -25,12 +24,19 @@
 
 SOURCEPATH ..\src
 USERINCLUDE ..\inc
+USERINCLUDE ..\..\group
 SYSTEMINCLUDE \epoc32\include 
 SYSTEMINCLUDE \epoc32\include\mw
 SYSTEMINCLUDE \epoc32\include\platform
 SYSTEMINCLUDE \epoc32\include\platform\mw
 SYSTEMINCLUDE \epoc32\include\stdapis
 
+#ifdef ENABLE_MPX_INTEGRATION
+CAPABILITY NetworkServices UserEnvironment WriteUserData ReadDeviceData WriteDeviceData MultimediaDD
+#else
+CAPABILITY NetworkServices UserEnvironment
+#endif
+
 SOURCE			HttpClient.cpp
 SOURCE			HttpEventHandler.cpp 
 SOURCE			FeedParser.cpp 
@@ -78,10 +84,3 @@
 LIBRARY avkon.lib
 LIBRARY centralrepository.lib
 LIBRARY sysutil.lib 
-
-#ifdef ENABLE_MPX_INTEGRATION
-CAPABILITY NetworkServices UserEnvironment WriteUserData ReadDeviceData WriteDeviceData MultimediaDD
-MACRO ENABLE_MPX_INTEGRATION
-#else
-CAPABILITY NetworkServices UserEnvironment
-#endif
diff -r 41f8256eb376 -r 56d23cf60795 engine/inc/PodcastModel.h
--- a/engine/inc/PodcastModel.h	Thu Oct 28 18:44:18 2010 +0100
+++ b/engine/inc/PodcastModel.h	Thu Oct 28 22:27:12 2010 +0100
@@ -25,7 +25,7 @@
 #include <es_sock.h>
 #include <http/rhttpsession.h>
 #include <cmmanager.h>
-
+#include "defines.h"
 #include "FeedInfo.h"
 #include "ShowInfo.h"
 #include "debug.h"
diff -r 41f8256eb376 -r 56d23cf60795 engine/src/SettingsEngine.cpp
--- a/engine/src/SettingsEngine.cpp	Thu Oct 28 18:44:18 2010 +0100
+++ b/engine/src/SettingsEngine.cpp	Thu Oct 28 22:27:12 2010 +0100
@@ -21,6 +21,7 @@
 #include "SettingsEngine.h"
 #include "FeedEngine.h"
 #include "ShowEngine.h"
+#include "defines.h"
 
 const TUid KMainSettingsStoreUid = {0x1000};
 const TUid KMainSettingsUid = {0x1002};
diff -r 41f8256eb376 -r 56d23cf60795 engine/src/ShowEngine.cpp
--- a/engine/src/ShowEngine.cpp	Thu Oct 28 18:44:18 2010 +0100
+++ b/engine/src/ShowEngine.cpp	Thu Oct 28 22:27:12 2010 +0100
@@ -26,6 +26,7 @@
 #include <httperr.h>
 #include "debug.h"
 #include "PodcastUtils.h"
+#include "defines.h"
 
 #ifdef ENABLE_MPX_INTEGRATION 
 #include <mpxcollectionhelperfactory.h>