Rename C++ header files.

Fixes #6291

diff --git a/components/checker/CMakeLists.txt b/components/checker/CMakeLists.txt
index 33761dc98b2227ffa5cfe14d3e9ef6bb325bf039..1790ecc31aa98ca55e9637b37618c79b2943d7dd 100644 (file)
--- a/components/checker/CMakeLists.txt
+++ b/components/checker/CMakeLists.txt
@@ -15,11 +15,11 @@
 # 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.th)
+mkclass_target(checkercomponent.ti checkercomponent.thpp)
 
 mkembedconfig_target(checker-type.conf checker-type.cpp)
 
-add_library(checker SHARED checkercomponent.cpp checkercomponent.th checker-type.cpp)
+add_library(checker SHARED checkercomponent.cpp checkercomponent.thpp checker-type.cpp)
 
 target_link_libraries(checker ${Boost_LIBRARIES} base config icinga remote)
 

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index 4bdf63928213627bd39dba995da2910aa4c2b1b9..c252fcf8faf20be415cc162b35c1ae39ee0b4577 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "checker/checkercomponent.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "remote/apilistener.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/statsfunction.h"
+#include "checker/checkercomponent.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "remote/apilistener.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/checker/checkercomponent.h b/components/checker/checkercomponent.hpp
similarity index 95%
rename from components/checker/checkercomponent.h
rename to components/checker/checkercomponent.hpp
index dad34ab8bfe26604b94f1c721e5871133479aad4..7ed8b0745a38dc1668c4c8539d9eb1d93aa9a6de 100644 (file)
--- a/components/checker/checkercomponent.h
+++ b/components/checker/checkercomponent.hpp
@@ -20,11 +20,11 @@
 #ifndef CHECKERCOMPONENT_H
 #define CHECKERCOMPONENT_H
 
-#include "checker/checkercomponent.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "checker/checkercomponent.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>

diff --git a/components/checker/checkercomponent.ti b/components/checker/checkercomponent.ti
index 38d38bd313334d484bb861397c48f711cc551bfd..a65b963edc54e0704e8beade9c4eb72a3c670957 100644 (file)
--- a/components/checker/checkercomponent.ti
+++ b/components/checker/checkercomponent.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/components/compat/CMakeLists.txt b/components/compat/CMakeLists.txt
index 6c69f0ee9d5346fbaca87b6cc63609538c262649..9e555ea61d9af19bd8605b07cb525d1e48b77d13 100644 (file)
--- a/components/compat/CMakeLists.txt
+++ b/components/compat/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(checkresultreader.ti checkresultreader.th)
-mkclass_target(compatlogger.ti compatlogger.th)
-mkclass_target(externalcommandlistener.ti externalcommandlistener.th)
-mkclass_target(statusdatawriter.ti statusdatawriter.th)
+mkclass_target(checkresultreader.ti checkresultreader.thpp)
+mkclass_target(compatlogger.ti compatlogger.thpp)
+mkclass_target(externalcommandlistener.ti externalcommandlistener.thpp)
+mkclass_target(statusdatawriter.ti statusdatawriter.thpp)
 
 mkembedconfig_target(compat-type.conf compat-type.cpp)
 
-add_library(compat SHARED checkresultreader.cpp checkresultreader.th compatlogger.cpp compatlogger.th externalcommandlistener.cpp externalcommandlistener.th statusdatawriter.cpp statusdatawriter.th compat-type.cpp)
+add_library(compat SHARED checkresultreader.cpp checkresultreader.thpp compatlogger.cpp compatlogger.thpp externalcommandlistener.cpp externalcommandlistener.thpp statusdatawriter.cpp statusdatawriter.thpp compat-type.cpp)
 
 target_link_libraries(compat ${Boost_LIBRARIES} base config icinga)
 

diff --git a/components/compat/checkresultreader.cpp b/components/compat/checkresultreader.cpp
index 10eda7e3fe30e33dd0cd0a7443341fa705f01281..095b9b8dcaac7b791fd74918dfde86a6c88ef92b 100644 (file)
--- a/components/compat/checkresultreader.cpp
+++ b/components/compat/checkresultreader.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/checkresultreader.h"
-#include "icinga/service.h"
-#include "icinga/pluginutility.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/application.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
+#include "compat/checkresultreader.hpp"
+#include "icinga/service.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/application.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
 #include <fstream>
 
 using namespace icinga;

diff --git a/components/compat/checkresultreader.h b/components/compat/checkresultreader.hpp
similarity index 96%
rename from components/compat/checkresultreader.h
rename to components/compat/checkresultreader.hpp
index 4b0adb9736bf9b43d7f7c4819b8392a473f8f991..83799794db91f399d656a86ddeb1aaa93b163f15 100644 (file)
--- a/components/compat/checkresultreader.h
+++ b/components/compat/checkresultreader.hpp
@@ -20,8 +20,8 @@
 #ifndef CHECKRESULTREADER_H
 #define CHECKRESULTREADER_H
 
-#include "compat/checkresultreader.th"
-#include "base/timer.h"
+#include "compat/checkresultreader.thpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga

diff --git a/components/compat/checkresultreader.ti b/components/compat/checkresultreader.ti
index 6daee2df32b9fb1bf8c3f54f19da07b988f26d0d..34ee62ecaadbc0de89f1c61b56cc05988d883ba6 100644 (file)
--- a/components/compat/checkresultreader.ti
+++ b/components/compat/checkresultreader.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/components/compat/compatlogger.cpp b/components/compat/compatlogger.cpp
index f5b3f73e59539ac1634d86f266ab23b0c1cdfd23..d610af96e3a5201c6d5cc335d6c502714e03d8fe 100644 (file)
--- a/components/compat/compatlogger.cpp
+++ b/components/compat/compatlogger.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/compatlogger.h"
-#include "icinga/service.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notification.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/compatutility.h"
-#include "config/configcompilercontext.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/application.h"
-#include "base/utility.h"
-#include "base/scriptfunction.h"
-#include "base/statsfunction.h"
+#include "compat/compatlogger.hpp"
+#include "icinga/service.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/compatutility.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/application.hpp"
+#include "base/utility.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 

diff --git a/components/compat/compatlogger.h b/components/compat/compatlogger.hpp
similarity index 97%
rename from components/compat/compatlogger.h
rename to components/compat/compatlogger.hpp
index 4311b4f60bf8ad0bf2a3d4771578df1943c90693..05081b1c1e78115b4e464baeb035180752e07f89 100644 (file)
--- a/components/compat/compatlogger.h
+++ b/components/compat/compatlogger.hpp
@@ -20,9 +20,9 @@
 #ifndef COMPATLOGGER_H
 #define COMPATLOGGER_H
 
-#include "compat/compatlogger.th"
-#include "icinga/service.h"
-#include "base/timer.h"
+#include "compat/compatlogger.thpp"
+#include "icinga/service.hpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga

diff --git a/components/compat/compatlogger.ti b/components/compat/compatlogger.ti
index 957ec3f3c21643ddbc95e6a2d6d4c824c0cb9cc7..ef94df27d02a0362ecacc58b7c7d0ca055e5cea4 100644 (file)
--- a/components/compat/compatlogger.ti
+++ b/components/compat/compatlogger.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/components/compat/externalcommandlistener.cpp b/components/compat/externalcommandlistener.cpp
index c1c6253213e777fb0fd58f39407bc3e1c0a21211..8308281b16af3a84b72e34d5ae6d4f1263b3f573 100644 (file)
--- a/components/compat/externalcommandlistener.cpp
+++ b/components/compat/externalcommandlistener.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/externalcommandlistener.h"
-#include "icinga/externalcommandprocessor.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/application.h"
-#include "base/statsfunction.h"
+#include "compat/externalcommandlistener.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/application.hpp"
+#include "base/statsfunction.hpp"
 
 using namespace icinga;
 

diff --git a/components/compat/externalcommandlistener.h b/components/compat/externalcommandlistener.hpp
similarity index 94%
rename from components/compat/externalcommandlistener.h
rename to components/compat/externalcommandlistener.hpp
index ba3f07ec649baec8bd32b8a4ad46c8846139c4b7..665b0272aea44749dbcd409f28af7a9800f6e295 100644 (file)
--- a/components/compat/externalcommandlistener.h
+++ b/components/compat/externalcommandlistener.hpp
@@ -20,10 +20,10 @@
 #ifndef EXTERNALCOMMANDLISTENER_H
 #define EXTERNALCOMMANDLISTENER_H
 
-#include "compat/externalcommandlistener.th"
-#include "base/objectlock.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "compat/externalcommandlistener.thpp"
+#include "base/objectlock.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/thread.hpp>
 #include <iostream>
 

diff --git a/components/compat/externalcommandlistener.ti b/components/compat/externalcommandlistener.ti
index 70f9fd051afdd3981b7b41b785efaadcd4adb698..7ef94e73c2da954b54fa36502afcde59e1045c22 100644 (file)
--- a/components/compat/externalcommandlistener.ti
+++ b/components/compat/externalcommandlistener.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/components/compat/statusdatawriter.cpp b/components/compat/statusdatawriter.cpp
index 5fe3b3350e3f2e5d565b1ce93151a9c517e920ce..92e21fbdef0cbcaf7a6aa9798a1dd8cac1f796a5 100644 (file)
--- a/components/compat/statusdatawriter.cpp
+++ b/components/compat/statusdatawriter.cpp
@@ -17,25 +17,25 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/statusdatawriter.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/hostgroup.h"
-#include "icinga/servicegroup.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/timeperiod.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/compatutility.h"
-#include "icinga/dependency.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/application.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
+#include "compat/statusdatawriter.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/servicegroup.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/dependency.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/application.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>

diff --git a/components/compat/statusdatawriter.h b/components/compat/statusdatawriter.hpp
similarity index 91%
rename from components/compat/statusdatawriter.h
rename to components/compat/statusdatawriter.hpp
index 4f179a01661872c7bb8bb61aef54f21913ca4faf..9c8125bffefd408941f77b5417ac8f372df1c366 100644 (file)
--- a/components/compat/statusdatawriter.h
+++ b/components/compat/statusdatawriter.hpp
@@ -20,15 +20,15 @@
 #ifndef STATUSDATAWRITER_H
 #define STATUSDATAWRITER_H
 
-#include "compat/statusdatawriter.th"
-#include "icinga/customvarobject.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/command.h"
-#include "icinga/compatutility.h"
-#include "base/objectlock.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "compat/statusdatawriter.thpp"
+#include "icinga/customvarobject.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/command.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/thread.hpp>
 #include <iostream>
 

diff --git a/components/compat/statusdatawriter.ti b/components/compat/statusdatawriter.ti
index 2feee09ebd7beda8ae57e6fda0ff50a3fba27dc0..109068c92363f239ed34e9cb172913a0622e38bc 100644 (file)
--- a/components/compat/statusdatawriter.ti
+++ b/components/compat/statusdatawriter.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/components/db_ido_mysql/CMakeLists.txt b/components/db_ido_mysql/CMakeLists.txt
index d048e707e113bb0f145e561e8a629e3c32c33be8..26687abc9171a47ac7b57f3be63ec776cd7d3408 100644 (file)
--- a/components/db_ido_mysql/CMakeLists.txt
+++ b/components/db_ido_mysql/CMakeLists.txt
@@ -18,11 +18,11 @@
 find_package(MYSQL)
 
 if(MYSQL_FOUND)
-    mkclass_target(idomysqlconnection.ti idomysqlconnection.th)
+    mkclass_target(idomysqlconnection.ti idomysqlconnection.thpp)
 
     mkembedconfig_target(db_ido_mysql-type.conf db_ido_mysql-type.cpp)
 
-    add_library(db_ido_mysql SHARED idomysqlconnection.cpp idomysqlconnection.th db_ido_mysql-type.cpp)
+    add_library(db_ido_mysql SHARED idomysqlconnection.cpp idomysqlconnection.thpp db_ido_mysql-type.cpp)
 
     include_directories(${MYSQL_INCLUDE_DIR})
     target_link_libraries(db_ido_mysql ${Boost_LIBRARIES} ${MYSQL_LIBRARIES} base config icinga db_ido)

diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index 7b3b18e9081d88d19e8f620a7f26db4c9d82f132..b5e4009b9caac1bf25df2c828536b8d42065f5fd 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/exception.h"
-#include "base/statsfunction.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido_mysql/idomysqlconnection.h"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/exception.hpp"
+#include "base/statsfunction.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido_mysql/idomysqlconnection.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/components/db_ido_mysql/idomysqlconnection.h b/components/db_ido_mysql/idomysqlconnection.hpp
similarity index 96%
rename from components/db_ido_mysql/idomysqlconnection.h
rename to components/db_ido_mysql/idomysqlconnection.hpp
index 26c03974cac3636595ada52b1b5f5d47a202c701..7a784a81792443154fe14913ffc44712eef53ffc 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.h
+++ b/components/db_ido_mysql/idomysqlconnection.hpp
@@ -20,10 +20,10 @@
 #ifndef IDOMYSQLCONNECTION_H
 #define IDOMYSQLCONNECTION_H
 
-#include "db_ido_mysql/idomysqlconnection.th"
-#include "base/array.h"
-#include "base/timer.h"
-#include "base/workqueue.h"
+#include "db_ido_mysql/idomysqlconnection.thpp"
+#include "base/array.hpp"
+#include "base/timer.hpp"
+#include "base/workqueue.hpp"
 #include <mysql.h>
 
 namespace icinga

diff --git a/components/db_ido_mysql/idomysqlconnection.ti b/components/db_ido_mysql/idomysqlconnection.ti
index d84f6e32933a4a8bdd3e9aa4ee3cdadc01444e92..97b9490a885d5148c8188aa5f9c5cfcba0546271 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.ti
+++ b/components/db_ido_mysql/idomysqlconnection.ti
@@ -1,4 +1,4 @@
-#include "db_ido/dbconnection.h"
+#include "db_ido/dbconnection.hpp"
 
 namespace icinga
 {

diff --git a/components/db_ido_pgsql/CMakeLists.txt b/components/db_ido_pgsql/CMakeLists.txt
index 94e7f90a5e21513434929ffb0b9d6a6a533113e4..2e50daa51582ebc0bfa895509172427a474b567e 100644 (file)
--- a/components/db_ido_pgsql/CMakeLists.txt
+++ b/components/db_ido_pgsql/CMakeLists.txt
@@ -18,14 +18,14 @@
 find_package(PostgreSQL)
 
 if(PostgreSQL_FOUND)
-    mkclass_target(idopgsqlconnection.ti idopgsqlconnection.th)
+    mkclass_target(idopgsqlconnection.ti idopgsqlconnection.thpp)
 
     mkembedconfig_target(db_ido_pgsql-type.conf db_ido_pgsql-type.cpp)
 
     link_directories(${PostgreSQL_LIBRARY_DIRS})
     include_directories(${PostgreSQL_INCLUDE_DIRS})
 
-    add_library(db_ido_pgsql SHARED idopgsqlconnection.cpp idopgsqlconnection.th db_ido_pgsql-type.cpp)
+    add_library(db_ido_pgsql SHARED idopgsqlconnection.cpp idopgsqlconnection.thpp db_ido_pgsql-type.cpp)
 
     target_link_libraries(db_ido_pgsql ${Boost_LIBRARIES} ${PostgreSQL_LIBRARIES} base config icinga db_ido)
 

diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp
index 064772d050b803d8bfb6953ff1577e11c7ba5d17..d55693f2955fd8e48a8322ff50ab1961d6982342 100644 (file)
--- a/components/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/components/db_ido_pgsql/idopgsqlconnection.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/exception.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido_pgsql/idopgsqlconnection.h"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/exception.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido_pgsql/idopgsqlconnection.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/components/db_ido_pgsql/idopgsqlconnection.h b/components/db_ido_pgsql/idopgsqlconnection.hpp
similarity index 96%
rename from components/db_ido_pgsql/idopgsqlconnection.h
rename to components/db_ido_pgsql/idopgsqlconnection.hpp
index e0459d4cc4c96a828a74fb51feea8b54c4063b3a..d1951d0f587051cc3ee875ed37a13730f6803180 100644 (file)
--- a/components/db_ido_pgsql/idopgsqlconnection.h
+++ b/components/db_ido_pgsql/idopgsqlconnection.hpp
@@ -20,10 +20,10 @@
 #ifndef IDOPGSQLCONNECTION_H
 #define IDOPGSQLCONNECTION_H
 
-#include "db_ido_pgsql/idopgsqlconnection.th"
-#include "base/array.h"
-#include "base/timer.h"
-#include "base/workqueue.h"
+#include "db_ido_pgsql/idopgsqlconnection.thpp"
+#include "base/array.hpp"
+#include "base/timer.hpp"
+#include "base/workqueue.hpp"
 #include <libpq-fe.h>
 
 namespace icinga

diff --git a/components/db_ido_pgsql/idopgsqlconnection.ti b/components/db_ido_pgsql/idopgsqlconnection.ti
index 39f600945150186ca5c3fe550c900c1679414194..46c9131b1b7103bab5a5cb48480aef25c974f2f9 100644 (file)
--- a/components/db_ido_pgsql/idopgsqlconnection.ti
+++ b/components/db_ido_pgsql/idopgsqlconnection.ti
@@ -1,4 +1,4 @@
-#include "db_ido/dbconnection.h"
+#include "db_ido/dbconnection.hpp"
 
 namespace icinga
 {

diff --git a/components/demo/CMakeLists.txt b/components/demo/CMakeLists.txt
index d31377efaba019a0b654a25cc3e019ae8a0606ae..5bd7b94f32bdfaeb463e55d51da4572f2b7ea298 100644 (file)
--- a/components/demo/CMakeLists.txt
+++ b/components/demo/CMakeLists.txt
@@ -15,11 +15,11 @@
 # 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(demo.ti demo.th)
+mkclass_target(demo.ti demo.thpp)
 
 mkembedconfig_target(demo-type.conf demo-type.cpp)
 
-add_library(demo SHARED demo.cpp demo.th demo-type.cpp)
+add_library(demo SHARED demo.cpp demo.thpp demo-type.cpp)
 
 target_link_libraries(demo ${Boost_LIBRARIES} base config icinga remote)
 

diff --git a/components/demo/demo.cpp b/components/demo/demo.cpp
index 04f950e4f0ffff6c27b39f1b913787b856a2a925..d1f298624ceadb06d49d220077b733ed90602477 100644 (file)
--- a/components/demo/demo.cpp
+++ b/components/demo/demo.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "demo/demo.h"
-#include "remote/apilistener.h"
-#include "remote/apifunction.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
+#include "demo/demo.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/apifunction.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 

diff --git a/components/demo/demo.h b/components/demo/demo.hpp
similarity index 95%
rename from components/demo/demo.h
rename to components/demo/demo.hpp
index f70e3f23ecf181ae7230f249c3d5d4f97beb07a2..7f4762e6947bac095b3ef1169fd18211b1808d32 100644 (file)
--- a/components/demo/demo.h
+++ b/components/demo/demo.hpp
@@ -20,9 +20,9 @@
 #ifndef DEMO_H
 #define DEMO_H
 
-#include "demo/demo.th"
-#include "remote/messageorigin.h"
-#include "base/timer.h"
+#include "demo/demo.thpp"
+#include "remote/messageorigin.hpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {

diff --git a/components/demo/demo.ti b/components/demo/demo.ti
index 71e14d487a261e25cb303d74fc2e152cb3ab1367..623a092571b76b861052e83cc7dcd6658b39385c 100644 (file)
--- a/components/demo/demo.ti
+++ b/components/demo/demo.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/CMakeLists.txt b/components/livestatus/CMakeLists.txt
index e48b331031ce57a1c949a827cc5e21cb3fb3b4a5..f706a43569fa76d57f54559da28d4b99febe4ddc 100644 (file)
--- a/components/livestatus/CMakeLists.txt
+++ b/components/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(listener.ti listener.th)
+mkclass_target(listener.ti listener.thpp)
 
 mkembedconfig_target(livestatus-type.conf livestatus-type.cpp)
 
@@ -24,7 +24,7 @@ add_library(livestatus SHARED aggregator.cpp andfilter.cpp attributefilter.cpp
   commentstable.cpp contactgroupstable.cpp contactstable.cpp countaggregator.cpp
   downtimestable.cpp endpointstable.cpp filter.cpp historytable.cpp
   hostgroupstable.cpp hoststable.cpp invavgaggregator.cpp invsumaggregator.cpp
-  listener.cpp listener.th logutility.cpp logtable.cpp maxaggregator.cpp
+  listener.cpp listener.thpp logutility.cpp logtable.cpp maxaggregator.cpp
   minaggregator.cpp negatefilter.cpp orfilter.cpp query.cpp
   servicegroupstable.cpp servicestable.cpp statehisttable.cpp
   statustable.cpp stdaggregator.cpp sumaggregator.cpp table.cpp

diff --git a/components/livestatus/aggregator.cpp b/components/livestatus/aggregator.cpp
index 60a0dfa7b6bad7adc806923470052fb9e4b3a22d..c6021f1c68f7b4550725dcc81aa5b30670f4a8a3 100644 (file)
--- a/components/livestatus/aggregator.cpp
+++ b/components/livestatus/aggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/aggregator.h"
+#include "livestatus/aggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/aggregator.h b/components/livestatus/aggregator.hpp
similarity index 96%
rename from components/livestatus/aggregator.h
rename to components/livestatus/aggregator.hpp
index a1f4021c7865e5812dbf7403a3eb0cfe2e0f98a8..7c933b82411ec676f0cdade62a5b338882770a26 100644 (file)
--- a/components/livestatus/aggregator.h
+++ b/components/livestatus/aggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef AGGREGATOR_H
 #define AGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/filter.h"
+#include "livestatus/table.hpp"
+#include "livestatus/filter.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/andfilter.cpp b/components/livestatus/andfilter.cpp
index 9558646723078e6d8b563b134dd01ebdb6b07483..4b654edde1c8c673b3d0212243b55f50b2e7d7b4 100644 (file)
--- a/components/livestatus/andfilter.cpp
+++ b/components/livestatus/andfilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/andfilter.h"
+#include "livestatus/andfilter.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/andfilter.h b/components/livestatus/andfilter.hpp
similarity index 97%
rename from components/livestatus/andfilter.h
rename to components/livestatus/andfilter.hpp
index 10c03f985e0b51fd82573605dc3223497d1dca22..5b8a6b76fe82b68d7084cdebee918af5eb226fc4 100644 (file)
--- a/components/livestatus/andfilter.h
+++ b/components/livestatus/andfilter.hpp
@@ -20,7 +20,7 @@
 #ifndef ANDFILTER_H
 #define ANDFILTER_H
 
-#include "livestatus/combinerfilter.h"
+#include "livestatus/combinerfilter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/attributefilter.cpp b/components/livestatus/attributefilter.cpp
index 5c2790d4a2e79a7ad230b2853ff9ca8456b17d71..03ace091bd8cc5f3c8870b03a141784fe29fe48f 100644 (file)
--- a/components/livestatus/attributefilter.cpp
+++ b/components/livestatus/attributefilter.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/attributefilter.h"
-#include "base/convert.h"
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
+#include "livestatus/attributefilter.hpp"
+#include "base/convert.hpp"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 

diff --git a/components/livestatus/attributefilter.h b/components/livestatus/attributefilter.hpp
similarity index 98%
rename from components/livestatus/attributefilter.h
rename to components/livestatus/attributefilter.hpp
index 42670a2e64042ec2a41bc2f051924756d5645743..43d750bb396de58651943f8d257727e290b90e76 100644 (file)
--- a/components/livestatus/attributefilter.h
+++ b/components/livestatus/attributefilter.hpp
@@ -20,7 +20,7 @@
 #ifndef ATTRIBUTEFILTER_H
 #define ATTRIBUTEFILTER_H
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/avgaggregator.cpp b/components/livestatus/avgaggregator.cpp
index 7737204dc908f288b9a2e30d1bcdaf1ff7d75e59..295460ce0d43cf01ade0acfa698028e75ecc2d00 100644 (file)
--- a/components/livestatus/avgaggregator.cpp
+++ b/components/livestatus/avgaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/avgaggregator.h"
+#include "livestatus/avgaggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/avgaggregator.h b/components/livestatus/avgaggregator.hpp
similarity index 96%
rename from components/livestatus/avgaggregator.h
rename to components/livestatus/avgaggregator.hpp
index d6e788914e6271eaa3be8ed90aea72fa7cb787c3..851a0179674de9eff21b701f68f8f224681f1fcf 100644 (file)
--- a/components/livestatus/avgaggregator.h
+++ b/components/livestatus/avgaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef AVGAGGREGATOR_H
 #define AVGAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/column.cpp b/components/livestatus/column.cpp
index 18c9d14f5b7b0beb72b04177f2e46a2e432738db..0a4845663783edf80c6296cb9abbe91b10dcb888 100644 (file)
--- a/components/livestatus/column.cpp
+++ b/components/livestatus/column.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/column.h"
+#include "livestatus/column.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/column.h b/components/livestatus/column.hpp
similarity index 98%
rename from components/livestatus/column.h
rename to components/livestatus/column.hpp
index aafb2143e768a9d45e063a5be366f37c26961be3..6bd3a814e069adfde3155b7a6634a3909c4661d8 100644 (file)
--- a/components/livestatus/column.h
+++ b/components/livestatus/column.hpp
@@ -20,7 +20,7 @@
 #ifndef COLUMN_H
 #define COLUMN_H
 
-#include "base/value.h"
+#include "base/value.hpp"
 #include <boost/function.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/combinerfilter.cpp b/components/livestatus/combinerfilter.cpp
index 3755d699bc40074706a1893aaea5966bb124f86e..61b4161202bf817f15a583a54c820d31539bd66d 100644 (file)
--- a/components/livestatus/combinerfilter.cpp
+++ b/components/livestatus/combinerfilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/combinerfilter.h"
+#include "livestatus/combinerfilter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/combinerfilter.h b/components/livestatus/combinerfilter.hpp
similarity index 98%
rename from components/livestatus/combinerfilter.h
rename to components/livestatus/combinerfilter.hpp
index 52f791fb8a480c638cf6c07776223e5f1e95ed6f..d962c36f2bfae274ac544879236066195d35b969 100644 (file)
--- a/components/livestatus/combinerfilter.h
+++ b/components/livestatus/combinerfilter.hpp
@@ -20,7 +20,7 @@
 #ifndef COMBINERFILTER_H
 #define COMBINERFILTER_H
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/commandstable.cpp b/components/livestatus/commandstable.cpp
index 459155e81f1122a0a981308bb6256ed170247952..4a9ba851bde0a79e9f3b55ed6f14d796355125bc 100644 (file)
--- a/components/livestatus/commandstable.cpp
+++ b/components/livestatus/commandstable.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/commandstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
+#include "livestatus/commandstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 

diff --git a/components/livestatus/commandstable.h b/components/livestatus/commandstable.hpp
similarity index 98%
rename from components/livestatus/commandstable.h
rename to components/livestatus/commandstable.hpp
index f31643baf3579c9047941aed715464984bdaacf8..b4f4d0930e12d2b3e79e98887ec28506024097e7 100644 (file)
--- a/components/livestatus/commandstable.h
+++ b/components/livestatus/commandstable.hpp
@@ -20,7 +20,7 @@
 #ifndef COMMANDSTABLE_H
 #define COMMANDSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/commentstable.cpp b/components/livestatus/commentstable.cpp
index 5ad4899e0f849a6d85cbc90a44ddbcc98e027e4d..eaa89e8eed802a3dd1c18704f927d549c89cf92d 100644 (file)
--- a/components/livestatus/commentstable.cpp
+++ b/components/livestatus/commentstable.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/commentstable.h"
-#include "livestatus/servicestable.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
+#include "livestatus/commentstable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/components/livestatus/commentstable.h b/components/livestatus/commentstable.hpp
similarity index 98%
rename from components/livestatus/commentstable.h
rename to components/livestatus/commentstable.hpp
index 309729f2d2a728b8db760b3d56eb9a2e0abde9dd..3d2a9126f09655cbda67addf926be433be80b2ff 100644 (file)
--- a/components/livestatus/commentstable.h
+++ b/components/livestatus/commentstable.hpp
@@ -20,7 +20,7 @@
 #ifndef COMMENTSTABLE_H
 #define COMMENTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/contactgroupstable.cpp b/components/livestatus/contactgroupstable.cpp
index 374b7a8c31282204228f0a9a8b3ccf5993957251..51cc8c05258fd51bd05925b4c04586e7bc716629 100644 (file)
--- a/components/livestatus/contactgroupstable.cpp
+++ b/components/livestatus/contactgroupstable.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/contactgroupstable.h"
-#include "icinga/usergroup.h"
-#include "base/dynamictype.h"
+#include "livestatus/contactgroupstable.hpp"
+#include "icinga/usergroup.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/contactgroupstable.h b/components/livestatus/contactgroupstable.hpp
similarity index 98%
rename from components/livestatus/contactgroupstable.h
rename to components/livestatus/contactgroupstable.hpp
index 98ab4302c8b8b30f8bc8b7a714a0b1e8d5fa9d4e..1e2334e53fc63ea17196287bccc3a4fa5f0168a5 100644 (file)
--- a/components/livestatus/contactgroupstable.h
+++ b/components/livestatus/contactgroupstable.hpp
@@ -20,7 +20,7 @@
 #ifndef CONTACTGROUPSTABLE_H
 #define CONTACTGROUPSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/contactstable.cpp b/components/livestatus/contactstable.cpp
index c8cf3e2ecb0d1f7e75ef707b5ad4b1d7d25568d2..1c42f98a00536ddec87fbb490f2a35fc88f2b90d 100644 (file)
--- a/components/livestatus/contactstable.cpp
+++ b/components/livestatus/contactstable.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/contactstable.h"
-#include "icinga/user.h"
-#include "icinga/timeperiod.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
+#include "livestatus/contactstable.hpp"
+#include "icinga/user.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 

diff --git a/components/livestatus/contactstable.h b/components/livestatus/contactstable.hpp
similarity index 98%
rename from components/livestatus/contactstable.h
rename to components/livestatus/contactstable.hpp
index f96e1c5bf62011e93ce27e92045e2724d76bb28a..3076d93e456d8c21616153dfca0139425a8dfec5 100644 (file)
--- a/components/livestatus/contactstable.h
+++ b/components/livestatus/contactstable.hpp
@@ -20,7 +20,7 @@
 #ifndef CONTACTSTABLE_H
 #define CONTACTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/countaggregator.cpp b/components/livestatus/countaggregator.cpp
index e33886758b4eea490c722110d0d9fa43e8806044..e28bd1fe5b227f1b3b90ff38e9ad4da552aac3e5 100644 (file)
--- a/components/livestatus/countaggregator.cpp
+++ b/components/livestatus/countaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/countaggregator.h"
+#include "livestatus/countaggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/countaggregator.h b/components/livestatus/countaggregator.hpp
similarity index 96%
rename from components/livestatus/countaggregator.h
rename to components/livestatus/countaggregator.hpp
index 003e19b847b355e730642b15e3e66a44d5c2954f..61860962e0fff64353a14b73f12493789d81957f 100644 (file)
--- a/components/livestatus/countaggregator.h
+++ b/components/livestatus/countaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef COUNTAGGREGATOR_H
 #define COUNTAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/downtimestable.cpp b/components/livestatus/downtimestable.cpp
index ccb01decab2b75d11d8f4550e05b444cb25e673b..8f259a44f42b4dac6b98ae193c26920d59b1455c 100644 (file)
--- a/components/livestatus/downtimestable.cpp
+++ b/components/livestatus/downtimestable.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/downtimestable.h"
-#include "livestatus/servicestable.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
+#include "livestatus/downtimestable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/components/livestatus/downtimestable.h b/components/livestatus/downtimestable.hpp
similarity index 98%
rename from components/livestatus/downtimestable.h
rename to components/livestatus/downtimestable.hpp
index cf0ddc8221fe76d308c6c65a167ab6c0d55da1b5..38a1f8695466df819c36c8fe7cf043b75feee496 100644 (file)
--- a/components/livestatus/downtimestable.h
+++ b/components/livestatus/downtimestable.hpp
@@ -20,7 +20,7 @@
 #ifndef DOWNTIMESTABLE_H
 #define DOWNTIMESTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/endpointstable.cpp b/components/livestatus/endpointstable.cpp
index 74d7990e5d817d98160768c7944208ecd1238c00..21258d7b88234f77bcc5dadf2e8bccc3581977ff 100644 (file)
--- a/components/livestatus/endpointstable.cpp
+++ b/components/livestatus/endpointstable.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/endpointstable.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/icingaapplication.h"
-#include "remote/endpoint.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/endpointstable.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "remote/endpoint.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>

diff --git a/components/livestatus/endpointstable.h b/components/livestatus/endpointstable.hpp
similarity index 98%
rename from components/livestatus/endpointstable.h
rename to components/livestatus/endpointstable.hpp
index 8e2f50cb6cb754780b5edff9a5311bd7d88f1fd8..fa2ca2b739696d93939b67b0cb10da1a96dd00bf 100644 (file)
--- a/components/livestatus/endpointstable.h
+++ b/components/livestatus/endpointstable.hpp
@@ -20,7 +20,7 @@
 #ifndef ENDPOINTSTABLE_H
 #define ENDPOINTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/filter.cpp b/components/livestatus/filter.cpp
index 129c088fb797d7bc16a0b9670ec489d73c020444..cec49ca8be7de3fe7ceca806c3a17b99341948f8 100644 (file)
--- a/components/livestatus/filter.cpp
+++ b/components/livestatus/filter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/filter.h b/components/livestatus/filter.hpp
similarity index 98%
rename from components/livestatus/filter.h
rename to components/livestatus/filter.hpp
index 30b344922758d601b71b08454a293dd3b1906c44..f8d9d1ed5d65a52adefd5513ac6651ff3ccce424 100644 (file)
--- a/components/livestatus/filter.h
+++ b/components/livestatus/filter.hpp
@@ -20,7 +20,7 @@
 #ifndef FILTER_H
 #define FILTER_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/historytable.cpp b/components/livestatus/historytable.cpp
index 8c8270bae8ba4e94034f2699b6a010597e9c8556..769292bb59d9398953707cd1fe7dbbe742b687d4 100644 (file)
--- a/components/livestatus/historytable.cpp
+++ b/components/livestatus/historytable.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/historytable.h"
+#include "livestatus/historytable.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/historytable.h b/components/livestatus/historytable.hpp
similarity index 96%
rename from components/livestatus/historytable.h
rename to components/livestatus/historytable.hpp
index dcebb1a2591c6be00366749c7a5147ff5f94306f..7871390143100b7852290117ab64b2abfac7a0d2 100644 (file)
--- a/components/livestatus/historytable.h
+++ b/components/livestatus/historytable.hpp
@@ -20,8 +20,8 @@
 #ifndef HISTORYTABLE_H
 #define HISTORYTABLE_H
 
-#include "livestatus/table.h"
-#include "base/dictionary.h"
+#include "livestatus/table.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/hostgroupstable.cpp b/components/livestatus/hostgroupstable.cpp
index 2e0c4134f82dc7472ec97710feed84f71ea341eb..d03a016bbecd2c8fb52d50541ef34e5d141b5bc5 100644 (file)
--- a/components/livestatus/hostgroupstable.cpp
+++ b/components/livestatus/hostgroupstable.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/hostgroupstable.h"
-#include "icinga/hostgroup.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
+#include "livestatus/hostgroupstable.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/hostgroupstable.h b/components/livestatus/hostgroupstable.hpp
similarity index 99%
rename from components/livestatus/hostgroupstable.h
rename to components/livestatus/hostgroupstable.hpp
index f8c28ca29caacd18dbef0558779afac8297913de..3cebe6d74f6eae3008d655f641b98ea710377902 100644 (file)
--- a/components/livestatus/hostgroupstable.h
+++ b/components/livestatus/hostgroupstable.hpp
@@ -20,7 +20,7 @@
 #ifndef HOSTGROUPSTABLE_H
 #define HOSTGROUPSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/hoststable.cpp b/components/livestatus/hoststable.cpp
index b6e2091d838fd1da39de1be06b251f02c85abdb0..797e8d8d34b7e529ffb593c29805e065fbb99fcb 100644 (file)
--- a/components/livestatus/hoststable.cpp
+++ b/components/livestatus/hoststable.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/hoststable.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/timeperiod.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/hoststable.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>

diff --git a/components/livestatus/hoststable.h b/components/livestatus/hoststable.hpp
similarity index 99%
rename from components/livestatus/hoststable.h
rename to components/livestatus/hoststable.hpp
index dc5bddede839d60a3ca920ae85bbc96cbcd4e4ad..ed9b877f9ca7b8a41f1f3d7db56a8af6fb72e148 100644 (file)
--- a/components/livestatus/hoststable.h
+++ b/components/livestatus/hoststable.hpp
@@ -20,7 +20,7 @@
 #ifndef HOSTSTABLE_H
 #define HOSTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/invavgaggregator.cpp b/components/livestatus/invavgaggregator.cpp
index 3bea562f30c3a041b84ea2fa8f6cc2557addb2f5..cf66bedad7c2ae30c1dc3e01aa74d8448fb2d40d 100644 (file)
--- a/components/livestatus/invavgaggregator.cpp
+++ b/components/livestatus/invavgaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/invavgaggregator.h"
+#include "livestatus/invavgaggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/invavgaggregator.h b/components/livestatus/invavgaggregator.hpp
similarity index 96%
rename from components/livestatus/invavgaggregator.h
rename to components/livestatus/invavgaggregator.hpp
index a454610320fc7134707182319c7b5c7b33cce795..d85898483ab9ef691d068cd23bf098df96ebbc13 100644 (file)
--- a/components/livestatus/invavgaggregator.h
+++ b/components/livestatus/invavgaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef INVAVGAGGREGATOR_H
 #define INVAVGAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/invsumaggregator.cpp b/components/livestatus/invsumaggregator.cpp
index 7e947d04e5c8845829cafb065b20904238b56bfe..40889b695d0dba3f7af2e6fe68b650760e4ecb90 100644 (file)
--- a/components/livestatus/invsumaggregator.cpp
+++ b/components/livestatus/invsumaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/invsumaggregator.h"
+#include "livestatus/invsumaggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/invsumaggregator.h b/components/livestatus/invsumaggregator.hpp
similarity index 96%
rename from components/livestatus/invsumaggregator.h
rename to components/livestatus/invsumaggregator.hpp
index e3950aa4691ad6ff890353902a1586e93e7b2ef5..b15648bdc3f8691442121dd08bc8b097cad0aed0 100644 (file)
--- a/components/livestatus/invsumaggregator.h
+++ b/components/livestatus/invsumaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef INVSUMAGGREGATOR_H
 #define INVSUMAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/listener.cpp b/components/livestatus/listener.cpp
index cb8b4e36dcc46b0ff7dc53c463ae236b70c869da..dfb8a1aed1a2f6941de6bd207785dd14fd4e674c 100644 (file)
--- a/components/livestatus/listener.cpp
+++ b/components/livestatus/listener.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/listener.h"
-#include "config/configcompilercontext.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/tcpsocket.h"
-#include "base/unixsocket.h"
-#include "base/networkstream.h"
-#include "base/application.h"
-#include "base/scriptfunction.h"
-#include "base/statsfunction.h"
-#include "base/convert.h"
+#include "livestatus/listener.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/unixsocket.hpp"
+#include "base/networkstream.hpp"
+#include "base/application.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/statsfunction.hpp"
+#include "base/convert.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/listener.h b/components/livestatus/listener.hpp
similarity index 95%
rename from components/livestatus/listener.h
rename to components/livestatus/listener.hpp
index d157169c0301b24a25edca42e7a2573a18503430..6a4080ef34146b4655ad2401d010a084c4eede0c 100644 (file)
--- a/components/livestatus/listener.h
+++ b/components/livestatus/listener.hpp
@@ -20,9 +20,9 @@
 #ifndef LIVESTATUSLISTENER_H
 #define LIVESTATUSLISTENER_H
 
-#include "livestatus/listener.th"
-#include "livestatus/query.h"
-#include "base/socket.h"
+#include "livestatus/listener.thpp"
+#include "livestatus/query.hpp"
+#include "base/socket.hpp"
 #include <boost/thread/thread.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/listener.ti b/components/livestatus/listener.ti
index c37981c2b5fc316d9330cac7714119fb1df4f889..61d85b9e974b62ec221f6b25ace2d4b7d123b4f0 100644 (file)
--- a/components/livestatus/listener.ti
+++ b/components/livestatus/listener.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/logtable.cpp b/components/livestatus/logtable.cpp
index a6e239937a3a28f501ff9e05b7c552d77cb41f54..179ad4e6d27ead7055f0516e79e0b2deae04453b 100644 (file)
--- a/components/livestatus/logtable.cpp
+++ b/components/livestatus/logtable.cpp
@@ -17,25 +17,25 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/logtable.h"
-#include "livestatus/logutility.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/servicestable.h"
-#include "livestatus/contactstable.h"
-#include "livestatus/commandstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/user.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/application.h"
-#include "base/objectlock.h"
+#include "livestatus/logtable.hpp"
+#include "livestatus/logutility.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/contactstable.hpp"
+#include "livestatus/commandstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/user.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>

diff --git a/components/livestatus/logtable.h b/components/livestatus/logtable.hpp
similarity index 98%
rename from components/livestatus/logtable.h
rename to components/livestatus/logtable.hpp
index 4a3bd74ae49254e21a00e627fcebc1c7905b5e29..63372f07caf8c52dd0bf4fceea29ff45b80b97e7 100644 (file)
--- a/components/livestatus/logtable.h
+++ b/components/livestatus/logtable.hpp
@@ -20,7 +20,7 @@
 #ifndef LOGTABLE_H
 #define LOGTABLE_H
 
-#include "livestatus/historytable.h"
+#include "livestatus/historytable.hpp"
 #include <boost/thread/mutex.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/logutility.cpp b/components/livestatus/logutility.cpp
index d5113126ca2af796a992574fa3a10eb132c8cd36..f8b1059239f643a4d675a6e3e7bafbf8a30e9a5b 100644 (file)
--- a/components/livestatus/logutility.cpp
+++ b/components/livestatus/logutility.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/logutility.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/user.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
+#include "livestatus/logutility.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/user.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>

diff --git a/components/livestatus/logutility.h b/components/livestatus/logutility.hpp
similarity index 98%
rename from components/livestatus/logutility.h
rename to components/livestatus/logutility.hpp
index 153e4383570945d4c747bfbe73f4ff7bcf4f9838..087073b3a744559c625c6da12775ba404a30d015 100644 (file)
--- a/components/livestatus/logutility.h
+++ b/components/livestatus/logutility.hpp
@@ -20,7 +20,7 @@
 #ifndef LOGUTILITY_H
 #define LOGUTILITY_H
 
-#include "livestatus/historytable.h"
+#include "livestatus/historytable.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/maxaggregator.cpp b/components/livestatus/maxaggregator.cpp
index 85fdbacde38afd2e871d7f7484b9a8074f6a85cd..bca6ab25a9d3206fb6ba654e47e5937ea6ecca85 100644 (file)
--- a/components/livestatus/maxaggregator.cpp
+++ b/components/livestatus/maxaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/maxaggregator.h"
+#include "livestatus/maxaggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/maxaggregator.h b/components/livestatus/maxaggregator.hpp
similarity index 96%
rename from components/livestatus/maxaggregator.h
rename to components/livestatus/maxaggregator.hpp
index 546e74150678baee60fade78216e354f73e1ddd8..315874803bfa4a4de5454016c1c012a7d49eeb29 100644 (file)
--- a/components/livestatus/maxaggregator.h
+++ b/components/livestatus/maxaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef MAXAGGREGATOR_H
 #define MAXAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/minaggregator.cpp b/components/livestatus/minaggregator.cpp
index 123e563b26b0784961a60871f0456d44c10aa502..4599005cf1cdbd6f391ef99660e40764a3696943 100644 (file)
--- a/components/livestatus/minaggregator.cpp
+++ b/components/livestatus/minaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/minaggregator.h"
+#include "livestatus/minaggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/minaggregator.h b/components/livestatus/minaggregator.hpp
similarity index 96%
rename from components/livestatus/minaggregator.h
rename to components/livestatus/minaggregator.hpp
index 48d8841f101f89e72170aaf48f115fd8b3ccfad1..d1280e3c718ee04336494c2dc2dd70fd114589fb 100644 (file)
--- a/components/livestatus/minaggregator.h
+++ b/components/livestatus/minaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef MINAGGREGATOR_H
 #define MINAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/negatefilter.cpp b/components/livestatus/negatefilter.cpp
index 483a95348d10839a5bc01eabf0945f381ccef666..baba99dcbf67a3a8bc86dd9e9241aec569bed4b5 100644 (file)
--- a/components/livestatus/negatefilter.cpp
+++ b/components/livestatus/negatefilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/negatefilter.h"
+#include "livestatus/negatefilter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/negatefilter.h b/components/livestatus/negatefilter.hpp
similarity index 98%
rename from components/livestatus/negatefilter.h
rename to components/livestatus/negatefilter.hpp
index b3c6f11a30de9b107aedfcd1c62304ea4666f4c8..742902bf8492c15eae1a4d045ecc21d6387af5dd 100644 (file)
--- a/components/livestatus/negatefilter.h
+++ b/components/livestatus/negatefilter.hpp
@@ -20,7 +20,7 @@
 #ifndef NEGATEFILTER_H
 #define NEGATEFILTER_H
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/orfilter.cpp b/components/livestatus/orfilter.cpp
index 4a657373f83df6a24ffa42ed29749db586bd1f8c..459e83b76f7f9fb220fe05c2f3ac53f1676574e9 100644 (file)
--- a/components/livestatus/orfilter.cpp
+++ b/components/livestatus/orfilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/orfilter.h"
+#include "livestatus/orfilter.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/orfilter.h b/components/livestatus/orfilter.hpp
similarity index 97%
rename from components/livestatus/orfilter.h
rename to components/livestatus/orfilter.hpp
index cf451ccc8e45cef973a1c24b65bd0ee7dce6fe39..6f5fcf3c0c465109ec8cee353c9f782a675b4994 100644 (file)
--- a/components/livestatus/orfilter.h
+++ b/components/livestatus/orfilter.hpp
@@ -20,7 +20,7 @@
 #ifndef ORFILTER_H
 #define ORFILTER_H
 
-#include "livestatus/combinerfilter.h"
+#include "livestatus/combinerfilter.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/query.cpp b/components/livestatus/query.cpp
index fdac9a7e05b54c795e5e779c13aa694cb9d3eabc..d1aea90bb93271ffc8ca0dab0a779dc9cd7786d4 100644 (file)
--- a/components/livestatus/query.cpp
+++ b/components/livestatus/query.cpp
@@ -17,27 +17,27 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/query.h"
-#include "livestatus/countaggregator.h"
-#include "livestatus/sumaggregator.h"
-#include "livestatus/minaggregator.h"
-#include "livestatus/maxaggregator.h"
-#include "livestatus/avgaggregator.h"
-#include "livestatus/stdaggregator.h"
-#include "livestatus/invsumaggregator.h"
-#include "livestatus/invavgaggregator.h"
-#include "livestatus/attributefilter.h"
-#include "livestatus/negatefilter.h"
-#include "livestatus/orfilter.h"
-#include "livestatus/andfilter.h"
-#include "icinga/externalcommandprocessor.h"
-#include "base/debug.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/utility.h"
-#include "base/serializer.h"
+#include "livestatus/query.hpp"
+#include "livestatus/countaggregator.hpp"
+#include "livestatus/sumaggregator.hpp"
+#include "livestatus/minaggregator.hpp"
+#include "livestatus/maxaggregator.hpp"
+#include "livestatus/avgaggregator.hpp"
+#include "livestatus/stdaggregator.hpp"
+#include "livestatus/invsumaggregator.hpp"
+#include "livestatus/invavgaggregator.hpp"
+#include "livestatus/attributefilter.hpp"
+#include "livestatus/negatefilter.hpp"
+#include "livestatus/orfilter.hpp"
+#include "livestatus/andfilter.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "base/debug.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/utility.hpp"
+#include "base/serializer.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/split.hpp>

diff --git a/components/livestatus/query.h b/components/livestatus/query.hpp
similarity index 95%
rename from components/livestatus/query.h
rename to components/livestatus/query.hpp
index 348282d4fc1773dfffe38636317a264e33ed1a03..a0f096e582deaae9cd8401df857dd9145f106b79 100644 (file)
--- a/components/livestatus/query.h
+++ b/components/livestatus/query.hpp
@@ -20,11 +20,11 @@
 #ifndef QUERY_H
 #define QUERY_H
 
-#include "livestatus/filter.h"
-#include "livestatus/aggregator.h"
-#include "base/object.h"
-#include "base/array.h"
-#include "base/stream.h"
+#include "livestatus/filter.hpp"
+#include "livestatus/aggregator.hpp"
+#include "base/object.hpp"
+#include "base/array.hpp"
+#include "base/stream.hpp"
 #include <deque>
 
 using namespace icinga;

diff --git a/components/livestatus/servicegroupstable.cpp b/components/livestatus/servicegroupstable.cpp
index 7f4a20afdd539237aa6740a71f9611780c8c6807..0db6f2167191445546a72fb4164ebb737b872178 100644 (file)
--- a/components/livestatus/servicegroupstable.cpp
+++ b/components/livestatus/servicegroupstable.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/servicegroupstable.h"
-#include "icinga/servicegroup.h"
-#include "base/dynamictype.h"
+#include "livestatus/servicegroupstable.hpp"
+#include "icinga/servicegroup.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/servicegroupstable.h b/components/livestatus/servicegroupstable.hpp
similarity index 98%
rename from components/livestatus/servicegroupstable.h
rename to components/livestatus/servicegroupstable.hpp
index fcb283f3dfebb594752a18db3dd561d6706d3f14..88d6d6ed83d291a151dbff8ae2b14d11b6a5f6bf 100644 (file)
--- a/components/livestatus/servicegroupstable.h
+++ b/components/livestatus/servicegroupstable.hpp
@@ -20,7 +20,7 @@
 #ifndef SERVICEGROUPSTABLE_H
 #define SERVICEGROUPSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/servicestable.cpp b/components/livestatus/servicestable.cpp
index e6533f59b81e08e6d95d45b0d7c716eefa9f5a05..6ccfcde07aad2f3bf56680db6689725ff93acf15 100644 (file)
--- a/components/livestatus/servicestable.cpp
+++ b/components/livestatus/servicestable.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/servicestable.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/endpointstable.h"
-#include "icinga/service.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/timeperiod.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/endpointstable.hpp"
+#include "icinga/service.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string/replace.hpp>

diff --git a/components/livestatus/servicestable.h b/components/livestatus/servicestable.hpp
similarity index 99%
rename from components/livestatus/servicestable.h
rename to components/livestatus/servicestable.hpp
index 4662628bfb9e1dd2d9ec7c9e4627282780d9da97..c3fe9174eff78cca7410801a7be6b162bf7de770 100644 (file)
--- a/components/livestatus/servicestable.h
+++ b/components/livestatus/servicestable.hpp
@@ -20,7 +20,7 @@
 #ifndef SERVICESTABLE_H
 #define SERVICESTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/statehisttable.cpp b/components/livestatus/statehisttable.cpp
index 9fb4cb79bb7b63e02daa56163e80c2420e5de3e7..6efe76ddef70e0a364667804bcbbda2f97618ccb 100644 (file)
--- a/components/livestatus/statehisttable.cpp
+++ b/components/livestatus/statehisttable.cpp
@@ -17,25 +17,25 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/statehisttable.h"
-#include "livestatus/logutility.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/servicestable.h"
-#include "livestatus/contactstable.h"
-#include "livestatus/commandstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/user.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/application.h"
-#include "base/objectlock.h"
+#include "livestatus/statehisttable.hpp"
+#include "livestatus/logutility.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/contactstable.hpp"
+#include "livestatus/commandstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/user.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>

diff --git a/components/livestatus/statehisttable.h b/components/livestatus/statehisttable.hpp
similarity index 98%
rename from components/livestatus/statehisttable.h
rename to components/livestatus/statehisttable.hpp
index 919d1d4e2e2f538b09a3516c2b9ed243e84acf27..a0ad0711347fad6ae755b872ab40b34ab8abdd7a 100644 (file)
--- a/components/livestatus/statehisttable.h
+++ b/components/livestatus/statehisttable.hpp
@@ -20,8 +20,8 @@
 #ifndef STATEHISTTABLE_H
 #define STATEHISTTABLE_H
 
-#include "icinga/service.h"
-#include "livestatus/historytable.h"
+#include "icinga/service.hpp"
+#include "livestatus/historytable.hpp"
 #include <boost/thread/mutex.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp
index f92ed524ec1a9851408d0c070a756f9266a3a63b..8ecec8ae55be86acaaea90f540e6584f67e18481 100644 (file)
--- a/components/livestatus/statustable.cpp
+++ b/components/livestatus/statustable.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/statustable.h"
-#include "livestatus/listener.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/application.h"
+#include "livestatus/statustable.hpp"
+#include "livestatus/listener.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/livestatus/statustable.h b/components/livestatus/statustable.hpp
similarity index 99%
rename from components/livestatus/statustable.h
rename to components/livestatus/statustable.hpp
index ac1b4550a2c1f203fb9af3be0b4d71b4f2e095cc..0d58b16ff4136834feebfc4182e8382101ea2645 100644 (file)
--- a/components/livestatus/statustable.h
+++ b/components/livestatus/statustable.hpp
@@ -20,7 +20,7 @@
 #ifndef STATUSTABLE_H
 #define STATUSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/stdaggregator.cpp b/components/livestatus/stdaggregator.cpp
index 638ae415bac52085bcebd14ddee4e0213a5c8f77..99f2826d1d63a83be35b779134fe1e2e03209ab4 100644 (file)
--- a/components/livestatus/stdaggregator.cpp
+++ b/components/livestatus/stdaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/stdaggregator.h"
+#include "livestatus/stdaggregator.hpp"
 #include <math.h>
 
 using namespace icinga;

diff --git a/components/livestatus/stdaggregator.h b/components/livestatus/stdaggregator.hpp
similarity index 96%
rename from components/livestatus/stdaggregator.h
rename to components/livestatus/stdaggregator.hpp
index 4d1a8858af9cb9d699edba9fd9e64269049b6841..070bcca700bd3edccd5a39e1141e03625f6333ca 100644 (file)
--- a/components/livestatus/stdaggregator.h
+++ b/components/livestatus/stdaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef STDAGGREGATOR_H
 #define STDAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/sumaggregator.cpp b/components/livestatus/sumaggregator.cpp
index 40aef1ab9a15412a1f278ebff463ec0d75773aac..a0a19b1bef1ee72c7b09130c45d5d86decc11c67 100644 (file)
--- a/components/livestatus/sumaggregator.cpp
+++ b/components/livestatus/sumaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/sumaggregator.h"
+#include "livestatus/sumaggregator.hpp"
 
 using namespace icinga;
 

diff --git a/components/livestatus/sumaggregator.h b/components/livestatus/sumaggregator.hpp
similarity index 96%
rename from components/livestatus/sumaggregator.h
rename to components/livestatus/sumaggregator.hpp
index 88668805f37cd1623b888ebf88eeb1b23de2ed00..b5693a776efe19641cceb7758c4112c8d676dec0 100644 (file)
--- a/components/livestatus/sumaggregator.h
+++ b/components/livestatus/sumaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef SUMAGGREGATOR_H
 #define SUMAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {

diff --git a/components/livestatus/table.cpp b/components/livestatus/table.cpp
index 4d56b52371cff80ad3063b7184a1d1190682bfa1..d6aa6fffe86dd7cba0159c1321c23489a67268d4 100644 (file)
--- a/components/livestatus/table.cpp
+++ b/components/livestatus/table.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/table.h"
-#include "livestatus/statustable.h"
-#include "livestatus/contactgroupstable.h"
-#include "livestatus/contactstable.h"
-#include "livestatus/hostgroupstable.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/servicegroupstable.h"
-#include "livestatus/servicestable.h"
-#include "livestatus/commandstable.h"
-#include "livestatus/commentstable.h"
-#include "livestatus/downtimestable.h"
-#include "livestatus/endpointstable.h"
-#include "livestatus/timeperiodstable.h"
-#include "livestatus/logtable.h"
-#include "livestatus/statehisttable.h"
-#include "livestatus/filter.h"
-#include "base/array.h"
-#include "base/dictionary.h"
+#include "livestatus/table.hpp"
+#include "livestatus/statustable.hpp"
+#include "livestatus/contactgroupstable.hpp"
+#include "livestatus/contactstable.hpp"
+#include "livestatus/hostgroupstable.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/servicegroupstable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/commandstable.hpp"
+#include "livestatus/commentstable.hpp"
+#include "livestatus/downtimestable.hpp"
+#include "livestatus/endpointstable.hpp"
+#include "livestatus/timeperiodstable.hpp"
+#include "livestatus/logtable.hpp"
+#include "livestatus/statehisttable.hpp"
+#include "livestatus/filter.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>

diff --git a/components/livestatus/table.h b/components/livestatus/table.hpp
similarity index 96%
rename from components/livestatus/table.h
rename to components/livestatus/table.hpp
index 1436fe7b113268d52c9c1918dcd0ef4df8dcbff4..3c92f0cfb0f2417e04b15bf1f185a50f22dbcf82 100644 (file)
--- a/components/livestatus/table.h
+++ b/components/livestatus/table.hpp
@@ -20,9 +20,9 @@
 #ifndef TABLE_H
 #define TABLE_H
 
-#include "livestatus/column.h"
-#include "base/object.h"
-#include "base/dictionary.h"
+#include "livestatus/column.hpp"
+#include "base/object.hpp"
+#include "base/dictionary.hpp"
 #include <vector>
 
 namespace icinga

diff --git a/components/livestatus/timeperiodstable.cpp b/components/livestatus/timeperiodstable.cpp
index 2b9c579dc468b83ba7652b5f619197adb997f2da..5675c10d489a4c6d0d2a5edfdc7a9424452145e3 100644 (file)
--- a/components/livestatus/timeperiodstable.cpp
+++ b/components/livestatus/timeperiodstable.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/timeperiodstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/timeperiod.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/timeperiodstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/timeperiod.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 

diff --git a/components/livestatus/timeperiodstable.h b/components/livestatus/timeperiodstable.hpp
similarity index 98%
rename from components/livestatus/timeperiodstable.h
rename to components/livestatus/timeperiodstable.hpp
index cf48a74d61454ac440a0f010db18877b16681b96..cd6df9f2175e63a5a86559b3823943cbc865ee9a 100644 (file)
--- a/components/livestatus/timeperiodstable.h
+++ b/components/livestatus/timeperiodstable.hpp
@@ -20,7 +20,7 @@
 #ifndef TIMEPERIODSTABLE_H
 #define TIMEPERIODSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 

diff --git a/components/notification/CMakeLists.txt b/components/notification/CMakeLists.txt
index 7d2ff0592d45a9068ace3bc4392bf3b072c959b8..cff9f0505e45bd8569b86f256b3e3fb122c18a3e 100644 (file)
--- a/components/notification/CMakeLists.txt
+++ b/components/notification/CMakeLists.txt
@@ -15,11 +15,11 @@
 # 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.th)
+mkclass_target(notificationcomponent.ti notificationcomponent.thpp)
 
 mkembedconfig_target(notification-type.conf notification-type.cpp)
 
-add_library(notification SHARED notificationcomponent.cpp notificationcomponent.th notification-type.cpp)
+add_library(notification SHARED notificationcomponent.cpp notificationcomponent.thpp notification-type.cpp)
 
 target_link_libraries(notification ${Boost_LIBRARIES} base config icinga)
 

diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp
index b818d749f0416371917adf94e9569830e6a4029b..90a12b8cbe7a63be09e8a4d02b739e88632417c0 100644 (file)
--- a/components/notification/notificationcomponent.cpp
+++ b/components/notification/notificationcomponent.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "notification/notificationcomponent.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/statsfunction.h"
+#include "notification/notificationcomponent.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/components/notification/notificationcomponent.h b/components/notification/notificationcomponent.hpp
similarity index 93%
rename from components/notification/notificationcomponent.h
rename to components/notification/notificationcomponent.hpp
index d52243e8f6fbe5d5311dc16a0391bea93ad59479..337fb45312772dd22d405bf873921aa98867af41 100644 (file)
--- a/components/notification/notificationcomponent.h
+++ b/components/notification/notificationcomponent.hpp
@@ -20,10 +20,10 @@
 #ifndef NOTIFICATIONCOMPONENT_H
 #define NOTIFICATIONCOMPONENT_H
 
-#include "notification/notificationcomponent.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
+#include "notification/notificationcomponent.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {

diff --git a/components/notification/notificationcomponent.ti b/components/notification/notificationcomponent.ti
index d19f1c2a601ee8146432acfb3f0a70371282fdb7..1758f9537cec2104a6a8da8f22fd484c763f286c 100644 (file)
--- a/components/notification/notificationcomponent.ti
+++ b/components/notification/notificationcomponent.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/components/perfdata/CMakeLists.txt b/components/perfdata/CMakeLists.txt
index 51a14cf59a21f50e02f7aaecba6b57b6ab21ba84..0914923ccdee5bda2704b3e36b0747859245f560 100644 (file)
--- a/components/perfdata/CMakeLists.txt
+++ b/components/perfdata/CMakeLists.txt
@@ -15,12 +15,12 @@
 # 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(graphitewriter.ti graphitewriter.th)
-mkclass_target(perfdatawriter.ti perfdatawriter.th)
+mkclass_target(graphitewriter.ti graphitewriter.thpp)
+mkclass_target(perfdatawriter.ti perfdatawriter.thpp)
 
 mkembedconfig_target(perfdata-type.conf perfdata-type.cpp)
 
-add_library(perfdata SHARED graphitewriter.cpp graphitewriter.th perfdatawriter.cpp perfdatawriter.th perfdata-type.cpp)
+add_library(perfdata SHARED graphitewriter.cpp graphitewriter.thpp perfdatawriter.cpp perfdatawriter.thpp perfdata-type.cpp)
 
 target_link_libraries(perfdata ${Boost_LIBRARIES} base config icinga)
 

diff --git a/components/perfdata/graphitewriter.cpp b/components/perfdata/graphitewriter.cpp
index 043d77d115d55a6062e009e2df981b5d265e4a96..22250bfbf264ab4c9697ce7bd4bd42a65429dc1a 100644 (file)
--- a/components/perfdata/graphitewriter.cpp
+++ b/components/perfdata/graphitewriter.cpp
@@ -17,23 +17,23 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "perfdata/graphitewriter.h"
-#include "icinga/service.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/compatutility.h"
-#include "icinga/perfdatavalue.h"
-#include "base/tcpsocket.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/application.h"
-#include "base/stream.h"
-#include "base/networkstream.h"
-#include "base/exception.h"
-#include "base/statsfunction.h"
+#include "perfdata/graphitewriter.hpp"
+#include "icinga/service.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/perfdatavalue.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
+#include "base/stream.hpp"
+#include "base/networkstream.hpp"
+#include "base/exception.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>

diff --git a/components/perfdata/graphitewriter.h b/components/perfdata/graphitewriter.hpp
similarity index 93%
rename from components/perfdata/graphitewriter.h
rename to components/perfdata/graphitewriter.hpp
index 4b1bf30e883d8f8dd3f166da1c71fcdaf0c4ed25..d0e516f22a6e1e827e8b35781513c5341c236037 100644 (file)
--- a/components/perfdata/graphitewriter.h
+++ b/components/perfdata/graphitewriter.hpp
@@ -20,11 +20,11 @@
 #ifndef GRAPHITEWRITER_H
 #define GRAPHITEWRITER_H
 
-#include "perfdata/graphitewriter.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/tcpsocket.h"
-#include "base/timer.h"
+#include "perfdata/graphitewriter.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga

diff --git a/components/perfdata/graphitewriter.ti b/components/perfdata/graphitewriter.ti
index 379663fa669df414b23985185836f8985993e007..29311b44cdb566f9896d13f237010883e4bee269 100644 (file)
--- a/components/perfdata/graphitewriter.ti
+++ b/components/perfdata/graphitewriter.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/components/perfdata/perfdatawriter.cpp b/components/perfdata/perfdatawriter.cpp
index 81c8ae46beaca15666cebc27283be49c6c999171..9da2707aebe4b2d7a9166e1c3d353d143b6d3848 100644 (file)
--- a/components/perfdata/perfdatawriter.cpp
+++ b/components/perfdata/perfdatawriter.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "perfdata/perfdatawriter.h"
-#include "icinga/service.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/context.h"
-#include "base/application.h"
-#include "base/statsfunction.h"
+#include "perfdata/perfdatawriter.hpp"
+#include "icinga/service.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/context.hpp"
+#include "base/application.hpp"
+#include "base/statsfunction.hpp"
 
 using namespace icinga;
 

diff --git a/components/perfdata/perfdatawriter.h b/components/perfdata/perfdatawriter.hpp
similarity index 94%
rename from components/perfdata/perfdatawriter.h
rename to components/perfdata/perfdatawriter.hpp
index cb66a02434d617eac14a507af9c04a207e833916..f22b63047fe9f171ad3a792f7c3c6d33cde2e00d 100644 (file)
--- a/components/perfdata/perfdatawriter.h
+++ b/components/perfdata/perfdatawriter.hpp
@@ -20,10 +20,10 @@
 #ifndef PERFDATAWRITER_H
 #define PERFDATAWRITER_H
 
-#include "perfdata/perfdatawriter.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
+#include "perfdata/perfdatawriter.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga

diff --git a/components/perfdata/perfdatawriter.ti b/components/perfdata/perfdatawriter.ti
index 95f9cfc39934480145827b849b541dac4194c900..8497a91db6bb8af1221e77e9ccc5084579521a34 100644 (file)
--- a/components/perfdata/perfdatawriter.ti
+++ b/components/perfdata/perfdatawriter.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 8f20208245a8acc7423487c8195d5b1d410ea505..d557ce43aa8f686ac423084026b63d1d4c0d03d4 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompilercontext.h"
-#include "config/configcompiler.h"
-#include "config/configitembuilder.h"
-#include "base/application.h"
-#include "base/logger.h"
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/scriptvariable.h"
-#include "base/context.h"
+#include "config/configcompilercontext.hpp"
+#include "config/configcompiler.hpp"
+#include "config/configitembuilder.hpp"
+#include "base/application.hpp"
+#include "base/logger.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/context.hpp"
 #include "config.h"
 #include <boost/program_options.hpp>
 #include <boost/tuple/tuple.hpp>

diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 6223f5c9e87525ebc0a093344f6274f969a991c2..4dbf4d2fe84f8d2b69ebc56d94e71f20b4bae4a5 100644 (file)
--- a/lib/base/CMakeLists.txt
+++ b/lib/base/CMakeLists.txt
@@ -15,22 +15,22 @@
 # 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.th)
-mkclass_target(dynamicobject.ti dynamicobject.th)
-mkclass_target(filelogger.ti filelogger.th)
-mkclass_target(logger.ti logger.th)
-mkclass_target(streamlogger.ti streamlogger.th)
-mkclass_target(sysloglogger.ti sysloglogger.th)
+mkclass_target(application.ti application.thpp)
+mkclass_target(dynamicobject.ti dynamicobject.thpp)
+mkclass_target(filelogger.ti filelogger.thpp)
+mkclass_target(logger.ti logger.thpp)
+mkclass_target(streamlogger.ti streamlogger.thpp)
+mkclass_target(sysloglogger.ti sysloglogger.thpp)
 
 add_library(base SHARED
-  application.cpp application.th array.cpp context.cpp
-  convert.cpp dictionary.cpp dynamicobject.cpp dynamicobject.th dynamictype.cpp
-  exception.cpp fifo.cpp filelogger.cpp filelogger.th logger.cpp logger.th
+  application.cpp application.thpp array.cpp context.cpp
+  convert.cpp dictionary.cpp dynamicobject.cpp dynamicobject.thpp dynamictype.cpp
+  exception.cpp fifo.cpp filelogger.cpp filelogger.thpp logger.cpp logger.thpp
   netstring.cpp networkstream.cpp object.cpp objectlock.cpp process.cpp
   qstring.cpp ringbuffer.cpp scriptfunction.cpp scriptfunctionwrapper.cpp
   scriptutils.cpp scriptvariable.cpp serializer.cpp socket.cpp stacktrace.cpp
-  statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.th
-  sysloglogger.cpp sysloglogger.th tcpsocket.cpp threadpool.cpp timer.cpp
+  statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.thpp
+  sysloglogger.cpp sysloglogger.thpp tcpsocket.cpp threadpool.cpp timer.cpp
   tlsstream.cpp tlsutility.cpp type.cpp unixsocket.cpp utility.cpp value.cpp
   value-operators.cpp workqueue.cpp
 )

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 07d781ccd760cb588490a0a38cd1273339ce5455..92a1541522d734d4dd0b005eb6afac4d59b4938b 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/application.h"
-#include "base/stacktrace.h"
-#include "base/timer.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/debug.h"
-#include "base/type.h"
-#include "base/convert.h"
-#include "base/scriptvariable.h"
-#include "base/process.h"
+#include "base/application.hpp"
+#include "base/stacktrace.hpp"
+#include "base/timer.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/debug.hpp"
+#include "base/type.hpp"
+#include "base/convert.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/process.hpp"
 #include "icinga-version.h"
 #include <sstream>
 #include <boost/algorithm/string/classification.hpp>

diff --git a/lib/base/application.h b/lib/base/application.hpp
similarity index 97%
rename from lib/base/application.h
rename to lib/base/application.hpp
index 7f3a4ca526040bb7ebbdd3ae37cfbcd409c38f56..1a221ebec862204454a35a39835778377e232925 100644 (file)
--- a/lib/base/application.h
+++ b/lib/base/application.hpp
@@ -20,11 +20,11 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include "base/i2-base.h"
-#include "base/application.th"
-#include "base/threadpool.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
+#include "base/i2-base.hpp"
+#include "base/application.thpp"
+#include "base/threadpool.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/application.ti b/lib/base/application.ti
index b66c638a11937e7c4e9527472b8c065f2b2e8923..fa28b3bdca0f5b6681b01c8258c622ec832ba9b9 100644 (file)
--- a/lib/base/application.ti
+++ b/lib/base/application.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/array.cpp b/lib/base/array.cpp
index 1240e0a1f34a939ca9aaadd59e75fbc9a7058591..924eaf27906f4b30ac90b339ccbc079c1f7265f2 100644 (file)
--- a/lib/base/array.cpp
+++ b/lib/base/array.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 #include <cJSON.h>
 #include <boost/foreach.hpp>
 

diff --git a/lib/base/array.h b/lib/base/array.hpp
similarity index 98%
rename from lib/base/array.h
rename to lib/base/array.hpp
index 4bd8bd7c10ef670e3043211851af06215c19d568..a74fbd23846f094f3a573f49a9d6b0c34e8d1178 100644 (file)
--- a/lib/base/array.h
+++ b/lib/base/array.hpp
@@ -20,8 +20,8 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 #include <vector>
 
 namespace icinga

diff --git a/lib/base/context.cpp b/lib/base/context.cpp
index 95086ffecc0742f2c24797e6c3caa993833ec2ef..dfb688a18d0d9501746c8a26014e1703a23b74e6 100644 (file)
--- a/lib/base/context.cpp
+++ b/lib/base/context.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/context.h"
+#include "base/context.hpp"
 #include <boost/thread/tss.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/lib/base/context.h b/lib/base/context.hpp
similarity index 97%
rename from lib/base/context.h
rename to lib/base/context.hpp
index 8b2718129579349eaeb7ffa7c475b8771788e462..c75849a6c12ce7fbcda5df0b12d404d57e2563d9 100644 (file)
--- a/lib/base/context.h
+++ b/lib/base/context.hpp
@@ -20,8 +20,8 @@
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 #include <list>
 
 namespace icinga

diff --git a/lib/base/convert.cpp b/lib/base/convert.cpp
index dbe8d8ed3a550ea2584260589299a3e20c678709..12a074e5278f7d98110caac338f4945a83bf9f72 100644 (file)
--- a/lib/base/convert.cpp
+++ b/lib/base/convert.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/convert.h"
+#include "base/convert.hpp"
 #include <boost/lexical_cast.hpp>
 
 using namespace icinga;

diff --git a/lib/base/convert.h b/lib/base/convert.hpp
similarity index 97%
rename from lib/base/convert.h
rename to lib/base/convert.hpp
index a66e9b7ce2566ee55fbe1b40486c161ed2b4116f..7d77abe933ce0a8043893540ee87a1c524f8e9e2 100644 (file)
--- a/lib/base/convert.h
+++ b/lib/base/convert.hpp
@@ -20,8 +20,8 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace icinga

diff --git a/lib/base/debug.h b/lib/base/debug.hpp
similarity index 99%
rename from lib/base/debug.h
rename to lib/base/debug.hpp
index 964c81d93f7acd086997985b083e9789e9311ccf..b1ede56494baa2d3a6cfd28f1d3d8ddb12bdb4df 100644 (file)
--- a/lib/base/debug.h
+++ b/lib/base/debug.hpp
@@ -20,7 +20,7 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include "i2-base.h"
+#include "i2-base.hpp"
 
 #ifndef _DEBUG
 #      define ASSERT(expr) ((void)0)

diff --git a/lib/base/dictionary.cpp b/lib/base/dictionary.cpp
index 833480541032073609ccb992329fc6df88834718..4362a13d7661b6b869d1d66f727bb6e41593dc0f 100644 (file)
--- a/lib/base/dictionary.cpp
+++ b/lib/base/dictionary.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 #include <cJSON.h>
 #include <boost/foreach.hpp>
 

diff --git a/lib/base/dictionary.h b/lib/base/dictionary.hpp
similarity index 97%
rename from lib/base/dictionary.h
rename to lib/base/dictionary.hpp
index 67f1121126a7f94923d4573c85d5209f37b02edb..e280d452f4e3b773b4396c17558dd97eaa7e12cd 100644 (file)
--- a/lib/base/dictionary.h
+++ b/lib/base/dictionary.hpp
@@ -20,9 +20,9 @@
 #ifndef DICTIONARY_H
 #define DICTIONARY_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
+#include "base/value.hpp"
 #include <map>
 
 namespace icinga

diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp
index d79a29a49000ea7b756922f926d5f773983cb35e..a5ae9c8cedd4324b9771f7f9201c390605b63e79 100644 (file)
--- a/lib/base/dynamicobject.cpp
+++ b/lib/base/dynamicobject.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dynamicobject.h"
-#include "base/dynamictype.h"
-#include "base/serializer.h"
-#include "base/netstring.h"
-#include "base/stdiostream.h"
-#include "base/debug.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/scriptfunction.h"
-#include "base/initialize.h"
-#include "base/scriptvariable.h"
-#include "base/workqueue.h"
+#include "base/dynamicobject.hpp"
+#include "base/dynamictype.hpp"
+#include "base/serializer.hpp"
+#include "base/netstring.hpp"
+#include "base/stdiostream.hpp"
+#include "base/debug.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/initialize.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/workqueue.hpp"
 #include <fstream>
 #include <boost/foreach.hpp>
 #include <boost/exception/errinfo_api_function.hpp>

diff --git a/lib/base/dynamicobject.h b/lib/base/dynamicobject.hpp
similarity index 96%
rename from lib/base/dynamicobject.h
rename to lib/base/dynamicobject.hpp
index a57518208fe388c9f6f8d72087f62d408db134f5..d3be72a40d862c63c59ace96450adf069071d0eb 100644 (file)
--- a/lib/base/dynamicobject.h
+++ b/lib/base/dynamicobject.hpp
@@ -20,11 +20,11 @@
 #ifndef DYNAMICOBJECT_H
 #define DYNAMICOBJECT_H
 
-#include "base/i2-base.h"
-#include "base/dynamicobject.th"
-#include "base/object.h"
-#include "base/serializer.h"
-#include "base/dictionary.h"
+#include "base/i2-base.hpp"
+#include "base/dynamicobject.thpp"
+#include "base/object.hpp"
+#include "base/serializer.hpp"
+#include "base/dictionary.hpp"
 #include <boost/signals2.hpp>
 #include <map>
 

diff --git a/lib/base/dynamictype.cpp b/lib/base/dynamictype.cpp
index ceba1f8d91215b5539d53a47fc538b9a6bc5ec02..219dfcc18998c5cb19e791d556c2d323ff9b991c 100644 (file)
--- a/lib/base/dynamictype.cpp
+++ b/lib/base/dynamictype.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dynamictype.h"
-#include "base/serializer.h"
-#include "base/debug.h"
-#include "base/objectlock.h"
+#include "base/dynamictype.hpp"
+#include "base/serializer.hpp"
+#include "base/debug.hpp"
+#include "base/objectlock.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/dynamictype.h b/lib/base/dynamictype.hpp
similarity index 97%
rename from lib/base/dynamictype.h
rename to lib/base/dynamictype.hpp
index 9675bbdf397df82c17aa81123b9308ee6c4bbe90..5a9927f4567bad22082cd958f528bc1df322b8a8 100644 (file)
--- a/lib/base/dynamictype.h
+++ b/lib/base/dynamictype.hpp
@@ -20,10 +20,10 @@
 #ifndef DYNAMICTYPE_H
 #define DYNAMICTYPE_H
 
-#include "base/i2-base.h"
-#include "base/dynamicobject.h"
-#include "base/debug.h"
-#include "base/objectlock.h"
+#include "base/i2-base.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/debug.hpp"
+#include "base/objectlock.hpp"
 #include <map>
 # include <boost/iterator/iterator_facade.hpp>
 

diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index a262bbb97d5f4a0ba56ecf579288a5a7eac12658..c3da16cef5466e0cf52b08411912d7a451542e20 100644 (file)
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/exception.h"
+#include "base/exception.hpp"
 #include <boost/thread/tss.hpp>
 
 #ifndef _MSC_VER

diff --git a/lib/base/exception.h b/lib/base/exception.hpp
similarity index 97%
rename from lib/base/exception.h
rename to lib/base/exception.hpp
index d7cccc8ac722883dc7c613ba673b3e86246319cc..4cd5bf06fa90adc537d460fd6442c609f4e88a32 100644 (file)
--- a/lib/base/exception.h
+++ b/lib/base/exception.hpp
@@ -20,10 +20,10 @@
 #ifndef EXCEPTION_H
 #define EXCEPTION_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
-#include "base/stacktrace.h"
-#include "base/context.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
+#include "base/stacktrace.hpp"
+#include "base/context.hpp"
 #include <sstream>
 #include <boost/exception/errinfo_api_function.hpp>
 #include <boost/exception/errinfo_errno.hpp>

diff --git a/lib/base/fifo.cpp b/lib/base/fifo.cpp
index 3365a6f87a6244b00a069540676b39d7de439811..c61e4a962c9e20e577a881bd267858bc4d70fc42 100644 (file)
--- a/lib/base/fifo.cpp
+++ b/lib/base/fifo.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/fifo.h"
+#include "base/fifo.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/fifo.h b/lib/base/fifo.hpp
similarity index 97%
rename from lib/base/fifo.h
rename to lib/base/fifo.hpp
index e32d35dbadc3104f07f60a6087183eea5c2b56dc..5534e5e4f381557c56014d6268f779cd0f6222ac 100644 (file)
--- a/lib/base/fifo.h
+++ b/lib/base/fifo.hpp
@@ -20,8 +20,8 @@
 #ifndef FIFO_H
 #define FIFO_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/filelogger.cpp b/lib/base/filelogger.cpp
index 193a7d7fc708f9418d6222859e882fc6fc86d1bc..123adeab7f92f7f775d35a61dbe1f3f75ac445c7 100644 (file)
--- a/lib/base/filelogger.cpp
+++ b/lib/base/filelogger.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/filelogger.h"
-#include "base/dynamictype.h"
-#include "base/statsfunction.h"
-#include "base/application.h"
+#include "base/filelogger.hpp"
+#include "base/dynamictype.hpp"
+#include "base/statsfunction.hpp"
+#include "base/application.hpp"
 #include <fstream>
 
 using namespace icinga;

diff --git a/lib/base/filelogger.h b/lib/base/filelogger.hpp
similarity index 96%
rename from lib/base/filelogger.h
rename to lib/base/filelogger.hpp
index a1244324cf482a9ba04b31dd7fc4f5850337210a..bbf5ff0563ca2f9450fda3bea7bd768c590e82da 100644 (file)
--- a/lib/base/filelogger.h
+++ b/lib/base/filelogger.hpp
@@ -20,8 +20,8 @@
 #ifndef FILELOGGER_H
 #define FILELOGGER_H
 
-#include "base/i2-base.h"
-#include "base/filelogger.th"
+#include "base/i2-base.hpp"
+#include "base/filelogger.thpp"
 
 namespace icinga
 {

diff --git a/lib/base/filelogger.ti b/lib/base/filelogger.ti
index 1392a9f9a97bac9c0f2ce41ff425d49a2cc6365a..93b35001a0fd9643c6e7fab091482926b1190246 100644 (file)
--- a/lib/base/filelogger.ti
+++ b/lib/base/filelogger.ti
@@ -1,4 +1,4 @@
-#include "base/streamlogger.h"
+#include "base/streamlogger.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/i2-base.h b/lib/base/i2-base.hpp
similarity index 97%
rename from lib/base/i2-base.h
rename to lib/base/i2-base.hpp
index e2f74a041eef3251a2c2faf15240a89699f7c0d1..3d5f5baf972ae1fda48739d1119458fb21c4c3b7 100644 (file)
--- a/lib/base/i2-base.h
+++ b/lib/base/i2-base.hpp
@@ -61,9 +61,9 @@
 #endif /* _MSC_VER */
 
 #ifdef _WIN32
-#      include "win32.h"
+#      include "base/win32.hpp"
 #else
-#      include "unix.h"
+#      include "base/unix.hpp"
 #endif
 
 #include <cstdlib>
@@ -83,7 +83,7 @@
 #      pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "visibility.h"
+#include "visibility.hpp"
 
 #ifdef I2_BASE_BUILD
 #      define I2_BASE_API I2_EXPORT

diff --git a/lib/base/initialize.h b/lib/base/initialize.hpp
similarity index 97%
rename from lib/base/initialize.h
rename to lib/base/initialize.hpp
index b0dfff905aa01457722507eea13745d85cd58479..ceb3554502b9cdf4045eeb7a9a677a7bed9ba69c 100644 (file)
--- a/lib/base/initialize.h
+++ b/lib/base/initialize.hpp
@@ -20,8 +20,8 @@
 #ifndef INITIALIZE_H
 #define INITIALIZE_H
 
-#include "base/i2-base.h"
-#include "base/utility.h"
+#include "base/i2-base.hpp"
+#include "base/utility.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
index b92ca31ef731e380075c5cc68411b5f00a9f84a3..507f6902f8e4b2f2d865539fb465def3baf4d688 100644 (file)
--- a/lib/base/logger.cpp
+++ b/lib/base/logger.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/application.h"
-#include "base/streamlogger.h"
-#include "base/logger.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/context.h"
-#include "base/scriptvariable.h"
+#include "base/application.hpp"
+#include "base/streamlogger.hpp"
+#include "base/logger.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/context.hpp"
+#include "base/scriptvariable.hpp"
 #include <boost/foreach.hpp>
 #include <iostream>
 

diff --git a/lib/base/logger.h b/lib/base/logger.hpp
similarity index 97%
rename from lib/base/logger.h
rename to lib/base/logger.hpp
index d4bb3ec93872ac38e613e9d6d9b0d1c10fa43852..b18229547f786c8c41bde837eadfc69c93be3f86 100644 (file)
--- a/lib/base/logger.h
+++ b/lib/base/logger.hpp
@@ -20,9 +20,9 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include "base/i2-base.h"
-#include "base/logger.th"
-#include "base/logger_fwd.h"
+#include "base/i2-base.hpp"
+#include "base/logger.thpp"
+#include "base/logger_fwd.hpp"
 #include <set>
 
 namespace icinga

diff --git a/lib/base/logger.ti b/lib/base/logger.ti
index fabf29ccffd367f26a5ad28edfe3f244419c2879..1f25f5770234a37c92a00eacd94573139ea4dbcc 100644 (file)
--- a/lib/base/logger.ti
+++ b/lib/base/logger.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/logger_fwd.h b/lib/base/logger_fwd.hpp
similarity index 96%
rename from lib/base/logger_fwd.h
rename to lib/base/logger_fwd.hpp
index 25d22fc2c51f24901f2e934a6ebe61d6f3a8f98a..3661e1f79ca52a88caa0dbf4387ce2873fa88316 100644 (file)
--- a/lib/base/logger_fwd.h
+++ b/lib/base/logger_fwd.hpp
@@ -20,8 +20,8 @@
 #ifndef LOGGER_FWD_H
 #define LOGGER_FWD_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp
index 7314a8ea124ea6fb195f0fb94e259896019c03af..615048adc73b111a3d652d96fe77cc9fad1b8512 100644 (file)
--- a/lib/base/netstring.cpp
+++ b/lib/base/netstring.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/netstring.h"
-#include "base/qstring.h"
-#include "base/debug.h"
+#include "base/netstring.hpp"
+#include "base/qstring.hpp"
+#include "base/debug.hpp"
 #include <sstream>
 
 using namespace icinga;

diff --git a/lib/base/netstring.h b/lib/base/netstring.hpp
similarity index 97%
rename from lib/base/netstring.h
rename to lib/base/netstring.hpp
index 54b96d46d214194a151cfbf3115e3795b4d2c639..0ed294c9237c0ebddac5c8306388502ab20cc125 100644 (file)
--- a/lib/base/netstring.h
+++ b/lib/base/netstring.hpp
@@ -20,8 +20,8 @@
 #ifndef NETSTRING_H
 #define NETSTRING_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/networkstream.cpp b/lib/base/networkstream.cpp
index c74ea42712d391f9a653084d9693fe7370885be5..6cb12c55d6cb923430c4636d8c74d260ae5c6e72 100644 (file)
--- a/lib/base/networkstream.cpp
+++ b/lib/base/networkstream.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/networkstream.h"
+#include "base/networkstream.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/networkstream.h b/lib/base/networkstream.hpp
similarity index 95%
rename from lib/base/networkstream.h
rename to lib/base/networkstream.hpp
index 1fcc1af5c3abe055522300b2b335f6e191441685..aae07edf573aa0e83990365e59a67afde257a119 100644 (file)
--- a/lib/base/networkstream.h
+++ b/lib/base/networkstream.hpp
@@ -20,9 +20,9 @@
 #ifndef NETWORKSTREAM_H
 #define NETWORKSTREAM_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
-#include "base/socket.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
+#include "base/socket.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/object.cpp b/lib/base/object.cpp
index e800175f61b4f93cc2a45a3a54ba6687de5c23cc..713e51a77ace7b4282b539cab195aca5d37848ca 100644 (file)
--- a/lib/base/object.cpp
+++ b/lib/base/object.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/object.h"
-#include "base/value.h"
+#include "base/object.hpp"
+#include "base/value.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/object.h b/lib/base/object.hpp
similarity index 98%
rename from lib/base/object.h
rename to lib/base/object.hpp
index c19fda884b3fa9f64a6bf99bca6e73f0d5c7b5db..c4832010ab672ca97ed0b6fe1c69b3a48b92d5b3 100644 (file)
--- a/lib/base/object.h
+++ b/lib/base/object.hpp
@@ -20,8 +20,8 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "base/i2-base.h"
-#include "base/debug.h"
+#include "base/i2-base.hpp"
+#include "base/debug.hpp"
 #include <boost/thread/thread.hpp>
 
 #ifndef _DEBUG

diff --git a/lib/base/objectlock.cpp b/lib/base/objectlock.cpp
index d711f7ce524471bc2b7599ff16fc2cade2128fe0..d236bf75c9703c6788eefe6db0ff2bc31dae52c5 100644 (file)
--- a/lib/base/objectlock.cpp
+++ b/lib/base/objectlock.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/objectlock.h b/lib/base/objectlock.hpp
similarity index 98%
rename from lib/base/objectlock.h
rename to lib/base/objectlock.hpp
index ec1bf25fc7492c7b9e6341515c2af764c575726d..4215f089a3d96a4a8e060b27c2c0eba39fdf95bf 100644 (file)
--- a/lib/base/objectlock.h
+++ b/lib/base/objectlock.hpp
@@ -20,7 +20,7 @@
 #ifndef OBJECTLOCK_H
 #define OBJECTLOCK_H
 
-#include "base/object.h"
+#include "base/object.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index 230dce5f32193b91770c4aad45b8f40e31d9f153..2ed95077bc3290b67a284041577597f217f1ec66 100644 (file)
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/process.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/scriptvariable.h"
+#include "base/process.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/scriptvariable.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/thread/once.hpp>

diff --git a/lib/base/process.h b/lib/base/process.hpp
similarity index 98%
rename from lib/base/process.h
rename to lib/base/process.hpp
index bd3e5ad80e5f0d9a3c3b6638cba73e2a32d1fb6a..e0f1806f6ce3e7957b143a78efd3b892d5e75ed2 100644 (file)
--- a/lib/base/process.h
+++ b/lib/base/process.hpp
@@ -20,8 +20,8 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
-#include "base/i2-base.h"
-#include "base/dictionary.h"
+#include "base/i2-base.hpp"
+#include "base/dictionary.hpp"
 #include <boost/function.hpp>
 #include <sstream>
 #include <deque>

diff --git a/lib/base/qstring.cpp b/lib/base/qstring.cpp
index 3d9ad37689a3073ae32a45880419a406392c109a..4d9b8bda2faef8ceaa622b50dcce5da62e58b371 100644 (file)
--- a/lib/base/qstring.cpp
+++ b/lib/base/qstring.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/qstring.h"
-#include "base/value.h"
+#include "base/qstring.hpp"
+#include "base/value.hpp"
 #include <boost/algorithm/string/trim.hpp>
 #include <ostream>
 

diff --git a/lib/base/qstring.h b/lib/base/qstring.hpp
similarity index 99%
rename from lib/base/qstring.h
rename to lib/base/qstring.hpp
index a54945d2ce4143b2e321bfd86aad043c25b22a47..bd02a52c6cfd2a46504a94e751e186045f57d302 100644 (file)
--- a/lib/base/qstring.h
+++ b/lib/base/qstring.hpp
@@ -20,7 +20,7 @@
 #ifndef STRING_H
 #define STRING_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <string.h>
 #include <functional>
 #include <string>

diff --git a/lib/base/registry.h b/lib/base/registry.hpp
similarity index 98%
rename from lib/base/registry.h
rename to lib/base/registry.hpp
index 9895e2b85a6d8dc2a508130d6ee85a37cdff87dc..781c16605645d4a1a92070f1b15bdc7e26d6839f 100644 (file)
--- a/lib/base/registry.h
+++ b/lib/base/registry.hpp
@@ -20,8 +20,8 @@
 #ifndef REGISTRY_H
 #define REGISTRY_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 #include <map>
 #include <boost/thread/mutex.hpp>
 #include <boost/signals2.hpp>

diff --git a/lib/base/ringbuffer.cpp b/lib/base/ringbuffer.cpp
index 2e19fbb9135e1af724b8d8c94cf2f2bf49afe830..d4854a2bda49ef9fb79876f2ef732a2f2c682a1e 100644 (file)
--- a/lib/base/ringbuffer.cpp
+++ b/lib/base/ringbuffer.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/ringbuffer.h"
-#include "base/objectlock.h"
+#include "base/ringbuffer.hpp"
+#include "base/objectlock.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/ringbuffer.h b/lib/base/ringbuffer.hpp
similarity index 97%
rename from lib/base/ringbuffer.h
rename to lib/base/ringbuffer.hpp
index c74544c9716abbb322afbd2bde5f38f0b5d5d3dc..cb8d96950ff5c074f42b24aee17b3cfe14cef44c 100644 (file)
--- a/lib/base/ringbuffer.h
+++ b/lib/base/ringbuffer.hpp
@@ -20,8 +20,8 @@
 #ifndef RINGBUFFER_H
 #define RINGBUFFER_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
 #include <vector>
 
 namespace icinga

diff --git a/lib/base/scriptfunction.cpp b/lib/base/scriptfunction.cpp
index 7459692370ecac33d307c43aa6e9d48d81c112be..2852db422a9263462882a76d2c19b6a26abf994b 100644 (file)
--- a/lib/base/scriptfunction.cpp
+++ b/lib/base/scriptfunction.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptfunction.h"
-#include "base/scriptvariable.h"
+#include "base/scriptfunction.hpp"
+#include "base/scriptvariable.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/scriptfunction.h b/lib/base/scriptfunction.hpp
similarity index 96%
rename from lib/base/scriptfunction.h
rename to lib/base/scriptfunction.hpp
index ef8861ba5e6419277c608ec374e8a3d02089a87b..aa50d7f7c804370e6c59e6dfedf98f3866a42eb0 100644 (file)
--- a/lib/base/scriptfunction.h
+++ b/lib/base/scriptfunction.hpp
@@ -20,9 +20,9 @@
 #ifndef SCRIPTFUNCTION_H
 #define SCRIPTFUNCTION_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
-#include "base/scriptfunctionwrapper.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
+#include "base/scriptfunctionwrapper.hpp"
 #include <vector>
 #include <boost/function.hpp>
 

diff --git a/lib/base/scriptfunctionwrapper.cpp b/lib/base/scriptfunctionwrapper.cpp
index d18a6a6239cbbfa2ff7e7058064c77447be14735..80e6590c6f306a61eb9ced338f926b3401b67d65 100644 (file)
--- a/lib/base/scriptfunctionwrapper.cpp
+++ b/lib/base/scriptfunctionwrapper.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptfunctionwrapper.h"
+#include "base/scriptfunctionwrapper.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/scriptfunctionwrapper.h b/lib/base/scriptfunctionwrapper.hpp
similarity index 99%
rename from lib/base/scriptfunctionwrapper.h
rename to lib/base/scriptfunctionwrapper.hpp
index 7704ae72320f8cb07051e8759a8e86219ced54bd..c250bdd7bd6342954721f4fe84860745c8558caf 100644 (file)
--- a/lib/base/scriptfunctionwrapper.h
+++ b/lib/base/scriptfunctionwrapper.hpp
@@ -20,8 +20,8 @@
 #ifndef SCRIPTFUNCTIONWRAPPER_H
 #define SCRIPTFUNCTIONWRAPPER_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 #include <vector>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>

diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp
index b7f7fc83fa6c802a329cc21100d6c437887fc2f8..c925a08492da94b56b67eebe8827ad2667e66e76 100644 (file)
--- a/lib/base/scriptutils.cpp
+++ b/lib/base/scriptutils.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptutils.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/array.h"
-#include "base/dictionary.h"
-#include "base/serializer.h"
-#include "base/logger_fwd.h"
+#include "base/scriptutils.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
+#include "base/serializer.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>

diff --git a/lib/base/scriptutils.h b/lib/base/scriptutils.hpp
similarity index 96%
rename from lib/base/scriptutils.h
rename to lib/base/scriptutils.hpp
index e4c1903830dceaf56227f3d0d6d18b2fdb639a68..34579e80e82b11eb86d65e381d100ce58d645756 100644 (file)
--- a/lib/base/scriptutils.h
+++ b/lib/base/scriptutils.hpp
@@ -20,9 +20,9 @@
 #ifndef SCRIPTUTILS_H
 #define SCRIPTUTILS_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
-#include "base/array.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/scriptvariable.cpp b/lib/base/scriptvariable.cpp
index 7cde7cf6dc2d934f35e0f87a93869d0a789ef9e4..55f0366dd23d255bb6a946d9d7328b6ede9270b6 100644 (file)
--- a/lib/base/scriptvariable.cpp
+++ b/lib/base/scriptvariable.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptvariable.h"
-#include "base/singleton.h"
+#include "base/scriptvariable.hpp"
+#include "base/singleton.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/scriptvariable.h b/lib/base/scriptvariable.hpp
similarity index 96%
rename from lib/base/scriptvariable.h
rename to lib/base/scriptvariable.hpp
index 977e133cbe39af64eb350570a4f33952e48a619c..5112afca99c229676702580fac801f33c7c7d29d 100644 (file)
--- a/lib/base/scriptvariable.h
+++ b/lib/base/scriptvariable.hpp
@@ -20,9 +20,9 @@
 #ifndef SCRIPTVARIABLE_H
 #define SCRIPTVARIABLE_H
 
-#include "base/i2-base.h"
-#include "base/registry.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/registry.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/serializer.cpp b/lib/base/serializer.cpp
index c4bd6d466328cce0418a9c57d978872e688595b5..057aeedcd8d038999ddb6fef22b1f7a79b13e88b 100644 (file)
--- a/lib/base/serializer.cpp
+++ b/lib/base/serializer.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/serializer.h"
-#include "base/type.h"
-#include "base/application.h"
-#include "base/objectlock.h"
+#include "base/serializer.hpp"
+#include "base/type.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 #include <cJSON.h>
 

diff --git a/lib/base/serializer.h b/lib/base/serializer.hpp
similarity index 97%
rename from lib/base/serializer.h
rename to lib/base/serializer.hpp
index 87132648eac1a3dfafa0fcb443ff22952920de22..ce0f8cae23ff52c924b69d33b812c5c4beb1b178 100644 (file)
--- a/lib/base/serializer.h
+++ b/lib/base/serializer.hpp
@@ -20,8 +20,8 @@
 #ifndef SERIALIZER_H
 #define SERIALIZER_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/singleton.h b/lib/base/singleton.hpp
similarity index 98%
rename from lib/base/singleton.h
rename to lib/base/singleton.hpp
index 811f6f5a73a9ff2ac95ae2c7f1e0af3aada76002..7d80fdd15d6bf02670db779ea88135b305d79d4a 100644 (file)
--- a/lib/base/singleton.h
+++ b/lib/base/singleton.hpp
@@ -20,7 +20,7 @@
 #ifndef SINGLETON_H
 #define SINGLETON_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <boost/thread/mutex.hpp>
 
 namespace icinga

diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp
index 3ea9f82557999644b9da662bd23f33460f1c9b17..2246ba6e004fd344d14dbf7edfafbab7d28e885a 100644 (file)
--- a/lib/base/socket.cpp
+++ b/lib/base/socket.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/socket.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "base/socket.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <sstream>
 #include <boost/exception/errinfo_api_function.hpp>
 #include <boost/exception/errinfo_errno.hpp>

diff --git a/lib/base/socket.h b/lib/base/socket.hpp
similarity index 97%
rename from lib/base/socket.h
rename to lib/base/socket.hpp
index f055ce52158a513fe6793f7448ed0b8f00d135b6..7dc3dca785525f70fabafb1b488ede424d2db48e 100644 (file)
--- a/lib/base/socket.h
+++ b/lib/base/socket.hpp
@@ -20,8 +20,8 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>

diff --git a/lib/base/stacktrace.cpp b/lib/base/stacktrace.cpp
index 99dba39bcc55110e96d69e859d84ed6b604d88f8..04d0d65176fb6977eb6c9cd819931ed750b657ea 100644 (file)
--- a/lib/base/stacktrace.cpp
+++ b/lib/base/stacktrace.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stacktrace.h"
-#include "base/qstring.h"
-#include "base/utility.h"
-#include "base/initialize.h"
+#include "base/stacktrace.hpp"
+#include "base/qstring.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
 
 #ifdef HAVE_BACKTRACE_SYMBOLS
 #      include <execinfo.h>

diff --git a/lib/base/stacktrace.h b/lib/base/stacktrace.hpp
similarity index 98%
rename from lib/base/stacktrace.h
rename to lib/base/stacktrace.hpp
index 8a634ef76d02274106cc89186bbd1621eb5bd0d3..91d428f1d054177f82cbf17dbf28d6220b8107d4 100644 (file)
--- a/lib/base/stacktrace.h
+++ b/lib/base/stacktrace.hpp
@@ -20,7 +20,7 @@
 #ifndef STACKTRACE_H
 #define STACKTRACE_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <ostream>
 
 namespace icinga

diff --git a/lib/base/statsfunction.cpp b/lib/base/statsfunction.cpp
index bbaaf44482132a6cf30157eba2ecdc1829f03898..cfaa50fc2353bb2ed100c10b4ef3567d1b2ca1cb 100644 (file)
--- a/lib/base/statsfunction.cpp
+++ b/lib/base/statsfunction.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/statsfunction.h"
-#include "base/registry.h"
-#include "base/singleton.h"
+#include "base/statsfunction.hpp"
+#include "base/registry.hpp"
+#include "base/singleton.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/statsfunction.h b/lib/base/statsfunction.hpp
similarity index 95%
rename from lib/base/statsfunction.h
rename to lib/base/statsfunction.hpp
index 2d0bfacaa8345d8b27c790d932e56a353420a9ec..d38073a5a174c0beb2d7bfa84d56355bc219e128 100644 (file)
--- a/lib/base/statsfunction.h
+++ b/lib/base/statsfunction.hpp
@@ -20,10 +20,10 @@
 #ifndef STATSFUNCTION_H
 #define STATSFUNCTION_H
 
-#include "base/i2-base.h"
-#include "base/registry.h"
-#include "base/value.h"
-#include "base/dictionary.h"
+#include "base/i2-base.hpp"
+#include "base/registry.hpp"
+#include "base/value.hpp"
+#include "base/dictionary.hpp"
 #include <boost/function.hpp>
 
 namespace icinga

diff --git a/lib/base/stdiostream.cpp b/lib/base/stdiostream.cpp
index 7027dbfdbf27995f8a8fe345118c27a1406f4c7a..097b12d284c37ad5fb3077649abd9bb079c1b782 100644 (file)
--- a/lib/base/stdiostream.cpp
+++ b/lib/base/stdiostream.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stdiostream.h"
-#include "base/objectlock.h"
+#include "base/stdiostream.hpp"
+#include "base/objectlock.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/stdiostream.h b/lib/base/stdiostream.hpp
similarity index 97%
rename from lib/base/stdiostream.h
rename to lib/base/stdiostream.hpp
index fcff20987a6264241c012edae8668cf40583e4bc..b79fcceffde3b2ffb3647e3e1779d321d760fab3 100644 (file)
--- a/lib/base/stdiostream.h
+++ b/lib/base/stdiostream.hpp
@@ -20,8 +20,8 @@
 #ifndef STDIOSTREAM_H
 #define STDIOSTREAM_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 #include <iostream>
 
 namespace icinga {

diff --git a/lib/base/stream.cpp b/lib/base/stream.cpp
index a8436838a25ac45edc435823baa9aa32a71aefaa..827e6680e071483ec46cd3e2c9bf8e5339039b87 100644 (file)
--- a/lib/base/stream.cpp
+++ b/lib/base/stream.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stream.h"
-#include "base/qstring.h"
+#include "base/stream.hpp"
+#include "base/qstring.hpp"
 #include <boost/algorithm/string/trim.hpp>
 
 using namespace icinga;

diff --git a/lib/base/stream.h b/lib/base/stream.hpp
similarity index 98%
rename from lib/base/stream.h
rename to lib/base/stream.hpp
index 5b91c6459b3f04e59315be19318083bf7325baec..2c8c76fc7eb5fa7dff13cfd0383bde8a060c39c9 100644 (file)
--- a/lib/base/stream.h
+++ b/lib/base/stream.hpp
@@ -20,8 +20,8 @@
 #ifndef STREAM_H
 #define STREAM_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp
index 822e94a368f1a7ebce640ec077b3ae1561c684b2..5ff650ffbb4f66f4d4d8c9562a1e327a462d9beb 100644 (file)
--- a/lib/base/streamlogger.cpp
+++ b/lib/base/streamlogger.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/streamlogger.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
+#include "base/streamlogger.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
 #include <iostream>
 
 using namespace icinga;

diff --git a/lib/base/streamlogger.h b/lib/base/streamlogger.hpp
similarity index 96%
rename from lib/base/streamlogger.h
rename to lib/base/streamlogger.hpp
index 1d72460099da815c1cca94b0578c30fc5f53ef57..be854449c6f9bc818948d038e7ab172a206fe0f1 100644 (file)
--- a/lib/base/streamlogger.h
+++ b/lib/base/streamlogger.hpp
@@ -20,9 +20,9 @@
 #ifndef STREAMLOGGER_H
 #define STREAMLOGGER_H
 
-#include "base/i2-base.h"
-#include "base/streamlogger.th"
-#include "base/timer.h"
+#include "base/i2-base.hpp"
+#include "base/streamlogger.thpp"
+#include "base/timer.hpp"
 #include <ostream>
 
 namespace icinga

diff --git a/lib/base/streamlogger.ti b/lib/base/streamlogger.ti
index 66779362c8f072a0af4fcfce47923c3fdba148e5..7be9c03557c1f5e208eec5845cdef4f1022f2de4 100644 (file)
--- a/lib/base/streamlogger.ti
+++ b/lib/base/streamlogger.ti
@@ -1,4 +1,4 @@
-#include "base/logger.h"
+#include "base/logger.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp
index 4cd4433ceec8081cd48d4895a411b7f6937670b9..b41ab7aa216d573946fa85e725c1d22b7efc0d91 100644 (file)
--- a/lib/base/sysloglogger.cpp
+++ b/lib/base/sysloglogger.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/sysloglogger.h"
-#include "base/dynamictype.h"
-#include "base/statsfunction.h"
+#include "base/sysloglogger.hpp"
+#include "base/dynamictype.hpp"
+#include "base/statsfunction.hpp"
 
 #ifndef _WIN32
 using namespace icinga;

diff --git a/lib/base/sysloglogger.h b/lib/base/sysloglogger.hpp
similarity index 96%
rename from lib/base/sysloglogger.h
rename to lib/base/sysloglogger.hpp
index 7eaa942ef5e3eca199227b716c618a31801a873c..38634f73803e736de745740f5674fe61e52c2e4b 100644 (file)
--- a/lib/base/sysloglogger.h
+++ b/lib/base/sysloglogger.hpp
@@ -20,8 +20,8 @@
 #ifndef SYSLOGLOGGER_H
 #define SYSLOGLOGGER_H
 
-#include "base/i2-base.h"
-#include "base/sysloglogger.th"
+#include "base/i2-base.hpp"
+#include "base/sysloglogger.thpp"
 
 #ifndef _WIN32
 namespace icinga

diff --git a/lib/base/sysloglogger.ti b/lib/base/sysloglogger.ti
index 286e4fcdfc0b72f5f232d2c597e582e6ca699c91..08272ccf1925899a6c32aef6896be90d7e77dc82 100644 (file)
--- a/lib/base/sysloglogger.ti
+++ b/lib/base/sysloglogger.ti
@@ -1,4 +1,4 @@
-#include "base/logger.h"
+#include "base/logger.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/tcpsocket.cpp b/lib/base/tcpsocket.cpp
index 3463ec195ad4e0db4a6744c86c88224878f20ac8..8ce5f575fdfe6bac09ea95983222bcbb9f7a59f6 100644 (file)
--- a/lib/base/tcpsocket.cpp
+++ b/lib/base/tcpsocket.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/tcpsocket.h"
-#include "base/exception.h"
+#include "base/tcpsocket.hpp"
+#include "base/exception.hpp"
 #include <boost/exception/errinfo_api_function.hpp>
 #include <boost/exception/errinfo_errno.hpp>
 

diff --git a/lib/base/tcpsocket.h b/lib/base/tcpsocket.hpp
similarity index 97%
rename from lib/base/tcpsocket.h
rename to lib/base/tcpsocket.hpp
index d73bb874a99a0ec8a5fb711bb5c783cd0bf46ee3..902874eafb48e34eeb4cde3cd7d7db2ffded7b2c 100644 (file)
--- a/lib/base/tcpsocket.h
+++ b/lib/base/tcpsocket.hpp
@@ -20,8 +20,8 @@
 #ifndef TCPSOCKET_H
 #define TCPSOCKET_H
 
-#include "base/i2-base.h"
-#include "base/socket.h"
+#include "base/i2-base.hpp"
+#include "base/socket.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp
index d79ec2cb2f59d9d39a562278761089780e6dae6f..b2eb754bd84b81cf8a8070175aa0fc64dde8a16a 100644 (file)
--- a/lib/base/threadpool.cpp
+++ b/lib/base/threadpool.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/threadpool.h"
-#include "base/logger_fwd.h"
-#include "base/debug.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "base/threadpool.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <boost/bind.hpp>
 #include <iostream>
 

diff --git a/lib/base/threadpool.h b/lib/base/threadpool.hpp
similarity index 99%
rename from lib/base/threadpool.h
rename to lib/base/threadpool.hpp
index 04b4fb857df8032191284add8fb2076454a4a8ce..27d9e53d30cd2232b1f9144cde9b36f2f1b92a9f 100644 (file)
--- a/lib/base/threadpool.h
+++ b/lib/base/threadpool.hpp
@@ -20,7 +20,7 @@
 #ifndef THREADPOOL_H
 #define THREADPOOL_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <boost/function.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>

diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index 2d558ff05b8cf4b8dca76b81ec6bf2c3a3684988..1fac02c0f71b96ff92e852439807e20cb85ccb24 100644 (file)
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/timer.h"
-#include "base/debug.h"
-#include "base/utility.h"
+#include "base/timer.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread/thread.hpp>

diff --git a/lib/base/timer.h b/lib/base/timer.hpp
similarity index 97%
rename from lib/base/timer.h
rename to lib/base/timer.hpp
index cb0a81320cdbc79ce72a83dc394bf8ea1e9a22ea..394ecf69e74e27d97c0872552a6e200389d1d617 100644 (file)
--- a/lib/base/timer.h
+++ b/lib/base/timer.hpp
@@ -20,8 +20,8 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
 #include <boost/signals2.hpp>
 
 namespace icinga {

diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index 0a68408e9dde770ed68385e258b7e8439f3488c1..120f673b4a4b4b60c2c9b03ea13eb7e14fd178f8 100644 (file)
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/tlsstream.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "base/tlsstream.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <boost/bind.hpp>
 
 using namespace icinga;

diff --git a/lib/base/tlsstream.h b/lib/base/tlsstream.hpp
similarity index 95%
rename from lib/base/tlsstream.h
rename to lib/base/tlsstream.hpp
index fc8f5c325d888c9d01b648aadbcdc450f2bf3233..0d26656d034bd95f83a5413e8dec9a397e6b2db6 100644 (file)
--- a/lib/base/tlsstream.h
+++ b/lib/base/tlsstream.hpp
@@ -20,10 +20,10 @@
 #ifndef TLSSTREAM_H
 #define TLSSTREAM_H
 
-#include "base/i2-base.h"
-#include "base/socket.h"
-#include "base/stream.h"
-#include "base/tlsutility.h"
+#include "base/i2-base.hpp"
+#include "base/socket.hpp"
+#include "base/stream.hpp"
+#include "base/tlsutility.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp
index 50083ff5353883ba9c0314dc30f52c42d5802277..d218974e3ef70cd7022e2313bce35f6fd1d559fc 100644 (file)
--- a/lib/base/tlsutility.cpp
+++ b/lib/base/tlsutility.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/tlsutility.h"
+#include "base/tlsutility.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/tlsutility.h b/lib/base/tlsutility.hpp
similarity index 96%
rename from lib/base/tlsutility.h
rename to lib/base/tlsutility.hpp
index 8dcfdb154decee936ad7dd6131448cc7b16c076e..51ece2bf1e42259cf1f535aaf1bbb87f232510ba 100644 (file)
--- a/lib/base/tlsutility.h
+++ b/lib/base/tlsutility.hpp
@@ -20,10 +20,10 @@
 #ifndef TLSUTILITY_H
 #define TLSUTILITY_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
-#include "base/qstring.h"
-#include "base/exception.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
+#include "base/qstring.hpp"
+#include "base/exception.hpp"
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>

diff --git a/lib/base/type.cpp b/lib/base/type.cpp
index 54a446747fba5218b2347a4d72d5701c332da3aa..7c1c027c3f3061dd13254b382d6762725293fb7e 100644 (file)
--- a/lib/base/type.cpp
+++ b/lib/base/type.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/type.h"
+#include "base/type.hpp"
 
 using namespace icinga;
 

diff --git a/lib/base/type.h b/lib/base/type.hpp
similarity index 96%
rename from lib/base/type.h
rename to lib/base/type.hpp
index 8d5b4de95d2c110b351c009d52c85dd388f05bcc..b4966c0a9c7a1acd0ba3ef529a5932a542c34052 100644 (file)
--- a/lib/base/type.h
+++ b/lib/base/type.hpp
@@ -20,10 +20,10 @@
 #ifndef TYPE_H
 #define TYPE_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
-#include "base/object.h"
-#include "base/initialize.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
+#include "base/object.hpp"
+#include "base/initialize.hpp"
 #include <boost/function.hpp>
 
 namespace icinga

diff --git a/lib/base/unix.h b/lib/base/unix.hpp
similarity index 100%
rename from lib/base/unix.h
rename to lib/base/unix.hpp

diff --git a/lib/base/unixsocket.cpp b/lib/base/unixsocket.cpp
index 20a06d8f5b820e877610c5c7013465f45f709393..41fdf1e137366a9df624a6980b2e1c0e13f6a106 100644 (file)
--- a/lib/base/unixsocket.cpp
+++ b/lib/base/unixsocket.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/unixsocket.h"
-#include "base/exception.h"
+#include "base/unixsocket.hpp"
+#include "base/exception.hpp"
 
 #ifndef _WIN32
 using namespace icinga;

diff --git a/lib/base/unixsocket.h b/lib/base/unixsocket.hpp
similarity index 98%
rename from lib/base/unixsocket.h
rename to lib/base/unixsocket.hpp
index 3407ecfbc287dfdb4e729bff8a75217a9f7c50ec..f72ac9a93d766cc6b1bcfb1dca44acfa81c3b8be 100644 (file)
--- a/lib/base/unixsocket.h
+++ b/lib/base/unixsocket.hpp
@@ -20,7 +20,7 @@
 #ifndef UNIXSOCKET_H
 #define UNIXSOCKET_H
 
-#include "base/socket.h"
+#include "base/socket.hpp"
 
 #ifndef _WIN32
 namespace icinga

diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index be1a91ca78df033d949a2e51cc92f87e3a980dda..1017346c94c817d1c1b03c0ef243d4ca25866361 100644 (file)
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/application.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/application.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
 #include <mmatch.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>

diff --git a/lib/base/utility.h b/lib/base/utility.hpp
similarity index 98%
rename from lib/base/utility.h
rename to lib/base/utility.hpp
index 7217f27154d2a8f5e98d17be041145aa87a95b45..2db5983132f3768521333ac122a7e1211cd275c5 100644 (file)
--- a/lib/base/utility.h
+++ b/lib/base/utility.hpp
@@ -20,8 +20,8 @@
 #ifndef UTILITY_H
 #define UTILITY_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 #include <typeinfo>
 #include <boost/function.hpp>
 #include <boost/thread/tss.hpp>

diff --git a/lib/base/value-operators.cpp b/lib/base/value-operators.cpp
index 95852f301fdb40b8fc3cf9cc4e9adb0ea373a796..72e72b981bcc7ae66217030306042a2a411adc27 100644 (file)
--- a/lib/base/value-operators.cpp
+++ b/lib/base/value-operators.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/value.h"
-#include "base/array.h"
-#include "base/dictionary.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
+#include "base/value.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 

diff --git a/lib/base/value.cpp b/lib/base/value.cpp
index dfdc15a162c3e914366e75a7592b97d755fca8b2..b4d1984a66ffef7aefcebc1eabdb38db40af2501 100644 (file)
--- a/lib/base/value.cpp
+++ b/lib/base/value.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/value.h"
-#include "base/array.h"
-#include "base/dictionary.h"
-#include "base/type.h"
+#include "base/value.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
+#include "base/type.hpp"
 #include <cJSON.h>
 
 using namespace icinga;

diff --git a/lib/base/value.h b/lib/base/value.hpp
similarity index 99%
rename from lib/base/value.h
rename to lib/base/value.hpp
index 27698c20e6ef0e9a963a09e03611a8a6e714a470..c4fa837a6a0519b0b830f0f719094e41af9ae24a 100644 (file)
--- a/lib/base/value.h
+++ b/lib/base/value.hpp
@@ -20,8 +20,8 @@
 #ifndef VALUE_H
 #define VALUE_H
 
-#include "base/object.h"
-#include "base/qstring.h"
+#include "base/object.hpp"
+#include "base/qstring.hpp"
 #include <boost/variant/variant.hpp>
 #include <boost/variant/get.hpp>
 

diff --git a/lib/base/visibility.h b/lib/base/visibility.hpp
similarity index 100%
rename from lib/base/visibility.h
rename to lib/base/visibility.hpp

diff --git a/lib/base/win32.h b/lib/base/win32.hpp
similarity index 100%
rename from lib/base/win32.h
rename to lib/base/win32.hpp

diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp
index 912a01e2a3803251092a94805de730051a8186e7..43594c42529a5bf7e0f1f16950b16ea127073039 100644 (file)
--- a/lib/base/workqueue.cpp
+++ b/lib/base/workqueue.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/workqueue.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
+#include "base/workqueue.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/lib/base/workqueue.h b/lib/base/workqueue.hpp
similarity index 98%
rename from lib/base/workqueue.h
rename to lib/base/workqueue.hpp
index 0013aa6abcbca7053fc41d9939df87a82727c105..9970c945a1772e17d5f951ba53bdd28710565c51 100644 (file)
--- a/lib/base/workqueue.h
+++ b/lib/base/workqueue.hpp
@@ -20,8 +20,8 @@
 #ifndef WORKQUEUE_H
 #define WORKQUEUE_H
 
-#include "base/i2-base.h"
-#include "base/timer.h"
+#include "base/i2-base.hpp"
+#include "base/timer.hpp"
 #include <deque>
 #include <boost/function.hpp>
 #include <boost/thread/thread.hpp>

diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index 0fcfa87346fec2b9aea1c67ec1139d8fd7fe349b..864c5552a5dfa20a85f0878091ad7e5e3d81feb2 100644 (file)
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/aexpression.h"
-#include "config/configerror.h"
-#include "config/configitem.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "config/objectrule.h"
-#include "base/array.h"
-#include "base/serializer.h"
-#include "base/scriptfunction.h"
-#include "base/scriptvariable.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/object.h"
-#include "base/logger_fwd.h"
+#include "config/aexpression.hpp"
+#include "config/configerror.hpp"
+#include "config/configitem.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "config/objectrule.hpp"
+#include "base/array.hpp"
+#include "base/serializer.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/object.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/exception_ptr.hpp>
 #include <boost/exception/errinfo_nested_exception.hpp>

diff --git a/lib/config/aexpression.h b/lib/config/aexpression.hpp
similarity index 97%
rename from lib/config/aexpression.h
rename to lib/config/aexpression.hpp
index 5ab2da8599eb7eecbfc234004997b45771c15c82..1e659ac391e94526b84976d63d9b9c1b7592fd5e 100644 (file)
--- a/lib/config/aexpression.h
+++ b/lib/config/aexpression.hpp
@@ -20,10 +20,10 @@
 #ifndef AEXPRESSION_H
 #define AEXPRESSION_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
-#include "base/array.h"
-#include "base/dictionary.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/config/applyrule.cpp b/lib/config/applyrule.cpp
index 590a10bbca24dc738e33de770a4dc4cafbff4eac..aa58963b8cd2f8675a31a093594c54d06ce5e40d 100644 (file)
--- a/lib/config/applyrule.cpp
+++ b/lib/config/applyrule.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/applyrule.h"
-#include "base/logger_fwd.h"
+#include "config/applyrule.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <set>
 

diff --git a/lib/config/applyrule.h b/lib/config/applyrule.hpp
similarity index 96%
rename from lib/config/applyrule.h
rename to lib/config/applyrule.hpp
index 2ad7388b7764e6293bb8500bae81fb519e0b215e..b6fc6088c66302cb3e0e909346c56a2a792d2caf 100644 (file)
--- a/lib/config/applyrule.h
+++ b/lib/config/applyrule.hpp
@@ -20,9 +20,9 @@
 #ifndef APPLYRULE_H
 #define APPLYRULE_H
 
-#include "config/i2-config.h"
-#include "config/aexpression.h"
-#include "config/debuginfo.h"
+#include "config/i2-config.hpp"
+#include "config/aexpression.hpp"
+#include "config/debuginfo.hpp"
 #include <boost/function.hpp>
 
 namespace icinga

diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll
index 7f9353f397eeffa29a53a23b1e2c02555e2f8e3a..3f593f373eab402b6bfd3090afe61488ccb09ef1 100644 (file)
--- a/lib/config/config_lexer.ll
+++ b/lib/config/config_lexer.ll
@@ -18,10 +18,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompiler.h"
-#include "config/typerule.h"
-#include "config/configcompilercontext.h"
-#include "config/aexpression.h"
+#include "config/configcompiler.hpp"
+#include "config/typerule.hpp"
+#include "config/configcompilercontext.hpp"
+#include "config/aexpression.hpp"
 
 using namespace icinga;
 

diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy
index 3f25ec95d30370d317e9bb3fda892815b06df476..1fe2b756e1b22a5d0c6e03756ad457e0ff6522e7 100644 (file)
--- a/lib/config/config_parser.yy
+++ b/lib/config/config_parser.yy
@@ -20,24 +20,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "i2-config.h"
-#include "config/configitembuilder.h"
-#include "config/configtype.h"
-#include "config/configcompiler.h"
-#include "config/configcompilercontext.h"
-#include "config/configerror.h"
-#include "config/typerule.h"
-#include "config/typerulelist.h"
-#include "config/aexpression.h"
-#include "config/applyrule.h"
-#include "config/objectrule.h"
-#include "config/aexpression.h"
-#include "base/value.h"
-#include "base/utility.h"
-#include "base/array.h"
-#include "base/scriptvariable.h"
-#include "base/exception.h"
-#include "base/dynamictype.h"
+#include "config/i2-config.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/configtype.hpp"
+#include "config/configcompiler.hpp"
+#include "config/configcompilercontext.hpp"
+#include "config/configerror.hpp"
+#include "config/typerule.hpp"
+#include "config/typerulelist.hpp"
+#include "config/aexpression.hpp"
+#include "config/applyrule.hpp"
+#include "config/objectrule.hpp"
+#include "config/aexpression.hpp"
+#include "base/value.hpp"
+#include "base/utility.hpp"
+#include "base/array.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/exception.hpp"
+#include "base/dynamictype.hpp"
 #include <sstream>
 #include <stack>
 #include <boost/foreach.hpp>

diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index 7f1c70dda1ec72c984c7064f576f6cd911b6dc53..d9e78d061f0f795a990ba19669c19bba9069874c 100644 (file)
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompiler.h"
-#include "config/configitem.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/context.h"
-#include "base/exception.h"
+#include "config/configcompiler.hpp"
+#include "config/configitem.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/context.hpp"
+#include "base/exception.hpp"
 #include <fstream>
 #include <boost/foreach.hpp>
 

diff --git a/lib/config/configcompiler.h b/lib/config/configcompiler.hpp
similarity index 95%
rename from lib/config/configcompiler.h
rename to lib/config/configcompiler.hpp
index b9631dc388969752f3cb68755a3c49e3d5aec7d7..69557b797384246d4829f667fa599e1c378bc343 100644 (file)
--- a/lib/config/configcompiler.h
+++ b/lib/config/configcompiler.hpp
@@ -20,11 +20,11 @@
 #ifndef CONFIGCOMPILER_H
 #define CONFIGCOMPILER_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
-#include "base/registry.h"
-#include "base/initialize.h"
-#include "base/singleton.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
+#include "base/registry.hpp"
+#include "base/initialize.hpp"
+#include "base/singleton.hpp"
 #include <iostream>
 #include <boost/function.hpp>
 

diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp
index 5f09855c9c2c21ec806c46926b298dc2ead3ce3c..b20684e6b90358638443b85c26736f366628173b 100644 (file)
--- a/lib/config/configcompilercontext.cpp
+++ b/lib/config/configcompilercontext.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompilercontext.h"
-#include "base/singleton.h"
+#include "config/configcompilercontext.hpp"
+#include "base/singleton.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/config/configcompilercontext.h b/lib/config/configcompilercontext.hpp
similarity index 97%
rename from lib/config/configcompilercontext.h
rename to lib/config/configcompilercontext.hpp
index 096df0e80f972156711b59ab173182734519ae20..d4319f0f931e261aeacdc3675a0a8fdfd7c9e77a 100644 (file)
--- a/lib/config/configcompilercontext.h
+++ b/lib/config/configcompilercontext.hpp
@@ -20,8 +20,8 @@
 #ifndef CONFIGCOMPILERCONTEXT_H
 #define CONFIGCOMPILERCONTEXT_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
 #include <boost/thread/mutex.hpp>
 #include <vector>
 

diff --git a/lib/config/configerror.cpp b/lib/config/configerror.cpp
index bae40acca07728de6a889f8ae716c6a0923304d8..845f359b63e8bd239bab7b8f35067918b85c0535 100644 (file)
--- a/lib/config/configerror.cpp
+++ b/lib/config/configerror.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configerror.h"
+#include "config/configerror.hpp"
 #include <sstream>
 
 using namespace icinga;

diff --git a/lib/config/configerror.h b/lib/config/configerror.hpp
similarity index 95%
rename from lib/config/configerror.h
rename to lib/config/configerror.hpp
index c60725b9912761266b1cbcfda3268f4bf3fefaf0..dc085c00dfeebf949177c12d4e9c2dbb198fcc9c 100644 (file)
--- a/lib/config/configerror.h
+++ b/lib/config/configerror.hpp
@@ -20,9 +20,9 @@
 #ifndef CONFIGERROR_H
 #define CONFIGERROR_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
-#include "base/exception.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
+#include "base/exception.hpp"
 
 namespace icinga
 {

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index d66aee26260da070c2806dbe0ea1b69faceeea08..3a3b15a047780b756e063270e2a9b36eefaa6e28 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configitem.h"
-#include "config/configcompilercontext.h"
-#include "config/applyrule.h"
-#include "config/objectrule.h"
-#include "config/configtype.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/debug.h"
-#include "base/workqueue.h"
-#include "base/exception.h"
+#include "config/configitem.hpp"
+#include "config/configcompilercontext.hpp"
+#include "config/applyrule.hpp"
+#include "config/objectrule.hpp"
+#include "config/configtype.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/debug.hpp"
+#include "base/workqueue.hpp"
+#include "base/exception.hpp"
 #include <sstream>
 #include <boost/foreach.hpp>
 

diff --git a/lib/config/configitem.h b/lib/config/configitem.hpp
similarity index 97%
rename from lib/config/configitem.h
rename to lib/config/configitem.hpp
index 4cd7acc4e5bdfc08bf7994b4646bada4dc332336..7c79cbb03e063266aab94e81b57cfb484c54181c 100644 (file)
--- a/lib/config/configitem.h
+++ b/lib/config/configitem.hpp
@@ -20,9 +20,9 @@
 #ifndef CONFIGITEM_H
 #define CONFIGITEM_H
 
-#include "config/i2-config.h"
-#include "config/aexpression.h"
-#include "base/dynamicobject.h"
+#include "config/i2-config.hpp"
+#include "config/aexpression.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp
index f9713afde55853954b406f84a25273dddb74c2db..6de15f19ff43997a9c8860a25bdad6dd3b757ac8 100644 (file)
--- a/lib/config/configitembuilder.cpp
+++ b/lib/config/configitembuilder.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configitembuilder.h"
-#include "base/dynamictype.h"
+#include "config/configitembuilder.hpp"
+#include "base/dynamictype.hpp"
 #include <sstream>
 #include <boost/foreach.hpp>
 

diff --git a/lib/config/configitembuilder.h b/lib/config/configitembuilder.hpp
similarity index 95%
rename from lib/config/configitembuilder.h
rename to lib/config/configitembuilder.hpp
index afad84759c71fb410b5210e0a137f1333ddb6f8a..9c9a2a8428080af7570be7bd23393e18cbb00016 100644 (file)
--- a/lib/config/configitembuilder.h
+++ b/lib/config/configitembuilder.hpp
@@ -20,10 +20,10 @@
 #ifndef CONFIGITEMBUILDER_H
 #define CONFIGITEMBUILDER_H
 
-#include "config/debuginfo.h"
-#include "config/aexpression.h"
-#include "config/configitem.h"
-#include "base/object.h"
+#include "config/debuginfo.hpp"
+#include "config/aexpression.hpp"
+#include "config/configitem.hpp"
+#include "base/object.hpp"
 
 namespace icinga
 {

diff --git a/lib/config/configtype.cpp b/lib/config/configtype.cpp
index 1e3b065cc2756108a62fe2fc8df53bf505e6d8ea..3c15d09decd4cfcf92871fe6db328e38ebdab62a 100644 (file)
--- a/lib/config/configtype.cpp
+++ b/lib/config/configtype.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configtype.h"
-#include "config/configcompilercontext.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/singleton.h"
-#include "base/scriptfunction.h"
+#include "config/configtype.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/singleton.hpp"
+#include "base/scriptfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/config/configtype.h b/lib/config/configtype.hpp
similarity index 91%
rename from lib/config/configtype.h
rename to lib/config/configtype.hpp
index 020c3cda4d91240492df1751836ad30a2e95ebcb..3b62d96dba0e94c4a2ea59183c52142304124d89 100644 (file)
--- a/lib/config/configtype.h
+++ b/lib/config/configtype.hpp
@@ -20,12 +20,12 @@
 #ifndef CONFIGTYPE_H\r
 #define CONFIGTYPE_H\r
 \r
-#include "config/i2-config.h"\r
-#include "config/typerulelist.h"\r
-#include "config/typerule.h"\r
-#include "config/configitem.h"\r
-#include "base/array.h"\r
-#include "base/registry.h"\r
+#include "config/i2-config.hpp"\r
+#include "config/typerulelist.hpp"\r
+#include "config/typerule.hpp"\r
+#include "config/configitem.hpp"\r
+#include "base/array.hpp"\r
+#include "base/registry.hpp"\r
 \r
 namespace icinga\r
 {\r

diff --git a/lib/config/debuginfo.cpp b/lib/config/debuginfo.cpp
index 51775a00bc673e090e6c968131ccacbbf3ec6122..1fbbe8ba7d56964385bc742cedf48e2d7a83a6c3 100644 (file)
--- a/lib/config/debuginfo.cpp
+++ b/lib/config/debuginfo.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/debuginfo.h"
-#include "base/convert.h"
+#include "config/debuginfo.hpp"
+#include "base/convert.hpp"
 #include <fstream>
 
 using namespace icinga;

diff --git a/lib/config/debuginfo.h b/lib/config/debuginfo.hpp
similarity index 97%
rename from lib/config/debuginfo.h
rename to lib/config/debuginfo.hpp
index 415f0bea7abd9c66b5839ce39f3969bc062f6982..84c97e74d61702800e348ef4b54badb6175f2bc0 100644 (file)
--- a/lib/config/debuginfo.h
+++ b/lib/config/debuginfo.hpp
@@ -20,8 +20,8 @@
 #ifndef DEBUGINFO_H
 #define DEBUGINFO_H
 
-#include "config/i2-config.h"
-#include "base/qstring.h"
+#include "config/i2-config.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {

diff --git a/lib/config/i2-config.h b/lib/config/i2-config.hpp
similarity index 98%
rename from lib/config/i2-config.h
rename to lib/config/i2-config.hpp
index 9518b58c9e9eae98616b5c54945fe6d64b195479..5c005ff495930538c88707464eb00044e4401fa3 100644 (file)
--- a/lib/config/i2-config.h
+++ b/lib/config/i2-config.hpp
@@ -28,7 +28,7 @@
  * at runtime.
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_CONFIG_BUILD
 #      define I2_CONFIG_API I2_EXPORT

diff --git a/lib/config/objectrule.cpp b/lib/config/objectrule.cpp
index 67a78153aec3de4b716284ef22420dbc008f17fe..ace1ca8b7ddc8d346dcfa2f61ae5c546376f7a87 100644 (file)
--- a/lib/config/objectrule.cpp
+++ b/lib/config/objectrule.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/objectrule.h"
+#include "config/objectrule.hpp"
 #include <boost/foreach.hpp>
 #include <set>
 

diff --git a/lib/config/objectrule.h b/lib/config/objectrule.hpp
similarity index 95%
rename from lib/config/objectrule.h
rename to lib/config/objectrule.hpp
index 530fd35bf17447ce8b23ef7e278eed78bd1a12e3..6098fb60a40c17ddfd1dcddbcc55f44e30be5d67 100644 (file)
--- a/lib/config/objectrule.h
+++ b/lib/config/objectrule.hpp
@@ -20,10 +20,10 @@
 #ifndef OBJECTRULE_H
 #define OBJECTRULE_H
 
-#include "config/i2-config.h"
-#include "config/aexpression.h"
-#include "config/debuginfo.h"
-#include "base/dynamictype.h"
+#include "config/i2-config.hpp"
+#include "config/aexpression.hpp"
+#include "config/debuginfo.hpp"
+#include "base/dynamictype.hpp"
 
 namespace icinga
 {

diff --git a/lib/config/typerule.cpp b/lib/config/typerule.cpp
index 2cba290cc098cd9992c749e92cfcc2c70551648b..fd33429a6f00d4ae89965553e905e6f4d9802bf8 100644 (file)
--- a/lib/config/typerule.cpp
+++ b/lib/config/typerule.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/typerule.h"
-#include "config/configitem.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/dictionary.h"
-#include "base/array.h"
+#include "config/typerule.hpp"
+#include "config/configitem.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/dictionary.hpp"
+#include "base/array.hpp"
 
 using namespace icinga;
 

diff --git a/lib/config/typerule.h b/lib/config/typerule.hpp
similarity index 92%
rename from lib/config/typerule.h
rename to lib/config/typerule.hpp
index 481260aee9d62855513c2498702d526e25066aca..8a1ab737e7db54ff0172b1cc102d71aaf309e2c9 100644 (file)
--- a/lib/config/typerule.h
+++ b/lib/config/typerule.hpp
@@ -20,9 +20,9 @@
 #ifndef TYPERULE_H\r
 #define TYPERULE_H\r
 \r
-#include "config/i2-config.h"\r
-#include "config/typerulelist.h"\r
-#include "config/debuginfo.h"\r
+#include "config/i2-config.hpp"\r
+#include "config/typerulelist.hpp"\r
+#include "config/debuginfo.hpp"\r
 \r
 namespace icinga\r
 {\r

diff --git a/lib/config/typerulelist.cpp b/lib/config/typerulelist.cpp
index 45c6b57b329fac873d9cc5126dfaf0526e460901..9f48fbf15935d36b78b09ed576bd1794800b1a25 100644 (file)
--- a/lib/config/typerulelist.cpp
+++ b/lib/config/typerulelist.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *\r
  ******************************************************************************/\r
 \r
-#include "config/typerulelist.h"\r
-#include "config/typerule.h"\r
+#include "config/typerulelist.hpp"\r
+#include "config/typerule.hpp"\r
 #include <boost/foreach.hpp>\r
 \r
 using namespace icinga;\r

diff --git a/lib/config/typerulelist.h b/lib/config/typerulelist.hpp
similarity index 94%
rename from lib/config/typerulelist.h
rename to lib/config/typerulelist.hpp
index f28c6501b9e71e1fa2c4e04e207829eb85aa7958..0c6a1504e97a3e03189f4022782703d6b86f8255 100644 (file)
--- a/lib/config/typerulelist.h
+++ b/lib/config/typerulelist.hpp
@@ -20,8 +20,8 @@
 #ifndef TYPERULELIST_H\r
 #define TYPERULELIST_H\r
 \r
-#include "config/i2-config.h"\r
-#include "base/value.h"\r
+#include "config/i2-config.hpp"\r
+#include "base/value.hpp"\r
 #include <vector>\r
 \r
 namespace icinga\r

diff --git a/lib/db_ido/CMakeLists.txt b/lib/db_ido/CMakeLists.txt
index 9b92fa8e6e41cc061ff84e1597cd53594e6f13fd..43f7b6548a27f3943479f6d84af6c40b40e22932 100644 (file)
--- a/lib/db_ido/CMakeLists.txt
+++ b/lib/db_ido/CMakeLists.txt
@@ -15,12 +15,12 @@
 # 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.th)
+mkclass_target(dbconnection.ti dbconnection.thpp)
 
 mkembedconfig_target(db_ido-type.conf db_ido-type.cpp)
 
 add_library(db_ido SHARED
-  commanddbobject.cpp dbconnection.cpp dbconnection.th dbconnection.th
+  commanddbobject.cpp dbconnection.cpp dbconnection.thpp dbconnection.thpp
   db_ido-type.cpp dbevents.cpp dbobject.cpp dbquery.cpp dbreference.cpp dbtype.cpp
   dbvalue.cpp endpointdbobject.cpp hostdbobject.cpp hostgroupdbobject.cpp
   servicedbobject.cpp servicegroupdbobject.cpp timeperioddbobject.cpp

diff --git a/lib/db_ido/commanddbobject.cpp b/lib/db_ido/commanddbobject.cpp
index 63e6ec941d53e62c06a35834d5f284efcae245cd..eb4ba237f8b9b03883da3d29d1ab8a5f3a8c60f0 100644 (file)
--- a/lib/db_ido/commanddbobject.cpp
+++ b/lib/db_ido/commanddbobject.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/commanddbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/command.h"
-#include "icinga/compatutility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
+#include "db_ido/commanddbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/command.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/commanddbobject.h b/lib/db_ido/commanddbobject.hpp
similarity index 96%
rename from lib/db_ido/commanddbobject.h
rename to lib/db_ido/commanddbobject.hpp
index 7e3816eda82aac51bb8549746f41c745c7461573..ed6250c8ce848ed154e048e549fb2a46d7cfdcde 100644 (file)
--- a/lib/db_ido/commanddbobject.h
+++ b/lib/db_ido/commanddbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef COMMANDDBOBJECT_H
 #define COMMANDDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 493733d9754964c50d38d92efa25c06dc6f651dd..751f56922ee42c2131ce155567de5fa75f05d08a 100644 (file)
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbconnection.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/logger_fwd.h"
+#include "db_ido/dbconnection.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/dbconnection.h b/lib/db_ido/dbconnection.hpp
similarity index 96%
rename from lib/db_ido/dbconnection.h
rename to lib/db_ido/dbconnection.hpp
index 110528004afd09809bb5ed63e01be32afbb4e12b..1a0e149519e37906758acb77ca18cf1c66961817 100644 (file)
--- a/lib/db_ido/dbconnection.h
+++ b/lib/db_ido/dbconnection.hpp
@@ -20,11 +20,11 @@
 #ifndef DBCONNECTION_H
 #define DBCONNECTION_H
 
-#include "db_ido/i2-db_ido.h"
-#include "db_ido/dbconnection.th"
-#include "db_ido/dbobject.h"
-#include "db_ido/dbquery.h"
-#include "base/timer.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "db_ido/dbconnection.thpp"
+#include "db_ido/dbobject.hpp"
+#include "db_ido/dbquery.hpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/dbconnection.ti b/lib/db_ido/dbconnection.ti
index 4056deeb787617cbac8650fd105981701de1ac4f..d71af85173a5cd269660b1d22738ca025a45f332 100644 (file)
--- a/lib/db_ido/dbconnection.ti
+++ b/lib/db_ido/dbconnection.ti
@@ -1,5 +1,5 @@
-#include "db_ido/dbquery.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbquery.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
index 189d600d65d54f45e33320bb726542dfdc7aaae0..a244cfffbbca7c8f714963bcf7f7827d625865f9 100644 (file)
--- a/lib/db_ido/dbevents.cpp
+++ b/lib/db_ido/dbevents.cpp
@@ -17,22 +17,22 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbevents.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "remote/endpoint.h"
-#include "icinga/notification.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/compatutility.h"
-#include "icinga/icingaapplication.h"
+#include "db_ido/dbevents.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "remote/endpoint.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/icingaapplication.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 

diff --git a/lib/db_ido/dbevents.h b/lib/db_ido/dbevents.hpp
similarity index 98%
rename from lib/db_ido/dbevents.h
rename to lib/db_ido/dbevents.hpp
index 6c55cd55ad561e2588e86276ed94d19eeec628ef..f21e925deaaf421af011fe2e993393cfff4ae93c 100644 (file)
--- a/lib/db_ido/dbevents.h
+++ b/lib/db_ido/dbevents.hpp
@@ -20,9 +20,9 @@
 #ifndef DBEVENTS_H
 #define DBEVENTS_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
-#include "icinga/service.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp
index fc66f394135a7ecd8e54ef81d638098c90813b7a..aa635b744230e45ae8c10e1b585b590359dec92e 100644 (file)
--- a/lib/db_ido/dbobject.cpp
+++ b/lib/db_ido/dbobject.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/customvarobject.h"
-#include "icinga/service.h"
-#include "icinga/compatutility.h"
-#include "remote/endpoint.h"
-#include "base/dynamicobject.h"
-#include "base/dynamictype.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/logger_fwd.h"
+#include "db_ido/dbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/customvarobject.hpp"
+#include "icinga/service.hpp"
+#include "icinga/compatutility.hpp"
+#include "remote/endpoint.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/dynamictype.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/dbobject.h b/lib/db_ido/dbobject.hpp
similarity index 94%
rename from lib/db_ido/dbobject.h
rename to lib/db_ido/dbobject.hpp
index a4daf976482a0e1a4f4b4b5e5826b0c461df071b..80f85bbd2d0abc20a26b2888be33a908a9503c65 100644 (file)
--- a/lib/db_ido/dbobject.h
+++ b/lib/db_ido/dbobject.hpp
@@ -20,12 +20,12 @@
 #ifndef DBOBJECT_H
 #define DBOBJECT_H
 
-#include "db_ido/i2-db_ido.h"
-#include "db_ido/dbreference.h"
-#include "db_ido/dbquery.h"
-#include "db_ido/dbtype.h"
-#include "icinga/customvarobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "db_ido/dbreference.hpp"
+#include "db_ido/dbquery.hpp"
+#include "db_ido/dbtype.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/dbquery.cpp b/lib/db_ido/dbquery.cpp
index 5e5798baa335c2ef4a0b69c10142c19e2f74ca41..2ecccbf5c06a2f39f93fcab46188d426ee927a97 100644 (file)
--- a/lib/db_ido/dbquery.cpp
+++ b/lib/db_ido/dbquery.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbquery.h"
-#include "base/initialize.h"
-#include "base/scriptvariable.h"
+#include "db_ido/dbquery.hpp"
+#include "base/initialize.hpp"
+#include "base/scriptvariable.hpp"
 
 using namespace icinga;
 

diff --git a/lib/db_ido/dbquery.h b/lib/db_ido/dbquery.hpp
similarity index 94%
rename from lib/db_ido/dbquery.h
rename to lib/db_ido/dbquery.hpp
index df5dc81463a8389de8cb952ccb1b61791d752689..4d5faa03a5fde9296f9ca89c70d7e0dcf4ca78a3 100644 (file)
--- a/lib/db_ido/dbquery.h
+++ b/lib/db_ido/dbquery.hpp
@@ -20,10 +20,10 @@
 #ifndef DBQUERY_H
 #define DBQUERY_H
 
-#include "db_ido/i2-db_ido.h"
-#include "icinga/customvarobject.h"
-#include "base/dictionary.h"
-#include "base/dynamicobject.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/dictionary.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/dbreference.cpp b/lib/db_ido/dbreference.cpp
index 00dfb502d02d82d2f83cf022f02fce5e0425c961..cc6ef31c91d068ff3996e8464452468bc585dc43 100644 (file)
--- a/lib/db_ido/dbreference.cpp
+++ b/lib/db_ido/dbreference.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "dbreference.h"
+#include "dbreference.hpp"
 
 using namespace icinga;
 

diff --git a/lib/db_ido/dbreference.h b/lib/db_ido/dbreference.hpp
similarity index 98%
rename from lib/db_ido/dbreference.h
rename to lib/db_ido/dbreference.hpp
index b88125ce0cce391fbeb682439782c73aa3613600..20166ef3a143f41e4f61605d6ba099074216a823 100644 (file)
--- a/lib/db_ido/dbreference.h
+++ b/lib/db_ido/dbreference.hpp
@@ -20,7 +20,7 @@
 #ifndef DBREFERENCE_H
 #define DBREFERENCE_H
 
-#include "db_ido/i2-db_ido.h"
+#include "db_ido/i2-db_ido.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/dbtype.cpp b/lib/db_ido/dbtype.cpp
index 4521fec260e33aace7f9f3749dfae8780eeda722..ca96498d7ecf75ed463d9faaecda374c8b210ebf 100644 (file)
--- a/lib/db_ido/dbtype.cpp
+++ b/lib/db_ido/dbtype.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbtype.h"
-#include "db_ido/dbconnection.h"
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbconnection.hpp"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 #include <boost/thread/once.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/lib/db_ido/dbtype.h b/lib/db_ido/dbtype.hpp
similarity index 97%
rename from lib/db_ido/dbtype.h
rename to lib/db_ido/dbtype.hpp
index 50ebe9e87ce7c8dfa1d944635b515221680f7741..199a04b2c3fae1722cc907b2c4b2a0be1ed6cc58 100644 (file)
--- a/lib/db_ido/dbtype.h
+++ b/lib/db_ido/dbtype.hpp
@@ -20,10 +20,10 @@
 #ifndef DBTYPE_H
 #define DBTYPE_H
 
-#include "db_ido/i2-db_ido.h"
-#include "base/object.h"
-#include "base/registry.h"
-#include "base/singleton.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "base/object.hpp"
+#include "base/registry.hpp"
+#include "base/singleton.hpp"
 #include <set>
 
 namespace icinga

diff --git a/lib/db_ido/dbvalue.cpp b/lib/db_ido/dbvalue.cpp
index a62f8cf82ba682ba3055fb701a145b7afe6a5ea4..a1b4242ded5fba96b771a2d2b7e7460c91319bce 100644 (file)
--- a/lib/db_ido/dbvalue.cpp
+++ b/lib/db_ido/dbvalue.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbvalue.h"
+#include "db_ido/dbvalue.hpp"
 
 using namespace icinga;
 

diff --git a/lib/db_ido/dbvalue.h b/lib/db_ido/dbvalue.hpp
similarity index 96%
rename from lib/db_ido/dbvalue.h
rename to lib/db_ido/dbvalue.hpp
index c43181530c2fc5e8e37cf865816126fa007224fe..1c7e184abea66ad0a029e21eb28f9f1a7ca072db 100644 (file)
--- a/lib/db_ido/dbvalue.h
+++ b/lib/db_ido/dbvalue.hpp
@@ -20,9 +20,9 @@
 #ifndef DBVALUE_H
 #define DBVALUE_H
 
-#include "db_ido/i2-db_ido.h"
-#include "base/object.h"
-#include "base/value.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "base/object.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/endpointdbobject.cpp b/lib/db_ido/endpointdbobject.cpp
index 13615fbbd091782537cae21d59bd5ca311691798..2f74fa9c83a2abd102592f97d8d59f277ee22b27 100644 (file)
--- a/lib/db_ido/endpointdbobject.cpp
+++ b/lib/db_ido/endpointdbobject.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/endpointdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/icingaapplication.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
+#include "db_ido/endpointdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/endpointdbobject.h b/lib/db_ido/endpointdbobject.hpp
similarity index 95%
rename from lib/db_ido/endpointdbobject.h
rename to lib/db_ido/endpointdbobject.hpp
index e2cf45e4807018134fb972e3a429cd3105005557..d65665371382c2880922af1bd4a420545a8860d6 100644 (file)
--- a/lib/db_ido/endpointdbobject.h
+++ b/lib/db_ido/endpointdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef ENDPOINTDBOBJECT_H
 #define ENDPOINTDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
-#include "remote/endpoint.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
+#include "remote/endpoint.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index abb9fcdccc8153cf710048e3ef1df1169a89b7b7..db6070e54ed476046ab3f2d4a8bd1234df245356 100644 (file)
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/hostdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido/dbevents.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/notification.h"
-#include "icinga/dependency.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/compatutility.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
+#include "db_ido/hostdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido/dbevents.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/dependency.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/hostdbobject.h b/lib/db_ido/hostdbobject.hpp
similarity index 96%
rename from lib/db_ido/hostdbobject.h
rename to lib/db_ido/hostdbobject.hpp
index 1453913a32084c732e6a6cca593b94b3fe071bed..aabf4540119074598fcb371cb5cf1e809f29a947 100644 (file)
--- a/lib/db_ido/hostdbobject.h
+++ b/lib/db_ido/hostdbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef HOSTDBOBJECT_H
 #define HOSTDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/hostgroupdbobject.cpp b/lib/db_ido/hostgroupdbobject.cpp
index e569ff5d78f9b4912e85784381432c57c44ba6c2..b99fa89b0e20005fddbb07d16126a9ef381346fb 100644 (file)
--- a/lib/db_ido/hostgroupdbobject.cpp
+++ b/lib/db_ido/hostgroupdbobject.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/hostgroupdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
+#include "db_ido/hostgroupdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/hostgroupdbobject.h b/lib/db_ido/hostgroupdbobject.hpp
similarity index 95%
rename from lib/db_ido/hostgroupdbobject.h
rename to lib/db_ido/hostgroupdbobject.hpp
index 3661021fe3cc683f5366a60852442eab4f4a5798..d9f4c6a2dc93bd4f888e51a31105174a3bb3745c 100644 (file)
--- a/lib/db_ido/hostgroupdbobject.h
+++ b/lib/db_ido/hostgroupdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef HOSTGROUPDBOBJECT_H
 #define HOSTGROUPDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "icinga/hostgroup.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "icinga/hostgroup.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/i2-db_ido.h b/lib/db_ido/i2-db_ido.hpp
similarity index 98%
rename from lib/db_ido/i2-db_ido.h
rename to lib/db_ido/i2-db_ido.hpp
index 6d0deaaaa9808cb4d4f180ee1721db36dd817b80..76cde2088affe3fb66c6d843abf879e4c09631ea 100644 (file)
--- a/lib/db_ido/i2-db_ido.h
+++ b/lib/db_ido/i2-db_ido.hpp
@@ -26,7 +26,7 @@
  * The Icinga library implements database-agnostic IDO functionality.
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_DB_IDO_BUILD
 #      define I2_DB_IDO_API I2_EXPORT

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 660006f023be626c339f49b05eb4da5bd1a55ebc..43d2d014cdd8736f256de9aae9aab017660efa6b 100644 (file)
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/servicedbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido/dbevents.h"
-#include "icinga/notification.h"
-#include "icinga/dependency.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/compatutility.h"
-#include "icinga/icingaapplication.h"
-#include "remote/endpoint.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
+#include "db_ido/servicedbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido/dbevents.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/dependency.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "remote/endpoint.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 

diff --git a/lib/db_ido/servicedbobject.h b/lib/db_ido/servicedbobject.hpp
similarity index 95%
rename from lib/db_ido/servicedbobject.h
rename to lib/db_ido/servicedbobject.hpp
index 67c4fc55b58ace2d925040c2d9617d677be14278..c99d4a8247975309a10ff0f742c7506b6c388abb 100644 (file)
--- a/lib/db_ido/servicedbobject.h
+++ b/lib/db_ido/servicedbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef SERVICEDBOBJECT_H
 #define SERVICEDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
-#include "icinga/service.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/servicegroupdbobject.cpp b/lib/db_ido/servicegroupdbobject.cpp
index a119bcb34ef1572d48fb90d591162404fb2d8803..b2cd0673f6a382c3c9f0151e9bda3e0ea0f42750 100644 (file)
--- a/lib/db_ido/servicegroupdbobject.cpp
+++ b/lib/db_ido/servicegroupdbobject.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/servicegroupdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
+#include "db_ido/servicegroupdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/servicegroupdbobject.h b/lib/db_ido/servicegroupdbobject.hpp
similarity index 95%
rename from lib/db_ido/servicegroupdbobject.h
rename to lib/db_ido/servicegroupdbobject.hpp
index 4d08428314ce37a15171bdfd0ec67b7ad47b9a86..dc79ef766e6ce70e31782f6e97b30fdf09d826cc 100644 (file)
--- a/lib/db_ido/servicegroupdbobject.h
+++ b/lib/db_ido/servicegroupdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef SERVICEGROUPDBOBJECT_H
 #define SERVICEGROUPDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "icinga/servicegroup.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "icinga/servicegroup.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/timeperioddbobject.cpp b/lib/db_ido/timeperioddbobject.cpp
index ea8625f06bcc31dc7a1fa4d2f48a2b8ba86cf79d..810b38a8462886ac7c72570e72ec4b8a9f191d1c 100644 (file)
--- a/lib/db_ido/timeperioddbobject.cpp
+++ b/lib/db_ido/timeperioddbobject.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/timeperioddbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/timeperiod.h"
-#include "icinga/legacytimeperiod.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/objectlock.h"
+#include "db_ido/timeperioddbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/legacytimeperiod.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/timeperioddbobject.h b/lib/db_ido/timeperioddbobject.hpp
similarity index 96%
rename from lib/db_ido/timeperioddbobject.h
rename to lib/db_ido/timeperioddbobject.hpp
index 173eeb576f55c5e5bc2eb9ee21c3185a085c878e..b68eebe43a1ee0123ab764bbfe1ea3e43542626c 100644 (file)
--- a/lib/db_ido/timeperioddbobject.h
+++ b/lib/db_ido/timeperioddbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef TIMEPERIODDBOBJECT_H
 #define TIMEPERIODDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp
index bccff13c73ec1d5a2da0b0e73b349f8298f8391a..af31a661f3e7ba720416e8d823576d7ca3cc880a 100644 (file)
--- a/lib/db_ido/userdbobject.cpp
+++ b/lib/db_ido/userdbobject.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/userdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/user.h"
-#include "icinga/notification.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
+#include "db_ido/userdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/user.hpp"
+#include "icinga/notification.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/userdbobject.h b/lib/db_ido/userdbobject.hpp
similarity index 96%
rename from lib/db_ido/userdbobject.h
rename to lib/db_ido/userdbobject.hpp
index 84277241c5eaee7162bcec5c32a12c6d0a7773f6..4156ee4e0ff9363599d4ae545f9e9ed79967e524 100644 (file)
--- a/lib/db_ido/userdbobject.h
+++ b/lib/db_ido/userdbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef USERDBOBJECT_H
 #define USERDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/db_ido/usergroupdbobject.cpp b/lib/db_ido/usergroupdbobject.cpp
index 4bb22715a5d52ba85feeb5de41743094686459e0..7e993b07623004dd241248222239db6b9b71f115 100644 (file)
--- a/lib/db_ido/usergroupdbobject.cpp
+++ b/lib/db_ido/usergroupdbobject.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/usergroupdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
+#include "db_ido/usergroupdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/db_ido/usergroupdbobject.h b/lib/db_ido/usergroupdbobject.hpp
similarity index 95%
rename from lib/db_ido/usergroupdbobject.h
rename to lib/db_ido/usergroupdbobject.hpp
index 8ab4a8246f26ff851aabb516b10ec67639f6e79e..05e9ef2baae420a2ff73e1c42cf2b3234bbea29d 100644 (file)
--- a/lib/db_ido/usergroupdbobject.h
+++ b/lib/db_ido/usergroupdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef USERGROUPDBOBJECT_H
 #define USERGROUPDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "icinga/usergroup.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "icinga/usergroup.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/hello/CMakeLists.txt b/lib/hello/CMakeLists.txt
index a062eb618b1cf5dc9f56bf8430ba7b3d388fd5c3..04dda707166c11dba16f9b906c1f6bc8c2a3deca 100644 (file)
--- a/lib/hello/CMakeLists.txt
+++ b/lib/hello/CMakeLists.txt
@@ -15,12 +15,12 @@
 # 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(hello.ti hello.th)
+mkclass_target(hello.ti hello.thpp)
 
 mkembedconfig_target(hello-type.conf hello-type.cpp)
 
 add_library(hello SHARED
-  hello.cpp hello.th hello-type.cpp
+  hello.cpp hello.thpp hello-type.cpp
 )
 
 target_link_libraries(hello ${Boost_LIBRARIES} base config)

diff --git a/lib/hello/hello.cpp b/lib/hello/hello.cpp
index 9c729baa927945da678f4c9bdf2d84bd0e972c1b..fc4d23cfc8d84317c479ec17ce261b1a11cef9e6 100644 (file)
--- a/lib/hello/hello.cpp
+++ b/lib/hello/hello.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "hello/hello.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
+#include "hello/hello.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 

diff --git a/lib/hello/hello.h b/lib/hello/hello.hpp
similarity index 98%
rename from lib/hello/hello.h
rename to lib/hello/hello.hpp
index dc73eba6ef0449ac43bd1dbdc6297bc08a1ac237..2283fe77f24fe39abb1160feefb60ec7f41f166f 100644 (file)
--- a/lib/hello/hello.h
+++ b/lib/hello/hello.hpp
@@ -20,7 +20,7 @@
 #ifndef HELLO_H
 #define HELLO_H
 
-#include "hello/hello.th"
+#include "hello/hello.thpp"
 
 namespace icinga
 {

diff --git a/lib/hello/hello.ti b/lib/hello/hello.ti
index f7226550164c1f6767c2e73d4133e454ad721a03..6bb8b8769042433d89236c48e46bf443aa804dee 100644 (file)
--- a/lib/hello/hello.ti
+++ b/lib/hello/hello.ti
@@ -1,4 +1,4 @@
-#include "base/application.h"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/CMakeLists.txt b/lib/icinga/CMakeLists.txt
index f3ef3906b473fdbb08ec84ffc818aa5b46d628fd..95363441f63e1eaf4cc9a13981b148b39107c797 100644 (file)
--- a/lib/icinga/CMakeLists.txt
+++ b/lib/icinga/CMakeLists.txt
@@ -15,43 +15,43 @@
 # 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.th)
-mkclass_target(checkcommand.ti checkcommand.th)
-mkclass_target(checkresult.ti checkresult.th)
-mkclass_target(command.ti command.th)
-mkclass_target(comment.ti comment.th)
-mkclass_target(dependency.ti dependency.th)
-mkclass_target(downtime.ti downtime.th)
-mkclass_target(eventcommand.ti eventcommand.th)
-mkclass_target(hostgroup.ti hostgroup.th)
-mkclass_target(host.ti host.th)
-mkclass_target(icingaapplication.ti icingaapplication.th)
-mkclass_target(customvarobject.ti customvarobject.th)
-mkclass_target(icingastatuswriter.ti icingastatuswriter.th)
-mkclass_target(notificationcommand.ti notificationcommand.th)
-mkclass_target(notification.ti notification.th)
-mkclass_target(perfdatavalue.ti perfdatavalue.th)
-mkclass_target(scheduleddowntime.ti scheduleddowntime.th)
-mkclass_target(servicegroup.ti servicegroup.th)
-mkclass_target(service.ti service.th)
-mkclass_target(timeperiod.ti timeperiod.th)
-mkclass_target(usergroup.ti usergroup.th)
-mkclass_target(user.ti user.th)
+mkclass_target(checkable.ti checkable.thpp)
+mkclass_target(checkcommand.ti checkcommand.thpp)
+mkclass_target(checkresult.ti checkresult.thpp)
+mkclass_target(command.ti command.thpp)
+mkclass_target(comment.ti comment.thpp)
+mkclass_target(dependency.ti dependency.thpp)
+mkclass_target(downtime.ti downtime.thpp)
+mkclass_target(eventcommand.ti eventcommand.thpp)
+mkclass_target(hostgroup.ti hostgroup.thpp)
+mkclass_target(host.ti host.thpp)
+mkclass_target(icingaapplication.ti icingaapplication.thpp)
+mkclass_target(customvarobject.ti customvarobject.thpp)
+mkclass_target(icingastatuswriter.ti icingastatuswriter.thpp)
+mkclass_target(notificationcommand.ti notificationcommand.thpp)
+mkclass_target(notification.ti notification.thpp)
+mkclass_target(perfdatavalue.ti perfdatavalue.thpp)
+mkclass_target(scheduleddowntime.ti scheduleddowntime.thpp)
+mkclass_target(servicegroup.ti servicegroup.thpp)
+mkclass_target(service.ti service.thpp)
+mkclass_target(timeperiod.ti timeperiod.thpp)
+mkclass_target(usergroup.ti usergroup.thpp)
+mkclass_target(user.ti user.thpp)
 
 mkembedconfig_target(icinga-type.conf icinga-type.cpp)
 
 add_library(icinga SHARED
-  api.cpp apievents.cpp checkable.cpp checkable.th checkable-dependency.cpp checkable-downtime.cpp checkable-event.cpp
-  checkable-flapping.cpp checkcommand.cpp checkcommand.th checkresult.cpp checkresult.th
-  cib.cpp command.cpp command.th comment.cpp comment.th compatutility.cpp dependency.cpp dependency.th
-  dependency-apply.cpp downtime.cpp downtime.th eventcommand.cpp eventcommand.th
-  externalcommandprocessor.cpp host.cpp host.th hostgroup.cpp hostgroup.th icingaapplication.cpp
-  icingaapplication.th customvarobject.cpp customvarobject.th icingastatuswriter.cpp icingastatuswriter.th
-  legacytimeperiod.cpp macroprocessor.cpp notificationcommand.cpp notificationcommand.th notification.cpp
-  notification.th notification-apply.cpp perfdatavalue.cpp perfdatavalue.th pluginutility.cpp scheduleddowntime.cpp
-  scheduleddowntime.th scheduleddowntime-apply.cpp service-apply.cpp checkable-check.cpp checkable-comment.cpp
-  service.cpp service.th servicegroup.cpp servicegroup.th checkable-notification.cpp timeperiod.cpp timeperiod.th
-  user.cpp user.th usergroup.cpp usergroup.th icinga-type.cpp
+  api.cpp apievents.cpp checkable.cpp checkable.thpp checkable-dependency.cpp checkable-downtime.cpp checkable-event.cpp
+  checkable-flapping.cpp checkcommand.cpp checkcommand.thpp checkresult.cpp checkresult.thpp
+  cib.cpp command.cpp command.thpp comment.cpp comment.thpp compatutility.cpp dependency.cpp dependency.thpp
+  dependency-apply.cpp downtime.cpp downtime.thpp eventcommand.cpp eventcommand.thpp
+  externalcommandprocessor.cpp host.cpp host.thpp hostgroup.cpp hostgroup.thpp icingaapplication.cpp
+  icingaapplication.thpp customvarobject.cpp customvarobject.thpp icingastatuswriter.cpp icingastatuswriter.thpp
+  legacytimeperiod.cpp macroprocessor.cpp notificationcommand.cpp notificationcommand.thpp notification.cpp
+  notification.thpp notification-apply.cpp perfdatavalue.cpp perfdatavalue.thpp pluginutility.cpp scheduleddowntime.cpp
+  scheduleddowntime.thpp scheduleddowntime-apply.cpp service-apply.cpp checkable-check.cpp checkable-comment.cpp
+  service.cpp service.thpp servicegroup.cpp servicegroup.thpp checkable-notification.cpp timeperiod.cpp timeperiod.thpp
+  user.cpp user.thpp usergroup.cpp usergroup.thpp icinga-type.cpp
 )
 
 target_link_libraries(icinga ${Boost_LIBRARIES} base config remote)

diff --git a/lib/icinga/api.cpp b/lib/icinga/api.cpp
index 57eb8656e94ee51345bd9f2ea6f2d0977d45827a..67cfdc466a0b9e9ccbc465567294b2869f0ea347 100644 (file)
--- a/lib/icinga/api.cpp
+++ b/lib/icinga/api.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/api.h"
-#include "remote/apifunction.h"
-#include "base/logger_fwd.h"
+#include "icinga/api.hpp"
+#include "remote/apifunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/api.h b/lib/icinga/api.hpp
similarity index 94%
rename from lib/icinga/api.h
rename to lib/icinga/api.hpp
index 78f64ef0605754e2de6104e7cb6ead5ade3d34fd..c4b9ab1099ee8e1df7b762a67237cac4e4e298a1 100644 (file)
--- a/lib/icinga/api.h
+++ b/lib/icinga/api.hpp
@@ -20,9 +20,9 @@
 #ifndef API_H
 #define API_H
 
-#include "icinga/i2-icinga.h"
-#include "base/value.h"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "base/value.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/apievents.cpp b/lib/icinga/apievents.cpp
index 37811a52feebf27ccd00869ebb121a4fb90a9e27..3bbd2e27bea9503aba7c6bc21c57b11933ad2eb2 100644 (file)
--- a/lib/icinga/apievents.cpp
+++ b/lib/icinga/apievents.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/apievents.h"
-#include "icinga/service.h"
-#include "remote/apilistener.h"
-#include "remote/endpoint.h"
-#include "remote/messageorigin.h"
-#include "remote/zone.h"
-#include "remote/apifunction.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/initialize.h"
+#include "icinga/apievents.hpp"
+#include "icinga/service.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/endpoint.hpp"
+#include "remote/messageorigin.hpp"
+#include "remote/zone.hpp"
+#include "remote/apifunction.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/initialize.hpp"
 #include <fstream>
 
 using namespace icinga;

diff --git a/lib/icinga/apievents.h b/lib/icinga/apievents.hpp
similarity index 98%
rename from lib/icinga/apievents.h
rename to lib/icinga/apievents.hpp
index 3413dc8415c23e7100ebbf00114b7800d5c35944..5ebe217e8ebd9c63d3e09b440c99731ef00e6438 100644 (file)
--- a/lib/icinga/apievents.h
+++ b/lib/icinga/apievents.hpp
@@ -20,8 +20,8 @@
 #ifndef APIEVENTS_H
 #define APIEVENTS_H
 
-#include "icinga/checkable.h"
-#include "icinga/host.h"
+#include "icinga/checkable.hpp"
+#include "icinga/host.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index e37050c039fc4103c674dc162f05b44b212a9ac9..714d1e2259756ed4237f14a0783fd6e396cf0e75 100644 (file)
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/checkcommand.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "remote/messageorigin.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/context.h"
+#include "icinga/checkable.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/context.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable-comment.cpp b/lib/icinga/checkable-comment.cpp
index bdd80957f571ead3719796d5aaa5e5bc973d2949..ba634b31e61c3608c19ca73987191d7904023c2b 100644 (file)
--- a/lib/icinga/checkable-comment.cpp
+++ b/lib/icinga/checkable-comment.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp
index d55340ddb4c9d002df98ead63451352d8ce4d4cc..8bb541ef8a30924d6f26acddea8ca9f39dfa365b 100644 (file)
--- a/lib/icinga/checkable-dependency.cpp
+++ b/lib/icinga/checkable-dependency.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "icinga/dependency.h"
-#include "base/logger_fwd.h"
+#include "icinga/service.hpp"
+#include "icinga/dependency.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable-downtime.cpp b/lib/icinga/checkable-downtime.cpp
index 086b64c61239acb0b81406d706d344818192e3c6..492e805cf8c0a953aaaa9224149f5b5e0b56ed39 100644 (file)
--- a/lib/icinga/checkable-downtime.cpp
+++ b/lib/icinga/checkable-downtime.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/convert.h"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable-event.cpp b/lib/icinga/checkable-event.cpp
index 06d47d004114b212e76fef72879a87d67801cfca..d52ebc1701544dcca5f90d2187175bc81547f461 100644 (file)
--- a/lib/icinga/checkable-event.cpp
+++ b/lib/icinga/checkable-event.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/eventcommand.h"
-#include "icinga/icingaapplication.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
+#include "icinga/checkable.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/checkable-flapping.cpp b/lib/icinga/checkable-flapping.cpp
index 7bd6f47b47ce3d52089199bcb89438a60ad1e199..34ecb7e6d5af4c1a4ca41a7b87de608bcd20dcff 100644 (file)
--- a/lib/icinga/checkable-flapping.cpp
+++ b/lib/icinga/checkable-flapping.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/icingaapplication.h"
-#include "base/utility.h"
+#include "icinga/checkable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp
index f53d53ac78fd61c5542483336159d3447be6426c..5a2af26da1346ec0e9537231263480c57afb770c 100644 (file)
--- a/lib/icinga/checkable-notification.cpp
+++ b/lib/icinga/checkable-notification.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/icingaapplication.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/context.h"
-#include "base/convert.h"
+#include "icinga/checkable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/context.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index f53f165531190604e0b8109fe3640dafc5e59e0d..ef1c99067a4bd43317ae0a3a7125e2049b0a8050 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
+#include "icinga/checkable.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/bind/apply.hpp>
 

diff --git a/lib/icinga/checkable.h b/lib/icinga/checkable.hpp
similarity index 98%
rename from lib/icinga/checkable.h
rename to lib/icinga/checkable.hpp
index 86b4046591f843bdd256e4f3c32704f0c28e3ca9..c2b2b77252850ff29f6f7535be99b6cbf42560f5 100644 (file)
--- a/lib/icinga/checkable.h
+++ b/lib/icinga/checkable.hpp
@@ -20,13 +20,13 @@
 #ifndef CHECKABLE_H
 #define CHECKABLE_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkable.th"
-#include "icinga/timeperiod.h"
-#include "icinga/notification.h"
-#include "icinga/comment.h"
-#include "icinga/downtime.h"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkable.thpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/comment.hpp"
+#include "icinga/downtime.hpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/checkable.ti b/lib/icinga/checkable.ti
index 778bc8a78768b162b4056a81d2de8def5a114976..6193f23da3e44b5cec3880bf4bcd95435e515264 100644 (file)
--- a/lib/icinga/checkable.ti
+++ b/lib/icinga/checkable.ti
@@ -1,6 +1,6 @@
-#include "icinga/icingaapplication.h"
-#include "icinga/customvarobject.h"
-#include "base/array.h"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/checkcommand.cpp b/lib/icinga/checkcommand.cpp
index 32630fef6cb99d5dc01908e6b499efd9766cf11a..ff7728f060d643259862529c8793eb3ece21ceef 100644 (file)
--- a/lib/icinga/checkcommand.cpp
+++ b/lib/icinga/checkcommand.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkcommand.h"
-#include "base/dynamictype.h"
+#include "icinga/checkcommand.hpp"
+#include "base/dynamictype.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/checkcommand.h b/lib/icinga/checkcommand.hpp
similarity index 96%
rename from lib/icinga/checkcommand.h
rename to lib/icinga/checkcommand.hpp
index 15cd69d6c2ba7b9e70d2b925a525aac5bb4a6193..9b977ce154d3e51fe3922c001330437fb5ac37ea 100644 (file)
--- a/lib/icinga/checkcommand.h
+++ b/lib/icinga/checkcommand.hpp
@@ -20,8 +20,8 @@
 #ifndef CHECKCOMMAND_H
 #define CHECKCOMMAND_H
 
-#include "icinga/checkcommand.th"
-#include "icinga/checkable.h"
+#include "icinga/checkcommand.thpp"
+#include "icinga/checkable.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/checkcommand.ti b/lib/icinga/checkcommand.ti
index d0dda721222297ac437198633aa08eb70a0c37f8..bf2f03e5cf213603ca9f6b97a511e79a21c11650 100644 (file)
--- a/lib/icinga/checkcommand.ti
+++ b/lib/icinga/checkcommand.ti
@@ -1,4 +1,4 @@
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/checkresult.cpp b/lib/icinga/checkresult.cpp
index 098af8f2d74907ed0ed83da7ef69fedf64d0c40e..06846b09e9b2adb48b8247949a8d1091c76c957d 100644 (file)
--- a/lib/icinga/checkresult.cpp
+++ b/lib/icinga/checkresult.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkresult.h"
+#include "icinga/checkresult.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/checkresult.h b/lib/icinga/checkresult.hpp
similarity index 96%
rename from lib/icinga/checkresult.h
rename to lib/icinga/checkresult.hpp
index b0f595ac04d43cbd3535efff990c3ae741993063..87f366260f256094b2662c811b1f6d49b646b520 100644 (file)
--- a/lib/icinga/checkresult.h
+++ b/lib/icinga/checkresult.hpp
@@ -20,8 +20,8 @@
 #ifndef CHECKRESULT_H
 #define CHECKRESULT_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkresult.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkresult.thpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/cib.cpp b/lib/icinga/cib.cpp
index cfbf53538b966d3ce4029c5c118fd6c3058e8a1c..dcf7422e78cbb4e8ab396705fbe9134702cd0fa2 100644 (file)
--- a/lib/icinga/cib.cpp
+++ b/lib/icinga/cib.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/dynamictype.h"
-#include "base/statsfunction.h"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/cib.h b/lib/icinga/cib.hpp
similarity index 97%
rename from lib/icinga/cib.h
rename to lib/icinga/cib.hpp
index 39c3d6a5eaf80a68081850d795eb021fe325a99e..deadd4cf1216cb6c3b326594921618e34b454f54 100644 (file)
--- a/lib/icinga/cib.h
+++ b/lib/icinga/cib.hpp
@@ -20,9 +20,9 @@
 #ifndef CIB_H
 #define CIB_H
 
-#include "icinga/i2-icinga.h"
-#include "base/ringbuffer.h"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "base/ringbuffer.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index e408dc0f28f19ea6f514abc41c2d67c7ba661117..51d24ddc8feb491e5af1c0b58968b35e73d8e521 100644 (file)
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/command.h b/lib/icinga/command.hpp
similarity index 94%
rename from lib/icinga/command.h
rename to lib/icinga/command.hpp
index 3b691e91d5da288fb59b745aa3b5e9cd4cb19c5a..83ad778c572fda100c782b0d09e3c63a852a60e8 100644 (file)
--- a/lib/icinga/command.h
+++ b/lib/icinga/command.hpp
@@ -20,9 +20,9 @@
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/command.th"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/command.thpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/command.ti b/lib/icinga/command.ti
index f04f826ef33deb4c2de7c294156c031ce3f36824..06199a521cbde45c5868a5b3ad464b2260db0f7d 100644 (file)
--- a/lib/icinga/command.ti
+++ b/lib/icinga/command.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp
index 10fcc8904e0e70baf0fcf1577693b0158901c711..4139ade11fdde798ff5be896905411b2b3eaee82 100644 (file)
--- a/lib/icinga/comment.cpp
+++ b/lib/icinga/comment.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/comment.h"
-#include "base/utility.h"
-#include "base/dynamictype.h"
+#include "icinga/comment.hpp"
+#include "base/utility.hpp"
+#include "base/dynamictype.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/comment.h b/lib/icinga/comment.hpp
similarity index 96%
rename from lib/icinga/comment.h
rename to lib/icinga/comment.hpp
index 071769d0a0cb0522dece22aced2937ab39438a36..0b64d5ded63068d8be864ed9fafbc4a181f4a629 100644 (file)
--- a/lib/icinga/comment.h
+++ b/lib/icinga/comment.hpp
@@ -20,8 +20,8 @@
 #ifndef COMMENT_H
 #define COMMENT_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/comment.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/comment.thpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp
index 87cc1836156f0088eca5ad23e13efb1dc8d50ed6..6fa8700ff0cd70ffdeaca50893217f1105c744bf 100644 (file)
--- a/lib/icinga/compatutility.cpp
+++ b/lib/icinga/compatutility.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/compatutility.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/pluginutility.h"
-#include "icinga/service.h"
-#include "base/utility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
+#include "icinga/compatutility.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/service.hpp"
+#include "base/utility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/icinga/compatutility.h b/lib/icinga/compatutility.hpp
similarity index 97%
rename from lib/icinga/compatutility.h
rename to lib/icinga/compatutility.hpp
index 3589d95e60e5a844651a529dacd5ebdaf5b4f11b..4670334d0d5247df61b3e75ee709f5c6b11c0baf 100644 (file)
--- a/lib/icinga/compatutility.h
+++ b/lib/icinga/compatutility.hpp
@@ -20,12 +20,12 @@
 #ifndef COMPATUTILITY_H
 #define COMPATUTILITY_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/customvarobject.h"
-#include "icinga/host.h"
-#include "icinga/command.h"
-#include "base/dictionary.h"
-#include "base/array.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/customvarobject.hpp"
+#include "icinga/host.hpp"
+#include "icinga/command.hpp"
+#include "base/dictionary.hpp"
+#include "base/array.hpp"
 #include <vector>
 
 namespace icinga

diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp
index ca4dbfb23d2d7a8315c0a034ae5fcdbb9009b858..df0774ab213a4f5791d8c5937e5fe9b63d57455b 100644 (file)
--- a/lib/icinga/customvarobject.cpp
+++ b/lib/icinga/customvarobject.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/customvarobject.h"
-#include "base/logger_fwd.h"
+#include "icinga/customvarobject.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/customvarobject.h b/lib/icinga/customvarobject.hpp
similarity index 95%
rename from lib/icinga/customvarobject.h
rename to lib/icinga/customvarobject.hpp
index 09b927b8eca8f9bd26d0f7ff79250863394ab599..d8903b239dc16a246a53dd5f943e44af31fe3e6c 100644 (file)
--- a/lib/icinga/customvarobject.h
+++ b/lib/icinga/customvarobject.hpp
@@ -20,10 +20,10 @@
 #ifndef CUSTOMVAROBJECT_H
 #define CUSTOMVAROBJECT_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/customvarobject.th"
-#include "base/dynamicobject.h"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/customvarobject.thpp"
+#include "base/dynamicobject.hpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/customvarobject.ti b/lib/icinga/customvarobject.ti
index cb14e50b14116f0efe3b2869da5f8357906c2219..b178de633930a5503818f8988e17fd0f414446c8 100644 (file)
--- a/lib/icinga/customvarobject.ti
+++ b/lib/icinga/customvarobject.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp
index 2bff8334f37b15d1f48198ae1fbbdf9341436f07..62a3e80b3866d9130f6fcf2b959cbd8ddd6130af 100644 (file)
--- a/lib/icinga/dependency-apply.cpp
+++ b/lib/icinga/dependency-apply.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/dependency.h"
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/dependency.hpp"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp
index 968f4cfb771510657402436e93527052fbf85594..46374302177be675c10265cca6011c034b6bd99d 100644 (file)
--- a/lib/icinga/dependency.cpp
+++ b/lib/icinga/dependency.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/dependency.h"
-#include "icinga/service.h"
-#include "config/configcompilercontext.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
+#include "icinga/dependency.hpp"
+#include "icinga/service.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/dependency.h b/lib/icinga/dependency.hpp
similarity index 96%
rename from lib/icinga/dependency.h
rename to lib/icinga/dependency.hpp
index 210d8c2e9bc54e55e291ca07577b82e2f2925d48..4d310c9563e5cd9a962ec7567f5166ea75fa5e77 100644 (file)
--- a/lib/icinga/dependency.h
+++ b/lib/icinga/dependency.hpp
@@ -20,9 +20,9 @@
 #ifndef DEPENDENCY_H
 #define DEPENDENCY_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/dependency.th"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/dependency.thpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/dependency.ti b/lib/icinga/dependency.ti
index 0b21bb148221f1b5abc62ab181cd68023e242394..40de2aec81ee8ded853281e7a592e636e9681fe5 100644 (file)
--- a/lib/icinga/dependency.ti
+++ b/lib/icinga/dependency.ti
@@ -1,5 +1,5 @@
-#include "icinga/customvarobject.h"
-#include "icinga/checkable.h"
+#include "icinga/customvarobject.hpp"
+#include "icinga/checkable.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index f17af8f9f045e508559fc0fa4e53adb00f041754..4ba4577a65775d8597294fac4f5ac5fc913f8da9 100644 (file)
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/downtime.h"
-#include "base/utility.h"
+#include "icinga/downtime.hpp"
+#include "base/utility.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/downtime.h b/lib/icinga/downtime.hpp
similarity index 96%
rename from lib/icinga/downtime.h
rename to lib/icinga/downtime.hpp
index f76384288049dc972c3cfbb94c013c076f1e274f..73fffd3105e458e9818c98e9a91a0caf46750e0b 100644 (file)
--- a/lib/icinga/downtime.h
+++ b/lib/icinga/downtime.hpp
@@ -20,8 +20,8 @@
 #ifndef DOWNTIME_H
 #define DOWNTIME_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/downtime.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/downtime.thpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/eventcommand.cpp b/lib/icinga/eventcommand.cpp
index 8fd2628424c9c38c34d943b5c4f92319f62d3b49..2a0b92e7b417d68c9a2b6fa7eb8c1789f25db9a5 100644 (file)
--- a/lib/icinga/eventcommand.cpp
+++ b/lib/icinga/eventcommand.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/eventcommand.h"
+#include "icinga/eventcommand.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/eventcommand.h b/lib/icinga/eventcommand.hpp
similarity index 96%
rename from lib/icinga/eventcommand.h
rename to lib/icinga/eventcommand.hpp
index a1dedce80d9dc2e378ace8454aa812a95b926bfd..6717928da46771447261b9d1ae2abf2a895afb4b 100644 (file)
--- a/lib/icinga/eventcommand.h
+++ b/lib/icinga/eventcommand.hpp
@@ -20,8 +20,8 @@
 #ifndef EVENTCOMMAND_H
 #define EVENTCOMMAND_H
 
-#include "icinga/eventcommand.th"
-#include "icinga/checkable.h"
+#include "icinga/eventcommand.thpp"
+#include "icinga/checkable.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/eventcommand.ti b/lib/icinga/eventcommand.ti
index 7a578b568b59bb24f77b77c7e3b67577b625d984..4bbca8a064f4ee88b36ab57128ede215c87fe1f6 100644 (file)
--- a/lib/icinga/eventcommand.ti
+++ b/lib/icinga/eventcommand.ti
@@ -1,4 +1,4 @@
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index 1d4b132877b97b305a0942e67eb252d2b6290742..ebd283ff74181ade0666833322e05582d346ad91 100644 (file)
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/user.h"
-#include "icinga/hostgroup.h"
-#include "icinga/servicegroup.h"
-#include "icinga/pluginutility.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "remote/apifunction.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/application.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/user.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/servicegroup.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "remote/apifunction.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/application.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <fstream>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>

diff --git a/lib/icinga/externalcommandprocessor.h b/lib/icinga/externalcommandprocessor.hpp
similarity index 99%
rename from lib/icinga/externalcommandprocessor.h
rename to lib/icinga/externalcommandprocessor.hpp
index db995d5185d7ecd1e55d0b07fc1a2c8cc6776bf6..309a02855a97cde1bd44c71cced3924e301c39cd 100644 (file)
--- a/lib/icinga/externalcommandprocessor.h
+++ b/lib/icinga/externalcommandprocessor.hpp
@@ -20,9 +20,9 @@
 #ifndef EXTERNALCOMMANDPROCESSOR_H
 #define EXTERNALCOMMANDPROCESSOR_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/command.h"
-#include "base/qstring.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/command.hpp"
+#include "base/qstring.hpp"
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 #include <vector>

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index fd7c9cd8e1e30a374f14c8dab7263f13ca38d34d..52cdd76587681bd822a605edb573a56b60906ee6 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/hostgroup.h"
-#include "icinga/pluginutility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/debug.h"
-#include "base/serializer.h"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/pluginutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/debug.hpp"
+#include "base/serializer.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/host.h b/lib/icinga/host.hpp
similarity index 95%
rename from lib/icinga/host.h
rename to lib/icinga/host.hpp
index 469bb8a7eb5547cb35df8b10f5d9acabcf8507b9..1101cae3d995073e302f1e2f00e8059637017b8f 100644 (file)
--- a/lib/icinga/host.h
+++ b/lib/icinga/host.hpp
@@ -20,10 +20,10 @@
 #ifndef HOST_H
 #define HOST_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/host.th"
-#include "icinga/macroresolver.h"
-#include "icinga/checkresult.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/host.thpp"
+#include "icinga/macroresolver.hpp"
+#include "icinga/checkresult.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/host.ti b/lib/icinga/host.ti
index e3667c869f5348022bca8d8d5c0cc68a1791a8d1..1b8edc2c44c51862d9c8dc37103eca6af5e5edef 100644 (file)
--- a/lib/icinga/host.ti
+++ b/lib/icinga/host.ti
@@ -1,5 +1,5 @@
-#include "icinga/checkable.h"
-#include "icinga/customvarobject.h"
+#include "icinga/checkable.hpp"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index cada9e887aa15be0c063292102237572ac7de867..0274998bc2672f6490756fed092e9981d7200675 100644 (file)
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/hostgroup.h"
-#include "config/objectrule.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/hostgroup.hpp"
+#include "config/objectrule.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/hostgroup.h b/lib/icinga/hostgroup.hpp
similarity index 96%
rename from lib/icinga/hostgroup.h
rename to lib/icinga/hostgroup.hpp
index 0c7ea97fd9f3aa2893b5883fb383ce5fde753ed1..76cf9c7592f9727df5a9f9b11ba30540ba8438ad 100644 (file)
--- a/lib/icinga/hostgroup.h
+++ b/lib/icinga/hostgroup.hpp
@@ -20,9 +20,9 @@
 #ifndef HOSTGROUP_H
 #define HOSTGROUP_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/hostgroup.th"
-#include "icinga/host.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/hostgroup.thpp"
+#include "icinga/host.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/hostgroup.ti b/lib/icinga/hostgroup.ti
index 4aa89fc463188039bf1ae8efe49dcd269c589dda..1656f85cc71aa8e3491348ef80182e6319db04c9 100644 (file)
--- a/lib/icinga/hostgroup.ti
+++ b/lib/icinga/hostgroup.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/i2-icinga.h b/lib/icinga/i2-icinga.hpp
similarity index 98%
rename from lib/icinga/i2-icinga.h
rename to lib/icinga/i2-icinga.hpp
index bf2d4c7b9232051f75aebd922234100bfbbb7a74..fdc096e37b551706c770e5f7bc1789a6604b1544 100644 (file)
--- a/lib/icinga/i2-icinga.h
+++ b/lib/icinga/i2-icinga.hpp
@@ -27,7 +27,7 @@
  * common to all components (e.g. hosts, services, etc.).
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_ICINGA_BUILD
 #      define I2_ICINGA_API I2_EXPORT

diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 67465206de643c600861594ac3bac8816e972a11..c55bc01a85cb9ab0c547c946f14c9245b72e9d49 100644 (file)
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/debug.h"
-#include "base/utility.h"
-#include "base/timer.h"
-#include "base/scriptvariable.h"
-#include "base/initialize.h"
-#include "base/statsfunction.h"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
+#include "base/timer.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/initialize.hpp"
+#include "base/statsfunction.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/icingaapplication.h b/lib/icinga/icingaapplication.hpp
similarity index 96%
rename from lib/icinga/icingaapplication.h
rename to lib/icinga/icingaapplication.hpp
index cee4cbbac61deccde83729f11007ffadf44b80c6..00aa3e7c91613233830488264d55b71b4d8b34c2 100644 (file)
--- a/lib/icinga/icingaapplication.h
+++ b/lib/icinga/icingaapplication.hpp
@@ -20,9 +20,9 @@
 #ifndef ICINGAAPPLICATION_H
 #define ICINGAAPPLICATION_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/icingaapplication.th"
-#include "icinga/macroresolver.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/icingaapplication.thpp"
+#include "icinga/macroresolver.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/icingaapplication.ti b/lib/icinga/icingaapplication.ti
index b2860752c0cebee4c77a03e70b6acdc088f640a1..70b206ea298eed0101688ddbae9e9fb9546439f1 100644 (file)
--- a/lib/icinga/icingaapplication.ti
+++ b/lib/icinga/icingaapplication.ti
@@ -1,4 +1,4 @@
-#include "base/application.h"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/icingastatuswriter.cpp b/lib/icinga/icingastatuswriter.cpp
index 7d59e91cadd43bc06e51b06672418b9ca45d2f99..cabbd5b2be21affcfd5659a9dcb72a36eb2f2d34 100644 (file)
--- a/lib/icinga/icingastatuswriter.cpp
+++ b/lib/icinga/icingastatuswriter.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/icingastatuswriter.h"
-#include "icinga/cib.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/application.h"
-#include "base/statsfunction.h"
+#include "icinga/icingastatuswriter.hpp"
+#include "icinga/cib.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/application.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>

diff --git a/lib/icinga/icingastatuswriter.h b/lib/icinga/icingastatuswriter.hpp
similarity index 96%
rename from lib/icinga/icingastatuswriter.h
rename to lib/icinga/icingastatuswriter.hpp
index 32ae31bc8615e65fc99c82c8d5390e3ca0ada3e8..b60412abb596a5aa15006ebaf0882047e9a3beef 100644 (file)
--- a/lib/icinga/icingastatuswriter.h
+++ b/lib/icinga/icingastatuswriter.hpp
@@ -20,8 +20,8 @@
 #ifndef ICINGASTATUSWRITER_H
 #define ICINGASTATUSWRITER_H
 
-#include "icinga/icingastatuswriter.th"
-#include "base/timer.h"
+#include "icinga/icingastatuswriter.thpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/icingastatuswriter.ti b/lib/icinga/icingastatuswriter.ti
index fb397d7477ddc9eb79693f3c8206d3d93b70c4d0..191688891e7206643dba12f2d4ae265ed2a00c2e 100644 (file)
--- a/lib/icinga/icingastatuswriter.ti
+++ b/lib/icinga/icingastatuswriter.ti
@@ -1,5 +1,5 @@
-#include "icinga/customvarobject.h"
-#include "base/application.h"
+#include "icinga/customvarobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/legacytimeperiod.cpp b/lib/icinga/legacytimeperiod.cpp
index e9256da47eba9d5dd90196edbd6b0e99df36fdad..469cbd09fc853e52297c0f8c5d29a888e7e405cb 100644 (file)
--- a/lib/icinga/legacytimeperiod.cpp
+++ b/lib/icinga/legacytimeperiod.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/legacytimeperiod.h"
-#include "base/scriptfunction.h"
-#include "base/convert.h"
-#include "base/exception.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/debug.h"
-#include "base/utility.h"
+#include "icinga/legacytimeperiod.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/convert.hpp"
+#include "base/exception.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>

diff --git a/lib/icinga/legacytimeperiod.h b/lib/icinga/legacytimeperiod.hpp
similarity index 96%
rename from lib/icinga/legacytimeperiod.h
rename to lib/icinga/legacytimeperiod.hpp
index d33c2bc53808493efdfec11cb0ee218349811aab..7c9265bd74d7e07efbe59fda603fb4a070e85257 100644 (file)
--- a/lib/icinga/legacytimeperiod.h
+++ b/lib/icinga/legacytimeperiod.hpp
@@ -20,9 +20,9 @@
 #ifndef LEGACYTIMEPERIOD_H
 #define LEGACYTIMEPERIOD_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/timeperiod.h"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/timeperiod.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp
index b77a3b014e0f8eb434cc852fc0a4a6be9d3b33cd..667e44b18c6105599f753ca35797634dc9a3322b 100644 (file)
--- a/lib/icinga/macroprocessor.cpp
+++ b/lib/icinga/macroprocessor.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/macroprocessor.h"
-#include "icinga/macroresolver.h"
-#include "icinga/customvarobject.h"
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/dynamicobject.h"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/macroresolver.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/dynamicobject.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/icinga/macroprocessor.h b/lib/icinga/macroprocessor.hpp
similarity index 96%
rename from lib/icinga/macroprocessor.h
rename to lib/icinga/macroprocessor.hpp
index 19ebd960a97bd51515ef8206b0739ad3e3b3fd0d..4fb27a9db7e8032ce9859087453b2673bfc0b712 100644 (file)
--- a/lib/icinga/macroprocessor.h
+++ b/lib/icinga/macroprocessor.hpp
@@ -20,9 +20,9 @@
 #ifndef MACROPROCESSOR_H
 #define MACROPROCESSOR_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkable.h"
-#include "base/value.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkable.hpp"
+#include "base/value.hpp"
 #include <boost/function.hpp>
 #include <vector>
 

diff --git a/lib/icinga/macroresolver.h b/lib/icinga/macroresolver.hpp
similarity index 93%
rename from lib/icinga/macroresolver.h
rename to lib/icinga/macroresolver.hpp
index 8637d4bf9406fec7d14fe7997655c35ca16813ef..6ad8a73ce33d8a03f7162fae0d832a745c82999a 100644 (file)
--- a/lib/icinga/macroresolver.h
+++ b/lib/icinga/macroresolver.hpp
@@ -20,10 +20,10 @@
 #ifndef MACRORESOLVER_H
 #define MACRORESOLVER_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkresult.h"
-#include "base/dictionary.h"
-#include "base/qstring.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkresult.hpp"
+#include "base/dictionary.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp
index 317b8c0cd795bd1bd397fdba46d7bfdf33185bdb..ea04f963003b9b04ef810232f6ebd359887494ac 100644 (file)
--- a/lib/icinga/notification-apply.cpp
+++ b/lib/icinga/notification-apply.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/notification.h"
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/notification.hpp"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index efadfbd632762d0bc307bd4490cf6353918e2579..d3d1615d983e10a7a73b1246b56922942c1c9095 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/notification.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/service.h"
-#include "config/configcompilercontext.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/exception.h"
-#include "base/initialize.h"
-#include "base/scriptvariable.h"
-#include "base/scriptfunction.h"
+#include "icinga/notification.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/service.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/exception.hpp"
+#include "base/initialize.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/scriptfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/notification.h b/lib/icinga/notification.hpp
similarity index 94%
rename from lib/icinga/notification.h
rename to lib/icinga/notification.hpp
index 58db371b6a53397c7f10c67f581a5da6c84a49e9..354f9d38b61f6afd9fcdd27b276464f0d047c59d 100644 (file)
--- a/lib/icinga/notification.h
+++ b/lib/icinga/notification.hpp
@@ -20,14 +20,14 @@
 #ifndef NOTIFICATION_H
 #define NOTIFICATION_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/notification.th"
-#include "icinga/user.h"
-#include "icinga/usergroup.h"
-#include "icinga/timeperiod.h"
-#include "icinga/checkresult.h"
-#include "remote/messageorigin.h"
-#include "base/array.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/notification.thpp"
+#include "icinga/user.hpp"
+#include "icinga/usergroup.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/checkresult.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/notification.ti b/lib/icinga/notification.ti
index 2565a9058b35afad886a10bca5c18428c694af64..f73af49a44656fd66f57f3d8fac42998bf3aabc4 100644 (file)
--- a/lib/icinga/notification.ti
+++ b/lib/icinga/notification.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/notificationcommand.cpp b/lib/icinga/notificationcommand.cpp
index 2d39de252b42dfbce2da42c1b1364bea0433e6ab..ab00c30a6d06a918ba6301d65553981c3dc568b7 100644 (file)
--- a/lib/icinga/notificationcommand.cpp
+++ b/lib/icinga/notificationcommand.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/notificationcommand.h"
+#include "icinga/notificationcommand.hpp"
 
 using namespace icinga;
 

diff --git a/lib/icinga/notificationcommand.h b/lib/icinga/notificationcommand.hpp
similarity index 96%
rename from lib/icinga/notificationcommand.h
rename to lib/icinga/notificationcommand.hpp
index e2c413180ca6b4840441982c626750f144acc097..361541f18c66389d1c72f298c724e5bf30167ef9 100644 (file)
--- a/lib/icinga/notificationcommand.h
+++ b/lib/icinga/notificationcommand.hpp
@@ -20,8 +20,8 @@
 #ifndef NOTIFICATIONCOMMAND_H
 #define NOTIFICATIONCOMMAND_H
 
-#include "icinga/notificationcommand.th"
-#include "icinga/notification.h"
+#include "icinga/notificationcommand.thpp"
+#include "icinga/notification.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/notificationcommand.ti b/lib/icinga/notificationcommand.ti
index 49475a0d53836231bb3a2c1b0a75de241e70b492..9ae71e593a05e604932d7c35a3badd198f9e1dd3 100644 (file)
--- a/lib/icinga/notificationcommand.ti
+++ b/lib/icinga/notificationcommand.ti
@@ -1,4 +1,4 @@
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/perfdatavalue.cpp b/lib/icinga/perfdatavalue.cpp
index 0c8b9e300442cb64691f4657ee57b59205ff9341..19493807053e46c0f40acb7346ee9bb35a099914 100644 (file)
--- a/lib/icinga/perfdatavalue.cpp
+++ b/lib/icinga/perfdatavalue.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.h"
-#include "base/convert.h"
+#include "icinga/perfdatavalue.hpp"
+#include "base/convert.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>

diff --git a/lib/icinga/perfdatavalue.h b/lib/icinga/perfdatavalue.hpp
similarity index 96%
rename from lib/icinga/perfdatavalue.h
rename to lib/icinga/perfdatavalue.hpp
index 6f38a78cc0eca43c7055bb747dda79b882908f7e..6d299e03c45cfa571ef84383334086d07af44a42 100644 (file)
--- a/lib/icinga/perfdatavalue.h
+++ b/lib/icinga/perfdatavalue.hpp
@@ -20,8 +20,8 @@
 #ifndef PERFDATAVALUE_H
 #define PERFDATAVALUE_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/perfdatavalue.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/perfdatavalue.thpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/perfdatavalue.ti b/lib/icinga/perfdatavalue.ti
index c2911d9d9720d566bf1f58e09db5d29628c97afc..0c6ad37029a2ba001c080148fc97a8751c95aee0 100644 (file)
--- a/lib/icinga/perfdatavalue.ti
+++ b/lib/icinga/perfdatavalue.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/pluginutility.cpp b/lib/icinga/pluginutility.cpp
index 4670f9eef04a046867181cb01a4ae0cc488fb24c..11628c763618f31f3dcebaba9614c6e9c7f187b2 100644 (file)
--- a/lib/icinga/pluginutility.cpp
+++ b/lib/icinga/pluginutility.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/pluginutility.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/perfdatavalue.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/process.h"
-#include "base/objectlock.h"
+#include "icinga/pluginutility.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/perfdatavalue.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/process.hpp"
+#include "base/objectlock.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>

diff --git a/lib/icinga/pluginutility.h b/lib/icinga/pluginutility.hpp
similarity index 94%
rename from lib/icinga/pluginutility.h
rename to lib/icinga/pluginutility.hpp
index 060e2215291c7e0829ef88edbb4419750634a990..1e8d6785a79ace5665123b134c44a10be72d7b73 100644 (file)
--- a/lib/icinga/pluginutility.h
+++ b/lib/icinga/pluginutility.hpp
@@ -20,10 +20,10 @@
 #ifndef PLUGINUTILITY_H
 #define PLUGINUTILITY_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkable.h"
-#include "icinga/checkcommand.h"
-#include "icinga/macroprocessor.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkable.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/macroprocessor.hpp"
 #include <vector>
 
 namespace icinga

diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp
index 1d05bf7a48db741bef7cc3ebe408f190a554b94a..8cc98ad54ec6ddf69267f2647648c030235f00e6 100644 (file)
--- a/lib/icinga/scheduleddowntime-apply.cpp
+++ b/lib/icinga/scheduleddowntime-apply.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/scheduleddowntime.h"
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
+#include "icinga/scheduleddowntime.hpp"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index 2397846a8a3a0206c0622100ca375443f82d9580..db07461390972c70eeb933292e99c17dba0ad0d6 100644 (file)
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/lib/icinga/scheduleddowntime.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/scheduleddowntime.h"
-#include "icinga/legacytimeperiod.h"
-#include "icinga/downtime.h"
-#include "icinga/service.h"
-#include "base/timer.h"
-#include "base/dynamictype.h"
-#include "base/initialize.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
+#include "icinga/scheduleddowntime.hpp"
+#include "icinga/legacytimeperiod.hpp"
+#include "icinga/downtime.hpp"
+#include "icinga/service.hpp"
+#include "base/timer.hpp"
+#include "base/dynamictype.hpp"
+#include "base/initialize.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/scheduleddowntime.h b/lib/icinga/scheduleddowntime.hpp
similarity index 95%
rename from lib/icinga/scheduleddowntime.h
rename to lib/icinga/scheduleddowntime.hpp
index b24a3cd3c178e45e9696054949ea92e8ed06fa25..f34246a32258672797b3ebde3f531778484d4db8 100644 (file)
--- a/lib/icinga/scheduleddowntime.h
+++ b/lib/icinga/scheduleddowntime.hpp
@@ -20,9 +20,9 @@
 #ifndef SCHEDULEDDOWNTIME_H
 #define SCHEDULEDDOWNTIME_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/scheduleddowntime.th"
-#include "icinga/checkable.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/scheduleddowntime.thpp"
+#include "icinga/checkable.hpp"
 #include <utility>
 
 namespace icinga

diff --git a/lib/icinga/scheduleddowntime.ti b/lib/icinga/scheduleddowntime.ti
index e5dafeacf88cbcce01b81ca4e60819c2bc626667..eead4fd5ab8ef728dcf283aa94ea502de07c57b3 100644 (file)
--- a/lib/icinga/scheduleddowntime.ti
+++ b/lib/icinga/scheduleddowntime.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp
index 6a4f4569cabcf460f602fb295fecacf4e1c3fe84..8a71e63df94ed2dbd6a69677fc5998c2e337b347 100644 (file)
--- a/lib/icinga/service-apply.cpp
+++ b/lib/icinga/service-apply.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index fda39ae77233356169616800c1fa3d83aec29e26..fd12f735b320dcab14cd971ba5cbe6f8d3f50194 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "icinga/servicegroup.h"
-#include "icinga/pluginutility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "icinga/service.hpp"
+#include "icinga/servicegroup.hpp"
+#include "icinga/pluginutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/bind/apply.hpp>
 

diff --git a/lib/icinga/service.h b/lib/icinga/service.hpp
similarity index 95%
rename from lib/icinga/service.h
rename to lib/icinga/service.hpp
index 7356150016ca8ba40c10a2b0cbb0e6a997297551..8219af06744129d311a391cc5a61414d56d9b696 100644 (file)
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.hpp
@@ -20,10 +20,10 @@
 #ifndef SERVICE_H
 #define SERVICE_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/service.th"
-#include "icinga/macroresolver.h"
-#include "icinga/host.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/service.thpp"
+#include "icinga/macroresolver.hpp"
+#include "icinga/host.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/service.ti b/lib/icinga/service.ti
index 67e056e703e164402fef61b56c249d4889381337..bef085fcfa5bd8fd6b9c18f4ebaac7d4b9c89942 100644 (file)
--- a/lib/icinga/service.ti
+++ b/lib/icinga/service.ti
@@ -1,7 +1,7 @@
-#include "icinga/checkable.h"
-#include "icinga/host.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/customvarobject.h"
+#include "icinga/checkable.hpp"
+#include "icinga/host.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index e1fd62c5ae510c26c6d77b94d200e1e5c8a3f3ae..ef44f4653f9e73e4012a01328b095ba716700f08 100644 (file)
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/servicegroup.h"
-#include "config/objectrule.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/servicegroup.hpp"
+#include "config/objectrule.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/servicegroup.h b/lib/icinga/servicegroup.hpp
similarity index 96%
rename from lib/icinga/servicegroup.h
rename to lib/icinga/servicegroup.hpp
index 82c7d5632b2c3420112992d1cc6a723c33c7fb76..b025a137c7fbbfe2d880b2c18c77582661f13c47 100644 (file)
--- a/lib/icinga/servicegroup.h
+++ b/lib/icinga/servicegroup.hpp
@@ -20,9 +20,9 @@
 #ifndef SERVICEGROUP_H
 #define SERVICEGROUP_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/servicegroup.th"
-#include "icinga/service.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/servicegroup.thpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/servicegroup.ti b/lib/icinga/servicegroup.ti
index 722b3de5916aa6127d5a64781ecdf92f18850829..f0ed6ea4295ae2fe60bb47a1ff536e9272545550 100644 (file)
--- a/lib/icinga/servicegroup.ti
+++ b/lib/icinga/servicegroup.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index e0cb6586c75de80a4ed3acebd897a0aa31a5e79c..53477b0e97d091e793c5e88df0b5a18786f88507 100644 (file)
--- a/lib/icinga/timeperiod.cpp
+++ b/lib/icinga/timeperiod.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/timeperiod.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "icinga/timeperiod.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/timeperiod.h b/lib/icinga/timeperiod.hpp
similarity index 97%
rename from lib/icinga/timeperiod.h
rename to lib/icinga/timeperiod.hpp
index 9ea8a970ed7f173a4650bbfc9410c87826884ba0..3e6d2a5dab1d402c03f0094a7e22aa74ec021af9 100644 (file)
--- a/lib/icinga/timeperiod.h
+++ b/lib/icinga/timeperiod.hpp
@@ -20,8 +20,8 @@
 #ifndef TIMEPERIOD_H
 #define TIMEPERIOD_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/timeperiod.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/timeperiod.thpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/timeperiod.ti b/lib/icinga/timeperiod.ti
index dc826b26a506ea65b9fc6d08efb4af3b0b7d86fa..a9cae8379fd2a7a7a53a2814a5f629e465c3c29f 100644 (file)
--- a/lib/icinga/timeperiod.ti
+++ b/lib/icinga/timeperiod.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 5a96faae9488ff322ab91ad06c2ab3e0cf2ce5ad..c7f5020d0e8138796ca5bd91b0d89f6366341c05 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/user.h"
-#include "icinga/notification.h"
-#include "icinga/usergroup.h"
-#include "config/configcompilercontext.h"
-#include "base/scriptfunction.h"
-#include "base/objectlock.h"
+#include "icinga/user.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/usergroup.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/user.h b/lib/icinga/user.hpp
similarity index 94%
rename from lib/icinga/user.h
rename to lib/icinga/user.hpp
index 9a0a816f4880d1b75664d43a98545468ec2d09a1..af64c4bac05342ebfc1e33dbc0c4f592a8ecfc17 100644 (file)
--- a/lib/icinga/user.h
+++ b/lib/icinga/user.hpp
@@ -20,10 +20,10 @@
 #ifndef USER_H
 #define USER_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/user.th"
-#include "icinga/timeperiod.h"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/user.thpp"
+#include "icinga/timeperiod.hpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/user.ti b/lib/icinga/user.ti
index cb2ddf0add42ac60f3f3334048e03efd132f5ec9..649e9fda24f93601e13b6501cfbfb0ebbccb1154 100644 (file)
--- a/lib/icinga/user.ti
+++ b/lib/icinga/user.ti
@@ -1,5 +1,5 @@
-#include "icinga/customvarobject.h"
-#include "base/array.h"
+#include "icinga/customvarobject.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index c5d31dac7a7321ab411169a39434e0092e311c99..fa085f5979353c3f8f9d10857b406c38408c4ef3 100644 (file)
--- a/lib/icinga/usergroup.cpp
+++ b/lib/icinga/usergroup.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/usergroup.h"
-#include "config/objectrule.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/usergroup.hpp"
+#include "config/objectrule.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/icinga/usergroup.h b/lib/icinga/usergroup.hpp
similarity index 96%
rename from lib/icinga/usergroup.h
rename to lib/icinga/usergroup.hpp
index 96a4aabf8adf0c31dba6e0976bcc4ffad172917d..9e9d6c1edb31695c9fc1bd68d15951182eb0fed5 100644 (file)
--- a/lib/icinga/usergroup.h
+++ b/lib/icinga/usergroup.hpp
@@ -20,9 +20,9 @@
 #ifndef USERGROUP_H
 #define USERGROUP_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/usergroup.th"
-#include "icinga/user.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/usergroup.thpp"
+#include "icinga/user.hpp"
 
 namespace icinga
 {

diff --git a/lib/icinga/usergroup.ti b/lib/icinga/usergroup.ti
index ba0967de06ceb70fac6a550fc8b54efaefeef680..202ff92deb57f9920d361ec583f84d4796fba2e5 100644 (file)
--- a/lib/icinga/usergroup.ti
+++ b/lib/icinga/usergroup.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/castfuncs.cpp b/lib/methods/castfuncs.cpp
index c4c7a7aa1deab11db878d1e140933fa01e2ab709..a925edd9b88688a5cc100e6229326cb8656d1414 100644 (file)
--- a/lib/methods/castfuncs.cpp
+++ b/lib/methods/castfuncs.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/castfuncs.h"
-#include "base/scriptfunction.h"
+#include "methods/castfuncs.hpp"
+#include "base/scriptfunction.hpp"
 
 using namespace icinga;
 

diff --git a/lib/methods/castfuncs.h b/lib/methods/castfuncs.hpp
similarity index 96%
rename from lib/methods/castfuncs.h
rename to lib/methods/castfuncs.hpp
index cd3ea4c9d82c5894f5fd6e2b3577f13c1d8799ee..37e4eb2b632caf1b36ff1a01157d21219544e4ec 100644 (file)
--- a/lib/methods/castfuncs.h
+++ b/lib/methods/castfuncs.hpp
@@ -20,8 +20,8 @@
 #ifndef CASTFUNCS_H
 #define CASTFUNCS_H
 
-#include "methods/i2-methods.h"
-#include "base/qstring.h"
+#include "methods/i2-methods.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/clrchecktask.cpp b/lib/methods/clrchecktask.cpp
index 9d617844656dbd480674a8832c839c820fb3827b..b65eb9c8e4160b2ea45f83ddd9568f1e58bebcf5 100644 (file)
--- a/lib/methods/clrchecktask.cpp
+++ b/lib/methods/clrchecktask.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/clrchecktask.h"
-#include "icinga/pluginutility.h"
-#include "icinga/checkcommand.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/clrchecktask.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/foreach.hpp>

diff --git a/lib/methods/clrchecktask.h b/lib/methods/clrchecktask.hpp
similarity index 95%
rename from lib/methods/clrchecktask.h
rename to lib/methods/clrchecktask.hpp
index 28f35f549021810b99bac1d23db4fbfc34f619ae..5448030c6147fd6bb9c34f6c3fbe5f04c5089743 100644 (file)
--- a/lib/methods/clrchecktask.h
+++ b/lib/methods/clrchecktask.hpp
@@ -20,9 +20,9 @@
 #ifndef CLRCHECKTASK_H
 #define CLRCHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "base/process.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "base/process.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/clusterchecktask.cpp b/lib/methods/clusterchecktask.cpp
index ff69a40df7753e8d76160d228de6cdec6858661a..96a512649f5f47de820419069f367041e0d883cf 100644 (file)
--- a/lib/methods/clusterchecktask.cpp
+++ b/lib/methods/clusterchecktask.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/clusterchecktask.h"
-#include "remote/apilistener.h"
-#include "remote/endpoint.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/icingaapplication.h"
-#include "base/application.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/scriptfunction.h"
-#include "base/dynamictype.h"
+#include "methods/clusterchecktask.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/endpoint.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/lib/methods/clusterchecktask.h b/lib/methods/clusterchecktask.hpp
similarity index 98%
rename from lib/methods/clusterchecktask.h
rename to lib/methods/clusterchecktask.hpp
index 0c2872e5a01da4d93fe10ae819c9ccd86f47cb44..9ca3b3780dcaee85abd5834638c764d213c0a6f8 100644 (file)
--- a/lib/methods/clusterchecktask.h
+++ b/lib/methods/clusterchecktask.hpp
@@ -20,7 +20,7 @@
 #ifndef CLUSTERCHECKTASK_H
 #define CLUSTERCHECKTASK_H
 
-#include "icinga/service.h"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/i2-methods.h b/lib/methods/i2-methods.hpp
similarity index 98%
rename from lib/methods/i2-methods.h
rename to lib/methods/i2-methods.hpp
index 72f37b3de875fbdbf1bbd8850f047ae3fbe1d610..68761ddb6ca5fd9a8d02626dc9d33bd55a9651fd 100644 (file)
--- a/lib/methods/i2-methods.h
+++ b/lib/methods/i2-methods.hpp
@@ -27,7 +27,7 @@
  * handlers, etc.).
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_METHODS_BUILD
 #      define I2_METHODS_API I2_EXPORT

diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp
index d5045ce57c5e97104d0afa13576dfb69ad844b09..4b941caa6938224f9b04549aa4c635e4b6aca5a9 100644 (file)
--- a/lib/methods/icingachecktask.cpp
+++ b/lib/methods/icingachecktask.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/icingachecktask.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/icingaapplication.h"
-#include "base/application.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/scriptfunction.h"
-#include "base/dynamictype.h"
+#include "methods/icingachecktask.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/dynamictype.hpp"
 
 using namespace icinga;
 

diff --git a/lib/methods/icingachecktask.h b/lib/methods/icingachecktask.hpp
similarity index 96%
rename from lib/methods/icingachecktask.h
rename to lib/methods/icingachecktask.hpp
index 64aa6fbd1ada22f78533aed63f53e3cb261566d7..b3c1d2bcfcfbe4cce2705ea9b01b6c9a9d7f70b1 100644 (file)
--- a/lib/methods/icingachecktask.h
+++ b/lib/methods/icingachecktask.hpp
@@ -20,8 +20,8 @@
 #ifndef ICINGACHECKTASK_H
 #define ICINGACHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp
index ad9a13384ab81a97c1059c04f741166b12d09422..0f25559f74f3f6a055c12707c5a6eca65fa10124 100644 (file)
--- a/lib/methods/nullchecktask.cpp
+++ b/lib/methods/nullchecktask.cpp
@@ -20,11 +20,11 @@
 #ifndef _WIN32
 #      include <stdlib.h>
 #endif /* _WIN32 */
-#include "methods/nullchecktask.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
+#include "methods/nullchecktask.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 

diff --git a/lib/methods/nullchecktask.h b/lib/methods/nullchecktask.hpp
similarity index 95%
rename from lib/methods/nullchecktask.h
rename to lib/methods/nullchecktask.hpp
index 9f5e104df641c6eb50820606d15d27040c6ef15c..6587e71e24daf158d1b40a33ae8e77375f76213a 100644 (file)
--- a/lib/methods/nullchecktask.h
+++ b/lib/methods/nullchecktask.hpp
@@ -20,9 +20,9 @@
 #ifndef NULLCHECKTASK_H
 #define NULLCHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
-#include "base/dictionary.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/nulleventtask.cpp b/lib/methods/nulleventtask.cpp
index 68e00ac73845ff816f1fa56f4339ac477e00d17c..39dfaf854b099506575595eea197d6fb07e90db6 100644 (file)
--- a/lib/methods/nulleventtask.cpp
+++ b/lib/methods/nulleventtask.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/nulleventtask.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
+#include "methods/nulleventtask.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 

diff --git a/lib/methods/nulleventtask.h b/lib/methods/nulleventtask.hpp
similarity index 94%
rename from lib/methods/nulleventtask.h
rename to lib/methods/nulleventtask.hpp
index 286ae140f1afcc20c09f86f333516a92a12355c5..cc9320104bc831dade196515f07507f4093f47ad 100644 (file)
--- a/lib/methods/nulleventtask.h
+++ b/lib/methods/nulleventtask.hpp
@@ -20,9 +20,9 @@
 #ifndef NULLEVENTTASK_H
 #define NULLEVENTTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
-#include "base/dictionary.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/pluginchecktask.cpp b/lib/methods/pluginchecktask.cpp
index 0908adfe5f97d0824e2476aeeeb5b6c0377325c5..7ba0c64969687d840f3457cab26f71c0bf13433c 100644 (file)
--- a/lib/methods/pluginchecktask.cpp
+++ b/lib/methods/pluginchecktask.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/pluginchecktask.h"
-#include "icinga/pluginutility.h"
-#include "icinga/checkcommand.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/pluginchecktask.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/foreach.hpp>

diff --git a/lib/methods/pluginchecktask.h b/lib/methods/pluginchecktask.hpp
similarity index 95%
rename from lib/methods/pluginchecktask.h
rename to lib/methods/pluginchecktask.hpp
index 0527983f3375ac9a91c4376e392e82ad97353a91..f92e33a663bb48c4ecadf9b409b7546e20106a04 100644 (file)
--- a/lib/methods/pluginchecktask.h
+++ b/lib/methods/pluginchecktask.hpp
@@ -20,9 +20,9 @@
 #ifndef PLUGINCHECKTASK_H
 #define PLUGINCHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "base/process.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "base/process.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/plugineventtask.cpp b/lib/methods/plugineventtask.cpp
index 7773e04b3e85d3cf9391c05ea8889b7a271a8894..033616c1f1a0422f270b8cb8b83289af2c4961f6 100644 (file)
--- a/lib/methods/plugineventtask.cpp
+++ b/lib/methods/plugineventtask.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/plugineventtask.h"
-#include "icinga/eventcommand.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/pluginutility.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/plugineventtask.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/methods/plugineventtask.h b/lib/methods/plugineventtask.hpp
similarity index 96%
rename from lib/methods/plugineventtask.h
rename to lib/methods/plugineventtask.hpp
index ae9f5b3ec9cd5975b3dcbd4d526c81eb8fddc185..ce57021b07e78ff8144e249c1a41e23629892a8f 100644 (file)
--- a/lib/methods/plugineventtask.h
+++ b/lib/methods/plugineventtask.hpp
@@ -20,8 +20,8 @@
 #ifndef PLUGINEVENTTASK_H
 #define PLUGINEVENTTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/pluginnotificationtask.cpp b/lib/methods/pluginnotificationtask.cpp
index 996c2c5ee26f7405261ab03ad79b0bca2c61baf7..6e25ccd71529a7c91462fcc9c52934a3c4e0cdf7 100644 (file)
--- a/lib/methods/pluginnotificationtask.cpp
+++ b/lib/methods/pluginnotificationtask.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/pluginnotificationtask.h"
-#include "icinga/notification.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/pluginutility.h"
-#include "icinga/service.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/pluginnotificationtask.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/service.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/methods/pluginnotificationtask.h b/lib/methods/pluginnotificationtask.hpp
similarity index 94%
rename from lib/methods/pluginnotificationtask.h
rename to lib/methods/pluginnotificationtask.hpp
index 20e1d4819401ec69da01dcbc8c3ae1a2332b22e6..a7e843d19ea636285fc34a422f8629f8813a6d28 100644 (file)
--- a/lib/methods/pluginnotificationtask.h
+++ b/lib/methods/pluginnotificationtask.hpp
@@ -20,10 +20,10 @@
 #ifndef PLUGINNOTIFICATIONTASK_H
 #define PLUGINNOTIFICATIONTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/notification.h"
-#include "icinga/service.h"
-#include "base/process.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/service.hpp"
+#include "base/process.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp
index a8ad402bc6382349ce22cafcd05f611c695a102f..1ea4d3c7e66e1d74b5c50af55f7316f3347169b2 100644 (file)
--- a/lib/methods/randomchecktask.cpp
+++ b/lib/methods/randomchecktask.cpp
@@ -20,12 +20,12 @@
 #ifndef _WIN32
 #      include <stdlib.h>
 #endif /* _WIN32 */
-#include "icinga/icingaapplication.h"
-#include "methods/randomchecktask.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
+#include "icinga/icingaapplication.hpp"
+#include "methods/randomchecktask.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 

diff --git a/lib/methods/randomchecktask.h b/lib/methods/randomchecktask.hpp
similarity index 96%
rename from lib/methods/randomchecktask.h
rename to lib/methods/randomchecktask.hpp
index e26c06817fc14616aed706f4b9b350b3fa727451..d026bf7fe8b220958dcadb93122664f4d5560042 100644 (file)
--- a/lib/methods/randomchecktask.h
+++ b/lib/methods/randomchecktask.hpp
@@ -20,8 +20,8 @@
 #ifndef RANDOMCHECKTASK_H
 #define RANDOMCHECKTASK_H
 
-#include "icinga/service.h"
-#include "base/dictionary.h"
+#include "icinga/service.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/timeperiodtask.cpp b/lib/methods/timeperiodtask.cpp
index 139f4716a1581bcf11185e4643c6a1b35e349244..7a21c0dab199b0bfce644f5d4bca044fb36b95e3 100644 (file)
--- a/lib/methods/timeperiodtask.cpp
+++ b/lib/methods/timeperiodtask.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/timeperiodtask.h"
-#include "base/scriptfunction.h"
+#include "methods/timeperiodtask.hpp"
+#include "base/scriptfunction.hpp"
 
 using namespace icinga;
 

diff --git a/lib/methods/timeperiodtask.h b/lib/methods/timeperiodtask.hpp
similarity index 98%
rename from lib/methods/timeperiodtask.h
rename to lib/methods/timeperiodtask.hpp
index 3334e52bd5f3d633eabd153f2e2df2cec1b8cade..1cc1e46a7028e66c0e48729a9aa586b37aded306 100644 (file)
--- a/lib/methods/timeperiodtask.h
+++ b/lib/methods/timeperiodtask.hpp
@@ -20,7 +20,7 @@
 #ifndef TIMEPERIODTASK_H
 #define TIMEPERIODTASK_H
 
-#include "icinga/timeperiod.h"
+#include "icinga/timeperiod.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt
index f2c1ff0c3394d32a8fa3772780a81c20f5e7a427..5bff6e4da3d5b13abc956a1d23ea2d4b3da65ab2 100644 (file)
--- a/lib/remote/CMakeLists.txt
+++ b/lib/remote/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(apilistener.ti apilistener.th)
-mkclass_target(endpoint.ti endpoint.th)
-mkclass_target(zone.ti zone.th)
+mkclass_target(apilistener.ti apilistener.thpp)
+mkclass_target(endpoint.ti endpoint.thpp)
+mkclass_target(zone.ti zone.thpp)
 
 mkembedconfig_target(remote-type.conf remote-type.cpp)
 
 add_library(remote SHARED
   apiclient.cpp apifunction.cpp apilistener.cpp apilistener-sync.cpp
-  apilistener.th authority.cpp endpoint.cpp endpoint.th jsonrpc.cpp
-  messageorigin.cpp remote-type.cpp zone.cpp zone.th
+  apilistener.thpp authority.cpp endpoint.cpp endpoint.thpp jsonrpc.cpp
+  messageorigin.cpp remote-type.cpp zone.cpp zone.thpp
 )
 
 include_directories(${Boost_INCLUDE_DIRS})

diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp
index 8ab7a63de1c0570bfd37e9fabc14171235d0f2a9..a3b518b1c925be5f9ba24992fc8474d29764a3d5 100644 (file)
--- a/lib/remote/apiclient.cpp
+++ b/lib/remote/apiclient.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apiclient.h"
-#include "remote/apilistener.h"
-#include "remote/apifunction.h"
-#include "remote/jsonrpc.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/initialize.h"
+#include "remote/apiclient.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/apifunction.hpp"
+#include "remote/jsonrpc.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/initialize.hpp"
 
 using namespace icinga;
 

diff --git a/lib/remote/apiclient.h b/lib/remote/apiclient.hpp
similarity index 95%
rename from lib/remote/apiclient.h
rename to lib/remote/apiclient.hpp
index 9180574dd0f017493f6959de6931089067f8eaeb..3809f85ca5b1840ddaf6a3fbe5cd9c965ae508e4 100644 (file)
--- a/lib/remote/apiclient.h
+++ b/lib/remote/apiclient.hpp
@@ -20,10 +20,10 @@
 #ifndef APICLIENT_H
 #define APICLIENT_H
 
-#include "remote/endpoint.h"
-#include "base/stream.h"
-#include "base/timer.h"
-#include "remote/i2-remote.h"
+#include "remote/endpoint.hpp"
+#include "base/stream.hpp"
+#include "base/timer.hpp"
+#include "remote/i2-remote.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/apifunction.cpp b/lib/remote/apifunction.cpp
index 9e15f7eff7e481e8bc7cc57fcbd886ee0ef54aab..bbb6fa4fc6d5c548a3abaf3c58190fad3d5d0a72 100644 (file)
--- a/lib/remote/apifunction.cpp
+++ b/lib/remote/apifunction.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apifunction.h"
-#include "base/singleton.h"
+#include "remote/apifunction.hpp"
+#include "base/singleton.hpp"
 
 using namespace icinga;
 

diff --git a/lib/remote/apifunction.h b/lib/remote/apifunction.hpp
similarity index 94%
rename from lib/remote/apifunction.h
rename to lib/remote/apifunction.hpp
index 46ec2a5a60bf40fa6c5a8f982d55bddcf4765bc1..72da522d4d26e2b5cfcfc047085188c2730e9ebd 100644 (file)
--- a/lib/remote/apifunction.h
+++ b/lib/remote/apifunction.hpp
@@ -20,11 +20,11 @@
 #ifndef APIFUNCTION_H
 #define APIFUNCTION_H
 
-#include "remote/i2-remote.h"
-#include "remote/messageorigin.h"
-#include "base/registry.h"
-#include "base/value.h"
-#include "base/dictionary.h"
+#include "remote/i2-remote.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/registry.hpp"
+#include "base/value.hpp"
+#include "base/dictionary.hpp"
 #include <vector>
 #include <boost/function.hpp>
 

diff --git a/lib/remote/apilistener-sync.cpp b/lib/remote/apilistener-sync.cpp
index 1251938c107b45e08438f24a5ecda02bb1b5a4bd..6d0a895991e33cf2b2208849371e97bfd61944c9 100644 (file)
--- a/lib/remote/apilistener-sync.cpp
+++ b/lib/remote/apilistener-sync.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apilistener.h"
-#include "remote/apifunction.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
+#include "remote/apilistener.hpp"
+#include "remote/apifunction.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 #include <fstream>
 

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 24d231918f5364a6ff9f5cb24c9b0c075df424c6..c6816ab7b4eb874927141ce896ecaa47634603cc 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apilistener.h"
-#include "remote/apiclient.h"
-#include "remote/endpoint.h"
-#include "base/convert.h"
-#include "base/netstring.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/stdiostream.h"
-#include "base/application.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
+#include "remote/apilistener.hpp"
+#include "remote/apiclient.hpp"
+#include "remote/endpoint.hpp"
+#include "base/convert.hpp"
+#include "base/netstring.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/stdiostream.hpp"
+#include "base/application.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
 #include <fstream>
 
 using namespace icinga;

diff --git a/lib/remote/apilistener.h b/lib/remote/apilistener.hpp
similarity index 93%
rename from lib/remote/apilistener.h
rename to lib/remote/apilistener.hpp
index 95638bb2e5797f5e7246964ce05ae6a0c4ed2136..5cd0c041151de50bfc7054d0dbd91bc69008b5bf 100644 (file)
--- a/lib/remote/apilistener.h
+++ b/lib/remote/apilistener.hpp
@@ -20,15 +20,15 @@
 #ifndef APILISTENER_H
 #define APILISTENER_H
 
-#include "remote/apilistener.th"
-#include "remote/apiclient.h"
-#include "remote/endpoint.h"
-#include "remote/messageorigin.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
-#include "base/workqueue.h"
-#include "base/tcpsocket.h"
-#include "base/tlsstream.h"
+#include "remote/apilistener.thpp"
+#include "remote/apiclient.hpp"
+#include "remote/endpoint.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
+#include "base/workqueue.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/tlsstream.hpp"
 #include <set>
 
 namespace icinga

diff --git a/lib/remote/apilistener.ti b/lib/remote/apilistener.ti
index be7cd6b15db67091141bb736d5bc73b19d9e95f2..75a3e1195e668a73b6fd56348028ea25b6cecede 100644 (file)
--- a/lib/remote/apilistener.ti
+++ b/lib/remote/apilistener.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/authority.cpp b/lib/remote/authority.cpp
index 8ea18752792858eea4e44a8039bb08f1f8a84acb..a9aa49c5ea85f47b157280e194ac224ecf594ade 100644 (file)
--- a/lib/remote/authority.cpp
+++ b/lib/remote/authority.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/zone.h"
-#include "remote/apilistener.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/timer.h"
+#include "remote/zone.hpp"
+#include "remote/apilistener.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/timer.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp
index 535516b7ce444e8b888cbf2c0275afd3807d6c31..eb50fcec1e15853959541898dbb076c95d8fa9b1 100644 (file)
--- a/lib/remote/endpoint.cpp
+++ b/lib/remote/endpoint.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/endpoint.h"
-#include "remote/apilistener.h"
-#include "remote/apiclient.h"
-#include "remote/zone.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "remote/endpoint.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/apiclient.hpp"
+#include "remote/zone.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/remote/endpoint.h b/lib/remote/endpoint.hpp
similarity index 97%
rename from lib/remote/endpoint.h
rename to lib/remote/endpoint.hpp
index eecec73bf90984ae4399ce95244c05570db33f44..d732600ba68730fe6980bb98866bb0e4371a0f71 100644 (file)
--- a/lib/remote/endpoint.h
+++ b/lib/remote/endpoint.hpp
@@ -20,8 +20,8 @@
 #ifndef ENDPOINT_H
 #define ENDPOINT_H
 
-#include "remote/i2-remote.h"
-#include "remote/endpoint.th"
+#include "remote/i2-remote.hpp"
+#include "remote/endpoint.thpp"
 #include <set>
 
 namespace icinga

diff --git a/lib/remote/endpoint.ti b/lib/remote/endpoint.ti
index 6e1a521d89686a5df2221ae4f4fbdf407961d88c..dc0a9029e827c0fba482930af54cbd2933a71edd 100644 (file)
--- a/lib/remote/endpoint.ti
+++ b/lib/remote/endpoint.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/i2-remote.h b/lib/remote/i2-remote.hpp
similarity index 98%
rename from lib/remote/i2-remote.h
rename to lib/remote/i2-remote.hpp
index 045d89476b628edc92a0e57909ed5280903790ba..b9b16c7ccb452469775d1681bc3190745dccd54c 100644 (file)
--- a/lib/remote/i2-remote.h
+++ b/lib/remote/i2-remote.hpp
@@ -26,7 +26,7 @@
  * The Icinga library implements remote cluster functionality.
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_REMOTE_BUILD
 #      define I2_REMOTE_API I2_EXPORT

diff --git a/lib/remote/jsonrpc.cpp b/lib/remote/jsonrpc.cpp
index 55f844d4da9bc2a7342422295d51bb291e7adc6f..1ee32d703f6de4af62fe977b67397ffc2d8baaf8 100644 (file)
--- a/lib/remote/jsonrpc.cpp
+++ b/lib/remote/jsonrpc.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/jsonrpc.h"
-#include "base/netstring.h"
-#include "base/serializer.h"
+#include "remote/jsonrpc.hpp"
+#include "base/netstring.hpp"
+#include "base/serializer.hpp"
 //#include <iostream>
 
 using namespace icinga;

diff --git a/lib/remote/jsonrpc.h b/lib/remote/jsonrpc.hpp
similarity index 95%
rename from lib/remote/jsonrpc.h
rename to lib/remote/jsonrpc.hpp
index 47782356a44a3509c5ab6dab2e6ca23d1d619c87..b37455adab3f86c0b2725533ab01e8baa5a7b7bf 100644 (file)
--- a/lib/remote/jsonrpc.h
+++ b/lib/remote/jsonrpc.hpp
@@ -20,9 +20,9 @@
 #ifndef JSONRPC_H
 #define JSONRPC_H
 
-#include "base/stream.h"
-#include "base/dictionary.h"
-#include "remote/i2-remote.h"
+#include "base/stream.hpp"
+#include "base/dictionary.hpp"
+#include "remote/i2-remote.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/messageorigin.cpp b/lib/remote/messageorigin.cpp
index e6a02bf97825ab7d9e0b33da2c736d4e9ef8ba92..7295df4e42d0d2f213062677602e01221bb90c08 100644 (file)
--- a/lib/remote/messageorigin.cpp
+++ b/lib/remote/messageorigin.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/messageorigin.h"
+#include "remote/messageorigin.hpp"
 
 using namespace icinga;
 

diff --git a/lib/remote/messageorigin.h b/lib/remote/messageorigin.hpp
similarity index 96%
rename from lib/remote/messageorigin.h
rename to lib/remote/messageorigin.hpp
index e3ab713584ad2fead81b3c7a747b8c54dfbfd8ec..1337560a4019df32c5e716dfde4fe6e9646a057a 100644 (file)
--- a/lib/remote/messageorigin.h
+++ b/lib/remote/messageorigin.hpp
@@ -20,8 +20,8 @@
 #ifndef MESSAGEORIGIN_H
 #define MESSAGEORIGIN_H
 
-#include "remote/zone.h"
-#include "remote/apiclient.h"
+#include "remote/zone.hpp"
+#include "remote/apiclient.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index c7fd9351064dd06ff741f03d69826a3295441211..ac73307c3d8c993ed4e7b9c260427dc883102188 100644 (file)
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/zone.h"
+#include "remote/zone.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;

diff --git a/lib/remote/zone.h b/lib/remote/zone.hpp
similarity index 95%
rename from lib/remote/zone.h
rename to lib/remote/zone.hpp
index b7222e0a6992935eed694d797980fb0a97648950..7b484bdaf2b3b06747923a08c2aa6bc0406c6dcc 100644 (file)
--- a/lib/remote/zone.h
+++ b/lib/remote/zone.hpp
@@ -20,9 +20,9 @@
 #ifndef ZONE_H
 #define ZONE_H
 
-#include "remote/i2-remote.h"
-#include "remote/zone.th"
-#include "remote/endpoint.h"
+#include "remote/i2-remote.hpp"
+#include "remote/zone.thpp"
+#include "remote/endpoint.hpp"
 
 namespace icinga
 {

diff --git a/lib/remote/zone.ti b/lib/remote/zone.ti
index 7c1b152adfa961cf88f7afe9765a05933a974e04..d2f3433f047e93af80278f20bac21f73d0024e56 100644 (file)
--- a/lib/remote/zone.ti
+++ b/lib/remote/zone.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

diff --git a/test/base-array.cpp b/test/base-array.cpp
index 2640fa4d775b50e81fea00e0be82c0c90339ce03..da84eebdd5e073f3f17df1ba98ba91ce7b79aa6a 100644 (file)
--- a/test/base-array.cpp
+++ b/test/base-array.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/serializer.h"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/serializer.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/test/base-convert.cpp b/test/base-convert.cpp
index 40ed1b7473b16733e4e56617d67b924e7d3ed7a1..7aaecf836044ef2900c7676eb86349b6c6516aac 100644 (file)
--- a/test/base-convert.cpp
+++ b/test/base-convert.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/convert.h"
-#include "base/object.h"
+#include "base/convert.hpp"
+#include "base/object.hpp"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 

diff --git a/test/base-dictionary.cpp b/test/base-dictionary.cpp
index 81d754612e521fd34989b7b2acca6dd32e6e835a..eed1229c6c993ab38b59b7b63e652e4c8ada1bfc 100644 (file)
--- a/test/base-dictionary.cpp
+++ b/test/base-dictionary.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/serializer.h"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/serializer.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>

diff --git a/test/base-fifo.cpp b/test/base-fifo.cpp
index 5997af2de5575210e1e29cd03b75924e31a4ff24..abe88b1c82af771dee228b2f9bace68231bf86c3 100644 (file)
--- a/test/base-fifo.cpp
+++ b/test/base-fifo.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/fifo.h"
-#include "base/objectlock.h"
+#include "base/fifo.hpp"
+#include "base/objectlock.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/test/base-match.cpp b/test/base-match.cpp
index b6f25f8b1990a0da6928a7d4d872852b462a3ef1..796ad45ab5423080a39c8a44f873dad7f77b7dfa 100644 (file)
--- a/test/base-match.cpp
+++ b/test/base-match.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/utility.h"
+#include "base/utility.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;

diff --git a/test/base-netstring.cpp b/test/base-netstring.cpp
index e5cd70ecc25f9b3bbb21ddd501dfc382c81ef009..21c5d386f75e2234602bb6f85551819045b0ff1f 100644 (file)
--- a/test/base-netstring.cpp
+++ b/test/base-netstring.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/netstring.h"
-#include "base/fifo.h"
-#include "base/qstring.h"
+#include "base/netstring.hpp"
+#include "base/fifo.hpp"
+#include "base/qstring.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;

diff --git a/test/base-object.cpp b/test/base-object.cpp
index 2db4c8fbe284f53ae311a3e44512afc46f3f5097..8be052703201e5eb63c41fe0188f423e9df97e5a 100644 (file)
--- a/test/base-object.cpp
+++ b/test/base-object.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/object.h"
-#include "base/value.h"
+#include "base/object.hpp"
+#include "base/value.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;

diff --git a/test/base-serialize.cpp b/test/base-serialize.cpp
index d483c97c0cd511e19164b299366eed82beb7622a..1e9b8698551e856034bf7eced5eb7c22de1e4bb9 100644 (file)
--- a/test/base-serialize.cpp
+++ b/test/base-serialize.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.h"
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/serializer.h"
-#include "base/array.h"
-#include "base/dictionary.h"
+#include "icinga/perfdatavalue.hpp"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/serializer.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>

diff --git a/test/base-shellescape.cpp b/test/base-shellescape.cpp
index d05790e5e243917a2b3e7afc875f396ae840d481..0b55983bbf0debf1ff8884f55e061dafab9d2e17 100644 (file)
--- a/test/base-shellescape.cpp
+++ b/test/base-shellescape.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/utility.h"
+#include "base/utility.hpp"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 

diff --git a/test/base-stacktrace.cpp b/test/base-stacktrace.cpp
index c5c48b3f5d42adbaacbefd73b5ac694caca6a82f..d26ce9b82bb2695c13eea48af23232d16bf4ae9c 100644 (file)
--- a/test/base-stacktrace.cpp
+++ b/test/base-stacktrace.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stacktrace.h"
+#include "base/stacktrace.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;

diff --git a/test/base-stream.cpp b/test/base-stream.cpp
index 71fa6408f134578c16c7c18bf9e8e71896bcdbcd..76e70c2f4557f0294caa371dbe01b0885d1412b6 100644 (file)
--- a/test/base-stream.cpp
+++ b/test/base-stream.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stdiostream.h"
-#include "base/qstring.h"
+#include "base/stdiostream.hpp"
+#include "base/qstring.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <sstream>

diff --git a/test/base-string.cpp b/test/base-string.cpp
index 569ec139cb5cda42e87235dd77bf41d0df9ed0a7..02563e35c9537c5512fa32a52db4895f85ee0ef9 100644 (file)
--- a/test/base-string.cpp
+++ b/test/base-string.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/qstring.h"
+#include "base/qstring.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/test/base-timer.cpp b/test/base-timer.cpp
index 1dfaa19f4b420fe89d512cee8ee35c523fa8063b..d7b1380c773d06aeb9c2c435240e2d26ce9c4a84 100644 (file)
--- a/test/base-timer.cpp
+++ b/test/base-timer.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/application.h"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 

diff --git a/test/base-type.cpp b/test/base-type.cpp
index a8263b7888eb88fd74fb1312f9ca60f4546e03b7..8a4ee5e310f941bfce4327e9182eccb48dd4926c 100644 (file)
--- a/test/base-type.cpp
+++ b/test/base-type.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.h"
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/application.h"
-#include "base/type.h"
+#include "icinga/perfdatavalue.hpp"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/application.hpp"
+#include "base/type.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>

diff --git a/test/base-value.cpp b/test/base-value.cpp
index 83817abcaa84136f48aedc1ded83abd796a7b651..eda394f0b7524b9088bd6880ad46069b6685db24 100644 (file)
--- a/test/base-value.cpp
+++ b/test/base-value.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/value.h"
+#include "base/value.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;

diff --git a/test/icinga-perfdata.cpp b/test/icinga-perfdata.cpp
index e9be44fdd36f6119465991a1bf643ffacf28708b..acca81a00d600006be1c1651dc2b4dfd9b85ffa4 100644 (file)
--- a/test/icinga-perfdata.cpp
+++ b/test/icinga-perfdata.cpp
@@ -17,7 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/pluginutility.cpp"
+#include "icinga/perfdatavalue.hpp"
+#include "icinga/pluginutility.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;

diff --git a/test/test.cpp b/test/test.cpp
index f4520e7dc3ad947b764179e681ef31d52e810e55..af024d66ef06470396d3283f1efa0f58febb91fd 100644 (file)
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -20,7 +20,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE icinga2_test
 
-#include "base/application.h"
+#include "base/application.hpp"
 #include <BoostTestTargetConfig.h>
 
 using namespace icinga;

diff --git a/third-party/cJSON/cJSON.h b/third-party/cJSON/cJSON.h
index d9e5b795621e378349aa156a1a966ee052fa6d9c..5d0555aff36dc3410271d54be075c8cc38b08b73 100644 (file)
--- a/third-party/cJSON/cJSON.h
+++ b/third-party/cJSON/cJSON.h
@@ -23,7 +23,7 @@
 #ifndef cJSON__h
 #define cJSON__h
 
-#include "base/visibility.h"
+#include "base/visibility.hpp"
 
 #ifdef I2_CJSON_BUILD
 #      define I2_CJSON_API I2_EXPORT

diff --git a/third-party/execvpe/execvpe.h b/third-party/execvpe/execvpe.h
index b3c23b0fcc13b6a2781d1079188641055c3c1019..1593171fd68a166a2f0455c80d0878d9d6f25dee 100644 (file)
--- a/third-party/execvpe/execvpe.h
+++ b/third-party/execvpe/execvpe.h
@@ -20,7 +20,7 @@
 #ifndef EXECVPE_H
 #define EXECVPE_H
 
-#include "base/visibility.h"
+#include "base/visibility.hpp"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/third-party/mmatch/mmatch.h b/third-party/mmatch/mmatch.h
index 526bab657367cbe070267959a6dc081c859d9399..940220391d6eac0b23d7d251aef796e4a847f0ae 100644 (file)
--- a/third-party/mmatch/mmatch.h
+++ b/third-party/mmatch/mmatch.h
@@ -1,7 +1,7 @@
 #ifndef MMATCH_H
 #define MMATCH_H
 
-#include "base/visibility.h"
+#include "base/visibility.hpp"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/tools/mkclass/CMakeLists.txt b/tools/mkclass/CMakeLists.txt
index 5c9736be4c35e3f1c7d2569e5013746893fe30d7..f58742b4d3d888f11cabb4237d69f21891d44906 100644 (file)
--- a/tools/mkclass/CMakeLists.txt
+++ b/tools/mkclass/CMakeLists.txt
@@ -24,7 +24,7 @@ add_flex_bison_dependency(class_lexer class_parser)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(mkclass mkclass.cpp classcompiler.cpp classcompiler.h ${FLEX_class_lexer_OUTPUTS} ${BISON_class_parser_OUTPUTS})
+add_executable(mkclass mkclass.cpp classcompiler.cpp classcompiler.hpp ${FLEX_class_lexer_OUTPUTS} ${BISON_class_parser_OUTPUTS})
 
 set_target_properties (
   mkclass PROPERTIES

diff --git a/tools/mkclass/class_lexer.ll b/tools/mkclass/class_lexer.ll
index ab95b26b11a881b00caccc5a1c5d33e2089a284c..1f7ec20005ca79192403b2fcac2be219e82f66b7 100644 (file)
--- a/tools/mkclass/class_lexer.ll
+++ b/tools/mkclass/class_lexer.ll
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "classcompiler.h"
+#include "classcompiler.hpp"
 
 using namespace icinga;
 

diff --git a/tools/mkclass/class_parser.yy b/tools/mkclass/class_parser.yy
index cb530dd253a3992c5801e0c234382defd4bb3052..a9180f012504a274f6571a5e1b26a9de29f51c97 100644 (file)
--- a/tools/mkclass/class_parser.yy
+++ b/tools/mkclass/class_parser.yy
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
- #include "classcompiler.h"
- #include <iostream>
- #include <vector>
+#include "classcompiler.hpp"
+#include <iostream>
+#include <vector>
 
 using namespace icinga;
 

diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp
index 7363b898527f041761e8ebc0d6c4b756237bf009..f67a951ba632bab94a99a806dd280174cc916802 100644 (file)
--- a/tools/mkclass/classcompiler.cpp
+++ b/tools/mkclass/classcompiler.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "classcompiler.h"
+#include "classcompiler.hpp"
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
@@ -486,13 +486,13 @@ void ClassCompiler::CompileStream(const std::string& path, std::istream *stream)
 {
        stream->exceptions(std::istream::badbit);
 
-       std::cout << "#include \"base/object.h\"" << std::endl
-                         << "#include \"base/type.h\"" << std::endl
-                         << "#include \"base/debug.h\"" << std::endl
-                         << "#include \"base/value.h\"" << std::endl
-                         << "#include \"base/array.h\"" << std::endl
-                         << "#include \"base/dictionary.h\"" << std::endl
-                         << "#include \"base/utility.h\"" << std::endl << std::endl
+       std::cout << "#include \"base/object.hpp\"" << std::endl
+                         << "#include \"base/type.hpp\"" << std::endl
+                         << "#include \"base/debug.hpp\"" << std::endl
+                         << "#include \"base/value.hpp\"" << std::endl
+                         << "#include \"base/array.hpp\"" << std::endl
+                         << "#include \"base/dictionary.hpp\"" << std::endl
+                         << "#include \"base/utility.hpp\"" << std::endl << std::endl
                          << "#ifdef _MSC_VER" << std::endl
                          << "#pragma warning( push )" << std::endl
                          << "#pragma warning( disable : 4244 )" << std::endl

diff --git a/tools/mkclass/classcompiler.h b/tools/mkclass/classcompiler.hpp
similarity index 100%
rename from tools/mkclass/classcompiler.h
rename to tools/mkclass/classcompiler.hpp

diff --git a/tools/mkclass/mkclass.cpp b/tools/mkclass/mkclass.cpp
index 5e9f9664f944320ea5c129c0e1405097a63a445e..24666f61f290e4ebbf5b40daa0ae1c22fcab9e99 100644 (file)
--- a/tools/mkclass/mkclass.cpp
+++ b/tools/mkclass/mkclass.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "classcompiler.h"
+#include "classcompiler.hpp"
 #include <iostream>
 
 using namespace icinga;

diff --git a/tools/mkembedconfig/mkembedconfig.c b/tools/mkembedconfig/mkembedconfig.c
index fafa2065ac1cda4fcee9a3223b7445a757e66ca2..ddf27a286a61540bb6c82cc3a46fad1508adb988 100644 (file)
--- a/tools/mkembedconfig/mkembedconfig.c
+++ b/tools/mkembedconfig/mkembedconfig.c
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 
        fprintf(outfp, "/* This file has been automatically generated\n"
            "   from the input file \"%s\". */\n\n", argv[1]);
-       fputs("#include \"config/configcompiler.h\"\n\nstatic const char g_ConfigFragment[] = {\n", outfp);
+       fputs("#include \"config/configcompiler.hpp\"\n\nstatic const char g_ConfigFragment[] = {\n", outfp);
        fputc('\t', outfp);
 
        cols = 0;