summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-01 22:56:57 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:16 +0900
commit58c91c02e2889b7b6e6c2c0ae6862e09c6c58f05 (patch)
tree0fe31d7893bcb9a25e628084cf4708dde78ccc75
parent5c1c8b5fab11054d29bd78a69eb5d3b568288b28 (diff)
downloadmpv-58c91c02e2889b7b6e6c2c0ae6862e09c6c58f05.tar.bz2
mpv-58c91c02e2889b7b6e6c2c0ae6862e09c6c58f05.tar.xz
DOCS/client_api_examples: don't throw char* in C++ code
C++ is the worst language ever, and allows throwing any type, even if it doesn't make sense. In this case, we were throwing char*, which the runtime typically treats as opaque, instead of printing it as message if such an exception was not caught. Conflicts: DOCS/client_api_examples/qml/mpvrenderer.cpp
-rw-r--r--DOCS/client_api_examples/qtexample.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/DOCS/client_api_examples/qtexample.cpp b/DOCS/client_api_examples/qtexample.cpp
index f44dfd29c1..7e208984ad 100644
--- a/DOCS/client_api_examples/qtexample.cpp
+++ b/DOCS/client_api_examples/qtexample.cpp
@@ -2,6 +2,7 @@
#include <clocale>
#include <sstream>
+#include <stdexcept>
#include <QtGlobal>
#include <QFileDialog>
@@ -55,7 +56,7 @@ MainWindow::MainWindow(QWidget *parent) :
mpv = mpv_create();
if (!mpv)
- throw "can't create mpv instance";
+ throw std::runtime_error("can't create mpv instance");
// Create a video child window. Force Qt to create a native window, and
// pass the window ID to the mpv wid option. Works on: X11, win32, Cocoa
@@ -92,7 +93,7 @@ MainWindow::MainWindow(QWidget *parent) :
mpv_set_wakeup_callback(mpv, wakeup, this);
if (mpv_initialize(mpv) < 0)
- throw "mpv failed to initialize";
+ throw std::runtime_error("mpv failed to initialize");
}
void MainWindow::handle_mpv_event(mpv_event *event)