From e33d94fecd272db4bf542541c069e9e2c168c1d5 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Fri, 15 Feb 2019 22:48:41 -0800
Subject: Moved NativeApp to Diligent namespace

---
 Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h | 2 +-
 Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m | 6 +++---
 Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Common/NativeApp/Apple/Source')

diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h
index 1931c69..ed9ebe4 100644
--- a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h
+++ b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h
@@ -34,7 +34,7 @@
 -(void)initApp:(NSView*) view;
 -(void)destroyApp;
 -(NSString*)getError;
--(NativeAppBase*)lockApp;
+-(Diligent::NativeAppBase*)lockApp;
 -(void)unlockApp;
 -(void)stopDisplayLink;
 -(void)startDisplayLink;
diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m
index 6f138c7..4e8d292 100644
--- a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m
+++ b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m
@@ -28,7 +28,7 @@
 
 @implementation ViewBase
 {
-    std::unique_ptr<NativeAppBase> _theApp;
+    std::unique_ptr<Diligent::NativeAppBase> _theApp;
     std::string _error;
     NSRecursiveLock* appLock;
 }
@@ -41,7 +41,7 @@
 {
     [super awakeFromNib];
 
-    _theApp.reset(CreateApplication());
+    _theApp.reset(Diligent::CreateApplication());
 
     // [self window] is nil here
     auto* mainWindow = [[NSApplication sharedApplication] mainWindow];
@@ -66,7 +66,7 @@
     }
 }
 
--(NativeAppBase*)lockApp
+-(Diligent::NativeAppBase*)lockApp
 {
     [appLock lock];
     return _theApp.get();
diff --git a/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m b/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m
index 9ddb5f4..9120e99 100644
--- a/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m
+++ b/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m
@@ -14,7 +14,7 @@
 
 @interface EAGLView ()
 {
-    std::unique_ptr<NativeAppBase> _theApp;
+    std::unique_ptr<Diligent::NativeAppBase> _theApp;
     EAGLContext* _context;
     NSInteger _animationFrameInterval;
     CADisplayLink* _displayLink;
@@ -52,7 +52,7 @@
 		
         try
         {
-            _theApp.reset(CreateApplication());
+            _theApp.reset(Diligent::CreateApplication());
             // Init our renderer.
             _theApp->OnGLContextCreated((__bridge void*)self.layer);
         }
-- 
cgit v1.2.3