Revert "qv4l2: add function getMargins"

This reverts commit 603229f177942d47f9de3fcfb748143ec8a8fb92.

diff --git a/utils/qv4l2/capture-win.cpp b/utils/qv4l2/capture-win.cpp
index e583900..2d57909 100644 (file)
--- a/utils/qv4l2/capture-win.cpp
+++ b/utils/qv4l2/capture-win.cpp
@@ -54,22 +54,16 @@ void CaptureWin::buildWindow(QWidget *videoSurface)
        vbox->setSpacing(b);
 }
 
-QSize CaptureWin::getMargins()
-{
-       int l, t, r, b;
-       layout()->getContentsMargins(&l, &t, &r, &b);
-       return QSize(l + r, t + b + m_information.minimumSizeHint().height() + layout()->spacing());
-}
-
 void CaptureWin::setMinimumSize(int minw, int minh)
 {
        QDesktopWidget *screen = QApplication::desktop();
        QRect resolution = screen->screenGeometry();
        QSize maxSize = maximumSize();
 
-       QSize margins = getMargins();
-       minw += margins.width();
-       minh += margins.height();
+       int l, t, r, b;
+       layout()->getContentsMargins(&l, &t, &r, &b);
+       minw += l + r;
+       minh += t + b + m_information.minimumSizeHint().height() + layout()->spacing();
 
        if (minw > resolution.width())
                minw = resolution.width();

diff --git a/utils/qv4l2/capture-win.h b/utils/qv4l2/capture-win.h
index 6b72e00..ca60244 100644 (file)
--- a/utils/qv4l2/capture-win.h
+++ b/utils/qv4l2/capture-win.h
@@ -78,8 +78,6 @@ public:
 protected:
        void closeEvent(QCloseEvent *event);
        void buildWindow(QWidget *videoSurface);
-       QSize getMargins();
-
 
        /**
         * @brief A label that can is used to display capture information.