From b9bbbdba1f8a8fa4cdc11534c0e601a8bf049717 Mon Sep 17 00:00:00 2001 From: Gustavo Carneiro Date: Mon, 12 Oct 2020 03:51:50 -0300 Subject: [PATCH] Move character classes to a new folder. --- src/CMakeLists.txt | 6 +++--- src/Screen.h | 2 +- src/ScreenWindow.h | 2 +- src/TerminalCharacterDecoder.h | 2 +- src/autotests/CharacterColorTest.h | 2 +- src/autotests/CharacterWidthTest.cpp | 2 +- src/autotests/TerminalCharacterDecoderTest.h | 2 +- src/autotests/TerminalTest.cpp | 2 +- src/{ => characters}/Character.h | 0 src/{ => characters}/CharacterColor.h | 0 src/{ => characters}/CharacterFormat.cpp | 0 src/{ => characters}/CharacterFormat.h | 0 src/{ => characters}/CharacterWidth.cpp | 0 src/{ => characters}/CharacterWidth.h | 0 src/{ => characters}/CharacterWidth.src.cpp | 0 src/{ => characters}/LineBlockCharacters.cpp | 0 src/{ => characters}/LineBlockCharacters.h | 0 src/colorscheme/ColorScheme.h | 2 +- src/colorscheme/ColorSchemeEditor.cpp | 2 +- src/colorscheme/ColorSchemeWallpaper.h | 2 +- src/filterHotSpots/Filter.h | 2 +- src/filterHotSpots/TerminalImageFilterChain.h | 2 +- src/history/HistoryScroll.h | 2 +- src/history/compact/CompactHistoryBlock.h | 2 +- src/history/compact/CompactHistoryLine.h | 2 +- src/terminalDisplay/TerminalDisplay.cpp | 2 +- src/terminalDisplay/TerminalDisplay.h | 2 +- src/terminalDisplay/TerminalPainter.cpp | 2 +- src/terminalDisplay/TerminalPainter.hpp | 2 +- src/terminalDisplay/TerminalScrollBar.cpp | 2 +- 30 files changed, 23 insertions(+), 23 deletions(-) rename src/{ => characters}/Character.h (100%) rename src/{ => characters}/CharacterColor.h (100%) rename src/{ => characters}/CharacterFormat.cpp (100%) rename src/{ => characters}/CharacterFormat.h (100%) rename src/{ => characters}/CharacterWidth.cpp (100%) rename src/{ => characters}/CharacterWidth.h (100%) rename src/{ => characters}/CharacterWidth.src.cpp (100%) rename src/{ => characters}/LineBlockCharacters.cpp (100%) rename src/{ => characters}/LineBlockCharacters.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec853f303..452a1328a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -107,8 +107,8 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS} AutoScrollHandler.cpp BookmarkHandler.cpp BookmarkMenu.cpp - CharacterFormat.cpp - CharacterWidth.cpp + characters/CharacterFormat.cpp + characters/CharacterWidth.cpp CheckableSessionModel.cpp CompositeWidgetFocusWatcher.cpp CopyInputDialog.cpp @@ -120,7 +120,7 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS} HistorySizeDialog.cpp KeyBindingEditor.cpp LabelsAligner.cpp - LineBlockCharacters.cpp + characters/LineBlockCharacters.cpp NullProcessInfo.cpp NullProcessInfo.cpp PlainTextDecoder.cpp diff --git a/src/Screen.h b/src/Screen.h index 9143b1ab5..a9813138d 100644 --- a/src/Screen.h +++ b/src/Screen.h @@ -31,7 +31,7 @@ #include // Konsole -#include "Character.h" +#include "../characters/Character.h" #include "konsoleprivate_export.h" #define MODE_Origin 0 diff --git a/src/ScreenWindow.h b/src/ScreenWindow.h index 61d244e92..d0d32de65 100644 --- a/src/ScreenWindow.h +++ b/src/ScreenWindow.h @@ -26,7 +26,7 @@ #include // Konsole -#include "Character.h" +#include "../characters/Character.h" #include "Screen.h" namespace Konsole { diff --git a/src/TerminalCharacterDecoder.h b/src/TerminalCharacterDecoder.h index ab45d406d..8a4c07a77 100644 --- a/src/TerminalCharacterDecoder.h +++ b/src/TerminalCharacterDecoder.h @@ -27,7 +27,7 @@ #include // Konsole -#include "Character.h" +#include "../characters/Character.h" #include "konsoleprivate_export.h" class QTextStream; diff --git a/src/autotests/CharacterColorTest.h b/src/autotests/CharacterColorTest.h index d5fdd5176..5afc93fda 100644 --- a/src/autotests/CharacterColorTest.h +++ b/src/autotests/CharacterColorTest.h @@ -22,7 +22,7 @@ #include -#include "../CharacterColor.h" +#include "../characters/CharacterColor.h" namespace Konsole { diff --git a/src/autotests/CharacterWidthTest.cpp b/src/autotests/CharacterWidthTest.cpp index b81cafbd9..a231ef3ea 100644 --- a/src/autotests/CharacterWidthTest.cpp +++ b/src/autotests/CharacterWidthTest.cpp @@ -23,7 +23,7 @@ // KDE #include -#include "../Character.h" +#include "../characters/Character.h" #include "konsoleprivate_export.h" using namespace Konsole; diff --git a/src/autotests/TerminalCharacterDecoderTest.h b/src/autotests/TerminalCharacterDecoderTest.h index aa10ff9d3..ce612c96a 100644 --- a/src/autotests/TerminalCharacterDecoderTest.h +++ b/src/autotests/TerminalCharacterDecoderTest.h @@ -23,7 +23,7 @@ #include -#include "../Character.h" +#include "../characters/Character.h" namespace Konsole { diff --git a/src/autotests/TerminalTest.cpp b/src/autotests/TerminalTest.cpp index 1951845ef..74f9eb7de 100644 --- a/src/autotests/TerminalTest.cpp +++ b/src/autotests/TerminalTest.cpp @@ -25,7 +25,7 @@ // Konsole #include "../terminalDisplay/TerminalDisplay.h" #include "../terminalDisplay/TerminalScrollBar.hpp" -#include "../CharacterColor.h" +#include "../characters/CharacterColor.h" #include "colorscheme/ColorScheme.h" using namespace Konsole; diff --git a/src/Character.h b/src/characters/Character.h similarity index 100% rename from src/Character.h rename to src/characters/Character.h diff --git a/src/CharacterColor.h b/src/characters/CharacterColor.h similarity index 100% rename from src/CharacterColor.h rename to src/characters/CharacterColor.h diff --git a/src/CharacterFormat.cpp b/src/characters/CharacterFormat.cpp similarity index 100% rename from src/CharacterFormat.cpp rename to src/characters/CharacterFormat.cpp diff --git a/src/CharacterFormat.h b/src/characters/CharacterFormat.h similarity index 100% rename from src/CharacterFormat.h rename to src/characters/CharacterFormat.h diff --git a/src/CharacterWidth.cpp b/src/characters/CharacterWidth.cpp similarity index 100% rename from src/CharacterWidth.cpp rename to src/characters/CharacterWidth.cpp diff --git a/src/CharacterWidth.h b/src/characters/CharacterWidth.h similarity index 100% rename from src/CharacterWidth.h rename to src/characters/CharacterWidth.h diff --git a/src/CharacterWidth.src.cpp b/src/characters/CharacterWidth.src.cpp similarity index 100% rename from src/CharacterWidth.src.cpp rename to src/characters/CharacterWidth.src.cpp diff --git a/src/LineBlockCharacters.cpp b/src/characters/LineBlockCharacters.cpp similarity index 100% rename from src/LineBlockCharacters.cpp rename to src/characters/LineBlockCharacters.cpp diff --git a/src/LineBlockCharacters.h b/src/characters/LineBlockCharacters.h similarity index 100% rename from src/LineBlockCharacters.h rename to src/characters/LineBlockCharacters.h diff --git a/src/colorscheme/ColorScheme.h b/src/colorscheme/ColorScheme.h index 6d0d5d4f3..840a56b4e 100644 --- a/src/colorscheme/ColorScheme.h +++ b/src/colorscheme/ColorScheme.h @@ -27,7 +27,7 @@ #include // Konsole -#include "CharacterColor.h" +#include "../characters/CharacterColor.h" #include "ColorSchemeWallpaper.h" class KConfig; diff --git a/src/colorscheme/ColorSchemeEditor.cpp b/src/colorscheme/ColorSchemeEditor.cpp index d20f6c8d6..cac855dce 100644 --- a/src/colorscheme/ColorSchemeEditor.cpp +++ b/src/colorscheme/ColorSchemeEditor.cpp @@ -40,7 +40,7 @@ // Konsole #include "ui_ColorSchemeEditor.h" #include "ColorScheme.h" -#include "CharacterColor.h" +#include "../characters/CharacterColor.h" using namespace Konsole; diff --git a/src/colorscheme/ColorSchemeWallpaper.h b/src/colorscheme/ColorSchemeWallpaper.h index 9389949de..cc226b6ec 100644 --- a/src/colorscheme/ColorSchemeWallpaper.h +++ b/src/colorscheme/ColorSchemeWallpaper.h @@ -27,7 +27,7 @@ #include // Konsole -#include "CharacterColor.h" +#include "../characters/CharacterColor.h" class QPixmap; class QPainter; diff --git a/src/filterHotSpots/Filter.h b/src/filterHotSpots/Filter.h index b31796e10..1b2eb53e2 100644 --- a/src/filterHotSpots/Filter.h +++ b/src/filterHotSpots/Filter.h @@ -40,7 +40,7 @@ #include // Konsole -#include "Character.h" +#include "../characters/Character.h" class QAction; class QMenu; diff --git a/src/filterHotSpots/TerminalImageFilterChain.h b/src/filterHotSpots/TerminalImageFilterChain.h index 16c256bd0..cf34d398a 100644 --- a/src/filterHotSpots/TerminalImageFilterChain.h +++ b/src/filterHotSpots/TerminalImageFilterChain.h @@ -25,7 +25,7 @@ #include #include "FilterChain.h" -#include "Character.h" +#include "../characters/Character.h" namespace Konsole { class TerminalDisplay; diff --git a/src/history/HistoryScroll.h b/src/history/HistoryScroll.h index a9708e9ce..6f23ceff2 100644 --- a/src/history/HistoryScroll.h +++ b/src/history/HistoryScroll.h @@ -24,7 +24,7 @@ #include "konsoleprivate_export.h" // Konsole -#include "Character.h" +#include "../characters/Character.h" // Qt #include diff --git a/src/history/compact/CompactHistoryBlock.h b/src/history/compact/CompactHistoryBlock.h index 75ac8495d..d77286b77 100644 --- a/src/history/compact/CompactHistoryBlock.h +++ b/src/history/compact/CompactHistoryBlock.h @@ -22,7 +22,7 @@ #define COMPACTHISTORYBLOCK_H // Konsole -#include "Character.h" +#include "../characters/Character.h" // System #include diff --git a/src/history/compact/CompactHistoryLine.h b/src/history/compact/CompactHistoryLine.h index f8a09d205..589451a75 100644 --- a/src/history/compact/CompactHistoryLine.h +++ b/src/history/compact/CompactHistoryLine.h @@ -23,7 +23,7 @@ #include -#include "CharacterFormat.h" +#include "../characters/CharacterFormat.h" #include "CompactHistoryBlockList.h" namespace Konsole diff --git a/src/terminalDisplay/TerminalDisplay.cpp b/src/terminalDisplay/TerminalDisplay.cpp index 31ee81dec..1a741e86a 100644 --- a/src/terminalDisplay/TerminalDisplay.cpp +++ b/src/terminalDisplay/TerminalDisplay.cpp @@ -80,7 +80,7 @@ #include "widgets/IncrementalSearchBar.h" #include "profile/Profile.h" #include "ViewManager.h" // for colorSchemeForProfile. // TODO: Rewrite this. -#include "LineBlockCharacters.h" +#include "../characters/LineBlockCharacters.h" #include "PrintOptions.h" #include "../widgets/KonsolePrintManager.h" #include "EscapeSequenceUrlExtractor.h" diff --git a/src/terminalDisplay/TerminalDisplay.h b/src/terminalDisplay/TerminalDisplay.h index d15a6f7fa..f3ba94483 100644 --- a/src/terminalDisplay/TerminalDisplay.h +++ b/src/terminalDisplay/TerminalDisplay.h @@ -27,7 +27,7 @@ #include // Konsole -#include "Character.h" +#include "../characters/Character.h" #include "konsoleprivate_export.h" #include "ScreenWindow.h" #include "colorscheme/ColorScheme.h" diff --git a/src/terminalDisplay/TerminalPainter.cpp b/src/terminalDisplay/TerminalPainter.cpp index c24f66862..644ea4c1b 100644 --- a/src/terminalDisplay/TerminalPainter.cpp +++ b/src/terminalDisplay/TerminalPainter.cpp @@ -26,7 +26,7 @@ #include "TerminalDisplay.h" #include "TerminalScrollBar.hpp" #include "ExtendedCharTable.h" -#include "LineBlockCharacters.h" +#include "../characters/LineBlockCharacters.h" // Qt #include diff --git a/src/terminalDisplay/TerminalPainter.hpp b/src/terminalDisplay/TerminalPainter.hpp index 9f8fcdef5..459e97a4a 100644 --- a/src/terminalDisplay/TerminalPainter.hpp +++ b/src/terminalDisplay/TerminalPainter.hpp @@ -29,7 +29,7 @@ #include // Konsole -#include "Character.h" +#include "../characters/Character.h" #include "ScreenWindow.h" #include "Enumeration.h" #include "colorscheme/ColorSchemeWallpaper.h" diff --git a/src/terminalDisplay/TerminalScrollBar.cpp b/src/terminalDisplay/TerminalScrollBar.cpp index 7917dfb44..386b82166 100644 --- a/src/terminalDisplay/TerminalScrollBar.cpp +++ b/src/terminalDisplay/TerminalScrollBar.cpp @@ -25,7 +25,7 @@ // Konsole #include "TerminalDisplay.h" #include "session/SessionController.h" -#include "Character.h" +#include "../characters/Character.h" // KDE #include