From 616db49e69c57a90c92eac7d49914aae83965d47 Mon Sep 17 00:00:00 2001 From: Gustavo Carneiro Date: Tue, 21 Jul 2020 23:47:27 -0300 Subject: [PATCH] Remove unused History.h and History.cpp files." --- src/CMakeLists.txt | 1 - src/CompactHistoryScroll.cpp | 2 +- src/History.cpp | 58 ---------------------------- src/History.h | 63 ------------------------------- src/HistoryScroll.cpp | 2 +- src/HistoryScrollFile.cpp | 3 +- src/HistoryScrollNone.cpp | 2 +- src/Screen.cpp | 3 +- src/autotests/HistoryTest.cpp | 6 ++- src/autotests/SessionTest.cpp | 1 - src/session/Session.cpp | 4 +- src/session/SessionController.cpp | 5 ++- src/session/SessionManager.cpp | 4 +- 13 files changed, 22 insertions(+), 132 deletions(-) delete mode 100644 src/History.cpp delete mode 100644 src/History.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d4d96a60..4e60b0a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,7 +72,6 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS} filterHotSpots/TerminalImageFilterChain.cpp filterHotSpots/UrlFilter.cpp filterHotSpots/UrlFilterHotspot.cpp - History.cpp HistoryFile.cpp HistoryScroll.cpp HistoryScrollFile.cpp diff --git a/src/CompactHistoryScroll.cpp b/src/CompactHistoryScroll.cpp index c1606b9b..95b20d02 100644 --- a/src/CompactHistoryScroll.cpp +++ b/src/CompactHistoryScroll.cpp @@ -21,7 +21,7 @@ // Own #include "CompactHistoryScroll.h" -#include "History.h" +#include "CompactHistoryType.h" using namespace Konsole; diff --git a/src/History.cpp b/src/History.cpp deleted file mode 100644 index 39a06b57..00000000 --- a/src/History.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - 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. -*/ - -// Own -#include "History.h" - -#include "HistoryScrollFile.h" - -#include "konsoledebug.h" -#include "KonsoleSettings.h" - -// System -#include -#include -#include -#include -#include - -// KDE -#include -#include -#include -#include -#include - -using namespace Konsole; - -/* - An arbitrary long scroll. - - One can modify the scroll only by adding either cells - or newlines, but access it randomly. - - The model is that of an arbitrary wide typewriter scroll - in that the scroll is a series of lines and each line is - a series of cells with no overwriting permitted. - - The implementation provides arbitrary length and numbers - of cells and line/column indexed read access to the scroll - at constant costs. -*/ diff --git a/src/History.h b/src/History.h deleted file mode 100644 index 49c5e4d6..00000000 --- a/src/History.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - 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 HISTORY_H -#define HISTORY_H - -// System -#include - -// Qt -#include -#include -#include - -#include "konsoleprivate_export.h" - -// History -#include "HistoryFile.h" -#include "HistoryScroll.h" -#include "HistoryScrollFile.h" -#include "HistoryScrollNone.h" -#include "CharacterFormat.h" -#include "CompactHistoryBlock.h" -#include "CompactHistoryBlockList.h" -#include "CompactHistoryLine.h" -#include "CompactHistoryScroll.h" - -#include "HistoryType.h" -#include "HistoryTypeNone.h" -#include "HistoryTypeFile.h" -#include "CompactHistoryType.h" - -// Konsole -#include "Character.h" - -namespace Konsole { - -////////////////////////////////////////////////////////////////////// -// History using compact storage -// This implementation uses a list of fixed-sized blocks -// where history lines are allocated in (avoids heap fragmentation) -////////////////////////////////////////////////////////////////////// - -} - -#endif // HISTORY_H diff --git a/src/HistoryScroll.cpp b/src/HistoryScroll.cpp index 1b5a1ea2..6e27da9b 100644 --- a/src/HistoryScroll.cpp +++ b/src/HistoryScroll.cpp @@ -21,7 +21,7 @@ // Own #include "HistoryScroll.h" -#include "History.h" +#include "HistoryType.h" using namespace Konsole; diff --git a/src/HistoryScrollFile.cpp b/src/HistoryScrollFile.cpp index 6e168ea6..285ed070 100644 --- a/src/HistoryScrollFile.cpp +++ b/src/HistoryScrollFile.cpp @@ -19,7 +19,8 @@ */ #include "HistoryScrollFile.h" -#include "History.h" + +#include "HistoryTypeFile.h" /* The history scroll makes a Row(Row(Cell)) from diff --git a/src/HistoryScrollNone.cpp b/src/HistoryScrollNone.cpp index 44f04f38..93fa2213 100644 --- a/src/HistoryScrollNone.cpp +++ b/src/HistoryScrollNone.cpp @@ -21,7 +21,7 @@ // Own #include "HistoryScrollNone.h" -#include "History.h" +#include "HistoryTypeNone.h" using namespace Konsole; diff --git a/src/Screen.cpp b/src/Screen.cpp index 0f00f2c2..03bec000 100644 --- a/src/Screen.cpp +++ b/src/Screen.cpp @@ -28,7 +28,8 @@ // Konsole #include "TerminalCharacterDecoder.h" -#include "History.h" +#include "HistoryType.h" +#include "HistoryScrollNone.h" #include "ExtendedCharTable.h" using namespace Konsole; diff --git a/src/autotests/HistoryTest.cpp b/src/autotests/HistoryTest.cpp index 550cf57e..fe2cf5c9 100644 --- a/src/autotests/HistoryTest.cpp +++ b/src/autotests/HistoryTest.cpp @@ -25,8 +25,12 @@ // Konsole #include "../session/Session.h" #include "../Emulation.h" -#include "../History.h" +#include "../HistoryTypeNone.h" +#include "../HistoryTypeFile.h" +#include "../CompactHistoryType.h" +#include "../HistoryScrollNone.h" #include "../HistoryScrollFile.h" +#include "../CompactHistoryScroll.h" using namespace Konsole; diff --git a/src/autotests/SessionTest.cpp b/src/autotests/SessionTest.cpp index 5815da64..5089b4a6 100644 --- a/src/autotests/SessionTest.cpp +++ b/src/autotests/SessionTest.cpp @@ -25,7 +25,6 @@ // Konsole #include "../session/Session.h" #include "../Emulation.h" -#include "../History.h" using namespace Konsole; diff --git a/src/session/Session.cpp b/src/session/Session.cpp index 03d7e175..1fe83a55 100644 --- a/src/session/Session.cpp +++ b/src/session/Session.cpp @@ -55,7 +55,9 @@ #include "ShellCommand.h" #include "Vt102Emulation.h" #include "ZModemDialog.h" -#include "History.h" +#include "HistoryTypeNone.h" +#include "HistoryTypeFile.h" +#include "CompactHistoryType.h" #include "konsoledebug.h" #include "session/SessionManager.h" #include "ProfileManager.h" diff --git a/src/session/SessionController.cpp b/src/session/SessionController.cpp index 9d3454e6..0caa6bec 100644 --- a/src/session/SessionController.cpp +++ b/src/session/SessionController.cpp @@ -68,7 +68,10 @@ #include "filterHotSpots/HotSpot.h" #include "filterHotSpots/RegExpFilter.h" #include "filterHotSpots/UrlFilter.h" -#include "History.h" +#include "HistoryType.h" +#include "HistoryTypeNone.h" +#include "HistoryTypeFile.h" +#include "CompactHistoryType.h" #include "HistorySizeDialog.h" #include "widgets/IncrementalSearchBar.h" #include "RenameTabDialog.h" diff --git a/src/session/SessionManager.cpp b/src/session/SessionManager.cpp index 05c524d0..351f18dd 100644 --- a/src/session/SessionManager.cpp +++ b/src/session/SessionManager.cpp @@ -35,7 +35,9 @@ // Konsole #include "session/Session.h" #include "ProfileManager.h" -#include "History.h" +#include "HistoryTypeNone.h" +#include "HistoryTypeFile.h" +#include "CompactHistoryType.h" #include "Enumeration.h" #include "widgets/TerminalDisplay.h"