Make Qt exception safer.

Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.

Rev-By: Harald Fernengel
Rev-By: Ralf Engels

3 files changed, 4 insertions, 1 deletions

diff --git a/src/qt3support/itemviews/q3table.cpp b/src/qt3support/itemviews/q3table.cpp
index 658b0ad..458f5a5 100644
--- a/src/qt3support/itemviews/q3table.cpp
+++ b/src/qt3support/itemviews/q3table.cpp
@@ -166,6 +166,7 @@ private:
     QTimer *stretchTimer, *widgetStretchTimer;
     Q3TableHeaderPrivate *d;
 
+    Q_DISABLE_COPY(Q3TableHeader)
 };
 
 #ifdef _WS_QWS_
diff --git a/src/qt3support/other/q3accel.cpp b/src/qt3support/other/q3accel.cpp
index a570a70..2358092 100644
--- a/src/qt3support/other/q3accel.cpp
+++ b/src/qt3support/other/q3accel.cpp
@@ -206,7 +206,7 @@ bool Q_COMPAT_EXPORT qt_tryComposeUnicode(QWidget* w, QKeyEvent*  e){
 void Q3AccelManager::setFuncPtr() {
     if (qApp->d_func()->qt_compat_used)
         return;
-    QApplicationPrivate *data = static_cast<QApplicationPrivate*>(qApp->d_ptr);
+    QApplicationPrivate *data = static_cast<QApplicationPrivate*>(qApp->d_ptr.data());
     data->qt_tryAccelEvent = qt_tryAccelEvent;
     data->qt_tryComposeUnicode = qt_tryComposeUnicode;
     data->qt_dispatchAccelEvent = qt_dispatchAccelEvent;
diff --git a/src/qt3support/painting/q3painter.h b/src/qt3support/painting/q3painter.h
index 6fd17cb..c301ee7 100644
--- a/src/qt3support/painting/q3painter.h
+++ b/src/qt3support/painting/q3painter.h
@@ -82,6 +82,8 @@ public:
 
 private:
     QRect adjustedRectangle(const QRect &r);
+    
+    Q_DISABLE_COPY(Q3Painter)
 };
 
 void inline Q3Painter::drawRect(const QRect &r)