From afd698aa6058379c021ff7062465eee7da714101 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 27 Apr 2020 22:18:38 +0900 Subject: Rearrangement of libtdegames highscore headers. Signed-off-by: Michele Calgaro --- libksirtet/base/CMakeLists.txt | 1 - libksirtet/base/Makefile.am | 2 +- libksirtet/base/field.h | 2 +- libksirtet/base/highscores.h | 2 +- libksirtet/base/inter.cpp | 2 +- libksirtet/base/main.cpp | 2 +- libksirtet/common/CMakeLists.txt | 1 - libksirtet/common/Makefile.am | 2 +- libksirtet/common/inter.h | 2 +- 9 files changed, 7 insertions(+), 9 deletions(-) (limited to 'libksirtet') diff --git a/libksirtet/base/CMakeLists.txt b/libksirtet/base/CMakeLists.txt index 52546bc7..38acbd88 100644 --- a/libksirtet/base/CMakeLists.txt +++ b/libksirtet/base/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libtdegames - ${CMAKE_SOURCE_DIR}/libtdegames/highscore ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/libksirtet/base/Makefile.am b/libksirtet/base/Makefile.am index b7f2877b..ae19bdcc 100644 --- a/libksirtet/base/Makefile.am +++ b/libksirtet/base/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes) +INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes) # Don't compile with hidden symbols since we are a library. if disable_VISIBILITY diff --git a/libksirtet/base/field.h b/libksirtet/base/field.h index e30e0bdd..217eea5b 100644 --- a/libksirtet/base/field.h +++ b/libksirtet/base/field.h @@ -1,7 +1,7 @@ #ifndef BASE_FIELD_H #define BASE_FIELD_H -#include +#include #include diff --git a/libksirtet/base/highscores.h b/libksirtet/base/highscores.h index b3e7b99e..0ed91c54 100644 --- a/libksirtet/base/highscores.h +++ b/libksirtet/base/highscores.h @@ -1,7 +1,7 @@ #ifndef BASE_HIGHSCORES_H #define BASE_HIGHSCORES_H -#include +#include #include class KDE_EXPORT BaseHighscores : public KExtHighscore::Manager diff --git a/libksirtet/base/inter.cpp b/libksirtet/base/inter.cpp index 658e7c47..7f832b29 100644 --- a/libksirtet/base/inter.cpp +++ b/libksirtet/base/inter.cpp @@ -1,6 +1,6 @@ #include "inter.h" -#include +#include void BaseInterface::showHighscores(TQWidget *parent) diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp index 8f5479f1..e9f576f1 100644 --- a/libksirtet/base/main.cpp +++ b/libksirtet/base/main.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "inter.h" diff --git a/libksirtet/common/CMakeLists.txt b/libksirtet/common/CMakeLists.txt index a094ea8b..b2b5f7a5 100644 --- a/libksirtet/common/CMakeLists.txt +++ b/libksirtet/common/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libksirtet ${CMAKE_SOURCE_DIR}/libksirtet/base - ${CMAKE_SOURCE_DIR}/libtdegames/highscore ${CMAKE_SOURCE_DIR}/libtdegames ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/libksirtet/common/Makefile.am b/libksirtet/common/Makefile.am index dcce4c2a..d4582f9e 100644 --- a/libksirtet/common/Makefile.am +++ b/libksirtet/common/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(srcdir)/../base -I$(top_srcdir)/libtdegames/highscore -I$(top_srcdir)/libtdegames $(all_includes) +INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(srcdir)/../base -I$(top_srcdir)/libtdegames $(all_includes) # Don't compile with hidden symbols since we are a library. if disable_VISIBILITY diff --git a/libksirtet/common/inter.h b/libksirtet/common/inter.h index 09e014b2..fbf78c77 100644 --- a/libksirtet/common/inter.h +++ b/libksirtet/common/inter.h @@ -1,7 +1,7 @@ #ifndef COMMON_INTER_H #define COMMON_INTER_H -#include +#include #include "lib/libksirtet_export.h" #include "lib/mp_simple_interface.h" -- cgit v1.2.1