[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 437687 by okellogg:

Patch by Leo Savernik removes gratuitous dependence on exception handling.


 M  +1 -0      THANKS  
 M  +6 -23     umbrello/worktoolbar.cpp  


--- trunk/KDE/kdesdk/umbrello/THANKS #437686:437687
@@ -55,6 +55,7 @@
 Peeter Russak <pezz @tkwcy.ee>
 Paulo Roberto Rodriguez Sehn <paulo.sehn @gmail.com>
 Achim Spangler <Achim.Spangler @mnet-online.de>
+Leo Savernik <l.savernik @aon.at>
 Sebastian Stein <seb.stein @gmx.de>
 Andrew Sutton <asutton @cs.kent.edu>
 Tanuj <tagrawal @hss.hns.com>
--- trunk/KDE/kdesdk/umbrello/umbrello/worktoolbar.cpp #437686:437687
@@ -53,13 +53,8 @@
 }
 
 void WorkToolBar::insertHotBtn(ToolBar_Buttons tbb) {
-    try {
-        insertButton(m_ToolButtons[tbb].Symbol, tbb, true, m_ToolButtons[tbb].Label);
-        setToggle(tbb, true);
-    }
-    catch (...) {
-        kdError() << "Undefined button id " << tbb << "!" << endl;
-    }
+    insertButton(m_ToolButtons[tbb].Symbol, tbb, true, m_ToolButtons[tbb].Label);
+    setToggle(tbb, true);
 }
 
 void WorkToolBar::insertBasicAssociations()  {
@@ -199,13 +194,7 @@
 }
 
 QCursor WorkToolBar::currentCursor() {
-    try {
-        return m_ToolButtons[m_CurrentButtonID].Cursor;
-    }
-    catch (...) {
-        kdError() << "Cursor not found for id " << m_CurrentButtonID << "!" << endl;
-        return QCursor();
-    }
+    return m_ToolButtons[m_CurrentButtonID].Cursor;
 }
 
 void WorkToolBar::slotResetToolBar() {
@@ -238,15 +227,9 @@
 }
 
 QPixmap WorkToolBar::load(const QString & fileName) {
-    try {
-        QPixmap pxm;
-        pxm.load(fileName);
-        return pxm;
-    }
-    catch (...) {
-        kdError() << "Could not load pixmap from " << fileName << "!" << endl;
-        return 0;
-    }
+    QPixmap pxm;
+    pxm.load(fileName);
+    return pxm;
 }
 
 void WorkToolBar::loadPixmaps() {