diff options
| author | Elvis Angelaccio <[email protected]> | 2019-01-28 22:38:21 +0100 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2019-01-28 22:38:21 +0100 |
| commit | 8bc93b564c283a677e02dc2ac71b40b63a990e38 (patch) | |
| tree | b0838ad5e265d42dd5da7f8ff58532aac95daca4 /src/settings | |
| parent | 52c019c9cbf679af5c24438bbe840ef890ae3f92 (diff) | |
Introduce HAVE_TERMINAL
Source code should check for features detected during configure-time,
rather than checking for a specific OS.
See also commit 87e8d0ba5f.
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/general/confirmationssettingspage.cpp | 24 | ||||
| -rw-r--r-- | src/settings/general/confirmationssettingspage.h | 5 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index 27e4ab662..1d0eebdd3 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -41,9 +41,9 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : m_confirmEmptyTrash(nullptr), m_confirmDelete(nullptr), - #ifndef Q_OS_WIN +#ifdef HAVE_TERMINAL m_confirmClosingTerminalRunningProgram(nullptr), - #endif +#endif m_confirmClosingMultipleTabs(nullptr) { @@ -67,10 +67,10 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation in Dolphin when", "Closing windows with multiple tabs"), this); - #ifndef Q_OS_WIN +#ifdef HAVE_TERMINAL m_confirmClosingTerminalRunningProgram = new QCheckBox(i18nc("@option:check Ask for confirmation when", "Closing windows with a program running in the Terminal panel"), this); - #endif +#endif topLayout->addWidget(confirmLabelKde); topLayout->addWidget(m_confirmMoveToTrash); @@ -81,9 +81,9 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : topLayout->addWidget(confirmLabelDolphin); topLayout->addWidget(m_confirmClosingMultipleTabs); - #ifndef Q_OS_WIN +#ifdef HAVE_TERMINAL topLayout->addWidget(m_confirmClosingTerminalRunningProgram); - #endif +#endif topLayout->addStretch(); @@ -95,9 +95,9 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : connect(m_confirmScriptExecution, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed); connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed); - #ifndef Q_OS_WIN +#ifdef HAVE_TERMINAL connect(m_confirmClosingTerminalRunningProgram, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed); - #endif +#endif } ConfirmationsSettingsPage::~ConfirmationsSettingsPage() @@ -123,9 +123,9 @@ void ConfirmationsSettingsPage::applySettings() GeneralSettings* settings = GeneralSettings::self(); settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked()); - #ifndef Q_OS_WIN +#ifdef HAVE_TERMINAL settings->setConfirmClosingTerminalRunningProgram(m_confirmClosingTerminalRunningProgram->isChecked()); - #endif +#endif settings->save(); } @@ -157,8 +157,8 @@ void ConfirmationsSettingsPage::loadSettings() m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs()); - #ifndef Q_OS_WIN +#ifdef HAVE_TERMINAL m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram()); - #endif +#endif } diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h index a96af554d..52b101b2a 100644 --- a/src/settings/general/confirmationssettingspage.h +++ b/src/settings/general/confirmationssettingspage.h @@ -19,6 +19,7 @@ #ifndef CONFIRMATIONSSETTINGSPAGE_H #define CONFIRMATIONSSETTINGSPAGE_H +#include "config-terminal.h" #include "settings/settingspagebase.h" class QCheckBox; @@ -48,9 +49,9 @@ private: QCheckBox* m_confirmEmptyTrash; QCheckBox* m_confirmDelete; - #ifndef Q_OS_WIN +#ifdef HAVE_TERMINAL QCheckBox* m_confirmClosingTerminalRunningProgram; - #endif +#endif QCheckBox* m_confirmClosingMultipleTabs; QCheckBox* m_confirmScriptExecution; |
