r20655 by craig -

[scribus-commit]

Author: craig
Date: Sat Jan  2 22:09:47 2016
New Revision: 20655

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20655
Log:
Rename some member vars of gtframestyle

Modified:
    trunk/Scribus/scribus/gtframestyle.cpp
    trunk/Scribus/scribus/gtframestyle.h

Modified: trunk/Scribus/scribus/gtframestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20655&path=/trunk/Scribus/scribus/gtframestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/gtframestyle.cpp	(original)
+++ trunk/Scribus/scribus/gtframestyle.cpp	Sat Jan  2 22:09:47 2016
@@ -34,10 +34,10 @@
 
 gtFrameStyle::gtFrameStyle(const gtFrameStyle& f) : gtParagraphStyle(f)
 {
-	columns    = f.columns;
-	columnsGap = f.columnsGap;
-	bgColor    = f.bgColor;
-	bgShade    = f.bgShade;
+	m_columns    = f.m_columns;
+	m_columnsGap = f.m_columnsGap;
+	m_bgColor    = f.m_bgColor;
+	m_bgShade    = f.m_bgShade;
 }
 
 gtFrameStyle::gtFrameStyle(const gtParagraphStyle& p) : gtParagraphStyle(p)
@@ -52,50 +52,50 @@
 
 void gtFrameStyle::init()
 {
-	columns    = 1;
-	columnsGap = 0;
-	bgColor    = "White";
-	bgShade    = 100;
+	m_columns    = 1;
+	m_columnsGap = 0;
+	m_bgColor    = "White";
+	m_bgShade    = 100;
 }
 
 int gtFrameStyle::getColumns()
 {
-	return columns;
+	return m_columns;
 }
 
 void gtFrameStyle::setColumns(int newColumns)
 {
-	columns = newColumns;
+	m_columns = newColumns;
 }
 
 double gtFrameStyle::getColumnsGap()
 {
-	return columnsGap;
+	return m_columnsGap;
 }
 
 void gtFrameStyle::setColumnsGap(double newColumnsGap)
 {
-	columnsGap = newColumnsGap;
+	m_columnsGap = newColumnsGap;
 }
 
 QString gtFrameStyle::getBgColor()
 {
-	return bgColor;
+	return m_bgColor;
 }
 
 void gtFrameStyle::setBgColor(QString newBgColor)
 {
-	bgColor = newBgColor;
+	m_bgColor = newBgColor;
 }
 
 int gtFrameStyle::getBgShade()
 {
-	return bgShade;
+	return m_bgShade;
 }
 
 void gtFrameStyle::setBgShade(int newBgShade)
 {
-	bgShade = newBgShade;
+	m_bgShade = newBgShade;
 }
 
 QString gtFrameStyle::target()

Modified: trunk/Scribus/scribus/gtframestyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20655&path=/trunk/Scribus/scribus/gtframestyle.h
==============================================================================
--- trunk/Scribus/scribus/gtframestyle.h	(original)
+++ trunk/Scribus/scribus/gtframestyle.h	Sat Jan  2 22:09:47 2016
@@ -33,10 +33,10 @@
 class SCRIBUS_API gtFrameStyle : public gtParagraphStyle
 {
 private:
-	int     columns;
-	double  columnsGap;
-	QString bgColor;
-	int     bgShade;
+	int     m_columns;
+	double  m_columnsGap;
+	QString m_bgColor;
+	int     m_bgShade;
 	void init();
 public:
 	gtFrameStyle(QString name);