Группа :: Архивирование/Резервное копирование
Пакет: qt-fsarchiver
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: qt-fsarchiver-g++8.patch
Скачать
Скачать
From bded16778cbaae49a8099d16feceda4605e07097 Mon Sep 17 00:00:00 2001
From: Andrey Bychkov <mrdrew@altlinux.org>
Date: Fri, 15 Feb 2019 12:42:40 +0300
Subject: [PATCH] Fix no return statement in the non-void function (according
g++8)
---
qt5-fsarchiver/src/clone.cpp | 2 ++
qt5-fsarchiver/src/dir.cpp | 2 ++
qt5-fsarchiver/src/mainWindow.cpp | 3 +++
qt5-fsarchiver/src/mbr.cpp | 2 ++
qt5-fsarchiver/src/net.cpp | 4 ++++
qt5-fsarchiver/src/net_ein.cpp | 4 +++-
qt5-fsarchiver/src/net_ein.h | 2 +-
7 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/qt5-fsarchiver/src/clone.cpp b/qt5-fsarchiver/src/clone.cpp
index 22e7e64..a15fae9 100644
--- a/qt5-fsarchiver/src/clone.cpp
+++ b/qt5-fsarchiver/src/clone.cpp
@@ -510,6 +510,8 @@ int DialogClone::questionMessage(QString frage)
return 1;
else if (msg.clickedButton() == noButton)
return 2;
+
+ return 0;
}
void DialogClone::rdbutton_clone(){
diff --git a/qt5-fsarchiver/src/dir.cpp b/qt5-fsarchiver/src/dir.cpp
index 39eaf54..dc00e54 100644
--- a/qt5-fsarchiver/src/dir.cpp
+++ b/qt5-fsarchiver/src/dir.cpp
@@ -723,6 +723,8 @@ int DialogDIR::questionMessage(QString frage)
return 1;
else if (msg.clickedButton() == noButton)
return 2;
+
+ return 0;
}
void DialogDIR::esc_end()
diff --git a/qt5-fsarchiver/src/mainWindow.cpp b/qt5-fsarchiver/src/mainWindow.cpp
index 009973d..e3f69c7 100644
--- a/qt5-fsarchiver/src/mainWindow.cpp
+++ b/qt5-fsarchiver/src/mainWindow.cpp
@@ -1207,6 +1207,8 @@ int MWindow::questionMessage(QString frage)
return 1;
else if (msg.clickedButton() == noButton)
return 2;
+
+ return 0;
}
@@ -1731,6 +1733,7 @@ int found;
zahl_.replace(found, 1, ",");
return zahl_ + tr(" GB");
}
+ return zahl_;
}
QString MWindow::linux_version() {
diff --git a/qt5-fsarchiver/src/mbr.cpp b/qt5-fsarchiver/src/mbr.cpp
index 2098c7d..6484132 100644
--- a/qt5-fsarchiver/src/mbr.cpp
+++ b/qt5-fsarchiver/src/mbr.cpp
@@ -448,6 +448,8 @@ int DialogMBR::questionMessage(QString frage)
return 1;
else if (msg.clickedButton() == noButton)
return 2;
+
+ return 0;
}
string DialogMBR::mtab_einlesen(string partition_if_home)
diff --git a/qt5-fsarchiver/src/net.cpp b/qt5-fsarchiver/src/net.cpp
index d15a80d..ac1c43c 100644
--- a/qt5-fsarchiver/src/net.cpp
+++ b/qt5-fsarchiver/src/net.cpp
@@ -1579,6 +1579,8 @@ int DialogNet::questionMessage(QString frage)
return 1;
else if (msg.clickedButton() == noButton)
return 2;
+
+ return 0;
}
void DialogNet::esc_end()
@@ -1718,6 +1720,8 @@ int i = 0;
tr("The backup or restore with ssh is not possible. Exit the program and restart it again in the terminal with root right.\n", " Die Sicherung oder Wiederherstellung mit ssh ist nicht mц╤glich. Beenden Sie das Programm und starten es erneut im Terminal mit Root-Rechten\n"));
return 256;
}
+
+ return 0;
}
diff --git a/qt5-fsarchiver/src/net_ein.cpp b/qt5-fsarchiver/src/net_ein.cpp
index 0be8a19..6d3b949 100644
--- a/qt5-fsarchiver/src/net_ein.cpp
+++ b/qt5-fsarchiver/src/net_ein.cpp
@@ -439,7 +439,7 @@ QString NetEin::user_holen()
return user;
}
-int NetEin:: end()
+void NetEin:: end()
{
close();
}
@@ -675,6 +675,8 @@ int NetEin::questionMessage(QString frage)
return 1;
else if (msg.clickedButton() == noButton)
return 2;
+
+ return 0;
}
bool NetEin::rmDir(const QString &dirPath)
diff --git a/qt5-fsarchiver/src/net_ein.h b/qt5-fsarchiver/src/net_ein.h
index 97955a4..08ace37 100644
--- a/qt5-fsarchiver/src/net_ein.h
+++ b/qt5-fsarchiver/src/net_ein.h
@@ -59,7 +59,7 @@ private:
QFileSystemModel *dirModel;
private slots:
- int end();
+ void end();
int go();
};
--
2.19.2