From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Thu, 8 Aug 2013 11:51:12 +0000 (+0200)
Subject: Revert "qv4l2: add function getMargins"
X-Git-Tag: v4l-utils-1.2.0~415
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91aac539c342f23ab0dc05219d94e162f058c595;p=platform%2Fupstream%2Fv4l-utils.git

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
--- 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
--- 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.