Revert be2338ff0 (intended just to reduce warnings)

- keep the calamaresstyle formatting changes,
 - drop shadowing and nullptr changes.

FIXES #805
This commit is contained in:
Adriaan de Groot 2017-09-18 15:10:13 +02:00
parent a14e98ce95
commit ddb6455365
6 changed files with 67 additions and 57 deletions

View file

@ -24,7 +24,8 @@
class QPluginLoader;
namespace Calamares {
namespace Calamares
{
class ViewStep;
@ -43,7 +44,7 @@ protected:
private:
friend class Module; //so only the superclass can instantiate
explicit ViewModule();
virtual ~ViewModule() override;
virtual ~ViewModule();
QPluginLoader* m_loader;
ViewStep* m_viewStep = nullptr;