Merge pull request #6008 from Icinga/fix/cmake-3-0-compat

Fix compatibility with CMake < 3.1

lib/base/CMakeLists.txt

@@ -15,42 +15,42 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(application.ti application.tcpp application.thpp)
+mkclass_target(application.ti application-ti.cpp application-ti.hpp)
-mkclass_target(configobject.ti configobject.tcpp configobject.thpp)
+mkclass_target(configobject.ti configobject-ti.cpp configobject-ti.hpp)
-mkclass_target(datetime.ti datetime.tcpp datetime.thpp)
+mkclass_target(datetime.ti datetime-ti.cpp datetime-ti.hpp)
-mkclass_target(filelogger.ti filelogger.tcpp filelogger.thpp)
+mkclass_target(filelogger.ti filelogger-ti.cpp filelogger-ti.hpp)
-mkclass_target(function.ti function.tcpp function.thpp)
+mkclass_target(function.ti function-ti.cpp function-ti.hpp)
-mkclass_target(logger.ti logger.tcpp logger.thpp)
+mkclass_target(logger.ti logger-ti.cpp logger-ti.hpp)
-mkclass_target(perfdatavalue.ti perfdatavalue.tcpp perfdatavalue.thpp)
+mkclass_target(perfdatavalue.ti perfdatavalue-ti.cpp perfdatavalue-ti.hpp)
-mkclass_target(streamlogger.ti streamlogger.tcpp streamlogger.thpp)
+mkclass_target(streamlogger.ti streamlogger-ti.cpp streamlogger-ti.hpp)
-mkclass_target(sysloglogger.ti sysloglogger.tcpp sysloglogger.thpp)
+mkclass_target(sysloglogger.ti sysloglogger-ti.cpp sysloglogger-ti.hpp)
 
 set(base_SOURCES
   i2-base.hpp
-  application.cpp application.hpp application.thpp application-version.cpp
+  application.cpp application.hpp application-ti.hpp application-version.cpp
   array.cpp array.hpp array-script.cpp
   base64.cpp base64.hpp
   boolean.cpp boolean.hpp boolean-script.cpp
-  configobject.cpp configobject.hpp configobject.thpp configobject-script.cpp
+  configobject.cpp configobject.hpp configobject-ti.hpp configobject-script.cpp
   configtype.cpp configtype.hpp
   configwriter.cpp configwriter.hpp
   console.cpp console.hpp
   context.cpp context.hpp
   convert.cpp convert.hpp
-  datetime.cpp datetime.hpp datetime.thpp datetime-script.cpp
+  datetime.cpp datetime.hpp datetime-ti.hpp datetime-script.cpp
   debug.hpp
   debuginfo.cpp debuginfo.hpp
   dependencygraph.cpp dependencygraph.hpp
   dictionary.cpp dictionary.hpp dictionary-script.cpp
   exception.cpp exception.hpp
   fifo.cpp fifo.hpp
-  filelogger.cpp filelogger.hpp filelogger.thpp
+  filelogger.cpp filelogger.hpp filelogger-ti.hpp
-  function.cpp function.hpp function.thpp function-script.cpp functionwrapper.hpp
+  function.cpp function.hpp function-ti.hpp function-script.cpp functionwrapper.hpp
   initialize.cpp initialize.hpp
   json.cpp json.hpp json-script.cpp
   library.cpp library.hpp
   loader.cpp loader.hpp
-  logger.cpp logger.hpp logger.thpp
+  logger.cpp logger.hpp logger-ti.hpp
   math-script.cpp
   netstring.cpp netstring.hpp
   networkstream.cpp networkstream.hpp
@@ -58,7 +58,7 @@ set(base_SOURCES
   object.cpp object.hpp object-script.cpp
   objectlock.cpp objectlock.hpp
   objecttype.cpp objecttype.hpp
-  perfdatavalue.cpp perfdatavalue.hpp perfdatavalue.thpp
+  perfdatavalue.cpp perfdatavalue.hpp perfdatavalue-ti.hpp
   primitivetype.cpp primitivetype.hpp
   process.cpp process.hpp
   registry.hpp
@@ -74,9 +74,9 @@ set(base_SOURCES
   statsfunction.hpp
   stdiostream.cpp stdiostream.hpp
   stream.cpp stream.hpp
-  streamlogger.cpp streamlogger.hpp streamlogger.thpp
+  streamlogger.cpp streamlogger.hpp streamlogger-ti.hpp
   string.cpp string.hpp string-script.cpp
-  sysloglogger.cpp sysloglogger.hpp sysloglogger.thpp
+  sysloglogger.cpp sysloglogger.hpp sysloglogger-ti.hpp
   tcpsocket.cpp tcpsocket.hpp
   threadpool.cpp threadpool.hpp
   timer.cpp timer.hpp

lib/base/application.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/application.hpp"
-#include "base/application.tcpp"
+#include "base/application-ti.cpp"
 #include "base/stacktrace.hpp"
 #include "base/timer.hpp"
 #include "base/logger.hpp"

lib/base/application.hpp

@@ -21,7 +21,7 @@
 #define APPLICATION_H
 
 #include "base/i2-base.hpp"
-#include "base/application.thpp"
+#include "base/application-ti.hpp"
 #include "base/threadpool.hpp"
 #include "base/utility.hpp"
 #include "base/logger.hpp"

lib/base/configobject.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/configobject.hpp"
-#include "base/configobject.tcpp"
+#include "base/configobject-ti.cpp"
 #include "base/configtype.hpp"
 #include "base/serializer.hpp"
 #include "base/netstring.hpp"

lib/base/configobject.hpp

@@ -21,7 +21,7 @@
 #define CONFIGOBJECT_H
 
 #include "base/i2-base.hpp"
-#include "base/configobject.thpp"
+#include "base/configobject-ti.hpp"
 #include "base/object.hpp"
 #include "base/type.hpp"
 #include "base/dictionary.hpp"

lib/base/datetime.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/datetime.hpp"
-#include "base/datetime.tcpp"
+#include "base/datetime-ti.cpp"
 #include "base/utility.hpp"
 #include "base/primitivetype.hpp"
 

lib/base/datetime.hpp

@@ -21,7 +21,7 @@
 #define DATETIME_H
 
 #include "base/i2-base.hpp"
-#include "base/datetime.thpp"
+#include "base/datetime-ti.hpp"
 #include "base/value.hpp"
 #include <vector>
 

lib/base/filelogger.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/filelogger.hpp"
-#include "base/filelogger.tcpp"
+#include "base/filelogger-ti.cpp"
 #include "base/configtype.hpp"
 #include "base/statsfunction.hpp"
 #include "base/application.hpp"

lib/base/filelogger.hpp

@@ -21,7 +21,7 @@
 #define FILELOGGER_H
 
 #include "base/i2-base.hpp"
-#include "base/filelogger.thpp"
+#include "base/filelogger-ti.hpp"
 
 namespace icinga
 {

lib/base/function.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/function.hpp"
-#include "base/function.tcpp"
+#include "base/function-ti.cpp"
 #include "base/array.hpp"
 #include "base/scriptframe.hpp"
 

lib/base/function.hpp

@@ -21,7 +21,7 @@
 #define SCRIPTFUNCTION_H
 
 #include "base/i2-base.hpp"
-#include "base/function.thpp"
+#include "base/function-ti.hpp"
 #include "base/value.hpp"
 #include "base/functionwrapper.hpp"
 #include "base/scriptglobal.hpp"

lib/base/logger.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/logger.hpp"
-#include "base/logger.tcpp"
+#include "base/logger-ti.cpp"
 #include "base/application.hpp"
 #include "base/streamlogger.hpp"
 #include "base/configtype.hpp"

lib/base/logger.hpp

@@ -21,7 +21,7 @@
 #define LOGGER_H
 
 #include "base/i2-base.hpp"
-#include "base/logger.thpp"
+#include "base/logger-ti.hpp"
 #include <set>
 #include <sstream>
 

lib/base/perfdatavalue.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/perfdatavalue.hpp"
-#include "base/perfdatavalue.tcpp"
+#include "base/perfdatavalue-ti.cpp"
 #include "base/convert.hpp"
 #include "base/exception.hpp"
 #include "base/logger.hpp"

lib/base/perfdatavalue.hpp

@@ -21,7 +21,7 @@
 #define PERFDATAVALUE_H
 
 #include "base/i2-base.hpp"
-#include "base/perfdatavalue.thpp"
+#include "base/perfdatavalue-ti.hpp"
 
 namespace icinga
 {

lib/base/streamlogger.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/streamlogger.hpp"
-#include "base/streamlogger.tcpp"
+#include "base/streamlogger-ti.cpp"
 #include "base/utility.hpp"
 #include "base/objectlock.hpp"
 #include "base/console.hpp"

lib/base/streamlogger.hpp

@@ -21,7 +21,7 @@
 #define STREAMLOGGER_H
 
 #include "base/i2-base.hpp"
-#include "base/streamlogger.thpp"
+#include "base/streamlogger-ti.hpp"
 #include "base/timer.hpp"
 #include <ostream>
 

lib/base/sysloglogger.cpp

@@ -19,9 +19,9 @@
 
 #ifndef _WIN32
 #include "base/sysloglogger.hpp"
+#include "base/sysloglogger-ti.cpp"
 #include "base/configtype.hpp"
 #include "base/statsfunction.hpp"
-#include "base/sysloglogger.tcpp"
 
 using namespace icinga;
 

lib/base/sysloglogger.hpp

@@ -22,7 +22,7 @@
 
 #ifndef _WIN32
 #include "base/i2-base.hpp"
-#include "base/sysloglogger.thpp"
+#include "base/sysloglogger-ti.hpp"
 
 namespace icinga
 {

lib/checker/CMakeLists.txt

@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(checkercomponent.ti checkercomponent.tcpp checkercomponent.thpp)
+mkclass_target(checkercomponent.ti checkercomponent-ti.cpp checkercomponent-ti.hpp)
 
 set(checker_SOURCES
-  checkercomponent.cpp checkercomponent.hpp checkercomponent.thpp
+  checkercomponent.cpp checkercomponent.hpp checkercomponent-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

lib/checker/checkercomponent.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "checker/checkercomponent.hpp"
-#include "checker/checkercomponent.tcpp"
+#include "checker/checkercomponent-ti.cpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/cib.hpp"
 #include "remote/apilistener.hpp"

lib/checker/checkercomponent.hpp

@@ -20,7 +20,7 @@
 #ifndef CHECKERCOMPONENT_H
 #define CHECKERCOMPONENT_H
 
-#include "checker/checkercomponent.thpp"
+#include "checker/checkercomponent-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/timer.hpp"

lib/compat/CMakeLists.txt

@@ -15,16 +15,16 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(checkresultreader.ti checkresultreader.tcpp checkresultreader.thpp)
+mkclass_target(checkresultreader.ti checkresultreader-ti.cpp checkresultreader-ti.hpp)
-mkclass_target(compatlogger.ti compatlogger.tcpp compatlogger.thpp)
+mkclass_target(compatlogger.ti compatlogger-ti.cpp compatlogger-ti.hpp)
-mkclass_target(externalcommandlistener.ti externalcommandlistener.tcpp externalcommandlistener.thpp)
+mkclass_target(externalcommandlistener.ti externalcommandlistener-ti.cpp externalcommandlistener-ti.hpp)
-mkclass_target(statusdatawriter.ti statusdatawriter.tcpp statusdatawriter.thpp)
+mkclass_target(statusdatawriter.ti statusdatawriter-ti.cpp statusdatawriter-ti.hpp)
 
 set(compat_SOURCES
-  checkresultreader.cpp checkresultreader.hpp checkresultreader.thpp
+  checkresultreader.cpp checkresultreader.hpp checkresultreader-ti.hpp
-  compatlogger.cpp compatlogger.hpp compatlogger.thpp
+  compatlogger.cpp compatlogger.hpp compatlogger-ti.hpp
-  externalcommandlistener.cpp externalcommandlistener.hpp externalcommandlistener.thpp
+  externalcommandlistener.cpp externalcommandlistener.hpp externalcommandlistener-ti.hpp
-  statusdatawriter.cpp statusdatawriter.hpp statusdatawriter.thpp
+  statusdatawriter.cpp statusdatawriter.hpp statusdatawriter-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

lib/compat/checkresultreader.cpp

@@ -19,7 +19,7 @@
 
 #include "icinga/compatutility.hpp"
 #include "compat/checkresultreader.hpp"
-#include "compat/checkresultreader.tcpp"
+#include "compat/checkresultreader-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/pluginutility.hpp"
 #include "icinga/icingaapplication.hpp"

lib/compat/checkresultreader.hpp

@@ -20,7 +20,7 @@
 #ifndef CHECKRESULTREADER_H
 #define CHECKRESULTREADER_H
 
-#include "compat/checkresultreader.thpp"
+#include "compat/checkresultreader-ti.hpp"
 #include "base/timer.hpp"
 #include <fstream>
 

lib/compat/compatlogger.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "compat/compatlogger.hpp"
-#include "compat/compatlogger.tcpp"
+#include "compat/compatlogger-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/checkcommand.hpp"
 #include "icinga/eventcommand.hpp"

lib/compat/compatlogger.hpp

@@ -20,7 +20,7 @@
 #ifndef COMPATLOGGER_H
 #define COMPATLOGGER_H
 
-#include "compat/compatlogger.thpp"
+#include "compat/compatlogger-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/timer.hpp"
 #include <fstream>

lib/compat/externalcommandlistener.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "compat/externalcommandlistener.hpp"
-#include "compat/externalcommandlistener.tcpp"
+#include "compat/externalcommandlistener-ti.cpp"
 #include "icinga/externalcommandprocessor.hpp"
 #include "base/configtype.hpp"
 #include "base/logger.hpp"

lib/compat/externalcommandlistener.hpp

@@ -20,7 +20,7 @@
 #ifndef EXTERNALCOMMANDLISTENER_H
 #define EXTERNALCOMMANDLISTENER_H
 
-#include "compat/externalcommandlistener.thpp"
+#include "compat/externalcommandlistener-ti.hpp"
 #include "base/objectlock.hpp"
 #include "base/timer.hpp"
 #include "base/utility.hpp"

lib/compat/statusdatawriter.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "compat/statusdatawriter.hpp"
-#include "compat/statusdatawriter.tcpp"
+#include "compat/statusdatawriter-ti.cpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/cib.hpp"
 #include "icinga/hostgroup.hpp"

lib/compat/statusdatawriter.hpp

@@ -20,7 +20,7 @@
 #ifndef STATUSDATAWRITER_H
 #define STATUSDATAWRITER_H
 
-#include "compat/statusdatawriter.thpp"
+#include "compat/statusdatawriter-ti.hpp"
 #include "icinga/customvarobject.hpp"
 #include "icinga/host.hpp"
 #include "icinga/service.hpp"

lib/db_ido/CMakeLists.txt

@@ -15,14 +15,14 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(dbconnection.ti dbconnection.tcpp dbconnection.thpp)
+mkclass_target(dbconnection.ti dbconnection-ti.cpp dbconnection-ti.hpp)
 
 mkembedconfig_target(db_ido-itl.conf db_ido-itl.cpp)
 
 set(db_ido_SOURCES
   i2-db_ido.hpp db_ido-itl.cpp
   commanddbobject.cpp commanddbobject.hpp
-  dbconnection.cpp dbconnection.hpp dbconnection.thpp
+  dbconnection.cpp dbconnection.hpp dbconnection-ti.hpp
   dbevents.cpp dbevents.hpp
   dbobject.cpp dbobject.hpp
   dbquery.cpp dbquery.hpp

lib/db_ido/dbconnection.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "db_ido/dbconnection.hpp"
-#include "db_ido/dbconnection.tcpp"
+#include "db_ido/dbconnection-ti.cpp"
 #include "db_ido/dbvalue.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/host.hpp"

lib/db_ido/dbconnection.hpp

@@ -21,7 +21,7 @@
 #define DBCONNECTION_H
 
 #include "db_ido/i2-db_ido.hpp"
-#include "db_ido/dbconnection.thpp"
+#include "db_ido/dbconnection-ti.hpp"
 #include "db_ido/dbobject.hpp"
 #include "db_ido/dbquery.hpp"
 #include "base/timer.hpp"

lib/db_ido_mysql/CMakeLists.txt

@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(idomysqlconnection.ti idomysqlconnection.tcpp idomysqlconnection.thpp)
+mkclass_target(idomysqlconnection.ti idomysqlconnection-ti.cpp idomysqlconnection-ti.hpp)
 
 set(db_ido_mysql_SOURCES
-  idomysqlconnection.cpp idomysqlconnection.hpp idomysqlconnection.thpp
+  idomysqlconnection.cpp idomysqlconnection.hpp idomysqlconnection-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

lib/db_ido_mysql/idomysqlconnection.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "db_ido_mysql/idomysqlconnection.hpp"
-#include "db_ido_mysql/idomysqlconnection.tcpp"
+#include "db_ido_mysql/idomysqlconnection-ti.cpp"
 #include "db_ido/dbtype.hpp"
 #include "db_ido/dbvalue.hpp"
 #include "base/logger.hpp"

lib/db_ido_mysql/idomysqlconnection.hpp

@@ -20,7 +20,7 @@
 #ifndef IDOMYSQLCONNECTION_H
 #define IDOMYSQLCONNECTION_H
 
-#include "db_ido_mysql/idomysqlconnection.thpp"
+#include "db_ido_mysql/idomysqlconnection-ti.hpp"
 #include "mysql_shim/mysqlinterface.hpp"
 #include "base/array.hpp"
 #include "base/timer.hpp"

lib/db_ido_pgsql/CMakeLists.txt

@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(idopgsqlconnection.ti idopgsqlconnection.tcpp idopgsqlconnection.thpp)
+mkclass_target(idopgsqlconnection.ti idopgsqlconnection-ti.cpp idopgsqlconnection-ti.hpp)
 
 set(db_ido_pgsql_SOURCES
-  idopgsqlconnection.cpp idopgsqlconnection.hpp idopgsqlconnection.thpp
+  idopgsqlconnection.cpp idopgsqlconnection.hpp idopgsqlconnection-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

lib/db_ido_pgsql/idopgsqlconnection.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "db_ido_pgsql/idopgsqlconnection.hpp"
-#include "db_ido_pgsql/idopgsqlconnection.tcpp"
+#include "db_ido_pgsql/idopgsqlconnection-ti.cpp"
 #include "db_ido/dbtype.hpp"
 #include "db_ido/dbvalue.hpp"
 #include "base/logger.hpp"

lib/db_ido_pgsql/idopgsqlconnection.hpp

@@ -20,7 +20,7 @@
 #ifndef IDOPGSQLCONNECTION_H
 #define IDOPGSQLCONNECTION_H
 
-#include "db_ido_pgsql/idopgsqlconnection.thpp"
+#include "db_ido_pgsql/idopgsqlconnection-ti.hpp"
 #include "pgsql_shim/pgsqlinterface.hpp"
 #include "base/array.hpp"
 #include "base/timer.hpp"

lib/icinga/CMakeLists.txt

@@ -15,26 +15,26 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(checkable.ti checkable.tcpp checkable.thpp)
+mkclass_target(checkable.ti checkable-ti.cpp checkable-ti.hpp)
-mkclass_target(checkcommand.ti checkcommand.tcpp checkcommand.thpp)
+mkclass_target(checkcommand.ti checkcommand-ti.cpp checkcommand-ti.hpp)
-mkclass_target(checkresult.ti checkresult.tcpp checkresult.thpp)
+mkclass_target(checkresult.ti checkresult-ti.cpp checkresult-ti.hpp)
-mkclass_target(command.ti command.tcpp command.thpp)
+mkclass_target(command.ti command-ti.cpp command-ti.hpp)
-mkclass_target(comment.ti comment.tcpp comment.thpp)
+mkclass_target(comment.ti comment-ti.cpp comment-ti.hpp)
-mkclass_target(dependency.ti dependency.tcpp dependency.thpp)
+mkclass_target(dependency.ti dependency-ti.cpp dependency-ti.hpp)
-mkclass_target(downtime.ti downtime.tcpp downtime.thpp)
+mkclass_target(downtime.ti downtime-ti.cpp downtime-ti.hpp)
-mkclass_target(eventcommand.ti eventcommand.tcpp eventcommand.thpp)
+mkclass_target(eventcommand.ti eventcommand-ti.cpp eventcommand-ti.hpp)
-mkclass_target(hostgroup.ti hostgroup.tcpp hostgroup.thpp)
+mkclass_target(hostgroup.ti hostgroup-ti.cpp hostgroup-ti.hpp)
-mkclass_target(host.ti host.tcpp host.thpp)
+mkclass_target(host.ti host-ti.cpp host-ti.hpp)
-mkclass_target(icingaapplication.ti icingaapplication.tcpp icingaapplication.thpp)
+mkclass_target(icingaapplication.ti icingaapplication-ti.cpp icingaapplication-ti.hpp)
-mkclass_target(customvarobject.ti customvarobject.tcpp customvarobject.thpp)
+mkclass_target(customvarobject.ti customvarobject-ti.cpp customvarobject-ti.hpp)
-mkclass_target(notificationcommand.ti notificationcommand.tcpp notificationcommand.thpp)
+mkclass_target(notificationcommand.ti notificationcommand-ti.cpp notificationcommand-ti.hpp)
-mkclass_target(notification.ti notification.tcpp notification.thpp)
+mkclass_target(notification.ti notification-ti.cpp notification-ti.hpp)
-mkclass_target(scheduleddowntime.ti scheduleddowntime.tcpp scheduleddowntime.thpp)
+mkclass_target(scheduleddowntime.ti scheduleddowntime-ti.cpp scheduleddowntime-ti.hpp)
-mkclass_target(servicegroup.ti servicegroup.tcpp servicegroup.thpp)
+mkclass_target(servicegroup.ti servicegroup-ti.cpp servicegroup-ti.hpp)
-mkclass_target(service.ti service.tcpp service.thpp)
+mkclass_target(service.ti service-ti.cpp service-ti.hpp)
-mkclass_target(timeperiod.ti timeperiod.tcpp timeperiod.thpp)
+mkclass_target(timeperiod.ti timeperiod-ti.cpp timeperiod-ti.hpp)
-mkclass_target(usergroup.ti usergroup.tcpp usergroup.thpp)
+mkclass_target(usergroup.ti usergroup-ti.cpp usergroup-ti.hpp)
-mkclass_target(user.ti user.tcpp user.thpp)
+mkclass_target(user.ti user-ti.cpp user-ti.hpp)
 
 mkembedconfig_target(icinga-itl.conf icinga-itl.cpp)
 
@@ -42,38 +42,38 @@ set(icinga_SOURCES
   i2-icinga.hpp icinga-itl.cpp
   apiactions.cpp apiactions.hpp
   apievents.cpp apievents.hpp
-  checkable.cpp checkable.hpp checkable.thpp
+  checkable.cpp checkable.hpp checkable-ti.hpp
   checkable-check.cpp checkable-comment.cpp checkable-dependency.cpp
   checkable-downtime.cpp checkable-event.cpp checkable-flapping.cpp
   checkable-notification.cpp checkable-script.cpp
-  checkcommand.cpp checkcommand.hpp checkcommand.thpp
+  checkcommand.cpp checkcommand.hpp checkcommand-ti.hpp
-  checkresult.cpp checkresult.hpp checkresult.thpp
+  checkresult.cpp checkresult.hpp checkresult-ti.hpp
   cib.cpp cib.hpp
   clusterevents.cpp clusterevents.hpp
-  command.cpp command.hpp command.thpp
+  command.cpp command.hpp command-ti.hpp
-  comment.cpp comment.hpp comment.thpp
+  comment.cpp comment.hpp comment-ti.hpp
   compatutility.cpp compatutility.hpp
-  customvarobject.cpp customvarobject.hpp customvarobject.thpp
+  customvarobject.cpp customvarobject.hpp customvarobject-ti.hpp
-  dependency.cpp dependency.hpp dependency.thpp dependency-apply.cpp
+  dependency.cpp dependency.hpp dependency-ti.hpp dependency-apply.cpp
-  downtime.cpp downtime.hpp downtime.thpp
+  downtime.cpp downtime.hpp downtime-ti.hpp
-  eventcommand.cpp eventcommand.hpp eventcommand.thpp
+  eventcommand.cpp eventcommand.hpp eventcommand-ti.hpp
   externalcommandprocessor.cpp externalcommandprocessor.hpp
-  host.cpp host.hpp host.thpp
+  host.cpp host.hpp host-ti.hpp
-  hostgroup.cpp hostgroup.hpp hostgroup.thpp
+  hostgroup.cpp hostgroup.hpp hostgroup-ti.hpp
-  icingaapplication.cpp icingaapplication.hpp icingaapplication.thpp
+  icingaapplication.cpp icingaapplication.hpp icingaapplication-ti.hpp
   legacytimeperiod.cpp legacytimeperiod.hpp
   macroprocessor.cpp macroprocessor.hpp
   macroresolver.hpp
-  notification.cpp notification.hpp notification.thpp notification-apply.cpp
+  notification.cpp notification.hpp notification-ti.hpp notification-apply.cpp
-  notificationcommand.cpp notificationcommand.hpp notificationcommand.thpp
+  notificationcommand.cpp notificationcommand.hpp notificationcommand-ti.hpp
   objectutils.cpp objectutils.hpp
   pluginutility.cpp pluginutility.hpp
-  scheduleddowntime.cpp scheduleddowntime.hpp scheduleddowntime.thpp scheduleddowntime-apply.cpp
+  scheduleddowntime.cpp scheduleddowntime.hpp scheduleddowntime-ti.hpp scheduleddowntime-apply.cpp
-  service.cpp service.hpp service.thpp service-apply.cpp
+  service.cpp service.hpp service-ti.hpp service-apply.cpp
-  servicegroup.cpp servicegroup.hpp servicegroup.thpp
+  servicegroup.cpp servicegroup.hpp servicegroup-ti.hpp
-  timeperiod.cpp timeperiod.hpp timeperiod.thpp
+  timeperiod.cpp timeperiod.hpp timeperiod-ti.hpp
-  user.cpp user.hpp user.thpp
+  user.cpp user.hpp user-ti.hpp
-  usergroup.cpp usergroup.hpp usergroup.thpp
+  usergroup.cpp usergroup.hpp usergroup-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

lib/icinga/checkable.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/checkable.hpp"
-#include "icinga/checkable.tcpp"
+#include "icinga/checkable-ti.cpp"
 #include "icinga/host.hpp"
 #include "icinga/service.hpp"
 #include "base/objectlock.hpp"

lib/icinga/checkable.hpp

@@ -21,7 +21,7 @@
 #define CHECKABLE_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/checkable.thpp"
+#include "icinga/checkable-ti.hpp"
 #include "icinga/timeperiod.hpp"
 #include "icinga/notification.hpp"
 #include "icinga/comment.hpp"

lib/icinga/checkcommand.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/checkcommand.hpp"
-#include "icinga/checkcommand.tcpp"
+#include "icinga/checkcommand-ti.cpp"
 #include "base/configtype.hpp"
 
 using namespace icinga;

lib/icinga/checkcommand.hpp

@@ -20,7 +20,7 @@
 #ifndef CHECKCOMMAND_H
 #define CHECKCOMMAND_H
 
-#include "icinga/checkcommand.thpp"
+#include "icinga/checkcommand-ti.hpp"
 #include "icinga/checkable.hpp"
 
 namespace icinga

lib/icinga/checkresult.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/checkresult.hpp"
-#include "icinga/checkresult.tcpp"
+#include "icinga/checkresult-ti.cpp"
 #include "base/scriptglobal.hpp"
 
 using namespace icinga;

lib/icinga/checkresult.hpp

@@ -21,7 +21,7 @@
 #define CHECKRESULT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/checkresult.thpp"
+#include "icinga/checkresult-ti.hpp"
 
 namespace icinga
 {

lib/icinga/command.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/command.hpp"
-#include "icinga/command.tcpp"
+#include "icinga/command-ti.cpp"
 #include "icinga/macroprocessor.hpp"
 #include "base/exception.hpp"
 #include "base/objectlock.hpp"

lib/icinga/command.hpp

@@ -21,7 +21,7 @@
 #define COMMAND_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/command.thpp"
+#include "icinga/command-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga

lib/icinga/comment.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/comment.hpp"
-#include "icinga/comment.tcpp"
+#include "icinga/comment-ti.cpp"
 #include "icinga/host.hpp"
 #include "remote/configobjectutility.hpp"
 #include "base/utility.hpp"

lib/icinga/comment.hpp

@@ -21,8 +21,8 @@
 #define COMMENT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/comment.thpp"
+#include "icinga/comment-ti.hpp"
-#include "icinga/checkable.thpp"
+#include "icinga/checkable-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga

lib/icinga/customvarobject.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/customvarobject.hpp"
-#include "icinga/customvarobject.tcpp"
+#include "icinga/customvarobject-ti.cpp"
 #include "icinga/macroprocessor.hpp"
 #include "base/logger.hpp"
 #include "base/function.hpp"

lib/icinga/customvarobject.hpp

@@ -21,7 +21,7 @@
 #define CUSTOMVAROBJECT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/customvarobject.thpp"
+#include "icinga/customvarobject-ti.hpp"
 #include "base/configobject.hpp"
 #include "remote/messageorigin.hpp"
 

lib/icinga/dependency.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/dependency.hpp"
-#include "icinga/dependency.tcpp"
+#include "icinga/dependency-ti.cpp"
 #include "icinga/service.hpp"
 #include "base/logger.hpp"
 #include "base/exception.hpp"

lib/icinga/dependency.hpp

@@ -21,7 +21,7 @@
 #define DEPENDENCY_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/dependency.thpp"
+#include "icinga/dependency-ti.hpp"
 
 namespace icinga
 {

lib/icinga/downtime.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/downtime.hpp"
-#include "icinga/downtime.tcpp"
+#include "icinga/downtime-ti.cpp"
 #include "icinga/host.hpp"
 #include "icinga/scheduleddowntime.hpp"
 #include "remote/configobjectutility.hpp"

lib/icinga/downtime.hpp

@@ -21,8 +21,8 @@
 #define DOWNTIME_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/downtime.thpp"
+#include "icinga/downtime-ti.hpp"
-#include "icinga/checkable.thpp"
+#include "icinga/checkable-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga

lib/icinga/eventcommand.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/eventcommand.hpp"
-#include "icinga/eventcommand.tcpp"
+#include "icinga/eventcommand-ti.cpp"
 
 using namespace icinga;
 

lib/icinga/eventcommand.hpp

@@ -20,7 +20,7 @@
 #ifndef EVENTCOMMAND_H
 #define EVENTCOMMAND_H
 
-#include "icinga/eventcommand.thpp"
+#include "icinga/eventcommand-ti.hpp"
 #include "icinga/checkable.hpp"
 
 namespace icinga

lib/icinga/host.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/host.hpp"
-#include "icinga/host.tcpp"
+#include "icinga/host-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/hostgroup.hpp"
 #include "icinga/pluginutility.hpp"

lib/icinga/host.hpp

@@ -21,7 +21,7 @@
 #define HOST_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/host.thpp"
+#include "icinga/host-ti.hpp"
 #include "icinga/macroresolver.hpp"
 #include "icinga/checkresult.hpp"
 

lib/icinga/hostgroup.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/hostgroup.hpp"
-#include "icinga/hostgroup.tcpp"
+#include "icinga/hostgroup-ti.cpp"
 #include "config/objectrule.hpp"
 #include "config/configitem.hpp"
 #include "base/configtype.hpp"

lib/icinga/hostgroup.hpp

@@ -21,7 +21,7 @@
 #define HOSTGROUP_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/hostgroup.thpp"
+#include "icinga/hostgroup-ti.hpp"
 #include "icinga/host.hpp"
 
 namespace icinga

lib/icinga/icingaapplication.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/icingaapplication.hpp"
-#include "icinga/icingaapplication.tcpp"
+#include "icinga/icingaapplication-ti.cpp"
 #include "icinga/cib.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "config/configcompiler.hpp"

lib/icinga/icingaapplication.hpp

@@ -21,7 +21,7 @@
 #define ICINGAAPPLICATION_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/icingaapplication.thpp"
+#include "icinga/icingaapplication-ti.hpp"
 #include "icinga/macroresolver.hpp"
 
 namespace icinga

lib/icinga/notification.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/notification.hpp"
-#include "icinga/notification.tcpp"
+#include "icinga/notification-ti.cpp"
 #include "icinga/notificationcommand.hpp"
 #include "icinga/service.hpp"
 #include "remote/apilistener.hpp"

lib/icinga/notification.hpp

@@ -21,8 +21,8 @@
 #define NOTIFICATION_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/notification.thpp"
+#include "icinga/notification-ti.hpp"
-#include "icinga/checkable.thpp"
+#include "icinga/checkable-ti.hpp"
 #include "icinga/user.hpp"
 #include "icinga/usergroup.hpp"
 #include "icinga/timeperiod.hpp"

lib/icinga/notificationcommand.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/notificationcommand.hpp"
-#include "icinga/notificationcommand.tcpp"
+#include "icinga/notificationcommand-ti.cpp"
 
 using namespace icinga;
 

lib/icinga/notificationcommand.hpp

@@ -20,7 +20,7 @@
 #ifndef NOTIFICATIONCOMMAND_H
 #define NOTIFICATIONCOMMAND_H
 
-#include "icinga/notificationcommand.thpp"
+#include "icinga/notificationcommand-ti.hpp"
 #include "icinga/notification.hpp"
 
 namespace icinga

lib/icinga/scheduleddowntime.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/scheduleddowntime.hpp"
-#include "icinga/scheduleddowntime.tcpp"
+#include "icinga/scheduleddowntime-ti.cpp"
 #include "icinga/legacytimeperiod.hpp"
 #include "icinga/downtime.hpp"
 #include "icinga/service.hpp"

lib/icinga/scheduleddowntime.hpp

@@ -21,7 +21,7 @@
 #define SCHEDULEDDOWNTIME_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/scheduleddowntime.thpp"
+#include "icinga/scheduleddowntime-ti.hpp"
 #include "icinga/checkable.hpp"
 
 namespace icinga

lib/icinga/service.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/service.hpp"
-#include "icinga/service.tcpp"
+#include "icinga/service-ti.cpp"
 #include "icinga/servicegroup.hpp"
 #include "icinga/scheduleddowntime.hpp"
 #include "icinga/pluginutility.hpp"

lib/icinga/service.hpp

@@ -21,7 +21,7 @@
 #define SERVICE_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/service.thpp"
+#include "icinga/service-ti.hpp"
 #include "icinga/macroresolver.hpp"
 #include "icinga/host.hpp"
 #include <tuple>

lib/icinga/servicegroup.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/servicegroup.hpp"
-#include "icinga/servicegroup.tcpp"
+#include "icinga/servicegroup-ti.cpp"
 #include "config/objectrule.hpp"
 #include "config/configitem.hpp"
 #include "base/configtype.hpp"

lib/icinga/servicegroup.hpp

@@ -21,7 +21,7 @@
 #define SERVICEGROUP_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/servicegroup.thpp"
+#include "icinga/servicegroup-ti.hpp"
 #include "icinga/service.hpp"
 
 namespace icinga

lib/icinga/timeperiod.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/timeperiod.hpp"
-#include "icinga/timeperiod.tcpp"
+#include "icinga/timeperiod-ti.cpp"
 #include "icinga/legacytimeperiod.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"

lib/icinga/timeperiod.hpp

@@ -21,7 +21,7 @@
 #define TIMEPERIOD_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/timeperiod.thpp"
+#include "icinga/timeperiod-ti.hpp"
 
 namespace icinga
 {

lib/icinga/user.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/user.hpp"
-#include "icinga/user.tcpp"
+#include "icinga/user-ti.cpp"
 #include "icinga/usergroup.hpp"
 #include "icinga/notification.hpp"
 #include "icinga/usergroup.hpp"

lib/icinga/user.hpp

@@ -21,7 +21,7 @@
 #define USER_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/user.thpp"
+#include "icinga/user-ti.hpp"
 #include "icinga/timeperiod.hpp"
 #include "remote/messageorigin.hpp"
 

lib/icinga/usergroup.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/usergroup.hpp"
-#include "icinga/usergroup.tcpp"
+#include "icinga/usergroup-ti.cpp"
 #include "config/objectrule.hpp"
 #include "config/configitem.hpp"
 #include "base/configtype.hpp"

lib/icinga/usergroup.hpp

@@ -21,7 +21,7 @@
 #define USERGROUP_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/usergroup.thpp"
+#include "icinga/usergroup-ti.hpp"
 #include "icinga/user.hpp"
 
 namespace icinga

lib/livestatus/CMakeLists.txt

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(livestatuslistener.ti livestatuslistener.tcpp livestatuslistener.thpp)
+mkclass_target(livestatuslistener.ti livestatuslistener-ti.cpp livestatuslistener-ti.hpp)
 
 set(livestatus_SOURCES
   i2-livestatus.hpp
@@ -38,7 +38,7 @@ set(livestatus_SOURCES
   hoststable.cpp hoststable.hpp
   invavgaggregator.cpp invavgaggregator.hpp
   invsumaggregator.cpp invsumaggregator.hpp
-  livestatuslistener.cpp livestatuslistener.hpp livestatuslistener.thpp
+  livestatuslistener.cpp livestatuslistener.hpp livestatuslistener-ti.hpp
   livestatuslogutility.cpp livestatuslogutility.hpp
   livestatusquery.cpp livestatusquery.hpp
   logtable.cpp logtable.hpp

lib/livestatus/livestatuslistener.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "livestatus/livestatuslistener.hpp"
-#include "livestatus/livestatuslistener.tcpp"
+#include "livestatus/livestatuslistener-ti.cpp"
 #include "base/utility.hpp"
 #include "base/perfdatavalue.hpp"
 #include "base/objectlock.hpp"

lib/livestatus/livestatuslistener.hpp

@@ -21,7 +21,7 @@
 #define LIVESTATUSLISTENER_H
 
 #include "livestatus/i2-livestatus.hpp"
-#include "livestatus/livestatuslistener.thpp"
+#include "livestatus/livestatuslistener-ti.hpp"
 #include "livestatus/livestatusquery.hpp"
 #include "base/socket.hpp"
 #include <thread>

lib/notification/CMakeLists.txt

@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(notificationcomponent.ti notificationcomponent.tcpp notificationcomponent.thpp)
+mkclass_target(notificationcomponent.ti notificationcomponent-ti.cpp notificationcomponent-ti.hpp)
 
 set(notification_SOURCES
-  notificationcomponent.cpp notificationcomponent.hpp notificationcomponent.thpp
+  notificationcomponent.cpp notificationcomponent.hpp notificationcomponent-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

lib/notification/notificationcomponent.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "notification/notificationcomponent.hpp"
-#include "notification/notificationcomponent.tcpp"
+#include "notification/notificationcomponent-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "base/configtype.hpp"

lib/notification/notificationcomponent.hpp

@@ -20,7 +20,7 @@
 #ifndef NOTIFICATIONCOMPONENT_H
 #define NOTIFICATIONCOMPONENT_H
 
-#include "notification/notificationcomponent.thpp"
+#include "notification/notificationcomponent-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/timer.hpp"

lib/perfdata/CMakeLists.txt

@@ -15,20 +15,20 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(gelfwriter.ti gelfwriter.tcpp gelfwriter.thpp)
+mkclass_target(gelfwriter.ti gelfwriter-ti.cpp gelfwriter-ti.hpp)
-mkclass_target(graphitewriter.ti graphitewriter.tcpp graphitewriter.thpp)
+mkclass_target(graphitewriter.ti graphitewriter-ti.cpp graphitewriter-ti.hpp)
-mkclass_target(influxdbwriter.ti influxdbwriter.tcpp influxdbwriter.thpp)
+mkclass_target(influxdbwriter.ti influxdbwriter-ti.cpp influxdbwriter-ti.hpp)
-mkclass_target(elasticsearchwriter.ti elasticsearchwriter.tcpp elasticsearchwriter.thpp)
+mkclass_target(elasticsearchwriter.ti elasticsearchwriter-ti.cpp elasticsearchwriter-ti.hpp)
-mkclass_target(opentsdbwriter.ti opentsdbwriter.tcpp opentsdbwriter.thpp)
+mkclass_target(opentsdbwriter.ti opentsdbwriter-ti.cpp opentsdbwriter-ti.hpp)
-mkclass_target(perfdatawriter.ti perfdatawriter.tcpp perfdatawriter.thpp)
+mkclass_target(perfdatawriter.ti perfdatawriter-ti.cpp perfdatawriter-ti.hpp)
 
 set(perfdata_SOURCES
-  elasticsearchwriter.cpp elasticsearchwriter.hpp elasticsearchwriter.thpp
+  elasticsearchwriter.cpp elasticsearchwriter.hpp elasticsearchwriter-ti.hpp
-  gelfwriter.cpp gelfwriter.hpp gelfwriter.thpp
+  gelfwriter.cpp gelfwriter.hpp gelfwriter-ti.hpp
-  graphitewriter.cpp graphitewriter.hpp graphitewriter.thpp
+  graphitewriter.cpp graphitewriter.hpp graphitewriter-ti.hpp
-  influxdbwriter.cpp influxdbwriter.hpp influxdbwriter.thpp
+  influxdbwriter.cpp influxdbwriter.hpp influxdbwriter-ti.hpp
-  opentsdbwriter.cpp opentsdbwriter.hpp opentsdbwriter.thpp
+  opentsdbwriter.cpp opentsdbwriter.hpp opentsdbwriter-ti.hpp
-  perfdatawriter.cpp perfdatawriter.hpp perfdatawriter.thpp
+  perfdatawriter.cpp perfdatawriter.hpp perfdatawriter-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

lib/perfdata/elasticsearchwriter.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/elasticsearchwriter.hpp"
-#include "perfdata/elasticsearchwriter.tcpp"
+#include "perfdata/elasticsearchwriter-ti.cpp"
 #include "remote/url.hpp"
 #include "remote/httprequest.hpp"
 #include "remote/httpresponse.hpp"

lib/perfdata/elasticsearchwriter.hpp

@@ -20,7 +20,7 @@
 #ifndef ELASTICSEARCHWRITER_H
 #define ELASTICSEARCHWRITER_H
 
-#include "perfdata/elasticsearchwriter.thpp"
+#include "perfdata/elasticsearchwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/workqueue.hpp"

lib/perfdata/gelfwriter.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/gelfwriter.hpp"
-#include "perfdata/gelfwriter.tcpp"
+#include "perfdata/gelfwriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/notification.hpp"
 #include "icinga/checkcommand.hpp"

lib/perfdata/gelfwriter.hpp

@@ -20,7 +20,7 @@
 #ifndef GELFWRITER_H
 #define GELFWRITER_H
 
-#include "perfdata/gelfwriter.thpp"
+#include "perfdata/gelfwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"

lib/perfdata/graphitewriter.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/graphitewriter.hpp"
-#include "perfdata/graphitewriter.tcpp"
+#include "perfdata/graphitewriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"

lib/perfdata/graphitewriter.hpp

@@ -20,7 +20,7 @@
 #ifndef GRAPHITEWRITER_H
 #define GRAPHITEWRITER_H
 
-#include "perfdata/graphitewriter.thpp"
+#include "perfdata/graphitewriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"

lib/perfdata/influxdbwriter.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/influxdbwriter.hpp"
-#include "perfdata/influxdbwriter.tcpp"
+#include "perfdata/influxdbwriter-ti.cpp"
 #include "remote/url.hpp"
 #include "remote/httprequest.hpp"
 #include "remote/httpresponse.hpp"

lib/perfdata/influxdbwriter.hpp

@@ -20,7 +20,7 @@
 #ifndef INFLUXDBWRITER_H
 #define INFLUXDBWRITER_H
 
-#include "perfdata/influxdbwriter.thpp"
+#include "perfdata/influxdbwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"

lib/perfdata/opentsdbwriter.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/opentsdbwriter.hpp"
-#include "perfdata/opentsdbwriter.tcpp"
+#include "perfdata/opentsdbwriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"

lib/perfdata/opentsdbwriter.hpp

@@ -20,7 +20,7 @@
 #ifndef OPENTSDBWRITER_H
 #define OPENTSDBWRITER_H
 
-#include "perfdata/opentsdbwriter.thpp"
+#include "perfdata/opentsdbwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"

lib/perfdata/perfdatawriter.cpp

@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/perfdatawriter.hpp"
-#include "perfdata/perfdatawriter.tcpp"
+#include "perfdata/perfdatawriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"

lib/perfdata/perfdatawriter.hpp

@@ -20,7 +20,7 @@
 #ifndef PERFDATAWRITER_H
 #define PERFDATAWRITER_H
 
-#include "perfdata/perfdatawriter.thpp"
+#include "perfdata/perfdatawriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/timer.hpp"