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 a94a863f93)

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}

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;

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>
 

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;

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
 )

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}
 )

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"

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"
 

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"

twin4/twin4/twin4player.h

@@ -22,7 +22,7 @@
 #include <config.h>
 #endif 
 
-#include <kplayer.h>
+#include <kgame/kplayer.h>
 
 class StatusWidget;
 class TDEConfig;

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

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;

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;