uiuiui - fixed a bug which let running applications crash if switched style

from phase to any other. Reason was that in phase-style a special menubaritem-
drawroutine was set but not RESET to qte default if this style was removed
I'd implemented the unPolish routine and just set this callback to 0 (qt-default)
and now it works nice.

2 files changed, 21 insertions, 9 deletions

diff --git a/noncore/styles/phase/phasestyle.cpp b/noncore/styles/phase/phasestyle.cpp
index ba8c460..906ccee 100644
--- a/noncore/styles/phase/phasestyle.cpp
+++ b/noncore/styles/phase/phasestyle.cpp
@@ -320,2 +320,7 @@ void PhaseStyle::polish( QWidget* widget ) {
 
+void PhaseStyle::unPolish( QWidget *w )
+{
+    QWindowsStyle::unPolish( w );
+}
+
 void PhaseStyle::polish( QPalette &pal ) {
@@ -339,2 +344,7 @@ void PhaseStyle::polish( QApplication* app ) {
 
+void PhaseStyle::unPolish( QApplication* app ) {
+    QWindowsStyle::unPolish(app);
+    qt_set_draw_menu_bar_impl ( 0 );
+}
+
 void PhaseStyle::drawPushButtonLabel (QPushButton *button, QPainter *painter) {
@@ -633,4 +643,4 @@ void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable,
     if (mi->isSeparator() ) {
-	p->setPen( g.dark() );
-	p->drawLine( x+8, y+1, x+w-8, y+1 );
+    p->setPen( g.dark() );
+    p->drawLine( x+8, y+1, x+w-8, y+1 );
 
@@ -640,4 +650,4 @@ void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable,
 
-	p->setPen( g.midlight() );
-	p->drawLine( x+8, y-1, x+w-8, y-1 );
+    p->setPen( g.midlight() );
+    p->drawLine( x+8, y-1, x+w-8, y-1 );
         p->drawPoint(x+8, y );
@@ -778,5 +788,5 @@ void PhaseStyle::drawTab(QPainter* painter, const QTabBar* bar, QTab* tab,
     if ((bar->count() == 1 ))
-	edge = true;
+    edge = true;
     else
-	edge = false;
+    edge = false;
 
diff --git a/noncore/styles/phase/phasestyle.h b/noncore/styles/phase/phasestyle.h
index cbaa534..ae53efe 100644
--- a/noncore/styles/phase/phasestyle.h
+++ b/noncore/styles/phase/phasestyle.h
@@ -42,5 +42,7 @@ public:
 
-    void polish( QWidget * );
-    void polish( QPalette& );
-    void polish( QApplication* );
+    virtual void polish( QWidget * );
+    virtual void polish( QPalette& );
+    virtual void polish( QApplication* a);
+    virtual void unPolish( QWidget * );
+    virtual void unPolish(QApplication *a);