diff options
author | falkTX <falktx@gmail.com> | 2015-05-05 13:27:18 +0200 |
---|---|---|
committer | falkTX <falktx@gmail.com> | 2015-05-05 13:27:18 +0200 |
commit | 12061de4cadc1e04572adcafe8c6cbfdb23cdb5c (patch) | |
tree | 27ef89d8fb06083dd8a6719be8bdb1a7b0059e2f /dgl/StandaloneWindow.hpp | |
parent | 8d66fbcd2666624a01efa5f90048d7d868064976 (diff) |
App->Application; Use class namespace by default; Misc fixes
Diffstat (limited to 'dgl/StandaloneWindow.hpp')
-rw-r--r-- | dgl/StandaloneWindow.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dgl/StandaloneWindow.hpp b/dgl/StandaloneWindow.hpp index 5cb4217c..0a510413 100644 --- a/dgl/StandaloneWindow.hpp +++ b/dgl/StandaloneWindow.hpp @@ -17,7 +17,7 @@ #ifndef DGL_STANDALONE_WINDOW_HPP_INCLUDED #define DGL_STANDALONE_WINDOW_HPP_INCLUDED -#include "App.hpp" +#include "Application.hpp" #include "Widget.hpp" #include "Window.hpp" @@ -25,19 +25,19 @@ START_NAMESPACE_DGL // ----------------------------------------------------------------------- -class StandaloneWindow : public App, +class StandaloneWindow : public Application, public Window { public: StandaloneWindow() - : App(), - Window((App&)*this), + : Application(), + Window((Application&)*this), fWidget(nullptr) {} void exec() { Window::show(); - App::exec(); + Application::exec(); } protected: |