App->Application; Use class namespace by default; Misc fixes

1 files changed, 6 insertions, 6 deletions

diff --git a/dgl/Window.hpp b/dgl/Window.hpp
index baefb0ad..3e1f75cb 100644
--- a/dgl/Window.hpp
+++ b/dgl/Window.hpp
@@ -23,7 +23,7 @@ START_NAMESPACE_DGL
 
 // -----------------------------------------------------------------------
 
-class App;
+class Application;
 class Widget;
 class StandaloneWindow;
 
@@ -67,9 +67,9 @@ public:
               buttons() {}
     };
 
-    explicit Window(App& app);
-    explicit Window(App& app, Window& parent);
-    explicit Window(App& app, intptr_t parentId);
+    explicit Window(Application& app);
+    explicit Window(Application& app, Window& parent);
+    explicit Window(Application& app, intptr_t parentId);
     virtual ~Window();
 
     void show();
@@ -99,7 +99,7 @@ public:
 
     void setTransientWinId(uintptr_t winId);
 
-    App& getApp() const noexcept;
+    Application& getApp() const noexcept;
     intptr_t getWindowId() const noexcept;
 
     void addIdleCallback(IdleCallback* const callback);
@@ -116,7 +116,7 @@ protected:
 private:
     struct PrivateData;
     PrivateData* const pData;
-    friend class App;
+    friend class Application;
     friend class Widget;
     friend class StandaloneWindow;