From 3603cf6b0cc199192b7776eb61b9b5a414bc21ab Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Fri, 7 Dec 2007 03:37:28 +0000
Subject: [PATCH] Fix annoying crash bug in abakus.

svn path=/trunk/playground/utils/abakus/; revision=745799
---
 src/function.cpp | 13 +++++--------
 src/function.h   |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/function.cpp b/src/function.cpp
index d008b02..bb7e9c1 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -143,7 +143,10 @@ DECLARE_FUNC1(frac, "Fractional part of number");
 
 Function *FunctionManager::function(const QString &name)
 {
-    return m_dict[name];
+    if(!m_dict.contains(name))
+        return 0;
+
+    return m_dict.value(name, 0);
 }
 
 // Returns true if the named identifier is a function, false otherwise.
@@ -185,14 +188,8 @@ bool FunctionManager::addFunction(BaseFunction *fn, const QString &dependantVar)
     fnTabEntry->needsTrig = false;
     fnTabEntry->userDefined = true;
 
-    foreach(Function *func, m_dict) {
-        kDebug() << "Function " << func->name << " present.\n";
-    }
-
-    if(m_dict.contains(fn->name())) {
-        Q_ASSERT(m_dict[fn->name()] != 0);
+    if(m_dict.contains(fn->name()))
         emit signalFunctionRemoved(fn->name());
-    }
 
     m_dict.insert(fn->name(), fnTabEntry);
     emit signalFunctionAdded(fn->name());
diff --git a/src/function.h b/src/function.h
index 38c8d77..dc854a8 100644
--- a/src/function.h
+++ b/src/function.h
@@ -23,7 +23,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QHash>
+#include <QtCore/QHash>
 
 class BaseFunction;
 
-- 
GitLab