r19899 by jghali - fix name of method with incorrect english name

scribus-commit scribus-commit at lists.scribus.net
Wed Mar 4 20:22:42 UTC 2015


Author: jghali
Date: Wed Mar  4 20:22:41 2015
New Revision: 19899

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19899
Log:
fix name of method with incorrect english name

Modified:
    trunk/Scribus/scribus/gtaction.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/text/storytext.cpp

Modified: trunk/Scribus/scribus/gtaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19899&path=/trunk/Scribus/scribus/gtaction.cpp
==============================================================================
--- trunk/Scribus/scribus/gtaction.cpp (original)
+++ trunk/Scribus/scribus/gtaction.cpp Wed Mar  4 20:22:41 2015
@@ -167,7 +167,7 @@
 				label += " in " + it->firstInChain()->itemName();
 			else if (nStyle->range() == NSRframe)
 				label += " in frame" + it->itemName();
-			if (it->m_Doc->getMarkDefinied(label + "_1", MARKNoteMasterType) != NULL)
+			if (it->m_Doc->getMark(label + "_1", MARKNoteMasterType) != NULL)
 				getUniqueName(label,it->m_Doc->marksLabelsList(MARKNoteMasterType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
 			else
 				label = label + "_1";
@@ -322,7 +322,7 @@
 				label += " in " + it->firstInChain()->itemName();
 			else if (nStyle->range() == NSRframe)
 				label += " in frame" + it->itemName();
-			if (it->m_Doc->getMarkDefinied(label + "_1", MARKNoteMasterType) != NULL)
+			if (it->m_Doc->getMark(label + "_1", MARKNoteMasterType) != NULL)
 				getUniqueName(label,it->m_Doc->marksLabelsList(MARKNoteMasterType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
 			else
 				label = label + "_1";

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19899&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 Wed Mar  4 20:22:41 2015
@@ -3424,7 +3424,7 @@
 				{
 					QString mark2Label = attrs.valueAsString("MARKlabel");
 					MarkType mark2Type = (MarkType) attrs.valueAsInt("MARKtype");
-					Mark* mark2 = doc->getMarkDefinied(mark2Label, mark2Type);
+					Mark* mark2 = doc->getMark(mark2Label, mark2Type);
 					if (mark2 != NULL) //mark is not defined yet, insert into temp list for update to pointers later
 						mark->setMark(mark2);
 					else
@@ -3953,16 +3953,16 @@
 				Mark* mark = NULL;
 				if (m_Doc->isLoading())
 				{
-					mark = m_Doc->getMarkDefinied(l, t);
+					mark = m_Doc->getMark(l, t);
 				}
 				else
 				{	//doc is not loading so it is copy/paste task
 					if (t == MARKVariableTextType)
-						mark = m_Doc->getMarkDefinied(l, t);
+						mark = m_Doc->getMark(l, t);
 					else
 					{
 						//create copy of mark
-						Mark* oldMark = m_Doc->getMarkDefinied(l, t);
+						Mark* oldMark = m_Doc->getMark(l, t);
 						if (oldMark == NULL)
 						{
 							qWarning() << "wrong copy of oldMark";
@@ -4447,16 +4447,16 @@
 			Mark* mark = NULL;
 			if (m_Doc->isLoading())
 			{
-				mark = m_Doc->getMarkDefinied(l, t);
+				mark = m_Doc->getMark(l, t);
 			}
 			else
 			{	//doc is not loading so it is copy/paste task
 				if (t == MARKVariableTextType)
-					mark = m_Doc->getMarkDefinied(l, t);
+					mark = m_Doc->getMark(l, t);
 				else
 				{
 					//create copy of mark
-					Mark* oldMark = m_Doc->getMarkDefinied(l, t);
+					Mark* oldMark = m_Doc->getMark(l, t);
 					if (oldMark == NULL)
 					{
 						qWarning() << "wrong copy of oldMark";
@@ -5911,7 +5911,7 @@
 			success = readArrows(m_Doc, attrs);
 			if (!success) break;
 		}
-		if(tagName == "MultiLine")
+		if (tagName == "MultiLine")
 		{
 			multiLine ml;
 			QString mlName  = attrs.valueAsString("Name");
@@ -6668,7 +6668,7 @@
 			{
 				qWarning() << "Scribus150Format::updateNames2Ptr() : wrong mark [" << mrk->label << "] data - item [" << ItemID << "] not exists - DELETING MARK";
 				if (!m_Doc->eraseMark(mrk, true))
-					qWarning() << "Erase mark [" << mrk->label << "] failed - was it definied?";
+					qWarning() << "Erase mark [" << mrk->label << "] failed - was it defined?";
 			}
 		}
 		markeredItemsMap.clear();
@@ -6683,7 +6683,7 @@
 			QMap<QString, MarkType> mark2map = markIt.value();
 			QString label2 = mark2map.begin().key();
 			MarkType type2 = mark2map.begin().value();
-			Mark* mark2 = m_Doc->getMarkDefinied(label2, type2);
+			Mark* mark2 = m_Doc->getMark(label2, type2);
 			if (mark2 != NULL)
 			{
 				mark->setMark(mark2);
@@ -6757,7 +6757,7 @@
 			TextNote* note = it.value();
 			assert(note != NULL);
 			QString mrkLabel = it.key();
-			Mark* mrk = m_Doc->getMarkDefinied(mrkLabel, MARKNoteMasterType);
+			Mark* mrk = m_Doc->getMark(mrkLabel, MARKNoteMasterType);
 			if (mrk == NULL)
 			{
 				qWarning() << "Scribus150Format::updateNames2Ptr() : cannot find master mark ("<<mrkLabel <<") for note - note will be deleted";

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19899&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Mar  4 20:22:41 2015
@@ -9265,7 +9265,7 @@
 			label += " in " + currItem->firstInChain()->itemName();
 		else if (nStyle->range() == NSRframe)
 			label += " in frame" + currItem->itemName();
-		if (doc->getMarkDefinied(label + "_1", MARKNoteMasterType) != NULL)
+		if (doc->getMark(label + "_1", MARKNoteMasterType) != NULL)
 			getUniqueName(label,doc->marksLabelsList(MARKNoteMasterType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
 		else
 			label = label + "_1";
@@ -9417,7 +9417,7 @@
 			//check if label for new mark can be used as is
 			if (mrkType == MARKNoteMasterType)
 			{
-				if (doc->getMarkDefinied(label + "_1", mrkType) != NULL)
+				if (doc->getMark(label + "_1", mrkType) != NULL)
 					getUniqueName(label,doc->marksLabelsList(mrkType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
 				else
 					label = label + "_1";
@@ -9530,7 +9530,7 @@
 				QString l;
 				MarkType t;
 				mrk->getMark(l,t);
-				Mark* m = doc->getMarkDefinied(l,t);
+				Mark* m = doc->getMark(l,t);
 				editMDialog->setValues(mrk->label, m);
 			}
 			break;

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19899&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Wed Mar  4 20:22:41 2015
@@ -2060,9 +2060,9 @@
 			ScItemsState *is = dynamic_cast<ScItemsState*>(state);
 			if (is)
 			{
-				Mark* mrk = getMarkDefinied(is->get("label"), (MarkType) is->getInt("type"));
+				Mark* mrk = getMark(is->get("label"), (MarkType) is->getInt("type"));
 				if (mrk == NULL && is->contains("labelOLD"))
-					mrk = getMarkDefinied(is->get("labelOLD"), (MarkType) is->getInt("type"));
+					mrk = getMark(is->get("labelOLD"), (MarkType) is->getInt("type"));
 				int pos = is->getInt("at");
 				bool isAutoNoteFrame = false;
 				PageItem* currItem = NULL;
@@ -2096,7 +2096,7 @@
 						Q_ASSERT(pos >= 0);
 						Q_ASSERT(currItem != NULL);
 						Q_ASSERT(mrk != NULL);
-						Mark* mrk = getMarkDefinied(is->get("label"), (MarkType) is->getInt("type"));
+						Mark* mrk = getMark(is->get("label"), (MarkType) is->getInt("type"));
 						currItem->itemText.replaceMark(pos, mrk);
 						if (is->contains("strtxtOLD"))
 						{
@@ -2221,7 +2221,7 @@
 					{
 						Q_ASSERT(currItem != NULL);
 						Q_ASSERT(pos >= 0);
-						currItem->itemText.replaceMark(pos, getMarkDefinied(is->get("label"), (MarkType) is->getInt("type")));
+						currItem->itemText.replaceMark(pos, getMark(is->get("label"), (MarkType) is->getInt("type")));
 						if (is->contains("strtxtNEW"))
 						{
 							mrk->setString(is->get("strtxtNEW"));
@@ -17441,7 +17441,7 @@
 	return nameList;
 }
 
-Mark* ScribusDoc::getMarkDefinied(QString l, MarkType t)
+Mark* ScribusDoc::getMark(QString l, MarkType t)
 {
 	foreach (Mark* mrk, m_docMarksList)
 	{
@@ -17623,7 +17623,7 @@
 			QString l;
 			MarkType t;
 			m->getMark(l, t);
-			if (mrk == getMarkDefinied(l, t))
+			if (mrk == getMark(l, t))
 			{
 				setUndoDelMark(m);
 				eraseMark(m, true, NULL, true);
@@ -17822,7 +17822,7 @@
 			QString l;
 			MarkType t;
 			mrk->getMark(l,t);
-			Mark* destMark = getMarkDefinied(l,t);
+			Mark* destMark = getMark(l,t);
 			if (destMark != NULL)
 			{
 				PageItem* dItem = findFirstMarkItem(destMark);

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19899&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Wed Mar  4 20:22:41 2015
@@ -1719,8 +1719,8 @@
 	//returns list of marks labels for given mark type
 	QStringList marksLabelsList(MarkType type);
 
-	//return mark definied with gioven label and given type
-	Mark* getMarkDefinied(QString label, MarkType type); //returns mark with label and type (labels are unique only for same type marks)
+	//return mark with given label and given type
+	Mark* getMark(QString label, MarkType type); //returns mark with label and type (labels are unique only for same type marks)
 	Mark* newMark(Mark* mrk = NULL);
 	TextNote* newNote(NotesStyle* NS);
 	

Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19899&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp (original)
+++ trunk/Scribus/scribus/text/storytext.cpp Wed Mar  4 20:22:41 2015
@@ -1877,7 +1877,7 @@
 				QString l;
 				MarkType t;
 				mrk->getMark(l, t);
-				if (m_doc->getMarkDefinied(l,t) != NULL)
+				if (m_doc->getMark(l,t) != NULL)
 				{
 					mark_attr.insert("mark_l", l);
 					mark_attr.insert("mark_t", QString::number((int) t));
@@ -2080,7 +2080,7 @@
 				ScribusDoc* doc  = this->dig->lookup<ScribusDoc>("<scribusdoc>");
 				//				ParagraphStyle* pstyle = NULL;
 				if (t == MARKVariableTextType)
-					mrk = doc->getMarkDefinied(l,t);
+					mrk = doc->getMark(l,t);
 				//			else if (t == MARKBullNumType)
 				//			{
 				//				mrk = (Mark*) new BulNumMark();
@@ -2156,7 +2156,7 @@
 					}
 					if (mrk->isType(MARK2MarkType) && (m_lIt != attr.end()) && (m_tIt != attr.end()))
 					{
-						Mark* targetMark = doc->getMarkDefinied(Xml_data(m_lIt), (MarkType) parseInt(Xml_data(m_tIt)));
+						Mark* targetMark = doc->getMark(Xml_data(m_lIt), (MarkType) parseInt(Xml_data(m_tIt)));
 						mrk->setMark(targetMark);
 						if (targetMark == NULL)
 							mrk->setString("0");




More information about the scribus-commit mailing list