From 6396659c2be599579647f0edc703656ccea1980c Mon Sep 17 00:00:00 2001 From: Gustavo Carneiro Date: Wed, 15 Jul 2020 19:19:46 -0300 Subject: [PATCH] Move HistoryTypeNone Class to a new file. --- src/CMakeLists.txt | 1 + src/History.cpp | 20 ------------------- src/History.h | 13 ++----------- src/HistoryTypeNone.cpp | 42 ++++++++++++++++++++++++++++++++++++++++ src/HistoryTypeNone.h | 43 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 31 deletions(-) create mode 100644 src/HistoryTypeNone.cpp create mode 100644 src/HistoryTypeNone.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d92af99d..60654a12 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -83,6 +83,7 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS} CompactHistoryLine.cpp CompactHistoryScroll.cpp HistoryType.cpp + HistoryTypeNone.cpp HistorySizeDialog.cpp widgets/HistorySizeWidget.cpp widgets/IncrementalSearchBar.cpp diff --git a/src/History.cpp b/src/History.cpp index 93fb01ac..810bc421 100644 --- a/src/History.cpp +++ b/src/History.cpp @@ -60,26 +60,6 @@ using namespace Konsole; at constant costs. */ -HistoryTypeNone::HistoryTypeNone() = default; - -bool HistoryTypeNone::isEnabled() const -{ - return false; -} - -HistoryScroll *HistoryTypeNone::scroll(HistoryScroll *old) const -{ - delete old; - return new HistoryScrollNone(); -} - -int HistoryTypeNone::maximumLineCount() const -{ - return 0; -} - -////////////////////////////// - HistoryTypeFile::HistoryTypeFile() = default; bool HistoryTypeFile::isEnabled() const diff --git a/src/History.h b/src/History.h index 762751ad..742b4946 100644 --- a/src/History.h +++ b/src/History.h @@ -41,7 +41,9 @@ #include "CompactHistoryBlockList.h" #include "CompactHistoryLine.h" #include "CompactHistoryScroll.h" + #include "HistoryType.h" +#include "HistoryTypeNone.h" // Konsole #include "Character.h" @@ -54,17 +56,6 @@ namespace Konsole { // where history lines are allocated in (avoids heap fragmentation) ////////////////////////////////////////////////////////////////////// -class KONSOLEPRIVATE_EXPORT HistoryTypeNone : public HistoryType -{ -public: - HistoryTypeNone(); - - bool isEnabled() const override; - int maximumLineCount() const override; - - HistoryScroll *scroll(HistoryScroll *) const override; -}; - class KONSOLEPRIVATE_EXPORT HistoryTypeFile : public HistoryType { public: diff --git a/src/HistoryTypeNone.cpp b/src/HistoryTypeNone.cpp new file mode 100644 index 00000000..5ee516bd --- /dev/null +++ b/src/HistoryTypeNone.cpp @@ -0,0 +1,42 @@ +/* + This file is part of Konsole, an X terminal. + Copyright 1997,1998 by Lars Doelle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. +*/ + +#include "HistoryTypeNone.h" +#include "HistoryScrollNone.h" + +using namespace Konsole; + +HistoryTypeNone::HistoryTypeNone() = default; + +bool HistoryTypeNone::isEnabled() const +{ + return false; +} + +HistoryScroll *HistoryTypeNone::scroll(HistoryScroll *old) const +{ + delete old; + return new HistoryScrollNone(); +} + +int HistoryTypeNone::maximumLineCount() const +{ + return 0; +} diff --git a/src/HistoryTypeNone.h b/src/HistoryTypeNone.h new file mode 100644 index 00000000..28bebab8 --- /dev/null +++ b/src/HistoryTypeNone.h @@ -0,0 +1,43 @@ +/* + This file is part of Konsole, an X terminal. + Copyright 1997,1998 by Lars Doelle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. +*/ + +#ifndef HISTORYTYPENONE_H +#define HISTORYTYPENONE_H + +#include "HistoryType.h" +#include "konsoleprivate_export.h" + +namespace Konsole +{ + +class KONSOLEPRIVATE_EXPORT HistoryTypeNone : public HistoryType +{ +public: + HistoryTypeNone(); + + bool isEnabled() const override; + int maximumLineCount() const override; + + HistoryScroll *scroll(HistoryScroll *) const override; +}; + +} + +#endif