Fix a number of threading data races

Add proper thread termination handler
This partially resolves Bug 1508

1 files changed, 15 insertions, 21 deletions

diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h
index 0efc386..c38f403 100644
--- a/src/kernel/qstyle.h
+++ b/src/kernel/qstyle.h
@@ -59,30 +59,24 @@ class QTab;
 class QListViewItem;
 class QCheckListItem;
 
-class QStyleOption {
+class Q_EXPORT QStyleOption {
 public:
     enum StyleOptionDefault { Default };
 
-    QStyleOption(StyleOptionDefault=Default) : def(TRUE), tb(NULL), cli(NULL), tbh(NULL) {}
-
-    // Note: we don't use default arguments since that is unnecessary
-    // initialization.
-    QStyleOption(int in1) :
-	def(FALSE), tb(NULL), i1(in1), cli(NULL), tbh(NULL) {}
-    QStyleOption(int in1, int in2) :
-	def(FALSE), tb(NULL), i1(in1), i2(in2), cli(NULL), tbh(NULL) {}
-    QStyleOption(int in1, int in2, int in3, int in4) :
-	def(FALSE), tb(NULL), i1(in1), i2(in2), i3(in3), i4(in4), cli(NULL), tbh(NULL) {}
-    QStyleOption(QMenuItem* m) : def(FALSE), mi(m), tb(NULL), cli(NULL), tbh(NULL) {}
-    QStyleOption(QMenuItem* m, int in1) : def(FALSE), mi(m), tb(NULL), i1(in1), cli(NULL), tbh(NULL) {}
-    QStyleOption(QMenuItem* m, int in1, int in2) : def(FALSE), mi(m), tb(NULL), i1(in1), i2(in2), cli(NULL), tbh(NULL) {}
-    QStyleOption(const QColor& c) : def(FALSE), tb(NULL), cl(&c), cli(NULL), tbh(NULL) {}
-    QStyleOption(QTab* t) : def(FALSE), tb(t), cli(NULL), tbh(NULL) {}
-    QStyleOption(QListViewItem* i) : def(FALSE), tb(NULL), li(i), cli(NULL), tbh(NULL) {}
-    QStyleOption(QCheckListItem* i) : def(FALSE), tb(NULL), cli(i), tbh(NULL) {}
-    QStyleOption(Qt::ArrowType a) : def(FALSE), tb(NULL), i1((int)a), cli(NULL), tbh(NULL) {}
-    QStyleOption(const QRect& r) : def(FALSE), tb(NULL), i1(r.x()), i2(r.y()), i3(r.width()), i4(r.height()), cli(NULL), tbh(NULL) {}
-    QStyleOption(QWidget *w) : def(FALSE), tb(NULL), cli(NULL), p1((void*)w), tbh(NULL) {}
+    QStyleOption(StyleOptionDefault=Default);
+    QStyleOption(int in1);
+    QStyleOption(int in1, int in2);
+    QStyleOption(int in1, int in2, int in3, int in4);
+    QStyleOption(QMenuItem* m);
+    QStyleOption(QMenuItem* m, int in1);
+    QStyleOption(QMenuItem* m, int in1, int in2);
+    QStyleOption(const QColor& c);
+    QStyleOption(QTab* t);
+    QStyleOption(QListViewItem* i);
+    QStyleOption(QCheckListItem* i);
+    QStyleOption(Qt::ArrowType a);
+    QStyleOption(const QRect& r);
+    QStyleOption(QWidget *w);
 
     bool isDefault() const { return def; }