Move ExtendedCharTable to characters library.

src/CMakeLists.txt

@@ -111,7 +111,6 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS}
                         CopyInputDialog.cpp
                         Emulation.cpp
                         EscapeSequenceUrlExtractor.cpp
-                        ExtendedCharTable.cpp
                         FontDialog.cpp
                         decoders/HTMLDecoder.cpp
                         HistorySizeDialog.cpp

src/Screen.cpp

@@ -17,7 +17,7 @@
 #include "../decoders/HTMLDecoder.h"
 #include "history/HistoryType.h"
 #include "history/HistoryScrollNone.h"
-#include "ExtendedCharTable.h"
+#include "characters/ExtendedCharTable.h"
 #include "profile/Profile.h"
 #include "EscapeSequenceUrlExtractor.h"
 

src/characters/CMakeLists.txt

@@ -1,10 +1,19 @@
 
-add_library(konsolecharacters
-    OBJECT
+set(konsolecharacters_SRCS
     CharacterFormat.cpp
     CharacterWidth.cpp
     LineBlockCharacters.cpp
+    ExtendedCharTable.cpp
 )
+
+ecm_qt_declare_logging_category(
+    konsolecharacters_SRCS
+    HEADER charactersdebug.h
+    IDENTIFIER CharactersDebug
+    CATEGORY_NAME org.kde.konsole.characters
+)
+
+add_library(konsolecharacters OBJECT ${konsolecharacters_SRCS})
 generate_export_header(konsolecharacters BASE_NAME konsolecharacters)
 target_include_directories(konsolecharacters PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(konsolecharacters Qt5::Gui)

src/characters/ExtendedCharTable.cpp

@@ -7,7 +7,7 @@
 // Own
 #include "ExtendedCharTable.h"
 
-#include "konsoledebug.h"
+#include "charactersdebug.h"
 
 using namespace Konsole;
 
@@ -64,7 +64,7 @@ uint ExtendedCharTable::createExtendedChar(const uint *unicodePoints, ushort len
                     }
                 }
             } else {
-                qCDebug(KonsoleDebug) << "Using all the extended char hashes, going to miss this extended character";
+                qCDebug(CharactersDebug) << "Using all the extended char hashes, going to miss this extended character";
                 return 0;
             }
         }

src/characters/ExtendedCharTable.h

@@ -8,6 +8,7 @@
 #define EXTENDEDCHARTABLE_H
 
 // Qt
+#include <QSet>
 #include <QHash>
 
 #include <functional>

src/decoders/HTMLDecoder.cpp

@@ -9,7 +9,7 @@
 
 // Konsole
 #include "colorscheme/ColorSchemeManager.h"
-#include "ExtendedCharTable.h"
+#include "../characters/ExtendedCharTable.h"
 
 // Qt
 #include <QTextStream>

src/decoders/PlainTextDecoder.cpp

@@ -8,7 +8,7 @@
 #include "PlainTextDecoder.h"
 
 // Konsole
-#include "ExtendedCharTable.h"
+#include "../characters/ExtendedCharTable.h"
 
 // Qt
 #include <QList>

src/terminalDisplay/TerminalDisplay.cpp

@@ -57,7 +57,7 @@
 #include "konsoledebug.h"
 #include "../decoders/PlainTextDecoder.h"
 #include "Screen.h"
-#include "ExtendedCharTable.h"
+#include "../characters/ExtendedCharTable.h"
 #include "../widgets/TerminalDisplayAccessible.h"
 #include "session/SessionController.h"
 #include "session/SessionManager.h"

src/terminalDisplay/TerminalPainter.cpp

@@ -11,7 +11,7 @@
 
 // Konsole
 #include "TerminalScrollBar.hpp"
-#include "ExtendedCharTable.h"
+#include "../characters/ExtendedCharTable.h"
 #include "../characters/LineBlockCharacters.h"
 #include "TerminalColor.hpp"