r18759 by jghali - more renaming of style manager widgets member variables

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


Author: jghali
Date: Sun Jan 19 22:59:54 2014
New Revision: 18759

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18759
Log:
more renaming of style manager widgets member variables

Modified:
    trunk/Scribus/scribus/ui/smcellstyle.cpp
    trunk/Scribus/scribus/ui/smcellstylewidget.cpp
    trunk/Scribus/scribus/ui/smcellstylewidget.ui
    trunk/Scribus/scribus/ui/smtablestylewidget.cpp
    trunk/Scribus/scribus/ui/smtablestylewidget.ui
    trunk/Scribus/scribus/ui/smtabruler.cpp
    trunk/Scribus/scribus/ui/smtabruler.h

Modified: trunk/Scribus/scribus/ui/smcellstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18759&path=/trunk/Scribus/scribus/ui/smcellstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstyle.cpp (original)
+++ trunk/Scribus/scribus/ui/smcellstyle.cpp Sun Jan 19 22:59:54 2014
@@ -410,7 +410,7 @@
 	if (!m_page)
 		return;
 	connect(m_page->fillColor, SIGNAL(activated(const QString&)), this, SLOT(slotFillColor()));
-	connect(m_page->fillShade_, SIGNAL(clicked()), this, SLOT(slotFillShade()));
+	connect(m_page->fillShade, SIGNAL(clicked()), this, SLOT(slotFillShade()));
 	connect(m_page->parentCombo, SIGNAL(activated(const QString&)), this, SLOT(slotParentChanged(const QString&)));
 }
 
@@ -419,7 +419,7 @@
 	if (!m_page)
 		return;
 	disconnect(m_page->fillColor, SIGNAL(activated(const QString&)), this, SLOT(slotFillColor()));
-	disconnect(m_page->fillShade_, SIGNAL(clicked()), this, SLOT(slotFillShade()));
+	disconnect(m_page->fillShade, SIGNAL(clicked()), this, SLOT(slotFillShade()));
 	disconnect(m_page->parentCombo, SIGNAL(activated(const QString&)), this, SLOT(slotParentChanged(const QString&)));
 }
 
@@ -447,7 +447,7 @@
 
 void SMCellStyle::slotFillShade()
 {
-	if (m_page->fillShade_->useParentValue())
+	if (m_page->fillShade->useParentValue())
 	{
 		for (int i = 0; i < m_selection.count(); ++i)
 		{
@@ -456,7 +456,7 @@
 	}
 	else
 	{
-		int fs = m_page->fillShade_->getValue();
+		int fs = m_page->fillShade->getValue();
 		for (int i = 0; i < m_selection.count(); ++i)
 		{
 			m_selection[i]->setFillShade(fs);

Modified: trunk/Scribus/scribus/ui/smcellstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18759&path=/trunk/Scribus/scribus/ui/smcellstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.cpp Sun Jan 19 22:59:54 2014
@@ -17,7 +17,7 @@
 	fillColorIcon->setPixmap(loadIcon("16/color-fill.png"));
 	fillColor->addItem(CommonStrings::tr_NoneColor);
 	fillShadeLabel->setPixmap( loadIcon("shade.png") );
-	fillShade_->setToolTip( tr("Fill Shade"));
+	fillShade->setToolTip( tr("Fill Shade"));
 }
 
 SMCellStyleWidget::~SMCellStyleWidget()
@@ -27,9 +27,7 @@
 void SMCellStyleWidget::changeEvent(QEvent *e)
 {
 	if (e->type() == QEvent::LanguageChange)
-	{
 		languageChange();
-	}
 	else
 		QWidget::changeEvent(e);
 }
@@ -47,13 +45,13 @@
 	{
 		fillColor->setCurrentText(cellStyle->fillColor(), cellStyle->isInhFillColor());
 		fillColor->setParentText(parent->fillColor());
-		fillShade_->setValue(qRound(cellStyle->fillShade()), cellStyle->isInhFillShade());
-		fillShade_->setParentValue(qRound(parent->fillShade()));
+		fillShade->setValue(qRound(cellStyle->fillShade()), cellStyle->isInhFillShade());
+		fillShade->setParentValue(qRound(parent->fillShade()));
 	}
 	else
 	{
 		fillColor->setCurrentText(cellStyle->fillColor());
-		fillShade_->setValue(qRound(cellStyle->fillShade()));
+		fillShade->setValue(qRound(cellStyle->fillShade()));
 	}
 	parentCombo->clear();
 	parentCombo->addItem( cellStyle->isDefaultStyle()? tr("A default style cannot be assigned a parent style") : "");
@@ -108,9 +106,9 @@
 			d = cellStyles[i]->fillShade();
 	}
 	if (d == -30000)
-		fillShade_->setText( tr("Shade"));
+		fillShade->setText( tr("Shade"));
 	else
-		fillShade_->setValue(qRound(d));
+		fillShade->setValue(qRound(d));
 	QString s;
 	QString emptyString;
 	for (int i = 0; i < cellStyles.count(); ++i)

Modified: trunk/Scribus/scribus/ui/smcellstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18759&path=/trunk/Scribus/scribus/ui/smcellstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.ui Sun Jan 19 22:59:54 2014
@@ -67,7 +67,7 @@
          </widget>
         </item>
         <item>
-         <widget class="SMShadeButton" name="fillShade_">
+         <widget class="SMShadeButton" name="fillShade">
           <property name="text">
            <string/>
           </property>

Modified: trunk/Scribus/scribus/ui/smtablestylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18759&path=/trunk/Scribus/scribus/ui/smtablestylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.cpp Sun Jan 19 22:59:54 2014
@@ -26,9 +26,7 @@
 void SMTableStyleWidget::changeEvent(QEvent *e)
 {
 	if (e->type() == QEvent::LanguageChange)
-	{
 		languageChange();
-	}
 	else
 		QWidget::changeEvent(e);
 }
@@ -45,13 +43,13 @@
 	{
 		fillColor->setCurrentText(tableStyle->fillColor(), tableStyle->isInhFillColor());
 		fillColor->setParentText(parent->fillColor());
-		fillShade_->setValue(qRound(tableStyle->fillShade()), tableStyle->isInhFillShade());
-		fillShade_->setParentValue(qRound(parent->fillShade()));
+		fillShade->setValue(qRound(tableStyle->fillShade()), tableStyle->isInhFillShade());
+		fillShade->setParentValue(qRound(parent->fillShade()));
 	}
 	else
 	{
 		fillColor->setCurrentText(tableStyle->fillColor());
-		fillShade_->setValue(qRound(tableStyle->fillShade()));
+		fillShade->setValue(qRound(tableStyle->fillShade()));
 	}
 	parentCombo->clear();
 	parentCombo->addItem( tableStyle->isDefaultStyle()? tr("A default style cannot be assigned a parent style") : "");
@@ -106,9 +104,9 @@
 			d = tableStyles[i]->fillShade();
 	}
 	if (d == -30000)
-		fillShade_->setText( tr("Shade"));
+		fillShade->setText( tr("Shade"));
 	else
-		fillShade_->setValue(qRound(d));
+		fillShade->setValue(qRound(d));
 	QString s;
 	QString emptyString;
 	for (int i = 0; i < tableStyles.count(); ++i)
@@ -134,7 +132,7 @@
 void SMTableStyleWidget::languageChange()
 {
 	fillColor->setToolTip( tr("Fill Color"));
-	fillShade_->setToolTip( tr("Fill Shade"));
+	fillShade->setToolTip( tr("Fill Shade"));
 }
 
 void SMTableStyleWidget::fillFillColorCombo(ColorList &colors)

Modified: trunk/Scribus/scribus/ui/smtablestylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18759&path=/trunk/Scribus/scribus/ui/smtablestylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.ui Sun Jan 19 22:59:54 2014
@@ -67,7 +67,7 @@
          </widget>
         </item>
         <item>
-         <widget class="SMShadeButton" name="fillShade_">
+         <widget class="SMShadeButton" name="fillShade">
           <property name="text">
            <string/>
           </property>

Modified: trunk/Scribus/scribus/ui/smtabruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18759&path=/trunk/Scribus/scribus/ui/smtabruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtabruler.cpp (original)
+++ trunk/Scribus/scribus/ui/smtabruler.cpp Sun Jan 19 22:59:54 2014
@@ -15,18 +15,18 @@
 					   QList<ParagraphStyle::TabRecord> Tabs, double wid)
 : Tabruler(parent, haveFirst, dEin, Tabs, wid)
 {
-	parentButton_ = new QToolButton(this);
-	Q_CHECK_PTR(parentButton_);
-	parentButton_->setText( tr(" Parent Tabs "));
-	indentLayout->addWidget(parentButton_);
-	parentButton_->hide();
+	m_parentButton = new QToolButton(this);
+	Q_CHECK_PTR(m_parentButton);
+	m_parentButton->setText( tr(" Parent Tabs "));
+	indentLayout->addWidget(m_parentButton);
+	m_parentButton->hide();
 	QFont f(font());
 	f.setBold(true);
-	parentButton_->setFont(f);
-	connect(parentButton_, SIGNAL(clicked()), this, SLOT(pbClicked()));
-	hasParent_ = false;
-	tabsChanged_ = false;
-	useParentTabs_ = false;
+	m_parentButton->setFont(f);
+	connect(m_parentButton, SIGNAL(clicked()), this, SLOT(pbClicked()));
+	m_hasParent = false;
+	m_tabsChanged = false;
+	m_useParentTabs = false;
 	first_ = new SMScrSpinBox(-3000, 4000, this, dEin);
 	Q_CHECK_PTR(first_);
 	left_ = new SMScrSpinBox(0, 4000, this, dEin);
@@ -87,8 +87,8 @@
 {
 	disconnect(this, SIGNAL(tabsChanged()), this, SLOT(slotTabsChanged()));
 	disconnect(this, SIGNAL(mouseReleased()), this, SLOT(slotTabsChanged()));
-	hasParent_ = false;
-	parentButton_->hide();
+	m_hasParent = false;
+	m_parentButton->hide();
 	Tabruler::setTabs(Tabs, unitIndex);
 	Tabruler::repaint();
 	first_->setNewUnit(unitIndex);
@@ -101,12 +101,12 @@
 {
 	disconnect(this, SIGNAL(tabsChanged()), this, SLOT(slotTabsChanged()));
 	disconnect(this, SIGNAL(mouseReleased()), this, SLOT(slotTabsChanged()));
-	hasParent_  = true;
+	m_hasParent  = true;
 	m_unitIndex = unitIndex;
 	if (isParentValue)
-		parentButton_->hide();
+		m_parentButton->hide();
 	else
-		parentButton_->show();
+		m_parentButton->show();
 	Tabruler::setTabs(Tabs, unitIndex);
 	Tabruler::repaint();
 	first_->setNewUnit(unitIndex);
@@ -120,8 +120,8 @@
 
 void SMTabruler::setParentTabs(QList<ParagraphStyle::TabRecord> Tabs)
 {
-	hasParent_ = true;
-	pTabs_ = Tabs;
+	m_hasParent = true;
+	m_pTabs = Tabs;
 }
 
 void SMTabruler::setFirstLineValue(double t)
@@ -153,7 +153,7 @@
 	disconnect(first_, SIGNAL(valueChanged(double)), this, SLOT(firstValueChanged()));
 	disconnect(right_, SIGNAL(valueChanged(double)), this, SLOT(rightValueChanged()));
 	disconnect(left_, SIGNAL(valueChanged(double)), this, SLOT(leftValueChanged()));
-	isSetupFirst_ = true;
+	m_isSetupFirst = true;
 	first_->setValue(t, isParentValue);
 	firstLineData->setValue(t);
 	setLeftIndent();
@@ -201,7 +201,7 @@
 	disconnect(first_, SIGNAL(valueChanged(double)), this, SLOT(firstValueChanged()));
 	disconnect(right_, SIGNAL(valueChanged(double)), this, SLOT(rightValueChanged()));
 	disconnect(left_, SIGNAL(valueChanged(double)), this, SLOT(leftValueChanged()));
-	isSetupLeft_ = true;
+	m_isSetupLeft = true;
 	left_->setValue(t, isParentValue);
 	leftIndentData->setValue(t);
 	setLeftIndent();
@@ -249,7 +249,7 @@
 	disconnect(first_, SIGNAL(valueChanged(double)), this, SLOT(firstValueChanged()));
 	disconnect(right_, SIGNAL(valueChanged(double)), this, SLOT(rightValueChanged()));
 	disconnect(left_, SIGNAL(valueChanged(double)), this, SLOT(leftValueChanged()));
-	isSetupRight_ = true;
+	m_isSetupRight = true;
 	right_->setValue(t, isParentValue);
 	rightIndentData->setValue(t);
 	setLeftIndent();
@@ -270,16 +270,16 @@
 
 bool SMTabruler::useParentTabs()
 {
-	bool ret = useParentTabs_;
-	if (ret && hasParent_)
+	bool ret = m_useParentTabs;
+	if (ret && m_hasParent)
 	{
-		setTabs(pTabs_, m_unitIndex, true);
+		setTabs(m_pTabs, m_unitIndex, true);
 		Tabruler::repaint();
-		parentButton_->hide();
+		m_parentButton->hide();
 	}
-	else if (hasParent_)
+	else if (m_hasParent)
 	{
-		parentButton_->show();
+		m_parentButton->show();
 	}
 
 	return ret;
@@ -302,18 +302,18 @@
 
 void SMTabruler::slotTabsChanged()
 {
-	if (hasParent_)
+	if (m_hasParent)
 	{
-		useParentTabs_ = false;
-		tabsChanged_ = true;
+		m_useParentTabs = false;
+		m_tabsChanged = true;
 	}
 }
 
 void SMTabruler::pbClicked()
 {
-	if (hasParent_)
+	if (m_hasParent)
 	{
-		useParentTabs_ = true;
+		m_useParentTabs = true;
 		emit mouseReleased();
 	}
 }
@@ -326,12 +326,12 @@
 	double a, b, value;
 	int c;
 	leftIndentData->getValues(&a, &b, &c, &value);
-	if (hasParent_ && !isSetupLeft_)
+	if (m_hasParent && !m_isSetupLeft)
 		left_->setValue(value, false);
-	else if (!hasParent_)
+	else if (!m_hasParent)
 		left_->setValue(value);
 
-	isSetupLeft_ = false;
+	m_isSetupLeft = false;
 	connect(first_, SIGNAL(valueChanged(double)), this, SLOT(firstValueChanged()));
 	connect(right_, SIGNAL(valueChanged(double)), this, SLOT(rightValueChanged()));
 	connect(left_, SIGNAL(valueChanged(double)), this, SLOT(leftValueChanged()));
@@ -345,12 +345,12 @@
 	double a, b, value;
 	int c;
 	rightIndentData->getValues(&a, &b, &c, &value);
-	if (hasParent_ && !isSetupRight_)
+	if (m_hasParent && !m_isSetupRight)
 		right_->setValue(value, false);
-	else if (!hasParent_)
+	else if (!m_hasParent)
 		right_->setValue(value);
 
-	isSetupRight_ = false;
+	m_isSetupRight = false;
 	connect(first_, SIGNAL(valueChanged(double)), this, SLOT(firstValueChanged()));
 	connect(right_, SIGNAL(valueChanged(double)), this, SLOT(rightValueChanged()));
 	connect(left_, SIGNAL(valueChanged(double)), this, SLOT(leftValueChanged()));
@@ -364,12 +364,12 @@
 	double a, b, value;
 	int c;
 	firstLineData->getValues(&a, &b, &c, &value);
-	if (hasParent_ && !isSetupFirst_)
+	if (m_hasParent && !m_isSetupFirst)
 		first_->setValue(value, false);
-	else if (!hasParent_)
+	else if (!m_hasParent)
 		first_->setValue(value);
 
-	isSetupFirst_ = false;
+	m_isSetupFirst = false;
 	connect(first_, SIGNAL(valueChanged(double)), this, SLOT(firstValueChanged()));
 	connect(right_, SIGNAL(valueChanged(double)), this, SLOT(rightValueChanged()));
 	connect(left_, SIGNAL(valueChanged(double)), this, SLOT(leftValueChanged()));
@@ -387,7 +387,7 @@
 	setFirstLine();
 	setLeftIndent();
 	setRightIndent();
-	isSetupFirst_ = true;
+	m_isSetupFirst = true;
 //	connect(firstLineData, SIGNAL(valueChanged(double)), this, SLOT(firstDataChanged()));
 //	connect(rightIndentData, SIGNAL(valueChanged(double)), this, SLOT(rightDataChanged()));
 //	connect(leftIndentData, SIGNAL(valueChanged(double)), this, SLOT(leftDataChanged()));
@@ -405,7 +405,7 @@
 	setLeftIndent();
 //	setFirstLine();
 	setRightIndent();
-	isSetupLeft_ = true;
+	m_isSetupLeft = true;
 //	connect(firstLineData, SIGNAL(valueChanged(double)), this, SLOT(firstDataChanged()));
 //	connect(rightIndentData, SIGNAL(valueChanged(double)), this, SLOT(rightDataChanged()));
 	connect(leftIndentData, SIGNAL(valueChanged(double)), this, SLOT(leftDataChanged()));
@@ -423,8 +423,8 @@
 	setLeftIndent();
 	setFirstLine();
 	setRightIndent();
-	isSetupRight_ = true;
-	connect(firstLineData, SIGNAL(valueChanged(double)), this, SLOT(firstDataChanged()));
-	connect(rightIndentData, SIGNAL(valueChanged(double)), this, SLOT(rightDataChanged()));
-	connect(leftIndentData, SIGNAL(valueChanged(double)), this, SLOT(leftDataChanged()));
-}
+	m_isSetupRight = true;
+	connect(firstLineData, SIGNAL(valueChanged(double)), this, SLOT(firstDataChanged()));
+	connect(rightIndentData, SIGNAL(valueChanged(double)), this, SLOT(rightDataChanged()));
+	connect(leftIndentData, SIGNAL(valueChanged(double)), this, SLOT(leftDataChanged()));
+}

Modified: trunk/Scribus/scribus/ui/smtabruler.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18759&path=/trunk/Scribus/scribus/ui/smtabruler.h
==============================================================================
--- trunk/Scribus/scribus/ui/smtabruler.h (original)
+++ trunk/Scribus/scribus/ui/smtabruler.h Sun Jan 19 22:59:54 2014
@@ -51,15 +51,15 @@
 	SMScrSpinBox *right_;
 
 private:
-	QList<ParagraphStyle::TabRecord> pTabs_;
+	QList<ParagraphStyle::TabRecord> m_pTabs;
 	int  m_unitIndex;
-	QToolButton *parentButton_;
-	bool hasParent_;
-	bool tabsChanged_;
-	bool useParentTabs_;
-	bool isSetupRight_;
-	bool isSetupLeft_;
-	bool isSetupFirst_;
+	QToolButton *m_parentButton;
+	bool m_hasParent;
+	bool m_tabsChanged;
+	bool m_useParentTabs;
+	bool m_isSetupRight;
+	bool m_isSetupLeft;
+	bool m_isSetupFirst;
 
 private slots:
 	void slotTabsChanged();




More information about the scribus-commit mailing list