Use nested namespaces (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-09-15 21:44:54 +01:00
parent 3f2e5b0b69
commit 57d32da826
1345 changed files with 146075 additions and 150376 deletions

View File

@@ -22,71 +22,68 @@ using namespace BlackMisc;
using namespace BlackGui;
using namespace BlackCore::Context;
namespace BlackGui
namespace BlackGui::Components
{
namespace Components
CApplicationCloseDialog::CApplicationCloseDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::CApplicationCloseDialog)
{
CApplicationCloseDialog::CApplicationCloseDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::CApplicationCloseDialog)
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui");
ui->setupUi(this);
this->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
this->initSettingsView();
ui->bb_ApplicationCloseDialog->button(QDialogButtonBox::Save)->setDefault(true);
connect(this, &CApplicationCloseDialog::accepted, this, &CApplicationCloseDialog::onAccepted);
connect(this, &CApplicationCloseDialog::rejected, this, &CApplicationCloseDialog::onRejected);
connect(ui->bb_ApplicationCloseDialog, &QDialogButtonBox::clicked, this, &CApplicationCloseDialog::buttonClicked);
}
CApplicationCloseDialog::~CApplicationCloseDialog()
{ }
void CApplicationCloseDialog::onAccepted()
{
const QModelIndexList indexes = ui->lv_UnsavedSettings->selectionModel()->selectedIndexes();
if (indexes.isEmpty()) { return; }
QStringList saveKeys;
const QList<int> rows = CGuiUtility::indexToUniqueRows(indexes);
for (int r : rows)
{
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui");
ui->setupUi(this);
this->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
this->initSettingsView();
ui->bb_ApplicationCloseDialog->button(QDialogButtonBox::Save)->setDefault(true);
connect(this, &CApplicationCloseDialog::accepted, this, &CApplicationCloseDialog::onAccepted);
connect(this, &CApplicationCloseDialog::rejected, this, &CApplicationCloseDialog::onRejected);
connect(ui->bb_ApplicationCloseDialog, &QDialogButtonBox::clicked, this, &CApplicationCloseDialog::buttonClicked);
const QString description = m_settingsDescriptions[r];
const QString key = m_settingsDictionary.key(description);
if (!key.isEmpty()) { saveKeys.append(key); }
}
if (saveKeys.isEmpty()) { return; }
const CStatusMessage msg = sApp->saveSettingsByKey(saveKeys);
if (msg.isFailure()) { CLogMessage::preformatted(msg); }
}
CApplicationCloseDialog::~CApplicationCloseDialog()
{ }
void CApplicationCloseDialog::onRejected()
{
// void
}
void CApplicationCloseDialog::onAccepted()
void CApplicationCloseDialog::buttonClicked(QAbstractButton *button)
{
if (button == ui->bb_ApplicationCloseDialog->button(QDialogButtonBox::Discard))
{
const QModelIndexList indexes = ui->lv_UnsavedSettings->selectionModel()->selectedIndexes();
if (indexes.isEmpty()) { return; }
QStringList saveKeys;
const QList<int> rows = CGuiUtility::indexToUniqueRows(indexes);
for (int r : rows)
{
const QString description = m_settingsDescriptions[r];
const QString key = m_settingsDictionary.key(description);
if (!key.isEmpty()) { saveKeys.append(key); }
}
if (saveKeys.isEmpty()) { return; }
const CStatusMessage msg = sApp->saveSettingsByKey(saveKeys);
if (msg.isFailure()) { CLogMessage::preformatted(msg); }
ui->lv_UnsavedSettings->clearSelection();
this->accept(); // fake accept with unselected items
}
}
void CApplicationCloseDialog::onRejected()
{
// void
}
void CApplicationCloseDialog::initSettingsView()
{
const CSettingsDictionary settingsDictionary(sApp->getIContextApplication()->getUnsavedSettingsKeysDescribed());
QStringList descriptions = settingsDictionary.values();
descriptions.sort();
QStringListModel *model = new QStringListModel(descriptions, this);
ui->lv_UnsavedSettings->setModel(model);
ui->lv_UnsavedSettings->selectAll();
void CApplicationCloseDialog::buttonClicked(QAbstractButton *button)
{
if (button == ui->bb_ApplicationCloseDialog->button(QDialogButtonBox::Discard))
{
ui->lv_UnsavedSettings->clearSelection();
this->accept(); // fake accept with unselected items
}
}
void CApplicationCloseDialog::initSettingsView()
{
const CSettingsDictionary settingsDictionary(sApp->getIContextApplication()->getUnsavedSettingsKeysDescribed());
QStringList descriptions = settingsDictionary.values();
descriptions.sort();
QStringListModel *model = new QStringListModel(descriptions, this);
ui->lv_UnsavedSettings->setModel(model);
ui->lv_UnsavedSettings->selectAll();
m_settingsDictionary = settingsDictionary;
m_settingsDescriptions = descriptions;
}
} // ns
m_settingsDictionary = settingsDictionary;
m_settingsDescriptions = descriptions;
}
} // ns