Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37761983
en ru br
Репозитории ALT
S:0.9.100-alt1
5.1: 0.4.2-alt2
4.1: 0.6.0-alt0.M41.1
4.0: 0.4.2-alt0.M40.1
www.altlinux.org/Changes

Группа :: Издательство
Пакет: fontmatrix

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: fontmatrix-g++8.patch
Скачать


From 2715c724e0fb8847ce6a8c1c5b6dbaa3c4640372 Mon Sep 17 00:00:00 2001
From: Andrey Bychkov <mrdrew@altlinux.org>
Date: Wed, 13 Feb 2019 16:46:05 +0300
Subject: [PATCH] Fix no return statement in the non-void function (according
 g++8)
---
 fontmatrix-0.9.99-Source/src/chartwidget.cpp          | 2 +-
 fontmatrix-0.9.99-Source/src/chartwidget.h            | 2 +-
 fontmatrix-0.9.99-Source/src/samplewidget.h           | 2 +-
 fontmatrix-0.9.99-Source/src/tagswidget_listmodel.cpp | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fontmatrix-0.9.99-Source/src/chartwidget.cpp b/fontmatrix-0.9.99-Source/src/chartwidget.cpp
index 86834f9..847761a 100644
--- a/fontmatrix-0.9.99-Source/src/chartwidget.cpp
+++ b/fontmatrix-0.9.99-Source/src/chartwidget.cpp
@@ -127,7 +127,7 @@ QString ChartWidget::currentBlock()
 	return ui->uniPlaneCombo->currentText();
 }
 
-bool ChartWidget::selectBlock(const QString &uname)
+void ChartWidget::selectBlock(const QString &uname)
 {
 	int idx(ui->uniPlaneCombo->findText(uname));
 	if(idx < 0)
diff --git a/fontmatrix-0.9.99-Source/src/chartwidget.h b/fontmatrix-0.9.99-Source/src/chartwidget.h
index df12ad8..076efb5 100644
--- a/fontmatrix-0.9.99-Source/src/chartwidget.h
+++ b/fontmatrix-0.9.99-Source/src/chartwidget.h
@@ -41,7 +41,7 @@ public:
     ~ChartWidget();
 
     QString currentBlock();
-    bool selectBlock(const QString& uname);
+    void selectBlock(const QString& uname);
 
 protected:
     void changeEvent(QEvent *e);
diff --git a/fontmatrix-0.9.99-Source/src/samplewidget.h b/fontmatrix-0.9.99-Source/src/samplewidget.h
index 8d1369a..09ef2d4 100644
--- a/fontmatrix-0.9.99-Source/src/samplewidget.h
+++ b/fontmatrix-0.9.99-Source/src/samplewidget.h
@@ -99,7 +99,7 @@ public:
 		State fromByteArray(QByteArray b);
 
 	private:
-		State operator= (const State&){}
+		void operator= (const State&){}
 	};
 
 	static const QString Name;
diff --git a/fontmatrix-0.9.99-Source/src/tagswidget_listmodel.cpp b/fontmatrix-0.9.99-Source/src/tagswidget_listmodel.cpp
index 5b01463..decf897 100644
--- a/fontmatrix-0.9.99-Source/src/tagswidget_listmodel.cpp
+++ b/fontmatrix-0.9.99-Source/src/tagswidget_listmodel.cpp
@@ -164,6 +164,8 @@ QModelIndex TagsWidget_ListModel::addTag()
 			return index(i);
 	}
 
+	return QModelIndex();
+
 }
 
 
-- 
2.19.2
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin