Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

3 files changed, 12 insertions, 10 deletions

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
index 8c5877b..6df0c0a 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
@@ -53,7 +53,7 @@ class QDirectFBPaintEnginePrivate;
 
 class QDirectFBPaintEngine : public QRasterPaintEngine
 {
-    Q_DECLARE_PRIVATE(QDirectFBPaintEngine)
+    Q_DECLARE_SCOPED_PRIVATE(QDirectFBPaintEngine)
 public:
     QDirectFBPaintEngine(QPaintDevice *device);
     ~QDirectFBPaintEngine();
diff --git a/src/plugins/imageformats/mng/qmnghandler.h b/src/plugins/imageformats/mng/qmnghandler.h
index b9e37bf..aa6efd3 100644
--- a/src/plugins/imageformats/mng/qmnghandler.h
+++ b/src/plugins/imageformats/mng/qmnghandler.h
@@ -74,7 +74,7 @@ class QMngHandler : public QImageIOHandler
     virtual bool supportsOption(ImageOption option) const;
 
     private:
-    Q_DECLARE_PRIVATE(QMngHandler)
+    Q_DECLARE_SCOPED_PRIVATE(QMngHandler)
     QScopedPointer<QMngHandlerPrivate> d_ptr;
 };
 
diff --git a/src/plugins/s60/src/qdesktopservices_3_2.cpp b/src/plugins/s60/src/qdesktopservices_3_2.cpp
index cbdc810..f08799b 100644
--- a/src/plugins/s60/src/qdesktopservices_3_2.cpp
+++ b/src/plugins/s60/src/qdesktopservices_3_2.cpp
@@ -52,14 +52,16 @@ EXPORT_C QString localizedDirectoryName(QString& rawPath)
     QString ret;
 
     TRAPD(err,
-        CDirectoryLocalizer* localizer = CDirectoryLocalizer::NewL();
-        CleanupStack::PushL(localizer);
-        localizer->SetFullPath(qt_QString2TPtrC(QDir::toNativeSeparators(rawPath)));
-        if(localizer->IsLocalized()){
-            TPtrC locName(localizer->LocalizedName());
-            ret = qt_TDesC2QStringL(locName);
-        }
-        CleanupStack::PopAndDestroy(localizer);
+        QT_TRYCATCH_LEAVING(
+            CDirectoryLocalizer* localizer = CDirectoryLocalizer::NewL();
+            CleanupStack::PushL(localizer);
+            localizer->SetFullPath(qt_QString2TPtrC(QDir::toNativeSeparators(rawPath)));
+            if(localizer->IsLocalized()){
+                TPtrC locName(localizer->LocalizedName());
+                ret = qt_TDesC2QString(locName);
+            }
+            CleanupStack::PopAndDestroy(localizer);
+        )
     )
 
     if (err != KErrNone)