r24761 by craig - Code cleanup and switch to https links #15858/#15859

scribus-commit scribus-commit at lists.scribus.net
Wed Oct 27 19:40:31 UTC 2021


Author: craig
Date: Wed Oct 27 19:40:30 2021
New Revision: 24761

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24761
Log:
Code cleanup and switch to https links #15858/#15859

Modified:
    trunk/Scribus/LINKS
    trunk/Scribus/NEWS
    trunk/Scribus/PACKAGING
    trunk/Scribus/scribus/downloadmanager/scdlthread.cpp
    trunk/Scribus/scribus/ui/charselect.cpp
    trunk/Scribus/scribus/ui/resourcemanager.cpp
    trunk/Scribus/scribus/ui/smtextstyles.cpp
    trunk/Scribus/scribus/ui/stylemanager.cpp
    trunk/Scribus/scribus/ui/unicodesearch.cpp

Modified: trunk/Scribus/LINKS
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/LINKS
==============================================================================
--- trunk/Scribus/LINKS	(original)
+++ trunk/Scribus/LINKS	Wed Oct 27 19:40:30 2021
@@ -1,17 +1,17 @@
 Homepage
-http://www.scribus.net
+https://www.scribus.net
 
 Online Reference
-http://docs.scribus.net
+https://docs.scribus.net
 
 Wiki
-http://wiki.scribus.net
+https://wiki.scribus.net
 
 Bugs and Feature Requests
-http://bugs.scribus.net
+https://bugs.scribus.net
 
 Developer Blog
-http://rants.scribus.net
+https://rants.scribus.net
 
 Mailing List
-http://lists.scribus.info
+https://lists.scribus.net

Modified: trunk/Scribus/NEWS
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/NEWS
==============================================================================
--- trunk/Scribus/NEWS	(original)
+++ trunk/Scribus/NEWS	Wed Oct 27 19:40:30 2021
@@ -1 +1 @@
-For detailed release notes, please see http://www.scribus.net
+For detailed release notes, please see https://www.scribus.net

Modified: trunk/Scribus/PACKAGING
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/PACKAGING
==============================================================================
--- trunk/Scribus/PACKAGING	(original)
+++ trunk/Scribus/PACKAGING	Wed Oct 27 19:40:30 2021
@@ -76,13 +76,13 @@
 =============================================================================
 
 We do appreciate the effort in maintaining packagers make for Scribus. 
-Please file issues or enhancement requests at http://bugs.scribus.net
+Please file issues or enhancement requests at https://bugs.scribus.net
 
 Detailed notes on exact library requirements are detailed in the BUILDING file with the source tarball.
 
 There is a lively on-line community, both on IRC @ #scribus on libera.chat
 and the mailing list. Mailing list info can be found at: 
-http://lists.scribus.net/mailman/listinfo/scribus
+https://lists.scribus.net/mailman/listinfo/scribus
 
 For the Scribus Team,
 Peter Linnell

Modified: trunk/Scribus/scribus/downloadmanager/scdlthread.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/scribus/downloadmanager/scdlthread.cpp
==============================================================================
--- trunk/Scribus/scribus/downloadmanager/scdlthread.cpp	(original)
+++ trunk/Scribus/scribus/downloadmanager/scdlthread.cpp	Wed Oct 27 19:40:30 2021
@@ -160,7 +160,6 @@
 
 void ScDLThread::replyFinished(QNetworkReply* reply)
 {
-	qDebug()<<"replyFinished";
 	QVariant possibleRedirectUrl =reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
 	QUrl urlRedirectedTo = possibleRedirectUrl.toUrl();
 	QString text;

Modified: trunk/Scribus/scribus/ui/charselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/scribus/ui/charselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/charselect.cpp	(original)
+++ trunk/Scribus/scribus/ui/charselect.cpp	Wed Oct 27 19:40:30 2021
@@ -45,7 +45,7 @@
 	connect(m_userTable, SIGNAL(selectChar(uint,QString)), this, SLOT(userNewChar(uint,QString)));
 	connect(m_userTable->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), this, SLOT(slot_selectionChanged(const QItemSelection&,const QItemSelection&)));
 	connect(m_userTableModel, SIGNAL(rowAppended()),m_userTable, SLOT(resizeLastRow()));
-	connect(unicodeButton, SIGNAL(chosenUnicode(const QString&)),m_userTableModel, SLOT(appendUnicode(const QString&)));
+	connect(unicodeButton, SIGNAL(chosenUnicode(const QString&)), m_userTableModel, SLOT(appendUnicode(const QString&)));
 	connect(enhancedDialogButton, SIGNAL(toggled(bool)), this, SLOT(enhancedDialogButton_toggled(bool)));
 	connect(this, SIGNAL(insertUserSpecialChar(QChar,QString)), this, SLOT(slot_insertUserSpecialChar(QChar,QString)));
 	connect(uniLoadButton, SIGNAL(clicked()), this, SLOT(uniLoadButton_clicked()));

Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp	Wed Oct 27 19:40:30 2021
@@ -938,9 +938,9 @@
 	dataReceivedLabel->setVisible(true);
 	downloadProgressBar->setRange(0, m_dataFiles.count());
 	for (const QString& f : qAsConst(m_dataFiles))
-		ScQApp->dlManager()->addURL("http://services.scribus.net/" + f, true, ScPaths::downloadDir(), ScPaths::downloadDir());
+		ScQApp->dlManager()->addURL("https://services.scribus.net/" + f, true, ScPaths::downloadDir(), ScPaths::downloadDir());
 	for (const QString& f : qAsConst(m_dataFiles))
-		ScQApp->dlManager()->addURL("http://services.scribus.net/" + f + ".sha256", true, ScPaths::downloadDir(), ScPaths::downloadDir());
+		ScQApp->dlManager()->addURL("https://services.scribus.net/" + f + ".sha256", true, ScPaths::downloadDir(), ScPaths::downloadDir());
 	connect(ScQApp->dlManager(), SIGNAL(finished()), this, SLOT(downloadListFinished()));
 	connect(ScQApp->dlManager(), SIGNAL(fileReceived(const QString&)), this, SLOT(updateProgressBar()));
 	connect(ScQApp->dlManager(), SIGNAL(fileFailed(const QString&)), this, SLOT(updateProgressBar()));

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp	Wed Oct 27 19:40:30 2021
@@ -425,6 +425,7 @@
 		}
 	}
 
+	//When a parent style is renamed, also set the parent style name of the children
 	for (int j = 0; j < m_tmpStyles.count(); ++j)
 	{
 		if (m_tmpStyles[j].parent() == oldName)

Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp	Wed Oct 27 19:40:30 2021
@@ -1216,8 +1216,7 @@
 		nameEdit->setEnabled(false);
 	}
 
-	connect(nameEdit, SIGNAL(textChanged(const QString&)),
-	        this, SLOT(slotNameChanged(const QString&)));
+	connect(nameEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotNameChanged(const QString&)));
 
 }
 

Modified: trunk/Scribus/scribus/ui/unicodesearch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24761&path=/trunk/Scribus/scribus/ui/unicodesearch.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/unicodesearch.cpp	(original)
+++ trunk/Scribus/scribus/ui/unicodesearch.cpp	Wed Oct 27 19:40:30 2021
@@ -5,6 +5,7 @@
 for which a new license (GPL+exception) is in place.
 */
 
+#include <QDebug>
 #include <QFile>
 #include <QHeaderView>
 #include <QSortFilterProxyModel>




More information about the scribus-commit mailing list