r23682 by craig - Code cleanup

[scribus-commit]

Author: craig
Date: Sun May  3 19:23:40 2020
New Revision: 23682

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23682
Log:
Code cleanup

Modified:
    trunk/Scribus/scribus/colorsetmanager.cpp
    trunk/Scribus/scribus/deferredtask.cpp
    trunk/Scribus/scribus/deferredtask.h

Modified: trunk/Scribus/scribus/colorsetmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23682&path=/trunk/Scribus/scribus/colorsetmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/colorsetmanager.cpp	(original)
+++ trunk/Scribus/scribus/colorsetmanager.cpp	Sun May  3 19:23:40 2020
@@ -54,7 +54,8 @@
 
 	if (fiC.open(QIODevice::ReadOnly))
 	{
-		QString ColorEn, Cname;
+		QString ColorEn;
+		QString Cname;
 		int Rval, Gval, Bval;
 		QTextStream tsC(&fiC);
 		ColorEn = tsC.readLine();

Modified: trunk/Scribus/scribus/deferredtask.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23682&path=/trunk/Scribus/scribus/deferredtask.cpp
==============================================================================
--- trunk/Scribus/scribus/deferredtask.cpp	(original)
+++ trunk/Scribus/scribus/deferredtask.cpp	Sun May  3 19:23:40 2020
@@ -7,15 +7,6 @@
 
 #include <QTimer>
 #include "deferredtask.h"
-
-enum FileSearchStatus
-{
-	Status_NotStarted,
-	Status_Running,
-	Status_Cancelled,
-	Status_Failed,
-	Status_Finished,
-};
 
 DeferredTask::DeferredTask(QObject* parent) : QObject(parent)
 {

Modified: trunk/Scribus/scribus/deferredtask.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23682&path=/trunk/Scribus/scribus/deferredtask.h
==============================================================================
--- trunk/Scribus/scribus/deferredtask.h	(original)
+++ trunk/Scribus/scribus/deferredtask.h	Sun May  3 19:23:40 2020
@@ -117,12 +117,22 @@
 	void done();
 
 private:
+	enum FileSearchStatus
+	{
+		Status_NotStarted,
+		Status_Running,
+		Status_Cancelled,
+		Status_Failed,
+		Status_Finished,
+	};
+
+
 	/*! \brief Status code indicating whether we're running, not yet started, failed,
 	etc. */
-	int m_status;
+	int m_status {Status_NotStarted};
 
 	//! \brief  The timer used to control next() calls.
-	QTimer* m_timer;
+	QTimer* m_timer {nullptr};
 };
 
 #endif