Minimize usages of legacy C API inside the library

doc/tutorials/core/adding_images/adding_images.rst

@@ -35,8 +35,7 @@ As usual, after the not-so-lengthy explanation, let's go to the code:
 
 .. code-block:: cpp
 
-   #include <cv.h>
-   #include <highgui.h>
+   #include <opencv2/opencv.hpp>
    #include <iostream>
 
    using namespace cv;

doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst

@@ -72,8 +72,7 @@ Code
 
 .. code-block:: cpp
 
-   #include <cv.h>
-   #include <highgui.h>
+   #include <opencv2/opencv.hpp>
    #include <iostream>
 
    using namespace cv;

doc/tutorials/highgui/trackbar/trackbar.rst

@@ -28,9 +28,7 @@ Let's modify the program made in the tutorial :ref:`Adding_Images`. We will let
 
 .. code-block:: cpp
 
-   #include <cv.h>
-   #include <highgui.h>
-
+   #include <opencv2/opencv.hpp>
    using namespace cv;
 
    /// Global Variables
@@ -50,41 +48,41 @@ Let's modify the program made in the tutorial :ref:`Adding_Images`. We will let
     */
    void on_trackbar( int, void* )
    {
-    alpha = (double) alpha_slider/alpha_slider_max ;
-    beta = ( 1.0 - alpha );
+     alpha = (double) alpha_slider/alpha_slider_max ;
+     beta = ( 1.0 - alpha );
 
-    addWeighted( src1, alpha, src2, beta, 0.0, dst);
+     addWeighted( src1, alpha, src2, beta, 0.0, dst);
 
-    imshow( "Linear Blend", dst );
+     imshow( "Linear Blend", dst );
    }
 
    int main( int argc, char** argv )
    {
-    /// Read image ( same size, same type )
-    src1 = imread("../../images/LinuxLogo.jpg");
-    src2 = imread("../../images/WindowsLogo.jpg");
+     /// Read image ( same size, same type )
+     src1 = imread("../../images/LinuxLogo.jpg");
+     src2 = imread("../../images/WindowsLogo.jpg");
 
-    if( !src1.data ) { printf("Error loading src1 \n"); return -1; }
-    if( !src2.data ) { printf("Error loading src2 \n"); return -1; }
+     if( !src1.data ) { printf("Error loading src1 \n"); return -1; }
+     if( !src2.data ) { printf("Error loading src2 \n"); return -1; }
 
-    /// Initialize values
-    alpha_slider = 0;
+     /// Initialize values
+     alpha_slider = 0;
 
-    /// Create Windows
-    namedWindow("Linear Blend", 1);
+     /// Create Windows
+     namedWindow("Linear Blend", 1);
 
-    /// Create Trackbars
-    char TrackbarName[50];
-    sprintf( TrackbarName, "Alpha x %d", alpha_slider_max );
+     /// Create Trackbars
+     char TrackbarName[50];
+     sprintf( TrackbarName, "Alpha x %d", alpha_slider_max );
 
-    createTrackbar( TrackbarName, "Linear Blend", &alpha_slider, alpha_slider_max, on_trackbar );
+     createTrackbar( TrackbarName, "Linear Blend", &alpha_slider, alpha_slider_max, on_trackbar );
 
-    /// Show some stuff
-    on_trackbar( alpha_slider, 0 );
+     /// Show some stuff
+     on_trackbar( alpha_slider, 0 );
 
-    /// Wait until user press some key
-    waitKey(0);
-    return 0;
+     /// Wait until user press some key
+     waitKey(0);
+     return 0;
    }
 
 

doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst

@@ -65,8 +65,7 @@ Making a project
 
    .. code-block:: cpp
 
-      #include <cv.h>
-      #include <highgui.h>
+      #include <opencv2/opencv.hpp>
 
       using namespace cv;
 
@@ -81,7 +80,7 @@ Making a project
             return -1;
           }
 
-        namedWindow( "Display Image", CV_WINDOW_AUTOSIZE );
+        namedWindow( "Display Image", WINDOW_AUTOSIZE );
         imshow( "Display Image", image );
 
         waitKey(0);
@@ -206,22 +205,15 @@ Say you have or create a new file, *helloworld.cpp* in a directory called *foo*:
 .. code-block:: cpp
 
 
-   #include <cv.h>
-   #include <highgui.h>
+   #include <opencv2/opencv.hpp>
+   using namespace cv;
+
    int main ( int argc, char **argv )
    {
-     cvNamedWindow( "My Window", 1 );
-     IplImage *img = cvCreateImage( cvSize( 640, 480 ), IPL_DEPTH_8U, 1 );
-     CvFont font;
-     double hScale = 1.0;
-     double vScale = 1.0;
-     int lineWidth = 1;
-     cvInitFont( &font, CV_FONT_HERSHEY_SIMPLEX | CV_FONT_ITALIC,
-                 hScale, vScale, 0, lineWidth );
-     cvPutText( img, "Hello World!", cvPoint( 200, 400 ), &font,
-                cvScalar( 255, 255, 0 ) );
-     cvShowImage( "My Window", img );
-     cvWaitKey();
+     Mat img(480, 640, CV_8U);
+     putText(img, "Hello World!", Point( 200, 400 ), FONT_HERSHEY_SIMPLEX | FONT_ITALIC, 1.0, Scalar( 255, 255, 0 ));
+     imshow("My Window", img);
+     waitKey();
      return 0;
    }
 

doc/tutorials/introduction/load_save_image/load_save_image.rst

@@ -26,8 +26,7 @@ Here it is:
 .. code-block:: cpp
    :linenos:
 
-   #include <cv.h>
-   #include <highgui.h>
+   #include <opencv2/opencv.hpp>
 
    using namespace cv;
 
@@ -45,12 +44,12 @@ Here it is:
     }
 
     Mat gray_image;
-    cvtColor( image, gray_image, CV_BGR2GRAY );
+    cvtColor( image, gray_image, COLOR_BGR2GRAY );
 
     imwrite( "../../images/Gray_Image.jpg", gray_image );
 
-    namedWindow( imageName, CV_WINDOW_AUTOSIZE );
-    namedWindow( "Gray image", CV_WINDOW_AUTOSIZE );
+    namedWindow( imageName, WINDOW_AUTOSIZE );
+    namedWindow( "Gray image", WINDOW_AUTOSIZE );
 
     imshow( imageName, image );
     imshow( "Gray image", gray_image );