r18757 by jghali - rename private member variables from style manager widgets in a more standard way

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 19 22:19:09 UTC 2014


Author: jghali
Date: Sun Jan 19 22:19:09 2014
New Revision: 18757

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18757
Log:
rename private member variables from style manager widgets in a more standard way

Modified:
    trunk/Scribus/scribus/ui/smalignselect.cpp
    trunk/Scribus/scribus/ui/smalignselect.h
    trunk/Scribus/scribus/ui/smcheckbox.cpp
    trunk/Scribus/scribus/ui/smcheckbox.h
    trunk/Scribus/scribus/ui/smcolorcombo.cpp
    trunk/Scribus/scribus/ui/smcolorcombo.h
    trunk/Scribus/scribus/ui/smpstylewidget.cpp
    trunk/Scribus/scribus/ui/smpstylewidget.h
    trunk/Scribus/scribus/ui/smsccombobox.cpp
    trunk/Scribus/scribus/ui/smsccombobox.h
    trunk/Scribus/scribus/ui/smscrspinbox.cpp
    trunk/Scribus/scribus/ui/smscrspinbox.h
    trunk/Scribus/scribus/ui/smshadebutton.cpp
    trunk/Scribus/scribus/ui/smshadebutton.h
    trunk/Scribus/scribus/ui/smspinbox.cpp
    trunk/Scribus/scribus/ui/smspinbox.h
    trunk/Scribus/scribus/ui/smstyleselect.cpp
    trunk/Scribus/scribus/ui/smstyleselect.h

Modified: trunk/Scribus/scribus/ui/smalignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smalignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smalignselect.cpp (original)
+++ trunk/Scribus/scribus/ui/smalignselect.cpp Sun Jan 19 22:19:09 2014
@@ -10,9 +10,9 @@
 
 SMAlignSelect::SMAlignSelect(QWidget *parent)
 : AlignSelect(parent),
-  hasParent_(false),
-  useParentStyle_(false),
-  pStyle_(0)
+  m_hasParent(false),
+  m_useParentStyle(false),
+  m_pStyle(0)
 {
 	parentButton = new QToolButton(this);
 	parentButton->setMaximumSize( QSize( 22, 22 ) );
@@ -29,8 +29,8 @@
 	disconnect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
 	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
 	setFont(false);
-	hasParent_ = false;
-	pStyle_ = 0;
+	m_hasParent = false;
+	m_pStyle = 0;
 	parentButton->hide();
 	AlignSelect::setStyle(i);
 }
@@ -39,8 +39,8 @@
 {
 	disconnect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
 	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
-	hasParent_ = true;
-	pStyle_ = i;
+	m_hasParent = true;
+	m_pStyle = i;
 	setFont(!isParentValue);
 	if (isParentValue)
 		parentButton->hide();
@@ -54,16 +54,16 @@
 
 void SMAlignSelect::setParentItem(int i)
 {
-	hasParent_ = true;
-	pStyle_ = i;
+	m_hasParent = true;
+	m_pStyle = i;
 }
 
 bool SMAlignSelect::useParentValue()
 {
-	bool ret = useParentStyle_;
-	useParentStyle_ = false;
+	bool ret = m_useParentStyle;
+	m_useParentStyle = false;
 	if (ret)
-		setStyle(pStyle_, true);
+		setStyle(m_pStyle, true);
 
 	return ret;
 }
@@ -77,7 +77,7 @@
 
 void SMAlignSelect::styleChanged()
 {
-	if (hasParent_)
+	if (m_hasParent)
 	{
 		setFont(true);
 		parentButton->show();
@@ -86,5 +86,5 @@
 
 void SMAlignSelect::pbPressed()
 {
-	useParentStyle_ = true;
+	m_useParentStyle = true;
 }

Modified: trunk/Scribus/scribus/ui/smalignselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smalignselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/smalignselect.h (original)
+++ trunk/Scribus/scribus/ui/smalignselect.h Sun Jan 19 22:19:09 2014
@@ -28,9 +28,9 @@
 	QToolButton *parentButton;
 
 private:
-	bool   hasParent_;
-	bool   useParentStyle_;
-	int    pStyle_;
+	bool   m_hasParent;
+	bool   m_useParentStyle;
+	int    m_pStyle;
 	void setFont(bool wantBold);
 
 private slots:

Modified: trunk/Scribus/scribus/ui/smcheckbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smcheckbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcheckbox.cpp (original)
+++ trunk/Scribus/scribus/ui/smcheckbox.cpp Sun Jan 19 22:19:09 2014
@@ -9,9 +9,9 @@
 
 SMCheckBox::SMCheckBox(QWidget *parent)
 : QCheckBox(parent),
-  hasParent_(false),
-  useParentValue_(false),
-  pValue_(false)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pValue(false)
 {
 
 }
@@ -19,8 +19,8 @@
 void SMCheckBox::setChecked(bool val)
 {
 	disconnect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int)));
-	hasParent_ = false;
-	pValue_ = false;
+	m_hasParent = false;
+	m_pValue = false;
 	setFont(false);
 
 	QCheckBox::setChecked(val);
@@ -29,8 +29,8 @@
 void SMCheckBox::setChecked(bool val, bool isParentVal)
 {
 	disconnect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int)));
-	hasParent_ = true;
-	pValue_ = val;
+	m_hasParent = true;
+	m_pValue = val;
 	setFont(!isParentVal);
 
 	QCheckBox::setChecked(val);
@@ -39,14 +39,14 @@
 
 void SMCheckBox::setParentValue(bool val)
 {
-	hasParent_ = true;
-	pValue_ = val;
+	m_hasParent = true;
+	m_pValue = val;
 }
 
 bool SMCheckBox::useParentValue()
 {
-	bool ret = useParentValue_;
-	useParentValue_ = false;
+	bool ret = m_useParentValue;
+	m_useParentValue = false;
 	return ret;
 }
 
@@ -59,6 +59,6 @@
 
 void SMCheckBox::slotStateChanged(int)
 {
-	if(hasParent_)
+	if(m_hasParent)
 		setFont(true);
 }

Modified: trunk/Scribus/scribus/ui/smcheckbox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smcheckbox.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcheckbox.h (original)
+++ trunk/Scribus/scribus/ui/smcheckbox.h Sun Jan 19 22:19:09 2014
@@ -24,9 +24,9 @@
 	bool useParentValue();
 
 private:
-	bool   hasParent_;
-	bool   useParentValue_;
-	bool   pValue_;
+	bool   m_hasParent;
+	bool   m_useParentValue;
+	bool   m_pValue;
 	void setFont(bool wantBold);
 
 private slots:

Modified: trunk/Scribus/scribus/ui/smcolorcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smcolorcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcolorcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/smcolorcombo.cpp Sun Jan 19 22:19:09 2014
@@ -11,19 +11,19 @@
 
 SMColorCombo::SMColorCombo(QWidget *parent)
 : ColorCombo(parent),
-  hasParent_(false),
-  useParentValue_(false),
-  pItem_(0)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pItem(0)
 {
 	
 }
 
 SMColorCombo::SMColorCombo(bool rw, QWidget* parent)
 : ColorCombo(rw, parent),
-  hasParent_(false),
-  useParentValue_(false),
-  pItem_(0),
-  pText_(QString::null)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pItem(0),
+  m_pText(QString::null)
 {
 	
 }
@@ -32,18 +32,18 @@
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	setFont(false);
-	hasParent_ = false;
-	pItem_ = 0;
-	pText_ = QString::null;
+	m_hasParent = false;
+	m_pItem = 0;
+	m_pText = QString::null;
 	ColorCombo::setCurrentIndex(i);
 }
 
 void SMColorCombo::setCurrentItem(int i, bool isParentValue)
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	hasParent_ = true;
-	pItem_ = i;
-	pText_ = QString::null;
+	m_hasParent = true;
+	m_pItem = i;
+	m_pText = QString::null;
 	ColorCombo::setCurrentIndex(i);
 	setFont(!isParentValue);
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
@@ -53,9 +53,9 @@
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	setFont(false);
-	hasParent_ = false;
-	pItem_ = -1;
-	pText_ = s;
+	m_hasParent = false;
+	m_pItem = -1;
+	m_pText = s;
 	setCurrentComboItem(this, s);
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 }
@@ -63,9 +63,9 @@
 void SMColorCombo::setCurrentText(const QString &s, bool isParentValue)
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	hasParent_ = true;
-	pItem_ = -1;
-	pText_ = s;
+	m_hasParent = true;
+	m_pItem = -1;
+	m_pText = s;
 	setCurrentComboItem(this, s);
 	setFont(!isParentValue);
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
@@ -73,33 +73,33 @@
 
 void SMColorCombo::setParentItem(int i)
 {
-	hasParent_ = true;
-	pItem_ = i;
-	pText_ = QString::null;
+	m_hasParent = true;
+	m_pItem = i;
+	m_pText = QString::null;
 }
 
 void SMColorCombo::setParentText(const QString &s)
 {
-	hasParent_ = true;
-	pText_ = s;
+	m_hasParent = true;
+	m_pText = s;
 }
 
 bool SMColorCombo::useParentValue()
 {
 	bool ret = false;
 
-	if (useParentValue_ && hasParent_)
+	if (m_useParentValue && m_hasParent)
 	{
 		ret = currentIndex() == (count() - 1);
 		if (ret)
 		{
 			removeItem(count() - 1);
 			setFont(false);
-			if (!pText_.isNull())
-				setCurrentText(pText_, true);
+			if (!m_pText.isNull())
+				setCurrentText(m_pText, true);
 			else
-				setCurrentItem(pItem_, true);
-			useParentValue_ = false;
+				setCurrentItem(m_pItem, true);
+			m_useParentValue = false;
 		}
 	}
 
@@ -115,10 +115,10 @@
 
 void SMColorCombo::currentChanged()
 {
-	if (hasParent_ && !useParentValue_)
+	if (m_hasParent && !m_useParentValue)
 	{
 		setFont(true);
 		addItem( tr("Use Parent Value"));
-		useParentValue_ = true;
+		m_useParentValue = true;
 	}
 }

Modified: trunk/Scribus/scribus/ui/smcolorcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smcolorcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/smcolorcombo.h (original)
+++ trunk/Scribus/scribus/ui/smcolorcombo.h Sun Jan 19 22:19:09 2014
@@ -30,10 +30,10 @@
 	bool useParentValue();
 
 private:
-	bool   hasParent_;
-	bool   useParentValue_;
-	int    pItem_;
-	QString pText_;
+	bool   m_hasParent;
+	bool   m_useParentValue;
+	int    m_pItem;
+	QString m_pText;
 	void setFont(bool wantBold);
 
 private slots:

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Sun Jan 19 22:19:09 2014
@@ -364,10 +364,10 @@
 		keepWithNext->setParentValue (parent->keepWithNext());
 		
 //Effects Gropup Box
-		parentDC_ = parent->hasDropCap();
-		parentBul_ = parent->hasBullet();
-		parentNum_ = parent->hasNum();
-		//parentParEffects_ = (parentDC_ || parentBul_ || parentNum_);
+		m_parentDC = parent->hasDropCap();
+		m_parentBul = parent->hasBullet();
+		m_parentNum = parent->hasNum();
+		//parentParEffects_ = (m_parentDC || m_parentBul || m_parentNum);
 		if (pstyle->isInhHasDropCap() && pstyle->isInhHasBullet() && pstyle->isInhHasNum())
 		{
 			parentParEffectsButton->hide();
@@ -1124,9 +1124,9 @@
 {
 	disconnectPESignals();
 	parentParEffectsButton->hide();
-	dropCapsBox->setChecked(parentDC_);
-	bulletBox->setChecked(parentBul_);
-	numBox->setChecked(parentNum_);
+	dropCapsBox->setChecked(m_parentDC);
+	bulletBox->setChecked(m_parentBul);
+	numBox->setChecked(m_parentNum);
 	emit useParentParaEffects();
 	connectPESignals();
 }

Modified: trunk/Scribus/scribus/ui/smpstylewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smpstylewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.h (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.h Sun Jan 19 22:19:09 2014
@@ -35,7 +35,7 @@
 private:
 	bool hasParent_;
 	//bool parentParEffects_;
-	bool parentDC_, parentBul_, parentNum_;
+	bool m_parentDC, m_parentBul, m_parentNum;
 	CharSelectEnhanced * m_enhanced;
 	ScribusDoc * m_Doc;
 	QString currFontName;

Modified: trunk/Scribus/scribus/ui/smsccombobox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smsccombobox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smsccombobox.cpp (original)
+++ trunk/Scribus/scribus/ui/smsccombobox.cpp Sun Jan 19 22:19:09 2014
@@ -10,9 +10,9 @@
 
 SMScComboBox::SMScComboBox(QWidget *parent)
 : ScComboBox(parent),
-  hasParent_(false),
-  useParentValue_(false),
-  pItem_(0)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pItem(0)
 {
 	
 }
@@ -21,20 +21,20 @@
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	setFont(false);
-	hasParent_ = false;
-	pItem_ = 0;
+	m_hasParent = false;
+	m_pItem = 0;
 	ScComboBox::setCurrentIndex(i);
 }
 
 void SMScComboBox::setCurrentItem(int i, bool isParentValue)
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	hasParent_ = true;
-	pItem_ = i;
+	m_hasParent = true;
+	m_pItem = i;
 	setFont(!isParentValue);
-	if (!isParentValue && !useParentValue_)
+	if (!isParentValue && !m_useParentValue)
 	{
-		useParentValue_ = true;
+		m_useParentValue = true;
 		addItem( tr("Use Parent Value"));
 	}
 
@@ -46,8 +46,8 @@
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	setFont(false);
-	hasParent_ = false;
-	pItem_ = 0;
+	m_hasParent = false;
+	m_pItem = 0;
 	for(int idx(0); idx < count(); ++idx)
 	{
 		if(itemData(idx).toInt() == i)
@@ -59,11 +59,11 @@
 void SMScComboBox::setCurrentItemByData(int i, bool isParentValue)
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	hasParent_ = true;
+	m_hasParent = true;
 	setFont(!isParentValue);
-	if (!isParentValue && !useParentValue_)
+	if (!isParentValue && !m_useParentValue)
 	{
-		useParentValue_ = true;
+		m_useParentValue = true;
 		addItem( tr("Use Parent Value"));
 	}
 
@@ -72,7 +72,7 @@
 		if(itemData(idx).toInt() == i)
 		{
 			ScComboBox::setCurrentIndex(idx);
-			pItem_ = idx;
+			m_pItem = idx;
 		}
 	}
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
@@ -82,8 +82,8 @@
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	setFont(false);
-	hasParent_ = false;
-	pItem_ = 0;
+	m_hasParent = false;
+	m_pItem = 0;
 	for(int idx(0); idx < count(); ++idx)
 	{
 		if(itemData(idx).toDouble() == d)
@@ -95,11 +95,11 @@
 void SMScComboBox::setCurrentItemByData(double d, bool isParentValue)
 {
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
-	hasParent_ = true;
+	m_hasParent = true;
 	setFont(!isParentValue);
-	if (!isParentValue && !useParentValue_)
+	if (!isParentValue && !m_useParentValue)
 	{
-		useParentValue_ = true;
+		m_useParentValue = true;
 		addItem( tr("Use Parent Value"));
 	}
 
@@ -108,7 +108,7 @@
 		if(itemData(idx).toDouble() == d)
 		{
 			ScComboBox::setCurrentIndex(idx);
-			pItem_ = idx;
+			m_pItem = idx;
 		}
 	}
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
@@ -142,23 +142,23 @@
 
 void SMScComboBox::setParentItem(int i)
 {
-	hasParent_ = true;
-	pItem_ = i;
+	m_hasParent = true;
+	m_pItem = i;
 }
 
 bool SMScComboBox::useParentValue()
 {
 	bool ret = false;
 
-	if (useParentValue_ && hasParent_)
+	if (m_useParentValue && m_hasParent)
 	{
 		ret = currentIndex() == (count() - 1);
 		if (ret)
 		{
 			removeItem(count() - 1);
 			setFont(false);
-			setCurrentItem(pItem_, true);
-			useParentValue_ = false;
+			setCurrentItem(m_pItem, true);
+			m_useParentValue = false;
 		}
 	}
 
@@ -174,10 +174,10 @@
 
 void SMScComboBox::currentChanged()
 {
-	if (hasParent_ && !useParentValue_)
+	if (m_hasParent && !m_useParentValue)
 	{
 		setFont(true);
 		addItem( tr("Use Parent Value"));
-		useParentValue_ = true;
+		m_useParentValue = true;
 	}
 }

Modified: trunk/Scribus/scribus/ui/smsccombobox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smsccombobox.h
==============================================================================
--- trunk/Scribus/scribus/ui/smsccombobox.h (original)
+++ trunk/Scribus/scribus/ui/smsccombobox.h Sun Jan 19 22:19:09 2014
@@ -36,9 +36,9 @@
 	bool useParentValue();
 
 private:
-	bool   hasParent_;
-	bool   useParentValue_;
-	int    pItem_;
+	bool   m_hasParent;
+	bool   m_useParentValue;
+	int    m_pItem;
 	void setFont(bool wantBold);
 
 private slots:

Modified: trunk/Scribus/scribus/ui/smscrspinbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smscrspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smscrspinbox.cpp (original)
+++ trunk/Scribus/scribus/ui/smscrspinbox.cpp Sun Jan 19 22:19:09 2014
@@ -9,27 +9,27 @@
 
 SMScrSpinBox::SMScrSpinBox(QWidget *pa, int s)
 : ScrSpinBox(pa, s),
-  hasParent_(false),
-  useParentValue_(false),
-  pValue_(0.0)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pValue(0.0)
 {
 	
 }
 
 SMScrSpinBox::SMScrSpinBox(double minValue, double maxValue, QWidget *pa, int s)
 : ScrSpinBox(minValue, maxValue, pa, s),
-  hasParent_(false),
-  useParentValue_(false),
-  pValue_(0.0)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pValue(0.0)
 {
 	
 }
 
 SMScrSpinBox::SMScrSpinBox(QWidget *parent, const char * name)
 : ScrSpinBox(parent, 0),
-  hasParent_(false),
-  useParentValue_(false),
-  pValue_(0.0)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pValue(0.0)
 {
 	
 }
@@ -37,8 +37,8 @@
 void SMScrSpinBox::setValue(double val)
 {
 	disconnect(this, SIGNAL(valueChanged(double)), this, SLOT(slotValueChanged()));
-	hasParent_ = false;
-	pValue_ = 0.0;
+	m_hasParent = false;
+	m_pValue = 0.0;
 	setFont(false);
 
 	ScrSpinBox::setValue(val);
@@ -47,8 +47,8 @@
 void SMScrSpinBox::setValue(double val, bool isParentVal)
 {
 	disconnect(this, SIGNAL(valueChanged(double)), this, SLOT(slotValueChanged()));
-	hasParent_ = true;
-	pValue_ = val;
+	m_hasParent = true;
+	m_pValue = val;
 	setFont(!isParentVal);
 
 	ScrSpinBox::setValue(val);
@@ -64,25 +64,25 @@
 
 void SMScrSpinBox::setParentValue(double val)
 {
-	hasParent_ = true;
-	pValue_ = val;
+	m_hasParent = true;
+	m_pValue = val;
 }
 
 bool SMScrSpinBox::useParentValue()
 {
-	bool ret = useParentValue_;
-	useParentValue_ = false;
+	bool ret = m_useParentValue;
+	m_useParentValue = false;
 	return ret;
 }
 
 void SMScrSpinBox::interpretText()
 {
 // 	QString t = text();
-// 	if (hasParent_ && (t == "" || t.isEmpty() || t == QString::null))
-	if (hasParent_ && text().isEmpty())
+// 	if (m_hasParent && (t == "" || t.isEmpty() || t == QString::null))
+	if (m_hasParent && text().isEmpty())
 	{
-		useParentValue_ = true;
-		setValue(pValue_, true);
+		m_useParentValue = true;
+		setValue(m_pValue, true);
 	}
 	ScrSpinBox::interpretText();
 }
@@ -96,6 +96,6 @@
 
 void SMScrSpinBox::slotValueChanged()
 {
-	if(hasParent_)
+	if(m_hasParent)
 		setFont(true);
 }

Modified: trunk/Scribus/scribus/ui/smscrspinbox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smscrspinbox.h
==============================================================================
--- trunk/Scribus/scribus/ui/smscrspinbox.h (original)
+++ trunk/Scribus/scribus/ui/smscrspinbox.h Sun Jan 19 22:19:09 2014
@@ -32,9 +32,9 @@
 	void interpretText();
 
 private:
-	bool   hasParent_;
-	bool   useParentValue_;
-	double pValue_;
+	bool   m_hasParent;
+	bool   m_useParentValue;
+	double m_pValue;
 	void setFont(bool wantBold);
 
 private slots:

Modified: trunk/Scribus/scribus/ui/smshadebutton.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smshadebutton.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smshadebutton.cpp (original)
+++ trunk/Scribus/scribus/ui/smshadebutton.cpp Sun Jan 19 22:19:09 2014
@@ -10,9 +10,9 @@
 
 SMShadeButton::SMShadeButton(QWidget *parent)
 : ShadeButton(parent),
-  hasParent_(false),
-  useParentValue_(false),
-  pValue_(0)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pValue(0)
 {
 	
 }
@@ -21,16 +21,16 @@
 {
 	disconnect(this, SIGNAL(pressed()), this, SLOT(currentChanged()));
 	setFont(false);
-	hasParent_ = false;
-	pValue_ = 0;
+	m_hasParent = false;
+	m_pValue = 0;
 	ShadeButton::setValue(i);
 }
 
 void SMShadeButton::setValue(int i, bool isParentValue)
 {
 	disconnect(this, SIGNAL(pressed()), this, SLOT(currentChanged()));
-	hasParent_ = true;
-	pValue_ = i;
+	m_hasParent = true;
+	m_pValue = i;
 	setFont(!isParentValue);
 	ShadeButton::setValue(i);
 	connect(this, SIGNAL(pressed()), this, SLOT(currentChanged()));
@@ -38,18 +38,18 @@
 
 void SMShadeButton::setParentValue(int i)
 {
-	hasParent_ = true;
-	pValue_ = i;
+	m_hasParent = true;
+	m_pValue = i;
 }
 
 bool SMShadeButton::useParentValue()
 {
-	bool ret = useParentValue_;
-	useParentValue_ = false;
+	bool ret = m_useParentValue;
+	m_useParentValue = false;
 
 	if (ret)
 	{
-		setValue(pValue_, true);
+		setValue(m_pValue, true);
 		QList<QAction*> actList = FillSh->actions();
 		FillSh->removeAction(actList.last());
 	}
@@ -68,7 +68,7 @@
 
 void SMShadeButton::currentChanged()
 {
-	if (hasParent_)
+	if (m_hasParent)
 	{
 		setFont(true);
 		QString upv = tr("Use Parent Value");
@@ -80,7 +80,7 @@
 
 void SMShadeButton::slotUseParent()
 {
-	useParentValue_ = true;
+	m_useParentValue = true;
 	QList<QAction*> actList = FillSh->actions();
 	FillSh->removeAction(actList.last());
 	emit clicked();

Modified: trunk/Scribus/scribus/ui/smshadebutton.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smshadebutton.h
==============================================================================
--- trunk/Scribus/scribus/ui/smshadebutton.h (original)
+++ trunk/Scribus/scribus/ui/smshadebutton.h Sun Jan 19 22:19:09 2014
@@ -25,9 +25,9 @@
 	bool useParentValue();
 
 private:
-	bool   hasParent_;
-	bool   useParentValue_;
-	int    pValue_;
+	bool   m_hasParent;
+	bool   m_useParentValue;
+	int    m_pValue;
 	void setFont(bool wantBold);
 
 private slots:

Modified: trunk/Scribus/scribus/ui/smspinbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smspinbox.cpp (original)
+++ trunk/Scribus/scribus/ui/smspinbox.cpp Sun Jan 19 22:19:09 2014
@@ -9,9 +9,9 @@
 
 SMSpinBox::SMSpinBox(QWidget *parent)
 : QSpinBox(parent),
-  hasParent_(false),
-  useParentValue_(false),
-  pValue_(0)
+  m_hasParent(false),
+  m_useParentValue(false),
+  m_pValue(0)
 {
 
 }
@@ -19,8 +19,8 @@
 void SMSpinBox::setValue(int val)
 {
 	disconnect(this, SIGNAL(valueChanged(int)), this, SLOT(slotValueChanged()));
-	hasParent_ = false;
-	pValue_ = 0;
+	m_hasParent = false;
+	m_pValue = 0;
 	setFont(false);
 
 	QSpinBox::setValue(val);
@@ -29,8 +29,8 @@
 void SMSpinBox::setValue(int val, bool isParentVal)
 {
 	disconnect(this, SIGNAL(valueChanged(int)), this, SLOT(slotValueChanged()));
-	hasParent_ = true;
-	pValue_ = val;
+	m_hasParent = true;
+	m_pValue = val;
 	setFont(!isParentVal);
 
 	QSpinBox::setValue(val);
@@ -46,25 +46,25 @@
 
 void SMSpinBox::setParentValue(int val)
 {
-	hasParent_ = true;
-	pValue_ = val;
+	m_hasParent = true;
+	m_pValue = val;
 }
 
 bool SMSpinBox::useParentValue()
 {
-	bool ret = useParentValue_;
-	useParentValue_ = false;
+	bool ret = m_useParentValue;
+	m_useParentValue = false;
 	return ret;
 }
 
 void SMSpinBox::interpretText()
 {
 // 	QString t = text();
-// 	if (hasParent_ && (t == "" || t.isEmpty() || t == QString::null))
-	if (hasParent_ && text().isEmpty())
+// 	if (m_hasParent && (t == "" || t.isEmpty() || t == QString::null))
+	if (m_hasParent && text().isEmpty())
 	{
-		useParentValue_ = true;
-		setValue(pValue_, true);
+		m_useParentValue = true;
+		setValue(m_pValue, true);
 	}
 	QSpinBox::interpretText();
 }
@@ -78,6 +78,6 @@
 
 void SMSpinBox::slotValueChanged()
 {
-	if(hasParent_)
+	if(m_hasParent)
 		setFont(true);
 }

Modified: trunk/Scribus/scribus/ui/smspinbox.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smspinbox.h
==============================================================================
--- trunk/Scribus/scribus/ui/smspinbox.h (original)
+++ trunk/Scribus/scribus/ui/smspinbox.h Sun Jan 19 22:19:09 2014
@@ -29,9 +29,9 @@
 	void interpretText();
 
 private:
-	bool   hasParent_;
-	bool   useParentValue_;
-	int    pValue_;
+	bool   m_hasParent;
+	bool   m_useParentValue;
+	int    m_pValue;
 	void setFont(bool wantBold);
 
 private slots:

Modified: trunk/Scribus/scribus/ui/smstyleselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smstyleselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smstyleselect.cpp (original)
+++ trunk/Scribus/scribus/ui/smstyleselect.cpp Sun Jan 19 22:19:09 2014
@@ -10,9 +10,9 @@
 
 SMStyleSelect::SMStyleSelect(QWidget *parent)
 : StyleSelect(parent),
-  hasParent_(false),
-  useParentStyle_(false),
-  pStyle_(0)
+  m_hasParent(false),
+  m_useParentStyle(false),
+  m_pStyle(0)
 {
 	parentButton = new QToolButton(this);
 	parentButton->setMaximumSize(QSize(22, 22));
@@ -36,8 +36,8 @@
 	disconnect(StrikeVal->LWidth, SIGNAL(valueChanged(double)), this, SLOT(styleChanged()));
 	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
 	setFont(false);
-	hasParent_ = false;
-	pStyle_ = 0;
+	m_hasParent = false;
+	m_pStyle = 0;
 	parentButton->hide();
 	StyleSelect::setStyle(i);
 }
@@ -53,8 +53,8 @@
 	disconnect(StrikeVal->LPos, SIGNAL(valueChanged(double)), this, SLOT(styleChanged()));
 	disconnect(StrikeVal->LWidth, SIGNAL(valueChanged(double)), this, SLOT(styleChanged()));
 	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
-	hasParent_ = true;
-	pStyle_ = i;
+	m_hasParent = true;
+	m_pStyle = i;
 	setFont(!isParentValue);
 	if (isParentValue)
 		parentButton->hide();
@@ -75,16 +75,16 @@
 
 void SMStyleSelect::setParentItem(int i)
 {
-	hasParent_ = true;
-	pStyle_ = i;
+	m_hasParent = true;
+	m_pStyle = i;
 }
 
 bool SMStyleSelect::useParentValue()
 {
-	bool ret = useParentStyle_;
-	useParentStyle_ = false;
+	bool ret = m_useParentStyle;
+	m_useParentStyle = false;
 	if (ret)
-		setStyle(pStyle_, true);
+		setStyle(m_pStyle, true);
 
 	return ret;
 }
@@ -106,7 +106,7 @@
 
 void SMStyleSelect::styleChanged()
 {
-	if (hasParent_)
+	if (m_hasParent)
 	{
 		setFont(true);
 		parentButton->show();
@@ -115,6 +115,6 @@
 
 void SMStyleSelect::pbPressed()
 {
-	useParentStyle_ = true;
+	m_useParentStyle = true;
 	emit State(getStyle());
 }

Modified: trunk/Scribus/scribus/ui/smstyleselect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18757&path=/trunk/Scribus/scribus/ui/smstyleselect.h
==============================================================================
--- trunk/Scribus/scribus/ui/smstyleselect.h (original)
+++ trunk/Scribus/scribus/ui/smstyleselect.h Sun Jan 19 22:19:09 2014
@@ -27,9 +27,9 @@
 	QToolButton *parentButton;
 
 private:
-	bool   hasParent_;
-	bool   useParentStyle_;
-	int    pStyle_;
+	bool   m_hasParent;
+	bool   m_useParentStyle;
+	int    m_pStyle;
 	void setFont(bool wantBold);
 
 private slots:




More information about the scribus-commit mailing list