From 55a2b13af5b316faf3f850ed0c3f802db5742fdc Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sat, 3 Nov 2018 14:09:30 +0100
Subject: [PATCH] fix control may reach end of non void function
---
agui2/src/Graphics/Dialogs/OutputDialog.cpp | 2 +-
agui2/src/GraphvizIntegrator.cpp | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/agui2/src/Graphics/Dialogs/OutputDialog.cpp b/agui2/src/Graphics/Dialogs/OutputDialog.cpp
index 1826d5b412..afac41904a 100644
--- a/agui2/src/Graphics/Dialogs/OutputDialog.cpp
+++ b/agui2/src/Graphics/Dialogs/OutputDialog.cpp
@@ -110,7 +110,7 @@ TabType OutputDialog::getCurrentTabType() const {
return TabType::Image;
}
- throw std::logic_error ( "Invalid tab type" );
+ throw std::logic_error ( "Invalid tab type." );
}
std::pair<QString, QString> OutputDialog::getCurrentTabFileFilter() const {
diff --git a/agui2/src/GraphvizIntegrator.cpp b/agui2/src/GraphvizIntegrator.cpp
index 5786165d01..873d2a293a 100644
--- a/agui2/src/GraphvizIntegrator.cpp
+++ b/agui2/src/GraphvizIntegrator.cpp
@@ -9,7 +9,8 @@ QString selectFormat(GraphvizIntegrator::PictureFormat format) {
case GraphvizIntegrator::PictureFormat::SVG:
return "svg";
}
- Q_ASSERT(false);
+
+ throw std::logic_error ( "Invalid picture format." );
}
namespace GraphvizIntegrator {
@@ -56,4 +57,4 @@ namespace GraphvizIntegrator {
return PNG;
throw std::runtime_error { "Failed to determine output format from filename." };
}
-}
\ No newline at end of file
+}
--
GitLab