r24467 by jghali - Remove a few semicolons in excess at end of lines

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 10 22:52:57 UTC 2021


Author: jghali
Date: Wed Feb 10 22:52:57 2021
New Revision: 24467

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24467
Log:
Remove a few semicolons in excess at end of lines

Modified:
    trunk/Scribus/scribus/fonts/cff.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
    trunk/Scribus/scribus/langdef.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_imageframe.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/sclayer.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scpainterex_ps2.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/helpbrowser.cpp
    trunk/Scribus/scribus/ui/prefs_documentsections.cpp
    trunk/Scribus/scribus/ui/prefs_externaltools.cpp
    trunk/Scribus/scribus/ui/propertiespalette_image.cpp
    trunk/Scribus/scribus/ui/search.cpp

Modified: trunk/Scribus/scribus/fonts/cff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/fonts/cff.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/cff.cpp	(original)
+++ trunk/Scribus/scribus/fonts/cff.cpp	Wed Feb 10 22:52:57 2021
@@ -731,7 +731,7 @@
 		result.exponent = 0;
 		bool upperNibble = false;
 		bool haveSeenMinus = false;
-		bool haveSeenE = false;;
+		bool haveSeenE = false;
 		bool haveSeenEminus = false;
 		int decimalPointAt = -1;
 		uchar nibble, twoNibbles;

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp	Wed Feb 10 22:52:57 2021
@@ -511,7 +511,7 @@
 					d++;
 				}
 			}
-			m_pixelFormat = Format_GRAY_8;;
+			m_pixelFormat = Format_GRAY_8;
 		}
 	}
 	(void) jpeg_finish_decompress(&cinfo);
@@ -524,7 +524,7 @@
 		if (ori != 1)
 		{
 			QTransform M;
-			QTransform flip = QTransform ( -1,0,0,1,0,0 );
+			QTransform flip = QTransform(-1, 0, 0, 1, 0, 0);
 			switch ( ori )
 			{  // notice intentional fallthroughs
 				case 2:

Modified: trunk/Scribus/scribus/langdef.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/langdef.cpp
==============================================================================
--- trunk/Scribus/scribus/langdef.cpp	(original)
+++ trunk/Scribus/scribus/langdef.cpp	Wed Feb 10 22:52:57 2021
@@ -21,7 +21,7 @@
 
 #include "langdef.h"
 
-LangDef::LangDef() = default;;
+LangDef::LangDef() = default;
 
 LangDef::LangDef(const QString& pri,
 			 const QString& alt,

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Wed Feb 10 22:52:57 2021
@@ -795,7 +795,7 @@
 
 void PageItem::moveBy(const double dX, const double dY, bool drawingOnly)
 {
-	//qDebug()<<"pageitem::moveby"<<dX<<dY;;
+	//qDebug() << "pageitem::moveby" << dX << dY;
 	if (dX==0.0 && dY==0.0)
 		return;
 	invalid = true;

Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp	Wed Feb 10 22:52:57 2021
@@ -246,7 +246,7 @@
 	setImageFlippedV(false);
 	EmbeddedProfile.clear();
 	UseEmbedded = true; // Otherwise embedded profile will never be used when reloading image
-	ScaleType = m_Doc->prefsData().itemToolPrefs.imageScaleType;;
+	ScaleType = m_Doc->prefsData().itemToolPrefs.imageScaleType;
 	AspectRatio = m_Doc->prefsData().itemToolPrefs.imageAspectRatio;
 	setFillTransparency(0.0);
 	setLineTransparency(0.0);

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Wed Feb 10 22:52:57 2021
@@ -1617,7 +1617,7 @@
 	double gx = 0.0;
 	double gy = 0.0;
 	double gw = 0.0;
-	double gh = 0.0;;
+	double gh = 0.0;
 	PS_set_Info("Author", m_Doc->documentInfo().author());
 	PS_set_Info("Title", m_Doc->documentInfo().title());
 	if (!Options.useColor)

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp	(original)
+++ trunk/Scribus/scribus/scfonts.cpp	Wed Feb 10 22:52:57 2021
@@ -566,7 +566,7 @@
 	// Warning: code below is also present in addScalableFont, so if you do
 	// any modification here, think also about modifying code in addScalableFont
 	int faceIndex = 0;
-	QString fam(getFamilyName(face));;
+	QString fam(getFamilyName(face));
 	QStringList features(getFontFeatures(face));
 	QString sty(face->style_name);
 	if ((sty == "Regular" && face->style_flags != 0) || sty.isEmpty())

Modified: trunk/Scribus/scribus/sclayer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp	(original)
+++ trunk/Scribus/scribus/sclayer.cpp	Wed Feb 10 22:52:57 2021
@@ -45,7 +45,7 @@
 			markerColor = Qt::magenta;
 			break;
 		case 6:
-			markerColor = Qt::yellow;;
+			markerColor = Qt::yellow;
 			break;
 	}
 }

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Wed Feb 10 22:52:57 2021
@@ -1615,7 +1615,7 @@
 	{
 		FPoint start, end;
 		double left = offsetX - bleedLeft, right = offsetX + width + bleedRight;
-		double bottom = offsetY + height + bleedBottom, top = offsetY - bleedTop;;
+		double bottom = offsetY + height + bleedBottom, top = offsetY - bleedTop;
 		drawBoxMarks(painter, QRectF(QPointF(left, top), QPointF(right, bottom)), bleedBox, markOffs, markLength);
 	}
 	if (options.registrationMarks)

Modified: trunk/Scribus/scribus/scpainterex_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/scpainterex_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_ps2.cpp	(original)
+++ trunk/Scribus/scribus/scpainterex_ps2.cpp	Wed Feb 10 22:52:57 2021
@@ -263,7 +263,7 @@
 	m_strokeGradient.setType(mode);
 	m_strokeGradient.setOrigin(orig);
 	m_strokeGradient.setVector(vec);
-	m_strokeGradient.setFocalPoint(foc);;
+	m_strokeGradient.setFocalPoint(foc);
 }
 
 void ScPainterEx_Ps2::setPattern(ScPattern *pattern, double scaleX, double scaleY, double offsetX, double offsetY, double rotation, double skewX, double skewY, bool mirrorX, bool mirrorY)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Wed Feb 10 22:52:57 2021
@@ -2055,7 +2055,7 @@
 				mrk->setItemPtr((PageItem*) is->getItem("itemPtr"));
 			if (mrk->isType(MARKNoteMasterType))
 			{
-				NotesStyle* nStyle = getNotesStyle(is->get("nStyle"));;
+				NotesStyle* nStyle = getNotesStyle(is->get("nStyle"));
 				TextNote* note = newNote(nStyle);
 				mrk->setNotePtr(note);
 				note->setMasterMark(mrk);
@@ -12009,11 +12009,11 @@
 			break;
 		case alignPage:
 			newX = m_currentPage->xOffset();
-			newX += m_currentPage->width();;
+			newX += m_currentPage->width();
 			break;
 		case alignMargins:
 			newX = m_currentPage->xOffset();
-			newX += m_currentPage->width();;
+			newX += m_currentPage->width();
 			newX -= m_currentPage->Margins.right();
 			break;
 		case alignGuide:

Modified: trunk/Scribus/scribus/ui/helpbrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp	(original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp	Wed Feb 10 22:52:57 2021
@@ -611,7 +611,7 @@
 	helpMenuFiles.append(qMakePair(baseHelpDir, enLanguage));
 	helpMenuFiles.append(qMakePair(installHelpDir, enLanguage));
 
-	QString toLoad;;
+	QString toLoad;
 	for (int i = 0; i < helpMenuFiles.count(); ++i)
 	{
 		auto helpPair = helpMenuFiles.at(i);

Modified: trunk/Scribus/scribus/ui/prefs_documentsections.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/ui/prefs_documentsections.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsections.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentsections.cpp	Wed Feb 10 22:52:57 2021
@@ -67,7 +67,7 @@
 		QTableWidgetItem *item0 = new QTableWidgetItem(it->name);
 		sectionsTable->setItem(row, i++, item0);
 		//Active
-		QTableWidgetItem *item1 = new QTableWidgetItem();;
+		QTableWidgetItem *item1 = new QTableWidgetItem();
 		item1->setCheckState(it->active ? Qt::Checked : Qt::Unchecked);
 		sectionsTable->setItem(row, i++, item1);
 		//Reversed
@@ -154,7 +154,7 @@
 			}
 			break;
 		case 6:
-			m_localSections[row].sectionstartindex = sectionsTable->item(row, col)->text().toUInt();;
+			m_localSections[row].sectionstartindex = sectionsTable->item(row, col)->text().toUInt();
 			break;
 		case 7:
 			m_localSections[row].pageNumberWidth = sectionsTable->item(row, col)->text().toInt();

Modified: trunk/Scribus/scribus/ui/prefs_externaltools.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/ui/prefs_externaltools.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_externaltools.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_externaltools.cpp	Wed Feb 10 22:52:57 2021
@@ -79,7 +79,7 @@
 	prefsData->extToolPrefs.gs_AntiAliasGraphics = psAntialiasGraphicsCheckBox->isChecked();
 	prefsData->extToolPrefs.gs_AntiAliasText = psAntialiasTextCheckBox->isChecked();
 	prefsData->extToolPrefs.gs_exe=QDir::fromNativeSeparators(psToolLineEdit->text());
-	prefsData->extToolPrefs.gs_Resolution = psResolutionSpinBox->value();;
+	prefsData->extToolPrefs.gs_Resolution = psResolutionSpinBox->value();
 
 	prefsData->extToolPrefs.imageEditorExecutable=QDir::fromNativeSeparators(imageToolLineEdit->text());
 	prefsData->extToolPrefs.extBrowserExecutable=QDir::fromNativeSeparators(webBrowserLineEdit->text());

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp	Wed Feb 10 22:52:57 2021
@@ -862,7 +862,7 @@
 
 bool PropertiesPalette_Image::userActionOn()
 {
-	return m_userActionOn;;
+	return m_userActionOn;
 }
 
 void PropertiesPalette_Image::spinboxStartUserAction()

Modified: trunk/Scribus/scribus/ui/search.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24467&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp	(original)
+++ trunk/Scribus/scribus/ui/search.cpp	Wed Feb 10 22:52:57 2021
@@ -251,7 +251,7 @@
 	setCurrentComboItem(RStrokeVal, doc->currentStyle.charStyle().strokeColor());
 	RStrokeVal->setEnabled(false);
 	ReplaceLayout->addWidget( RStrokeVal, 8, 1 );
-	RStrokeSVal = new ShadeButton(Replace);;
+	RStrokeSVal = new ShadeButton(Replace);
 	RStrokeSVal->setEnabled(false);
 	ReplaceLayout->addWidget( RStrokeSVal, 9, 1, Qt::AlignLeft );
 	SelLayout->addWidget( Replace );




More information about the scribus-commit mailing list