Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 14 insertions, 4 deletions

diff --git a/library/qpedecoration_qws.h b/library/qpedecoration_qws.h
index b8afd05..691c6f6 100644
--- a/library/qpedecoration_qws.h
+++ b/library/qpedecoration_qws.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -23,2 +23,3 @@
 
+#ifdef QWS
 #include <qwsdefaultdecoration_qws.h>
@@ -27,2 +28,3 @@
 #include <qguardedptr.h>
+#include "windowdecorationinterface.h"
 
@@ -38,2 +40,3 @@ public:
     QPEDecoration();
+    QPEDecoration( const QString &plugin );
     virtual ~QPEDecoration();
@@ -52,4 +55,2 @@ public:
 protected:
-    void fillTitle( QPainter *p, const QWidget *w, int x, int y, int w, int h );
-//    virtual int getTitleWidth(const QWidget *);
     virtual int getTitleHeight(const QWidget *);
@@ -61,2 +62,5 @@ protected:
 
+private:
+    void windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const;
+
 protected:
@@ -79,2 +83,4 @@ public:
     void updateActive();
+    const QWidget *activeWidget() const { return (const QWidget *)active; }
+    const QWidget *whatsThisWidget() const { return (const QWidget *)whatsThis; }
 
@@ -84,2 +90,3 @@ protected:
     void drawButton( QWidget *w, QPEDecoration::QPERegion r, int state );
+    void drawTitle( QWidget *w );
 
@@ -94,2 +101,4 @@ protected:
     QTimer *wtTimer;
+    bool inWhatsThis;
+    QGuardedPtr<QWidget> whatsThis;
 };
@@ -101 +110,2 @@ protected:
 #endif // QPE_DECORATION_QWS_H__
+#endif // QWS