Changeset 5781 for code/trunk/src/libraries/util

Timestamp:

Sep 24, 2009, 11:02:42 AM (15 years ago)

Author:

rgrieder

Message:

Reverted trunk again. We might want to find a way to delete these revisions again (x3n's changes are still available as diff in the commit mails).

Location:

code/trunk/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• Clipboard.cc (copied) (copied from code/trunk/src/libraries/util/Clipboard.cc)
• Clipboard.h (copied) (copied from code/trunk/src/libraries/util/Clipboard.h)
• Exception.cc (modified) (2 diffs)
• OgreForwardRefs.h (copied) (copied from code/trunk/src/libraries/util/OgreForwardRefs.h)
• UTFStringConversions.h (copied) (copied from code/trunk/src/libraries/util/UTFStringConversions.h)

code/trunk/src/libraries/util/CMakeLists.txt

@@ -19 +19 @@
 
 SET_SOURCE_FILES(UTIL_SRC_FILES
+  Clipboard.cc
   CRC32.cc
   Exception.cc

code/trunk/src/libraries/util/Exception.cc

@@ -34 +34 @@
 
 #include "Exception.h"
+#include <CEGUIExceptions.h>
 
 namespace orxonox
@@ -105 +106 @@
             return ex.what();
         }
+        catch (const CEGUI::Exception& ex)
+        {
+#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR < 6
+            return GeneralException(ex.getMessage().c_str()).getDescription();
+#else
+            return GeneralException(ex.getMessage().c_str(), ex.getLine(),
+                ex.getFileName().c_str(), ex.getName().c_str()).getDescription();
+#endif
+        }
         catch (...)
         {