From 1aa6039e0e5c003f902d2186a6f52c3e72669e8c Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Mon, 30 Mar 2020 02:53:52 +0300
Subject: [PATCH] Small rearrangement of libtdegames headers

Move kgame dialog headers to a dedicated subdir to make installed
includes match source code layout. This will make linking of games
to an installed instance of libtdegames library more straightforward.

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit a94a863f93fe5d45f5f6d4fa732eb297d6a154f7)
---
 kbackgammon/CMakeLists.txt               |  1 -
 kbackgammon/engines/nextgen/kbggame.h    |  2 +-
 kbackgammon/engines/nextgen/kbgng.h      |  2 +-
 kbackgammon/engines/nextgen/kbgplayer.h  |  2 +-
 libtdegames/kgame/dialogs/CMakeLists.txt |  2 +-
 twin4/twin4/CMakeLists.txt               |  1 -
 twin4/twin4/twin4.cpp                    | 12 ++++++------
 twin4/twin4/twin4doc.h                   |  6 +++---
 twin4/twin4/twin4player.cpp              |  2 +-
 twin4/twin4/twin4player.h                |  2 +-
 twin4/twin4/twin4proc.cpp                |  2 +-
 twin4/twin4/twin4proc.h                  |  2 +-
 twin4/twin4/twin4view.h                  |  2 +-
 13 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/kbackgammon/CMakeLists.txt b/kbackgammon/CMakeLists.txt
index 432239ef..9d6eaef3 100644
--- a/kbackgammon/CMakeLists.txt
+++ b/kbackgammon/CMakeLists.txt
@@ -19,7 +19,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/kgame/
   ${CMAKE_CURRENT_SOURCE_DIR}/engines
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
diff --git a/kbackgammon/engines/nextgen/kbggame.h b/kbackgammon/engines/nextgen/kbggame.h
index 9d81531e..bfbf2a06 100644
--- a/kbackgammon/engines/nextgen/kbggame.h
+++ b/kbackgammon/engines/nextgen/kbggame.h
@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include <kgame.h>
+#include <kgame/kgame.h>
 #include <kdemacros.h>
 class TQObject;
 class KPlayer;
diff --git a/kbackgammon/engines/nextgen/kbgng.h b/kbackgammon/engines/nextgen/kbgng.h
index 8fb2f8b5..b936f377 100644
--- a/kbackgammon/engines/nextgen/kbgng.h
+++ b/kbackgammon/engines/nextgen/kbgng.h
@@ -33,7 +33,7 @@
 #include <tqspinbox.h>
 #include <tdeaction.h>
 #include <tqdatastream.h>
-#include <kgameproperty.h>
+#include <kgame/kgameproperty.h>
 
 #include <generic/kbgengine.h>
 
diff --git a/kbackgammon/engines/nextgen/kbgplayer.h b/kbackgammon/engines/nextgen/kbgplayer.h
index b59cad8a..9256db6b 100644
--- a/kbackgammon/engines/nextgen/kbgplayer.h
+++ b/kbackgammon/engines/nextgen/kbgplayer.h
@@ -28,7 +28,7 @@
 #include <config.h>
 #endif 
 
-#include <kplayer.h>
+#include <kgame/kplayer.h>
 #include <tqdatastream.h> 
 
 class KGame;
diff --git a/libtdegames/kgame/dialogs/CMakeLists.txt b/libtdegames/kgame/dialogs/CMakeLists.txt
index 17bbefd4..101d1a3d 100644
--- a/libtdegames/kgame/dialogs/CMakeLists.txt
+++ b/libtdegames/kgame/dialogs/CMakeLists.txt
@@ -26,5 +26,5 @@ tde_add_library( kgamedialogs STATIC_PIC AUTOMOC
 ##### headers ###################################
 install( FILES kgamedialog.h kgameconnectdialog.h kgameerrordialog.h
   kgamedebugdialog.h kgamedialogconfig.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kgame
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kgame/dialogs
 )
diff --git a/twin4/twin4/CMakeLists.txt b/twin4/twin4/CMakeLists.txt
index cb991878..2a283bd1 100644
--- a/twin4/twin4/CMakeLists.txt
+++ b/twin4/twin4/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/kgame
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp
index 086e127e..d97d31f2 100644
--- a/twin4/twin4/twin4.cpp
+++ b/twin4/twin4/twin4.cpp
@@ -40,12 +40,12 @@
 #include <tdeconfigdialog.h>
 
 #include <kchatdialog.h>
-#include <kgamechat.h>
-#include <dialogs/kgamedialog.h>
-#include <dialogs/kgamedialogconfig.h>
-#include <dialogs/kgameconnectdialog.h>
-#include <dialogs/kgameerrordialog.h>
-#include <dialogs/kgamedebugdialog.h>
+#include <kgame/kgamechat.h>
+#include <kgame/dialogs/kgamedialog.h>
+#include <kgame/dialogs/kgamedialogconfig.h>
+#include <kgame/dialogs/kgameconnectdialog.h>
+#include <kgame/dialogs/kgameerrordialog.h>
+#include <kgame/dialogs/kgamedebugdialog.h>
 
 // application specific includes
 #include "twin4.h"
diff --git a/twin4/twin4/twin4doc.h b/twin4/twin4/twin4doc.h
index 49ed1307..f78e15a6 100644
--- a/twin4/twin4/twin4doc.h
+++ b/twin4/twin4/twin4doc.h
@@ -18,9 +18,9 @@
 #ifndef TWIN4DOC_H
 #define TWIN4DOC_H
 
-#include <kgame.h>
-#include <kgameio.h>
-#include <kgamepropertyarray.h>
+#include <kgame/kgame.h>
+#include <kgame/kgameio.h>
+#include <kgame/kgamepropertyarray.h>
 
 #include "twin4player.h"
 
diff --git a/twin4/twin4/twin4player.cpp b/twin4/twin4/twin4player.cpp
index 47014f10..5992c400 100644
--- a/twin4/twin4/twin4player.cpp
+++ b/twin4/twin4/twin4player.cpp
@@ -19,7 +19,7 @@
 // include files for TDE
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kgamepropertyhandler.h>
+#include <kgame/kgamepropertyhandler.h>
 
 #include "twin4player.h"
 #include "statuswidget.h"
diff --git a/twin4/twin4/twin4player.h b/twin4/twin4/twin4player.h
index 89ea213a..a7186e10 100644
--- a/twin4/twin4/twin4player.h
+++ b/twin4/twin4/twin4player.h
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif 
 
-#include <kplayer.h>
+#include <kgame/kplayer.h>
 
 class StatusWidget;
 class TDEConfig;
diff --git a/twin4/twin4/twin4proc.cpp b/twin4/twin4/twin4proc.cpp
index 81f17324..b47dbe48 100644
--- a/twin4/twin4/twin4proc.cpp
+++ b/twin4/twin4/twin4proc.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
-#include <kgamemessage.h>
+#include <kgame/kgamemessage.h>
 #include <kdebug.h>
 
 #define MIN_TIME 1  // sec
diff --git a/twin4/twin4/twin4proc.h b/twin4/twin4/twin4proc.h
index 5e0e3521..6d6fe1a3 100644
--- a/twin4/twin4/twin4proc.h
+++ b/twin4/twin4/twin4proc.h
@@ -18,7 +18,7 @@
 #ifndef _TWIN4PROC_H_
 #define _TWIN4PROC_H_
 
-#include <kgameprocess.h>
+#include <kgame/kgameprocess.h>
 
 // TODO match up with what is in twin4doc.h
 typedef enum e_farbe {Niemand=0,Gelb=1,Rot=2,Tip=3,Rand=4} Farbe;
diff --git a/twin4/twin4/twin4view.h b/twin4/twin4/twin4view.h
index ea722f93..25a9fda4 100644
--- a/twin4/twin4/twin4view.h
+++ b/twin4/twin4/twin4view.h
@@ -19,7 +19,7 @@
 #define TWIN4VIEW_H
 
 #include <tqcanvas.h>
-#include <kgameio.h>
+#include <kgame/kgameio.h>
 
 class Kwin4Doc;
 class ScoreWidget;