UIQ3 update, some makefile unification, rm old configs, stuff

[picodrive.git] / platform / uiq3 / App.h

diff --git a/platform/uiq3/App.h b/platform/uiq3/App.h
index 9dcb572..2c1543f 100644 (file)
--- a/platform/uiq3/App.h
+++ b/platform/uiq3/App.h
@@ -20,10 +20,10 @@
 #include <coemain.h>\r
 \r
 #include <qikappui.h>\r
-#include <QikApplication.h>\r
-#include <QikViewBase.h>\r
+#include <qikapplication.h>\r
+#include <qikviewbase.h>\r
 //#include <eikapp.h>\r
-#include <QikDocument.h>\r
+#include <qikdocument.h>\r
 \r
 #include "Engine.h"\r
 #include "picodrive.hrh"\r
@@ -41,11 +41,12 @@ const TUid KUidPicolStore    = { 0x00000011 }; // store stream UID
 //};\r
 \r
 \r
+extern "C" struct _currentConfig_t;\r
 \r
 class CPicolAppView : public CQikViewBase\r
 {\r
 public:\r
-       static CPicolAppView* NewLC(CQikAppUi& aAppUi, TPicoConfig& aCurrentConfig);\r
+       static CPicolAppView* NewLC(CQikAppUi& aAppUi, TPicoConfig &aCurrentConfig);\r
        ~CPicolAppView();\r
 \r
        // from CQikViewBase\r
@@ -53,12 +54,12 @@ public:
        void HandleCommandL(CQikCommand& aCommand);\r
        void UpdateCommandList();\r
 \r
-protected: \r
+protected:\r
        // from CQikViewBase\r
        void ViewConstructL();\r
-       \r
+\r
 private:\r
-       CPicolAppView(CQikAppUi& aAppUi, TPicoConfig& aCurrentConfig);\r
+       CPicolAppView(CQikAppUi& aAppUi, TPicoConfig &aCurrentConfig);\r
        void ConstructL();\r
 \r
 protected:             // new stuf\r
@@ -71,7 +72,7 @@ protected:            // new stuf
        void RunGameL();*/\r
 \r
 private:\r
-       TPicoConfig&            iCurrentConfig;\r
+       TPicoConfig                     &iCurrentConfig;\r
        TBool                           iROMLoaded;\r
        TBool                           iTitleAdded;\r
 };\r
@@ -95,7 +96,7 @@ public:
        void StoreL(CStreamStore& aStore, CStreamDictionary& aStreamDic) const;\r
        void RestoreL(const CStreamStore& aStore, const CStreamDictionary& aStreamDic);\r
 \r
-       TPicoConfig                     iCurrentConfig;\r
+       TPicoConfig                     iCurrentConfig;\r
 \r
 private: // from CQikDocument\r
        CQikAppUi* CreateAppUiL();\r