next: drop DISABLE_OPENCV_24_COMPATIBILITY

modules/calib3d/include/opencv2/calib3d.hpp

@@ -2426,8 +2426,4 @@ optimization. It stays at the center or at a different location specified when C
 
 } //end namespace cv
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/calib3d/calib3d_c.h"
-#endif
-
 #endif

modules/core/include/opencv2/core/cvdef.h

@@ -254,7 +254,7 @@ Cv64suf;
 #define OPENCV_ABI_COMPATIBILITY 400
 
 #ifdef __OPENCV_BUILD
-#  define DISABLE_OPENCV_24_COMPATIBILITY
+#  define DISABLE_OPENCV_3_COMPATIBILITY
 #endif
 
 #ifdef CVAPI_EXPORTS

modules/core/include/opencv2/core/cvstd.hpp

@@ -281,10 +281,7 @@ struct Ptr
     @note It is often easier to use makePtr instead.
      */
     template<typename Y>
-#ifdef DISABLE_OPENCV_24_COMPATIBILITY
-    explicit
-#endif
-    Ptr(Y* p);
+    explicit Ptr(Y* p);
 
     /** @overload
     @param d Deleter to use for the owned pointer.

modules/core/include/opencv2/core/utility.hpp

@@ -1244,8 +1244,4 @@ CV_EXPORTS int getThreadID();
 
 } //namespace cv
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/core/core_c.h"
-#endif
-
 #endif //OPENCV_CORE_UTILITY_H

modules/highgui/include/opencv2/highgui.hpp

@@ -837,8 +837,4 @@ CV_EXPORTS int createButton( const String& bar_name, ButtonCallback on_change,
 
 } // cv
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/highgui/highgui_c.h"
-#endif
-
 #endif

modules/imgproc/include/opencv2/imgproc.hpp

@@ -4907,8 +4907,4 @@ Point LineIterator::pos() const
 
 } // cv
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/imgproc/imgproc_c.h"
-#endif
-
 #endif

modules/objdetect/include/opencv2/objdetect.hpp

@@ -676,8 +676,4 @@ public:
 
 #include "opencv2/objdetect/detection_based_tracker.hpp"
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/objdetect/objdetect_c.h"
-#endif
-
 #endif

modules/photo/include/opencv2/photo.hpp

@@ -869,8 +869,4 @@ CV_EXPORTS_W void stylization(InputArray src, OutputArray dst, float sigma_s = 6
 
 } // cv
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/photo/photo_c.h"
-#endif
-
 #endif

modules/video/include/opencv2/video.hpp

@@ -56,8 +56,4 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/video/background_segm.hpp"
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/video/tracking_c.h"
-#endif
-
 #endif //OPENCV_VIDEO_HPP