From: André Pönitz <poenitz@gmx.net>
Date: Thu, 29 Nov 2007 22:12:19 +0000 (+0000)
Subject: use structure with named members instead of  pair<int, int>...
X-Git-Tag: 1.6.10~7126
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b06df568f3db8dccf586a5c750277cf3120bb327;p=lyx.git

use structure with named members instead of  pair<int, int>...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21868 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
index d1e14c819f..1a36eed31e 100644
--- a/src/frontends/qt4/GuiViewSource.cpp
+++ b/src/frontends/qt4/GuiViewSource.cpp
@@ -72,12 +72,12 @@ void ViewSourceWidget::updateView()
 	if (autoUpdateCB->isChecked())
 		update(viewFullSourceCB->isChecked());
 
-	int beg, end;
-	boost::tie(beg, end) = controller_.getRows();
+	GuiViewSource::Row row = controller_.getRows();
 	QTextCursor c = QTextCursor(viewSourceTV->document());
-	c.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, beg);
+	c.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, row.begin);
 	c.select(QTextCursor::BlockUnderCursor);
-	c.movePosition(QTextCursor::NextBlock, QTextCursor::KeepAnchor, end - beg + 1);
+	c.movePosition(QTextCursor::NextBlock, QTextCursor::KeepAnchor,
+		row.end - row.begin + 1);
 	viewSourceTV->setTextCursor(c);
 }
 
@@ -88,7 +88,8 @@ void ViewSourceWidget::update(bool full_source)
 }
 
 
-GuiViewSource::GuiViewSource(GuiView & parent, Qt::DockWidgetArea area, Qt::WindowFlags flags)
+GuiViewSource::GuiViewSource(GuiView & parent,
+		Qt::DockWidgetArea area, Qt::WindowFlags flags)
 	: DockView(parent, "view-source", area, flags)
 {
 	widget_ = new ViewSourceWidget(*this);
@@ -139,7 +140,7 @@ QString GuiViewSource::getContent(bool fullSource)
 }
 
 
-std::pair<int, int> GuiViewSource::getRows() const
+GuiViewSource::Row GuiViewSource::getRows() const
 {
 	BufferView const * view = bufferview();
 	CursorSlice beg = view->cursor().selectionBegin().bottom();
@@ -151,7 +152,10 @@ std::pair<int, int> GuiViewSource::getRows() const
 		getRowFromIdPos(end.paragraph().id(), end.pos());
 	int nextendrow = view->buffer().texrow().
 		getRowFromIdPos(end.paragraph().id(), end.pos() + 1);
-	return std::make_pair(begrow, endrow == nextendrow ? endrow : (nextendrow - 1));
+	Row row;
+	row.begin = begrow;
+	row.end = endrow == nextendrow ? endrow : (nextendrow - 1);
+	return row;
 }
 
 
@@ -172,7 +176,7 @@ QString GuiViewSource::title() const
 
 Dialog * createGuiViewSource(GuiView & lv)
 {
-	return new GuiViewSource(static_cast<GuiView &>(lv));
+	return new GuiViewSource(lv);
 }
 
 
diff --git a/src/frontends/qt4/GuiViewSource.h b/src/frontends/qt4/GuiViewSource.h
index 340d1d63b0..51a3e94cb6 100644
--- a/src/frontends/qt4/GuiViewSource.h
+++ b/src/frontends/qt4/GuiViewSource.h
@@ -87,9 +87,9 @@ public:
 		\param fullSource get full source code
 	 */
 	QString getContent(bool fullSource);
-	/** get the cursor position in the source code
-	 */
-	std::pair<int, int> getRows() const;
+	// cursor position in the source code
+	struct Row { int begin; int end; };
+	Row getRows() const;
 
 private:
 	/// The encapsulated widget.