Rename qstring.{cpp,hpp} to string.{cpp,hpp}

diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 1ce98e09f5cd7fb082731f0c552a4dfb918102e5..41c13fc0849fe746f840e5d4a2ca0e60a1be0be7 100644 (file)
--- a/lib/base/CMakeLists.txt
+++ b/lib/base/CMakeLists.txt
@@ -27,9 +27,9 @@ set(base_SOURCES
   convert.cpp debuginfo.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
+  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.thpp
+  statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.thpp string.cpp 
   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/context.hpp b/lib/base/context.hpp
index c75849a6c12ce7fbcda5df0b12d404d57e2563d9..8f219b5e63fd488ec1e8651cb404c97098fff66a 100644 (file)
--- a/lib/base/context.hpp
+++ b/lib/base/context.hpp
@@ -21,7 +21,7 @@
 #define CONTEXT_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include <list>
 
 namespace icinga

diff --git a/lib/base/debuginfo.hpp b/lib/base/debuginfo.hpp
index 42aeffe1c69a8e3b463b10bcfcf7610da78e35f4..43829ec2e92e606228a37f313d0cd6b3f763e500 100644 (file)
--- a/lib/base/debuginfo.hpp
+++ b/lib/base/debuginfo.hpp
@@ -21,7 +21,7 @@
 #define DEBUGINFO_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include "base/exception.hpp"
 
 namespace icinga

diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp
index ead065388e60680d3def4d2cdd8efa89ff9819e8..ab9ea1f707c7b86c16ecc95f05b011da2ef894aa 100644 (file)
--- a/lib/base/exception.hpp
+++ b/lib/base/exception.hpp
@@ -21,7 +21,7 @@
 #define EXCEPTION_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include "base/stacktrace.hpp"
 #include "base/context.hpp"
 #include <sstream>

diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp
index 615048adc73b111a3d652d96fe77cc9fad1b8512..cbd9419f8c8934e07ff36171e478b99271b187c4 100644 (file)
--- a/lib/base/netstring.cpp
+++ b/lib/base/netstring.cpp
@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 #include "base/netstring.hpp"
-#include "base/qstring.hpp"
 #include "base/debug.hpp"
 #include <sstream>
 

diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp
index 0ed294c9237c0ebddac5c8306388502ab20cc125..ab47dac54eebb955953f276137c42d301577d1fd 100644 (file)
--- a/lib/base/netstring.hpp
+++ b/lib/base/netstring.hpp
@@ -21,6 +21,7 @@
 #define NETSTRING_H
 
 #include "base/i2-base.hpp"
+#include "base/string.hpp"
 #include "base/stream.hpp"
 
 namespace icinga

diff --git a/lib/base/registry.hpp b/lib/base/registry.hpp
index 781c16605645d4a1a92070f1b15bdc7e26d6839f..a0f0006f0594a7263e34559a5ccee74bec1de096 100644 (file)
--- a/lib/base/registry.hpp
+++ b/lib/base/registry.hpp
@@ -21,7 +21,7 @@
 #define REGISTRY_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include <map>
 #include <boost/thread/mutex.hpp>
 #include <boost/signals2.hpp>

diff --git a/lib/base/scriptutils.hpp b/lib/base/scriptutils.hpp
index 34579e80e82b11eb86d65e381d100ce58d645756..633d74009075bcf53b81518422a4af950cf1eaf5 100644 (file)
--- a/lib/base/scriptutils.hpp
+++ b/lib/base/scriptutils.hpp
@@ -21,7 +21,7 @@
 #define SCRIPTUTILS_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include "base/array.hpp"
 
 namespace icinga

diff --git a/lib/base/stacktrace.cpp b/lib/base/stacktrace.cpp
index 2938d7e0d09e937b3a5578345c5142dca95e52be..b82ffcc1e226d5ca8b7147b5eb7951ae1afce9f0 100644 (file)
--- a/lib/base/stacktrace.cpp
+++ b/lib/base/stacktrace.cpp
@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 #include "base/stacktrace.hpp"
-#include "base/qstring.hpp"
 #include "base/utility.hpp"
 #include "base/initialize.hpp"
 

diff --git a/lib/base/stream.cpp b/lib/base/stream.cpp
index 827e6680e071483ec46cd3e2c9bf8e5339039b87..673cd31d2589b1f66cf74d90b106689ec1a9586f 100644 (file)
--- a/lib/base/stream.cpp
+++ b/lib/base/stream.cpp
@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 #include "base/stream.hpp"
-#include "base/qstring.hpp"
 #include <boost/algorithm/string/trim.hpp>
 
 using namespace icinga;

diff --git a/lib/base/stream.hpp b/lib/base/stream.hpp
index 2c8c76fc7eb5fa7dff13cfd0383bde8a060c39c9..8a6120b08847614b3a4334fde61347f86500f3fa 100644 (file)
--- a/lib/base/stream.hpp
+++ b/lib/base/stream.hpp
@@ -22,6 +22,7 @@
 
 #include "base/i2-base.hpp"
 #include "base/object.hpp"
+#include "base/string.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/qstring.cpp b/lib/base/string.cpp
similarity index 99%
rename from lib/base/qstring.cpp
rename to lib/base/string.cpp
index 4d9b8bda2faef8ceaa622b50dcce5da62e58b371..279cd44cfc14effaabd0140031a2a6ff9602c176 100644 (file)
--- a/lib/base/qstring.cpp
+++ b/lib/base/string.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include "base/value.hpp"
 #include <boost/algorithm/string/trim.hpp>
 #include <ostream>

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

diff --git a/lib/base/tlsutility.hpp b/lib/base/tlsutility.hpp
index 823de2b7b56f97ec14405b20eb202004eb76a20f..c5f11f93d7bf57e4d2a2ce54f0edc24a791b2d5f 100644 (file)
--- a/lib/base/tlsutility.hpp
+++ b/lib/base/tlsutility.hpp
@@ -22,7 +22,7 @@
 
 #include "base/i2-base.hpp"
 #include "base/object.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include "base/exception.hpp"
 #include <openssl/ssl.h>
 #include <openssl/bio.h>

diff --git a/lib/base/type.hpp b/lib/base/type.hpp
index 219b07bc6c39ca2d37ecc7ac19bd10eae2f45307..bc3c18b98641b422a57f0d56033ca9ed99216c37 100644 (file)
--- a/lib/base/type.hpp
+++ b/lib/base/type.hpp
@@ -21,7 +21,7 @@
 #define TYPE_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include "base/object.hpp"
 #include "base/initialize.hpp"
 #include "base/utility.hpp"

diff --git a/lib/base/utility.hpp b/lib/base/utility.hpp
index e6e133a7621b57c6aa8adcb80b1f9d935a139b7f..108741c4ac6069ae542524539e7a1d5118e2002f 100644 (file)
--- a/lib/base/utility.hpp
+++ b/lib/base/utility.hpp
@@ -21,7 +21,7 @@
 #define UTILITY_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include <typeinfo>
 #include <boost/function.hpp>
 #include <boost/thread/tss.hpp>

diff --git a/lib/base/value.hpp b/lib/base/value.hpp
index c4fa837a6a0519b0b830f0f719094e41af9ae24a..375e7b2da2c4a7bb1005582a9f4c63eaba0c7ea8 100644 (file)
--- a/lib/base/value.hpp
+++ b/lib/base/value.hpp
@@ -21,7 +21,7 @@
 #define VALUE_H
 
 #include "base/object.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include <boost/variant/variant.hpp>
 #include <boost/variant/get.hpp>
 

diff --git a/lib/cli/agentaddcommand.hpp b/lib/cli/agentaddcommand.hpp
index 2202034db82fdda83c9ac663562c2241700c2b75..88da787f5a734ac5663a3ff1b27b3bf704410f25 100644 (file)
--- a/lib/cli/agentaddcommand.hpp
+++ b/lib/cli/agentaddcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef AGENTADDCOMMAND_H
 #define AGENTADDCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/agentblackandwhitelistcommand.hpp b/lib/cli/agentblackandwhitelistcommand.hpp
index a019a00506559b64a60d33b0c4cc07cd03a84da1..16a13cea3c3398e2a5410c6de01d279649eb9fda 100644 (file)
--- a/lib/cli/agentblackandwhitelistcommand.hpp
+++ b/lib/cli/agentblackandwhitelistcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef BLACKANDWHITELISTCOMMAND_H
 #define BLACKANDWHITELISTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/agentlistcommand.hpp b/lib/cli/agentlistcommand.hpp
index 650d741f0b872562165bd3e4bb05832d796ddb78..8e68e9cfe537eeaa502c22a061eee0bbdb0532d2 100644 (file)
--- a/lib/cli/agentlistcommand.hpp
+++ b/lib/cli/agentlistcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef AGENTLISTCOMMAND_H
 #define AGENTLISTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/agentremovecommand.hpp b/lib/cli/agentremovecommand.hpp
index f400b7e8ba7f441ec9a757c78fb018f49664951d..ab3551972755e0e9151e21dccdfbccd4dd4ac3c0 100644 (file)
--- a/lib/cli/agentremovecommand.hpp
+++ b/lib/cli/agentremovecommand.hpp
@@ -20,7 +20,6 @@
 #ifndef AGENTREMOVECOMMAND_H
 #define AGENTREMOVECOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/agentsetcommand.hpp b/lib/cli/agentsetcommand.hpp
index 274ff4e7c6af52e2182e961c351c157339019b49..2a4cf516257072f8644e913375a6806912223278 100644 (file)
--- a/lib/cli/agentsetcommand.hpp
+++ b/lib/cli/agentsetcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef AGENTSETCOMMAND_H
 #define AGENTSETCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/agentsetupcommand.hpp b/lib/cli/agentsetupcommand.hpp
index 2b27e62b1ede3f0eb0323712d28cd2550df2b966..1e970ea5556644abe6c2ce146cff3f37935029c9 100644 (file)
--- a/lib/cli/agentsetupcommand.hpp
+++ b/lib/cli/agentsetupcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef AGENTSETUPCOMMAND_H
 #define AGENTSETUPCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/agentupdateconfigcommand.hpp b/lib/cli/agentupdateconfigcommand.hpp
index 9ca6a9327c624f824f0add96e97f1233c2cb89bc..418435edae32c89c72f3a0f6f726ecc3ed372255 100644 (file)
--- a/lib/cli/agentupdateconfigcommand.hpp
+++ b/lib/cli/agentupdateconfigcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef AGENTUPDATECONFIGCOMMAND_H
 #define AGENTUPDATECONFIGCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/agentwizardcommand.hpp b/lib/cli/agentwizardcommand.hpp
index e9be2d0cac27a0ca363475782d7d376be30e064d..ef8007925c8fed360608c5b3315ab060519336bb 100644 (file)
--- a/lib/cli/agentwizardcommand.hpp
+++ b/lib/cli/agentwizardcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef AGENTWIZARDCOMMAND_H
 #define AGENTWIZARDCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/daemoncommand.hpp b/lib/cli/daemoncommand.hpp
index 14550ecc02f18702bc80362b12504a94d542d6e7..942b01f803b2aa1ae04bc597944529a561a92811 100644 (file)
--- a/lib/cli/daemoncommand.hpp
+++ b/lib/cli/daemoncommand.hpp
@@ -21,8 +21,6 @@
 #define DAEMONCOMMAND_H
 
 #include "base/clicommand.hpp"
-#include "base/qstring.hpp"
-#include <vector>
 
 namespace icinga
 {

diff --git a/lib/cli/featuredisablecommand.hpp b/lib/cli/featuredisablecommand.hpp
index 5558442aabedc31cd4cb3c209f1db98ec5676b89..1b44288118df43651e44878ec729799173b2f8d8 100644 (file)
--- a/lib/cli/featuredisablecommand.hpp
+++ b/lib/cli/featuredisablecommand.hpp
@@ -20,7 +20,6 @@
 #ifndef FEATUREDISABLECOMMAND_H
 #define FEATUREDISABLECOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/featureenablecommand.hpp b/lib/cli/featureenablecommand.hpp
index bf5d6bab26b08ec55163d9b8f37de7d495e4b96b..985bcd203a78b6b664a17239cac9b5935c6dda86 100644 (file)
--- a/lib/cli/featureenablecommand.hpp
+++ b/lib/cli/featureenablecommand.hpp
@@ -20,7 +20,6 @@
 #ifndef FEATUREENABLECOMMAND_H
 #define FEATUREENABLECOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/featurelistcommand.hpp b/lib/cli/featurelistcommand.hpp
index 1dcb18b0957f9b0ecfbd3084524439022f479a66..146ee36b225e61e750651e5ff1827284dded47e9 100644 (file)
--- a/lib/cli/featurelistcommand.hpp
+++ b/lib/cli/featurelistcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef FEATURELISTCOMMAND_H
 #define FEATURELISTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/featureutility.hpp b/lib/cli/featureutility.hpp
index 4af3602968a55bcd3d922984a8f62e011f6c4217..104910848ac7560197f4e5cc32eed4bfa302fdeb 100644 (file)
--- a/lib/cli/featureutility.hpp
+++ b/lib/cli/featureutility.hpp
@@ -21,7 +21,7 @@
 #define FEATUREUTILITY_H
 
 #include "base/i2-base.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include <vector>
 
 namespace icinga

diff --git a/lib/cli/objectlistcommand.hpp b/lib/cli/objectlistcommand.hpp
index 2e191362df018e118bd42f9203f5b118670ffa90..9bbc4f2ad07a1ac2e00df585cfc8598ff2020ec0 100644 (file)
--- a/lib/cli/objectlistcommand.hpp
+++ b/lib/cli/objectlistcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef OBJECTLISTCOMMAND_H
 #define OBJECTLISTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/dictionary.hpp"
 #include "base/array.hpp"
 #include "base/clicommand.hpp"

diff --git a/lib/cli/pkinewcacommand.hpp b/lib/cli/pkinewcacommand.hpp
index 6a6cf45c0f7a776b0f31dfab607dda04aef112b5..198ae6ef2cb383041e25d7835ed57072b6ab64a0 100644 (file)
--- a/lib/cli/pkinewcacommand.hpp
+++ b/lib/cli/pkinewcacommand.hpp
@@ -20,7 +20,6 @@
 #ifndef PKINEWCACOMMAND_H
 #define PKINEWCACOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/pkinewcertcommand.hpp b/lib/cli/pkinewcertcommand.hpp
index bff677274d69997f266803bc443c7a0c35057e2c..78c0e389711b49a942962d8ab1322f384c16f320 100644 (file)
--- a/lib/cli/pkinewcertcommand.hpp
+++ b/lib/cli/pkinewcertcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef PKINEWCERTCOMMAND_H
 #define PKINEWCERTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/pkirequestcommand.hpp b/lib/cli/pkirequestcommand.hpp
index 439548980df8a095a8a2638cccc237c1cbf9145b..018bea168c32b1b00fc5ec0ab847701e3d9be0c6 100644 (file)
--- a/lib/cli/pkirequestcommand.hpp
+++ b/lib/cli/pkirequestcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef PKIREQUESTCOMMAND_H
 #define PKIREQUESTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/pkisigncsrcommand.hpp b/lib/cli/pkisigncsrcommand.hpp
index f38bb6bce341bcfba1477824165212afba15539d..7c02330fa7be189bc2ccdefca626784bab2f6dcf 100644 (file)
--- a/lib/cli/pkisigncsrcommand.hpp
+++ b/lib/cli/pkisigncsrcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef PKISIGNCSRCOMMAND_H
 #define PKISIGNCSRCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/pkiticketcommand.hpp b/lib/cli/pkiticketcommand.hpp
index 36fbc64714984088a549b6e12fc5c8bc8772d1d5..13dd54bc3f6c575aca6331607e4ba965d47be46a 100644 (file)
--- a/lib/cli/pkiticketcommand.hpp
+++ b/lib/cli/pkiticketcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef PKITICKETCOMMAND_H
 #define PKITICKETCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp
index 625d2ca262ddd94fc80f5dd160c3891ed7e0050a..43fd0d8a8b361ad4077850af8a3501e423aef788 100644 (file)
--- a/lib/cli/repositoryobjectcommand.hpp
+++ b/lib/cli/repositoryobjectcommand.hpp
@@ -20,7 +20,6 @@
 #ifndef REPOSITORYOBJECTCOMMAND_H
 #define REPOSITORYOBJECTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

diff --git a/lib/icinga/externalcommandprocessor.hpp b/lib/icinga/externalcommandprocessor.hpp
index f543b8523ee747388d2b3b47cdca79f3ed4978c7..acdaf22f472e144010305f404e1f052f015afdf8 100644 (file)
--- a/lib/icinga/externalcommandprocessor.hpp
+++ b/lib/icinga/externalcommandprocessor.hpp
@@ -22,7 +22,7 @@
 
 #include "icinga/i2-icinga.hpp"
 #include "icinga/command.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 #include <vector>

diff --git a/lib/icinga/macroresolver.hpp b/lib/icinga/macroresolver.hpp
index 6ad8a73ce33d8a03f7162fae0d832a745c82999a..300145f2b4e2fb99c92c4b108837a6370512b66a 100644 (file)
--- a/lib/icinga/macroresolver.hpp
+++ b/lib/icinga/macroresolver.hpp
@@ -23,7 +23,7 @@
 #include "icinga/i2-icinga.hpp"
 #include "icinga/checkresult.hpp"
 #include "base/dictionary.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 
 namespace icinga
 {

diff --git a/lib/methods/castfuncs.hpp b/lib/methods/castfuncs.hpp
index 37e4eb2b632caf1b36ff1a01157d21219544e4ec..b8612afe7e43d66f2b1c628d5134cd51df5275af 100644 (file)
--- a/lib/methods/castfuncs.hpp
+++ b/lib/methods/castfuncs.hpp
@@ -21,7 +21,7 @@
 #define CASTFUNCS_H
 
 #include "methods/i2-methods.hpp"
-#include "base/qstring.hpp"
+#include "base/string.hpp"
 
 namespace icinga
 {

diff --git a/test/base-netstring.cpp b/test/base-netstring.cpp
index 21c5d386f75e2234602bb6f85551819045b0ff1f..94becf4d2f6f094803c39425fcf0853c70a0e316 100644 (file)
--- a/test/base-netstring.cpp
+++ b/test/base-netstring.cpp
@@ -19,7 +19,6 @@
 
 #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-stream.cpp b/test/base-stream.cpp
index 76e70c2f4557f0294caa371dbe01b0885d1412b6..3b523375ade7650666bbf737bb128b1497019e42 100644 (file)
--- a/test/base-stream.cpp
+++ b/test/base-stream.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/stdiostream.hpp"
-#include "base/qstring.hpp"
+#include "base/string.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 02563e35c9537c5512fa32a52db4895f85ee0ef9..83d9c8ad6cae0fdfeb39ca4096e3c5f3d5db9f26 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.hpp"
+#include "base/string.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>