fixed issue with including private headers

Josh Klontz
1 parent 3473eeed
Showing 2 changed files with 17 additions and 5 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
@@ -234,6 +234,11 @@ void File::appendRect(const QRectF &amp;rect)
     m_metadata["Rects"] = newRects;
 }
+void File::appendRect(const Rect &rect)
+{
+    appendRect(OpenCVUtils::fromRect(rect));
+}
+
 void File::appendRects(const QList<QRectF> &rects)
 {
     QList<QVariant> newRects = m_metadata["Rects"].toList();
@@ -242,6 +247,11 @@ void File::appendRects(const QList&lt;QRectF&gt; &amp;rects)
     m_metadata["Rects"] = newRects;
 }
+void File::appendRects(const QList<Rect> &rects)
+{
+    appendRects(OpenCVUtils::fromRects(rects));
+}
+
 /* File - private methods */
 void File::init(const QString &file)
 {
@@ -41,8 +41,6 @@
 #include <QVector>
 #include <opencv2/core/core.hpp>
 #include <openbr/openbr.h>
-#include <openbr/core/qtutils.h>
-#include <openbr/core/opencvutils.h>
 /*!
  * \defgroup cpp_plugin_sdk C++ Plugin SDK
@@ -222,7 +220,11 @@ struct BR_EXPORT File
     template <typename T>
     void setList(const QString &key, const QList<T> &value)
     {
-        set(key, QtUtils::toVariantList(value));
+        QVariantList variantList;
+        variantList.reserve(value.size());
+        foreach (const T &item, value)
+            variantList << item;
+        set(key, variantList);
     }
     inline void remove(const QString &key) { m_metadata.remove(key); } /*!< \brief Remove the metadata key. */
@@ -315,9 +317,9 @@ struct BR_EXPORT File
     QList<QRectF> namedRects() const; /*!< \brief Returns rects convertible from metadata values. */
     QList<QRectF> rects() const; /*!< \brief Returns the file's rects list. */
     void appendRect(const QRectF &rect); /*!< \brief Adds a rect to the file's rect list. */
-    void appendRect(const cv::Rect &rect) { appendRect(OpenCVUtils::fromRect(rect)); } /*!< \brief Adds a rect to the file's rect list. */
+    void appendRect(const cv::Rect &rect); /*!< \brief Adds a rect to the file's rect list. */
     void appendRects(const QList<QRectF> &rects); /*!< \brief Adds rects to the file's rect list. */
-    void appendRects(const QList<cv::Rect> &rects) { appendRects(OpenCVUtils::fromRects(rects)); } /*!< \brief Adds rects to the file's rect list. */
+    void appendRects(const QList<cv::Rect> &rects); /*!< \brief Adds rects to the file's rect list. */
     inline void clearRects() { m_metadata["Rects"] = QList<QVariant>(); } /*!< \brief Clears the file's rect list. */
     inline void setRects(const QList<QRectF> &rects) { clearRects(); appendRects(rects); } /*!< \brief Overwrites the file's rect list. */
     inline void setRects(const QList<cv::Rect> &rects) { clearRects(); appendRects(rects); } /*!< \brief Overwrites the file's rect list. */