View Issue Details

IDProjectCategoryView StatusLast Update
0016930ScribusGeneralpublic2023-05-29 18:56
Reportermjg Assigned Tojghali  
PrioritynormalSeveritymajorReproducibilityalways
Status closedResolutionfixed 
Fixed in Version1.6.0.svn 
Summary0016930: Scrbus fails to build since code cleanup in r25414
Descriptionr25414 (trunk) resp r25413 (Version15x) replaced struct ItemToolPrefs by ItemToolPrefs, omitting the struct. This leads to build failures.
Steps To ReproduceBuild trunk or Version15x from svn
Additional InformationCouldn't not find the current mailing list, or I would have simply sent the patch there ... Website needs some love :)
TagsNo tags attached.
PatchYes

Activities

mjg

2023-04-15 20:34

reporter  

0001-fix-code-cleanup.patch (1,892 bytes)   
From 9beb91dd2b54ed01b81cf63825d096d1aa86c72f Mon Sep 17 00:00:00 2001
Message-ID: <9beb91dd2b54ed01b81cf63825d096d1aa86c72f.1681586293.git.mjg@fedoraproject.org>
From: Michael J Gruber <mjg@fedoraproject.org>
Date: Sat, 15 Apr 2023 21:16:49 +0200
Subject: [PATCH] fix code cleanup

r25414 replaced struct ItemToolPrefs by ItemToolPrefs, omitting the
struct. Fix this up.
---
 scribus/ui/arcwidget.cpp | 4 ++--
 scribus/ui/arcwidget.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scribus/ui/arcwidget.cpp b/scribus/ui/arcwidget.cpp
index f3c9ca0f3..7e723c466 100644
--- a/scribus/ui/arcwidget.cpp
+++ b/scribus/ui/arcwidget.cpp
@@ -43,7 +43,7 @@ void ArcWidget::connectSignals(bool conn)
 }
 
 
-void ArcWidget::restoreDefaults(const ItemToolPrefs *prefsData)
+void ArcWidget::restoreDefaults(const struct ItemToolPrefs *prefsData)
 {
 	connectSignals(false);
 	startAngle->setValue(prefsData->arcStartAngle);
@@ -52,7 +52,7 @@ void ArcWidget::restoreDefaults(const ItemToolPrefs *prefsData)
 	connectSignals(true);
 }
 
-void ArcWidget::saveGuiToPrefs(ItemToolPrefs *prefsData)
+void ArcWidget::saveGuiToPrefs(struct ItemToolPrefs *prefsData)
 {
 	prefsData->arcStartAngle = startAngle->value();
 	double nSweep = endAngle->value() - startAngle->value();
diff --git a/scribus/ui/arcwidget.h b/scribus/ui/arcwidget.h
index cb7e10a5e..6355e7585 100644
--- a/scribus/ui/arcwidget.h
+++ b/scribus/ui/arcwidget.h
@@ -20,8 +20,8 @@ class SCRIBUS_API ArcWidget : public QWidget, Ui::ArcWidgetBase
 		ArcWidget(QWidget* parent);
 		~ArcWidget() {};
 
-		void restoreDefaults(const ItemToolPrefs *prefsData);
-		void saveGuiToPrefs(ItemToolPrefs *prefsData);
+		void restoreDefaults(const struct ItemToolPrefs *prefsData);
+		void saveGuiToPrefs(struct ItemToolPrefs *prefsData);
 
 	protected slots:
 		void updatePreview();
-- 
2.40.0.414.g17ff5447bb

0001-fix-code-cleanup.patch (1,892 bytes)   

jghali

2023-04-15 23:27

administrator   ~0050120

Thanks, but the fix was even more simple.

jghali

2023-04-15 23:41

administrator   ~0050121

Last edited: 2023-04-15 23:42

>> Couldn't not find the current mailing list, or I would have simply sent the patch there

The mailing lists have been decommissioned and do not exist anymore.

mjg

2023-04-16 13:01

reporter   ~0050124

Thanks.
There is at least one more in scribus/ui/spiralwidget.h, though.

Issue History

Date Modified Username Field Change
2023-04-15 20:34 mjg New Issue
2023-04-15 20:34 mjg File Added: 0001-fix-code-cleanup.patch
2023-04-15 23:17 jghali Project Contributor Builds => Scribus
2023-04-15 23:27 jghali Note Added: 0050120
2023-04-15 23:28 jghali Assigned To => jghali
2023-04-15 23:28 jghali Status new => resolved
2023-04-15 23:28 jghali Resolution open => fixed
2023-04-15 23:28 jghali Fixed in Version => 1.6.0.svn
2023-04-15 23:41 jghali Note Added: 0050121
2023-04-15 23:42 jghali Note Edited: 0050121
2023-04-16 13:01 mjg Note Added: 0050124
2023-05-29 18:56 cbradney Status resolved => closed