r20818 by jghali -

[scribus-commit]

Author: jghali
Date: Sat Jan 30 22:58:41 2016
New Revision: 20818

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20818
Log:
some refactoring

Modified:
    trunk/Scribus/scribus/ui/inspage.cpp
    trunk/Scribus/scribus/ui/inspage.h
    trunk/Scribus/scribus/ui/margindialog.cpp
    trunk/Scribus/scribus/ui/margindialog.h

Modified: trunk/Scribus/scribus/ui/inspage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20818&path=/trunk/Scribus/scribus/ui/inspage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inspage.cpp	(original)
+++ trunk/Scribus/scribus/ui/inspage.cpp	Sat Jan 30 22:58:41 2016
@@ -295,7 +295,7 @@
 	connect( insWhereData, SIGNAL( activated(int) ), this, SLOT( insWherePageDataDisable(int) ) );
 	connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
 	connect( cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
-	connect(orientationQComboBox, SIGNAL(activated(int)), this, SLOT(setOrien(int)));
+	connect(orientationQComboBox, SIGNAL(activated(int)), this, SLOT(setOrientation(int)));
 	connect(sizeQComboBox, SIGNAL(activated(const QString &)), this, SLOT(setSize(const QString &)));
 	connect(overrideMPSizingCheckBox, SIGNAL(stateChanged(int)), this, SLOT(enableSizingControls(int)));
 }
@@ -320,7 +320,7 @@
 	delete ps2;
 }
 
-void InsPage::setOrien(int ori)
+void InsPage::setOrientation(int ori)
 {
 	double br;
 	setSize(sizeQComboBox->currentText());

Modified: trunk/Scribus/scribus/ui/inspage.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20818&path=/trunk/Scribus/scribus/ui/inspage.h
==============================================================================
--- trunk/Scribus/scribus/ui/inspage.h	(original)
+++ trunk/Scribus/scribus/ui/inspage.h	Sat Jan 30 22:58:41 2016
@@ -71,7 +71,7 @@
 private slots:
 	void insWherePageDataDisable (int index);
 	void setSize(const QString &);
-	void setOrien(int ori);
+	void setOrientation(int ori);
 	void enableSizingControls(int);
 };
 

Modified: trunk/Scribus/scribus/ui/margindialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20818&path=/trunk/Scribus/scribus/ui/margindialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/margindialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/margindialog.cpp	Sat Jan 30 22:58:41 2016
@@ -175,7 +175,7 @@
 	// signals and slots connections
 	connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
 	connect( cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
-	connect(orientationQComboBox, SIGNAL(activated(int)), this, SLOT(setOrien(int)));
+	connect(orientationQComboBox, SIGNAL(activated(int)), this, SLOT(setOrientation(int)));
 	connect(sizeQComboBox, SIGNAL(activated(const QString &)), this, SLOT(setPageSize()));
 	connect(widthSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setPageWidth(double)));
 	connect(heightSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setPageHeight(double)));
@@ -225,7 +225,7 @@
 {
 	if (sizeQComboBox->currentText() != CommonStrings::trCustomPageSize)
 		oldOri++;
-	setOrien(orientationQComboBox->currentIndex());
+	setOrientation(orientationQComboBox->currentIndex());
 }
 
 void MarginDialog::setSize(const QString & gr)
@@ -259,7 +259,7 @@
 	delete ps2;
 }
 
-void MarginDialog::setOrien(int ori)
+void MarginDialog::setOrientation(int ori)
 {
 	setSize(sizeQComboBox->currentText());
 	disconnect(widthSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setPageWidth(double)));

Modified: trunk/Scribus/scribus/ui/margindialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20818&path=/trunk/Scribus/scribus/ui/margindialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/margindialog.h	(original)
+++ trunk/Scribus/scribus/ui/margindialog.h	Sat Jan 30 22:58:41 2016
@@ -72,14 +72,14 @@
 	int getMarginPreset();
 
 public slots:
-	//! \brief as setOrien for orientationQComboBox current item
+	//! \brief as setOrientation for orientationQComboBox current item
 	virtual void setPageSize();
 	/*! \brief Sets page size and enables/disables size widgets.
 	\param gr A QString with name of the page size or "Custom" */
 	virtual void setSize(const QString & gr);
 	/*! \brief Sets page orientation and sizes regarding the given value
 	\param  ori integer from orientationQComboBox item index */
-	virtual void setOrien(int ori);
+	virtual void setOrientation(int ori);
 	/*! \brief Recompute the page width for current unit.
 	It's called from width spinbox.
 	\param v new width */