r24567 by jghali - Fix inconsistent line endings

[scribus-commit]

Author: jghali
Date: Mon Mar 15 20:38:05 2021
New Revision: 24567

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24567
Log:
Fix inconsistent line endings

Modified:
    trunk/Scribus/scribus/ui/smalignselect.cpp

Modified: trunk/Scribus/scribus/ui/smalignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24567&path=/trunk/Scribus/scribus/ui/smalignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smalignselect.cpp	(original)
+++ trunk/Scribus/scribus/ui/smalignselect.cpp	Mon Mar 15 20:38:05 2021
@@ -1,89 +1,89 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-#include <QToolTip>
-#include "smalignselect.h"
-
-
-SMAlignSelect::SMAlignSelect(QWidget *parent)
-	: AlignSelect(parent)
-{
-	parentButton = new QToolButton(this);
-	parentButton->setCheckable( true );
-	parentButton->setText( tr("P", "P as in Parent"));
-	parentButton->setToolTip( tr("Use parent style's alignment instead of overriding it"));
-	GroupAlignLayout->addWidget( parentButton );
-	resize(minimumSizeHint());
-	parentButton->hide();
-}
-
-void SMAlignSelect::setStyle(int a, int d)
-{
-	disconnect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
-	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
-	setFont(false);
-	m_hasParent = false;
-	m_pStyle = 0;
-	m_pDirection = 0;
-	parentButton->hide();
-	AlignSelect::setStyle(a, d);
-}
-
-void SMAlignSelect::setStyle(int a, int d, bool isParentValue)
-{
-	disconnect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
-	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
-	m_hasParent = true;
-	m_pStyle = a;
-	m_pDirection = d;
-	setFont(!isParentValue);
-	if (isParentValue)
-		parentButton->hide();
-	else
-		parentButton->show();
-
-	AlignSelect::setStyle(a, d);
-	connect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
-	connect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
-}
-
-void SMAlignSelect::setParentItem(int a, int d)
-{
-	m_hasParent = true;
-	m_pStyle = a;
-	m_pDirection = d;
-}
-
-bool SMAlignSelect::useParentValue()
-{
-	bool ret = m_useParentStyle;
-	m_useParentStyle = false;
-	if (ret)
-		setStyle(m_pStyle, m_pDirection, true);
-
-	return ret;
-}
-
-void SMAlignSelect::setFont(bool wantBold)
-{
-	QFont f(font());
-	f.setBold(wantBold);
-	parentButton->setFont(f);
-}
-
-void SMAlignSelect::styleChanged()
-{
-	if (m_hasParent)
-	{
-		setFont(true);
-		parentButton->show();
-	}
-}
-
-void SMAlignSelect::pbPressed()
-{
-	m_useParentStyle = true;
-}
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+#include <QToolTip>
+#include "smalignselect.h"
+
+
+SMAlignSelect::SMAlignSelect(QWidget *parent)
+	: AlignSelect(parent)
+{
+	parentButton = new QToolButton(this);
+	parentButton->setCheckable( true );
+	parentButton->setText( tr("P", "P as in Parent"));
+	parentButton->setToolTip( tr("Use parent style's alignment instead of overriding it"));
+	GroupAlignLayout->addWidget( parentButton );
+	resize(minimumSizeHint());
+	parentButton->hide();
+}
+
+void SMAlignSelect::setStyle(int a, int d)
+{
+	disconnect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
+	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
+	setFont(false);
+	m_hasParent = false;
+	m_pStyle = 0;
+	m_pDirection = 0;
+	parentButton->hide();
+	AlignSelect::setStyle(a, d);
+}
+
+void SMAlignSelect::setStyle(int a, int d, bool isParentValue)
+{
+	disconnect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
+	disconnect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
+	m_hasParent = true;
+	m_pStyle = a;
+	m_pDirection = d;
+	setFont(!isParentValue);
+	if (isParentValue)
+		parentButton->hide();
+	else
+		parentButton->show();
+
+	AlignSelect::setStyle(a, d);
+	connect(this, SIGNAL(State(int)), this, SLOT(styleChanged()));
+	connect(parentButton, SIGNAL(pressed()), this, SLOT(pbPressed()));
+}
+
+void SMAlignSelect::setParentItem(int a, int d)
+{
+	m_hasParent = true;
+	m_pStyle = a;
+	m_pDirection = d;
+}
+
+bool SMAlignSelect::useParentValue()
+{
+	bool ret = m_useParentStyle;
+	m_useParentStyle = false;
+	if (ret)
+		setStyle(m_pStyle, m_pDirection, true);
+
+	return ret;
+}
+
+void SMAlignSelect::setFont(bool wantBold)
+{
+	QFont f(font());
+	f.setBold(wantBold);
+	parentButton->setFont(f);
+}
+
+void SMAlignSelect::styleChanged()
+{
+	if (m_hasParent)
+	{
+		setFont(true);
+		parentButton->show();
+	}
+}
+
+void SMAlignSelect::pbPressed()
+{
+	m_useParentStyle = true;
+}