From 739cb43289d2f70a5fcbb7e6d809a06f6dd7739b Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 19 Oct 2014 14:48:19 +0200 Subject: [PATCH] Rename qstring.{cpp,hpp} to string.{cpp,hpp} --- lib/base/CMakeLists.txt | 4 ++-- lib/base/context.hpp | 2 +- lib/base/debuginfo.hpp | 2 +- lib/base/exception.hpp | 2 +- lib/base/netstring.cpp | 1 - lib/base/netstring.hpp | 1 + lib/base/registry.hpp | 2 +- lib/base/scriptutils.hpp | 2 +- lib/base/stacktrace.cpp | 1 - lib/base/stream.cpp | 1 - lib/base/stream.hpp | 1 + lib/base/{qstring.cpp => string.cpp} | 2 +- lib/base/{qstring.hpp => string.hpp} | 0 lib/base/tlsutility.hpp | 2 +- lib/base/type.hpp | 2 +- lib/base/utility.hpp | 2 +- lib/base/value.hpp | 2 +- lib/cli/agentaddcommand.hpp | 1 - lib/cli/agentblackandwhitelistcommand.hpp | 1 - lib/cli/agentlistcommand.hpp | 1 - lib/cli/agentremovecommand.hpp | 1 - lib/cli/agentsetcommand.hpp | 1 - lib/cli/agentsetupcommand.hpp | 1 - lib/cli/agentupdateconfigcommand.hpp | 1 - lib/cli/agentwizardcommand.hpp | 1 - lib/cli/daemoncommand.hpp | 2 -- lib/cli/featuredisablecommand.hpp | 1 - lib/cli/featureenablecommand.hpp | 1 - lib/cli/featurelistcommand.hpp | 1 - lib/cli/featureutility.hpp | 2 +- lib/cli/objectlistcommand.hpp | 1 - lib/cli/pkinewcacommand.hpp | 1 - lib/cli/pkinewcertcommand.hpp | 1 - lib/cli/pkirequestcommand.hpp | 1 - lib/cli/pkisigncsrcommand.hpp | 1 - lib/cli/pkiticketcommand.hpp | 1 - lib/cli/repositoryobjectcommand.hpp | 1 - lib/icinga/externalcommandprocessor.hpp | 2 +- lib/icinga/macroresolver.hpp | 2 +- lib/methods/castfuncs.hpp | 2 +- test/base-netstring.cpp | 1 - test/base-stream.cpp | 2 +- test/base-string.cpp | 2 +- 43 files changed, 20 insertions(+), 42 deletions(-) rename lib/base/{qstring.cpp => string.cpp} (99%) rename lib/base/{qstring.hpp => string.hpp} (100%) diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt index 1ce98e09f..41c13fc08 100644 --- 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 c75849a6c..8f219b5e6 100644 --- 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 namespace icinga diff --git a/lib/base/debuginfo.hpp b/lib/base/debuginfo.hpp index 42aeffe1c..43829ec2e 100644 --- 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 ead065388..ab9ea1f70 100644 --- 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 diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp index 615048adc..cbd9419f8 100644 --- 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 diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp index 0ed294c92..ab47dac54 100644 --- 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 781c16605..a0f0006f0 100644 --- 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 #include #include diff --git a/lib/base/scriptutils.hpp b/lib/base/scriptutils.hpp index 34579e80e..633d74009 100644 --- 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 2938d7e0d..b82ffcc1e 100644 --- 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 827e6680e..673cd31d2 100644 --- a/lib/base/stream.cpp +++ b/lib/base/stream.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "base/stream.hpp" -#include "base/qstring.hpp" #include using namespace icinga; diff --git a/lib/base/stream.hpp b/lib/base/stream.hpp index 2c8c76fc7..8a6120b08 100644 --- 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 4d9b8bda2..279cd44cf 100644 --- 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 #include 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 823de2b7b..c5f11f93d 100644 --- 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 #include diff --git a/lib/base/type.hpp b/lib/base/type.hpp index 219b07bc6..bc3c18b98 100644 --- 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 e6e133a76..108741c4a 100644 --- 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 #include #include diff --git a/lib/base/value.hpp b/lib/base/value.hpp index c4fa837a6..375e7b2da 100644 --- 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 #include diff --git a/lib/cli/agentaddcommand.hpp b/lib/cli/agentaddcommand.hpp index 2202034db..88da787f5 100644 --- 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 a019a0050..16a13cea3 100644 --- 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 650d741f0..8e68e9cfe 100644 --- 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 f400b7e8b..ab3551972 100644 --- 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 274ff4e7c..2a4cf5162 100644 --- 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 2b27e62b1..1e970ea55 100644 --- 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 9ca6a9327..418435eda 100644 --- 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 e9be2d0ca..ef8007925 100644 --- 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 14550ecc0..942b01f80 100644 --- 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 namespace icinga { diff --git a/lib/cli/featuredisablecommand.hpp b/lib/cli/featuredisablecommand.hpp index 5558442aa..1b4428811 100644 --- 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 bf5d6bab2..985bcd203 100644 --- 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 1dcb18b09..146ee36b2 100644 --- 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 4af360296..104910848 100644 --- 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 namespace icinga diff --git a/lib/cli/objectlistcommand.hpp b/lib/cli/objectlistcommand.hpp index 2e191362d..9bbc4f2ad 100644 --- 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 6a6cf45c0..198ae6ef2 100644 --- 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 bff677274..78c0e3897 100644 --- 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 439548980..018bea168 100644 --- 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 f38bb6bce..7c02330fa 100644 --- 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 36fbc6471..13dd54bc3 100644 --- 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 625d2ca26..43fd0d8a8 100644 --- 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 f543b8523..acdaf22f4 100644 --- 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 #include #include diff --git a/lib/icinga/macroresolver.hpp b/lib/icinga/macroresolver.hpp index 6ad8a73ce..300145f2b 100644 --- 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 37e4eb2b6..b8612afe7 100644 --- 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 21c5d386f..94becf4d2 100644 --- 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 using namespace icinga; diff --git a/test/base-stream.cpp b/test/base-stream.cpp index 76e70c2f4..3b523375a 100644 --- 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 #include #include diff --git a/test/base-string.cpp b/test/base-string.cpp index 02563e35c..83d9c8ad6 100644 --- 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 #include