r15216 by cbradney - rename some path variables

[scribus-commit]

Revision: 15216
Author: cbradney
Date: 2010-06-17T22:04:24.227775Z
Commit message: rename some path variables

Changeset: 
M  /trunk/Scribus/scribus/prefsmanager.cpp
M  /trunk/Scribus/scribus/colorsetmanager.cpp

Diffs:
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 15215)
+++ scribus/prefsmanager.cpp	(revision 15216)
@@ -162,7 +162,7 @@
 		appPrefs.colorPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
 		appPrefs.colorPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
 		appPrefs.colorPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
-		appPrefs.colorPrefs.DColorSet = "Scribus-Small";
+		appPrefs.colorPrefs.DColorSet = "Scribus_Small";
 	}
 	else
 	{
@@ -1679,7 +1679,7 @@
 		elem.appendChild(cos);
 	}
 	QDomElement cosd=docu.createElement("DefaultColorSet");
-	cosd.setAttribute("NAME",appPrefs.colorPrefs.DColorSet);
+	cosd.setAttribute("Name",appPrefs.colorPrefs.DColorSet);
 	elem.appendChild(cosd);
 
 	QDomElement pdf = docu.createElement("PDF");
Index: scribus/colorsetmanager.cpp
===================================================================
--- scribus/colorsetmanager.cpp	(revision 15215)
+++ scribus/colorsetmanager.cpp	(revision 15216)
@@ -17,7 +17,6 @@
 #include <QDomElement>
 #include <QTextStream>
 #include <QByteArray>
-//Added by qt3to4:
 
 ColorSetManager::ColorSetManager()
 {
@@ -29,9 +28,8 @@
 
 void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs)
 {
-	QString pfadC = ScPaths::instance().libDir()+"swatches/";
-	QString pfadC2 = pfadC + "Scribus_Basic.xml";
-	QFile fiC(pfadC2);
+	QString defaultSwatch = ScPaths::instance().libDir() + "swatches/" + "Scribus_Basic.xml";
+	QFile fiC(defaultSwatch);
 	if (!fiC.exists())
 	{
 		appPrefs.colorPrefs.DColors.insert("White", ScColor(0, 0, 0, 0));
@@ -45,7 +43,7 @@
 		appPrefs.colorPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
 		appPrefs.colorPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
 		appPrefs.colorPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
-		appPrefs.colorPrefs.DColorSet = "Scribus-Small";
+		appPrefs.colorPrefs.DColorSet = "Scribus_Small";
 	}
 	else
 	{
@@ -58,7 +56,7 @@
 			if (ColorEn.startsWith("<?xml version="))
 			{
 				QByteArray docBytes("");
-				loadRawText(pfadC2, docBytes);
+				loadRawText(defaultSwatch, docBytes);
 				QString docText("");
 				docText = QString::fromUtf8(docBytes);
 				QDomDocument docu("scridoc");