use QString in QgsException to fix encoding

jef · jef · commit 8cc3c65e7a2a · 2009-12-24T16:02:02.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12616 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -17,6 +17,7 @@
 #include "qgsapplication.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsproviderregistry.h"
+#include "qgsexception.h"
 
 #include <QDir>
 #include <QMessageBox>
@@ -87,10 +88,18 @@ bool QgsApplication::notify( QObject * receiver, QEvent * event )
   {
     done = QApplication::notify( receiver, event );
   }
+  catch ( QgsException & e )
+  {
+    QMessageBox::critical( activeWindow(), tr( "Exception" ), e.what() );
+  }
   catch ( std::exception & e )
   {
     QMessageBox::critical( activeWindow(), tr( "Exception" ), e.what() );
   }
+  catch ( ... )
+  {
+    QMessageBox::critical( activeWindow(), tr( "Exception" ), "unknown exception" );
+  }
   return done;
 }
 
diff --git a/src/core/qgscsexception.h b/src/core/qgscsexception.h
@@ -25,7 +25,6 @@
 class CORE_EXPORT QgsCsException : public QgsException
 {
   public:
-    QgsCsException( std::string const &what ) : QgsException( what ) {};
     QgsCsException( QString const &what ) : QgsException( what ) {};
 
 };
diff --git a/src/core/qgsexception.h b/src/core/qgsexception.h
@@ -18,40 +18,28 @@
 #ifndef QGSEXCEPTION_H
 #define QGSEXCEPTION_H
 
-#include <exception>
-#include <string>
-#include <list>
-
-#include <QDomNode>
-#include <QDomDocument>
-
 /** \ingroup core
   * Defines a qgis exception class.
  */
-class CORE_EXPORT QgsException : public std::exception
+class CORE_EXPORT QgsException
 {
   public:
-
-    QgsException( std::string const & what )
-        : what_( what )
-    {}
-
     QgsException( QString const & what )
-        : what_(( const char * )what.toLocal8Bit().data() )
+        : what_( what )
     {}
 
     virtual ~QgsException() throw()
     {}
 
-    const char* what() const throw()
+    QString what() const throw()
     {
-      return what_.c_str();
+      return what_;
     }
 
   private:
 
     /// description of exception
-    std::string what_;
+    QString what_;
 
 }; // class QgsException
 
diff --git a/src/plugins/diagram_overlay/qgsbardiagramfactory.cpp b/src/plugins/diagram_overlay/qgsbardiagramfactory.cpp
@@ -19,6 +19,7 @@
 #include "qgsrendercontext.h"
 #include <limits>
 #include <QPainter>
+#include <QDomNode>
 
 QgsBarDiagramFactory::QgsBarDiagramFactory(): QgsWKNDiagramFactory(), mBarWidth( 5 )
 {
diff --git a/src/plugins/diagram_overlay/qgsdiagramfactory.cpp b/src/plugins/diagram_overlay/qgsdiagramfactory.cpp
@@ -15,6 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QDomNode>
+
 #include "qgsdiagramfactory.h"
 #include "qgsrendercontext.h"
 
diff --git a/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp b/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
@@ -32,7 +32,9 @@
 #include "qgssymbologyutils.h"
 #include "qgsvectordataprovider.h"
 #include "qgslogger.h"
+
 #include <QPainter>
+#include <QDomNode>
 
 QgsDiagramOverlay::QgsDiagramOverlay( QgsVectorLayer* vl ): QgsVectorOverlay( vl ), mDiagramRenderer( 0 )
 {
diff --git a/src/plugins/diagram_overlay/qgssvgdiagramfactory.cpp b/src/plugins/diagram_overlay/qgssvgdiagramfactory.cpp
@@ -19,6 +19,7 @@
 #include "qgsrendercontext.h"
 #include <QImage>
 #include <QPainter>
+#include <QDomNode>
 
 QgsSVGDiagramFactory::QgsSVGDiagramFactory(): QgsDiagramFactory()
 {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include "qgsapplication.h"`
`18`	`18`	`#include "qgsmaplayerregistry.h"`
`19`	`19`	`#include "qgsproviderregistry.h"`
	`20`	`+#include "qgsexception.h"`
`20`	`21`
`21`	`22`	`#include <QDir>`
`22`	`23`	`#include <QMessageBox>`
`@@ -87,10 +88,18 @@ bool QgsApplication::notify( QObject * receiver, QEvent * event )`
`87`	`88`	`{`
`88`	`89`	`done = QApplication::notify( receiver, event );`
`89`	`90`	`}`
	`91`	`+ catch ( QgsException & e )`
	`92`	`+ {`
	`93`	`+ QMessageBox::critical( activeWindow(), tr( "Exception" ), e.what() );`
	`94`	`+ }`
`90`	`95`	`catch ( std::exception & e )`
`91`	`96`	`{`
`92`	`97`	`QMessageBox::critical( activeWindow(), tr( "Exception" ), e.what() );`
`93`	`98`	`}`
	`99`	`+ catch ( ... )`
	`100`	`+ {`
	`101`	`+ QMessageBox::critical( activeWindow(), tr( "Exception" ), "unknown exception" );`
	`102`	`+ }`
`94`	`103`	`return done;`
`95`	`104`	`}`
`96`	`105`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`class CORE_EXPORT QgsCsException : public QgsException`
`26`	`26`	`{`
`27`	`27`	`public:`
`28`		`- QgsCsException( std::string const &what ) : QgsException( what ) {};`
`29`	`28`	`QgsCsException( QString const &what ) : QgsException( what ) {};`
`30`	`29`
`31`	`30`	`};`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include "qgsrendercontext.h"`
`20`	`20`	`#include <limits>`
`21`	`21`	`#include <QPainter>`
	`22`	`+#include <QDomNode>`
`22`	`23`
`23`	`24`	`QgsBarDiagramFactory::QgsBarDiagramFactory(): QgsWKNDiagramFactory(), mBarWidth( 5 )`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@`
`32`	`32`	`#include "qgssymbologyutils.h"`
`33`	`33`	`#include "qgsvectordataprovider.h"`
`34`	`34`	`#include "qgslogger.h"`
	`35`	`+`
`35`	`36`	`#include <QPainter>`
	`37`	`+#include <QDomNode>`
`36`	`38`
`37`	`39`	`QgsDiagramOverlay::QgsDiagramOverlay( QgsVectorLayer* vl ): QgsVectorOverlay( vl ), mDiagramRenderer( 0 )`
`38`	`40`	`{`