Move character classes to a new folder.

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

src/Screen.h

@@ -31,7 +31,7 @@
 #include <QVarLengthArray>
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 #include "konsoleprivate_export.h"
 
 #define MODE_Origin    0

src/ScreenWindow.h

@@ -26,7 +26,7 @@
 #include <QRect>
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 #include "Screen.h"
 
 namespace Konsole {

src/TerminalCharacterDecoder.h

@@ -27,7 +27,7 @@
 #include <QExplicitlySharedDataPointer>
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 #include "konsoleprivate_export.h"
 
 class QTextStream;

src/autotests/CharacterColorTest.h

@@ -22,7 +22,7 @@
 
 #include <QObject>
 
-#include "../CharacterColor.h"
+#include "../characters/CharacterColor.h"
 
 namespace Konsole
 {

src/autotests/CharacterWidthTest.cpp

@@ -23,7 +23,7 @@
 // KDE
 #include <qtest.h>
 
-#include "../Character.h"
+#include "../characters/Character.h"
 #include "konsoleprivate_export.h"
 
 using namespace Konsole;

src/autotests/TerminalCharacterDecoderTest.h

@@ -23,7 +23,7 @@
 
 #include <QObject>
 
-#include "../Character.h"
+#include "../characters/Character.h"
 
 namespace Konsole
 {

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;

src/colorscheme/ColorScheme.h

@@ -27,7 +27,7 @@
 #include <QSharedData>
 
 // Konsole
-#include "CharacterColor.h"
+#include "../characters/CharacterColor.h"
 #include "ColorSchemeWallpaper.h"
 
 class KConfig;

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;
 

src/colorscheme/ColorSchemeWallpaper.h

@@ -27,7 +27,7 @@
 #include <QSharedData>
 
 // Konsole
-#include "CharacterColor.h"
+#include "../characters/CharacterColor.h"
 
 class QPixmap;
 class QPainter;

src/filterHotSpots/Filter.h

@@ -40,7 +40,7 @@
 #include <memory>
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 
 class QAction;
 class QMenu;

src/filterHotSpots/TerminalImageFilterChain.h

@@ -25,7 +25,7 @@
 #include <QString>
 
 #include "FilterChain.h"
-#include "Character.h"
+#include "../characters/Character.h"
 
 namespace Konsole {
 class TerminalDisplay;

src/history/HistoryScroll.h

@@ -24,7 +24,7 @@
 #include "konsoleprivate_export.h"
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 
 // Qt
 #include <QVector>

src/history/compact/CompactHistoryBlock.h

@@ -22,7 +22,7 @@
 #define COMPACTHISTORYBLOCK_H
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 
 // System
 #include <sys/mman.h>

src/history/compact/CompactHistoryLine.h

@@ -23,7 +23,7 @@
 
 #include <QVector>
 
-#include "CharacterFormat.h"
+#include "../characters/CharacterFormat.h"
 #include "CompactHistoryBlockList.h"
 
 namespace Konsole

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"

src/terminalDisplay/TerminalDisplay.h

@@ -27,7 +27,7 @@
 #include <QWidget>
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 #include "konsoleprivate_export.h"
 #include "ScreenWindow.h"
 #include "colorscheme/ColorScheme.h"

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 <QRect>

src/terminalDisplay/TerminalPainter.hpp

@@ -29,7 +29,7 @@
 #include <QScrollBar>
 
 // Konsole
-#include "Character.h"
+#include "../characters/Character.h"
 #include "ScreenWindow.h"
 #include "Enumeration.h"
 #include "colorscheme/ColorSchemeWallpaper.h"

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 <KMessageWidget>