r22832 by craig - Some C++11 changes and renames etc

scribus-commit scribus-commit at lists.scribus.net
Sun Feb 10 17:14:55 UTC 2019


Author: craig
Date: Sun Feb 10 17:14:55 2019
New Revision: 22832

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22832
Log:
Some C++11 changes and renames etc

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/canvas.cpp
    trunk/Scribus/scribus/canvasmode_copyproperties.cpp
    trunk/Scribus/scribus/canvasmode_edit.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/collect4output.cpp
    trunk/Scribus/scribus/documentchecker.cpp
    trunk/Scribus/scribus/gtaction.cpp
    trunk/Scribus/scribus/hyphenator.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/pageitem_arc.h
    trunk/Scribus/scribus/pageitem_group.cpp
    trunk/Scribus/scribus/pageitem_group.h
    trunk/Scribus/scribus/pageitem_imageframe.cpp
    trunk/Scribus/scribus/pageitem_imageframe.h
    trunk/Scribus/scribus/pageitem_latexframe.cpp
    trunk/Scribus/scribus/pageitem_latexframe.h
    trunk/Scribus/scribus/pageitem_line.cpp
    trunk/Scribus/scribus/pageitem_line.h
    trunk/Scribus/scribus/pageitem_noteframe.cpp
    trunk/Scribus/scribus/pageitem_noteframe.h
    trunk/Scribus/scribus/pageitem_osgframe.h
    trunk/Scribus/scribus/pageitem_pathtext.cpp
    trunk/Scribus/scribus/pageitem_pathtext.h
    trunk/Scribus/scribus/pageitem_polygon.h
    trunk/Scribus/scribus/pageitem_polyline.cpp
    trunk/Scribus/scribus/pageitem_polyline.h
    trunk/Scribus/scribus/pageitem_regularpolygon.h
    trunk/Scribus/scribus/pageitem_spiral.cpp
    trunk/Scribus/scribus/pageitem_spiral.h
    trunk/Scribus/scribus/pageitem_symbol.cpp
    trunk/Scribus/scribus/pageitem_symbol.h
    trunk/Scribus/scribus/pageitem_table.cpp
    trunk/Scribus/scribus/pageitem_table.h
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/pageitem_textframe.h
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/sampleitem.cpp
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/scpage.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scpaths.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/scribuswin.cpp
    trunk/Scribus/scribus/selection.cpp
    trunk/Scribus/scribus/tablecell.cpp
    trunk/Scribus/scribus/text/storytext.cpp
    trunk/Scribus/scribus/text/storytext.h
    trunk/Scribus/scribus/ui/bookmwin.cpp
    trunk/Scribus/scribus/ui/checkDocument.cpp
    trunk/Scribus/scribus/ui/createrange.cpp
    trunk/Scribus/scribus/ui/fontcombo.cpp
    trunk/Scribus/scribus/ui/hruler.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
    trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
    trunk/Scribus/scribus/ui/printdialog.cpp
    trunk/Scribus/scribus/ui/propertywidget_distance.cpp
    trunk/Scribus/scribus/ui/search.cpp
    trunk/Scribus/scribus/ui/tabpdfoptions.cpp
    trunk/Scribus/scribus/util.cpp
    trunk/Scribus/scribus/util_layer.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp	(original)
+++ trunk/Scribus/scribus/actionmanager.cpp	Sun Feb 10 17:14:55 2019
@@ -292,10 +292,9 @@
 
 void ActionManager::initStyleMenuActions()
 {
-	QString name;
 	//Text Size actions
 	(*scrActionGroups).insert("fontSize", new QActionGroup(mainWindow));
-	name="fontSizeOther";
+	QString name("fontSizeOther");
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), (*scrActionGroups).value("fontSize"), -1));
 	connect( (*scrActions)["fontSizeOther"], SIGNAL(triggeredData(int)), mainWindow, SLOT(setItemFontSize(int)));
 

Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp	(original)
+++ trunk/Scribus/scribus/canvas.cpp	Sun Feb 10 17:14:55 2019
@@ -443,7 +443,7 @@
 		{
 			currItem = m_doc->currentPage()->FromMaster.at(currNr);
 			QTransform itemPos;
-			if (((currItem->LayerID == m_doc->activeLayer()) || (m_doc->layerSelectable(currItem->LayerID))) && (!m_doc->layerLocked(currItem->LayerID)))
+			if (((currItem->m_layerID == m_doc->activeLayer()) || (m_doc->layerSelectable(currItem->m_layerID))) && (!m_doc->layerLocked(currItem->m_layerID)))
 			{
 				if (!currItem->ChangedMasterItem)
 				{
@@ -491,7 +491,7 @@
 			--currNr;
 			continue;
 		}
-		if (((currItem->LayerID == m_doc->activeLayer()) || (m_doc->layerSelectable(currItem->LayerID))) && (!m_doc->layerLocked(currItem->LayerID)))
+		if (((currItem->m_layerID == m_doc->activeLayer()) || (m_doc->layerSelectable(currItem->m_layerID))) && (!m_doc->layerLocked(currItem->m_layerID)))
 		{
 			QTransform itemPos = currItem->getTransform();
 			QPainterPath currPath(itemPos.map(QPointF(0,0)));
@@ -581,7 +581,7 @@
 
 	int itemid = m_doc->Items->indexOf(item);
 	QRectF baseRect(item->getBoundingRect());
-	int itemLevel = m_doc->layerLevelFromID(item->LayerID);
+	int itemLevel = m_doc->layerLevelFromID(item->m_layerID);
 	if (itemLevel < 0)
 		return nullptr;
 
@@ -589,7 +589,7 @@
 	{
 		PageItem* item1 = m_doc->Items->at(index);
 		int item1id = m_doc->Items->indexOf(item1);
-		int level = m_doc->layerLevelFromID(item1->LayerID);
+		int level = m_doc->layerLevelFromID(item1->m_layerID);
 		if ((item != item1) && (level >= 0) && (level <= itemLevel))
 		{
 			if ((level == itemLevel) && (item1id > itemid))
@@ -1379,7 +1379,7 @@
 	for (int a = 0; a < pageFromMasterCount; ++a)
 	{
 		currItem = page->FromMaster.at(a);
-		if (currItem->LayerID != layer.ID)
+		if (currItem->m_layerID != layer.ID)
 			continue;
 		if ((currItem->OwnPage != -1) && (currItem->OwnPage != static_cast<int>(Mp->pageNr())))
 			continue;
@@ -1463,7 +1463,7 @@
 			if ( !currItem->isTextFrame()
 				|| currItem->isNoteFrame()
 				|| !currItem->invalid
-				|| (currItem->LayerID != layer.ID)
+				|| (currItem->m_layerID != layer.ID)
 				|| (m_viewMode.previewMode && !currItem->printEnabled())
 				|| (m_viewMode.viewAsPreview && (!currItem->printEnabled()))
 				|| (m_doc->masterPageMode() && ((currItem->OwnPage != -1) && (currItem->OwnPage != docCurrPageNo)))
@@ -1480,7 +1480,7 @@
 			continue;
 		if (!notesFramesPass && currItem->isNoteFrame())
 			continue;
-		if (currItem->LayerID != layer.ID)
+		if (currItem->m_layerID != layer.ID)
 			continue;
 		if ((m_viewMode.previewMode) && (!currItem->printEnabled()))
 			continue;
@@ -2576,8 +2576,8 @@
 	double controlHash(0.0);
 	controlHash = item->xPos() 
 			+ item->yPos()				* 1.0
-			+ item->ColGap 				* 2.0
-			+ item->Cols 				* 3.0
+			+ item->m_columnGap 				* 2.0
+			+ item->m_columns 				* 3.0
 			+ item->textToFrameDistLeft()		* 4.0 
 			+ item->textToFrameDistRight()		* 5.0
 			+ item->currentStyle().firstIndent()	* 6.0

Modified: trunk/Scribus/scribus/canvasmode_copyproperties.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/canvasmode_copyproperties.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_copyproperties.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_copyproperties.cpp	Sun Feb 10 17:14:55 2019
@@ -153,8 +153,8 @@
 	if (GetItem(&currItem))
 	{
 		double sx, sy, ex, ey, r, skx, sky, fx, fy, ss, sk, sp;
-		currItem->ColGap = m_doc->ElemToLink->ColGap;
-		currItem->Cols = m_doc->ElemToLink->Cols;
+		currItem->m_columnGap = m_doc->ElemToLink->m_columnGap;
+		currItem->m_columns = m_doc->ElemToLink->m_columns;
 		currItem->setTextToFrameDist(m_doc->ElemToLink->textToFrameDistLeft(), m_doc->ElemToLink->textToFrameDistRight(), m_doc->ElemToLink->textToFrameDistTop(), m_doc->ElemToLink->textToFrameDistBottom());
 		// Stroke Properties
 		currItem->setLineStyle(m_doc->ElemToLink->lineStyle());

Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp	Sun Feb 10 17:14:55 2019
@@ -382,7 +382,7 @@
 					currItem->itemText.setCursorPosition(newPos);
 				}
 			}
-			currItem->HasSel = (currItem->itemText.lengthOfSelection() > 0);
+			currItem->HasSel = (currItem->itemText.selectionLength() > 0);
 		}
 	}
 	else
@@ -642,7 +642,7 @@
 				//<<CB Add in shift select to text frames
 				if (m->modifiers() & Qt::ShiftModifier)
 				{
-					if (currItem->itemText.lengthOfSelection() > 0)
+					if (currItem->itemText.selectionLength() > 0)
 					{
 						if (currItem->itemText.cursorPosition() < (currItem->itemText.startOfSelection() + currItem->itemText.endOfSelection()) / 2)
 						{
@@ -888,7 +888,7 @@
 				QRect apr2(docItem->getRedrawBounding(1.0));
 				if ((m_doc->masterPageMode()) && (docItem->OnMasterPage != m_doc->currentPage()->pageName()))
 					continue;
-				if (((Sele.contains(apr.boundingRect())) || (Sele.contains(apr2))) && ((docItem->LayerID == m_doc->activeLayer()) || (m_doc->layerSelectable(docItem->LayerID))) && (!m_doc->layerLocked(docItem->LayerID)))
+				if (((Sele.contains(apr.boundingRect())) || (Sele.contains(apr2))) && ((docItem->m_layerID == m_doc->activeLayer()) || (m_doc->layerSelectable(docItem->m_layerID))) && (!m_doc->layerLocked(docItem->m_layerID)))
 				{
 					bool redrawSelection=false;
 					m_view->SelectItemNr(a, redrawSelection);
@@ -950,7 +950,7 @@
 	}
 	if (GetItem(&currItem) && currItem->asTextFrame())
 	{
-		if (currItem->itemText.lengthOfSelection() > 0)
+		if (currItem->itemText.selectionLength() > 0)
 			m_ScMW->EnableTxEdit();
 		else
 			m_ScMW->DisableTxEdit();

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp	Sun Feb 10 17:14:55 2019
@@ -1170,7 +1170,7 @@
 				if ((m_doc->masterPageMode()) && (docItem->OnMasterPage != m_doc->currentPage()->pageName()))
 					continue;
 				QRect  apr2 = m_canvas->canvasToLocal( docItem->getCurrentBoundingRect(docItem->lineWidth()) );
-				if (((docItem->LayerID == m_doc->activeLayer()) || (m_doc->layerSelectable(docItem->LayerID))) && (!m_doc->layerLocked(docItem->LayerID)))
+				if (((docItem->m_layerID == m_doc->activeLayer()) || (m_doc->layerSelectable(docItem->m_layerID))) && (!m_doc->layerLocked(docItem->m_layerID)))
 				{
 					// get current item rect/bounding box
 					QRect apr2 = m_canvas->canvasToLocal( docItem->getCurrentBoundingRect(docItem->lineWidth()) );
@@ -1850,7 +1850,7 @@
 		for (int a = 0; a < m_doc->m_Selection->count(); ++a)
 		{
 			PageItem *currItem = m_doc->m_Selection->itemAt(a);
-			currItem->LayerID = m_doc->activeLayer();
+			currItem->m_layerID = m_doc->activeLayer();
 		}
 		if (m_doc->m_Selection->count() > 0)
 		{

Modified: trunk/Scribus/scribus/collect4output.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/collect4output.cpp
==============================================================================
--- trunk/Scribus/scribus/collect4output.cpp	(original)
+++ trunk/Scribus/scribus/collect4output.cpp	Sun Feb 10 17:14:55 2019
@@ -162,11 +162,11 @@
 
 	if ((m_Doc->hasName) && (!m_Doc->isConverted))
 	{
-		QFileInfo fis(m_Doc->DocName);
+		QFileInfo fis(m_Doc->documentFileName());
 		newName += fis.fileName();
 	}
 	else
-		newName += m_Doc->DocName+".sla";
+		newName += m_Doc->documentFileName() + ".sla";
 
 	m_Doc->hasName = true;
 	if (m_compressDoc)

Modified: trunk/Scribus/scribus/documentchecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/documentchecker.cpp
==============================================================================
--- trunk/Scribus/scribus/documentchecker.cpp	(original)
+++ trunk/Scribus/scribus/documentchecker.cpp	Sun Feb 10 17:14:55 2019
@@ -190,7 +190,7 @@
 			currItem = allItems.at(ii);
 			if (!currItem->printEnabled())
 				continue;
-			if (!(currDoc->layerPrintable(currItem->LayerID)) && (checkerSettings.ignoreOffLayers))
+			if (!(currDoc->layerPrintable(currItem->m_layerID)) && (checkerSettings.ignoreOffLayers))
 				continue;
 			itemError.clear();
 			if (((currItem->isAnnotation()) || (currItem->isBookmark)) && (checkerSettings.checkAnnotations))
@@ -438,7 +438,7 @@
 			currItem = allItems.at(ii);
 			if (!currItem->printEnabled())
 				continue;
-			if (!(currDoc->layerPrintable(currItem->LayerID)) && (checkerSettings.ignoreOffLayers))
+			if (!(currDoc->layerPrintable(currItem->m_layerID)) && (checkerSettings.ignoreOffLayers))
 				continue;
 			itemError.clear();
 			if ((currItem->hasSoftShadow() || (currItem->fillTransparency() != 0.0) || (currItem->lineTransparency() != 0.0) || (currItem->fillBlendmode() != 0) || (currItem->lineBlendmode() != 0)) && (checkerSettings.checkTransparency))

Modified: trunk/Scribus/scribus/gtaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/gtaction.cpp
==============================================================================
--- trunk/Scribus/scribus/gtaction.cpp	(original)
+++ trunk/Scribus/scribus/gtaction.cpp	Sun Feb 10 17:14:55 2019
@@ -489,8 +489,8 @@
 
 void gtAction::getFrameStyle(gtFrameStyle *fstyle)
 {
-	fstyle->setColumns(m_textFrame->Cols);
-	fstyle->setColumnsGap(m_textFrame->ColGap);
+	fstyle->setColumns(m_textFrame->m_columns);
+	fstyle->setColumnsGap(m_textFrame->m_columnGap);
 	fstyle->setBgColor(m_textFrame->fillColor());
 	fstyle->setBgShade(qRound(m_textFrame->fillShade()));
 

Modified: trunk/Scribus/scribus/hyphenator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/hyphenator.cpp
==============================================================================
--- trunk/Scribus/scribus/hyphenator.cpp	(original)
+++ trunk/Scribus/scribus/hyphenator.cpp	Sun Feb 10 17:14:55 2019
@@ -137,10 +137,10 @@
 	QString text = "";
 
 	int startC = 0;
-	if (it->itemText.lengthOfSelection() > 0)
+	if (it->itemText.selectionLength() > 0)
 	{
 		startC = it->itemText.startOfSelection();
-		text = it->itemText.text(startC, it->itemText.lengthOfSelection());
+		text = it->itemText.text(startC, it->itemText.selectionLength());
 	}
 	else {
 		text = it->itemText.text(0, it->itemText.length());
@@ -340,8 +340,8 @@
 	if (!(it->asTextFrame()) || (it ->itemText.length() == 0))
 		return;
 
-	if (it->itemText.lengthOfSelection() > 0)
-		it->itemText.hyphenateWord(it->itemText.startOfSelection(), it->itemText.lengthOfSelection(), nullptr);
+	if (it->itemText.selectionLength() > 0)
+		it->itemText.hyphenateWord(it->itemText.startOfSelection(), it->itemText.selectionLength(), nullptr);
 	else
 	{
 		int i = it->itemText.length();

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Sun Feb 10 17:14:55 2019
@@ -135,8 +135,8 @@
 	selectedMeshPointY(other.selectedMeshPointY),
 	selectedMeshControlPoint(other.selectedMeshControlPoint),
 	snapToPatchGrid(other.snapToPatchGrid),
-	Cols(other.Cols),
-	ColGap(other.ColGap),
+	m_columns(other.m_columns),
+	m_columnGap(other.m_columnGap),
 	m_startArrowIndex(other.m_startArrowIndex),
 	m_endArrowIndex(other.m_endArrowIndex),
 	m_startArrowScale(other.m_startArrowScale),
@@ -191,7 +191,7 @@
 	OldB2(other.OldB2),
 	OldH2(other.OldH2),
 	Sizing(other.Sizing),
-	LayerID(other.LayerID),
+	m_layerID(other.m_layerID),
 	ScaleType(other.ScaleType),
 	AspectRatio(other.AspectRatio),
 	DashValues(other.DashValues),
@@ -303,12 +303,12 @@
 	BackBox(nullptr),  // otherwise other.BackBox->NextBox would be inconsistent
 	NextBox(nullptr),  // otherwise other.NextBox->BackBox would be inconsistent
 	firstChar(0),   // since this box is unlinked now
-	MaxChars(0),   // since the layout is invalid now
+	m_maxChars(0),   // since the layout is invalid now
 	m_sampleItem(false),
 	m_textDistanceMargins(other.m_textDistanceMargins),
 	verticalAlign(other.verticalAlign),
 	m_ItemType(other.m_ItemType),
-	AnName(other.AnName),
+	m_itemName(other.m_itemName),
 	gradientVal(other.gradientVal),
 	patternVal(other.patternVal),
 	patternScaleX(other.patternScaleX),
@@ -364,13 +364,13 @@
 	m_imageVisible = m_Doc->guidesPrefs().showPic;
 	m_Doc->TotalItems++;
 	
-	QString oldName(AnName);
+	QString oldName(m_itemName);
 	int nameNum = m_Doc->TotalItems;
-	AnName += tmp.setNum(m_Doc->TotalItems);
-	while (m_Doc->itemNameExists(AnName))
+	m_itemName += tmp.setNum(m_Doc->TotalItems);
+	while (m_Doc->itemNameExists(m_itemName))
 	{
 		++nameNum;
-		AnName = oldName + tmp.setNum(nameNum);
+		m_itemName = oldName + tmp.setNum(nameNum);
 	}
 	
 	uniqueNr = m_Doc->TotalItems;
@@ -517,7 +517,7 @@
 	m_textDistanceMargins=m_Doc->itemToolPrefs().textDistances;
 	verticalAlign = 0;
 	firstChar = 0;
-	MaxChars = 0;
+	m_maxChars = 0;
 	m_sampleItem = false;
 	Pfile = "";
 	pixm = ScImage();
@@ -571,71 +571,71 @@
 		// because c++'s typeinfos are still saying it's 
 		// a plain pageitem
 		// This is fixed in the PageItem_LatexFrame constructor
-		AnName = tr("Image");
+		m_itemName = tr("Image");
 		setUPixmap(Um::IImageFrame);
 		break;
 	case TextFrame:
-		AnName = tr("Text");
+		m_itemName = tr("Text");
 		setUPixmap(Um::ITextFrame);
 		break;
 	case Line:
-		AnName = tr("Line");
+		m_itemName = tr("Line");
 		setUPixmap(Um::ILine);
 		break;
 	case Polygon:
-		AnName = tr("Polygon");
+		m_itemName = tr("Polygon");
 		setUPixmap(Um::IPolygon);
 		break;
 	case PolyLine:
-		AnName = tr("Polyline");
+		m_itemName = tr("Polyline");
 		setUPixmap(Um::IPolyline);
 		break;
 	case PathText:
-		AnName = tr("PathText");
+		m_itemName = tr("PathText");
 		setUPixmap(Um::IPathText);
 		break;
 	case Symbol:
-		AnName = tr("Symbol");
+		m_itemName = tr("Symbol");
 		setUPixmap(Um::IPolygon);
 		break;
 	case Group:
-		AnName = tr("Group");
+		m_itemName = tr("Group");
 		setUPixmap(Um::IPolygon);
 		break;
 	case RegularPolygon:
-		AnName = tr("RegularPolygon");
+		m_itemName = tr("RegularPolygon");
 		setUPixmap(Um::IPolygon);
 		break;
 	case Arc:
-		AnName = tr("Arc");
+		m_itemName = tr("Arc");
 		setUPixmap(Um::IPolygon);
 		break;
 	case Spiral:
-		AnName = tr("Spiral");
+		m_itemName = tr("Spiral");
 		setUPixmap(Um::IPolygon);
 		break;
 	case Table:
-		AnName = tr("Table");
+		m_itemName = tr("Table");
 		//setUPixmap(Um::IPolygon); // TODO: Fix this.
 		break;
 	default:
-		AnName = "Item";
+		m_itemName = "Item";
 		break;
 	}
 	m_Doc->TotalItems++;
 	
-	QString oldName(AnName);
+	QString oldName(m_itemName);
 	int nameNum = m_Doc->TotalItems;
-	AnName += tmp.setNum(m_Doc->TotalItems);
-	while (m_Doc->itemNameExists(AnName))
+	m_itemName += tmp.setNum(m_Doc->TotalItems);
+	while (m_Doc->itemNameExists(m_itemName))
 	{
 		++nameNum;
-		AnName = oldName + tmp.setNum(nameNum);
+		m_itemName = oldName + tmp.setNum(nameNum);
 	}
 	
 	uniqueNr = m_Doc->TotalItems;
 	AutoName = true;
-	setUName(AnName);
+	setUName(m_itemName);
 	m_annotation.setBorderColor(outline);
 	HasSel = false;
 	isAutoText = false;
@@ -649,7 +649,7 @@
 	groupItemList.clear();
 	groupWidth = 1.0;
 	groupHeight = 1.0;
-	LayerID = m_Doc->activeLayer();
+	m_layerID = m_Doc->activeLayer();
 	ScaleType = true;
 	AspectRatio = true;
 	NamedLStyle = "";
@@ -833,8 +833,8 @@
 	meshGradientPatches.append(patch);
 
 	m_firstLineOffset = FLOPRealGlyphHeight;
-	Cols = m_Doc->itemToolPrefs().textColumns;
-	ColGap = m_Doc->itemToolPrefs().textColumnGap;
+	m_columns = m_Doc->itemToolPrefs().textColumns;
+	m_columnGap = m_Doc->itemToolPrefs().textColumnGap;
 	LeftLink = nullptr;
 	RightLink = nullptr;
 	TopLink = nullptr;
@@ -967,16 +967,12 @@
 int PageItem::level() const
 {
 	PageItem* thisItem = const_cast<PageItem*>(this);
-	if (!isGroupChild())
-	{
-		if (m_Doc)
-		{
-			QList<PageItem*>* items = OnMasterPage.isEmpty() ? &m_Doc->DocItems : &m_Doc->MasterItems;
-			return (items->indexOf(thisItem) + 1);
-		}
+	if (isGroupChild())
+		return (Parent->asGroupFrame()->groupItemList.indexOf(thisItem) + 1);
+	if (!m_Doc)
 		return 0;
-	}
-	return (Parent->asGroupFrame()->groupItemList.indexOf(thisItem) + 1);
+	QList<PageItem*>* items = OnMasterPage.isEmpty() ? &m_Doc->DocItems : &m_Doc->MasterItems;
+	return (items->indexOf(thisItem) + 1);
 }
 
 void PageItem::moveBy(const double dX, const double dY, bool drawingOnly)
@@ -1215,31 +1211,30 @@
 	// Fix #6991 : "Text overflow" warning when there is a text underflow in fact
 	/*return NextBox == nullptr && itemText.length() > static_cast<int>(MaxChars);*/
 	return ( NextBox == nullptr )
-	       && ( static_cast<int> ( firstChar ) < itemText.length() )
+		   && ( static_cast<int> ( firstChar ) < itemText.length() )
 		   // Fix #7766 : scribus.textOverflows() returns 0 if there is no place for the overflow mark
-	       /*&& ( firstChar < MaxChars )*/
-		   && ( firstChar <= MaxChars )
-	       && ( itemText.length() > static_cast<int> ( MaxChars ) );
+		   /*&& ( firstChar < MaxChars )*/
+		   && ( firstChar <= m_maxChars )
+		   && ( itemText.length() > static_cast<int> ( m_maxChars ) );
 }
 
 int PageItem::frameOverflowCount() const
 {
 	if (frameOverflows())
-		return itemText.length()-MaxChars;
+		return itemText.length()-m_maxChars;
 	return 0;
 }
 
 int PageItem::frameOverflowBlankCount() const
 {
 	if (frameOverflows())
-		return itemText.plainText().right(itemText.length() - MaxChars).count(QRegularExpression("\\s+"));
-
+		return itemText.plainText().right(itemText.length() - m_maxChars).count(QRegularExpression("\\s+"));
 	return 0;
 }
 
 int PageItem::maxCharsInFrame()
 {
-	return MaxChars;
+	return m_maxChars;
 }
 
 /// returns true if text is ending before that frame
@@ -1292,7 +1287,7 @@
 }
 int PageItem::lastInFrame() const
 {
-	return qMin(signed(MaxChars), itemText.length()) - 1;
+	return qMin(signed(m_maxChars), itemText.length()) - 1;
 }
 
 bool PageItem::canBeLinkedTo(const PageItem* nxt) const
@@ -1419,7 +1414,8 @@
 		// link following frames to new text
 		NextBox->firstChar = 0;
 		NextBox->BackBox = nullptr;
-		while (NextBox) {
+		while (NextBox)
+		{
 			NextBox->itemText = follow;
 			NextBox->invalid = true;
 			NextBox->firstChar = 0;
@@ -1441,13 +1437,9 @@
 {
 	// update auto pointers
 	if (isAutoText && NextBox == nullptr)
-	{
 		m_Doc->LastAuto = BackBox;
-	}
 	if (isAutoText && BackBox == nullptr)
-	{
 		m_Doc->FirstAuto = NextBox;
-	}
 	isAutoText = false;
 
 	// leave text in remaining chain
@@ -1462,7 +1454,7 @@
 	if (before)
 	{
 		before->NextBox = after;
-		afterChar = qMin((int) before->MaxChars, before->itemText.length());
+		afterChar = qMin((int) before->m_maxChars, before->itemText.length());
 	}
 	if (after) 
 	{
@@ -1491,8 +1483,8 @@
 //but copy or cut its content from itemText
 void PageItem::unlinkWithText()
 {
-	PageItem * Next = NextBox;
-	PageItem * Prev = BackBox;
+	PageItem* Next = NextBox;
+	PageItem* Prev = BackBox;
 	int length = itemText.length();
 
 	if (this->invalid)
@@ -1542,7 +1534,7 @@
 /// tests if a character is displayed by this frame
 bool PageItem::frameDisplays(int textpos) const
 {
-	return 0 <= textpos && textpos < signed(MaxChars) &&  textpos < itemText.length();
+	return 0 <= textpos && textpos < signed(m_maxChars) && textpos < itemText.length();
 }
 
 
@@ -1550,7 +1542,7 @@
 const ParagraphStyle& PageItem::currentStyle() const
 {
 	int cursorPosition = itemText.cursorPosition();
-	if (itemText.lengthOfSelection() > 0)
+	if (itemText.selectionLength() > 0)
 	{
 		int firstSelected = itemText.startOfSelection();
 		int lastSelected  = qMax(itemText.endOfSelection() - 1, 0);
@@ -1566,7 +1558,7 @@
 ParagraphStyle& PageItem::changeCurrentStyle()
 {
 	int cursorPosition = itemText.cursorPosition();
-	if (itemText.lengthOfSelection() > 0)
+	if (itemText.selectionLength() > 0)
 	{
 		int firstSelected = itemText.startOfSelection();
 		int lastSelected  = qMax(itemText.endOfSelection() - 1, 0);
@@ -1582,7 +1574,7 @@
 const CharStyle& PageItem::currentCharStyle() const
 {
 	int cursorPosition = itemText.cursorPosition();
-	if (itemText.lengthOfSelection() > 0)
+	if (itemText.selectionLength() > 0)
 	{
 		int firstSelected = itemText.startOfSelection();
 		int lastSelected  = qMax(itemText.endOfSelection() - 1, 0);
@@ -1601,7 +1593,7 @@
 	parStyle = curStyle;
 
 	int position = itemText.cursorPosition();
-	if (itemText.lengthOfSelection() > 0)
+	if (itemText.selectionLength() > 0)
 		position = qMin(qMax(itemText.endOfSelection() - 1, 0), qMax(position, itemText.startOfSelection()));
 
 	// Note: cursor position can be past last characters, don't use frameDisplays() here
@@ -1693,37 +1685,46 @@
 	//emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
 }
 
-double PageItem::gridOffset() const { return m_Doc->guidesPrefs().offsetBaselineGrid; }
-double PageItem::gridDistance() const { return m_Doc->guidesPrefs().valueBaselineGrid; }
+double PageItem::gridOffset() const
+{
+	return m_Doc->guidesPrefs().offsetBaselineGrid;
+}
+double PageItem::gridDistance() const
+{
+	return m_Doc->guidesPrefs().valueBaselineGrid;
+}
 
 void PageItem::setGridOffset(double) { } // FIXME
 void PageItem::setGridDistance(double) { } // FIXME
-void PageItem::setColumns(int n) 
-{
-	if (Cols==n)
+
+void PageItem::setColumns(int newColumnCount)
+{
+	if (m_columns==newColumnCount)
 		return;
 	if (UndoManager::undoEnabled())
 	{
 		SimpleState *ss = new SimpleState(Um::Columns, "", Um::IBorder);
 		ss->set("COLUMNS");
-		ss->set("OLD_COLUMNS", Cols);
-		ss->set("NEW_COLUMNS",n);
+		ss->set("OLD_COLUMNS", m_columns);
+		ss->set("NEW_COLUMNS", newColumnCount);
 		undoManager->action(this, ss);
 	}
-	Cols = qMax(1, n);
-}
-void PageItem::setColumnGap(double gap)
-{
-	if (ColGap==gap)
-		return;
-	if (UndoManager::undoEnabled()){
+	m_columns = qMax(1, newColumnCount);
+}
+
+void PageItem::setColumnGap(double newColumnGap)
+{
+	if (m_columnGap==newColumnGap)
+		return;
+	if (UndoManager::undoEnabled())
+	{
 		SimpleState *ss = new SimpleState(Um::Columns, "", Um::IBorder);
 		ss->set("COLUMNSGAP");
-		ss->set("OLD_COLUMNS", ColGap);
-		ss->set("NEW_COLUMNS",gap);
+		ss->set("OLD_COLUMNS", m_columnGap);
+		ss->set("NEW_COLUMNS", newColumnGap);
 		undoManager->action(this, ss);
 	}
-	ColGap = gap;
+	m_columnGap = newColumnGap;
 }
 
 int PageItem::verticalAlignment()
@@ -1783,7 +1784,7 @@
 	no_fill = false;
 	no_stroke = false;
 	DrawObj_Pre(p);
-	if (m_Doc->layerOutline(LayerID))
+	if (m_Doc->layerOutline(m_layerID))
 	{
 		if ((itemType()==TextFrame || itemType()==ImageFrame || itemType()==PathText || itemType()==Line || itemType()==PolyLine || itemType()==Group || itemType()==Symbol))
 			DrawObj_Item(p, cullingArea);
@@ -1806,15 +1807,14 @@
 		p->translate(m_xPos, m_yPos);
 	p->rotate(m_rotation);
 
-	if (m_Doc->layerOutline(LayerID))
-	{
-		p->setPen(m_Doc->layerMarker(LayerID), 0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+	if (m_Doc->layerOutline(m_layerID))
+	{
+		p->setPen(m_Doc->layerMarker(m_layerID), 0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 		p->setFillMode(ScPainter::None);
 		p->setBrushOpacity(1.0);
 		p->setPenOpacity(1.0);
 		return;
 	}
-
 
 	if ((hasSoftShadow()) && (m_Doc->appMode != modeEdit))
 		DrawSoftShadow(p);
@@ -1996,14 +1996,13 @@
 {
 	bool doStroke=true;
 	double lwCorr = m_lineWidth;
-	double sc = p->zoomFactor();
-	if ((m_lineWidth * sc) < 1)
+	if ((m_lineWidth * p->zoomFactor()) < 1)
 		lwCorr = 0;
-	if (m_Doc->layerOutline(LayerID))
+	if (m_Doc->layerOutline(m_layerID))
 	{
 		if (itemType()!=Line)
 		{
-			p->setPen(m_Doc->layerMarker(LayerID), 0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+			p->setPen(m_Doc->layerMarker(m_layerID), 0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 			p->setFillMode(ScPainter::None);
 			p->setBrushOpacity(1.0);
 			p->setPenOpacity(1.0);
@@ -2219,13 +2218,13 @@
 		}
 		if ((m_Doc->guidesPrefs().layerMarkersShown) &&
 			(m_Doc->layerCount() > 1) &&
-			(!m_Doc->layerOutline(LayerID)) &&
+			(!m_Doc->layerOutline(m_layerID)) &&
 			(!isGroupChild()) &&
 			(!m_Doc->drawAsPreview))
 		{
 			p->setPen(Qt::black, 0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 			p->setPenOpacity(1.0);
-			p->setBrush(m_Doc->layerMarker(LayerID));
+			p->setBrush(m_Doc->layerMarker(m_layerID));
 			p->setBrushOpacity(1.0);
 			p->setFillMode(ScPainter::Solid);
 			double ofwh = 10;
@@ -2583,12 +2582,10 @@
 
 void PageItem::setItemName(const QString& newName)
 {
-	if (AnName == newName)
-		return; // nothing to do -> return
-	if (newName.isEmpty())
-		return;
-	QString oldName = AnName;
-	AnName = generateUniqueCopyName(newName);
+	if (m_itemName == newName || newName.isEmpty())
+		return;
+	QString oldName = m_itemName;
+	m_itemName = generateUniqueCopyName(newName);
 	AutoName=false;
 	if (UndoManager::undoEnabled())
 	{
@@ -2597,17 +2594,16 @@
 		ss->set("NEW_NAME", newName);
 		undoManager->action(this, ss);
 	}
-	setUName(AnName); // set the name for the UndoObject too
+	setUName(m_itemName); // set the name for the UndoObject too
 }
 
 void PageItem::setGradient(const QString &newGradient)
 {
-	if (gradientVal != newGradient)
-	{
-		gradientVal = newGradient;
-		if (m_Doc->docGradients.contains(gradientVal))
-			fill_gradient = m_Doc->docGradients[gradientVal];
-	}
+	if (gradientVal == newGradient)
+		return;
+	gradientVal = newGradient;
+	if (m_Doc->docGradients.contains(gradientVal))
+		fill_gradient = m_Doc->docGradients[gradientVal];
 }
 
 void PageItem::setMaskGradient(const VGradient& grad)
@@ -3300,7 +3296,7 @@
 	QList<VColorStop*> cstops = fill_gradient.colorStops();
 	double lastStop = -1.0;
 	double actualStop = 0.0;
-	bool   isFirst = true;
+	bool isFirst = true;
 	for (int cst = 0; cst < fill_gradient.stops(); ++cst)
 	{
 		actualStop = cstops.at(cst)->rampPoint;
@@ -4260,7 +4256,8 @@
 	update();
 }
 
-void PageItem::setOverprint(bool val) {
+void PageItem::setOverprint(bool val)
+{
 	if (doOverprint==val)
 			return;
 
@@ -4589,11 +4586,10 @@
 	switch (m_ItemType)
 	{
 		case ImageFrame:
-			if (asLatexFrame()) {
+			if (asLatexFrame())
 				fromType = Um::LatexFrame;
-			} else {
+			else
 				fromType = Um::ImageFrame;
-			}
 			break;
 		case TextFrame:
 			fromType = Um::TextFrame;
@@ -4654,19 +4650,19 @@
 
 void PageItem::setLayer(int newLayerID)
 {
-	if (LayerID == newLayerID)
+	if (m_layerID == newLayerID)
 		return;
 	if (UndoManager::undoEnabled())
 	{
 		SimpleState *ss = new SimpleState(Um::SendToLayer,
-										  QString(Um::FromTo).arg(LayerID).arg(newLayerID),
+										  QString(Um::FromTo).arg(m_layerID).arg(newLayerID),
 										  Um::ILayerAction);
 		ss->set("SEND_TO_LAYER");
-		ss->set("OLD_LAYER", LayerID);
+		ss->set("OLD_LAYER", m_layerID);
 		ss->set("NEW_LAYER", newLayerID);
 		undoManager->action(this, ss);
 	}
-	LayerID = newLayerID;
+	m_layerID = newLayerID;
 }
 
 void PageItem::checkChanges(bool force)
@@ -5338,12 +5334,12 @@
 	if (!is)
 		return;
 	Mark* mark = itemText.mark(is->getItem().first);
-    if (!itemText.hasMark(is->getItem().first))
-		return;
-	if (isUndo)
-        mark->setString(is->getItem().second);
-	else
-        mark->setString(QString());
+	if (!itemText.hasMark(is->getItem().first))
+		return;
+	if (isUndo)
+		mark->setString(is->getItem().second);
+	else
+		mark->setString(QString());
 }
 
 bool PageItem::checkGradientUndoRedo(SimpleState *ss, bool isUndo)
@@ -6574,9 +6570,9 @@
 void PageItem::restoreColumnsGap(SimpleState *ss, bool isUndo)
 {
 	if (isUndo)
-		ColGap = ss->getDouble("OLD_COLUMNS");
-	else
-		ColGap = ss->getDouble("NEW_COLUMNS");
+		m_columnGap = ss->getDouble("OLD_COLUMNS");
+	else
+		m_columnGap = ss->getDouble("NEW_COLUMNS");
 	update();
 }
 
@@ -6619,9 +6615,9 @@
 void PageItem::restoreColumns(SimpleState *ss, bool isUndo)
 {
 	if (isUndo)
-		Cols = ss->getInt("OLD_COLUMNS");
-	else
-		Cols = ss->getInt("NEW_COLUMNS");
+		m_columns = ss->getInt("OLD_COLUMNS");
+	else
+		m_columns = ss->getInt("NEW_COLUMNS");
 	update();
 }
 
@@ -7061,7 +7057,8 @@
 	ScribusView* view = m_Doc->view();
 	view->Deselect(false);
 	view->SelectItem(item, false);
-	switch (type) {
+	switch (type)
+	{
 		case ImageFrame: view->ToPicFrame(); break;
 		case TextFrame: view->ToTextFrame(); break;
 		case Polygon: view->ToPolyFrame(); break;
@@ -7541,8 +7538,7 @@
 
 void PageItem::restoreShapeContour(UndoState *state, bool isUndo)
 {
-	ScItemState<QPair<FPointArray,FPointArray> > *istate =
-			dynamic_cast<ScItemState<QPair<FPointArray,FPointArray> >*>(state);
+	auto *istate = dynamic_cast<ScItemState<QPair<FPointArray,FPointArray> >*>(state);
 	if (istate)
 	{
 		FPointArray oldClip = istate->getItem().first;
@@ -7579,8 +7575,7 @@
 
 void PageItem::restoreImageEffects(UndoState *state, bool isUndo)
 {
-	ScItemState<QPair<ScImageEffectList, ScImageEffectList> > *istate =
-	dynamic_cast<ScItemState<QPair<ScImageEffectList,ScImageEffectList> >*>(state);
+	auto *istate = dynamic_cast<ScItemState<QPair<ScImageEffectList,ScImageEffectList> >*>(state);
 	if (istate)
 	{
 		if (isUndo)
@@ -7611,9 +7606,7 @@
 	for (ObjAttrVector::const_iterator objAttrIt = pageItemAttributes.begin() ; objAttrIt != pageItemAttributes.end(); ++objAttrIt)
 	{
 		if (objAttrIt->name == attributeName)
-		{
 			attributes.append(*objAttrIt);
-		}
 	}
 	return attributes;
 }
@@ -9650,7 +9643,7 @@
 	}
 	arrow.map(arrowTrans);
 	p->setupPolygon(&arrow);
-	if (m_Doc->layerOutline(LayerID))
+	if (m_Doc->layerOutline(m_layerID))
 		p->strokePath();
 	else
 	{

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Sun Feb 10 17:14:55 2019
@@ -735,8 +735,8 @@
 	double textToFrameDistRight() const { return m_textDistanceMargins.right(); }
 	double textToFrameDistTop() const { return m_textDistanceMargins.top(); }
 	double textToFrameDistBottom() const { return m_textDistanceMargins.bottom(); }
-	int columns() const { return Cols; }
-	double columnGap() const { return ColGap; }
+	int columns() const { return m_columns; }
+	double columnGap() const { return m_columnGap; }
 	double gridOffset() const;
 	double gridDistance() const;
 	int verticalAlignment();
@@ -766,7 +766,7 @@
 	 * of its Qt name.
 	 * See also PageItem::setItemName()
 	 */
-	QString itemName() const { return AnName; }
+	QString itemName() const { return m_itemName; }
 	/**
 	 * @brief Set name of the item
 	 * @param newName name for the item
@@ -1278,8 +1278,8 @@
 	int selectedMeshPointY;
 	int selectedMeshControlPoint;
 	bool snapToPatchGrid;
-	int Cols;
-	double ColGap;
+	int m_columns;
+	double m_columnGap;
 	double gridOffset_;
 	double gridValue_;
 	int m_startArrowIndex;
@@ -1342,7 +1342,7 @@
 	double OldB2;
 	double OldH2;
 	bool Sizing;
-	int  LayerID;
+	int  m_layerID;
 	bool ScaleType;
 	bool AspectRatio;
 	QVector<double> DashValues;
@@ -1685,7 +1685,7 @@
 	PageItem *BackBox;
 	PageItem *NextBox;
 	uint firstChar;
-	uint MaxChars;
+	uint m_maxChars;
 	bool m_sampleItem; ///< Used to not draw the frame for sample items
 	MarginStruct m_textDistanceMargins; ///< Left, Top, Bottom, Right distances of text from the frame
 	int verticalAlign;
@@ -1702,7 +1702,7 @@
 	 * @todo This is Annotation Name.. not item name, needs splitting up.
 	 * @sa PageItem::itemName(), PageItem::setItemName()
 	 */
-	QString AnName;
+	QString m_itemName;
 
 	/**
 	 * @brief Fill gradient name

Modified: trunk/Scribus/scribus/pageitem_arc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_arc.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_arc.h	(original)
+++ trunk/Scribus/scribus/pageitem_arc.h	Sun Feb 10 17:14:55 2019
@@ -40,11 +40,11 @@
 	PageItem_Arc(const PageItem & p) : PageItem(p) {}
 	~PageItem_Arc() {};
 
-	virtual PageItem_Arc * asArc() { return this; }
-	virtual bool isArc() const { return true; }
-	virtual ItemType realItemType() const { return PageItem::Arc; }
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	PageItem_Arc * asArc() override { return this; }
+	bool isArc() const override { return true; }
+	ItemType realItemType() const override { return PageItem::Arc; }
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 	void recalcPath();
 	double arcHeight; //! height of the circumfering ellipse
 	double arcWidth;  //! width of the circumfering ellipse
@@ -52,7 +52,7 @@
 	double arcSweepAngle;    //! angle the arc spans
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_group.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_group.cpp	Sun Feb 10 17:14:55 2019
@@ -99,7 +99,7 @@
 		PageItem* embedded = groupItemList.at(em);
 		embedded->setLayer(newLayerID);
 	}
-	LayerID = newLayerID;
+	m_layerID = newLayerID;
 }
 
 void PageItem_Group::setMasterPage(int page, const QString& mpName)
@@ -253,10 +253,10 @@
 			embedded->setXYPos(x, y, true);
 			p->restore();
 		}
-		if (m_Doc->layerOutline(LayerID))
+		if (m_Doc->layerOutline(m_layerID))
 		{
 			p->save();
-			p->setPen(m_Doc->layerMarker(LayerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+			p->setPen(m_Doc->layerMarker(m_layerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 			p->setFillMode(ScPainter::None);
 			p->setBrushOpacity(1.0);
 			p->setPenOpacity(1.0);

Modified: trunk/Scribus/scribus/pageitem_group.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_group.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.h	(original)
+++ trunk/Scribus/scribus/pageitem_group.h	Sun Feb 10 17:14:55 2019
@@ -40,27 +40,27 @@
 	PageItem_Group(const PageItem & p) : PageItem(p) {}
 	~PageItem_Group();
 
-	virtual PageItem_Group * asGroupFrame() { return this; }
-	virtual bool isGroup() const { return true; }
-	virtual ItemType realItemType() const { return PageItem::Group; }
+	PageItem_Group * asGroupFrame() override { return this; }
+	bool isGroup() const override { return true; }
+	ItemType realItemType() const override { return PageItem::Group; }
 	void adjustXYPosition();
-	virtual void setLayer(int layerId);
-	virtual void setMasterPage(int page, const QString& mpName);
-	virtual void setMasterPageName(const QString& mpName);
-	virtual void getNamedResources(ResourceCollection& lists) const;
-	virtual void replaceNamedResources(ResourceCollection& newNames);
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	void setLayer(int layerId) override;
+	void setMasterPage(int page, const QString& mpName) override;
+	void setMasterPageName(const QString& mpName) override;
+	void getNamedResources(ResourceCollection& lists) const override;
+	void replaceNamedResources(ResourceCollection& newNames) override;
+	void applicableActions(QStringList& actionList) override;
+	 QString infoDescription() const override;
 
 	/// Retrieve child items of this item
-	virtual QList<PageItem*> getChildren() const { return groupItemList; }
+	QList<PageItem*> getChildren() const override { return groupItemList; }
 	/// Retrieve all children of item, including children of children
-	virtual QList<PageItem*> getAllChildren() const;
+	QList<PageItem*> getAllChildren() const override;
 
-	virtual void layout();
+	void layout() override;
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp	Sun Feb 10 17:14:55 2019
@@ -74,7 +74,7 @@
 {
 	if (m_Doc->RePos)
 		return;
-	if (m_Doc->layerOutline(LayerID))
+	if (m_Doc->layerOutline(m_layerID))
 		return;
 
 	p->setFillRule(true);

Modified: trunk/Scribus/scribus/pageitem_imageframe.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_imageframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.h	(original)
+++ trunk/Scribus/scribus/pageitem_imageframe.h	Sun Feb 10 17:14:55 2019
@@ -40,18 +40,18 @@
 	PageItem_ImageFrame(const PageItem & p) : PageItem(p) {}
 	~PageItem_ImageFrame();
 
-	virtual PageItem_ImageFrame * asImageFrame() { return this; }
-	virtual bool isImageFrame() const { return true; }
+	PageItem_ImageFrame * asImageFrame() override { return this; }
+	bool isImageFrame() const override { return true; }
 
-	virtual void handleModeEditKey(QKeyEvent *k, bool& keyRepeat);
-	virtual void clearContents();
+	void handleModeEditKey(QKeyEvent *k, bool& keyRepeat) override;
+	void clearContents() override;
 	
-	virtual bool createInfoGroup(QFrame *, QGridLayout *);
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	bool createInfoGroup(QFrame *, QGridLayout *) override;
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_latexframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_latexframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_latexframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_latexframe.cpp	Sun Feb 10 17:14:55 2019
@@ -44,8 +44,8 @@
 		: PageItem_ImageFrame(pa, x, y, w, h, w2, fill, outline)
 {
 	setUPixmap(Um::ILatexFrame);
-	AnName = tr("Render") + QString::number(m_Doc->TotalItems);
-	setUName(AnName);
+	m_itemName = tr("Render") + QString::number(m_Doc->TotalItems);
+	setUName(m_itemName);
 	
 	m_imgValid = false;
 	m_usePreamble = true;

Modified: trunk/Scribus/scribus/pageitem_latexframe.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_latexframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_latexframe.h	(original)
+++ trunk/Scribus/scribus/pageitem_latexframe.h	Sun Feb 10 17:14:55 2019
@@ -48,14 +48,14 @@
 		PageItem_LatexFrame(ScribusDoc *pa, double x, double y, double w, double h, double w2, const QString& fill, const QString& outline);
 		~PageItem_LatexFrame();
 		
-		virtual PageItem_LatexFrame * asLatexFrame() { return this; }
-		virtual bool isLatexFrame() const { return true; }
+		PageItem_LatexFrame * asLatexFrame() override { return this; }
+		bool isLatexFrame() const override { return true; }
 
-		virtual void clearContents();
-		virtual ItemType realItemType() const { return PageItem::LatexFrame; }
-		virtual void applicableActions(QStringList& actionList);
-		virtual QString infoDescription() const;
-		void layout();
+		void clearContents() override;
+		ItemType realItemType() const override { return PageItem::LatexFrame; }
+		void applicableActions(QStringList& actionList) override;
+		QString infoDescription() const override;
+		void layout() override;
 
 		/**
 		 * @brief Load an image into an image frame, moved from ScribusView
@@ -64,7 +64,7 @@
 		bool loadImage(const QString& filename, const bool reload, const int gsResolution = -1, bool showMsg = false) override;
 		
 		/** @brief Perform undo/redo action */
-		void restore(UndoState *state, bool isUndo);
+		void restore(UndoState *state, bool isUndo) override;
 		
 		
 		/** @brief UI-Callback that runs the editor. */
@@ -99,7 +99,7 @@
 		QMap<QString,QString> editorProperties;
 
 	protected:
-		virtual void DrawObj_Item(ScPainter *p, QRectF e);
+		virtual void DrawObj_Item(ScPainter *p, QRectF e) override;
 		double m_lastWidth, m_lastHeight, m_lastDpi;
 		
 		QString formulaText;

Modified: trunk/Scribus/scribus/pageitem_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_line.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_line.cpp	Sun Feb 10 17:14:55 2019
@@ -57,7 +57,7 @@
 	if (m_Doc->RePos)
 		return;
 
-	if (m_Doc->layerOutline(LayerID))
+	if (m_Doc->layerOutline(m_layerID))
 		p->drawLine(FPoint(0, 0), FPoint(m_width, 0));
 	else
 	{

Modified: trunk/Scribus/scribus/pageitem_line.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_line.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.h	(original)
+++ trunk/Scribus/scribus/pageitem_line.h	Sun Feb 10 17:14:55 2019
@@ -40,20 +40,20 @@
 	PageItem_Line(const PageItem & p) : PageItem(p) {}
 	~PageItem_Line() {};
 	
-	virtual PageItem_Line * asLine() { return this; }
-	virtual bool isLine() const { return true; }
+	PageItem_Line * asLine() override { return this; }
+	bool isLine() const override { return true; }
 	
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 
 	QPointF startPoint();
 	QPointF endPoint();
 
-	virtual void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
-	virtual void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
+	void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const override;
+	void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const override;
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp	Sun Feb 10 17:14:55 2019
@@ -20,9 +20,9 @@
 	m_masterFrame = nullptr;
 	itemText.clear();
 
-	AnName = generateUniqueCopyName(nStyle->isEndNotes() ? tr("Endnote frame ") + m_nstyle->name() : tr("Footnote frame ") + m_nstyle->name(), false);
+	m_itemName = generateUniqueCopyName(nStyle->isEndNotes() ? tr("Endnote frame ") + m_nstyle->name() : tr("Footnote frame ") + m_nstyle->name(), false);
 	AutoName = false; //endnotes frame will saved with name
-	setUName(AnName);
+	setUName(m_itemName);
 	
 	//set default style for note frame
 	ParagraphStyle newStyle;
@@ -75,9 +75,9 @@
 	m_nstyle = nStyle;
 	m_masterFrame = inFrame;
 
-	AnName = generateUniqueCopyName(nStyle->isEndNotes() ? tr("Endnote frame ") + m_nstyle->name() : tr("Footnote frame ") + m_nstyle->name(), false);
+	m_itemName = generateUniqueCopyName(nStyle->isEndNotes() ? tr("Endnote frame ") + m_nstyle->name() : tr("Footnote frame ") + m_nstyle->name(), false);
 	AutoName = false;
-	setUName(AnName);
+	setUName(m_itemName);
 
 	//set default style for note frame
 	ParagraphStyle newStyle;
@@ -139,8 +139,8 @@
 		m_masterFrame = master;
 	itemText.clear();
 
-	AnName = generateUniqueCopyName(m_nstyle->isEndNotes() ? "Endnote frame " + m_nstyle->name() : "Footnote frame " + m_nstyle->name(), false);
-	setUName(AnName);
+	m_itemName = generateUniqueCopyName(m_nstyle->isEndNotes() ? "Endnote frame " + m_nstyle->name() : "Footnote frame " + m_nstyle->name(), false);
+	setUName(m_itemName);
 	
 	//set default style for note frame
 	ParagraphStyle newStyle;
@@ -318,7 +318,7 @@
 		return;
 
 	int oldSelStart = itemText.startOfSelection();
-	int oldSelLen = itemText.lengthOfSelection();
+	int oldSelLen = itemText.selectionLength();
 	int pos = 0;
 	int startPos = 0;
 	TextNote *note = nullptr;

Modified: trunk/Scribus/scribus/pageitem_noteframe.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_noteframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.h	(original)
+++ trunk/Scribus/scribus/pageitem_noteframe.h	Sun Feb 10 17:14:55 2019
@@ -17,12 +17,12 @@
 	~PageItem_NoteFrame() { }
 
 public:
-	virtual PageItem_NoteFrame * asNoteFrame() { return this; }
-	virtual bool isNoteFrame() const { return true; }
-	virtual bool isAutoNoteFrame() const { return m_nstyle->isAutoRemoveEmptyNotesFrames(); }
+	PageItem_NoteFrame * asNoteFrame() override { return this; }
+	bool isNoteFrame() const override { return true; }
+	bool isAutoNoteFrame() const override { return m_nstyle->isAutoRemoveEmptyNotesFrames(); }
 
 	//overloaded text frame layouting
-	void layout();
+	void layout() override;
 
 	//indicate if noteframe should be deleted
 	bool deleteIt;

Modified: trunk/Scribus/scribus/pageitem_osgframe.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_osgframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_osgframe.h	(original)
+++ trunk/Scribus/scribus/pageitem_osgframe.h	Sun Feb 10 17:14:55 2019
@@ -76,15 +76,15 @@
 		PageItem_OSGFrame(ScribusDoc *pa, double x, double y, double w, double h, double w2, const QString& fill, const QString& outline);
 		~PageItem_OSGFrame();
 		
-		virtual PageItem_OSGFrame * asOSGFrame() { return this; }
-		virtual bool isOSGFrame() const { return true; }
+		PageItem_OSGFrame * asOSGFrame() override { return this; }
+		bool isOSGFrame() const override { return true; }
 
-		virtual ItemType realItemType() const { return PageItem::OSGFrame; }
-		virtual void clearContents();
+		ItemType realItemType() const override { return PageItem::OSGFrame; }
+		void clearContents() override;
 		void setImage(QImage &image);
 		void setExternalModelFile(QString val);
 		void loadModel();
-		virtual void applicableActions(QStringList& actionList);
+		void applicableActions(QStringList& actionList) override;
 		virtual QString infoDescription();
 		double getDistance(osg::Vec3d pos1, osg::Vec3d pos2);
 		QString getPDFMatrix(QString viewName);

Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp	Sun Feb 10 17:14:55 2019
@@ -57,7 +57,7 @@
 	: PageItem(pa, PageItem::PathText, x, y, w, h, w2, fill, outline)
 {
 	firstChar = 0;
-	MaxChars = itemText.length();
+	m_maxChars = itemText.length();
 }
 
 
@@ -77,12 +77,12 @@
 {
 	itemText.invalidateAll();
 	firstChar = 0;
-	MaxChars = 0;
+	m_maxChars = 0;
 	FPoint point = FPoint(0, 0);
 	FPoint tangent = FPoint(0, 0);
 	CurX = m_textDistanceMargins.left();
 
-	if (!m_Doc->layerOutline(LayerID))
+	if (!m_Doc->layerOutline(m_layerID))
 	{
 		if (PoShow)
 		{
@@ -238,7 +238,7 @@
 			currPathIndex++;
 			if (currPathIndex == pathList.count())
 			{
-				MaxChars = run.firstChar();
+				m_maxChars = run.firstChar();
 				break;
 			}
 			currPath = pathList[currPathIndex];
@@ -296,7 +296,7 @@
 		box->setMatrix(trafo);
 		linebox->addBox(box);
 
-		MaxChars = run.lastChar() + 1;
+		m_maxChars = run.lastChar() + 1;
 		CurX -= dx;
 		CurX += run.width() + cStyle.fontSize() * cStyle.tracking() / 10000.0 + extraOffset;
 		if (run.hasFlag(ScLayout_ExpandingSpace))

Modified: trunk/Scribus/scribus/pageitem_pathtext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_pathtext.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.h	(original)
+++ trunk/Scribus/scribus/pageitem_pathtext.h	Sun Feb 10 17:14:55 2019
@@ -39,18 +39,18 @@
 	PageItem_PathText(const PageItem & p) : PageItem(p) {}
 	~PageItem_PathText() {};
 	
-	virtual PageItem_PathText * asPathText() { return this; }
-	virtual bool isPathText() const { return true; }
+	PageItem_PathText * asPathText() override { return this; }
+	bool isPathText() const override { return true; }
 
-	virtual void layout();
-	virtual bool createInfoGroup(QFrame *, QGridLayout *);
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	void layout() override;
+	bool createInfoGroup(QFrame *, QGridLayout *) override;
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 
-	virtual void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
+	void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const override;
 
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_polygon.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_polygon.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_polygon.h	(original)
+++ trunk/Scribus/scribus/pageitem_polygon.h	Sun Feb 10 17:14:55 2019
@@ -40,13 +40,13 @@
 	PageItem_Polygon(const PageItem & p) : PageItem(p) {}
 	~PageItem_Polygon() {};
 
-	virtual PageItem_Polygon * asPolygon() { return this; }
-	virtual bool isPolygon() const { return true; }
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	PageItem_Polygon * asPolygon() override { return this; }
+	bool isPolygon() const override { return true; }
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_polyline.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_polyline.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_polyline.cpp	Sun Feb 10 17:14:55 2019
@@ -56,7 +56,7 @@
 	if (m_Doc->RePos || PoLine.size() < 4)
 		return;
 
-	if (!m_Doc->layerOutline(LayerID))
+	if (!m_Doc->layerOutline(m_layerID))
 	{
 		if ((fillColor() != CommonStrings::None) || (GrType != 0))
 		{

Modified: trunk/Scribus/scribus/pageitem_polyline.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_polyline.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.h	(original)
+++ trunk/Scribus/scribus/pageitem_polyline.h	Sun Feb 10 17:14:55 2019
@@ -39,17 +39,17 @@
 	PageItem_PolyLine(const PageItem & p) : PageItem(p) {}
 	~PageItem_PolyLine() {};
 	
-	virtual PageItem_PolyLine * asPolyLine() { return this; }
-	virtual bool isPolyLine() const { return true; }
+	PageItem_PolyLine * asPolyLine() override { return this; }
+	bool isPolyLine() const override { return true; }
 	
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 
-	virtual void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
-	virtual void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
+	void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const override;
+	void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const override;
 
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_regularpolygon.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_regularpolygon.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_regularpolygon.h	(original)
+++ trunk/Scribus/scribus/pageitem_regularpolygon.h	Sun Feb 10 17:14:55 2019
@@ -40,11 +40,11 @@
 	PageItem_RegularPolygon(const PageItem & p) : PageItem(p) {}
 	~PageItem_RegularPolygon() {};
 
-	virtual PageItem_RegularPolygon * asRegularPolygon() { return this; }
-	virtual bool isRegularPolygon() const { return true; }
-	virtual ItemType realItemType() const { return PageItem::RegularPolygon; }
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	PageItem_RegularPolygon * asRegularPolygon() override { return this; }
+	bool isRegularPolygon() const override { return true; }
+	ItemType realItemType() const override { return PageItem::RegularPolygon; }
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 
 	void recalcPath();
 	/* Regular Polygon Tool */
@@ -57,7 +57,7 @@
 	double polyOuterCurvature;
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_spiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_spiral.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_spiral.cpp	Sun Feb 10 17:14:55 2019
@@ -61,7 +61,7 @@
 	if (m_Doc->RePos || PoLine.size() < 4)
 		return;
 
-	if (!m_Doc->layerOutline(LayerID))
+	if (!m_Doc->layerOutline(m_layerID))
 	{
 		if ((fillColor() != CommonStrings::None) || (GrType != 0))
 		{

Modified: trunk/Scribus/scribus/pageitem_spiral.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_spiral.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.h	(original)
+++ trunk/Scribus/scribus/pageitem_spiral.h	Sun Feb 10 17:14:55 2019
@@ -40,21 +40,21 @@
 	PageItem_Spiral(const PageItem & p) : PageItem(p) {}
 	~PageItem_Spiral() {};
 
-	virtual PageItem_Spiral * asSpiral() { return this; }
-	virtual bool isSpiral() const { return true; }
-	virtual ItemType realItemType() const { return PageItem::Spiral; }
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	PageItem_Spiral * asSpiral() override { return this; }
+	bool isSpiral() const override { return true; }
+	ItemType realItemType() const override { return PageItem::Spiral; }
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 	void recalcPath();
 	double spiralStartAngle;    //! angle where the spiral starts
 	double spiralEndAngle;    //! angle the spiral spans
 	double spiralFactor;	//! factor the spiral gets smaller
 
-	virtual void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
-	virtual void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
+	void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const override;
+	void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const override;
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_symbol.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_symbol.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_symbol.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_symbol.cpp	Sun Feb 10 17:14:55 2019
@@ -147,9 +147,9 @@
 	}
 	p->endLayer();
 	p->restore();
-	if (m_Doc->layerOutline(LayerID))
+	if (m_Doc->layerOutline(m_layerID))
 	{
-		p->setPen(m_Doc->layerMarker(LayerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+		p->setPen(m_Doc->layerMarker(m_layerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 		p->setFillMode(ScPainter::None);
 		p->setBrushOpacity(1.0);
 		p->setPenOpacity(1.0);

Modified: trunk/Scribus/scribus/pageitem_symbol.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_symbol.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_symbol.h	(original)
+++ trunk/Scribus/scribus/pageitem_symbol.h	Sun Feb 10 17:14:55 2019
@@ -40,14 +40,14 @@
 	PageItem_Symbol(const PageItem & p) : PageItem(p) {}
 	~PageItem_Symbol() {};
 
-	virtual PageItem_Symbol * asSymbolFrame() { return this; }
-	virtual bool isSymbol() const { return true; }
-	virtual ItemType realItemType() const { return PageItem::Symbol; }
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	PageItem_Symbol * asSymbolFrame() override { return this; }
+	bool isSymbol() const override { return true; }
+	ItemType realItemType() const override { return PageItem::Symbol; }
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 	
 protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+	 void DrawObj_Item(ScPainter *p, QRectF e) override;
 
 };
 

Modified: trunk/Scribus/scribus/pageitem_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_table.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_table.cpp	Sun Feb 10 17:14:55 2019
@@ -216,7 +216,7 @@
 
 void PageItem_Table::setLayer(int newLayerID)
 {
-	LayerID = newLayerID;
+	m_layerID = newLayerID;
 
 	int rowCount = rows();
 	int columnCount = columns();
@@ -229,7 +229,7 @@
 			if (cell.row() == row && cell.column() == col)
 			{
 				PageItem* textFrame = cell.textFrame();
-				textFrame->LayerID = newLayerID;
+				textFrame->m_layerID = newLayerID;
 			}
 		}
 	}

Modified: trunk/Scribus/scribus/pageitem_table.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_table.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.h	(original)
+++ trunk/Scribus/scribus/pageitem_table.h	Sun Feb 10 17:14:55 2019
@@ -92,13 +92,13 @@
 	void adjustTable();
 
 	/// Return current text properties (current char + paragraph properties)
-	virtual void currentTextProps(ParagraphStyle& parStyle) const;
+	virtual void currentTextProps(ParagraphStyle& parStyle) const override;
 
 	/// Return the list of cell items
-	virtual QList<PageItem*> getChildren() const;
+	virtual QList<PageItem*> getChildren() const override;
 
 	/// Return the list of cell items
-	virtual QList<PageItem*> getAllChildren() const { return getChildren(); }
+	virtual QList<PageItem*> getAllChildren() const override { return getChildren(); }
 
 	/// Returns the number of rows in the table.
 	int rows() const { return m_rows; }
@@ -486,19 +486,19 @@
 	bool isOverflowing() const { return effectiveWidth() > width() || effectiveHeight() > height(); }
 
 	/// Returns this item as a PageItem_Table.
-	virtual PageItem_Table* asTable() { return this; }
+	PageItem_Table* asTable() override { return this; }
 
 	/// Returns <code>true</code>.
-	virtual bool isTable() const { return true; }
+	bool isTable() const override { return true; }
 
 	/// Returns PageItem::Table.
-	virtual ItemType realItemType() const { return PageItem::Table; }
+	ItemType realItemType() const override { return PageItem::Table; }
 
 	/// Adds the applicable actions for this table to @a actionList.
-	virtual void applicableActions(QStringList& actionList);
+	void applicableActions(QStringList& actionList) override;
 
 	/// Returns a textual description of this item.
-	virtual QString infoDescription() const { return QString(); }
+	QString infoDescription() const override { return QString(); }
 
 	/// Returns the Cell Areas from this table
 	const QList<CellArea>& cellAreas() const { return m_cellAreas; }
@@ -507,22 +507,22 @@
 	const QList<QList<TableCell> >& cellRows() const { return m_cellRows; }
 
 	/// Set the layer for the item
-	virtual void setLayer(int layerId);
+	void setLayer(int layerId) override;
 
 	/// Set the masterpage the object is on
-	virtual void setMasterPage(int page, const QString& mpName);
+	void setMasterPage(int page, const QString& mpName) override;
 
 	/// Set the masterpage the object is on
-	virtual void setMasterPageName(const QString& mpName);
+	void setMasterPageName(const QString& mpName) override;
 
 	/// Set the page "owning" the object
-	virtual void setOwnerPage(int page);
+	void setOwnerPage(int page) override;
 
 	/// Collect named resource of table and its cells
-	virtual void getNamedResources(ResourceCollection& lists) const;
+	void getNamedResources(ResourceCollection& lists) const override;
 
 	/// creates valid layout information
-	virtual void layout();
+	void layout() override;
 
 signals:
 	/// This signal is emitted whenever the table changes.
@@ -536,7 +536,7 @@
 
 protected:
 	/// Paints this item.
-	virtual void DrawObj_Item(ScPainter *p, QRectF clipRect);
+	void DrawObj_Item(ScPainter *p, QRectF clipRect) override;
 
 private:
 	/// Enum describing types of changes on a table. For internal use.

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sun Feb 10 17:14:55 2019
@@ -205,7 +205,7 @@
 
 		if (!invertible) return QRegion();
 
-		int LayerLev = m_Doc->layerLevelFromID(LayerID);
+		int LayerLev = m_Doc->layerLevelFromID(m_layerID);
 		int docItemsCount = m_Doc->Items->count();
 		ScPage* Mp=nullptr;
 		ScPage* Dp=nullptr;
@@ -229,8 +229,8 @@
 				// #10642 : masterpage items interact only with items placed on same masterpage
 				if (docItem->OnMasterPage != OnMasterPage)
 					continue;
-				LayerLevItem = m_Doc->layerLevelFromID(docItem->LayerID);
-				if (((a > thisid) && (docItem->LayerID == LayerID)) || (LayerLevItem > LayerLev && m_Doc->layerFlow(docItem->LayerID)))
+				LayerLevItem = m_Doc->layerLevelFromID(docItem->m_layerID);
+				if (((a > thisid) && (docItem->m_layerID == m_layerID)) || (LayerLevItem > LayerLev && m_Doc->layerFlow(docItem->m_layerID)))
 				{
 					if (docItem->textFlowAroundObject())
 					{
@@ -278,8 +278,8 @@
 				for (int a = 0; a < docItemsCount; ++a)
 				{
 					docItem = m_Doc->Items->at(a);
-					LayerLevItem = m_Doc->layerLevelFromID(docItem->LayerID);
-					if (((a > thisid) && (docItem->LayerID == LayerID)) || (LayerLevItem > LayerLev && m_Doc->layerFlow(docItem->LayerID)))
+					LayerLevItem = m_Doc->layerLevelFromID(docItem->m_layerID);
+					if (((a > thisid) && (docItem->m_layerID == m_layerID)) || (LayerLevItem > LayerLev && m_Doc->layerFlow(docItem->m_layerID)))
 					{
 						if (docItem->textFlowAroundObject())
 						{
@@ -1247,7 +1247,7 @@
 	int startingPos = prev->incompletePositions[prev->incompleteLines - pull];
 	for (int i = 0; i < pull; ++i)
 		prev->textLayout.removeLastLine();
-	firstChar = prev->MaxChars = startingPos;
+	firstChar = prev->m_maxChars = startingPos;
 	// keep the remaining incomplete lines flagged as such
 	// this ensures that if pulling one line won't be enough, the subsequent call to layout() will pull more
 	prev->incompleteLines -= pull;
@@ -1297,7 +1297,7 @@
 			// push this paragraph to the next frame
 			for (int i = 0; i < pull; ++i)
 				textLayout.removeLastLine();
-			MaxChars = incompletePositions[incompleteLines-pull];
+			m_maxChars = incompletePositions[incompleteLines-pull];
 			incompleteLines = 0;
 			incompletePositions.clear();
 		}
@@ -1399,7 +1399,7 @@
 		{
 			next->invalid = false;
 			next->firstChar = itLen;
-			next->MaxChars = itLen;
+			next->m_maxChars = itLen;
 			next->textLayout.clear();
 			next = dynamic_cast<PageItem_TextFrame*>(next->nextInChain());
 		}
@@ -1428,7 +1428,7 @@
 		m_availableRegion = calcAvailableRegion();
 		if (m_availableRegion.isEmpty())
 		{
-			MaxChars = firstInFrame();
+			m_maxChars = firstInFrame();
 			goto NoRoom;
 		}
 
@@ -1455,7 +1455,7 @@
 		QList<GlyphCluster> glyphClusters; // = textShaper.shape();
 		// std::sort(glyphClusters.begin(), glyphClusters.end(), logicalGlyphRunComp);
 
-		LineControl current(m_width, m_height, m_textDistanceMargins, lineCorr, m_Doc, context,columnWidth(), ColGap);
+		LineControl current(m_width, m_height, m_textDistanceMargins, lineCorr, m_Doc, context,columnWidth(), m_columnGap);
 		current.nextColumn(textLayout);
 
 		lastLineY = m_textDistanceMargins.top();
@@ -1495,7 +1495,7 @@
 
 		outs = false;
 		OFs = 0;
-		MaxChars = 0;
+		m_maxChars = 0;
 		double realEnd = 0;
 		current.restartIndex = current.restartRowIndex = 0;
 		current.afterOverflow = false;
@@ -2039,12 +2039,12 @@
 					if (current.isEndOfCol(realDesc))
 					{
 						current.column++;
-						if (current.column < Cols)
+						if (current.column < m_columns)
 						{
 							newColumn = true;
 							break;
 						}
-						MaxChars = a;
+						m_maxChars = a;
 						goto NoRoom;
 					}
 				}
@@ -2261,13 +2261,13 @@
 			bool inOverflow = false;
 			if (current.glyphs[currentIndex].hasFlag(ScLayout_HyphenationPossible) || itemText.text(a) == SpecialChars::SHYPHEN)
 				hyphWidth = font.hyphenWidth(charStyle, hlcsize10) * (charStyle.scaleH() / 1000.0);
-			if ((current.isEndOfLine(style.rightMargin() + hyphWidth)) || current.isEndOfCol(realDesc) || SpecialChars::isBreak(itemText.text(a), Cols > 1) || (current.xPos - current.maxShrink + hyphWidth) >= current.mustLineEnd)
+			if ((current.isEndOfLine(style.rightMargin() + hyphWidth)) || current.isEndOfCol(realDesc) || SpecialChars::isBreak(itemText.text(a), m_columns > 1) || (current.xPos - current.maxShrink + hyphWidth) >= current.mustLineEnd)
 			{
 				//end of row reached - right column, end of column, break char or line must end
-				if (current.isEmpty && !current.afterOverflow && !SpecialChars::isBreak(itemText.text(a), Cols > 1))
+				if (current.isEmpty && !current.afterOverflow && !SpecialChars::isBreak(itemText.text(a), m_columns > 1))
 				{
 					//no glyphs in line, so start new row
-					if (SpecialChars::isBreak(itemText.text(a), Cols > 1))
+					if (SpecialChars::isBreak(itemText.text(a), m_columns > 1))
 						current.restartRowIndex = i + 1;
 					i = current.restartRow(true);
 					inOverflow = false;
@@ -2278,7 +2278,7 @@
 				if (current.breakIndex < 0)
 				{
 					//force break
-					if (!SpecialChars::isBreak(itemText.text(a), Cols > 1))
+					if (!SpecialChars::isBreak(itemText.text(a), m_columns > 1))
 					{
 						//force line end at previouse glyph
 						i--;
@@ -2475,7 +2475,7 @@
 
 			if ((itemText.text(a) == SpecialChars::FRAMEBREAK) && (a < itemText.length()-1))
 				goNoRoom = true;
-			if ((itemText.text(a) == SpecialChars::COLBREAK) && (Cols > 1))
+			if ((itemText.text(a) == SpecialChars::COLBREAK) && (m_columns > 1))
 				goNextColumn = true;
 
 			if (i != 0 && implicitBreak(itemText.text(glyphClusters[i - 1].lastChar()), itemText.text(current.glyphs[currentIndex].firstChar())))
@@ -2542,7 +2542,7 @@
 				tabs.active = false;
 				tabs.status = TabNONE;
 				tabs.xPos   = 0.0;
-				if (SpecialChars::isBreak(itemText.text(a), Cols > 1))
+				if (SpecialChars::isBreak(itemText.text(a), m_columns > 1))
 				{
 					// find end of line
 //					qDebug() << "breakline isBreak @" << i;
@@ -2720,10 +2720,10 @@
 					current.updateHeightMetrics();
 					if (current.isEndOfCol(current.lineData.descent))
 					{
-						if (current.isEmpty || current.column+1 == Cols)
+						if (current.isEmpty || current.column+1 == m_columns)
 						{
 							goNoRoom = true;
-							MaxChars = a + 1;
+							m_maxChars = a + 1;
 							break;
 						}
 						goNextColumn = true;
@@ -2825,14 +2825,14 @@
 				if (goNoRoom)
 				{
 					goNoRoom = false;
-					MaxChars = a+1;
+					m_maxChars = a+1;
 					goto NoRoom;
 				}
 				if (goNextColumn)
 				{
 					goNextColumn = false;
 					current.column++;
-					if (current.column < Cols)
+					if (current.column < m_columns)
 					{
 						if (firstLineOffset() == FLOPRealGlyphHeight)
 							asce = 0;
@@ -2845,9 +2845,9 @@
 					}
 					else
 					{
-						MaxChars = a; // Always a+1???
+						m_maxChars = a; // Always a+1???
 						if (itemText.text(a) == SpecialChars::COLBREAK)
-							++MaxChars;
+							++m_maxChars;
 						goto NoRoom;
 					}
 				}
@@ -2976,7 +2976,7 @@
 			}
 		}
 	}
-	MaxChars = itemText.length();
+	m_maxChars = itemText.length();
 	if (verticalAlign > 0)
 	{
 		double hAdjust = height() - textLayout.box()->naturalHeight() - m_textDistanceMargins.bottom();
@@ -3016,7 +3016,7 @@
 		while (nextFrame)
 		{
 			nextFrame->invalid   = true;
-			nextFrame->firstChar = MaxChars;
+			nextFrame->firstChar = m_maxChars;
 			nextFrame = dynamic_cast<PageItem_TextFrame*>(nextFrame->NextBox);
 		}
 	}
@@ -3066,16 +3066,16 @@
 	PageItem_TextFrame * next = dynamic_cast<PageItem_TextFrame*>(NextBox);
 	if (next != nullptr)
 	{
-		if (itemText.cursorPosition() > signed(MaxChars))
+		if (itemText.cursorPosition() > signed(m_maxChars))
 		{
 			int nCP = itemText.cursorPosition();
 			if (m_Doc->appMode == modeEdit)
-				next->itemText.setCursorPosition( qMax(nCP, signed(MaxChars)) );
+				next->itemText.setCursorPosition( qMax(nCP, signed(m_maxChars)) );
 		}
 		while (next)
 		{
 			next->invalid   = true;
-			next->firstChar = MaxChars;
+			next->firstChar = m_maxChars;
 			next = dynamic_cast<PageItem_TextFrame*>(next->NextBox);
 		}
 	}
@@ -3114,7 +3114,7 @@
 	{
 		if (firstInvalid->invalid)
 			break;
-		if (firstInvalid->firstChar <= firstItem && firstItem <= firstInvalid->MaxChars)
+		if (firstInvalid->firstChar <= firstItem && firstItem <= firstInvalid->m_maxChars)
 			break;
 		firstInvalid = dynamic_cast<PageItem_TextFrame*>(firstInvalid->NextBox);
 	}
@@ -3165,7 +3165,7 @@
 		pf2.translate(m_xPos, m_yPos);
 	pf2.rotate(m_rotation);
 
-	if (!m_Doc->layerOutline(LayerID))
+	if (!m_Doc->layerOutline(m_layerID))
 	{
 		if ((fillColor() != CommonStrings::None) || (GrType != 0))
 		{
@@ -3639,9 +3639,9 @@
 
 void PageItem_TextFrame::DrawObj_Post(ScPainter *p)
 {
-	if (m_Doc->layerOutline(LayerID))
-	{
-		p->setPen(m_Doc->layerMarker(LayerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+	if (m_Doc->layerOutline(m_layerID))
+	{
+		p->setPen(m_Doc->layerMarker(m_layerID), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 		p->setFillMode(ScPainter::None);
 		p->setBrushOpacity(1.0);
 		p->setPenOpacity(1.0);
@@ -3795,12 +3795,12 @@
 			drawColumnBorders(p);
 		if ((m_Doc->guidesPrefs().layerMarkersShown) &&
 			(m_Doc->layerCount() > 1) &&
-			(!m_Doc->layerOutline(LayerID)) &&
+			(!m_Doc->layerOutline(m_layerID)) &&
 			(!m_Doc->drawAsPreview))
 		{
 			p->setPen(Qt::black, 0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 			p->setPenOpacity(1.0);
-			p->setBrush(m_Doc->layerMarker(LayerID));
+			p->setBrush(m_Doc->layerMarker(m_layerID));
 			p->setBrushOpacity(1.0);
 			p->setFillMode(ScPainter::Solid);
 			double ofwh = 10;
@@ -3859,7 +3859,7 @@
 	{
 		ParagraphStyle defaultStyle = this->itemText.defaultStyle();
 		int pos = itemText.cursorPosition();
-		if (itemText.lengthOfSelection() == 0)
+		if (itemText.selectionLength() == 0)
 		{
 			itemText.select(maxCharsInFrame(), itemText.length() - maxCharsInFrame(), true);
 			deleteSelectedTextFromFrame();
@@ -3994,7 +3994,7 @@
 				UndoTransaction trans;
 				if (UndoManager::undoEnabled())
 					trans = undoManager->beginTransaction(Um::Selection,Um::ITextFrame,Um::InsertText,"",Um::IDelete);
-				if (itemText.lengthOfSelection() > 0)
+				if (itemText.selectionLength() > 0)
 					deleteSelectedTextFromFrame();
 				if (conv < 31)
 					conv = 32;
@@ -4302,7 +4302,7 @@
 	case Qt::Key_Delete:
 		if (itemText.cursorPosition() == itemText.length())
 		{
-			if (itemText.lengthOfSelection() > 0)
+			if (itemText.selectionLength() > 0)
 			{
 				deleteSelectedTextFromFrame();
 				m_Doc->scMW()->setTBvals(this);
@@ -4326,7 +4326,7 @@
 			keyRepeat = false;
 			return;
 		}
-		if (itemText.lengthOfSelection() == 0)
+		if (itemText.selectionLength() == 0)
 		{
 			int pos1 = itemText.cursorPosition();
 			itemText.moveCursorForward();
@@ -4360,7 +4360,7 @@
 	case Qt::Key_Backspace:
 		if (itemText.cursorPosition() == 0)
 		{
-			if (itemText.lengthOfSelection() > 0)
+			if (itemText.selectionLength() > 0)
 			{
 				deleteSelectedTextFromFrame();
 				m_Doc->scMW()->setTBvals(this);
@@ -4379,7 +4379,7 @@
 		}
 		if (itemText.length() == 0)
 			break;
-		if (itemText.lengthOfSelection() == 0)
+		if (itemText.selectionLength() == 0)
 		{
 			itemText.setCursorPosition(-1, true);
 			itemText.select(itemText.cursorPosition(), 1, true);
@@ -4427,7 +4427,7 @@
 			break; //avoid inserting chars before first note mark
 		bool doUpdate = false;
 		UndoTransaction activeTransaction;
-		if (itemText.lengthOfSelection() > 0) //(kk < 0x1000)
+		if (itemText.selectionLength() > 0) //(kk < 0x1000)
 		{
 			bool x11Hack=false;
 			bool controlCharHack=false;
@@ -4592,7 +4592,7 @@
 {
 	if (itemText.length() <= 0)
 		return;
-	if (itemText.lengthOfSelection() == 0)
+	if (itemText.selectionLength() == 0)
 	{
 		itemText.select(itemText.cursorPosition(), 1);
 		HasSel = true;
@@ -4939,7 +4939,7 @@
 	{
 		itemText.extendSelection(oldPos, itemText.cursorPosition());
 	}
-	HasSel = (itemText.lengthOfSelection() > 0);
+	HasSel = (itemText.selectionLength() > 0);
 	if (HasSel)
 	{
 		//CB Replace with direct call for now //emit HasTextSel();
@@ -4960,7 +4960,7 @@
 
 void PageItem_TextFrame::deselectAll()
 {
-	if ( itemText.lengthOfSelection() > 0 )
+	if ( itemText.selectionLength() > 0 )
 	{
 		itemText.deselectAll();
 		PageItem *item = this;
@@ -4986,7 +4986,7 @@
 		lineCorr = m_lineWidth / 2.0;
 	else
 		lineCorr = 0;
-	return (m_width - (ColGap * (Cols - 1)) - m_textDistanceMargins.left() - m_textDistanceMargins.right() - 2 * lineCorr) / Cols;
+	return (m_width - (m_columnGap * (m_columns - 1)) - m_textDistanceMargins.left() - m_textDistanceMargins.right() - 2 * lineCorr) / m_columns;
 //	return (Width - (ColGap * (Cols - 1)) - m_textDistanceMargins.left() - m_textDistanceMargins.right() - lineCorr) / Cols;
 }
 
@@ -5039,9 +5039,9 @@
 		p->drawSharpLine(FPoint(m_textDistanceMargins.left() + lineCorr, m_textDistanceMargins.top() + lineCorr), FPoint(m_width - m_textDistanceMargins.right() - lineCorr, m_textDistanceMargins.top() + lineCorr));
 	if (m_textDistanceMargins.bottom() + lineCorr!=0.0)
 		p->drawSharpLine(FPoint(m_textDistanceMargins.left() + lineCorr, m_height - m_textDistanceMargins.bottom() - lineCorr), FPoint(m_width - m_textDistanceMargins.right() - lineCorr, m_height - m_textDistanceMargins.bottom() - lineCorr));
-	while (curCol < Cols)
-	{
-		colLeft=(colWidth + ColGap) * curCol + m_textDistanceMargins.left() + lineCorr;
+	while (curCol < m_columns)
+	{
+		colLeft=(colWidth + m_columnGap) * curCol + m_textDistanceMargins.left() + lineCorr;
 		if (colLeft != 0.0)
 			p->drawSharpLine(FPoint(colLeft, m_textDistanceMargins.top() + lineCorr), FPoint(colLeft, m_height - m_textDistanceMargins.bottom() - lineCorr));
 		if (colLeft + colWidth != m_width)
@@ -5616,11 +5616,11 @@
 	int stop = 0;
 	if (onlySelection)
 	{
-		if (itemText.lengthOfSelection() > 0)
+		if (itemText.selectionLength() > 0)
 		{
 			//only selection
 			start = itemText.startOfSelection();
-			stop = start + itemText.lengthOfSelection();
+			stop = start + itemText.selectionLength();
 		}
 		else //in edit mode only one char in cursor position
 		{
@@ -5668,10 +5668,10 @@
 	int stop = itemText.length();
 	if (onlySelection)
 	{
-		if (itemText.lengthOfSelection() > 0)
+		if (itemText.selectionLength() > 0)
 		{
 			start = itemText.startOfSelection();
-			stop = start + itemText.lengthOfSelection();
+			stop = start + itemText.selectionLength();
 		}
 		else
 			return nullptr;

Modified: trunk/Scribus/scribus/pageitem_textframe.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pageitem_textframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.h	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.h	Sun Feb 10 17:14:55 2019
@@ -53,18 +53,18 @@
 
 	void init();
 
-	virtual PageItem_TextFrame * asTextFrame() { return this; }
-	virtual bool isTextFrame() const { return true; }
+	PageItem_TextFrame * asTextFrame() override { return this; }
+	bool isTextFrame() const override { return true; }
 	
-	virtual void clearContents();
-	virtual void truncateContents();
+	void clearContents() override;
+	void truncateContents() override;
 	
 	/**
 	* \brief Handle keyboard interaction with the text frame while in edit mode
 	* @param k key event
 	* @param keyRepeat a reference to the keyRepeat property
 	*/
-	virtual void handleModeEditKey(QKeyEvent *k, bool& keyRepeat);
+	void handleModeEditKey(QKeyEvent *k, bool& keyRepeat) override;
 	void deleteSelectedTextFromFrame();
 	void ExpandSel(int oldPos);
 	void deselectAll();
@@ -72,7 +72,7 @@
 	//for speed up updates when changed was only one frame from chain
 	virtual void invalidateLayout(bool wholeChain);
 	using PageItem::invalidateLayout;
-	virtual void layout();
+	void layout() override;
 	//return true if all previouse frames from chain are valid (including that one)
 	bool isValidChainFromBegin();
 	void setTextAnnotationOpen(bool open);
@@ -86,9 +86,9 @@
 protected:
 	QRegion calcAvailableRegion();
 	QRegion m_availableRegion;
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
-	virtual void DrawObj_Post(ScPainter *p);
-	virtual void DrawObj_Decoration(ScPainter *p);
+	void DrawObj_Item(ScPainter *p, QRectF e) override;
+	void DrawObj_Post(ScPainter *p) override;
+	void DrawObj_Decoration(ScPainter *p) override;
 	//void drawOverflowMarker(ScPainter *p);
 	void drawUnderflowMarker(ScPainter *p);
 	void drawColumnBorders(ScPainter *p);
@@ -98,9 +98,9 @@
 	QString unicodeInputString;
 
 	void drawNoteIcon(ScPainter *p);
-	virtual bool createInfoGroup(QFrame *, QGridLayout *);
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription() const;
+	bool createInfoGroup(QFrame *, QGridLayout *) override;
+	void applicableActions(QStringList& actionList) override;
+	QString infoDescription() const override;
 	// Move incomplete lines from the previous frame if needed.
 	bool moveLinesFromPreviousFrame ();
 	void adjustParagraphEndings ();

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Sun Feb 10 17:14:55 2019
@@ -1201,7 +1201,7 @@
 	PutDoc("/Producer " + EncString(QByteArray("Scribus PDF Library ") + VERSION, writer.InfoObj) + "\n");
 	QString docTitle = doc.documentInfo().title();
 	if ((PDF_IsPDFX()) && (docTitle.isEmpty()))
-		PutDoc("/Title " + EncStringUTF16(doc.DocName, writer.InfoObj) + "\n");
+		PutDoc("/Title " + EncStringUTF16(doc.documentFileName(), writer.InfoObj) + "\n");
 	else
 		PutDoc("/Title " + EncStringUTF16(doc.documentInfo().title(), writer.InfoObj) + "\n");
 	PutDoc("/Author " + EncStringUTF16(doc.documentInfo().author(), writer.InfoObj) + "\n");
@@ -2674,7 +2674,7 @@
 			{
 				Content.clear();
 				ite =PItems.at(a);
-				if (ite->LayerID != ll.ID)
+				if (ite->m_layerID != ll.ID)
 					continue;
 				double x  = pag->xOffset() - bLeft;
 				double y  = pag->yOffset() - bTop;
@@ -3544,7 +3544,7 @@
 			QString docTitle = doc.documentInfo().title();
 			if (docTitle.isEmpty())
 			{
-				QFileInfo fi(doc.DocName);
+				QFileInfo fi(doc.documentFileName());
 				docTitle = fi.fileName();
 			}
 //			docTitle += "  "+ tr("Page:")+" "+tmp.setNum(PgNr+1);
@@ -3879,7 +3879,7 @@
 			ite = pag->FromMaster.at(am);
 			if (usingGUI)
 				qApp->processEvents();
-			if ((ite->LayerID != layer.ID) || (!ite->printEnabled()))
+			if ((ite->m_layerID != layer.ID) || (!ite->printEnabled()))
 				continue;
 			if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
 				continue;
@@ -3976,7 +3976,7 @@
 		for (int a = 0; a < PItems.count() && !abortExport; ++a)
 		{
 			ite = PItems.at(a);
-			if (ite->LayerID != layer.ID)
+			if (ite->m_layerID != layer.ID)
 				continue;
 			if (usingGUI)
 			{
@@ -11477,7 +11477,7 @@
 	alt1.appendChild(li1);
 	QString docTitle = doc.documentInfo().title();
 	if ((PDF_IsPDFX()) && (docTitle.isEmpty()))
-		docTitle = doc.DocName;
+		docTitle = doc.documentFileName();
 	li1.appendChild(xmpDoc.createTextNode(docTitle));
 	QDomElement creator = xmpDoc.createElement("dc:creator");
 	descDC.appendChild(creator);

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp	Sun Feb 10 17:14:55 2019
@@ -104,7 +104,7 @@
 	// interval widgets handling
 	QString tmp;
 	dia->rangeVal->setText(tmp.setNum(doc->currentPageNumber()+1));
-	dia->prefixLineEdit->setText(doc->DocName);
+	dia->prefixLineEdit->setText(doc->documentFileName());
 	// main "loop"
 	if (dia->exec() != QDialog::Accepted)
 		return true;

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	Sun Feb 10 17:14:55 2019
@@ -316,7 +316,7 @@
 	for (int j = 0; j < Items.count(); ++j)
 	{
 		Item = Items.at(j);
-		if (Item->LayerID != layer.ID)
+		if (Item->m_layerID != layer.ID)
 			continue;
 		if (!Item->printEnabled())
 			continue;

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	Sun Feb 10 17:14:55 2019
@@ -154,7 +154,7 @@
 		QString fna;
 		if (doc->hasName)
 		{
-			QFileInfo fi(doc->DocName);
+			QFileInfo fi(doc->documentFileName());
 			QString completeBaseName = fi.completeBaseName();
 			if (completeBaseName.endsWith(".xps", Qt::CaseInsensitive))
 				completeBaseName.chop(4);
@@ -168,7 +168,7 @@
 				fna = wdir + "/";
 			else
 				fna = wdir;
-			fna += doc->DocName + ".xps";
+			fna += doc->documentFileName() + ".xps";
 		}
 		openDia->setSelection(fna);
 		openDia->setExtension("xps");
@@ -379,7 +379,7 @@
 	for (int j = 0; j < Items.count(); ++j)
 	{
 		Item = Items.at(j);
-		if (Item->LayerID != layer.ID)
+		if (Item->m_layerID != layer.ID)
 			continue;
 		if (!Item->printEnabled())
 			continue;

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Sun Feb 10 17:14:55 2019
@@ -517,8 +517,8 @@
 	currItem->setStartArrowScale(Buffer->startArrowScale);
 	currItem->setEndArrowScale(Buffer->endArrowScale);
 	currItem->NamedLStyle = Buffer->NamedLStyle;
-	currItem->Cols = Buffer->Cols;
-	currItem->ColGap = Buffer->ColGap;
+	currItem->m_columns = Buffer->Cols;
+	currItem->m_columnGap = Buffer->ColGap;
 	currItem->setFirstLineOffset(Buffer->firstLineOffsetP);
 	if (Buffer->LayerID != -1)
 		currItem->setLayer(Buffer->LayerID);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Sun Feb 10 17:14:55 2019
@@ -2909,8 +2909,8 @@
 	currItem->setLineBlendmode(attrs.valueAsInt("TransBlendS", 0));
 	if (attrs.valueAsInt("TRANSPARENT", 0) == 1)
 		currItem->setFillColor(CommonStrings::None);
-	currItem->Cols   = attrs.valueAsInt("COLUMNS", 1);
-	currItem->ColGap = attrs.valueAsDouble("COLGAP", 0.0);
+	currItem->m_columns   = attrs.valueAsInt("COLUMNS", 1);
+	currItem->m_columnGap = attrs.valueAsDouble("COLGAP", 0.0);
 	if (attrs.valueAsInt("LAYER", 0) != -1)
 		currItem->setLayer(attrs.valueAsInt("LAYER", 0));
 	tmp = "";
@@ -3376,7 +3376,7 @@
 					newItem->setMasterPageName(QString());
 				else if (Mpage && !renamedPageName.isEmpty())
 					newItem->setMasterPageName(renamedPageName);
-				newItem->setLayer(layerTrans.value(newItem->LayerID, newItem->LayerID));
+				newItem->setLayer(layerTrans.value(newItem->m_layerID, newItem->m_layerID));
 
 				if (newItem->isTableItem)
 				{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Sun Feb 10 17:14:55 2019
@@ -1874,8 +1874,8 @@
 	currItem->setLineBlendmode(0);
 	if (obj->attribute("TRANSPARENT", "0").toInt() == 1)
 		currItem->setFillColor(CommonStrings::None);
-	currItem->Cols   = obj->attribute("COLUMNS", "1").toInt();
-	currItem->ColGap = ScCLocale::toDoubleC(obj->attribute("COLGAP"), 0.0);
+	currItem->m_columns   = obj->attribute("COLUMNS", "1").toInt();
+	currItem->m_columnGap = ScCLocale::toDoubleC(obj->attribute("COLGAP"), 0.0);
 	if (obj->attribute("LAYER", "0").toInt() != -1)
 		currItem->setLayer(obj->attribute("LAYER", "0").toInt());
 	tmp = "";
@@ -2290,7 +2290,7 @@
 						Neu->setMasterPageName(QString());
 					else if (Mpage && !renamedPageName.isEmpty())
 						Neu->setMasterPageName(renamedPageName);
-					Neu->setLayer(layerTrans.value(Neu->LayerID, Neu->LayerID));
+					Neu->setLayer(layerTrans.value(Neu->m_layerID, Neu->m_layerID));
 					/*m_Doc->GroupCounter = docGc;*/
 					QDomNode IT=pg.firstChild();
 					LastStyles * last = new LastStyles();

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Sun Feb 10 17:14:55 2019
@@ -321,7 +321,7 @@
 			success = readObject(m_Doc, reader, itemInfo, fileDir, true);
 			if (!success)
 				break;
-			itemInfo.item->LayerID = LayerToPaste;
+			itemInfo.item->m_layerID = LayerToPaste;
 			if (isNewFormat)
 			{
 				if (itemInfo.nextItem != -1)
@@ -4073,7 +4073,7 @@
 					PageItem* currItem = GroupItems.at(as);
 					newItem->groupItemList.append(currItem);
 					currItem->Parent = newItem;
-					currItem->LayerID = newItem->LayerID;
+					currItem->m_layerID = newItem->m_layerID;
 					currItem->OwnPage = newItem->OwnPage;
 					currItem->OnMasterPage = newItem->OnMasterPage;
 				}
@@ -5320,8 +5320,8 @@
 	currItem->setLineBlendmode(attrs.valueAsInt("TransBlendS", 0));
 	if (attrs.valueAsInt("TRANSPARENT", 0) == 1)
 		currItem->setFillColor(CommonStrings::None);
-	currItem->Cols   = attrs.valueAsInt("COLUMNS", 1);
-	currItem->ColGap = attrs.valueAsDouble("COLGAP", 0.0);
+	currItem->m_columns   = attrs.valueAsInt("COLUMNS", 1);
+	currItem->m_columnGap = attrs.valueAsDouble("COLGAP", 0.0);
 	if (attrs.valueAsInt("LAYER", 0) != -1)
 	{
 		currItem->setLayer(attrs.valueAsInt("LAYER", 0));
@@ -5329,7 +5329,7 @@
 		bool found = false;
 		for (uint i = 0; i < layerCount; ++i)
 		{
-			if (doc->Layers[i].ID == currItem->LayerID)
+			if (doc->Layers[i].ID == currItem->m_layerID)
 			{
 				found = true;
 				break;
@@ -5817,8 +5817,8 @@
 			item->cellAt(row, col).setBottomPadding(tAtt.valueAsDouble("BottomPadding", 0.0));
 
 		PageItem* newItem = item->cellAt(row, col).textFrame();
-		newItem->Cols   = tAtt.valueAsInt("TextColumns", 1);
-		newItem->ColGap = tAtt.valueAsDouble("TextColGap", 0.0);
+		newItem->m_columns   = tAtt.valueAsInt("TextColumns", 1);
+		newItem->m_columnGap = tAtt.valueAsDouble("TextColGap", 0.0);
 		newItem->setTextToFrameDist(tAtt.valueAsDouble("TextDistLeft", 0.0),
 							tAtt.valueAsDouble("TextDistRight", 0.0),
 							tAtt.valueAsDouble("TextDistTop", 0.0),
@@ -6275,7 +6275,7 @@
 					newItem->setMasterPageName(QString());
 				else if (Mpage && !renamedPageName.isEmpty())
 					newItem->setMasterPageName(renamedPageName);
-				newItem->setLayer(layerTrans.value(newItem->LayerID, newItem->LayerID));
+				newItem->setLayer(layerTrans.value(newItem->m_layerID, newItem->m_layerID));
 				if (isNewFormat)
 				{
 					if (itemInfo.nextItem != -1)

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	Sun Feb 10 17:14:55 2019
@@ -1991,7 +1991,7 @@
 		if (! item->itemText.defaultStyle().isInhAlignment())
 			docu.writeAttribute("ALIGN", item->itemText.defaultStyle().alignment());
 		
-		docu.writeAttribute("LAYER", item->LayerID);
+		docu.writeAttribute("LAYER", item->m_layerID);
 		if (item->isBookmark)
 			docu.writeAttribute("BOOKMARK", 1);
 

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&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	Sun Feb 10 17:14:55 2019
@@ -1509,7 +1509,7 @@
 			//	yp += m_Doc->currentPage()->yOffset();
 				int z = m_Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, baseX + xp, baseY + yp, 1, 1, 0, CommonStrings::None, CommonStrings::None);
 				PageItem *b = m_Doc->Items->at(z);
-				b->LayerID = m_Doc->activeLayer();
+				b->m_layerID = m_Doc->activeLayer();
 				ScPattern pat = m_Doc->docPatterns[currentSymbolName];
 				b->setWidth(pat.width * symTrans.m11());
 				b->setHeight(pat.height * symTrans.m22());

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&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	Sun Feb 10 17:14:55 2019
@@ -739,7 +739,7 @@
 			if (ite != nullptr)
 			{
 				GElements.append(ite);
-				gLayer = ite->LayerID;
+				gLayer = ite->m_layerID;
 			}
 		}
 		if (GElements.count() > 0)

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&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	Sun Feb 10 17:14:55 2019
@@ -1571,7 +1571,7 @@
 			Elements.append(ite);
 			m_Doc->Items->append(ite);
 			if ((importerFlags & LoadSavePlugin::lfCreateDoc) && (it > 0))
-				ite->LayerID = currentLayer;
+				ite->m_layerID = currentLayer;
 		}
 	}
 }

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp	(original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp	Sun Feb 10 17:14:55 2019
@@ -120,7 +120,7 @@
 		templates.mkdir("templates");
 	}
 	QString currentPath(QDir::currentPath());
-	QString currentFile(doc->DocName);
+	QString currentFile(doc->documentFileName());
 	bool hasName = doc->hasName;
 	bool isModified = doc->isModified();
 	QString userTemplatesDir = ScPaths::instance().userTemplateDir(true);
@@ -143,12 +143,12 @@
 		return;
 	if (oldCollect != ".")
 		dirs->set("collect", oldCollect);
-	QString docPath = doc->DocName;
+	QString docPath = doc->documentFileName();
 	QString docDir = docPath.left(docPath.lastIndexOf('/'));
 	QString docName = docPath.right(docPath.length() - docPath.lastIndexOf('/') - 1);
 	docName = docName.left(docName.lastIndexOf(".s"));
 
-	if (currentFile ==  doc->DocName)
+	if (currentFile == doc->documentFileName())
 		return;
 	SATDialog* satdia = new SATDialog(doc->scMW(),docName,
 									  static_cast<int>(doc->pageWidth() + 0.5),
@@ -161,7 +161,7 @@
 		delete s;
 	}
 	// Restore the state that was before ScMW->Collect()
-	doc->DocName = currentFile;
+	doc->setDocumentFileName(currentFile);
 	doc->hasName = hasName;
 	doc->setModified(isModified);
 	QString newCaption=currentFile;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp	Sun Feb 10 17:14:55 2019
@@ -201,7 +201,7 @@
 	{
 		return PyString_FromString("");
 	}
-	return PyString_FromString(ScCore->primaryMainWindow()->doc->DocName.toUtf8());
+	return PyString_FromString(ScCore->primaryMainWindow()->doc->documentFileName().toUtf8());
 }
 
 PyObject *scribus_savedocas(PyObject* /* self */, PyObject* args)

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	Sun Feb 10 17:14:55 2019
@@ -218,12 +218,12 @@
 		for (int i = 0; i < currentDoc->m_Selection->count(); ++i)
 		{
 			item = currentDoc->m_Selection->itemAt(i);
-			item->LayerID = scLayer->ID;
+			item->m_layerID = scLayer->ID;
 		}
 	}
 	else
 	{
-		item->LayerID = scLayer->ID;
+		item->m_layerID = scLayer->ID;
 	}
 
 	Py_RETURN_NONE;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	Sun Feb 10 17:14:55 2019
@@ -599,7 +599,7 @@
 		return NULL;
 	}
 
-	int selectionLength = item->itemText.lengthOfSelection();	
+	int selectionLength = item->itemText.selectionLength();	
 	if (selectionLength > 0)
 	{
 		int selectionStart = item->itemText.startOfSelection();
@@ -670,7 +670,7 @@
 		// Store text selection as clearing object selection
 		// will also clear text selection
 		int selectionStart = -1;
-		int selectionLength = item->itemText.lengthOfSelection();
+		int selectionLength = item->itemText.selectionLength();
 		if (selectionLength > 0)
 			selectionStart = item->itemText.startOfSelection();
 		// quick hack to always apply on the right frame - pv
@@ -753,7 +753,7 @@
 		// Store text selection as clearing object selection
 		// will also clear text selection
 		int selectionStart = -1;
-		int selectionLength = item->itemText.lengthOfSelection();
+		int selectionLength = item->itemText.selectionLength();
 		if (selectionLength > 0)
 			selectionStart = item->itemText.startOfSelection();
 		// quick hack to always apply on the right frame - pv

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	Sun Feb 10 17:14:55 2019
@@ -95,28 +95,28 @@
 PyObject *scribus_createcharstyle(PyObject* /* self */, PyObject* args, PyObject* keywords)
 {
 	char* keywordargs[] = {
-					  							const_cast<char*>("name"),
-					  							const_cast<char*>("font"),
-					  							const_cast<char*>("fontsize"),
-												const_cast<char*>("fontfeatures"),
-					  							const_cast<char*>("features"),
-					  							const_cast<char*>("fillcolor"),
-					  							const_cast<char*>("fillshade"),
-					  							const_cast<char*>("strokecolor"),
-					  							const_cast<char*>("strokeshade"),
-					  							const_cast<char*>("baselineoffset"),
-					  							const_cast<char*>("shadowxoffset"),
-					  							const_cast<char*>("shadowyoffset"),
-					  							const_cast<char*>("outlinewidth"),
-					  							const_cast<char*>("underlineoffset"),
-					  							const_cast<char*>("underlinewidth"),
-					  							const_cast<char*>("strikethruoffset"),
-					  							const_cast<char*>("strikethruwidth"),
-					  							const_cast<char*>("scaleh"),
-					  							const_cast<char*>("scalev"),
-					  							const_cast<char*>("tracking"),
-					  							const_cast<char*>("language"),
-											nullptr};
+		const_cast<char*>("name"),
+		const_cast<char*>("font"),
+		const_cast<char*>("fontsize"),
+		const_cast<char*>("fontfeatures"),
+		const_cast<char*>("features"),
+		const_cast<char*>("fillcolor"),
+		const_cast<char*>("fillshade"),
+		const_cast<char*>("strokecolor"),
+		const_cast<char*>("strokeshade"),
+		const_cast<char*>("baselineoffset"),
+		const_cast<char*>("shadowxoffset"),
+		const_cast<char*>("shadowyoffset"),
+		const_cast<char*>("outlinewidth"),
+		const_cast<char*>("underlineoffset"),
+		const_cast<char*>("underlinewidth"),
+		const_cast<char*>("strikethruoffset"),
+		const_cast<char*>("strikethruwidth"),
+		const_cast<char*>("scaleh"),
+		const_cast<char*>("scalev"),
+		const_cast<char*>("tracking"),
+		const_cast<char*>("language"),
+		nullptr};
 	char *Name = const_cast<char*>(""), *Font = const_cast<char*>("Times"), *Features = const_cast<char*>("inherit"), *FillColor = const_cast<char*>("Black"), *FontFeatures = const_cast<char*>(""), *StrokeColor = const_cast<char*>("Black"), *Language = const_cast<char*>("");
 	double FontSize = 200, FillShade = 1, StrokeShade = 1, ScaleH = 1, ScaleV = 1, BaselineOffset = 0, ShadowXOffset = 0, ShadowYOffset = 0, OutlineWidth = 0, UnderlineOffset = 0, UnderlineWidth = 0, StrikethruOffset = 0, StrikethruWidth = 0, Tracking = 0;
 	if (!PyArg_ParseTupleAndKeywords(args, keywords, "es|esdesesdesddddddddddddes", keywordargs,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp	Sun Feb 10 17:14:55 2019
@@ -221,7 +221,7 @@
 		PyErr_SetString(WrongFrameTypeError, QObject::tr("Cannot get column count of non-text frame.","python error").toLocal8Bit().constData());
 		return nullptr;
 	}
-	return PyInt_FromLong(static_cast<long>(item->Cols));
+	return PyInt_FromLong(static_cast<long>(item->m_columns));
 }
 
 PyObject *scribus_getcolumngap(PyObject* /* self */, PyObject* args)
@@ -239,7 +239,7 @@
 		PyErr_SetString(WrongFrameTypeError, QObject::tr("Cannot get column gap of non-text frame.", "python error").toLocal8Bit().constData());
 		return nullptr;
 	}
-	return PyFloat_FromDouble(PointToValue(static_cast<double>(item->ColGap)));
+	return PyFloat_FromDouble(PointToValue(static_cast<double>(item->m_columnGap)));
 }
 
 PyObject *scribus_getfontfeatures(PyObject* /* self */, PyObject* args)
@@ -762,7 +762,7 @@
 		PyErr_SetString(WrongFrameTypeError, QObject::tr("Cannot set column gap on a non-text frame.","python error").toLocal8Bit().constData());
 		return nullptr;
 	}
-	item->ColGap = ValueToPoint(w);
+	item->m_columnGap = ValueToPoint(w);
 
 	Py_RETURN_NONE;
 }
@@ -788,7 +788,7 @@
 		PyErr_SetString(WrongFrameTypeError, QObject::tr("Cannot set number of columns on a non-text frame.","python error").toLocal8Bit().constData());
 		return nullptr;
 	}
-	item->Cols = w;
+	item->m_columns = w;
 
 	Py_RETURN_NONE;
 }

Modified: trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp	Sun Feb 10 17:14:55 2019
@@ -335,7 +335,7 @@
 // defaut save into file
 	QString tf = pdfOptions.fileName;
 	if (tf.isEmpty()) {
-		QFileInfo fi = QFileInfo(currentDoc->DocName);
+		QFileInfo fi = QFileInfo(currentDoc->documentFileName());
 		tf = fi.path()+"/"+fi.baseName()+".pdf";
 	}
 	PyObject *file = nullptr;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp	Sun Feb 10 17:14:55 2019
@@ -162,7 +162,7 @@
 // set defaul name of file to print into
 	QString tf(ScCore->primaryMainWindow()->doc->pdfOptions().fileName);
 	if (tf.isEmpty()) {
-		QFileInfo fi = QFileInfo(ScCore->primaryMainWindow()->doc->DocName);
+		QFileInfo fi = QFileInfo(ScCore->primaryMainWindow()->doc->documentFileName());
 		tf = fi.path()+"/"+fi.baseName()+".pdf";
 	}
 	PyObject *file = nullptr;

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Sun Feb 10 17:14:55 2019
@@ -1655,7 +1655,7 @@
 						PageItem *it = Doc->MasterItems.at(api);
 						if (progressDialog)
 							ScQApp->processEvents();
-						if ((it->LayerID != ll.ID) || (!it->printEnabled()))
+						if ((it->m_layerID != ll.ID) || (!it->printEnabled()))
 							continue;
 						double bLeft, bRight, bBottom, bTop;
 						GetBleeds(Doc->MasterPages.at(ap), bLeft, bRight, bBottom, bTop);
@@ -2594,7 +2594,7 @@
 				item = PItems.at(b);
 				if (progressDialog)
 					ScQApp->processEvents();
-				if (item->LayerID != ll.ID)
+				if (item->m_layerID != ll.ID)
 					continue;
 				if ((!page->pageName().isEmpty()) && (item->asTextFrame()))
 					continue;
@@ -2644,7 +2644,7 @@
 			PageItem *ite = page->FromMaster.at(am);
 			if (progressDialog)
 				ScQApp->processEvents();
-			if ((ite->LayerID != layer.ID) || (!ite->printEnabled()))
+			if ((ite->m_layerID != layer.ID) || (!ite->printEnabled()))
 				continue;
 			if (!(ite->asTextFrame()) && !(ite->asImageFrame()) && !(ite->asPathText()) && !(ite->asTable()))
 			{
@@ -3020,7 +3020,7 @@
 		PageItem *item = items.at(i);
 		if (progressDialog)
 			ScQApp->processEvents();
-		if (item->LayerID != layer.ID)
+		if (item->m_layerID != layer.ID)
 			continue;
 		if ((!page->pageName().isEmpty()) && (item->asTextFrame()))
 			continue;

Modified: trunk/Scribus/scribus/sampleitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/sampleitem.cpp
==============================================================================
--- trunk/Scribus/scribus/sampleitem.cpp	(original)
+++ trunk/Scribus/scribus/sampleitem.cpp	Sun Feb 10 17:14:55 2019
@@ -306,7 +306,7 @@
 	previewItem->FrameType = PageItem::TextFrame;
 	previewItem->itemText.clear();
 //	previewItem->setFont(tmpStyle.charStyle().font()->scName());
-	previewItem->Cols = 1;
+	previewItem->m_columns = 1;
 	m_text.replace(QChar(10),QChar(13)).replace(QChar(5),QChar(13));
 	previewItem->itemText.insertChars(0, m_text);
 	previewItem->itemText.setDefaultStyle(m_tmpStyle);

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp	(original)
+++ trunk/Scribus/scribus/scfonts.cpp	Sun Feb 10 17:14:55 2019
@@ -926,7 +926,7 @@
 		}
 		else
 			replFont = prefsManager->appPrefs.fontPrefs.GFontSub[fontname];
-		ScFace repl = (*this)[replFont].mkReplacementFor(fontname, doc ? doc->DocName : QString(""));
+		ScFace repl = (*this)[replFont].mkReplacementFor(fontname, doc ? doc->documentFileName() : QString(""));
 		insert(fontname, repl);
 	}
 	else if ( doc && !doc->UsedFonts.contains(fontname) )
@@ -967,7 +967,7 @@
 		ScFace& font(const_cast<ScFace&>(findFont(it.key(), doc)));
 		if (font.isReplacement())
 		{
-			font.chReplacementTo(const_cast<ScFace&>(findFont(it.value(), doc)), doc->DocName);
+			font.chReplacementTo(const_cast<ScFace&>(findFont(it.value(), doc)), doc->documentFileName());
 		}
 	}
 }

Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp	(original)
+++ trunk/Scribus/scribus/scpage.cpp	Sun Feb 10 17:14:55 2019
@@ -495,8 +495,8 @@
 		return;
 	m_pageSize = sourcePage->m_pageSize;
 	m_orientation = sourcePage->m_orientation;
-	m_width=sourcePage->m_width;
-	m_height=sourcePage->m_height;
+	m_width = sourcePage->m_width;
+	m_height = sourcePage->m_height;
 	m_initialWidth = sourcePage->m_initialWidth;
 	m_initialHeight = sourcePage->m_initialHeight;
 

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Sun Feb 10 17:14:55 2019
@@ -121,7 +121,7 @@
 	for (uint a = 0; a < pageFromMasterCount; ++a)
 	{
 		currItem = page->FromMaster.at(a);
-		if (currItem->LayerID != layer.ID)
+		if (currItem->m_layerID != layer.ID)
 			continue;
 		if ((currItem->OwnPage != -1) && (currItem->OwnPage != static_cast<int>(Mp->pageNr())))
 			continue;
@@ -170,7 +170,7 @@
 	for (int it = 0; it < m_doc->Items->count(); ++it)
 	{
 		currItem = m_doc->Items->at(it);
-		if (currItem->LayerID != layer.ID)
+		if (currItem->m_layerID != layer.ID)
 			continue;
 		if (!currItem->printEnabled())
 			continue;

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp	(original)
+++ trunk/Scribus/scribus/scpaths.cpp	Sun Feb 10 17:14:55 2019
@@ -223,22 +223,22 @@
 	return m_sampleScriptDir;
 }
 
-const QString&  ScPaths::scriptDir() const
+const QString& ScPaths::scriptDir() const
 {
 	return m_scriptDir;
 }
 
-const QString&  ScPaths::templateDir() const
+const QString& ScPaths::templateDir() const
 {
 	return m_templateDir;
 }
 
-const QString&  ScPaths::shareDir() const
+const QString& ScPaths::shareDir() const
 {
 	return m_shareDir;
 }
 
-const QString&  ScPaths::qmlDir() const
+const QString& ScPaths::qmlDir() const
 {
 	return m_qmlDir;
 }

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sun Feb 10 17:14:55 2019
@@ -2087,9 +2087,9 @@
 			for (int i = 0; i < dia->recoverFiles.count(); ++i)
 			{
 				loadDoc(dia->recoverFiles[i]);
-				doc->setName(dia->recoverNames[i]);
+				doc->setDocumentFileName(dia->recoverNames[i]);
 				doc->hasName = true;
-				updateActiveWindowCaption(doc->DocName);
+				updateActiveWindowCaption(doc->documentFileName());
 				outlinePalette->setDoc(doc);
 				if (outlinePalette->isVisible())
 					outlinePalette->BuildTree();
@@ -2140,7 +2140,7 @@
 			// Don's disturb user with "save?" dialog just after new doc
 			// doc changing should be rewritten maybe... maybe later...
 			doc->setModified(false);
-			updateActiveWindowCaption(doc->DocName);
+			updateActiveWindowCaption(doc->documentFileName());
 		}
 		else if (dia->tabSelected() == NewDoc::NewFromTemplateTab)
 		{
@@ -2149,7 +2149,7 @@
 			{
 				doc->hasName = false;
 				UndoManager::instance()->renameStack(dia->nftGui->currentDocumentTemplate->name);
-				doc->DocName = dia->nftGui->currentDocumentTemplate->name;
+				doc->setDocumentFileName(dia->nftGui->currentDocumentTemplate->name);
 				updateActiveWindowCaption(QObject::tr("Document Template: ") + dia->nftGui->currentDocumentTemplate->name);
 				QDir::setCurrent(PrefsManager::instance()->documentDir());
 				removeRecent(fileName);
@@ -2225,7 +2225,7 @@
 			// Don's disturb user with "save?" dialog just after new doc
 			// doc changing should be rewritten maybe... maybe later...
 			doc->setModified(false);
-			updateActiveWindowCaption(doc->DocName);
+			updateActiveWindowCaption(doc->documentFileName());
 		}
 	}
 	delete dia;
@@ -2377,7 +2377,7 @@
 		connect(doc, SIGNAL(updateAutoSaveClock()), view->clockLabel, SLOT(resetTime()));
 		view->clockLabel->resetTime();
 		scrActions["viewToggleCMS"]->setChecked(tempDoc->HasCMS);
-		m_undoManager->switchStack(tempDoc->DocName);
+		m_undoManager->switchStack(tempDoc->documentFileName());
 		m_styleManager->setDoc(tempDoc);
 		marksManager->setDoc(tempDoc);
 		nsEditor->setDoc(tempDoc);
@@ -2398,7 +2398,7 @@
 		{
 			doc->hasName = false;
 			UndoManager::instance()->renameStack(currentTemplate->name);
-			doc->DocName = currentTemplate->name;
+			doc->setDocumentFileName(currentTemplate->name);
 			updateActiveWindowCaption(QObject::tr("Document Template: ") + currentTemplate->name);
 			QDir::setCurrent(PrefsManager::instance()->documentDir());
 			removeRecent(QDir::cleanPath(currentTemplate->file));
@@ -2536,7 +2536,7 @@
 		pageSelector->setEnabled(false);
 	}
 	doc = ActWin->doc();
-	m_undoManager->switchStack(doc->DocName);
+	m_undoManager->switchStack(doc->documentFileName());
 	if ((doc != nullptr) && doc->hasGUI())
 	{
 		connect(m_undoManager, SIGNAL(undoRedoBegin()), doc, SLOT(undoRedoBegin()));
@@ -2661,7 +2661,7 @@
 
 void ScribusMainWindow::SwitchWin()
 {
-	updateActiveWindowCaption(doc->DocName);
+	updateActiveWindowCaption(doc->documentFileName());
 	propertiesPalette->setDoc(doc);
 	textPalette->setDoc(doc);
 	marksManager->setDoc(doc);
@@ -2703,7 +2703,7 @@
 	appModeHelper->mainWindowHasNewDoc(doc, (ScMimeData::clipboardHasScribusData()) || (scrapbookPalette->tempHasContents()));
 
 	//Update palettes
-	updateActiveWindowCaption(doc->DocName);
+	updateActiveWindowCaption(doc->documentFileName());
 	propertiesPalette->setDoc(doc);
 	textPalette->setDoc(doc);
 	nsEditor->setDoc(doc);
@@ -2882,7 +2882,7 @@
 {
 	if (!doc->isModified())
 		doc->setModified(true);
-	updateActiveWindowCaption(doc->DocName + "*");
+	updateActiveWindowCaption(doc->documentFileName() + "*");
 	if (!doc->masterPageMode())
 	{
 		if (!doc->symbolEditMode() && !doc->inlineEditMode())
@@ -3080,7 +3080,7 @@
 	{
 		int z = doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, doc->currentPage()->xOffset(), doc->currentPage()->yOffset(), 1, 1, doc->itemToolPrefs().shapeLineWidth, doc->itemToolPrefs().imageFillColor, doc->itemToolPrefs().imageStrokeColor);
 		PageItem *b = doc->Items->at(z);
-		b->LayerID = doc->activeLayer();
+		b->m_layerID = doc->activeLayer();
 		doc->loadPict(data, b);
 		b->setWidth(static_cast<double>(b->OrigW * 72.0 / b->pixm.imgInfo.xres));
 		b->setHeight(static_cast<double>(b->OrigH * 72.0 / b->pixm.imgInfo.yres));
@@ -3253,7 +3253,7 @@
 		(*it)->setChecked(false);
 	}
 	if (!doc->m_Selection->isEmpty() && doc->m_Selection->itemAt(0))
-		scrLayersActions[QString("%1").arg(doc->m_Selection->itemAt(0)->LayerID)]->setChecked(true);
+		scrLayersActions[QString("%1").arg(doc->m_Selection->itemAt(0)->m_layerID)]->setChecked(true);
 	for (auto it = scrLayersActions.begin(); it != itend; ++it)
 		connect( (*it), SIGNAL(triggeredData(int)), doc, SLOT(itemSelection_SendToLayer(int)) );
 }
@@ -3470,8 +3470,8 @@
 	// PV - 5780: Scribus doesn't track what documents are already opened
 	// The goal of this part of code is to disallow user to open one
 	// doc multiple times.
-	QString FName = fi.absoluteFilePath();
-	QString platfName(QDir::toNativeSeparators(FName));
+	QString filename = fi.absoluteFilePath();
+	QString platfName(QDir::toNativeSeparators(filename));
 	int windowCount = windows.count();
 	for (int i = 0; i < windowCount; ++i)
 	{
@@ -3493,14 +3493,14 @@
 	UndoBlocker undoBlocker;
 	if (!fileName.isEmpty())
 	{
-		FileLoader *fileLoader = new FileLoader(FName);
+		FileLoader *fileLoader = new FileLoader(filename);
 		int testResult = fileLoader->testFile();
 		if (testResult == -1)
 		{
 			delete fileLoader;
 			qApp->restoreOverrideCursor();
 			QString title = tr("Fatal Error") ;
-			QString msg = "<qt>"+ tr("File %1 is not in an acceptable format").arg(FName)+"</qt>";
+			QString msg = "<qt>"+ tr("File %1 is not in an acceptable format").arg(filename)+"</qt>";
 			QString infoMsg = "<qt>" + tr("The file may be damaged or may have been produced in a later version of Scribus.") + "</qt>";
 			ScMessageBox msgBox(QMessageBox::Critical, title, msg, QMessageBox::Ok | QMessageBox::Help, this);
 			msgBox.setInformativeText(infoMsg);
@@ -3521,16 +3521,16 @@
 		if (docProfileDir.exists())
 			ScCore->getCMSProfilesDir(fi.absolutePath()+"/profiles", false, false);
 
-		m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/", FName);
+		m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/", filename);
 		QDir docFontDir(fi.absolutePath() + "/fonts");
 		if (docFontDir.exists())
-			m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/fonts", FName);
+			m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/fonts", filename);
 		QDir docFontDir2(fi.absolutePath() + "/Fonts");
 		if (docFontDir2.exists())
-			m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/Fonts", FName);
+			m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/Fonts", filename);
 		QDir docFontDir3(fi.absolutePath() + "/Document fonts");
 		if (docFontDir3.exists())
-			m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/Document fonts", FName);
+			m_prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/Document fonts", filename);
 		m_prefsManager->appPrefs.fontPrefs.AvailFonts.updateFontMap();
 		if (view != nullptr)
 		{
@@ -3740,13 +3740,13 @@
 		}
 		if (fileLoader->fileType() > FORMATID_NATIVEIMPORTEND)
 		{
-			doc->setName(FName+ tr("(converted)"));
-			QFileInfo fi(doc->DocName);
-			doc->setName(fi.fileName());
+			doc->setDocumentFileName(filename+ tr("(converted)"));
+			QFileInfo fi(doc->documentFileName());
+			doc->setDocumentFileName(fi.fileName());
 			doc->isConverted = true;
 		}
 		else
-			doc->setName(FName);
+			doc->setDocumentFileName(filename);
 		doc->setMasterPageMode(false);
 		doc->createHyphenator();
 		HaveNewDoc();
@@ -3811,7 +3811,7 @@
 		doc->RePos = false;
 		doc->setModified(false);
 		inlinePalette->setDoc(doc);
-		updateRecent(FName);
+		updateRecent(filename);
 		m_mainWindowStatusLabel->setText( tr("Ready"));
 		ret = true;
 		doc->setLoading(true);
@@ -3862,7 +3862,7 @@
 		pagePalette->setView(nullptr);
 	}
 
-	m_undoManager->switchStack(doc->DocName);
+	m_undoManager->switchStack(doc->documentFileName());
 	pagePalette->Rebuild();
 	qApp->restoreOverrideCursor();
 	doc->setModified(false);
@@ -4087,7 +4087,7 @@
 		QString wdir = ".";
 		if (doc->hasName)
 		{
-			QFileInfo fi(doc->DocName);
+			QFileInfo fi(doc->documentFileName());
 			wdir = QDir::fromNativeSeparators( fi.path() );
 		}
 		else
@@ -4166,7 +4166,7 @@
 
 		mdiArea->setActiveSubWindow(tw->getSubWin());
 		ActWin = tw;
-		QString fn(doc->DocName);
+		QString fn(doc->documentFileName());
 		doc->setModified(false);
 		if (doc==storyEditor->currentDocument())
 			storyEditor->close();
@@ -4186,7 +4186,7 @@
 		if (doc->is12doc && !warningVersion(this))
 			return false;
 
-		QString fn(doc->DocName), savedFileName;
+		QString fn(doc->documentFileName()), savedFileName;
 		ret = DoFileSave(fn, &savedFileName);
 		if (!ret && !savedFileName.isEmpty())
 			ScMessageBox::warning(this, CommonStrings::trWarning, tr("Your document was saved to a temporary file and could not be moved: \n%1").arg( QDir::toNativeSeparators(savedFileName) ));
@@ -4212,7 +4212,7 @@
 	QString wdir = ".";
 	if (doc->hasName)
 	{
-		QFileInfo fi(doc->DocName);
+		QFileInfo fi(doc->documentFileName());
 		QString completeBaseName = fi.completeBaseName();
 		if (completeBaseName.endsWith(".sla", Qt::CaseInsensitive))
 			completeBaseName.chop(4);
@@ -4233,7 +4233,7 @@
 			filename = wdir + "/";
 		else
 			filename = wdir;
-		filename += doc->DocName + ".sla";
+		filename += doc->documentFileName() + ".sla";
 	}
 	bool saveCompressed=m_prefsManager->appPrefs.docSetupPrefs.saveCompressed;
 	if (saveCompressed)
@@ -4304,7 +4304,7 @@
 	actionManager->disconnectNewDocActions();
 	actionManager->disconnectNewViewActions();
 	disconnect(view, SIGNAL(signalGuideInformation(int, qreal)), alignDistributePalette, SLOT(setGuide(int, qreal)));
-	m_undoManager->removeStack(doc->DocName);
+	m_undoManager->removeStack(doc->documentFileName());
 	closeActiveWindowMasterPageEditor();
 	slotSelect();
 	doc->autoSaveTimer->stop();
@@ -4438,9 +4438,9 @@
 	if (doc->Print_Options.firstUse)
 	{
 		doc->Print_Options.printer.clear();
-		if (!doc->DocName.startsWith( tr("Document")))
-		{
-			QFileInfo fi(doc->DocName);
+		if (!doc->documentFileName().startsWith( tr("Document")))
+		{
+			QFileInfo fi(doc->documentFileName());
 			QString completeBaseName = fi.completeBaseName();
 			if (completeBaseName.endsWith(".sla", Qt::CaseInsensitive))
 				if (completeBaseName.length() > 4) completeBaseName.chop(4);
@@ -4451,7 +4451,7 @@
 		else
 		{
 			QDir di = QDir();
-			doc->Print_Options.filename = di.currentPath()+"/"+doc->DocName+".ps";
+			doc->Print_Options.filename = di.currentPath()+"/"+doc->documentFileName()+".ps";
 		}
 	}
 	doc->Print_Options.copies = 1;
@@ -5041,7 +5041,7 @@
 	for (int i = 0; i < docItemsCount; ++i)
 	{
 		currItem = doc->Items->at(i);
-		if ((currItem->LayerID == doc->activeLayer()) && (!doc->layerLocked(currItem->LayerID)))
+		if ((currItem->m_layerID == doc->activeLayer()) && (!doc->layerLocked(currItem->m_layerID)))
 		{
 			if ((range == 0) && (currItem->OwnPage != docCurrentPage))
 				continue;
@@ -5125,7 +5125,7 @@
 		for (int i = 0; i < docItemsCount; ++i)
 		{
 			currItem = doc->Items->at(i);
-			if (((currItem->LayerID == doc->activeLayer()) || (doc->layerSelectable(currItem->LayerID))) && (!doc->layerLocked(currItem->LayerID)))
+			if (((currItem->m_layerID == doc->activeLayer()) || (doc->layerSelectable(currItem->m_layerID))) && (!doc->layerLocked(currItem->m_layerID)))
 			{
 				if (docWideSelect)
 					doc->m_Selection->addItem(currItem);
@@ -6159,7 +6159,7 @@
 	int oldPg = doc->currentPageNumber();
 	guidePalette->setDoc(nullptr);
 	if (UndoManager::undoEnabled())
-		activeTransaction = m_undoManager->beginTransaction(doc->DocName, Um::IDocument,
+		activeTransaction = m_undoManager->beginTransaction(doc->documentFileName(), Um::IDocument,
 														  (from - to == 0) ? Um::DeletePage : Um::DeletePages, "",
 														  Um::IDelete);
 	PageItem* ite;
@@ -6645,9 +6645,9 @@
 		if (oldPrefs.uiPrefs.style != newUIStyle)
 		{
 			if (newUIStyle.isEmpty())
-				qApp->setStyle(m_prefsManager->guiSystemStyle());
+				ScQApp->setStyle(m_prefsManager->guiSystemStyle());
 			else
-				qApp->setStyle(QStyleFactory::create(newUIStyle));
+				ScQApp->setStyle(QStyleFactory::create(newUIStyle));
 		}
 		int newUIFontSize = m_prefsManager->guiFontSize();
 		if (oldPrefs.uiPrefs.applicationFontSize != newUIFontSize)
@@ -7080,9 +7080,9 @@
 		scrActions["toolsPreflightVerifier"]->setChecked(false);
 		disconnect(docCheckerPalette, SIGNAL(ignoreAllErrors()), this, SLOT(reallySaveAsEps()));
 	}
-	if (!doc->DocName.startsWith( tr("Document")))
-	{
-		QFileInfo fi(doc->DocName);
+	if (!doc->documentFileName().startsWith( tr("Document")))
+	{
+		QFileInfo fi(doc->documentFileName());
 		if (!doc->m_Selection->isEmpty())
 			filename = fi.path() + "/" + fi.completeBaseName() + "_selection.eps";
 		else
@@ -7092,7 +7092,7 @@
 	{
 		QDir di = QDir();
 		if (!doc->m_Selection->isEmpty())
-			filename = di.currentPath() + "/" + doc->DocName + "_selection.eps";
+			filename = di.currentPath() + "/" + doc->documentFileName() + "_selection.eps";
 		else
 			filename = di.currentPath() + "/" + getFileNameByPage(doc, doc->currentPage()->pageNr(), "eps");
 	}
@@ -7201,7 +7201,7 @@
 		doc->pdfOptions().SubsetList = tmpEm;
 	}
 	MarginStruct optBleeds(doc->pdfOptions().bleeds);
-	PDFExportDialog dia(this, doc->DocName, ReallyUsed, view, doc->pdfOptions(), ScCore->PDFXProfiles, m_prefsManager->appPrefs.fontPrefs.AvailFonts, ScCore->PrinterProfiles);
+	PDFExportDialog dia(this, doc->documentFileName(), ReallyUsed, view, doc->pdfOptions(), ScCore->PDFXProfiles, m_prefsManager->appPrefs.fontPrefs.AvailFonts, ScCore->PrinterProfiles);
 	if (!dia.exec())
 		return;
 
@@ -7609,7 +7609,7 @@
 	layerPalette->setEnabled(true);
 	if (outlinePalette->isVisible())
 		outlinePalette->BuildTree(false);
-	updateActiveWindowCaption(doc->DocName);
+	updateActiveWindowCaption(doc->documentFileName());
 }
 
 void ScribusMainWindow::editInlineStart(int id)
@@ -7622,10 +7622,6 @@
 		doc->autoSaveTimer->stop();
 		doc->setAutoSave(false);
 	}
-	if (doc->m_Selection->count() == 1)
-		doc->currentEditedTextframe = doc->m_Selection->itemAt(0);
-	else
-		doc->currentEditedTextframe = nullptr;
 	view->Deselect(true);
 	m_storedPageNum = doc->currentPageNumber();
 	m_storedViewXCoor = view->contentsX();
@@ -7666,9 +7662,6 @@
 	doc->setCurrentPage(doc->DocPages.at(m_storedPageNum));
 	view->setContentsPos(static_cast<int>(m_storedViewXCoor * m_storedViewScale), static_cast<int>(m_storedViewYCoor * m_storedViewScale));
 	doc->invalidateAll();
-//	if (doc->currentEditedTextframe != nullptr)
-//		doc->currentEditedTextframe->invalidateLayout();
-	doc->currentEditedTextframe = nullptr;
 	view->DrawNew();
 	pagePalette->Rebuild();
 	propertiesPalette->unsetItem();
@@ -7679,7 +7672,7 @@
 	layerPalette->setEnabled(true);
 	if (outlinePalette->isVisible())
 		outlinePalette->BuildTree(false);
-	updateActiveWindowCaption(doc->DocName);
+	updateActiveWindowCaption(doc->documentFileName());
 }
 
 void ScribusMainWindow::editMasterPagesStart(const QString& temp)
@@ -8362,7 +8355,7 @@
 
 QString ScribusMainWindow::fileCollect(bool compress, bool withFonts, const bool withProfiles, const QString& )
 {
-	if ((doc->hasName) && doc->DocName.endsWith(".gz"))
+	if ((doc->hasName) && doc->documentFileName().endsWith(".gz"))
 		compress=true;
 	CollectForOutput_UI c(this, doc, QString::null, withFonts, withProfiles, compress);
 	QString newFileName;
@@ -8452,7 +8445,7 @@
 		QString fileName;
 		if (doc->hasName)
 		{
-			QFileInfo fi(doc->DocName);
+			QFileInfo fi(doc->documentFileName());
 			base = fi.baseName();
 			path = fi.absolutePath();
 		}

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sun Feb 10 17:14:55 2019
@@ -240,7 +240,7 @@
 	SubMode(-1),
 	ShapeValues(nullptr),
 	ValCount(0),
-	DocName( tr("Document")+"-"),
+	m_documentFileName( tr("Document")+"-"),
 	AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
 	CurrentSel(-1),
 	LastAuto(nullptr), FirstAuto(nullptr),
@@ -285,15 +285,13 @@
 	previewVisual = 0;
 	dontResize = false;
 	//create default numeration
-	NumStruct * numS = new NumStruct;
+	auto* numS = new NumStruct;
 	numS->m_name = "default";
 	Numeration newNum;
 	numS->m_nums.insert(0, newNum);
 	numS->m_counters.insert(0, 0);
 	numS->m_lastlevel = -1;
 	numerations.insert("default", numS);
-
-	currentEditedTextframe = nullptr;
 }
 
 
@@ -337,7 +335,7 @@
 	SubMode(-1),
 	ShapeValues(nullptr),
 	ValCount(0),
-	DocName(docName),
+	m_documentFileName(docName),
 	AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
 	CurrentSel(-1),
 	LastAuto(nullptr), FirstAuto(nullptr),
@@ -385,7 +383,6 @@
 	editOnPreview = false;
 	previewVisual = 0;
 	dontResize = false;
-	currentEditedTextframe = nullptr;
 }
 
 
@@ -581,7 +578,7 @@
 	m_guardedObject.nullify();
 	CloseCMSProfiles();
 	ScCore->fileWatcher->stop();
-	ScCore->fileWatcher->removeFile(DocName);
+	ScCore->fileWatcher->removeFile(m_documentFileName);
 	QList<PageItem*> allItems;
 	for (int i = 0; i < DocItems.count(); ++i)
 	{
@@ -805,7 +802,7 @@
 	m_docPrefsData.docSetupPrefs.pageSize = defaultPageSize;
 	FirstPnum = firstPageNumber;
 	m_docPrefsData.docSetupPrefs.pagePositioning = fp;
-	setName(documentName);
+	setDocumentFileName(documentName);
 	HasCMS = false;
 	if (!pdfOptions().UseLPI)
 	{
@@ -2397,12 +2394,6 @@
 	m_Selection->delaySignalsOff();
 }
 
-void ScribusDoc::setName(const QString& name)
-{
-	DocName = name;
-}
-
-
 void ScribusDoc::setModified(const bool isModified)
 {
 	if (m_modified != isModified)
@@ -2412,12 +2403,10 @@
 	}
 }
 
-
 bool ScribusDoc::isModified() const
 {
 	return m_modified;
 }
-
 
 /** sets page properties */
 void ScribusDoc::setPage(double w, double h, double t, double l, double r, double b, double sp, double ab, bool atf, int fp)
@@ -2873,8 +2862,8 @@
 						m_docPrefsData.docSetupPrefs.pageHeight-addToPage->Margins.bottom()-addToPage->Margins.top(),
 						1, CommonStrings::None, m_docPrefsData.itemToolPrefs.shapeLineColor);
 		Items->at(z)->isAutoText = true;
-		Items->at(z)->Cols = qRound(PageSp);
-		Items->at(z)->ColGap = PageSpa;
+		Items->at(z)->m_columns = qRound(PageSp);
+		Items->at(z)->m_columnGap = PageSpa;
 		if (LastAuto != nullptr)
 			LastAuto->link(Items->at(z));
 		else
@@ -2906,7 +2895,7 @@
 			ss->set("ACTIVE", m_ActiveLayer);
 			ss->set("NAME", ll->Name);
 			ss->set("LAYER_NR", ll->ID);
-			m_undoManager->action(this, ss, DocName, Um::ILayer);
+			m_undoManager->action(this, ss, m_documentFileName, Um::ILayer);
 		}
 
 	changed();
@@ -2922,7 +2911,7 @@
 	for (int ite = 0; ite < Items->count(); ++ite)
 	{
 		PageItem *itemToCopy = Items->at(ite);
-		if (itemToCopy->LayerID == layerIDToCopy)
+		if (itemToCopy->m_layerID == layerIDToCopy)
 		{
 			sourceSelection.addItem(itemToCopy);
 		}
@@ -2967,7 +2956,7 @@
 		ss->set("NAME", name);
 		ss->set("LAYER_NR", layerID);
 		ss->set("DELETE", deleteItems);
-		m_undoManager->action(this, ss, DocName, Um::ILayer);
+		m_undoManager->action(this, ss, m_documentFileName, Um::ILayer);
 		activeTransaction.commit();
 	}
 
@@ -3397,7 +3386,7 @@
 		SimpleState *ss = new SimpleState(Um::LowerLayer, "", Um::IDown);
 		ss->set("DOWN_LAYER");
 		ss->set("ACTIVE", layerIDFromLevel(layerLevel));
-		m_undoManager->action(this, ss, DocName, Um::ILayer);
+		m_undoManager->action(this, ss, m_documentFileName, Um::ILayer);
 	}
 
 	ScLayers::iterator it;
@@ -3444,7 +3433,7 @@
 		SimpleState *ss = new SimpleState(Um::RaiseLayer, "", Um::IUp);
 		ss->set("UP_LAYER");
 		ss->set("ACTIVE", layerIDFromLevel(layerLevel));
-		m_undoManager->action(this, ss, DocName, Um::ILayer);
+		m_undoManager->action(this, ss, m_documentFileName, Um::ILayer);
 	}
 
 	ScLayers::iterator it;
@@ -3506,7 +3495,7 @@
 					ss->set("ACTIVE", m_ActiveLayer);
 					ss->set("NEW_NAME", newName);
 					ss->set("OLD_NAME", Layers[i].Name);
-					m_undoManager->action(this, ss, DocName, Um::ILayer);
+					m_undoManager->action(this, ss, m_documentFileName, Um::ILayer);
 				}
 				Layers[i].Name = newName;
 				found=true;
@@ -3534,7 +3523,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->LayerID == layerID)
+			if (currItem->m_layerID == layerID)
 				return true;
 		}
 		allItems.clear();
@@ -3550,7 +3539,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->LayerID == layerID)
+			if (currItem->m_layerID == layerID)
 				return true;
 		}
 		allItems.clear();
@@ -4901,7 +4890,7 @@
 	bool ret = fl.saveFile(fileName, this, savedFile);
 	if (ret)
 	{
-		setName(fileName);
+		setDocumentFileName(fileName);
 		setModified(false);
 		hasName = true;
 		isConverted = false;
@@ -5258,7 +5247,7 @@
 					for (int ite = 0; ite < end2; ++ite)
 					{
 						PageItem *itemToCopy = MasterItems.at(ite);
-						if ((itemToCopy->OnMasterPage == pageMaster->pageName()) && (it->ID == itemToCopy->LayerID))
+						if ((itemToCopy->OnMasterPage == pageMaster->pageName()) && (it->ID == itemToCopy->m_layerID))
 							tempSelection.addItem(itemToCopy, true);
 					}
 					if (tempSelection.count() != 0)
@@ -5288,7 +5277,7 @@
 			for (int ite = 0; ite < end; ++ite)
 			{
 				PageItem *itemToCopy = DocItems.at(ite);
-				if ((itemToCopy->OwnPage == static_cast<int>(sourcePage->pageNr())) && (it->ID == itemToCopy->LayerID))
+				if ((itemToCopy->OwnPage == static_cast<int>(sourcePage->pageNr())) && (it->ID == itemToCopy->m_layerID))
 					tempSelection.addItem(itemToCopy, true);
 			}
 			if (tempSelection.count() != 0)
@@ -5753,14 +5742,14 @@
 		for (int it = 0; it < DocItems.count(); ++it)
 		{
 			currItem = DocItems.at(it);
-			if (currItem->LayerID != layerID)
+			if (currItem->m_layerID != layerID)
 				continue;
 			newDocItems.append(currItem);
 		}
 		for (int it = 0; it < MasterItems.count(); ++it)
 		{
 			currItem = MasterItems.at(it);
-			if (currItem->LayerID != layerID)
+			if (currItem->m_layerID != layerID)
 				continue;
 			newMasterItems.append(currItem);
 		}
@@ -7136,7 +7125,7 @@
 				for (int ite = 0; ite < oldItems; ++ite)
 				{
 					PageItem *itemToCopy = Items->at(ite);
-					if ((itemToCopy->OwnPage == static_cast<int>(from->pageNr())) && (it->ID == itemToCopy->LayerID))
+					if ((itemToCopy->OwnPage == static_cast<int>(from->pageNr())) && (it->ID == itemToCopy->m_layerID))
 						tempSelection.addItem(itemToCopy, true);
 				}
 				if (tempSelection.count() != 0)
@@ -9316,7 +9305,7 @@
 			int length = currItem->lastInFrame() - start + 1;
 			if ((appMode == modeEdit) || (appMode == modeEditTable))
 			{
-				if (currItem->itemText.lengthOfSelection() > 0)
+				if (currItem->itemText.selectionLength() > 0)
 				{
 					start = currItem->itemText.startOfSelection();
 					length = currItem->itemText.endOfSelection() - start;
@@ -9447,7 +9436,7 @@
 			int length = currItem->lastInFrame() - start + 1;
 			if ((appMode == modeEdit) || (appMode == modeEditTable))
 			{
-				if (currItem->itemText.lengthOfSelection() > 0)
+				if (currItem->itemText.selectionLength() > 0)
 				{
 					start = currItem->itemText.startOfSelection();
 					length = currItem->itemText.endOfSelection() - start;
@@ -9527,7 +9516,7 @@
 			int length = currItem->lastInFrame() - start + 1;
 			if ((appMode == modeEdit) || (appMode == modeEditTable))
 			{
-				if (currItem->itemText.lengthOfSelection() > 0)
+				if (currItem->itemText.selectionLength() > 0)
 				{
 					start = currItem->itemText.startOfSelection();
 					length = currItem->itemText.endOfSelection() - start;
@@ -10506,7 +10495,7 @@
 	}
 	for (int b = 0; b < MasterItems.count(); ++b)
 	{
-		if (MasterItems.at(b)->LayerID == l)
+		if (MasterItems.at(b)->m_layerID == l)
 		{
 			if (dl)
 			{
@@ -10523,7 +10512,7 @@
 	for (int b = 0; b < DocItems.count(); ++b)
 	{
 		PageItem* currItem = DocItems.at(b);
-		if (currItem->LayerID == l)
+		if (currItem->m_layerID == l)
 		{
 			if (dl)
 			{
@@ -13292,7 +13281,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			ite = allItems.at(ii);
-			if (ite->LayerID == layerID)
+			if (ite->m_layerID == layerID)
 					ite->invalidateLayout();
 		}
 		allItems.clear();
@@ -13309,7 +13298,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				ite = allItems.at(ii);
-				if (ite->LayerID == layerID)
+				if (ite->m_layerID == layerID)
 					ite->invalidateLayout();
 			}
 			allItems.clear();
@@ -14817,7 +14806,7 @@
 	groupItem->AutoName = false;
 	groupItem->groupWidth = gw;
 	groupItem->groupHeight = gh;
-	groupItem->LayerID = objectsLayer;
+	groupItem->m_layerID = objectsLayer;
 	for (int i = 0; i < selectedItemCount; ++i)
 	{
 		currItem = itemSelection->itemAt(i);
@@ -15005,7 +14994,7 @@
 	groupItem->AutoName = false;
 	groupItem->groupWidth = gw;
 	groupItem->groupHeight = gh;
-	groupItem->LayerID = objectsLayer;
+	groupItem->m_layerID = objectsLayer;
 	m_undoManager->setUndoEnabled(true);
 	for (int i = 0; i < selectedItemCount; ++i)
 	{
@@ -16153,9 +16142,19 @@
 	}
 }
 
+QString ScribusDoc::documentFileName() const
+{
+	return m_documentFileName;
+}
+
+void ScribusDoc::setDocumentFileName(const QString& documentFileName)
+{
+	m_documentFileName = documentFileName;
+}
+
 void ScribusDoc::itemSelection_UnlinkTextFrameAndCutText( Selection *customSelection)
 {
-	Selection* itemSelection = (customSelection!=nullptr) ? customSelection : m_Selection;
+    Selection* itemSelection = (customSelection!=nullptr) ? customSelection : m_Selection;
 	assert(itemSelection != nullptr);
 	int selectedItemCount = itemSelection->count();
 	if (selectedItemCount == 0)
@@ -16425,7 +16424,7 @@
 	QString fileName;
 	if (hasName)
 	{
-		QFileInfo fi(DocName);
+		QFileInfo fi(m_documentFileName);
 		base = fi.baseName();
 		path = fi.absolutePath();
 	}

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h	(original)
+++ trunk/Scribus/scribus/scribusdoc.h	Sun Feb 10 17:14:55 2019
@@ -646,12 +646,7 @@
 	 * @author Riku Leino
 	 */
 	void restore(UndoState* state, bool isUndo);
-	/**
-	 * @brief Sets the name of the document
-	 * @param name Name for the document
-	 * @author Riku Leino
-	 */
-	void setName(const QString& name);
+
 	/*!
 	 * @brief Returns a stringlist of the item attributes within the document
 	 */
@@ -1227,6 +1222,7 @@
 	Serializer *m_serializer, *m_tserializer;
 	QString m_currentEditedSymbol;
 	int m_currentEditedIFrame;
+	QString m_documentFileName;
 
 public: // Public attributes
 	bool is12doc; //public for now, it will be removed later
@@ -1263,7 +1259,6 @@
 	QList<PageItem*> DocItems;
 	QHash<int, PageItem*> FrameItems;
 	QList<PageItem*> EditFrameItems;
-	PageItem *currentEditedTextframe;
 	Selection* const m_Selection;
 	/** \brief Number of Columns */
 	double PageSp;
@@ -1279,7 +1274,6 @@
 	int SubMode;
 	double *ShapeValues;
 	int ValCount;
-	QString DocName;
 	QMap<QString,int> UsedFonts;
 	SCFonts * const AllFonts;
 	QList<AlignObjs> AObjects;
@@ -1830,6 +1824,8 @@
 	void SubmitForm();
 	void ImportData();
 	void ResetFormFields();
+	QString documentFileName() const;
+	void setDocumentFileName(const QString& m_documentFileName);
 };
 
 Q_DECLARE_METATYPE(ScribusDoc*);

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Sun Feb 10 17:14:55 2019
@@ -760,7 +760,7 @@
 	Doc->m_Selection->delaySignalsOn();
 	for (int i = Doc->Items->count() - 1; i >= 0 ; --i)
 	{
-		if (Doc->Items->at(i)->LayerID==Doc->activeLayer())
+		if (Doc->Items->at(i)->m_layerID==Doc->activeLayer())
 		{
 			if (m_canvas->frameHitTest(dropPosDocQ, Doc->Items->at(i)) >= Canvas::INSIDE)
 			{
@@ -805,7 +805,7 @@
 					continue;
 				int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x() + dropOffsetX, dropPosDoc.y() + dropOffsetY, 1, 1, Doc->itemToolPrefs().shapeLineWidth, Doc->itemToolPrefs().imageFillColor, Doc->itemToolPrefs().imageStrokeColor);
 				PageItem *item = Doc->Items->at(z);
-				item->LayerID = Doc->activeLayer();
+				item->m_layerID = Doc->activeLayer();
 				Doc->loadPict(url.toLocalFile(), item);
 				double iw = static_cast<double>(item->OrigW * 72.0 / item->pixm.imgInfo.xres);
 				double ih = static_cast<double>(item->OrigH * 72.0 / item->pixm.imgInfo.yres);
@@ -860,7 +860,7 @@
 		Doc->m_Selection->delaySignalsOn();
 		for (int i = Doc->Items->count() - 1; i >= 0 ; --i)
 		{
-			if (Doc->Items->at(i)->LayerID==Doc->activeLayer())
+			if (Doc->Items->at(i)->m_layerID==Doc->activeLayer())
 			{
 				if ((m_canvas->frameHitTest(dropPosDocQ, Doc->Items->at(i)) >= Canvas::INSIDE) && (Doc->Items->at(i)->itemType() == PageItem::Symbol))
 				{
@@ -877,7 +877,7 @@
 		{
 			int z = Doc->itemAdd(PageItem::Symbol, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, 0, CommonStrings::None, CommonStrings::None);
 			PageItem *item = Doc->Items->at(z);
-			item->LayerID = Doc->activeLayer();
+			item->m_layerID = Doc->activeLayer();
 			ScPattern pat = Doc->docPatterns[patternVal];
 			item->setWidth(pat.width);
 			item->setHeight(pat.height);
@@ -982,7 +982,7 @@
 	{
 		int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, Doc->itemToolPrefs().shapeLineWidth, Doc->itemToolPrefs().imageFillColor, Doc->itemToolPrefs().imageStrokeColor);
 		PageItem *item = Doc->Items->at(z);
-		item->LayerID = Doc->activeLayer();
+		item->m_layerID = Doc->activeLayer();
 		Doc->loadPict(url.toLocalFile(), item);
 
 		double iw = static_cast<double>(item->OrigW * 72.0 / item->pixm.imgInfo.xres);
@@ -1297,7 +1297,7 @@
 			for (int a = 0; a < Doc->m_Selection->count(); ++a)
 			{
 				PageItem *currItem = Doc->m_Selection->itemAt(a);
-				currItem->LayerID = Doc->activeLayer();
+				currItem->m_layerID = Doc->activeLayer();
 				currItem->gXpos = currItem->xPos() - gx;
 				currItem->gYpos = currItem->yPos() - gy;
 				currItem->gWidth = gw;
@@ -1311,7 +1311,7 @@
 		{
 			Doc->m_Selection->connectItemToGUI();
 			currItem = Doc->m_Selection->itemAt(0);
-			currItem->LayerID = Doc->activeLayer();
+			currItem->m_layerID = Doc->activeLayer();
 			if (Doc->SnapGrid)
 			{
 				double nx = currItem->xPos();
@@ -1714,7 +1714,7 @@
 		if (textFrame->itemText.length() > 0)
 		{
 			int pos = qMax(0, qMin(textFrame->itemText.cursorPosition(), textFrame->itemText.length()));
-			if (textFrame->itemText.lengthOfSelection() > 0)
+			if (textFrame->itemText.selectionLength() > 0)
 			{
 				int firstSelected = textFrame->itemText.startOfSelection();
 				int lastSelected  = qMax(textFrame->itemText.endOfSelection() - 1, 0);
@@ -1903,7 +1903,7 @@
 		if (currItem->isBookmark)
 			emit AddBM(currItem);
 		newObjects.addItem(currItem);
-		currItem->LayerID = Doc->activeLayer();
+		currItem->m_layerID = Doc->activeLayer();
 	}
 	if (newObjects.count() > 1)
 	{

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp	(original)
+++ trunk/Scribus/scribus/scribuswin.cpp	Sun Feb 10 17:14:55 2019
@@ -48,7 +48,7 @@
 
 void ScribusWin::setMainWindow(ScribusMainWindow *mw)
 {
-	m_ScMW=mw;
+	m_ScMW = mw;
 }
 
 void ScribusWin::setView(ScribusView* newView)
@@ -66,18 +66,18 @@
 	m_ScMW->newActWin(getSubWin());
 	if (m_Doc->isModified() && (m_Doc->viewCount == 1))
 	{
-		int exit = ScMessageBox::information(m_ScMW, CommonStrings::trWarning, tr("Document:")+" "+
-											QDir::toNativeSeparators(m_Doc->DocName)+"\n"+
-											tr("has been changed since the last save."),
-											QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel,
-											QMessageBox::Cancel,	// GUI default
-											QMessageBox::Discard);	// batch default
-		if (exit == QMessageBox::Cancel)
+		int i = ScMessageBox::information(m_ScMW, CommonStrings::trWarning, tr("Document:")+" "+
+										  QDir::toNativeSeparators(m_Doc->documentFileName())+"\n"+
+										  tr("has been changed since the last save."),
+										  QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel,
+										  QMessageBox::Cancel,	// GUI default
+										  QMessageBox::Discard);	// batch default
+		if (i == QMessageBox::Cancel)
 		{
 			ce->ignore();
 			return;
 		}
-		if (exit == QMessageBox::Save)
+		if (i == QMessageBox::Save)
 		{
 			if (!m_ScMW->slotFileSave())
 			{

Modified: trunk/Scribus/scribus/selection.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/selection.cpp
==============================================================================
--- trunk/Scribus/scribus/selection.cpp	(original)
+++ trunk/Scribus/scribus/selection.cpp	Sun Feb 10 17:14:55 2019
@@ -23,8 +23,8 @@
 #include "selection.h"
 #include <QDebug>
 
-Selection::Selection(QObject* parent)
-	: QObject(parent),
+Selection::Selection(QObject* parent) :
+	QObject(parent),
 	m_isGUISelection(false),
 	m_delaySignals(0),
 	m_sigSelectionChanged(false),
@@ -34,8 +34,8 @@
 	m_visualGX = m_visualGY = m_visualGW = m_visualGH = 0;
 }
 
-Selection::Selection(QObject* parent, bool guiSelection) 
-	: QObject(parent),
+Selection::Selection(QObject* parent, bool guiSelection) :
+	QObject(parent),
 	m_isGUISelection(guiSelection),
 	m_delaySignals(0),
 	m_sigSelectionChanged(false),
@@ -75,9 +75,9 @@
 	m_visualGH = other.m_visualGH;
 }
 
-Selection& Selection::operator=( const Selection &other )
-{
-	if (&other==this)
+Selection& Selection::operator=(const Selection &other)
+{
+	if (&other == this)
 		return *this;
 	if (m_isGUISelection)
 	{
@@ -104,7 +104,7 @@
 
 void Selection::copy(Selection& other, bool emptyOther)
 {
-	if (&other==this)
+	if (&other == this)
 		return;
 	if (m_isGUISelection)
 	{
@@ -112,7 +112,7 @@
 		for (SelectionList::Iterator it = m_SelList.begin(); it != itend; ++it)
 			(*it)->setSelected(false);
 	}
-	m_SelList=other.m_SelList;
+	m_SelList = other.m_SelList;
 	if (m_isGUISelection && !m_SelList.isEmpty())
 		m_sigSelectionIsMultiple = true;
 	if (emptyOther)
@@ -169,7 +169,7 @@
 	{
 		ret = m_SelList.first()->connectToGUI();
 		m_SelList.first()->emitAllToGUI();
-		m_sigSelectionChanged    = true;
+		m_sigSelectionChanged  = true;
 		m_sigSelectionIsMultiple = true;
 	}
 	sendSignals(false);
@@ -180,9 +180,9 @@
 {
 	if (!m_isGUISelection || m_SelList.isEmpty())
 		return false;
-	SelectionList::Iterator it2end=m_SelList.end();
-	SelectionList::Iterator it2=m_SelList.begin();
-	while (it2!=it2end)
+	SelectionList::Iterator it2end = m_SelList.end();
+	SelectionList::Iterator it2 = m_SelList.begin();
+	while (it2 != it2end)
 	{
 		(*it2)->disconnectFromGUI();
 		++it2;
@@ -192,7 +192,7 @@
 
 bool Selection::addItem(PageItem *item, bool /*ignoreGUI*/)
 {
-	if (item==nullptr)
+	if (item == nullptr)
 		return false;
 	bool listWasEmpty = m_SelList.isEmpty();
 	if (listWasEmpty || !m_SelList.contains(item))
@@ -212,7 +212,7 @@
 
 bool Selection::prependItem(PageItem *item, bool /*doEmit*/)
 {
-	if (item==nullptr)
+	if (item == nullptr)
 		return false;
 	if (!m_SelList.contains(item))
 	{
@@ -279,7 +279,7 @@
     bool removeOk(false);
 	if (!m_SelList.isEmpty() && m_SelList.contains(item))
 	{
-		removeOk=(m_SelList.removeAll(item)==1);
+		removeOk = (m_SelList.removeAll(item)==1);
 		if (removeOk)
 		{
 			if (m_isGUISelection)
@@ -305,7 +305,7 @@
 	if (!m_SelList.isEmpty() && itemIndex<m_SelList.count())
 	{
 		PageItem *item =  m_SelList[itemIndex];
-		bool removeOk  = (m_SelList.removeAll(item) == 1);
+		bool removeOk = (m_SelList.removeAll(item) == 1);
 		if (removeOk)
 		{
 			item->isSingleSel = false;
@@ -341,14 +341,14 @@
 	double maxX = -std::numeric_limits<double>::max();
 	SelectionList::ConstIterator it=m_SelList.begin();
 	SelectionList::ConstIterator itend=m_SelList.end();
-	double x1=0.0,x2=0.0,y1=0.0,y2=0.0;
-	for ( ; it!=itend ; ++it)
+	double x1 = 0.0, x2 = 0.0, y1 = 0.0, y2 = 0.0;
+	for ( ; it != itend ; ++it)
 	{
 		(*it)->getBoundingRect(&x1, &y1, &x2, &y2);
-		if (x1<minX)
-			minX=x1;
-		if (x2>maxX)
-			maxX=x2;
+		if (x1 < minX)
+			minX = x1;
+		if (x2 > maxX)
+			maxX = x2;
 	}
 	return maxX-minX;
 }
@@ -361,14 +361,14 @@
 	double maxY = -std::numeric_limits<double>::max();
 	SelectionList::ConstIterator it=m_SelList.begin();
 	SelectionList::ConstIterator itend=m_SelList.end();
-	double x1=0.0,x2=0.0,y1=0.0,y2=0.0;
-	for ( ; it!=itend ; ++it)
+	double x1 = 0.0, x2 = 0.0, y1 = 0.0, y2 = 0.0;
+	for ( ; it != itend ; ++it)
 	{
 		(*it)->getBoundingRect(&x1, &y1, &x2, &y2);
-		if (y1<minY)
-			minY=y1;
-		if (y2>maxY)
-			maxY=y2;
+		if (y1 < minY)
+			minY = y1;
+		if (y2 > maxY)
+			maxY = y2;
 	}
 	return maxY-minY;
 }
@@ -483,12 +483,12 @@
 bool Selection::itemsAreSameType() const
 {
 	//CB Putting count=1 before isempty test as its probably the most likely, given our view code.
-	if (m_SelList.count()==1)
+	if (m_SelList.count() == 1)
 		return true;
 	if (m_SelList.isEmpty())
 		return false;
-	SelectionList::ConstIterator it=m_SelList.begin();
-	SelectionList::ConstIterator itend=m_SelList.end();
+	SelectionList::ConstIterator it = m_SelList.begin();
+	SelectionList::ConstIterator itend = m_SelList.end();
 	PageItem::ItemType itemType = (*it)->itemType();
 	for ( ; it!=itend ; ++it)
 	{
@@ -504,10 +504,10 @@
 {
 	if (m_SelList.isEmpty())
 		return -1;
-	int layerID = m_SelList.at(0)->LayerID;
+	int layerID = m_SelList.at(0)->m_layerID;
 	for (int i = 1; i < m_SelList.count(); ++i)
 	{
-		if (m_SelList.at(i)->LayerID != layerID)
+		if (m_SelList.at(i)->m_layerID != layerID)
 		{
 			layerID = -1;
 			break;

Modified: trunk/Scribus/scribus/tablecell.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/tablecell.cpp
==============================================================================
--- trunk/Scribus/scribus/tablecell.cpp	(original)
+++ trunk/Scribus/scribus/tablecell.cpp	Sun Feb 10 17:14:55 2019
@@ -36,7 +36,7 @@
 	d->textFrame->Parent = table;
 	d->textFrame->OwnPage = table->OwnPage;
 	d->textFrame->OnMasterPage = table->OnMasterPage;
-	d->textFrame->LayerID = table->LayerID;
+	d->textFrame->m_layerID = table->m_layerID;
 
 	setValid(true);
 	setRow(row);

Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp	(original)
+++ trunk/Scribus/scribus/text/storytext.cpp	Sun Feb 10 17:14:55 2019
@@ -1738,7 +1738,7 @@
 	return m_selFirst <= m_selLast? m_selLast + 1 : -1;
 }
 
-int StoryText::lengthOfSelection() const
+int StoryText::selectionLength() const
 {
 	//FIX ME - sometimes I saw values equal or greater than length of text
 	int last = m_selLast;

Modified: trunk/Scribus/scribus/text/storytext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/text/storytext.h
==============================================================================
--- trunk/Scribus/scribus/text/storytext.h	(original)
+++ trunk/Scribus/scribus/text/storytext.h	Sun Feb 10 17:14:55 2019
@@ -244,7 +244,7 @@
  	bool selected(int pos) const;
 	int startOfSelection() const;
 	int endOfSelection() const;
-	int lengthOfSelection() const;
+	int selectionLength() const;
 
 	// break iterators
 	static BreakIterator* getGraphemeIterator();

Modified: trunk/Scribus/scribus/ui/bookmwin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/bookmwin.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/bookmwin.cpp	(original)
+++ trunk/Scribus/scribus/ui/bookmwin.cpp	Sun Feb 10 17:14:55 2019
@@ -130,9 +130,7 @@
 
 void BookMView::addPageItem(PageItem* ite)
 {
-	QChar ch;
 	QString bm, bm2;
-
 	getTextAndTitle(ite, bm, bm2);
 	addItem(bm, bm2, ite);
 	Last = NrItems;
@@ -142,9 +140,6 @@
 {
 	QChar ch;
 	QString str;
-
-	text.clear();
-	title.clear();
 
 	for (int i = 0; i < item->itemText.length(); ++i)
 	{

Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp	(original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp	Sun Feb 10 17:14:55 2019
@@ -201,7 +201,7 @@
 		if (itemMap[ite].isNull())
 			return;
 		ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
-		m_Doc->setActiveLayer(itemMap[ite]->LayerID);
+		m_Doc->setActiveLayer(itemMap[ite]->m_layerID);
 		ScCore->primaryMainWindow()->changeLayer(m_Doc->activeLayer());
 		if (itemMap[ite]->isTextFrame())
 			emit selectElement(itemMap[ite], true, posMap[ite]);
@@ -237,7 +237,7 @@
 			return;
 		if (!m_Doc->masterPageMode())
 			emit selectMasterPage(masterPageItemMap[ite]->OnMasterPage);
-		m_Doc->setActiveLayer(masterPageItemMap[ite]->LayerID);
+		m_Doc->setActiveLayer(masterPageItemMap[ite]->m_layerID);
 		ScCore->primaryMainWindow()->changeLayer(m_Doc->activeLayer());
 		if (masterPageItemMap[ite]->isTextFrame())
 			emit selectElement(masterPageItemMap[ite], true, posMap[ite]);
@@ -393,7 +393,7 @@
 			break;
 	};
 	// additional informations
-	const ScLayer* layer = m_Doc->Layers.layerByID(pageItem->LayerID);
+	const ScLayer* layer = m_Doc->Layers.layerByID(pageItem->m_layerID);
 	if (layer)
 	{
 		item->setText(COLUMN_LAYER, layer->Name);
@@ -524,7 +524,7 @@
 					|| (masterItemErrorsIt.key()->OnMasterPage == doc->MasterPages.at(mPage)->pageName()))
 					&&
 					((showNonPrintingLayerErrors) ||
-					(!showNonPrintingLayerErrors && doc->layerPrintable(masterItemErrorsIt.key()->LayerID)))
+					(!showNonPrintingLayerErrors && doc->layerPrintable(masterItemErrorsIt.key()->m_layerID)))
 					)
 				{
 					if (!showPagesWithoutErrors && page==nullptr)
@@ -625,7 +625,7 @@
 			{
 				if (docItemErrorsIt.key()->OwnPage == aPage &&
 					((showNonPrintingLayerErrors) ||
-					(!showNonPrintingLayerErrors && doc->layerPrintable(docItemErrorsIt.key()->LayerID)))
+					(!showNonPrintingLayerErrors && doc->layerPrintable(docItemErrorsIt.key()->m_layerID)))
 					)
 				{
 					if (!showPagesWithoutErrors && page==nullptr)

Modified: trunk/Scribus/scribus/ui/createrange.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/createrange.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/createrange.cpp	(original)
+++ trunk/Scribus/scribus/ui/createrange.cpp	Sun Feb 10 17:14:55 2019
@@ -66,13 +66,13 @@
 	//First tab selected
 	if (m_RangeType==0)
 	{
-		uint c=basicRangeListBox->count();
+		int c=basicRangeListBox->count();
 		if (c==0)
 		{
 			basicAddToRange();
 			c=basicRangeListBox->count();
 		}
-		for (uint i=0;i<c;++i)
+		for (int i=0;i<c;++i)
 		{
 			if (i!=0 && i<c)
 				crData.pageRange+=",";

Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp	Sun Feb 10 17:14:55 2019
@@ -70,7 +70,7 @@
 		{
 			if (currentDoc != nullptr)
 			{
-				if (currentDoc->DocName == it.current().localForDocument() || it.current().localForDocument().isEmpty())
+				if (currentDoc->documentFileName() == it.current().localForDocument() || it.current().localForDocument().isEmpty())
 					rlist.insert(it.currentKey().toLower(), it.currentKey());
 			}
 			else
@@ -225,7 +225,7 @@
 			{
 				if (!fIt->usable() || fIt->isReplacement())
 					continue;
-				if ((currDoc->DocName == fIt->localForDocument()) || (fIt->localForDocument().isEmpty()))
+				if ((currDoc->documentFileName() == fIt->localForDocument()) || (fIt->localForDocument().isEmpty()))
 					ilist.append(*it3);
 			}
 		}
@@ -265,7 +265,7 @@
 				{
 					const ScFace& fon(prefsManager->appPrefs.fontPrefs.AvailFonts[*it2 + " " + *it3]);
 					ScFace::FontType type = fon.type();
-					if (!fon.usable() || fon.isReplacement() || !(currentDoc->DocName == fon.localForDocument() || fon.localForDocument().isEmpty()))
+					if (!fon.usable() || fon.isReplacement() || !(currentDoc->documentFileName() == fon.localForDocument() || fon.localForDocument().isEmpty()))
 						continue;
 					if ((forAnnotation) && ((type == ScFace::TYPE1) || (type == ScFace::OTF) || (fon.subset())))
 						continue;

Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp	(original)
+++ trunk/Scribus/scribus/ui/hruler.cpp	Sun Feb 10 17:14:55 2019
@@ -888,8 +888,8 @@
 		m_lineCorr = item->lineWidth() / 2.0;
 	else
 		m_lineCorr = 0;
-	m_colGap = item->ColGap;
-	m_cols = item->Cols;
+	m_colGap = item->m_columnGap;
+	m_cols = item->m_columns;
 	m_distLeft  = item->textToFrameDistLeft();
 	m_distRight = item->textToFrameDistRight();
 

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Sun Feb 10 17:14:55 2019
@@ -141,7 +141,7 @@
 					OutlineTreeItem* childItem = dynamic_cast<OutlineTreeItem*>(itemPg->child(j));
 					if (!childItem)
 						qFatal("OutlineWidget::dropEvent !childItem");
-					if (item->PageItemObject->LayerID == childItem->LayerID)
+					if (item->PageItemObject->m_layerID == childItem->LayerID)
 					{
 						itemPl = childItem;
 						break;
@@ -181,7 +181,7 @@
 					item->PageItemObject->setXYPos(xx, yy);
 					item->DocObject->addToGroup(group, item->PageItemObject);
 					group->groupItemList.insert(d, item->PageItemObject);
-					item->PageItemObject->setLayer(group->LayerID);
+					item->PageItemObject->setLayer(group->m_layerID);
 				}
 				else
 				{
@@ -243,7 +243,7 @@
 					item->PageItemObject->setXYPos(xx, yy);
 					item->DocObject->addToGroup(group, item->PageItemObject);
 					group->groupItemList.append(item->PageItemObject);
-					item->PageItemObject->setLayer(group->LayerID);
+					item->PageItemObject->setLayer(group->m_layerID);
 				}
 			}
 			item->PageItemObject->setRedrawBounding();
@@ -1022,7 +1022,7 @@
 			if (!currDoc->masterPageMode())
 				emit selectMasterPage(item->PageItemObject->OnMasterPage);
 			pgItem = item->PageItemObject;
-			currDoc->setActiveLayer(pgItem->LayerID);
+			currDoc->setActiveLayer(pgItem->m_layerID);
 			m_MainWindow->changeLayer(currDoc->activeLayer());
 			if (item->PageItemObject->isGroup())
 				emit selectElementByItem(pgItem, false);
@@ -1045,7 +1045,7 @@
 				return;
 			pgItem = item->PageItemObject;
 			m_MainWindow->closeActiveWindowMasterPageEditor();
-			currDoc->setActiveLayer(pgItem->LayerID);
+			currDoc->setActiveLayer(pgItem->m_layerID);
 			m_MainWindow->changeLayer(currDoc->activeLayer());
 			if (pgItem->isGroup())
 				emit selectElementByItem(pgItem, false);
@@ -1109,7 +1109,7 @@
 	clearPalette();
 	OutlineTreeItem * item = new OutlineTreeItem( reportDisplay, nullptr );
 	rootObject = item;
-	item->setText( 0, currDoc->DocName.section( '/', -1 ) );
+	item->setText( 0, currDoc->documentFileName().section( '/', -1 ) );
 	item->type = -2;
 	item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 	OutlineTreeItem * pagep = nullptr;
@@ -1231,7 +1231,7 @@
 					for (int it = 0; it < pgItems.count(); ++it)
 					{
 						pgItem = pgItems.at(it);
-						if (pgItem->LayerID != layer.ID)
+						if (pgItem->m_layerID != layer.ID)
 							continue;
 						if (!pgItem->isGroup())
 						{
@@ -1327,7 +1327,7 @@
 					for (int it = 0; it < pgItems.count(); ++it)
 					{
 						pgItem = pgItems.at(it);
-						if (pgItem->LayerID != layer.ID)
+						if (pgItem->m_layerID != layer.ID)
 							continue;
 						if (!pgItem->isGroup())
 						{

Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp	Sun Feb 10 17:14:55 2019
@@ -294,7 +294,7 @@
 			for (uint ite = 0; ite < oldItems; ++ite)
 			{
 				PageItem *itemToCopy = m_doc->Items->at(ite);
-				if (itemToCopy->OwnPage == inde && (it->ID == itemToCopy->LayerID))
+				if (itemToCopy->OwnPage == inde && (it->ID == itemToCopy->m_layerID))
 					m_doc->m_Selection->addItem(itemToCopy, true);
 			}
 			if (m_doc->m_Selection->count() != 0)

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	Sun Feb 10 17:14:55 2019
@@ -543,7 +543,7 @@
 	{
 		if (m_doc != nullptr && exporting)
 		{
-			QFileInfo fi(m_doc->DocName);
+			QFileInfo fi(m_doc->documentFileName());
 			pdfx3InfoStringLineEdit->setText(fi.fileName());
 		}
 		else

Modified: trunk/Scribus/scribus/ui/printdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/printdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/printdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/printdialog.cpp	Sun Feb 10 17:14:55 2019
@@ -320,9 +320,9 @@
 #endif
 	if (toFile && LineEdit1->text().isEmpty())
 	{
-		QFileInfo fi(m_doc->DocName);
+		QFileInfo fi(m_doc->documentFileName());
 		if (fi.isRelative()) // if (m_doc->DocName.startsWith( tr("Document")))
-			LineEdit1->setText( QDir::toNativeSeparators(QDir::currentPath() + "/" + m_doc->DocName + ".ps") );
+			LineEdit1->setText( QDir::toNativeSeparators(QDir::currentPath() + "/" + m_doc->documentFileName() + ".ps") );
 		else
 		{
 			QString completeBaseName = fi.completeBaseName();

Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp	Sun Feb 10 17:14:55 2019
@@ -127,16 +127,16 @@
 
 	//#14427: columns->setMaximum(qMax(qRound(textItem->width() / qMax(textItem->ColGap, 10.0)), 1));
 	columns->setMinimum(1);
-	columns->setValue(textItem->Cols);
+	columns->setValue(textItem->m_columns);
 	columnGap->setMinimum(0);
 	if (columnGapLabel->currentIndex() == 0)
 	{
-		columnGap->setMaximum(qMax((textItem->width() / textItem->Cols - textItem->textToFrameDistLeft() - textItem->textToFrameDistRight()) * m_unitRatio, 0.0));
-		columnGap->setValue(textItem->ColGap * m_unitRatio);
+		columnGap->setMaximum(qMax((textItem->width() / textItem->m_columns - textItem->textToFrameDistLeft() - textItem->textToFrameDistRight()) * m_unitRatio, 0.0));
+		columnGap->setValue(textItem->m_columnGap * m_unitRatio);
 	}
 	else
 	{
-		columnGap->setMaximum(qMax((textItem->width() / textItem->Cols) * m_unitRatio, 0.0));
+		columnGap->setMaximum(qMax((textItem->width() / textItem->m_columns) * m_unitRatio, 0.0));
 		columnGap->setValue(textItem->columnWidth() * m_unitRatio);
 	}
 	leftDistance->setValue(textItem->textToFrameDistLeft()*m_unitRatio);
@@ -199,7 +199,7 @@
 
 		if (textItem)
 		{
-			int numCols = textItem->Cols;
+			int numCols = textItem->m_columns;
 			
 			columnGap->setEnabled(numCols != 1);
 			columnGapLabel->setEnabled(numCols != 1);
@@ -252,12 +252,12 @@
 //#14427: columns->setMaximum(qMax(qRound(textItem->width() / qMax(textItem->ColGap, 10.0)), 1));
 			if (columnGapLabel->currentIndex() == 0)
 			{
-				columnGap->setMaximum(qMax((textItem->width() / textItem->Cols - textItem->textToFrameDistLeft() - textItem->textToFrameDistRight()) * m_unitRatio, 0.0));
-				columnGap->setValue(textItem->ColGap * m_unitRatio);
+				columnGap->setMaximum(qMax((textItem->width() / textItem->m_columns - textItem->textToFrameDistLeft() - textItem->textToFrameDistRight()) * m_unitRatio, 0.0));
+				columnGap->setValue(textItem->m_columnGap * m_unitRatio);
 			}
 			else
 			{
-				columnGap->setMaximum(qMax((textItem->width() / textItem->Cols) * m_unitRatio, 0.0));
+				columnGap->setMaximum(qMax((textItem->width() / textItem->m_columns) * m_unitRatio, 0.0));
 				columnGap->setValue(textItem->columnWidth() * m_unitRatio);
 			}
 		}
@@ -291,7 +291,7 @@
 	if (textItem)
 	{
 		textItem->setColumns(static_cast<int>(columns->value()));
-		showColumns(textItem->Cols, textItem->ColGap);
+		showColumns(textItem->m_columns, textItem->m_columnGap);
 		//this is already done in showColumns()
 		/*if (static_cast<int>(columns->value()) == 1)
 		{
@@ -329,7 +329,7 @@
 		if ((textItem->lineColor() != CommonStrings::None) || (!textItem->strokePattern().isEmpty()))
 			lineCorr = textItem->lineWidth();
 		double newWidth = columnGap->value() / m_unitRatio;
-		double newGap = qMax(((textItem->width() - textItem->textToFrameDistLeft() - textItem->textToFrameDistRight() - lineCorr) - (newWidth * textItem->Cols)) / (textItem->Cols - 1), 0.0);
+		double newGap = qMax(((textItem->width() - textItem->textToFrameDistLeft() - textItem->textToFrameDistRight() - lineCorr) - (newWidth * textItem->m_columns)) / (textItem->m_columns - 1), 0.0);
 		textItem->setColumnGap(newGap);
 	}
 	textItem->update();
@@ -346,7 +346,7 @@
 	if (m_doc->appMode == modeEditTable)
 		textItem = m_item->asTable()->activeCell().textFrame();
 	if (textItem != nullptr)
-		showColumns(textItem->Cols, textItem->ColGap);
+		showColumns(textItem->m_columns, textItem->m_columnGap);
 
 	int index = columnGapLabel->currentIndex();
 	columnGap->setToolTip((index == 0) ? tr( "Distance between columns" ) : tr( "Column width" ));
@@ -415,7 +415,7 @@
 	double top    = topDistance->value() / m_unitRatio;
 	double bottom = bottomDistance->value() / m_unitRatio;
 	textItem->setTextToFrameDist(left, right, top, bottom);
-	showColumns(textItem->Cols, textItem->ColGap);
+	showColumns(textItem->m_columns, textItem->m_columnGap);
 
 	textItem->update();
 	if (m_doc->appMode == modeEditTable)

Modified: trunk/Scribus/scribus/ui/search.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp	(original)
+++ trunk/Scribus/scribus/ui/search.cpp	Sun Feb 10 17:14:55 2019
@@ -702,7 +702,7 @@
 		{
 			repl = RTextVal->text();
 			sear = STextVal->text();
-			textLen = m_item->itemText.lengthOfSelection();
+			textLen = m_item->itemText.selectionLength();
 			if (textLen == repl.length())
 			{
 				for (cs = 0; cs < textLen; ++cs)
@@ -757,7 +757,7 @@
 			m_doc->itemSelection_SetFont(RFontVal->currentText());
 		if (RSize->isChecked())
 			m_doc->itemSelection_SetFontSize(qRound(RSizeVal->value() * 10.0));
-		if (REffect->isChecked() && (m_item->itemText.lengthOfSelection() > 0))
+		if (REffect->isChecked() && (m_item->itemText.selectionLength() > 0))
 		{
 			int s = REffVal->getStyle() & ScStyle_UserStyles;
 			m_doc->currentStyle.charStyle().setFeatures(static_cast<StyleFlag>(s).featureList()); // ???
@@ -1055,7 +1055,7 @@
 	}
 	replaceEnabled |= RText->isChecked();
 	if (m_itemMode)
-		replaceEnabled &= (m_item->itemText.lengthOfSelection() > 0);
+		replaceEnabled &= (m_item->itemText.selectionLength() > 0);
 	else if (m_doc->scMW()->CurrStED != nullptr)
 		replaceEnabled &= m_doc->scMW()->CurrStED->Editor->textCursor().hasSelection();
 	else

Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp	(original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp	Sun Feb 10 17:14:55 2019
@@ -638,7 +638,7 @@
 		InfoString->setText(Opts.Info);
 	else
 	{
-		QFileInfo fi(m_Doc->DocName);
+		QFileInfo fi(m_Doc->documentFileName());
 		InfoString->setText(fi.fileName());
 	}
 
@@ -1371,9 +1371,9 @@
 	SubsetList->clear();
 	ToSubset->setEnabled(false);
 	FromSubset->setEnabled(false);
-	for (int a = 0; a < m_docFonts.count(); ++a)
-	{
-		QString fontName = m_docFonts.at(a);
+	for (int i = 0; i < m_docFonts.count(); ++i)
+	{
+		QString fontName = m_docFonts.at(i);
 		const ScFace fontFace = AllFonts[fontName];
 		if (!fontFace.subset() && !fontFace.isOTF())
 		{

Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp	(original)
+++ trunk/Scribus/scribus/util.cpp	Sun Feb 10 17:14:55 2019
@@ -514,7 +514,7 @@
 	if (prefix!=QString::null)
 		defaultName=prefix;
 	else
-		defaultName=currDoc->DocName;
+		defaultName=currDoc->documentFileName();
 	if (defaultName.isNull())
 		defaultName = "export";
 	else
@@ -1053,7 +1053,7 @@
 	int z = m_Doc->itemAdd(PageItem::Table, PageItem::Unspecified, gItem->xPos(), gItem->yPos(), gItem->width(), gItem->height(), 0.0, CommonStrings::None, CommonStrings::None);
 	PageItem_Table* currItem = m_Doc->Items->takeAt(z)->asTable();
 
-	currItem->LayerID = gItem->LayerID;
+	currItem->m_layerID = gItem->m_layerID;
 	currItem->OwnPage = gItem->OwnPage;
 	currItem->OnMasterPage = gItem->OnMasterPage;
 
@@ -1115,7 +1115,7 @@
 		tr = tr->BottomLink;
 	}
 	m_Doc->dontResize = true;
-	currItem->setLayer(gItem->LayerID);
+	currItem->setLayer(gItem->m_layerID);
 	currItem->setMasterPage(gItem->OwnPage, gItem->OnMasterPage);
 	currItem->adjustFrameToTable();
 	if (target != nullptr)

Modified: trunk/Scribus/scribus/util_layer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22832&path=/trunk/Scribus/scribus/util_layer.cpp
==============================================================================
--- trunk/Scribus/scribus/util_layer.cpp	(original)
+++ trunk/Scribus/scribus/util_layer.cpp	Sun Feb 10 17:14:55 2019
@@ -82,8 +82,8 @@
 	for (int i = 0; i < mpCount; ++i)
 	{
 		item = doc->MasterItems.at(i);
-		idIt = layerMap.find(item->LayerID);
+		idIt = layerMap.find(item->m_layerID);
 		if (idIt != layerMap.end())
-			item->LayerID = idIt.value();
+			item->m_layerID = idIt.value();
 	}
 }




More information about the scribus-commit mailing list