r23708 by jghali - Remove unused PageItem member

scribus-commit scribus-commit at lists.scribus.net
Tue May 5 23:26:26 UTC 2020


Author: jghali
Date: Tue May  5 23:26:25 2020
New Revision: 23708

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23708
Log:
Remove unused PageItem member

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Tue May  5 23:26:25 2020
@@ -326,7 +326,6 @@
 	m_textFlowMode(other.m_textFlowMode),
 	pageItemAttributes(other.pageItemAttributes),
 	m_PrintEnabled(other.m_PrintEnabled),
-	tagged(other.tagged),
 	m_fillQColor(other.m_fillQColor),
 	m_strokeQColor(other.m_strokeQColor),
 	m_grQColorP1(other.m_grQColorP1),
@@ -890,14 +889,13 @@
 	hatchBackgroundQ = QColor();
 	hatchForeground = "Black";
 	hatchForegroundQ = qcol;
-	selectedMeshControlPoint=0;
-	snapToPatchGrid=false;
-	FrameOnly=false;
-	inlineCharID=0;
-	GrStrokeExtend=VGradient::none;
-	tagged=false;
-	no_fill=false;
-	no_stroke=false;
+	selectedMeshControlPoint = 0;
+	snapToPatchGrid = false;
+	FrameOnly = false;
+	inlineCharID = 0;
+	GrStrokeExtend = VGradient::none;
+	no_fill = false;
+	no_stroke = false;
 }
 
 PageItem::~PageItem()
@@ -7646,11 +7644,6 @@
 	return newname;
 }
 
-void PageItem::setTagged(bool tag)
-{
-	tagged=tag;
-}
-
 void PageItem::replaceNamedResources(ResourceCollection& newNames)
 {
 	QMap<QString, QString>::ConstIterator it;

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Tue May  5 23:26:25 2020
@@ -1217,22 +1217,10 @@
 	void togglePrintEnabled();
 
 	/**
-	 * @brief Tells if the frame is tagged or not
-	 * @sa isTagged()
-	 */
-	bool isTagged() const { return tagged; }
-	/**
-	 * @brief Set the tagged member for use when deleting items, instead of reselecting them.
-	 * @sa setTagged()
-	 */
-	void setTagged(bool);
-
-	/**
 	 * @brief Load an image into an image frame, moved from ScribusView
 	 * @return True if load succeeded
 	 */
 	virtual bool loadImage(const QString& filename, bool reload, int gsResolution=-1, bool showMsg = false);
-
 
 	/**
 	 * @brief Connect the item's signals to the GUI, primarily the Properties palette, also some to ScMW
@@ -1847,12 +1835,6 @@
 	 */
 	bool m_PrintEnabled;
 
-	/**
-	 * @brief Is this item set to have an action done to it, eg deleted
-	 * @sa PageItem::isTagged(), PageItem::setTagged()
-	 */
-	bool tagged;
-
 	bool no_fill;
 	bool no_stroke;
 

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Tue May  5 23:26:25 2020
@@ -3500,29 +3500,6 @@
 	return true;
 }
 
-
-//Make the doc delete the items, not the view. TODO: Currently does nada, zilch, zero
-bool ScribusDoc::deleteTaggedItems()
-{
-//	QString tooltip = Um::ItemsInvolved + "\n";
-	//Master Items
-	for (int i = 0; i < MasterItems.count(); ++i)
-	{
-		if (MasterItems.at(i)->isTagged())
-		{
-		}
-	}
-	//Doc Items
-	for (int i = 0; i < DocItems.count(); ++i)
-	{
-		if (DocItems.at(i)->isTagged())
-		{
-		}
-	}
-	return true;
-}
-
-
 void ScribusDoc::replaceLineStyleColors(const QMap<QString, QString>& colorMap)
 {
 	multiLine::iterator its;
@@ -10504,8 +10481,6 @@
 		regionsChanged()->update(QRectF());
 }
 
-
-//TODO replace with the ScribusDoc::deleteTaggedItems
 void ScribusDoc::removeLayer(int l, bool dl)
 {
 	//FIXME: stop using m_View

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h	(original)
+++ trunk/Scribus/scribus/scribusdoc.h	Tue May  5 23:26:25 2020
@@ -517,9 +517,6 @@
 
 	int firstLayerID() const;
 
-	//Items
-	bool deleteTaggedItems();
-
 	/*!
 		* @brief Builds a qmap of the icc profiles used within the document
 	 */




More information about the scribus-commit mailing list