aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/qregisters.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qregisters.cpp')
-rw-r--r--src/qregisters.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qregisters.cpp b/src/qregisters.cpp
index aba5abf..fa95c80 100644
--- a/src/qregisters.cpp
+++ b/src/qregisters.cpp
@@ -35,6 +35,7 @@
#include "expressions.h"
#include "document.h"
#include "ring.h"
+#include "error.h"
#include "qregisters.h"
namespace SciTECO {
@@ -187,8 +188,8 @@ QRegister::execute(bool locals)
try {
Execute::macro(str, locals);
- } catch (State::Error &error) {
- error.add_frame(new State::Error::QRegFrame(name));
+ } catch (Error &error) {
+ error.add_frame(new Error::QRegFrame(name));
g_free(str);
throw; /* forward */
@@ -210,7 +211,7 @@ QRegister::load(const gchar *filename)
/* FIXME: prevent excessive allocations by reading file into buffer */
if (!g_file_get_contents(filename, &contents, &size, &gerror))
- throw State::GError(gerror);
+ throw GlibError(gerror);
edit();
string.reset();
@@ -434,7 +435,7 @@ done:
if (!reg) {
if (!initialize)
- throw State::InvalidQRegError(name, is_local);
+ throw InvalidQRegError(name, is_local);
reg = table.insert(name);
table.undo_remove(reg);
}