r19627 by jghali - fix typo in variable name

scribus-commit scribus-commit at lists.scribus.net
Sat Nov 15 01:27:12 UTC 2014


Author: jghali
Date: Sat Nov 15 01:27:12 2014
New Revision: 19627

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19627
Log:
fix typo in variable name

Modified:
    branches/Version14x/Scribus/scribus/fileloader.cpp
    branches/Version14x/Scribus/scribus/prefs.cpp
    branches/Version14x/Scribus/scribus/prefsmanager.cpp
    branches/Version14x/Scribus/scribus/prefsstructs.h
    branches/Version14x/Scribus/scribus/tabmiscellaneous.cpp

Modified: branches/Version14x/Scribus/scribus/fileloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19627&path=/branches/Version14x/Scribus/scribus/fileloader.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/fileloader.cpp (original)
+++ branches/Version14x/Scribus/scribus/fileloader.cpp Sat Nov 15 01:27:12 2014
@@ -376,7 +376,7 @@
 	ReplacedFonts = currDoc->AllFonts->getSubstitutions(ReplacedFonts.keys());
 	if (ReplacedFonts.count() != 0)
 	{
-		if ((prefsManager->appPrefs.askBeforeSubstituite)) 
+		if ((prefsManager->appPrefs.askBeforeSubstitute)) 
 		{
 			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			FontReplaceDialog dia(0, &ReplacedFonts);

Modified: branches/Version14x/Scribus/scribus/prefs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19627&path=/branches/Version14x/Scribus/scribus/prefs.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/prefs.cpp (original)
+++ branches/Version14x/Scribus/scribus/prefs.cpp Sat Nov 15 01:27:12 2014
@@ -429,7 +429,7 @@
 
 	prefsManager->appPrefs.guidesSettings.before = tabGuides->inBackground->isChecked();
 	
-	prefsManager->appPrefs.askBeforeSubstituite = tabMiscellaneous->AskForSubs->isChecked();
+	prefsManager->appPrefs.askBeforeSubstitute = tabMiscellaneous->AskForSubs->isChecked();
 	prefsManager->appPrefs.haveStylePreview = tabMiscellaneous->stylePreview->isChecked();
 	// lorem ipsum
 	prefsManager->appPrefs.useStandardLI = tabMiscellaneous->useStandardLI->isChecked();

Modified: branches/Version14x/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19627&path=/branches/Version14x/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/prefsmanager.cpp (original)
+++ branches/Version14x/Scribus/scribus/prefsmanager.cpp Sat Nov 15 01:27:12 2014
@@ -415,7 +415,7 @@
 	pageS.pageNames.append(CommonStrings::pageLocRight);
 	appPrefs.pageSets.append(pageS);
 	appPrefs.FacingPages = singlePage;
-	appPrefs.askBeforeSubstituite = true;
+	appPrefs.askBeforeSubstitute = true;
 	appPrefs.haveStylePreview = true;
 	// lorem ipsum defaults
 	appPrefs.useStandardLI = false;
@@ -1342,7 +1342,7 @@
 	QDomElement dc2=docu.createElement("FONTS");
 	dc2.setAttribute("FACE",appPrefs.toolSettings.defFont);
 	dc2.setAttribute("SIZE",appPrefs.toolSettings.defSize / 10.0);
-	dc2.setAttribute("AutomaticSubst", static_cast<int>(appPrefs.askBeforeSubstituite));
+	dc2.setAttribute("AutomaticSubst", static_cast<int>(appPrefs.askBeforeSubstitute));
 	elem.appendChild(dc2);
 	QDomElement dc3=docu.createElement("TYPO");
 	dc3.setAttribute("TIEF",appPrefs.typographicSettings.valueSubScript);
@@ -2219,7 +2219,7 @@
 				if (!newFont.isEmpty())
 					appPrefs.toolSettings.defFont = newFont;
 				appPrefs.toolSettings.defSize = qRound( ScCLocale::toDoubleC(dc.attribute("SIZE"), 12.0) * 10.0 );
-				appPrefs.askBeforeSubstituite = static_cast<bool>(dc.attribute("AutomaticSubst", "1").toInt());
+				appPrefs.askBeforeSubstitute = static_cast<bool>(dc.attribute("AutomaticSubst", "1").toInt());
 			}
 		}
 		if (dc.tagName()=="FONT")

Modified: branches/Version14x/Scribus/scribus/prefsstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19627&path=/branches/Version14x/Scribus/scribus/prefsstructs.h
==============================================================================
--- branches/Version14x/Scribus/scribus/prefsstructs.h (original)
+++ branches/Version14x/Scribus/scribus/prefsstructs.h Sat Nov 15 01:27:12 2014
@@ -263,7 +263,7 @@
 	double ScratchRight;
 	double ScratchTop;
 	double ScratchBottom;*/
-	bool askBeforeSubstituite;
+	bool askBeforeSubstitute;
 	bool haveStylePreview;
 	bool showToolTips;
 	bool showMouseCoordinates;

Modified: branches/Version14x/Scribus/scribus/tabmiscellaneous.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19627&path=/branches/Version14x/Scribus/scribus/tabmiscellaneous.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/tabmiscellaneous.cpp (original)
+++ branches/Version14x/Scribus/scribus/tabmiscellaneous.cpp Sat Nov 15 01:27:12 2014
@@ -26,7 +26,7 @@
 
 void TabMiscellaneous::restoreDefaults(struct ApplicationPrefs *prefsData)
 {
-	AskForSubs->setChecked(prefsData->askBeforeSubstituite);
+	AskForSubs->setChecked(prefsData->askBeforeSubstitute);
 	stylePreview->setChecked(prefsData->haveStylePreview);
 	useStandardLI->setChecked(prefsData->useStandardLI);
 	paragraphsLI->setValue(prefsData->paragraphsLI);




More information about the scribus-commit mailing list