From d1040daec5280c274e199868bf83f95e339ad34a Mon Sep 17 00:00:00 2001 From: Robert Knight Date: Sun, 13 Jan 2008 01:16:12 +0000 Subject: [PATCH] Revert part of #760591 which was committed unintentionally. svn path=/trunk/KDE/kdebase/apps/konsole/; revision=760592 --- src/HistorySizeDialog.cpp | 10 +--------- src/HistorySizeDialog.h | 7 +------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/HistorySizeDialog.cpp b/src/HistorySizeDialog.cpp index 35879a366..d85664e8f 100644 --- a/src/HistorySizeDialog.cpp +++ b/src/HistorySizeDialog.cpp @@ -23,7 +23,6 @@ // Qt #include #include -#include #include #include #include @@ -100,11 +99,8 @@ HistorySizeDialog::HistorySizeDialog( QWidget* parent ) _fixedHistoryButton->click(); _fixedHistoryButton->setFocus( Qt::OtherFocusReason ); - _useInNewTerminalsCheck = new QCheckBox(i18n("Use this setting in new terminals"),this); - dialogLayout->addSpacing(20); - dialogLayout->addWidget(_useInNewTerminalsCheck); - connect(this,SIGNAL(defaultClicked()),this,SLOT(useDefaults())); + connect(this,SIGNAL(accepted()),this,SLOT(emitOptionsChanged())); } @@ -113,10 +109,6 @@ void HistorySizeDialog::emitOptionsChanged() emit optionsChanged( mode() , lineCount() ); } -bool HistorySizeDialog::useInNewTerminals() const -{ - return _useInNewTerminalsCheck->isChecked(); -} void HistorySizeDialog::setDefaultMode( HistoryMode mode ) { _defaultMode = mode; } HistorySizeDialog::HistoryMode HistorySizeDialog::defaultMode() const { return _defaultMode; } void HistorySizeDialog::setDefaultLineCount( int count ) { _defaultLineCount = count; } diff --git a/src/HistorySizeDialog.h b/src/HistorySizeDialog.h index 3a53336b2..8ff2a9c40 100644 --- a/src/HistorySizeDialog.h +++ b/src/HistorySizeDialog.h @@ -95,9 +95,6 @@ public: /** Returns the default line count, as set with setDefaultLineCount() */ int defaultLineCount() const; - /** Returns true if the "Use this setting in new terminals" check box is checked. */ - bool useInNewTerminals() const; - signals: /** * Emitted when the user changes the scroll-back mode or line count and @@ -122,9 +119,7 @@ private: QAbstractButton* _noHistoryButton; QAbstractButton* _fixedHistoryButton; QAbstractButton* _unlimitedHistoryButton; - QAbstractButton* _useInNewTerminalsCheck; - - QSpinBox* _lineCountBox; + QSpinBox* _lineCountBox; HistoryMode _defaultMode; int _defaultLineCount;