r23390 by craig - Code cleanup

scribus-commit scribus-commit at lists.scribus.net
Sat Nov 30 17:06:39 UTC 2019


Author: craig
Date: Sat Nov 30 17:06:39 2019
New Revision: 23390

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23390
Log:
Code cleanup

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/canvasmode_copyproperties.cpp
    trunk/Scribus/scribus/canvasmode_create.cpp
    trunk/Scribus/scribus/canvasmode_drawbezier.cpp
    trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
    trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
    trunk/Scribus/scribus/canvasmode_edit.cpp
    trunk/Scribus/scribus/canvasmode_edittable.cpp
    trunk/Scribus/scribus/canvasmode_framelinks.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
    trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
    trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
    trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
    trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
    trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
    trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
    trunk/Scribus/scribus/scpage.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/scribusview.h
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp	(original)
+++ trunk/Scribus/scribus/appmodehelper.cpp	Sat Nov 30 17:06:39 2019
@@ -229,7 +229,7 @@
 				if (!doc->m_Selection->isEmpty())
 				{
 					doc->ElemToLink = doc->m_Selection->itemAt(0);
-					doc->view()->Deselect(true);
+					doc->view()->deselectItems(true);
 					(*a_scrActions)["toolsCopyProperties"]->setEnabled(true);
 				}
 			}
@@ -240,7 +240,7 @@
 			{
 				setSpecialEditMode(true);
 				if ((doc->m_Selection->count() != 0) && (!PrefsManager::instance().appPrefs.uiPrefs.stickyTools))
-					doc->view()->Deselect(true);
+					doc->view()->deselectItems(true);
 			}
 			break;
 		case modeDrawCalligraphicLine:

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Sat Nov 30 17:06:39 2019
@@ -994,11 +994,11 @@
 			currItem->Sizing = false;
 			if (m_doc->SubMode != -1)
 			{
-				m_view->Deselect(false);
+				m_view->deselectItems(false);
 				m_doc->Items->removeOne(currItem);
 			}
 			else
-				m_view->Deselect(false);
+				m_view->deselectItems(false);
 			m_view->cancelGroupTransaction();
 		}
 		m_doc->DragP = false;

Modified: trunk/Scribus/scribus/canvasmode_copyproperties.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_copyproperties.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_copyproperties.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_copyproperties.cpp	Sat Nov 30 17:06:39 2019
@@ -301,7 +301,7 @@
 	}
 	else if ( (m->modifiers() & SELECT_MULTIPLE) == Qt::NoModifier || (m_doc->appMode == modeLinkFrames) || (m_doc->appMode == modeUnlinkFrames) )
 	{
-		m_view->Deselect(false);
+		m_view->deselectItems(false);
 	}
 	currItem = m_canvas->itemUnderCursor(m->globalPos(), currItem, (m->modifiers() & SELECT_IN_GROUP));
 	if (currItem)
@@ -353,7 +353,7 @@
 	}
 	m_doc->m_Selection->connectItemToGUI();
 	if ( !(m->modifiers() & SELECT_MULTIPLE) || (m_doc->appMode == modeLinkFrames) || (m_doc->appMode == modeUnlinkFrames))
-		m_view->Deselect(true);
+		m_view->deselectItems(true);
 	return false;
 }
 

Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp	Sat Nov 30 17:06:39 2019
@@ -387,7 +387,7 @@
 	switch (m_doc->appMode)
 	{
 		case modeDrawTable2:
-			m_view->Deselect(false);
+			m_view->deselectItems(false);
 			break;
 	}
 
@@ -450,7 +450,7 @@
 //	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
 //	mpo.moveBy(qRound(Doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	m_doc->nodeEdit.deselect();
-	m_view->Deselect(false);
+	m_view->deselectItems(false);
 	if (!m_doc->masterPageMode())
 	{
 		int i = m_doc->OnPage(canvasPressCoord.x(), canvasPressCoord.y());

Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp	Sat Nov 30 17:06:39 2019
@@ -138,7 +138,7 @@
 			currItem->PoLine.resize(qMax(0, static_cast<int>(currItem->PoLine.size())-2));
 		if (currItem->PoLine.size() < 4)
 		{
-			m_view->Deselect(false);
+			m_view->deselectItems(false);
 			Selection tempSelection(m_doc, false);
 			tempSelection.addItem(currItem);
 			m_doc->itemSelection_DeleteItem(&tempSelection, true);
@@ -485,7 +485,7 @@
 	m_xp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
 	m_yp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
 	m_doc->nodeEdit.deselect();
-	m_view->Deselect(false);
+	m_view->deselectItems(false);
 
 	if (m_doc->masterPageMode())
 		return;

Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp	Sat Nov 30 17:06:39 2019
@@ -206,7 +206,7 @@
 		return;
 	}
 	m_poly.resize(0);
-	m_view->Deselect(false);
+	m_view->deselectItems(false);
 	m_xp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	m_yp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
 	m_canvas->setRenderModeFillBuffer();
@@ -322,7 +322,7 @@
 	m_xp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
 	m_yp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
 	m_doc->nodeEdit.deselect();
-	m_view->Deselect(false);
+	m_view->deselectItems(false);
 
 	if (m_doc->masterPageMode())
 		return;

Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp	Sat Nov 30 17:06:39 2019
@@ -190,7 +190,7 @@
 		return;
 	}
 	m_poly.resize(0);
-	m_view->Deselect(false);
+	m_view->deselectItems(false);
 	m_xp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	m_yp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
 	m_canvas->setRenderModeFillBuffer();
@@ -307,7 +307,7 @@
 	m_xp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
 	m_yp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
 	m_doc->nodeEdit.deselect();
-	m_view->Deselect(false);
+	m_view->deselectItems(false);
 
 	if (m_doc->masterPageMode())
 		return;

Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp	Sat Nov 30 17:06:39 2019
@@ -583,7 +583,7 @@
 			if (m_canvas->frameHitTest(QPointF(canvasPoint.x(), canvasPoint.y()), currItem) < 0)
 			{
 				m_doc->m_Selection->delaySignalsOn();
-				m_view->Deselect(true);
+				m_view->deselectItems(true);
 				bool wantNormal = true;
 				if (SeleItem(m))
 				{
@@ -627,7 +627,7 @@
 			if (!inText)
 			{
 				currItem->invalidateLayout();
-				m_view->Deselect(true);
+				m_view->deselectItems(true);
 				//m_view->slotDoCurs(true);
 				m_view->requestMode(modeNormal);
 				m_view->canvasMode()->mousePressEvent(m);
@@ -708,7 +708,7 @@
 		}
 		else if (!currItem->asImageFrame() || m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), currItem) < 0)
 		{
-			m_view->Deselect(true);
+			m_view->deselectItems(true);
 			if (SeleItem(m))
 			{
 				currItem = m_doc->m_Selection->itemAt(0);
@@ -889,7 +889,7 @@
 				if (((Sele.contains(apr.boundingRect())) || (Sele.contains(apr2))) && m_doc->canSelectItemOnLayer(docItem->m_layerID))
 				{
 					bool redrawSelection=false;
-					m_view->SelectItemNr(a, redrawSelection);
+					m_view->selectItemByNumber(a, redrawSelection);
 				}
 			}
 			m_doc->m_Selection->delaySignalsOff();
@@ -1034,7 +1034,7 @@
 	}
 	else if ( (m->modifiers() & SELECT_MULTIPLE) == Qt::NoModifier)
 	{
-		m_view->Deselect(false);
+		m_view->deselectItems(false);
 	}
 	currItem = m_canvas->itemUnderCursor(m->globalPos(), currItem, (m->modifiers() & SELECT_IN_GROUP));
 	if (currItem)
@@ -1081,7 +1081,7 @@
 	}
 	m_doc->m_Selection->connectItemToGUI();
 	if ( !(m->modifiers() & SELECT_MULTIPLE))
-		m_view->Deselect(true);
+		m_view->deselectItems(true);
 	return false;
 }
 

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp	Sat Nov 30 17:06:39 2019
@@ -281,7 +281,7 @@
 				activeFrame->itemText.deselectAll();
 				activeFrame->HasSel = false;
 				// Deselect the table and go back to normal mode.
-				m_view->Deselect(true);
+				m_view->deselectItems(true);
 				m_view->requestMode(modeNormal);
 				m_view->canvasMode()->mousePressEvent(event);
 				break;

Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp	Sat Nov 30 17:06:39 2019
@@ -358,7 +358,7 @@
 	m_Mxp = mousePointDoc.x(); //static_cast<int>(m->x()/m_canvas->scale());
 	m_Myp = mousePointDoc.y(); //static_cast<int>(m->y()/m_canvas->scale());
 	m_doc->nodeEdit.deselect();
-	m_view->Deselect(false);
+	m_view->deselectItems(false);
 	if (!m_doc->masterPageMode())
 	{
 		int i = m_doc->OnPage(m_Mxp, m_Myp);
@@ -456,7 +456,7 @@
 	}
 	else if ( (m->modifiers() & SELECT_MULTIPLE) == Qt::NoModifier || (m_doc->appMode == modeLinkFrames) || (m_doc->appMode == modeUnlinkFrames) )
 	{
-		m_view->Deselect(false);
+		m_view->deselectItems(false);
 	}
 	currItem = m_canvas->itemUnderCursor(m->globalPos(), currItem, (m->modifiers() & SELECT_IN_GROUP));
 	if (currItem)
@@ -508,7 +508,7 @@
 	}
 	m_doc->m_Selection->connectItemToGUI();
 	if ( !(m->modifiers() & SELECT_MULTIPLE) || (m_doc->appMode == modeLinkFrames) || (m_doc->appMode == modeUnlinkFrames))
-		m_view->Deselect(true);
+		m_view->deselectItems(true);
 	return false;
 }
 

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp	Sat Nov 30 17:06:39 2019
@@ -1221,7 +1221,7 @@
 			currItem->emitAllToGUI();*/
 	}
 	else
-		m_view->Deselect(true);
+		m_view->deselectItems(true);
 
 	xSnap = ySnap = 0;
 	m_canvas->setRenderModeUseBuffer(false);
@@ -1475,7 +1475,7 @@
 
 void CanvasMode_Normal::handleNamedAction(PageItem* currItem)
 {
-	m_view->Deselect(true);
+	m_view->deselectItems(true);
 	QString name = currItem->annotation().Action();
 	if (name == "FirstPage")
 		m_view->GotoPage(0);
@@ -1501,7 +1501,7 @@
 {
 	if (currItem->annotation().ActionType() == Annotation::Action_GoTo)
 	{
-		m_view->Deselect(true);
+		m_view->deselectItems(true);
 		if (currItem->annotation().Ziel() < m_doc->Pages->count())
 			m_view->GotoPage(currItem->annotation().Ziel());
 		else
@@ -1680,7 +1680,7 @@
 	}
 	else if ( (m->modifiers() & SELECT_MULTIPLE) == Qt::NoModifier)
 	{
-		m_view->Deselect(false);
+		m_view->deselectItems(false);
 	}
 	currItem = m_canvas->itemUnderCursor(m->globalPos(), currItem, ((m->modifiers() & SELECT_IN_GROUP) || (m_doc->drawAsPreview && !m_doc->editOnPreview)));
 	if (currItem)
@@ -1768,7 +1768,7 @@
 			m_canvas->update();
 		}
 		else
-			m_view->Deselect(true);
+			m_view->deselectItems(true);
 	}
 	if (previousSelectedItem != nullptr)
 		handleFocusOut(previousSelectedItem);

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Sat Nov 30 17:06:39 2019
@@ -6999,8 +6999,8 @@
 	if (!isUndo)
 		type = state->getInt("NEW_TYPE");
 	ScribusView* view = m_Doc->view();
-	view->Deselect(false);
-	view->SelectItem(item, false);
+	view->deselectItems(false);
+	view->selectItem(item, false);
 	switch (type)
 	{
 		case ImageFrame: view->ToPicFrame(); break;
@@ -7344,7 +7344,7 @@
 	if (!is)
 		qFatal("PageItem::restoreUniteItem: dynamic cast failed");
 
-	m_Doc->view()->Deselect(true);
+	m_Doc->view()->deselectItems(true);
 	if (isUndo)
 	{
 		int pts = 0;
@@ -7370,7 +7370,7 @@
 	{
 		select();
 		for (int i = 0; i < is->getItem().first.size(); ++i)
-			doc()->view()->SelectItem(is->getItem().first.at(i));
+			doc()->view()->selectItem(is->getItem().first.at(i));
 		doc()->itemSelection_UniteItems();
 		select();
 	}
@@ -7387,7 +7387,7 @@
 	if (isUndo)
 	{
 		for (int i = 0; i < itemsList.size(); ++i)
-			doc()->view()->SelectItem(doc()->Items->at(itemsList.at(i)));
+			doc()->view()->selectItem(doc()->Items->at(itemsList.at(i)));
 		doc()->itemSelection_UniteItems();
 		select();
 	}
@@ -7436,7 +7436,7 @@
 {
 	ScribusView* view = m_Doc->view();
 	setLayer(isUndo ? state->getInt("OLD_LAYER") : state->getInt("NEW_LAYER"));
-	view->Deselect(true);
+	view->deselectItems(true);
 	m_Doc->regionsChanged()->update(QRectF());
 }
 
@@ -7534,7 +7534,7 @@
 
 void PageItem::select()
 {
-	m_Doc->view()->Deselect(false);
+	m_Doc->view()->deselectItems(false);
 	//CB #2969 add this true parm to addItem so we don't connectToGUI, the rest of view->SelectItem isn't needed anyway
 	m_Doc->m_Selection->addItem(this, true);
 }

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sat Nov 30 17:06:39 2019
@@ -3807,7 +3807,7 @@
 		PageItem * jumpFrame = frameTextEnd();
 		if (jumpFrame)
 		{
-			m_Doc->view()->Deselect(true);
+			m_Doc->view()->deselectItems(true);
 			m_Doc->scMW()->selectItemsFromOutlines(jumpFrame);
 			m_Doc->scMW()->setTBvals(jumpFrame);
 			jumpFrame->update();
@@ -4055,7 +4055,7 @@
 					{
 						if (NextBox->frameDisplays(itemText.cursorPosition()))
 						{
-							view->Deselect(true);
+							view->deselectItems(true);
 							// we position the cursor at the beginning of the next frame
 							// TODO position at the right place in next frame
 							m_Doc->scMW()->selectItemsFromOutlines(NextBox);
@@ -4068,7 +4068,7 @@
 				{
 					if (NextBox->frameDisplays(lastInFrame()+1))
 					{
-						view->Deselect(true);
+						view->deselectItems(true);
 						m_Doc->scMW()->selectItemsFromOutlines(NextBox);
 					}
 				}
@@ -4104,7 +4104,7 @@
 				else
 					if ((textLayout.lines() > 0) && (oldPos <= textLayout.line(0)->lastChar()) && (itemText.cursorPosition()  == firstInFrame()) && (BackBox != nullptr))
 					{
-						view->Deselect(true);
+						view->deselectItems(true);
 						// TODO position at the right place in previous frame
 						BackBox->itemText.setCursorPosition( BackBox->lastInFrame() );
 						m_Doc->scMW()->selectItemsFromOutlines(BackBox);
@@ -4115,7 +4115,7 @@
 				itemText.setCursorPosition( firstInFrame() );
 				if (BackBox != nullptr)
 				{
-					view->Deselect(true);
+					view->deselectItems(true);
 					BackBox->itemText.setCursorPosition( BackBox->lastInFrame() );
 					m_Doc->scMW()->selectItemsFromOutlines(BackBox);
 				}
@@ -4128,7 +4128,7 @@
 	case Qt::Key_PageUp:
 		if (itemText.cursorPosition() == firstInFrame() && BackBox != nullptr)
 		{
-			view->Deselect(true);
+			view->deselectItems(true);
 			BackBox->itemText.setCursorPosition( BackBox->firstInFrame() );
 			m_Doc->scMW()->selectItemsFromOutlines(BackBox);
 			//currItem = currItem->BackBox;
@@ -4142,7 +4142,7 @@
 	case Qt::Key_PageDown:
 		if (!frameDisplays(itemText.length()-1) && itemText.cursorPosition() >= lastInFrame() && NextBox != nullptr)
 		{
-			view->Deselect(true);
+			view->deselectItems(true);
 			itemText.setCursorPosition( NextBox->lastInFrame() );
 			m_Doc->scMW()->selectItemsFromOutlines(NextBox);
 			//currItem = currItem->BackBox;
@@ -4173,7 +4173,7 @@
 				itemText.setCursorPosition( firstInFrame() );
 				if (BackBox != nullptr)
 				{
-					view->Deselect(true);
+					view->deselectItems(true);
 					BackBox->itemText.setCursorPosition( BackBox->lastInFrame() );
 					m_Doc->scMW()->selectItemsFromOutlines(BackBox);
 					//currItem = currItem->BackBox;
@@ -4215,7 +4215,7 @@
 				{
 					if (NextBox->frameDisplays(itemText.cursorPosition()))
 					{
-						view->Deselect(true);
+						view->deselectItems(true);
 						m_Doc->scMW()->selectItemsFromOutlines(NextBox);
 						//currItem = currItem->NextBox;
 					}
@@ -4337,7 +4337,7 @@
 			itemText.setCursorPosition( firstInFrame() );
 			if (BackBox != nullptr)
 			{
-				view->Deselect(true);
+				view->deselectItems(true);
 				if (BackBox->invalid)
 					BackBox->updateLayout();
 				itemText.setCursorPosition( BackBox->lastInFrame() );
@@ -4503,7 +4503,7 @@
 		//but not for notes frames can`t be updated as may disapper during update
 		if ((itemText.cursorPosition() > lastInFrame() + 1) && (lastInFrame() < (itemText.length() - 2)) && NextBox != nullptr)
 		{
-			view->Deselect(true);
+			view->deselectItems(true);
 			NextBox->update();
 			m_Doc->scMW()->selectItemsFromOutlines(NextBox);
 		}

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp	Sat Nov 30 17:06:39 2019
@@ -468,7 +468,7 @@
 		}
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp	Sat Nov 30 17:06:39 2019
@@ -205,7 +205,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	Sat Nov 30 17:06:39 2019
@@ -247,7 +247,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	Sat Nov 30 17:06:39 2019
@@ -204,7 +204,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	Sat Nov 30 17:06:39 2019
@@ -219,7 +219,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	Sat Nov 30 17:06:39 2019
@@ -661,7 +661,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfh.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfh.cpp	Sat Nov 30 17:06:39 2019
@@ -205,7 +205,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	Sat Nov 30 17:06:39 2019
@@ -352,7 +352,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	Sat Nov 30 17:06:39 2019
@@ -212,7 +212,7 @@
 	}
 	Elements.clear();
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	Sat Nov 30 17:06:39 2019
@@ -490,7 +490,7 @@
 		}
 	}
 	if (!(flags & LoadSavePlugin::lfLoadAsPattern))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	Sat Nov 30 17:06:39 2019
@@ -680,7 +680,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	Sat Nov 30 17:06:39 2019
@@ -224,7 +224,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp	Sat Nov 30 17:06:39 2019
@@ -212,7 +212,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpm.cpp	Sat Nov 30 17:06:39 2019
@@ -201,7 +201,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpub.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpub.cpp	Sat Nov 30 17:06:39 2019
@@ -204,7 +204,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	Sat Nov 30 17:06:39 2019
@@ -209,7 +209,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	Sat Nov 30 17:06:39 2019
@@ -204,7 +204,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	Sat Nov 30 17:06:39 2019
@@ -393,7 +393,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))

Modified: trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	Sat Nov 30 17:06:39 2019
@@ -488,7 +488,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp	Sat Nov 30 17:06:39 2019
@@ -208,7 +208,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	Sat Nov 30 17:06:39 2019
@@ -602,7 +602,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	Sat Nov 30 17:06:39 2019
@@ -572,7 +572,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	Sat Nov 30 17:06:39 2019
@@ -313,7 +313,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	Sat Nov 30 17:06:39 2019
@@ -344,7 +344,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	Sat Nov 30 17:06:39 2019
@@ -268,7 +268,7 @@
 		m_Doc->setPageSize("Custom");
 	}
 	if ((!(flags & LoadSavePlugin::lfLoadAsPattern)) && (m_Doc->view() != nullptr))
-		m_Doc->view()->Deselect();
+		m_Doc->view()->deselectItems();
 	Elements.clear();
 	m_Doc->setLoading(true);
 	m_Doc->DoDrawing = false;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp	Sat Nov 30 17:06:39 2019
@@ -60,17 +60,17 @@
 
 	currentDoc->m_Selection->clear();
 	// Clear the selection
-	currentView->Deselect();
+	currentView->deselectItems();
 	// Select the item, which will also select its group if
 	// there is one.
-	currentView->SelectItem(item);
+	currentView->selectItem(item);
 
 	// scale
 	currentDoc->itemSelection_SetImageScale(x, y); //CB why when this is done above?
 	currentDoc->updatePic();
 
 	// Now restore the selection.
-	currentView->Deselect();
+	currentView->deselectItems();
 	if (hadOrigSelection)
 		*currentDoc->m_Selection=tempSelection;
 
@@ -102,10 +102,10 @@
 
 	currentDoc->m_Selection->clear();
 	// Clear the selection
-	currentView->Deselect();
+	currentView->deselectItems();
 	// Select the item, which will also select its group if
 	// there is one.
-	currentView->SelectItem(item);
+	currentView->selectItem(item);
 
 	// scale
 	double newScaleX = x / item->pixm.imgInfo.xres * 72.0;
@@ -114,7 +114,7 @@
 	currentDoc->updatePic();
 
 	// Now restore the selection.
-	currentView->Deselect();
+	currentView->deselectItems();
 	if (hadOrigSelection)
 		*currentDoc->m_Selection=tempSelection;
 
@@ -145,10 +145,10 @@
 
 	currentDoc->m_Selection->clear();
 	// Clear the selection
-	currentView->Deselect();
+	currentView->deselectItems();
 	// Select the item, which will also select its group if
 	// there is one.
-	currentView->SelectItem(item);
+	currentView->selectItem(item);
 
 	// offset
 	double newOffsetX = x / ((item->imageXScale() != 0.0) ? item->imageXScale() : 1);
@@ -157,7 +157,7 @@
 	currentDoc->updatePic();
 
 	// Now restore the selection.
-	currentView->Deselect();
+	currentView->deselectItems();
 	if (hadOrigSelection)
 		*currentDoc->m_Selection=tempSelection;
 
@@ -239,10 +239,10 @@
 
 	currentDoc->m_Selection->clear();
 	// Clear the selection
-	currentView->Deselect();
+	currentView->deselectItems();
 	// Select the item, which will also select its group if
 	// there is one.
-	currentView->SelectItem(item);
+	currentView->selectItem(item);
 	// Move the item, or items
 	if (currentDoc->m_Selection->count() > 1)
 	{
@@ -254,7 +254,7 @@
 		currentDoc->moveItem(ValueToPoint(x), ValueToPoint(y), item);
 		}
 	// Now restore the selection.
-	currentView->Deselect();
+	currentView->deselectItems();
 	if (hadOrigSelection)
 		*currentDoc->m_Selection=tempSelection;
 	Py_RETURN_NONE;
@@ -279,10 +279,10 @@
 	bool hadOrigSelection = (tempSelection.count() != 0);
 
 	// Clear the selection
-	currentView->Deselect();
+	currentView->deselectItems();
 	// Select the item, which will also select its group if
 	// there is one.
-	currentView->SelectItem(item);
+	currentView->selectItem(item);
 	// Move the item, or items
 	if (currentDoc->m_Selection->count() > 1)
 	{
@@ -295,7 +295,7 @@
 	else
 		currentDoc->moveItem(pageUnitXToDocX(x) - item->xPos(), pageUnitYToDocY(y) - item->yPos(), item);
 	// Now restore the selection.
-	currentView->Deselect();
+	currentView->deselectItems();
 	if (hadOrigSelection)
 		*currentDoc->m_Selection=tempSelection;
 
@@ -414,8 +414,8 @@
 		return nullptr;
 
 	ScribusMainWindow* currentWin = ScCore->primaryMainWindow();
-	currentWin->view->Deselect();
-	currentWin->view->SelectItem(i);
+	currentWin->view->deselectItems();
+	currentWin->view->selectItem(i);
 	currentWin->UnGroupObj();
 
 	Py_RETURN_NONE;
@@ -441,8 +441,8 @@
 	ScribusDoc* currentDoc = ScCore->primaryMainWindow()->doc;
 	ScribusView* currentView = ScCore->primaryMainWindow()->view;
 
-	currentView->Deselect();
-	currentView->SelectItem(i);
+	currentView->deselectItems();
+	currentView->selectItem(i);
 //	int h = currentView->frameResizeHandle;
 //	currentView->frameResizeHandle = 1;
 	currentView->startGroupTransaction(Um::Resize, "", Um::IResize);
@@ -483,7 +483,7 @@
 	PageItem *i = GetUniqueItem(QString::fromUtf8(Name));
 	if (i == nullptr)
 		return nullptr;
-	ScCore->primaryMainWindow()->view->SelectItem(i);
+	ScCore->primaryMainWindow()->view->selectItem(i);
 	Py_RETURN_NONE;
 }
 
@@ -491,7 +491,7 @@
 {
 	if (!checkHaveDocument())
 		return nullptr;
-	ScCore->primaryMainWindow()->view->Deselect();
+	ScCore->primaryMainWindow()->view->deselectItems();
 	Py_RETURN_NONE;
 }
 
@@ -603,10 +603,10 @@
 
 	currentDoc->m_Selection->clear();
 	// Clear the selection
-	currentView->Deselect();
+	currentView->deselectItems();
 	// Select the item, which will also select its group if
 	// there is one.
-	currentView->SelectItem(item);
+	currentView->selectItem(item);
 
 	// flip
 	if (h == 1)
@@ -614,7 +614,7 @@
 	if (v == 1)
 		currentDoc->itemSelection_FlipV();
 	// Now restore the selection.
-	currentView->Deselect();
+	currentView->deselectItems();
 	if (hadOrigSelection)
 		*currentDoc->m_Selection = tempSelection;
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	Sat Nov 30 17:06:39 2019
@@ -211,7 +211,7 @@
 		return nullptr;
 	}
 	// If no name have been specified in args, process whole selection
-	currentView->SelectItem(item);
+	currentView->selectItem(item);
 	if (strlen(Name) == 0)
 	{
 		for (int i = 0; i < currentDoc->m_Selection->count(); ++i)

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	Sat Nov 30 17:06:39 2019
@@ -675,9 +675,9 @@
 		if (selectionLength > 0)
 			selectionStart = item->itemText.startOfSelection();
 		// quick hack to always apply on the right frame - pv
-		currentView->Deselect(true);
+		currentView->deselectItems(true);
 		//CB I dont think we need to draw here. Its faster if we dont.
-		currentView->SelectItem(item, false);
+		currentView->selectItem(item, false);
 		// Restore text selection if necessary
 		if (selectionStart >= 0)
 		{
@@ -758,9 +758,9 @@
 		if (selectionLength > 0)
 			selectionStart = item->itemText.startOfSelection();
 		// quick hack to always apply on the right frame - pv
-		currentView->Deselect(true);
+		currentView->deselectItems(true);
 		//CB I dont think we need to draw here. Its faster if we dont.
-		currentView->SelectItem(item, false);
+		currentView->selectItem(item, false);
 		// Restore text selection if necessary
 		if (selectionStart >= 0)
 		{

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp	Sat Nov 30 17:06:39 2019
@@ -1242,8 +1242,8 @@
 	}
 	if (item->invalid)
 		item->layout();
-	ScCore->primaryMainWindow()->view->Deselect(true);
-	ScCore->primaryMainWindow()->view->SelectItem(item);
+	ScCore->primaryMainWindow()->view->deselectItems(true);
+	ScCore->primaryMainWindow()->view->selectItem(item);
 	ScCore->primaryMainWindow()->view->TextToPath();
 
 	Py_RETURN_NONE;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp	Sat Nov 30 17:06:39 2019
@@ -176,7 +176,7 @@
 
 bool setSelectedItemsByName(QStringList& itemNames)
 {
-	ScCore->primaryMainWindow()->view->Deselect();
+	ScCore->primaryMainWindow()->view->deselectItems();
 	// For each named item
 	for (QStringList::Iterator it = itemNames.begin() ; it != itemNames.end() ; it++)
 	{
@@ -188,7 +188,7 @@
 		if (!item)
 			return false;
 		// and select it
-		ScCore->primaryMainWindow()->view->SelectItem(item);
+		ScCore->primaryMainWindow()->view->selectItem(item);
 	}
 	return true;
 }

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp	Sat Nov 30 17:06:39 2019
@@ -427,7 +427,7 @@
 			}
 		}
 		currDoc->m_Selection->clear();
-		currDoc->view()->Deselect(true);
+		currDoc->view()->deselectItems(true);
 	}
 
 	currDoc->changed();

Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp	(original)
+++ trunk/Scribus/scribus/scpage.cpp	Sat Nov 30 17:06:39 2019
@@ -346,7 +346,7 @@
 			m_Doc->m_Selection->removeItem(ite);
 		}
 		if ((stateCode == 0) || (stateCode == 1))
-			m_Doc->view()->Deselect(true);
+			m_Doc->view()->deselectItems(true);
 		Selection tmpSelection(m_Doc, false);
 		tmpSelection.addItem(ite);
 		m_Doc->itemSelection_DeleteItem(&tmpSelection);
@@ -354,7 +354,7 @@
 	else
 	{
 		if ((stateCode == 0) || (stateCode == 1))
-			m_Doc->view()->Deselect(true);
+			m_Doc->view()->deselectItems(true);
 		m_Doc->Items->append(ite);
 		ite->OwnPage = m_Doc->OnPage(ite);
 	}
@@ -375,7 +375,7 @@
 	int id2 = state->getInt("ID");
 	if (itemList.count() <= 0) 
 		return;
-	m_Doc->view()->Deselect(true);
+	m_Doc->view()->deselectItems(true);
 	bool oldMPMode = m_Doc->masterPageMode();
 	m_Doc->setMasterPageMode(!itemList.at(0)->OnMasterPage.isEmpty());
 	if (m_Doc->appMode == modeEditClip) // switch off from edit shape

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sat Nov 30 17:06:39 2019
@@ -1687,11 +1687,11 @@
 					currItem->Sizing = false;
 					if (doc->SubMode != -1)
 					{
-						view->Deselect(false);
+						view->deselectItems(false);
 						doc->Items->removeOne(currItem);
 					}
 					else
-						view->Deselect(false);
+						view->deselectItems(false);
 					view->cancelGroupTransaction();
 					break;
 				case modeEdit:
@@ -1703,7 +1703,7 @@
 				case modeLinkFrames:
 				case modeUnlinkFrames:
 				case modeRotation:
-					view->Deselect(false);
+					view->deselectItems(false);
 				case modeEditWeldPoint:
 				case modeEyeDropper:
 				case modeImportObject:
@@ -1716,7 +1716,7 @@
 				default:
 					if (currItem->Sizing)
 					{
-						view->Deselect(false);
+						view->deselectItems(false);
 						doc->Items->removeOne(currItem);
 					}
 					break;
@@ -3077,7 +3077,7 @@
 		UndoTransaction pasteAction;
 		if (UndoManager::undoEnabled())
 			pasteAction = m_undoManager->beginTransaction(Um::SelectionGroup, Um::IGroup, Um::Create,"",Um::ICreate);
-		view->Deselect(true);
+		view->deselectItems(true);
 		int docItemCount = doc->Items->count();
 		bool savedAlignGrid = doc->SnapGrid;
 		bool savedAlignGuides = doc->SnapGuides;
@@ -3581,7 +3581,7 @@
 		zoomSpinBox->blockSignals(b);
 		view->unitChange();
 		setScriptRunning(false);
-		view->Deselect(true);
+		view->deselectItems(true);
 		m_mainWindowStatusLabel->setText("");
 		mainWindowProgressBar->reset();
 		HaveDoc++;
@@ -4281,7 +4281,7 @@
 bool ScribusMainWindow::DoFileClose()
 {
 	slotEndSpecialEdit();
-	view->Deselect(false);
+	view->deselectItems(false);
 	if (doc == storyEditor->currentDocument())
 		storyEditor->close();
 	actionManager->disconnectNewDocActions();
@@ -4945,7 +4945,7 @@
 	{
 		if (ScMimeData::clipboardHasScribusElem() || ScMimeData::clipboardHasScribusFragment() || internalCopy)
 		{
-			view->Deselect(true);
+			view->deselectItems(true);
 			int docItemCount = doc->Items->count();
 			bool savedAlignGrid = doc->SnapGrid;
 			bool savedAlignGuides = doc->SnapGuides;
@@ -5022,7 +5022,7 @@
 		return;
 
 	PageItem *currItem;
-	view->Deselect();
+	view->deselectItems();
 	int docItemsCount = doc->Items->count();
 	int docCurrentPage = doc->currentPageNumber();
 	doc->m_Selection->delaySignalsOn();
@@ -5107,7 +5107,7 @@
 	else
 	{
 		PageItem *currItem;
-		view->Deselect();
+		view->deselectItems();
 		doc->m_Selection->delaySignalsOn();
 		int docItemsCount = doc->Items->count();
 		int docCurrentPage = doc->currentPageNumber();
@@ -5150,12 +5150,12 @@
 		}
 		else
 		{
-			doc->view()->Deselect(true);
+			doc->view()->deselectItems(true);
 			doc->view()->requestMode(modeNormal);
 		}
 	}
 	else if (view != nullptr)
-		view->Deselect(true);
+		view->deselectItems(true);
 }
 
 void ScribusMainWindow::ClipChange()
@@ -5303,7 +5303,7 @@
 		return;
 	if (doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
-	view->Deselect(true);
+	view->deselectItems(true);
 	int where = 1;
 	if (wo == 0)
 		where = 0;
@@ -5334,7 +5334,7 @@
 		return;
 	if (doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
-	view->Deselect(true);
+	view->deselectItems(true);
 	InsPage *dia = new InsPage(this, doc, doc->currentPage()->pageNr(), doc->Pages->count());
 	if (dia->exec())
 	{
@@ -5485,7 +5485,7 @@
 {
 	if (!HaveDoc)
 		return;
-	view->Deselect(true);
+	view->deselectItems(true);
 	int pageLocationIndex=-1;
 	int pageLocationCount=0;
 	if (doc->pagePositioning() != singlePage)
@@ -6140,7 +6140,7 @@
 {
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
-	view->Deselect(true);
+	view->deselectItems(true);
 	if (doc->Pages->count() == 1)
 		return;
 	deletePage(pg+1, pg+1);
@@ -6150,7 +6150,7 @@
 {
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
-	view->Deselect(true);
+	view->deselectItems(true);
 	DelPages *dia = new DelPages(this, doc->currentPage()->pageNr()+1, doc->Pages->count());
 	if (dia->exec())
 		deletePage(dia->getFromPage(), dia->getToPage());
@@ -6285,7 +6285,7 @@
 	int copyCount=dia->getCopyCount();
 	int wo = dia->getWherePage();
 	doc->copyPage(pageNumberToCopy, wo, whereToInsert, copyCount);
-	view->Deselect(true);
+	view->deselectItems(true);
 	doc->updateEndnotesFrames();
 	updateGUIAfterPagesChanged();
 	slotDocCh();
@@ -6457,7 +6457,7 @@
 	int oldItemCount = doc->Items->count();
 	doc->m_Selection->delaySignalsOn();
 	doc->itemSelection_MultipleDuplicate(mdData);
-	view->Deselect(true);
+	view->deselectItems(true);
 	for (int i = oldItemCount; i < doc->Items->count(); ++i)
 	{
 		PageItem* item = doc->Items->at(i);
@@ -6560,7 +6560,7 @@
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
 	activateWindow();
-	view->Deselect(true);
+	view->deselectItems(true);
 	if (!doc->symbolEditMode() && !doc->inlineEditMode())
 	{
 		int itemPage = ite->OwnPage;
@@ -6574,7 +6574,7 @@
 			view->GotoPage(itemPage);
 	}
 	doc->m_Selection->delaySignalsOn();
-	view->SelectItem(ite, true, single);
+	view->selectItem(ite, true, single);
 	doc->m_Selection->delaySignalsOff();
 
 	if (doc->m_Selection->isEmpty())
@@ -6617,7 +6617,7 @@
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
 	activateWindow();
-	view->Deselect(true);
+	view->deselectItems(true);
 	if (Page < 0)
 		return;
 	view->GotoPage(Page);
@@ -7512,7 +7512,7 @@
 		doc->autoSaveTimer->stop();
 		doc->setAutoSave(false);
 	}
-	view->Deselect(true);
+	view->deselectItems(true);
 	m_storedPageNum = doc->currentPageNumber();
 	m_storedViewXCoor = view->contentsX();
 	m_storedViewYCoor = view->contentsY();
@@ -7590,7 +7590,7 @@
 		doc->autoSaveTimer->stop();
 		doc->setAutoSave(false);
 	}
-	view->Deselect(true);
+	view->deselectItems(true);
 	m_storedPageNum = doc->currentPageNumber();
 	m_storedViewXCoor = view->contentsX();
 	m_storedViewYCoor = view->contentsY();
@@ -7653,7 +7653,7 @@
 		mpName = doc->currentPage()->masterPageName();
 	else
 		mpName = temp;
-	view->Deselect(true);
+	view->deselectItems(true);
 	if (doc->drawAsPreview)
 	{
 		view->togglePreview(false);
@@ -7960,7 +7960,7 @@
 		}
 		if (doc->appMode == modeEditClip)
 			view->requestMode(submodeEndNodeEdit);
-		view->Deselect(true);
+		view->deselectItems(true);
 		deletePage(delFrom, delTo);
 	}
 	else
@@ -7992,12 +7992,12 @@
 void ScribusMainWindow::restoreGrouping(SimpleState *state, bool isUndo)
 {
 	int itemCount = state->getInt("itemcount");
-	view->Deselect();
+	view->deselectItems();
 	for (int i = 0; i < itemCount; ++i)
 	{
 		int itemNr = doc->getItemNrfromUniqueID(state->getUInt(QString("item%1").arg(i)));
 		if (doc->Items->at(itemNr)->uniqueNr == state->getUInt(QString("item%1").arg(i)))
-			view->SelectItemNr(itemNr);
+			view->selectItemByNumber(itemNr);
 	}
 	if (isUndo)
 		UnGroupObj();
@@ -8008,12 +8008,12 @@
 void ScribusMainWindow::restoreUngrouping(SimpleState *state, bool isUndo)
 {
 	int itemCount = state->getInt("itemcount");
-	view->Deselect();
+	view->deselectItems();
 	for (int i = 0; i < itemCount; ++i)
 	{
 		int itemNr = doc->getItemNrfromUniqueID(state->getUInt(QString("item%1").arg(i)));
 		if (doc->Items->at(itemNr)->uniqueNr == state->getUInt(QString("item%1").arg(i)))
-			view->SelectItemNr(itemNr);
+			view->selectItemByNumber(itemNr);
 	}
 	if (isUndo)
 		GroupObj(false);
@@ -8179,7 +8179,7 @@
 		slotSelect();
 	else if (doc->appMode == modeEditClip)
 		NoFrameEdit();
-	view->Deselect(true);
+	view->deselectItems(true);
 	rebuildLayersList();
 	layerPalette->rebuildList();
 	layerPalette->markActiveLayer();
@@ -8219,7 +8219,7 @@
 
 void ScribusMainWindow::setCurrentPage(int p)
 {
-	doc->view()->Deselect();
+	doc->view()->deselectItems();
 	int p0=p-1; //p is what the user sees.. p0 is our count from 0
 	doc->setCurrentPage(doc->Pages->at(p0));
 	if (scriptIsRunning())
@@ -8885,7 +8885,7 @@
 
 	view->requestMode(modeNormal);
 	if (!doc->m_Selection->isEmpty())
-		view->Deselect(false);
+		view->deselectItems(false);
 
 	InsertAFrame dia(this, doc);
 	if (dia.exec())
@@ -8979,7 +8979,7 @@
 	inlinePalette->setDoc(doc);
 	if (outlinePalette->isVisible())
 		outlinePalette->BuildTree();
-	view->Deselect(false);
+	view->deselectItems(false);
 }
 
 void ScribusMainWindow::PutToInline()
@@ -9043,7 +9043,7 @@
 	inlinePalette->setDoc(doc);
 	if (outlinePalette->isVisible())
 		outlinePalette->BuildTree();
-	view->Deselect(false);
+	view->deselectItems(false);
 }
 
 void ScribusMainWindow::PutToPatterns()
@@ -9070,7 +9070,7 @@
 	doc->SnapGuides = savedAlignGuides;
 	doc->SnapElement = savedAlignElement;
 	doc->m_Selection->clear();
-	view->Deselect(true);
+	view->deselectItems(true);
 	PageItem* currItem;
 	doc->m_Selection->delaySignalsOn();
 	for (int as = ac; as < doc->Items->count(); ++as)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sat Nov 30 17:06:39 2019
@@ -6445,10 +6445,10 @@
 	if (newType == PageItem::PathText)
 	{
 		//FIXME: Stop using the view here
-		m_View->SelectItem(secondaryItem);
+		m_View->selectItem(secondaryItem);
 		itemSelection_DeleteItem();
 		regionsChanged()->update(QRectF());
-		m_View->Deselect(true);
+		m_View->deselectItems(true);
 	}
 	//Create the undo action for the new item
 	if (UndoManager::undoEnabled())
@@ -10475,7 +10475,7 @@
 void ScribusDoc::removeLayer(int l, bool dl)
 {
 	//FIXME: stop using m_View
-	m_View->Deselect();
+	m_View->deselectItems();
 	Selection tmpSelection(this, false);
 	int newLayerID = 0;
 	// Find the new layer identifier
@@ -10749,7 +10749,7 @@
 		setRotationMode ( 0 );
 		ScriXmlDoc xmlDoc;
 		QString copyBuffer = xmlDoc.writeElem(this, m_Selection);
-		view()->Deselect(true);
+		view()->deselectItems(true);
 		for (int b = 0; b < nrOfCopies; b++)
 		{
 			uint ac = Items->count();
@@ -11745,7 +11745,7 @@
 									 Um::ILayerAction);
 		}
 	}
-	m_View->Deselect(true);
+	m_View->deselectItems(true);
 	regionsChanged()->update(QRectF());
 	changed();
 }
@@ -13545,7 +13545,7 @@
 		ScriXmlDoc ss;
 		QString BufferS = ss.writeElem(this, &selection);
 		//FIXME: stop using m_View
-		m_View->Deselect(true);
+		m_View->deselectItems(true);
 		for (int i=0; i<mdData.copyCount; ++i)
 		{
 			uint ac = Items->count();
@@ -13641,7 +13641,7 @@
 	DoDrawing = true;
 	view()->updatesOn(true);
 	//FIXME: stop using m_View
-	m_View->Deselect(true);
+	m_View->deselectItems(true);
 	view()->DrawNew();
 	changed();
 }
@@ -15621,9 +15621,9 @@
 		is->set("CLIPEDITED",currClipEdited);
 		m_undoManager->action(currItem, is);
 	}
-	m_View->Deselect(true);
+	m_View->deselectItems(true);
 	for (int c = 0; c < toDel.count(); ++c)
-		m_View->SelectItem(toDel.at(c));
+		m_View->selectItem(toDel.at(c));
 	m_Selection->delaySignalsOff();
 	itemSelection_DeleteItem();
 	regionsChanged()->update(QRectF());
@@ -15693,7 +15693,7 @@
 	m_rotMode = oldRotMode;
 	m_undoManager->setUndoEnabled(true);
 	m_Selection->delaySignalsOff();
-	view()->Deselect(true);
+	view()->deselectItems(true);
 	regionsChanged()->update(QRectF());
 	if (transaction)
 		transaction.commit();
@@ -15753,7 +15753,7 @@
 	PageItem* currItem;
 	Selection itemSelection(this, false);
 	itemSelection.copy(*m_Selection, false);
-	m_View->Deselect(true);
+	m_View->deselectItems(true);
 	if (docSelectionCount > 1)
 		currItem = groupObjectsSelection(&itemSelection);
 	else
@@ -18170,9 +18170,9 @@
 		
 	if (appMode == modeEdit && nF->isSelected())
 	{
-		view()->Deselect(true);
+		view()->deselectItems(true);
 		if (!nF->isEndNotesFrame())
-			view()->SelectItem(nF->masterFrame());
+			view()->selectItem(nF->masterFrame());
 	}
 	if (m_docEndNotesFramesMap.contains(nF))
 	{

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Sat Nov 30 17:06:39 2019
@@ -278,7 +278,7 @@
 void ScribusView::togglePreview(bool inPreview)
 {
 	this->requestMode(modeNormal);
-	Deselect(true);
+	deselectItems(true);
 	undoManager->setUndoEnabled(false);
 	m_canvas->m_viewMode.viewAsPreview = inPreview;
 	Doc->drawAsPreview = inPreview;
@@ -758,7 +758,7 @@
 		{
 			if (m_canvas->frameHitTest(dropPosDocQ, Doc->Items->at(i)) >= Canvas::INSIDE)
 			{
-				Deselect(false);
+				deselectItems(false);
 				Doc->m_Selection->addItem(Doc->Items->at(i));
 				selectedItemByDrag = true;
 				break;
@@ -858,7 +858,7 @@
 			{
 				if ((m_canvas->frameHitTest(dropPosDocQ, Doc->Items->at(i)) >= Canvas::INSIDE) && (Doc->Items->at(i)->itemType() == PageItem::Symbol))
 				{
-					Deselect(false);
+					deselectItems(false);
 					Doc->m_Selection->addItem(Doc->Items->at(i));
 					Doc->Items->at(i)->setPattern(patternVal);
 					selectedItemByDrag=true;
@@ -879,7 +879,7 @@
 			item->OldH2 = item->height();
 			item->setPattern(patternVal);
 			item->updateClip();
-			Deselect(false);
+			deselectItems(false);
 			Doc->m_Selection->addItem(item);
 		}
 		emit DocChanged();
@@ -1077,7 +1077,7 @@
 	}
 	else
 	{
-		Deselect(true);
+		deselectItems(true);
 		int oldDocItemCount = Doc->Items->count();
 		if (((!img) || (vectorFile)) && (Doc->DraggedElem == nullptr))
 		{
@@ -1788,14 +1788,14 @@
 	return cursorShape;
 }
 
-void ScribusView::SelectItemNr(uint nr, bool draw, bool single)
-{
-	if (nr < static_cast<uint>(Doc->Items->count()))
-		SelectItem(Doc->Items->at(nr), draw, single);
+void ScribusView::selectItemByNumber(int nr, bool draw, bool single)
+{
+	if (nr < Doc->Items->count())
+		selectItem(Doc->Items->at(nr), draw, single);
 }
 
 //CB-->Doc/Fix
-void ScribusView::SelectItem(PageItem *currItem, bool draw, bool single)
+void ScribusView::selectItem(PageItem *currItem, bool draw, bool single)
 {
 	if (!currItem->isSelected())
 	{
@@ -1804,52 +1804,37 @@
 			Doc->m_Selection->addItem(currItem);
 			currItem->isSingleSel = true;
 			updateContents();
-			//			updateContents(currItem->getRedrawBounding(m_canvas->scale()));
 		}
 		else
 		{
 			Doc->m_Selection->addItem(currItem);
 			if (draw)
-			{
 				updateContents(currItem->getRedrawBounding(m_canvas->scale()));
-			}
-			//CB FIXME/TODO We are surely prepending here and we have turned off
-			//emitting in prepend below so do it here.
-			//Doc->m_Selection->itemAt(0)->emitAllToGUI();
-		}
-	}
-	if (draw)
-	{
-		if (Doc->m_Selection->count() > 0)
-		{
-			Doc->m_Selection->setGroupRect();
-			double x, y, w, h;
-			Doc->m_Selection->getGroupRect(&x, &y, &w, &h);
-			getGroupRectScreen(&x, &y, &w, &h);
-			updateContents();
-			//		updateContents(QRect(static_cast<int>(x-5), static_cast<int>(y-5), static_cast<int>(w+10), static_cast<int>(h+10)));
-			//CB move in here as the emitAllToGUI will do it otherwise
-			emit ItemGeom();
-			emit HaveSel();
-		}
-		//CB done by addItem for single selection or the frame data is already there
-		//else
-		//EmitValues(currItem);
-		//currItem->emitAllToGUI();
+		}
+	}
+	if (draw && !Doc->m_Selection->isEmpty())
+	{
+		Doc->m_Selection->setGroupRect();
+		double x, y, w, h;
+		Doc->m_Selection->getGroupRect(&x, &y, &w, &h);
+		getGroupRectScreen(&x, &y, &w, &h);
+		updateContents();
+		emit ItemGeom();
+		emit HaveSel();
 	}
 }
 
 //CB Remove bookmark interaction here, item/doc should do it
-void ScribusView::Deselect(bool /*prop*/)
+void ScribusView::deselectItems(bool /*prop*/)
 {
 	if (Doc->m_Selection->isEmpty())
 		return;
 
 	const double scale = m_canvas->scale();
 	PageItem* currItem = nullptr;
-	for (int a = 0; a < Doc->m_Selection->count(); ++a)
-	{
-		currItem = Doc->m_Selection->itemAt(a);
+	for (int i = 0; i < Doc->m_Selection->count(); ++i)
+	{
+		currItem = Doc->m_Selection->itemAt(i);
 		if ((currItem->asTextFrame()) && (currItem->isBookmark))
 			emit ChBMText(currItem);
 	}
@@ -2443,7 +2428,7 @@
 
 void ScribusView::GotoPa(int Seite)
 {
-	Deselect();
+	deselectItems();
 	GotoPage(Seite-1);
 	setFocus();
 }
@@ -2461,7 +2446,7 @@
 void ScribusView::showMasterPage(int nr)
 {
 	// #9684 : we need Deselect() to emit HaveSel() when switching masterpage
-	Deselect(true);
+	deselectItems(true);
 	OldScale = m_canvas->scale();
 	if (!Doc->masterPageMode())
 		this->requestMode(modeNormal);
@@ -2480,7 +2465,7 @@
 
 void ScribusView::hideMasterPage()
 {
-	Deselect(true);
+	deselectItems(true);
 	if (Doc->masterPageMode())
 		this->requestMode(modeNormal);
 	Doc->setMasterPageMode(false);
@@ -2491,7 +2476,7 @@
 
 void ScribusView::showSymbolPage(QString symbolName)
 {
-	Deselect(false);
+	deselectItems(false);
 	OldScale = m_canvas->scale();
 	if (!Doc->symbolEditMode())
 		this->requestMode(modeNormal);
@@ -2512,7 +2497,7 @@
 void ScribusView::hideSymbolPage()
 {
 	updatesOn(false);
-	Deselect(true);
+	deselectItems(true);
 	if (Doc->symbolEditMode())
 		this->requestMode(modeNormal);
 	Doc->setSymbolEditMode(false);
@@ -2526,7 +2511,7 @@
 
 void ScribusView::showInlinePage(int id)
 {
-	Deselect(false);
+	deselectItems(false);
 	OldScale = m_canvas->scale();
 	if (!Doc->inlineEditMode())
 		this->requestMode(modeNormal);
@@ -2547,7 +2532,7 @@
 void ScribusView::hideInlinePage()
 {
 	updatesOn(false);
-	Deselect(true);
+	deselectItems(true);
 	if (Doc->inlineEditMode())
 		this->requestMode(modeNormal);
 	Doc->setInlineEditMode(false);
@@ -2854,7 +2839,7 @@
 	Selection tempSelection(*Doc->m_Selection);
 	Doc->m_Selection->delaySignalsOn();
 	updatesOn(false);
-	Deselect(true);
+	deselectItems(true);
 	Selection restoreSelection(this);
 	Doc->itemSelection_convertItemsTo(PageItem::ImageFrame, &restoreSelection, &tempSelection);
 	Doc->m_Selection->copy(restoreSelection, true);
@@ -2867,7 +2852,7 @@
 	Selection tempSelection(*Doc->m_Selection);
 	Doc->m_Selection->delaySignalsOn();
 	updatesOn(false);
-	Deselect(true);
+	deselectItems(true);
 	Selection restoreSelection(this);
 	Doc->itemSelection_convertItemsTo(PageItem::Polygon, &restoreSelection, &tempSelection);
 	Doc->m_Selection->copy(restoreSelection, true);
@@ -2880,7 +2865,7 @@
 	Selection tempSelection(*Doc->m_Selection);
 	Doc->m_Selection->delaySignalsOn();
 	updatesOn(false);
-	Deselect(true);
+	deselectItems(true);
 	Selection restoreSelection(this);
 	Doc->itemSelection_convertItemsTo(PageItem::TextFrame, &restoreSelection, &tempSelection);
 	Doc->m_Selection->copy(restoreSelection, true);
@@ -2893,7 +2878,7 @@
 	Selection tempSelection(*Doc->m_Selection);
 	Doc->m_Selection->delaySignalsOn();
 	updatesOn(false);
-	Deselect(true);
+	deselectItems(true);
 	Selection restoreSelection(this);
 	Doc->itemSelection_convertItemsTo(PageItem::PolyLine, &restoreSelection, &tempSelection);
 	Doc->m_Selection->copy(restoreSelection, true);
@@ -2906,7 +2891,7 @@
 	Selection tempSelection(*Doc->m_Selection);
 	Doc->m_Selection->delaySignalsOn();
 	updatesOn(false);
-	Deselect(true);
+	deselectItems(true);
 	Selection restoreSelection(this);
 	Doc->itemSelection_convertItemsTo(PageItem::Polygon, &restoreSelection, &tempSelection);
 	Doc->m_Selection->copy(restoreSelection, true);
@@ -2931,13 +2916,13 @@
 	ParagraphStyle dstyle(currItem->itemText.defaultStyle());
 	if (polyLineItem->asPolyLine() || polyLineItem->asPolygon() || polyLineItem->asSpiral() || polyLineItem->asArc() || polyLineItem->asRegularPolygon())
 	{
-		Deselect(true);
+		deselectItems(true);
 		PageItem* newItem = Doc->convertItemTo(currItem, PageItem::PathText, polyLineItem);
 		newItem->itemText.setDefaultStyle(dstyle);
 		newItem->itemText.applyCharStyle(0, newItem->itemText.length(), dstyle.charStyle());
 		newItem->invalid = true;
 		newItem->update();
-		SelectItem(newItem);
+		selectItem(newItem);
 		emit DocChanged();
 	}
 }
@@ -2948,9 +2933,9 @@
 	if (!Doc->getItem(&currItem))
 		return;
 
-	Deselect(true);
+	deselectItems(true);
 	PageItem* newItem = Doc->convertItemTo(currItem, PageItem::TextFrame);
-	SelectItem(newItem);
+	selectItem(newItem);
 	Doc->bringItemSelectionToFront();
 	update();
 }
@@ -3120,7 +3105,7 @@
 		while (backItem->prevInChain() != nullptr)
 			backItem = backItem->prevInChain();
 		currItem = backItem;
-		Deselect(true);
+		deselectItems(true);
 		tmpSelection.addItem(currItem);
 		backItem = currItem->nextInChain();
 		while (backItem != nullptr)
@@ -3261,7 +3246,7 @@
 
 	Doc->setRotationMode(oldRotMode);
 	m_ScMW->HaveNewSel();
-	Deselect(true);
+	deselectItems(true);
 	trans.commit();
 }
 
@@ -3404,7 +3389,7 @@
 
 	if (obj == widget() && event->type() == QEvent::MouseMove)
 	{
-		QMouseEvent* m = static_cast<QMouseEvent*> (event);
+		auto* m = dynamic_cast<QMouseEvent*> (event);
 		m_mousePointDoc=m_canvas->globalToCanvas(m->globalPos());
 		FPoint p = m_canvas->localToCanvas(QPoint(m->x(),m->y()));
 		emit MousePos(p.x(),p.y());
@@ -3415,7 +3400,7 @@
 	}
 	if (obj == widget() && event->type() == QEvent::MouseButtonRelease)
 	{
-		QMouseEvent* m = static_cast<QMouseEvent*> (event);
+		auto* m = dynamic_cast<QMouseEvent*> (event);
 		m_canvasMode->mouseReleaseEvent(m);
 		m_canvas->m_viewMode.m_MouseButtonPressed = false;
 		if (linkAfterDraw)
@@ -3437,7 +3422,7 @@
 			requestMode(modeImportImage);
 			if (frame)
 			{
-				CanvasMode_ImageImport* cm = dynamic_cast<CanvasMode_ImageImport*>(canvasMode());
+				auto* cm = dynamic_cast<CanvasMode_ImageImport*>(canvasMode());
 				if (!cm)
 					qFatal("ScribusView::eventFilter cm nullptr");
 				cm->setImage(frame);
@@ -3449,7 +3434,7 @@
 	}
 	if (obj == widget() && event->type() == QEvent::MouseButtonPress)
 	{
-		QMouseEvent* m = static_cast<QMouseEvent*> (event);
+		auto* m = dynamic_cast<QMouseEvent*> (event);
 		bool linkmode = (Doc->appMode == modeLinkFrames);
 		firstFrame = Doc->m_Selection->itemAt(0);
 		m_canvasMode->mousePressEvent(m);
@@ -3476,13 +3461,13 @@
 	}
 	if (obj == widget() && event->type() == QEvent::MouseButtonDblClick)
 	{
-		QMouseEvent* m = static_cast<QMouseEvent*> (event);
+		auto* m = dynamic_cast<QMouseEvent*> (event);
 		m_canvasMode->mouseDoubleClickEvent(m);
 		return true;
 	}
 	if (event->type() == QEvent::KeyPress)
 	{
-		QKeyEvent* m = static_cast<QKeyEvent*> (event);
+		auto* m = dynamic_cast<QKeyEvent*> (event);
 		if (m_canvasMode->handleKeyEvents())
 			m_canvasMode->keyPressEvent(m);
 		else
@@ -3491,7 +3476,7 @@
 	}
 	if (event->type() == QEvent::KeyRelease)
 	{
-		QKeyEvent* m = static_cast<QKeyEvent*> (event);
+		auto* m = dynamic_cast<QKeyEvent*> (event);
 		if (m_canvasMode->handleKeyEvents())
 			m_canvasMode->keyReleaseEvent(m);
 		else
@@ -3500,25 +3485,25 @@
 	}
 	if (obj == widget() && event->type() == QEvent::DragEnter)
 	{
-		QDragEnterEvent* d = static_cast<QDragEnterEvent*> (event);
+		auto* d = dynamic_cast<QDragEnterEvent*> (event);
 		contentsDragEnterEvent(d);
 		return true;
 	}
 	if (obj == widget() && event->type() == QEvent::DragLeave)
 	{
-		QDragLeaveEvent* d = static_cast<QDragLeaveEvent*> (event);
+		auto* d = dynamic_cast<QDragLeaveEvent*> (event);
 		contentsDragLeaveEvent(d);
 		return true;
 	}
 	if (obj == widget() && event->type() == QEvent::DragMove)
 	{
-		QDragMoveEvent* d = static_cast<QDragMoveEvent*> (event);
+		auto* d = dynamic_cast<QDragMoveEvent*> (event);
 		contentsDragMoveEvent(d);
 		return true;
 	}
 	if (obj == widget() && event->type() == QEvent::Drop)
 	{
-		QDropEvent* d = static_cast<QDropEvent*> (event);
+		auto* d = dynamic_cast<QDropEvent*> (event);
 		contentsDropEvent(d);
 		return true;
 	}
@@ -3614,10 +3599,11 @@
 
 void ScribusView::zoom(double scale)
 {
-	double zPointX = m_oldZoomX, zPointY = m_oldZoomY;
+	double zPointX = m_oldZoomX;
+	double zPointY = m_oldZoomY;
 	if (scale <= 0.0)
 		scale = m_canvas->scale();
-	if (Doc->m_Selection->count() != 0)
+	if (!Doc->m_Selection->isEmpty())
 	{
 		PageItem *currItem = Doc->m_Selection->itemAt(0);
 		zPointX = currItem->xPos() + currItem->width() / 2.0;

Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h	(original)
+++ trunk/Scribus/scribus/scribusview.h	Sat Nov 30 17:06:39 2019
@@ -178,9 +178,9 @@
 	bool slotSetCurs(int x, int y);
 	// \brief return a resize cursor if the mouse is on a handle.
 	Qt::CursorShape getResizeCursor(PageItem *currItem, QRect mpo, Qt::CursorShape cursorShape = Qt::ArrowCursor);
-	void Deselect(bool prop = true);
-	void SelectItemNr(uint nr, bool draw = true, bool single = false);
-	void SelectItem(PageItem *pi, bool draw = true, bool single = false);
+	void deselectItems(bool prop = true);
+	void selectItemByNumber(int nr, bool draw = true, bool single = false);
+	void selectItem(PageItem *pi, bool draw = true, bool single = false);
 	void rememberOldZoomLocation(int mx=0, int my=0);
 	bool groupTransactionStarted() { return m_groupTransactions > 0; }
 	void startGroupTransaction(const QString &actionName = "",

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Sat Nov 30 17:06:39 2019
@@ -972,7 +972,7 @@
 		if (currDoc->appMode == modeEditClip)
 			currDoc->view()->requestMode(submodeEndNodeEdit);
 		currDoc->m_Selection->delaySignalsOn();
-		currDoc->view()->Deselect(true);
+		currDoc->view()->deselectItems(true);
 		for (int a = 0; a < items.count(); a++)
 		{
 			QTreeWidgetItem* ite = items[a];
@@ -994,7 +994,7 @@
 					if (!pgItem->isSelected())
 					{
 						m_MainWindow->closeActiveWindowMasterPageEditor();
-						currDoc->view()->SelectItem(pgItem, false, false);
+						currDoc->view()->selectItem(pgItem, false, false);
 					}
 					break;
 				default:

Modified: trunk/Scribus/scribus/ui/pagepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/ui/pagepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette.cpp	Sat Nov 30 17:06:39 2019
@@ -173,7 +173,7 @@
 		// fallback to normal mode by precaution
 		if (doc->appMode != modeNormal)
 			m_view->requestMode(modeNormal);
-		m_view->Deselect(true);
+		m_view->deselectItems(true);
 	}
 
 	QStackedWidget* stackedWidget = this->stackedWidget();

Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23390&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	Sat Nov 30 17:06:39 2019
@@ -300,7 +300,7 @@
 	}
 	from->guides.copy(&destination->guides);
 	m_doc->GroupCounter = GrMax + 1;
-	m_view->Deselect(true);
+	m_view->deselectItems(true);
 	m_doc->setLoading(false);
 	m_view->reformPages();
 	m_view->DrawNew();




More information about the scribus-commit mailing list