Move CompositeWidgetFocusWatcher to terminalDisplay/extras folder.

src/CMakeLists.txt

@@ -108,7 +108,6 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS}
                         BookmarkHandler.cpp
                         BookmarkMenu.cpp
                         CheckableSessionModel.cpp
-                        CompositeWidgetFocusWatcher.cpp
                         CopyInputDialog.cpp
                         Emulation.cpp
                         EscapeSequenceUrlExtractor.cpp
@@ -175,6 +174,8 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS}
                         widgets/RenameTabWidget.cpp
                         widgets/RenameTabWidget.cpp
                         widgets/TabTitleFormatButton.cpp
+
+                        terminalDisplay/extras/CompositeWidgetFocusWatcher.cpp
                         
                         terminalDisplay/TerminalDisplay.cpp
                         terminalDisplay/TerminalPainter.cpp

src/terminalDisplay/TerminalDisplay.cpp

@@ -58,7 +58,7 @@
 #include <KIO/StatJob>
 
 // Konsole
-#include "CompositeWidgetFocusWatcher.h"
+#include "extras/CompositeWidgetFocusWatcher.h"
 #include "AutoScrollHandler.h"
 
 #include "filterHotSpots/Filter.h"