Fix compatibility with CMake < 3.1

diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 48332ee6997c9410e5440cfda91998d1e5f995e6..905d638b84e46e83c7b755a4adee14aec8aa256c 100644 (file)
--- a/lib/base/CMakeLists.txt
+++ b/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(configobject.ti configobject.tcpp configobject.thpp)
-mkclass_target(datetime.ti datetime.tcpp datetime.thpp)
-mkclass_target(filelogger.ti filelogger.tcpp filelogger.thpp)
-mkclass_target(function.ti function.tcpp function.thpp)
-mkclass_target(logger.ti logger.tcpp logger.thpp)
-mkclass_target(perfdatavalue.ti perfdatavalue.tcpp perfdatavalue.thpp)
-mkclass_target(streamlogger.ti streamlogger.tcpp streamlogger.thpp)
-mkclass_target(sysloglogger.ti sysloglogger.tcpp sysloglogger.thpp)
+mkclass_target(application.ti application-ti.cpp application-ti.hpp)
+mkclass_target(configobject.ti configobject-ti.cpp configobject-ti.hpp)
+mkclass_target(datetime.ti datetime-ti.cpp datetime-ti.hpp)
+mkclass_target(filelogger.ti filelogger-ti.cpp filelogger-ti.hpp)
+mkclass_target(function.ti function-ti.cpp function-ti.hpp)
+mkclass_target(logger.ti logger-ti.cpp logger-ti.hpp)
+mkclass_target(perfdatavalue.ti perfdatavalue-ti.cpp perfdatavalue-ti.hpp)
+mkclass_target(streamlogger.ti streamlogger-ti.cpp streamlogger-ti.hpp)
+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
-  function.cpp function.hpp function.thpp function-script.cpp functionwrapper.hpp
+  filelogger.cpp filelogger.hpp filelogger-ti.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

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index e1717522c57d1a6187865b1992115374d91c9344..a2b7918dcdfdf8c0782dab5ae4720fc259ff951c 100644 (file)
--- a/lib/base/application.cpp
+++ b/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"

diff --git a/lib/base/application.hpp b/lib/base/application.hpp
index 429d06aba81cd5595bbf8961590b1765123531fb..1a16f7c9dde1eb242e70741adc67a4ebcfbf38dc 100644 (file)
--- a/lib/base/application.hpp
+++ b/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"

diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
index 8fe176b31519ed85adcf9be7d5e24418e6101d20..5958497df5f9afcf730c3bb78727c9ed7bd226a9 100644 (file)
--- a/lib/base/configobject.cpp
+++ b/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"

diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp
index 013f603dd7f500286d41f3d1d3265beb217d5947..9afadac90217723a400a5eaaf3d8f9bb90cea05f 100644 (file)
--- a/lib/base/configobject.hpp
+++ b/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"

diff --git a/lib/base/datetime.cpp b/lib/base/datetime.cpp
index a043aa24e0061738eea57778ab0e62efb5b293d1..808312269623207eccf628268395ee706afd24c4 100644 (file)
--- a/lib/base/datetime.cpp
+++ b/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"
 

diff --git a/lib/base/datetime.hpp b/lib/base/datetime.hpp
index 7ac84dcfab45b257bd40fba4bc23eec33aaac469..54821b3a7dd2c69229c7c9b5546f05714b0962ea 100644 (file)
--- a/lib/base/datetime.hpp
+++ b/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>
 

diff --git a/lib/base/filelogger.cpp b/lib/base/filelogger.cpp
index b1c8b0ad10f308df2b06eb1013b9a16730b1f498..5ae739d2e82c51fa9eb314831567b83b7ba134a9 100644 (file)
--- a/lib/base/filelogger.cpp
+++ b/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"

diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp
index d4a5dc5ec08532e8ef56a90c633f3a126ba7f1d3..8c9a8eee99a1400dcded9667ab555e563f8b1a63 100644 (file)
--- a/lib/base/filelogger.hpp
+++ b/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
 {

diff --git a/lib/base/function.cpp b/lib/base/function.cpp
index 13bf1d0758130d28e94a153c569bd5d648811072..6fec96208e5b86d4294db809ef2cbc77c9fa850b 100644 (file)
--- a/lib/base/function.cpp
+++ b/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"
 

diff --git a/lib/base/function.hpp b/lib/base/function.hpp
index b607fea140b0bd17937f95c8ec35be41164513ef..dd08df6ff7d5207bbabab12f995a5d4bd7f0e14f 100644 (file)
--- a/lib/base/function.hpp
+++ b/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"

diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
index 9425a7fd1a3f87625153c1487c92bf8b20d1a52f..1ff1d14c4480b65c58673759eb5ae716eda78f42 100644 (file)
--- a/lib/base/logger.cpp
+++ b/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"

diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp
index 40f4b455dabad3eb950ddfe3485d5bb02daf5531..d77252e881ad84df28fbac450a8239e90e6694a0 100644 (file)
--- a/lib/base/logger.hpp
+++ b/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>
 

diff --git a/lib/base/perfdatavalue.cpp b/lib/base/perfdatavalue.cpp
index 407f757f74f0675d6b1837010a7b6217897b4a63..2dfdac57be16489a986535340167db15dd9761aa 100644 (file)
--- a/lib/base/perfdatavalue.cpp
+++ b/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"

diff --git a/lib/base/perfdatavalue.hpp b/lib/base/perfdatavalue.hpp
index d79af942c0f7c3d2768c963df233c3828c0085ac..a72d267beb392547fe5634f979c36791c2eb7f0a 100644 (file)
--- a/lib/base/perfdatavalue.hpp
+++ b/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
 {

diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp
index c92fbccbbdaec89e158b751c5518f05974dd2ec8..fa93d740b71d2f7d1621e014e2604af7fcd45908 100644 (file)
--- a/lib/base/streamlogger.cpp
+++ b/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"

diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp
index 6376610e7b37ab75b5f311c2dbbfa49341da330f..3c6e6faf66e9f44709fcfd3354ecfaaf02439aae 100644 (file)
--- a/lib/base/streamlogger.hpp
+++ b/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>
 

diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp
index e7e17a92fce6f523bb396d96a8c50b65059c426f..b5d735a8030fffa79718e23a07e81bdd253cec2f 100644 (file)
--- a/lib/base/sysloglogger.cpp
+++ b/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;
 

diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp
index e81ffe700fb963b20c5810fc396f9005f3f586e1..8718a21d0ed84b2b70283e85282651ee19f1dd13 100644 (file)
--- a/lib/base/sysloglogger.hpp
+++ b/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
 {

diff --git a/lib/checker/CMakeLists.txt b/lib/checker/CMakeLists.txt
index f2a9f156c5e88297e3bae398ae61f06cf27711a2..78d4eb1869d51d0143f2a81dfc440a2faf94bcc6 100644 (file)
--- a/lib/checker/CMakeLists.txt
+++ b/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)

diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
index f2027e9ea7767b36cc7140db0d7f1f1fd82fe5a7..12e43b73c7509c006e609b3c048328439abaa712 100644 (file)
--- a/lib/checker/checkercomponent.cpp
+++ b/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"

diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp
index fd67b94454231fbb68d8ea61e04fb6ee7074d23e..601bb58b20ac1ac3eb18cea91d9d549bda31df46 100644 (file)
--- a/lib/checker/checkercomponent.hpp
+++ b/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"

diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt
index 5dd249689c3196af3bede33b6f3189c51a328c91..939a9f388e8663135d073a66d0c2783742c36c7e 100644 (file)
--- a/lib/compat/CMakeLists.txt
+++ b/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(compatlogger.ti compatlogger.tcpp compatlogger.thpp)
-mkclass_target(externalcommandlistener.ti externalcommandlistener.tcpp externalcommandlistener.thpp)
-mkclass_target(statusdatawriter.ti statusdatawriter.tcpp statusdatawriter.thpp)
+mkclass_target(checkresultreader.ti checkresultreader-ti.cpp checkresultreader-ti.hpp)
+mkclass_target(compatlogger.ti compatlogger-ti.cpp compatlogger-ti.hpp)
+mkclass_target(externalcommandlistener.ti externalcommandlistener-ti.cpp externalcommandlistener-ti.hpp)
+mkclass_target(statusdatawriter.ti statusdatawriter-ti.cpp statusdatawriter-ti.hpp)
 
 set(compat_SOURCES
-  checkresultreader.cpp checkresultreader.hpp checkresultreader.thpp
-  compatlogger.cpp compatlogger.hpp compatlogger.thpp
-  externalcommandlistener.cpp externalcommandlistener.hpp externalcommandlistener.thpp
-  statusdatawriter.cpp statusdatawriter.hpp statusdatawriter.thpp
+  checkresultreader.cpp checkresultreader.hpp checkresultreader-ti.hpp
+  compatlogger.cpp compatlogger.hpp compatlogger-ti.hpp
+  externalcommandlistener.cpp externalcommandlistener.hpp externalcommandlistener-ti.hpp
+  statusdatawriter.cpp statusdatawriter.hpp statusdatawriter-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

diff --git a/lib/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp
index 01e35dbd8fba71faa72fa5bfc00fbd9f66099054..557b9037da09667cdcd22cc66eba3c445f1ba50e 100644 (file)
--- a/lib/compat/checkresultreader.cpp
+++ b/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"

diff --git a/lib/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp
index 2885e3fc4068d6e0218480c751d51d70b5520916..445f8354cbe0d6a196c2846f680e15fd158093a0 100644 (file)
--- a/lib/compat/checkresultreader.hpp
+++ b/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>
 

diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp
index 58b97af698665429071ce9608d70a26c31e9365c..29990a8ea9f5fcec0916b76589dd6a3b1822efdc 100644 (file)
--- a/lib/compat/compatlogger.cpp
+++ b/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"

diff --git a/lib/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp
index 1665b19abc8770c9c099f5201c6f661210a5d1fa..fecab1f99ac3057cb30bc640c0ea3ae76001b5ea 100644 (file)
--- a/lib/compat/compatlogger.hpp
+++ b/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>

diff --git a/lib/compat/externalcommandlistener.cpp b/lib/compat/externalcommandlistener.cpp
index 5843bfd32c48694af5ed0795749da6c32e53faec..bb9402c799709c4a0f9799b3af4ae784c9b4dcff 100644 (file)
--- a/lib/compat/externalcommandlistener.cpp
+++ b/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"

diff --git a/lib/compat/externalcommandlistener.hpp b/lib/compat/externalcommandlistener.hpp
index 3510cd995b8409da3511bcd3425f8aa6aa24e2de..a2adc47ef613e3c6baa7b1a577778a2d66c64042 100644 (file)
--- a/lib/compat/externalcommandlistener.hpp
+++ b/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"

diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
index 90b8ef1317ef88406bfbec420b14184d44cce207..dd3ef329642d320ced410b751fb3a87f8a26079b 100644 (file)
--- a/lib/compat/statusdatawriter.cpp
+++ b/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"

diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp
index 5dd68427f5d560ac1454b6f09bc9b5e12690983d..b8fb71d33983c0914a17fa641093a6ff08942e2f 100644 (file)
--- a/lib/compat/statusdatawriter.hpp
+++ b/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"

diff --git a/lib/db_ido/CMakeLists.txt b/lib/db_ido/CMakeLists.txt
index b8f49fb288712bb49b1eeca2bb3d4e931df3e30b..b55184f2acf6ebcec595ac64b530314ad04c3858 100644 (file)
--- a/lib/db_ido/CMakeLists.txt
+++ b/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

diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 79d058614c6692c70c17aa3ffc938cc3c244da3f..30f602d563f425bd530562e48e75c7e9d73dcf85 100644 (file)
--- a/lib/db_ido/dbconnection.cpp
+++ b/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"

diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp
index e1eb506334727e728c473e53807a91ed3ecd314e..20ea9324f03bbae2649d550e0b7ba739b9932fd8 100644 (file)
--- a/lib/db_ido/dbconnection.hpp
+++ b/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"

diff --git a/lib/db_ido_mysql/CMakeLists.txt b/lib/db_ido_mysql/CMakeLists.txt
index aedc19ddf5e640e315414b6f410b1b7e88d01762..50eef55c388f6b8395583bb7e4c868f81e4baf64 100644 (file)
--- a/lib/db_ido_mysql/CMakeLists.txt
+++ b/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)

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 70e0196855871d101acfbbbb08024ec9ace0dd91..9c8fd7b41b67a4a0fa2d4e4fc031c1d65bd6473c 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/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"

diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp
index fa2383cd443ed2481648644a88edd62007cdaae2..0a13bb73a7e13e38b1a52448d3b8b8f194a056c0 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.hpp
+++ b/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"

diff --git a/lib/db_ido_pgsql/CMakeLists.txt b/lib/db_ido_pgsql/CMakeLists.txt
index de7121da153d829d7acce2471b39a92dc3dca517..9cc900472dd731e3e2dc53bbabc6b97d8db9b724 100644 (file)
--- a/lib/db_ido_pgsql/CMakeLists.txt
+++ b/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)

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index d9483e7851c91e8c5f6fb67ce4414bb44992685b..6bb4ee7ee793d4668e2464dc1031819b6c7813d7 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/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"

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp
index b00a4b7078c11ed85a622988546d95fb25286361..3b1dc2649d554532c9c7ec3a8f02f62d78749654 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.hpp
+++ b/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"

diff --git a/lib/icinga/CMakeLists.txt b/lib/icinga/CMakeLists.txt
index 25a1f0fe6f3d34fc1336952a2a096b5ea60d6bc0..d3e126af37a27d2e30064b97315283a7ffca336d 100644 (file)
--- a/lib/icinga/CMakeLists.txt
+++ b/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(checkcommand.ti checkcommand.tcpp checkcommand.thpp)
-mkclass_target(checkresult.ti checkresult.tcpp checkresult.thpp)
-mkclass_target(command.ti command.tcpp command.thpp)
-mkclass_target(comment.ti comment.tcpp comment.thpp)
-mkclass_target(dependency.ti dependency.tcpp dependency.thpp)
-mkclass_target(downtime.ti downtime.tcpp downtime.thpp)
-mkclass_target(eventcommand.ti eventcommand.tcpp eventcommand.thpp)
-mkclass_target(hostgroup.ti hostgroup.tcpp hostgroup.thpp)
-mkclass_target(host.ti host.tcpp host.thpp)
-mkclass_target(icingaapplication.ti icingaapplication.tcpp icingaapplication.thpp)
-mkclass_target(customvarobject.ti customvarobject.tcpp customvarobject.thpp)
-mkclass_target(notificationcommand.ti notificationcommand.tcpp notificationcommand.thpp)
-mkclass_target(notification.ti notification.tcpp notification.thpp)
-mkclass_target(scheduleddowntime.ti scheduleddowntime.tcpp scheduleddowntime.thpp)
-mkclass_target(servicegroup.ti servicegroup.tcpp servicegroup.thpp)
-mkclass_target(service.ti service.tcpp service.thpp)
-mkclass_target(timeperiod.ti timeperiod.tcpp timeperiod.thpp)
-mkclass_target(usergroup.ti usergroup.tcpp usergroup.thpp)
-mkclass_target(user.ti user.tcpp user.thpp)
+mkclass_target(checkable.ti checkable-ti.cpp checkable-ti.hpp)
+mkclass_target(checkcommand.ti checkcommand-ti.cpp checkcommand-ti.hpp)
+mkclass_target(checkresult.ti checkresult-ti.cpp checkresult-ti.hpp)
+mkclass_target(command.ti command-ti.cpp command-ti.hpp)
+mkclass_target(comment.ti comment-ti.cpp comment-ti.hpp)
+mkclass_target(dependency.ti dependency-ti.cpp dependency-ti.hpp)
+mkclass_target(downtime.ti downtime-ti.cpp downtime-ti.hpp)
+mkclass_target(eventcommand.ti eventcommand-ti.cpp eventcommand-ti.hpp)
+mkclass_target(hostgroup.ti hostgroup-ti.cpp hostgroup-ti.hpp)
+mkclass_target(host.ti host-ti.cpp host-ti.hpp)
+mkclass_target(icingaapplication.ti icingaapplication-ti.cpp icingaapplication-ti.hpp)
+mkclass_target(customvarobject.ti customvarobject-ti.cpp customvarobject-ti.hpp)
+mkclass_target(notificationcommand.ti notificationcommand-ti.cpp notificationcommand-ti.hpp)
+mkclass_target(notification.ti notification-ti.cpp notification-ti.hpp)
+mkclass_target(scheduleddowntime.ti scheduleddowntime-ti.cpp scheduleddowntime-ti.hpp)
+mkclass_target(servicegroup.ti servicegroup-ti.cpp servicegroup-ti.hpp)
+mkclass_target(service.ti service-ti.cpp service-ti.hpp)
+mkclass_target(timeperiod.ti timeperiod-ti.cpp timeperiod-ti.hpp)
+mkclass_target(usergroup.ti usergroup-ti.cpp usergroup-ti.hpp)
+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
-  checkresult.cpp checkresult.hpp checkresult.thpp
+  checkcommand.cpp checkcommand.hpp checkcommand-ti.hpp
+  checkresult.cpp checkresult.hpp checkresult-ti.hpp
   cib.cpp cib.hpp
   clusterevents.cpp clusterevents.hpp
-  command.cpp command.hpp command.thpp
-  comment.cpp comment.hpp comment.thpp
+  command.cpp command.hpp command-ti.hpp
+  comment.cpp comment.hpp comment-ti.hpp
   compatutility.cpp compatutility.hpp
-  customvarobject.cpp customvarobject.hpp customvarobject.thpp
-  dependency.cpp dependency.hpp dependency.thpp dependency-apply.cpp
-  downtime.cpp downtime.hpp downtime.thpp
-  eventcommand.cpp eventcommand.hpp eventcommand.thpp
+  customvarobject.cpp customvarobject.hpp customvarobject-ti.hpp
+  dependency.cpp dependency.hpp dependency-ti.hpp dependency-apply.cpp
+  downtime.cpp downtime.hpp downtime-ti.hpp
+  eventcommand.cpp eventcommand.hpp eventcommand-ti.hpp
   externalcommandprocessor.cpp externalcommandprocessor.hpp
-  host.cpp host.hpp host.thpp
-  hostgroup.cpp hostgroup.hpp hostgroup.thpp
-  icingaapplication.cpp icingaapplication.hpp icingaapplication.thpp
+  host.cpp host.hpp host-ti.hpp
+  hostgroup.cpp hostgroup.hpp hostgroup-ti.hpp
+  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
-  notificationcommand.cpp notificationcommand.hpp notificationcommand.thpp
+  notification.cpp notification.hpp notification-ti.hpp notification-apply.cpp
+  notificationcommand.cpp notificationcommand.hpp notificationcommand-ti.hpp
   objectutils.cpp objectutils.hpp
   pluginutility.cpp pluginutility.hpp
-  scheduleddowntime.cpp scheduleddowntime.hpp scheduleddowntime.thpp scheduleddowntime-apply.cpp
-  service.cpp service.hpp service.thpp service-apply.cpp
-  servicegroup.cpp servicegroup.hpp servicegroup.thpp
-  timeperiod.cpp timeperiod.hpp timeperiod.thpp
-  user.cpp user.hpp user.thpp
-  usergroup.cpp usergroup.hpp usergroup.thpp
+  scheduleddowntime.cpp scheduleddowntime.hpp scheduleddowntime-ti.hpp scheduleddowntime-apply.cpp
+  service.cpp service.hpp service-ti.hpp service-apply.cpp
+  servicegroup.cpp servicegroup.hpp servicegroup-ti.hpp
+  timeperiod.cpp timeperiod.hpp timeperiod-ti.hpp
+  user.cpp user.hpp user-ti.hpp
+  usergroup.cpp usergroup.hpp usergroup-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 9b66eb2408818f58f6e5fa786738922d66fb96a5..69af2c5813241fc4be9ca073ca4a18e593014d32 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/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"

diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
index 107def55fc331e4e31beb6ab1d4d4f9e1ff2aab0..24582389da74834f5d28bff92fb4db673024d5e1 100644 (file)
--- a/lib/icinga/checkable.hpp
+++ b/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"

diff --git a/lib/icinga/checkcommand.cpp b/lib/icinga/checkcommand.cpp
index 5d9da103a2098d4b6b05ce82cfac89409da351b9..e32af3220061932fa8eb36ce863f4bcdaa3403fa 100644 (file)
--- a/lib/icinga/checkcommand.cpp
+++ b/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;

diff --git a/lib/icinga/checkcommand.hpp b/lib/icinga/checkcommand.hpp
index 84c89fe822e889339919f53fcdd3679d4decfa57..471d6c2a12cdd0bfba580b7520f26be23d8046c0 100644 (file)
--- a/lib/icinga/checkcommand.hpp
+++ b/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

diff --git a/lib/icinga/checkresult.cpp b/lib/icinga/checkresult.cpp
index cbbab12dcf62c4df11677b088b2d55d1bdc7c4aa..52b1bb5e36154a0bf4c801010499c4b4abaccebd 100644 (file)
--- a/lib/icinga/checkresult.cpp
+++ b/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;

diff --git a/lib/icinga/checkresult.hpp b/lib/icinga/checkresult.hpp
index 7ac615fc7108ac08d51b28e6f6e15525fb14973d..245b4ba320043f1e33fc4260eb587148f3bafa63 100644 (file)
--- a/lib/icinga/checkresult.hpp
+++ b/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
 {

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index 9eec7e697d78cef732e174f22379538a0e523e3c..628ed301aca5535cbdd105ccbc92b4432a6e2c3c 100644 (file)
--- a/lib/icinga/command.cpp
+++ b/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"

diff --git a/lib/icinga/command.hpp b/lib/icinga/command.hpp
index 82d6aceaf568ba52d1a0fb5f229ee6db6de889eb..fa1aa5c0395d5a2498e408044b34467541f4f709 100644 (file)
--- a/lib/icinga/command.hpp
+++ b/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

diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp
index 77cc448a77ee14e77ad73b0399286eb098da71fc..2eb8c4f6d1386dd8b9064053f8ce28af0dfd5014 100644 (file)
--- a/lib/icinga/comment.cpp
+++ b/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"

diff --git a/lib/icinga/comment.hpp b/lib/icinga/comment.hpp
index d8cb2a91e5f1c909034d79b9550b6752c175cb12..d031b66dec320e55e321edf5d0540e73ade6deb0 100644 (file)
--- a/lib/icinga/comment.hpp
+++ b/lib/icinga/comment.hpp
@@ -21,8 +21,8 @@
 #define COMMENT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/comment.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/comment-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga

diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp
index 16d31df666f7a6011de872d8b80794e4825ac45a..2055dbd78b3d968930b8003a4506501082d29971 100644 (file)
--- a/lib/icinga/customvarobject.cpp
+++ b/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"

diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp
index dbb14531ec25819f365c8ad4c223cd5d59711e11..84328bd7be0d6185fa3546f80fa317bdc5a5d44b 100644 (file)
--- a/lib/icinga/customvarobject.hpp
+++ b/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"
 

diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp
index 6e02cfd4080f2817f5056c5191717df3534081a3..1c81efdc2fd447b90cb6e7392dc4ac3e8fd89210 100644 (file)
--- a/lib/icinga/dependency.cpp
+++ b/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"

diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp
index 820e0efb434e87d0b4113cfe8d842a803a8813ec..b9db395c34b7f2524d24f0e9abe03eac9237dacf 100644 (file)
--- a/lib/icinga/dependency.hpp
+++ b/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
 {

diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index 7428332d088ff4c994a1a710be72eb12ce345369..3b0403b6022abc5055d1bf27154b7c6abf964f6a 100644 (file)
--- a/lib/icinga/downtime.cpp
+++ b/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"

diff --git a/lib/icinga/downtime.hpp b/lib/icinga/downtime.hpp
index 5149762b113e88de26822b966f51fd83f413c391..6d4ba0a21086bf57b518811d2ab4be07cfa0b4c3 100644 (file)
--- a/lib/icinga/downtime.hpp
+++ b/lib/icinga/downtime.hpp
@@ -21,8 +21,8 @@
 #define DOWNTIME_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/downtime.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/downtime-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga

diff --git a/lib/icinga/eventcommand.cpp b/lib/icinga/eventcommand.cpp
index 769d6f5857e0535bb82dd8ece4b6f43a318cb3e7..a2a1cdc79c15acd76be4d025065a1d935ccd3c11 100644 (file)
--- a/lib/icinga/eventcommand.cpp
+++ b/lib/icinga/eventcommand.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/eventcommand.hpp"
-#include "icinga/eventcommand.tcpp"
+#include "icinga/eventcommand-ti.cpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/eventcommand.hpp b/lib/icinga/eventcommand.hpp
index 38a5610c454b06bd8ef975bcc4e1c828277c48ad..d971976a1f1e582e7617a03b408c129a73c8d108 100644 (file)
--- a/lib/icinga/eventcommand.hpp
+++ b/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

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index dc083224384b87435a6588ca5a123c47f9929914..89c4131e6fe3afbcf776bed1752cdb74181b056a 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/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"

diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp
index a4969e866a382f6c14a19e18d270e147db775281..cbd49d1db491a173ba163ea8f65390b6fcad5dc0 100644 (file)
--- a/lib/icinga/host.hpp
+++ b/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"
 

diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index e1419530af9bb66e36053e9cce47500721cfc2c7..da0e7b9adae63b94c1a89b95298e9becb4289e36 100644 (file)
--- a/lib/icinga/hostgroup.cpp
+++ b/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"

diff --git a/lib/icinga/hostgroup.hpp b/lib/icinga/hostgroup.hpp
index 146b9fa4a34677b566d996dca187ca666f4c4889..fb2564620c6e2c48b9fc772bb03f995244db0380 100644 (file)
--- a/lib/icinga/hostgroup.hpp
+++ b/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

diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 90e623a92eeddcbdaca31ac3d51bd235986e1210..cbec96b8dc3b3bba8cb96678fd50935abb528f69 100644 (file)
--- a/lib/icinga/icingaapplication.cpp
+++ b/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"

diff --git a/lib/icinga/icingaapplication.hpp b/lib/icinga/icingaapplication.hpp
index b5b1b951bdd32971c628c74d82d4031f9342eca8..51216a02c38892c3afa1a02ff53c92b244cdb14b 100644 (file)
--- a/lib/icinga/icingaapplication.hpp
+++ b/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

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 8771f424096bdb8d679c0b0c983328dcefc83ac3..b2f9fb6a22d3ca62cccc684ea6dcfe8c7675a73d 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/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"

diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp
index 27b78f531acaccdb89a6785bdf62c3edcd246e48..47dd9d52dd7a9cb1eeb51a2c5ddb553c3498f325 100644 (file)
--- a/lib/icinga/notification.hpp
+++ b/lib/icinga/notification.hpp
@@ -21,8 +21,8 @@
 #define NOTIFICATION_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/notification.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/notification-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "icinga/user.hpp"
 #include "icinga/usergroup.hpp"
 #include "icinga/timeperiod.hpp"

diff --git a/lib/icinga/notificationcommand.cpp b/lib/icinga/notificationcommand.cpp
index d9e94f2942f6b003f1a48bb915fad58b6a877af9..46dc7c0866038d8696c79bdbb0035d47f2d52eef 100644 (file)
--- a/lib/icinga/notificationcommand.cpp
+++ b/lib/icinga/notificationcommand.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/notificationcommand.hpp"
-#include "icinga/notificationcommand.tcpp"
+#include "icinga/notificationcommand-ti.cpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/notificationcommand.hpp b/lib/icinga/notificationcommand.hpp
index d1c604b6c1d494715c518ffb238f345d77d7503c..10079250ee54d6e423f6ec3d16f21fedd3973bdb 100644 (file)
--- a/lib/icinga/notificationcommand.hpp
+++ b/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

diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index 6c702946e5c38f2889dba327bc15ce2f5840b25c..53c036c78dc5a05e5d899ec2e4bfde42a4c1d97a 100644 (file)
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/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"

diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp
index 9e5751e417cf7f09a6de690ca8af6189c3f71af5..86138fa0442111a684894b37dfa6db0a4be52840 100644 (file)
--- a/lib/icinga/scheduleddowntime.hpp
+++ b/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

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index e6ca785f24f2a09d5843e91bf50b58443ebb37c8..c1e0149e5592249ec314a1aacd2eeab4f02278a0 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/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"

diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp
index 39952a2b1347b812d40290f9aef0ce41fc8fda6e..8fb45d68421143c69c086c46db524193609dd8c8 100644 (file)
--- a/lib/icinga/service.hpp
+++ b/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>

diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index 879e5156c66ac396f41b875fc1e125a7fb5c7bc3..555113259569b5e3a3140fd0d58073babb981841 100644 (file)
--- a/lib/icinga/servicegroup.cpp
+++ b/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"

diff --git a/lib/icinga/servicegroup.hpp b/lib/icinga/servicegroup.hpp
index dc87028c2f27733250787c95a5f59e1eb7d45784..9a8d49a7bfcda6ec272720257c4aa9c1c828e958 100644 (file)
--- a/lib/icinga/servicegroup.hpp
+++ b/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

diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index 4953c3ebb5a0acea0f92004af4ebc4373debc3fd..97183223e253a808a01ed6b6a509c00c07456b5d 100644 (file)
--- a/lib/icinga/timeperiod.cpp
+++ b/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"

diff --git a/lib/icinga/timeperiod.hpp b/lib/icinga/timeperiod.hpp
index fe1c7d651ab66272b04de86c5f8929d3461f7e6d..a641d40cb9a633026283f1f80e3e0773d66525c6 100644 (file)
--- a/lib/icinga/timeperiod.hpp
+++ b/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
 {

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 7059c8438e5c481dcd4403dd89dd27d27e1367a1..2d72d73736e52e3d7d7dcb49a15cf56effb4a624 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/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"

diff --git a/lib/icinga/user.hpp b/lib/icinga/user.hpp
index 28e0b8bcb4599cd159fec619c5cb52440816202b..57a007799668ff76e52d799fc37f4e65285d1e2c 100644 (file)
--- a/lib/icinga/user.hpp
+++ b/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"
 

diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index 4741ed0243abd795d6ebfb3e7febd118479198c9..db87067295d10a7cc696cbfd5ee8985ff602c66d 100644 (file)
--- a/lib/icinga/usergroup.cpp
+++ b/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"

diff --git a/lib/icinga/usergroup.hpp b/lib/icinga/usergroup.hpp
index a212ab3d31fb3471a17c699254944ccbbe76432b..9bf02a4e8051599aec70ab85c3140c4c9aec6a31 100644 (file)
--- a/lib/icinga/usergroup.hpp
+++ b/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

diff --git a/lib/livestatus/CMakeLists.txt b/lib/livestatus/CMakeLists.txt
index e2a0d98f7c2d22ad9c1e5321c696314e7b7ade72..8d2494b173200ed6ff0c6657bdf18f8e64b0674f 100644 (file)
--- a/lib/livestatus/CMakeLists.txt
+++ b/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

diff --git a/lib/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp
index 1f7944a397be9865feb7dd1ce6ba1d484639ae58..31cdebf4c090921a35fa94278c809571751fe11d 100644 (file)
--- a/lib/livestatus/livestatuslistener.cpp
+++ b/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"

diff --git a/lib/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp
index 3292a3eb80fd9886c1f77e68d9cf659bb7069123..56fd96c6536647c3eb314ebe066caa2a611c7526 100644 (file)
--- a/lib/livestatus/livestatuslistener.hpp
+++ b/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>

diff --git a/lib/notification/CMakeLists.txt b/lib/notification/CMakeLists.txt
index cf1a6d0ceafd66d2adf91cdab12a417ce161f044..04288727efe9f8d8f4aab1c1b469cc91f9541962 100644 (file)
--- a/lib/notification/CMakeLists.txt
+++ b/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)

diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp
index 3f9a83956c047a011b48e9b482118d43a973e9f0..ccc14c1de76bbdf6fc33d3ca5a6a52ee87c0e716 100644 (file)
--- a/lib/notification/notificationcomponent.cpp
+++ b/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"

diff --git a/lib/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp
index ed7d270d305aff1efc81a5a218a77799c088e4a6..39bb220f28d7549b95d3e56e20034c5512779efa 100644 (file)
--- a/lib/notification/notificationcomponent.hpp
+++ b/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"

diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt
index 2072c3ddb51387c9be280bcb301d2588666507d6..12b851ac2399b0a60042873a106e2be29bf56f27 100644 (file)
--- a/lib/perfdata/CMakeLists.txt
+++ b/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(graphitewriter.ti graphitewriter.tcpp graphitewriter.thpp)
-mkclass_target(influxdbwriter.ti influxdbwriter.tcpp influxdbwriter.thpp)
-mkclass_target(elasticsearchwriter.ti elasticsearchwriter.tcpp elasticsearchwriter.thpp)
-mkclass_target(opentsdbwriter.ti opentsdbwriter.tcpp opentsdbwriter.thpp)
-mkclass_target(perfdatawriter.ti perfdatawriter.tcpp perfdatawriter.thpp)
+mkclass_target(gelfwriter.ti gelfwriter-ti.cpp gelfwriter-ti.hpp)
+mkclass_target(graphitewriter.ti graphitewriter-ti.cpp graphitewriter-ti.hpp)
+mkclass_target(influxdbwriter.ti influxdbwriter-ti.cpp influxdbwriter-ti.hpp)
+mkclass_target(elasticsearchwriter.ti elasticsearchwriter-ti.cpp elasticsearchwriter-ti.hpp)
+mkclass_target(opentsdbwriter.ti opentsdbwriter-ti.cpp opentsdbwriter-ti.hpp)
+mkclass_target(perfdatawriter.ti perfdatawriter-ti.cpp perfdatawriter-ti.hpp)
 
 set(perfdata_SOURCES
-  elasticsearchwriter.cpp elasticsearchwriter.hpp elasticsearchwriter.thpp
-  gelfwriter.cpp gelfwriter.hpp gelfwriter.thpp
-  graphitewriter.cpp graphitewriter.hpp graphitewriter.thpp
-  influxdbwriter.cpp influxdbwriter.hpp influxdbwriter.thpp
-  opentsdbwriter.cpp opentsdbwriter.hpp opentsdbwriter.thpp
-  perfdatawriter.cpp perfdatawriter.hpp perfdatawriter.thpp
+  elasticsearchwriter.cpp elasticsearchwriter.hpp elasticsearchwriter-ti.hpp
+  gelfwriter.cpp gelfwriter.hpp gelfwriter-ti.hpp
+  graphitewriter.cpp graphitewriter.hpp graphitewriter-ti.hpp
+  influxdbwriter.cpp influxdbwriter.hpp influxdbwriter-ti.hpp
+  opentsdbwriter.cpp opentsdbwriter.hpp opentsdbwriter-ti.hpp
+  perfdatawriter.cpp perfdatawriter.hpp perfdatawriter-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
index 708e906705bf1707736b5b10eba6f6b13c8c5db6..d27aec22783a663e322fd7501c635eab5c2ed706 100644 (file)
--- a/lib/perfdata/elasticsearchwriter.cpp
+++ b/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"

diff --git a/lib/perfdata/elasticsearchwriter.hpp b/lib/perfdata/elasticsearchwriter.hpp
index a1732ee846321131960974c5eb2bb9a31a542167..e28ad4a7cd1952e1376d062d2fe79afe71c4f156 100644 (file)
--- a/lib/perfdata/elasticsearchwriter.hpp
+++ b/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"

diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp
index 060da2c80d25c9c30de1a40c7d27ad6aa76ffaec..ca900812728b2211ab7c58088e310fb4c7da71bc 100644 (file)
--- a/lib/perfdata/gelfwriter.cpp
+++ b/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"

diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp
index 0576ede1b7cd293c13c6e3c3208eb1362fcf445d..0948ecdd73f0e18ac5660cbb6a5fc83db344e90f 100644 (file)
--- a/lib/perfdata/gelfwriter.hpp
+++ b/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"

diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp
index 320c146fe387d1bf56e4d24a00795273e608637b..bc2d64005c27062dba16276af48f8c14e7d9673f 100644 (file)
--- a/lib/perfdata/graphitewriter.cpp
+++ b/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"

diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp
index 05bc8bb43d0430bc8932b179b902428e2458eea8..86a517f967f9fb24e2a70eeb3e497ec66f5d1915 100644 (file)
--- a/lib/perfdata/graphitewriter.hpp
+++ b/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"

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
index a165364743870c54d926db2a29234e904c3a426e..4708d28ad0bcdc0b6506b4ccf51f6a71136a1b35 100644 (file)
--- a/lib/perfdata/influxdbwriter.cpp
+++ b/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"

diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp
index 323d1f91156ff13da4bacd49b52270858ca88dd0..4d3e8037a1396ac72aaad83fbb209291d27ec29b 100644 (file)
--- a/lib/perfdata/influxdbwriter.hpp
+++ b/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"

diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp
index 056da782256650594e2b41dacba2e3f79a49cd63..8d1c6ab89721de87f3ae74d9a00ce0babca262bc 100644 (file)
--- a/lib/perfdata/opentsdbwriter.cpp
+++ b/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"

diff --git a/lib/perfdata/opentsdbwriter.hpp b/lib/perfdata/opentsdbwriter.hpp
index 5862a479af4e7017d433bdd688d94bb556efb0d0..f368918e6ed47fdcf1558fbc79e50fc3b3108fbb 100644 (file)
--- a/lib/perfdata/opentsdbwriter.hpp
+++ b/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"

diff --git a/lib/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp
index 79d0108d76fb0e2c5b41de9de89cd30663fda504..0d2f979bef8721ccf47de61b3490331caeaa0c25 100644 (file)
--- a/lib/perfdata/perfdatawriter.cpp
+++ b/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"

diff --git a/lib/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp
index 098fb84548f4639317e2ea3b083744dad714e4f4..3e0306950b31e8420deda014da60f36a9b97cb94 100644 (file)
--- a/lib/perfdata/perfdatawriter.hpp
+++ b/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"

diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt
index 6877143a7e76893865766e0a4761a165eaf7f8ed..cf89d55386d97708e5d9f07e7077362ac4b16e6a 100644 (file)
--- a/lib/remote/CMakeLists.txt
+++ b/lib/remote/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(apilistener.ti apilistener.tcpp apilistener.thpp)
-mkclass_target(apiuser.ti apiuser.tcpp apiuser.thpp)
-mkclass_target(endpoint.ti endpoint.tcpp endpoint.thpp)
-mkclass_target(zone.ti zone.tcpp zone.thpp)
+mkclass_target(apilistener.ti apilistener-ti.cpp apilistener-ti.hpp)
+mkclass_target(apiuser.ti apiuser-ti.cpp apiuser-ti.hpp)
+mkclass_target(endpoint.ti endpoint-ti.cpp endpoint-ti.hpp)
+mkclass_target(zone.ti zone-ti.cpp zone-ti.hpp)
 
 set(remote_SOURCES
   i2-remote.hpp
@@ -26,8 +26,8 @@ set(remote_SOURCES
   apiaction.cpp apiaction.hpp
   apiclient.cpp apiclient.hpp
   apifunction.cpp apifunction.hpp
-  apilistener.cpp apilistener.hpp apilistener.thpp apilistener-configsync.cpp apilistener-filesync.cpp
-  apiuser.cpp apiuser.hpp apiuser.thpp
+  apilistener.cpp apilistener.hpp apilistener-ti.hpp apilistener-configsync.cpp apilistener-filesync.cpp
+  apiuser.cpp apiuser.hpp apiuser-ti.hpp
   authority.cpp
   configfileshandler.cpp configfileshandler.hpp
   configobjectutility.cpp configobjectutility.hpp
@@ -37,7 +37,7 @@ set(remote_SOURCES
   consolehandler.cpp consolehandler.hpp
   createobjecthandler.cpp createobjecthandler.hpp
   deleteobjecthandler.cpp deleteobjecthandler.hpp
-  endpoint.cpp endpoint.hpp endpoint.thpp
+  endpoint.cpp endpoint.hpp endpoint-ti.hpp
   eventqueue.cpp eventqueue.hpp
   eventshandler.cpp eventshandler.hpp
   filterutility.cpp filterutility.hpp
@@ -60,7 +60,7 @@ set(remote_SOURCES
   typequeryhandler.cpp typequeryhandler.hpp
   url.cpp url.hpp url-characters.hpp
   variablequeryhandler.cpp variablequeryhandler.hpp
-  zone.cpp zone.hpp zone.thpp
+  zone.cpp zone.hpp zone-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 527036e0a2b1b07af3290a3b6ddf70d7d5d2fd5a..251aff7916e9512e06692e3194eb7769216a8e3e 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/apilistener.hpp"
-#include "remote/apilistener.tcpp"
+#include "remote/apilistener-ti.cpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/jsonrpc.hpp"

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index ecd1b38cb5da36561c7ac6ffbfbdbb3a0420d4c4..eb195f5b5d458802004dd6e317682e1a47586553 100644 (file)
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -20,7 +20,7 @@
 #ifndef APILISTENER_H
 #define APILISTENER_H
 
-#include "remote/apilistener.thpp"
+#include "remote/apilistener-ti.hpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/httpserverconnection.hpp"
 #include "remote/endpoint.hpp"

diff --git a/lib/remote/apiuser.cpp b/lib/remote/apiuser.cpp
index e2c7960e4bc0d132a1820aeca3296ed82fa13d0d..183291af314db4ee16fdb8bd4c96e26f82091277 100644 (file)
--- a/lib/remote/apiuser.cpp
+++ b/lib/remote/apiuser.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/apiuser.hpp"
-#include "remote/apiuser.tcpp"
+#include "remote/apiuser-ti.cpp"
 #include "base/configtype.hpp"
 
 using namespace icinga;

diff --git a/lib/remote/apiuser.hpp b/lib/remote/apiuser.hpp
index 1a8f8b661c913184b40a2f8d2a88859ca2e58377..755273bf4cf46f86e8c6b9399e1f0c051847e7db 100644 (file)
--- a/lib/remote/apiuser.hpp
+++ b/lib/remote/apiuser.hpp
@@ -21,7 +21,7 @@
 #define APIUSER_H
 
 #include "remote/i2-remote.hpp"
-#include "remote/apiuser.thpp"
+#include "remote/apiuser-ti.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp
index a354edbf0a3d421b3c8d4da15fe3a106bdaa59bf..2b2fb655bc4b2fc9c81e6386754a6d47bdb52a00 100644 (file)
--- a/lib/remote/endpoint.cpp
+++ b/lib/remote/endpoint.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/endpoint.hpp"
-#include "remote/endpoint.tcpp"
+#include "remote/endpoint-ti.cpp"
 #include "remote/apilistener.hpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/zone.hpp"

diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp
index 254492ebc4db845c7ab16708e83c79cbbee8c02c..41aea027091ede039b01587c15a4cfc3aeb64ece 100644 (file)
--- a/lib/remote/endpoint.hpp
+++ b/lib/remote/endpoint.hpp
@@ -21,7 +21,7 @@
 #define ENDPOINT_H
 
 #include "remote/i2-remote.hpp"
-#include "remote/endpoint.thpp"
+#include "remote/endpoint-ti.hpp"
 #include "base/ringbuffer.hpp"
 #include <set>
 

diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index acfff3c5a87a2f198fd8e95a81546120d29b2225..ea6e007bd2143213e62f223cd5a0421b6d263475 100644 (file)
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/zone.hpp"
-#include "remote/zone.tcpp"
+#include "remote/zone-ti.cpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "base/objectlock.hpp"
 #include "base/logger.hpp"

diff --git a/lib/remote/zone.hpp b/lib/remote/zone.hpp
index 158847de64741c0e1823232b6d71282d3d7ca763..6193dc0268e2e4739a7b45931d36ee918a7e0e86 100644 (file)
--- a/lib/remote/zone.hpp
+++ b/lib/remote/zone.hpp
@@ -21,7 +21,7 @@
 #define ZONE_H
 
 #include "remote/i2-remote.hpp"
-#include "remote/zone.thpp"
+#include "remote/zone-ti.hpp"
 #include "remote/endpoint.hpp"
 
 namespace icinga