Remove all include directives for <string>

modules/androidcamera/src/camera_activity.cpp

@@ -4,7 +4,6 @@
 #include <dirent.h>
 #include <android/log.h>
 #include <cctype>
-#include <string>
 #include <vector>
 #include <algorithm>
 #include <opencv2/core/version.hpp>

modules/core/doc/basic_structures.rst

@@ -2457,13 +2457,13 @@ Algorithm::name
 ---------------
 Returns the algorithm name
 
-.. ocv:function:: string Algorithm::name() const
+.. ocv:function:: String Algorithm::name() const
 
 Algorithm::get
 --------------
 Returns the algorithm parameter
 
-.. ocv:function:: template<typename _Tp> typename ParamType<_Tp>::member_type Algorithm::get(const string& name) const
+.. ocv:function:: template<typename _Tp> typename ParamType<_Tp>::member_type Algorithm::get(const String& name) const
 
     :param name: The parameter name.
 
@@ -2472,7 +2472,7 @@ The method returns value of the particular parameter. Since the compiler can not
     * myalgo.get<int>("param_name")
     * myalgo.get<double>("param_name")
     * myalgo.get<bool>("param_name")
-    * myalgo.get<string>("param_name")
+    * myalgo.get<String>("param_name")
     * myalgo.get<Mat>("param_name")
     * myalgo.get<vector<Mat> >("param_name")
     * myalgo.get<Algorithm>("param_name") (it returns Ptr<Algorithm>).
@@ -2529,13 +2529,13 @@ Algorithm::getList
 ------------------
 Returns the list of registered algorithms
 
-.. ocv:function:: void Algorithm::getList(vector<string>& algorithms)
+.. ocv:function:: void Algorithm::getList(vector<String>& algorithms)
 
     :param algorithms: The output vector of algorithm names.
 
 This static method returns the list of registered algorithms in alphabetical order. Here is how to use it ::
 
-    vector<string> algorithms;
+    vector<String> algorithms;
     Algorithm::getList(algorithms);
     cout << "Algorithms: " << algorithms.size() << endl;
     for (size_t i=0; i < algorithms.size(); i++)

modules/core/doc/command_line_parser.rst

@@ -63,8 +63,8 @@ The sample below demonstrates how to use CommandLineParser:
 
     use_time_stamp = parser.has("timestamp");
 
-    cv::String img1 = parser.get<string>(0);
-    cv::String img2 = parser.get<string>(1);
+    cv::String img1 = parser.get<cv::String>(0);
+    cv::String img2 = parser.get<cv::String>(1);
 
     int repeat = parser.get<int>(2);
 

modules/core/include/opencv2/core.hpp

@@ -62,7 +62,6 @@
 #include <complex>
 #include <map>
 #include <new>
-#include <string>
 #include <vector>
 #include <sstream>
 #endif // SKIP_INCLUDES

modules/core/src/gl_core_3_1.cpp

@@ -1,4 +1,3 @@
-#include <string>
 #include <sstream>
 #include "cvconfig.h"
 #include "opencv2/core.hpp"

modules/flann/include/opencv2/flann/flann_base.hpp

@@ -32,7 +32,6 @@
 #define OPENCV_FLANN_BASE_HPP_
 
 #include <vector>
-#include <string>
 #include <cassert>
 #include <cstdio>
 

modules/flann/include/opencv2/flann/hierarchical_clustering_index.h

@@ -32,7 +32,6 @@
 #define OPENCV_FLANN_HIERARCHICAL_CLUSTERING_INDEX_H_
 
 #include <algorithm>
-#include <string>
 #include <map>
 #include <cassert>
 #include <limits>

modules/flann/include/opencv2/flann/kmeans_index.h

@@ -32,7 +32,6 @@
 #define OPENCV_FLANN_KMEANS_INDEX_H_
 
 #include <algorithm>
-#include <string>
 #include <map>
 #include <cassert>
 #include <limits>

modules/flann/include/opencv2/flann/nn_index.h

@@ -31,8 +31,6 @@
 #ifndef OPENCV_FLANN_NNINDEX_H
 #define OPENCV_FLANN_NNINDEX_H
 
-#include <string>
-
 #include "general.h"
 #include "matrix.h"
 #include "result_set.h"

modules/gpu/src/nvidia/NCVHaarObjectDetection.hpp

@@ -58,7 +58,6 @@
 #ifndef _ncvhaarobjectdetection_hpp_
 #define _ncvhaarobjectdetection_hpp_
 
-#include <string>
 #include "NCV.hpp"
 
 

modules/gpu/src/nvidia/core/NCV.cu

@@ -41,7 +41,6 @@
 
 
 #include <iostream>
-#include <string>
 #include <vector>
 #include "NCV.hpp"
 

modules/gpu/src/precomp.hpp

@@ -64,7 +64,6 @@
 #include <deque>
 #include <stdexcept>
 #include <memory>
-#include <string>
 
 #include "opencv2/gpu.hpp"
 #include "opencv2/imgproc.hpp"

modules/highgui/src/cap_pvapi.cpp

@@ -63,7 +63,6 @@
 #  include <unistd.h>
 #endif
 
-#include <string>
 //#include <arpa/inet.h>
 
 #define MAX_CAMERAS 10

modules/ml/include/opencv2/ml.hpp

@@ -47,7 +47,6 @@
 #ifdef __cplusplus
 
 #include <map>
-#include <string>
 #include <iostream>
 
 // Apple defines a check() macro somewhere in the debug headers

modules/objdetect/doc/latent_svm.rst

@@ -204,7 +204,7 @@ Two types of constructors.
 
 .. ocv:function:: LatentSvmDetector::LatentSvmDetector()
 
-.. ocv:function:: LatentSvmDetector::LatentSvmDetector(const vector<string>& filenames, const vector<string>& classNames=vector<string>())
+.. ocv:function:: LatentSvmDetector::LatentSvmDetector(const vector<String>& filenames, const vector<String>& classNames=vector<String>())
 
 
 
@@ -228,7 +228,7 @@ LatentSvmDetector::load
 -----------------------
 Load the trained models from given ``.xml`` files and return ``true`` if at least one model was loaded.
 
-.. ocv:function:: bool LatentSvmDetector::load( const vector<string>& filenames, const vector<string>& classNames=vector<string>() )
+.. ocv:function:: bool LatentSvmDetector::load( const vector<String>& filenames, const vector<String>& classNames=vector<String>() )
 
     :param filenames: A set of filenames storing the trained detectors (models). Each file contains one model. See examples of such files here /opencv_extra/testdata/cv/latentsvmdetector/models_VOC2007/.
 
@@ -250,7 +250,7 @@ LatentSvmDetector::getClassNames
 --------------------------------
 Return the class (model) names that were passed in constructor or method ``load`` or extracted from models filenames in those methods.
 
-.. ocv:function:: const vector<string>& LatentSvmDetector::getClassNames() const
+.. ocv:function:: const vector<String>& LatentSvmDetector::getClassNames() const
 
 LatentSvmDetector::getClassCount
 --------------------------------

modules/objdetect/src/cascadedetect.cpp

@@ -44,8 +44,6 @@
 
 #include "cascadedetect.hpp"
 
-#include <string>
-
 #if defined (LOG_CASCADE_STATISTIC)
 struct Logger
 {

modules/ocl/src/haar.cpp

@@ -49,7 +49,6 @@
 
 #include "precomp.hpp"
 #include <stdio.h>
-#include <string>
 
 using namespace cv;
 using namespace cv::ocl;

modules/softcascade/src/octave.cpp

@@ -42,7 +42,6 @@
 
 #include "precomp.hpp"
 #include <queue>
-#include <string>
 
 using cv::InputArray;
 using cv::OutputArray;

modules/superres/src/frame_source.cpp

@@ -83,7 +83,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Empty()
 
 #ifndef HAVE_OPENCV_HIGHGUI
 
-Ptr<FrameSource> cv::superres::createFrameSource_Video(const string& fileName)
+Ptr<FrameSource> cv::superres::createFrameSource_Video(const String& fileName)
 {
     (void) fileName;
     CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform");
@@ -190,7 +190,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Camera(int deviceId)
 
 #ifndef HAVE_OPENCV_GPU
 
-Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const string& fileName)
+Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileName)
 {
     (void) fileName;
     CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform");

modules/videostab/include/opencv2/videostab/frame_source.hpp

@@ -44,7 +44,6 @@
 #define __OPENCV_VIDEOSTAB_FRAME_SOURCE_HPP__
 
 #include <vector>
-#include <string>
 #include "opencv2/core.hpp"
 
 namespace cv

modules/videostab/include/opencv2/videostab/global_motion.hpp

@@ -44,7 +44,6 @@
 #define __OPENCV_VIDEOSTAB_GLOBAL_MOTION_HPP__
 
 #include <vector>
-#include <string>
 #include <fstream>
 #include "opencv2/core.hpp"
 #include "opencv2/features2d.hpp"