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

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

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

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

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>

lib/base/netstring.cpp

@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 #include "base/netstring.hpp"
-#include "base/qstring.hpp"
 #include "base/debug.hpp"
 #include <sstream>
 

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

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>

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

lib/base/stacktrace.cpp

@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 #include "base/stacktrace.hpp"
-#include "base/qstring.hpp"
 #include "base/utility.hpp"
 #include "base/initialize.hpp"
 

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;

lib/base/stream.hpp

@@ -22,6 +22,7 @@
 
 #include "base/i2-base.hpp"
 #include "base/object.hpp"
+#include "base/string.hpp"
 
 namespace icinga
 {

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>

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>

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"

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>

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>
 

lib/cli/agentaddcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef AGENTADDCOMMAND_H
 #define AGENTADDCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/agentblackandwhitelistcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef BLACKANDWHITELISTCOMMAND_H
 #define BLACKANDWHITELISTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/agentlistcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef AGENTLISTCOMMAND_H
 #define AGENTLISTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/agentremovecommand.hpp

@@ -20,7 +20,6 @@
 #ifndef AGENTREMOVECOMMAND_H
 #define AGENTREMOVECOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/agentsetcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef AGENTSETCOMMAND_H
 #define AGENTSETCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/agentsetupcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef AGENTSETUPCOMMAND_H
 #define AGENTSETUPCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/agentupdateconfigcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef AGENTUPDATECONFIGCOMMAND_H
 #define AGENTUPDATECONFIGCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/agentwizardcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef AGENTWIZARDCOMMAND_H
 #define AGENTWIZARDCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/daemoncommand.hpp

@@ -21,8 +21,6 @@
 #define DAEMONCOMMAND_H
 
 #include "base/clicommand.hpp"
-#include "base/qstring.hpp"
-#include <vector>
 
 namespace icinga
 {

lib/cli/featuredisablecommand.hpp

@@ -20,7 +20,6 @@
 #ifndef FEATUREDISABLECOMMAND_H
 #define FEATUREDISABLECOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/featureenablecommand.hpp

@@ -20,7 +20,6 @@
 #ifndef FEATUREENABLECOMMAND_H
 #define FEATUREENABLECOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/featurelistcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef FEATURELISTCOMMAND_H
 #define FEATURELISTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

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

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"

lib/cli/pkinewcacommand.hpp

@@ -20,7 +20,6 @@
 #ifndef PKINEWCACOMMAND_H
 #define PKINEWCACOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/pkinewcertcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef PKINEWCERTCOMMAND_H
 #define PKINEWCERTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/pkirequestcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef PKIREQUESTCOMMAND_H
 #define PKIREQUESTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/pkisigncsrcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef PKISIGNCSRCOMMAND_H
 #define PKISIGNCSRCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/pkiticketcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef PKITICKETCOMMAND_H
 #define PKITICKETCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

lib/cli/repositoryobjectcommand.hpp

@@ -20,7 +20,6 @@
 #ifndef REPOSITORYOBJECTCOMMAND_H
 #define REPOSITORYOBJECTCOMMAND_H
 
-#include "base/qstring.hpp"
 #include "base/clicommand.hpp"
 
 namespace icinga

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>

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
 {

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
 {

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;

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>

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>