mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-19 03:45:30 +08:00
Use nested namespaces (C++17 feature)
This commit is contained in:
@@ -9,18 +9,15 @@
|
||||
#include "simulatoremulatedconfig.h"
|
||||
#include "simulatoremulatedconfigwidget.h"
|
||||
|
||||
namespace BlackSimPlugin
|
||||
namespace BlackSimPlugin::Emulated
|
||||
{
|
||||
namespace Emulated
|
||||
CSimulatorEmulatedConfig::CSimulatorEmulatedConfig(QObject *parent) : QObject(parent)
|
||||
{
|
||||
CSimulatorEmulatedConfig::CSimulatorEmulatedConfig(QObject *parent) : QObject(parent)
|
||||
{
|
||||
// void
|
||||
}
|
||||
// void
|
||||
}
|
||||
|
||||
BlackGui::CPluginConfigWindow *CSimulatorEmulatedConfig::createConfigWindow(QWidget *parent)
|
||||
{
|
||||
return new CSimulatorEmulatedConfigWidget(parent);
|
||||
}
|
||||
} // ns
|
||||
BlackGui::CPluginConfigWindow *CSimulatorEmulatedConfig::createConfigWindow(QWidget *parent)
|
||||
{
|
||||
return new CSimulatorEmulatedConfigWidget(parent);
|
||||
}
|
||||
} // ns
|
||||
|
||||
@@ -13,30 +13,27 @@
|
||||
|
||||
#include "blackgui/pluginconfig.h"
|
||||
|
||||
namespace BlackSimPlugin
|
||||
namespace BlackSimPlugin::Emulated
|
||||
{
|
||||
namespace Emulated
|
||||
/*!
|
||||
* Window for setting up the FSX plugin.
|
||||
*/
|
||||
class CSimulatorEmulatedConfig : public QObject, public BlackGui::IPluginConfig
|
||||
{
|
||||
/*!
|
||||
* Window for setting up the FSX plugin.
|
||||
*/
|
||||
class CSimulatorEmulatedConfig : public QObject, public BlackGui::IPluginConfig
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatoremulatedconfig.json")
|
||||
Q_INTERFACES(BlackGui::IPluginConfig)
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatoremulatedconfig.json")
|
||||
Q_INTERFACES(BlackGui::IPluginConfig)
|
||||
|
||||
public:
|
||||
//! Ctor
|
||||
CSimulatorEmulatedConfig(QObject *parent = nullptr);
|
||||
public:
|
||||
//! Ctor
|
||||
CSimulatorEmulatedConfig(QObject *parent = nullptr);
|
||||
|
||||
//! Dtor
|
||||
virtual ~CSimulatorEmulatedConfig() override {}
|
||||
//! Dtor
|
||||
virtual ~CSimulatorEmulatedConfig() override {}
|
||||
|
||||
//! \copydoc BlackGui::IPluginConfig::createConfigWindow()
|
||||
BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
|
||||
};
|
||||
} // ns
|
||||
//! \copydoc BlackGui::IPluginConfig::createConfigWindow()
|
||||
BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
|
||||
};
|
||||
} // ns
|
||||
|
||||
#endif // guard
|
||||
|
||||
@@ -11,20 +11,17 @@
|
||||
|
||||
using namespace BlackGui;
|
||||
|
||||
namespace BlackSimPlugin
|
||||
namespace BlackSimPlugin::Emulated
|
||||
{
|
||||
namespace Emulated
|
||||
CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) :
|
||||
BlackGui::CPluginConfigWindow(parent),
|
||||
ui(new Ui::CSimulatorEmulatedConfigWidget)
|
||||
{
|
||||
CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) :
|
||||
BlackGui::CPluginConfigWindow(parent),
|
||||
ui(new Ui::CSimulatorEmulatedConfigWidget)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
CGuiUtility::disableMinMaxCloseButtons(this);
|
||||
connect(ui->bb_Close, &QDialogButtonBox::rejected, this, &CSimulatorEmulatedConfigWidget::close);
|
||||
}
|
||||
ui->setupUi(this);
|
||||
CGuiUtility::disableMinMaxCloseButtons(this);
|
||||
connect(ui->bb_Close, &QDialogButtonBox::rejected, this, &CSimulatorEmulatedConfigWidget::close);
|
||||
}
|
||||
|
||||
CSimulatorEmulatedConfigWidget::~CSimulatorEmulatedConfigWidget()
|
||||
{ }
|
||||
} // ns
|
||||
CSimulatorEmulatedConfigWidget::~CSimulatorEmulatedConfigWidget()
|
||||
{ }
|
||||
} // ns
|
||||
|
||||
@@ -15,28 +15,25 @@
|
||||
#include <QScopedPointer>
|
||||
|
||||
namespace Ui { class CSimulatorEmulatedConfigWidget; }
|
||||
namespace BlackSimPlugin
|
||||
namespace BlackSimPlugin::Emulated
|
||||
{
|
||||
namespace Emulated
|
||||
/**
|
||||
* Configuration window for CSimulatorEmulatedConfig
|
||||
*/
|
||||
class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public BlackGui::CPluginConfigWindow
|
||||
{
|
||||
/**
|
||||
* Configuration window for CSimulatorEmulatedConfig
|
||||
*/
|
||||
class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public BlackGui::CPluginConfigWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
//! Ctor
|
||||
explicit CSimulatorEmulatedConfigWidget(QWidget *parent = nullptr);
|
||||
public:
|
||||
//! Ctor
|
||||
explicit CSimulatorEmulatedConfigWidget(QWidget *parent = nullptr);
|
||||
|
||||
//! Dtor
|
||||
virtual ~CSimulatorEmulatedConfigWidget();
|
||||
//! Dtor
|
||||
virtual ~CSimulatorEmulatedConfigWidget();
|
||||
|
||||
private:
|
||||
QScopedPointer <Ui::CSimulatorEmulatedConfigWidget> ui;
|
||||
};
|
||||
} // ns
|
||||
private:
|
||||
QScopedPointer <Ui::CSimulatorEmulatedConfigWidget> ui;
|
||||
};
|
||||
} // ns
|
||||
|
||||
#endif // guard
|
||||
|
||||
Reference in New Issue
Block a user