Restore Files:

	-QWSDecoration scaling fixes by mickeyl
	-Readd macros for DEPRECATED and VISIBILITY
	-Move out showWidget and execDialog to widget_sowing.cpp
	-QPE_EXPORT_SYMBOL for Q_EXPORT_INTERFACE
	-Deprecated for FileSelector, QPEMenubar and Toolbar

10 files changed, 177 insertions, 97 deletions

diff --git a/library/fileselector.h b/library/fileselector.h
index e3ae891..f1738db 100644
--- a/library/fileselector.h
+++ b/library/fileselector.h
@@ -22,12 +22,13 @@
 
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qtoolbutton.h>
 #include <qlistview.h>
 
+#include "qpeglobal.h"
 #include "filemanager.h"
 #include "applnk.h"
 
 class QPopupMenu;
 class QPushButton;
 class FileSelectorView;
@@ -50,13 +51,13 @@ class FileSelector : public QVBox
     Q_OBJECT
 
 public:
     FileSelector( const QString &mimefilter, QWidget *parent, const char *name=0, bool newVisible = TRUE, bool closeVisible = TRUE );
     ~FileSelector();
     void setNewVisible( bool b );
-    void setCloseVisible( bool b );
+    void setCloseVisible( bool b ) QPE_DEPRECATED;
     void setTypeComboVisible( bool b = TRUE );
     void setCategorySelectVisible( bool b = TRUE );
     void reread();
     int fileCount();
     DocLnk selectedDocument() const
     {
@@ -102,13 +103,13 @@ private slots:
 private:
     void updateView();
     void updateWhatsThis();
 
 private:
     // RESOLVE please -zecke@handhelds.org
-    const DocLnk *selected(); // use selectedDocument()  luckily no compiler is putting the access into the symbol name
+    const DocLnk *selected() QPE_DEPRECATED; // use selectedDocument()  luckily no compiler is putting the access into the symbol name
     FileSelectorView *view;
     QString filter;
     QToolButton *buttonNew, *buttonClose;
     FileSelectorPrivate *d;
 };
 
diff --git a/library/library.pro b/library/library.pro
index cdc1dab..45e69bc 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -114,13 +114,14 @@ SOURCES	=   calendar.cpp \
         ir.cpp \
         backend/vcc_yacc.cpp \
         backend/vobject.cpp \
         findwidget_p.cpp \
         finddialog.cpp \
         lnkproperties.cpp \
-        qt_override.cpp
+        qt_override.cpp   \
+        widget_showing.cpp
 
 
 
 # Qt 3 compatibility
 HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
diff --git a/library/qcom.h b/library/qcom.h
index 9972d8f..5703800 100644
--- a/library/qcom.h
+++ b/library/qcom.h
@@ -23,12 +23,13 @@
  
 #include <qstringlist.h>
 
 #ifndef QT_NO_COMPONENT
 
 #include <qpe/quuid.h>
+#include <qpe/qpeglobal.h>
 
 #define QRESULT         unsigned long
 #define QS_OK           (QRESULT)0x00000000
 #define QS_FALSE        (QRESULT)0x00000001
 
 #define QE_NOTIMPL      (QRESULT)0x80000001
@@ -148,13 +149,13 @@ struct Q_EXPORT QtULong
     unsigned long operator--( int ) { return ref--; }
 
     unsigned long ref;
 };
 
 #define Q_EXPORT_INTERFACE() \
-        extern "C" QUnknownInterface* ucm_instantiate()
+        extern "C" QUnknownInterface* ucm_instantiate  QPE_EXPORT_SYMBOL ()
 
 #define Q_REFCOUNT \
 private:          \
     QtULong qtrefcount;   \
 public:          \
     ulong addRef() {return qtrefcount++;} \
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 4adfc8f..43a9be5 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -195,61 +195,61 @@ public:
 #endif
 
            delete r;
            }
     }
 
-    static void show_mx(QWidget* mw, bool nomaximize, QString &strName)
-    {
-            if ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") )
-            {
-                ( (  QMainWindow* ) mw )->setUsesBigPixmaps( useBigPixmaps );
-            }
+    static void show_mx(QWidget* mw, bool nomaximize, QString &strName) {
+        if ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") )
+        {
+            ( (  QMainWindow* ) mw )->setUsesBigPixmaps( useBigPixmaps );
+        }
         QPoint p;
         QSize s;
         bool max;
-    if ( mw->isVisible() ) {
-        if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
-            mw->resize(s);
-            mw->move(p);
-        }
-        mw->raise();
-    } else {
 
-        if ( mw->layout() && mw->inherits("QDialog") ) {
-        if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
-            mw->resize(s);
-            mw->move(p);
+        if ( mw->isVisible() ) {
+            if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
+                mw->resize(s);
+                mw->move(p);
+            }
+            mw->raise();
+        } else {
 
-            if ( max && !nomaximize ) {
-            mw->showMaximized();
-            } else {
-            mw->show();
+            if ( mw->layout() && mw->inherits("QDialog") ) {
+                if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
+                    mw->resize(s);
+                    mw->move(p);
+
+                    if ( max && !nomaximize ) {
+                        mw->showMaximized();
+                    } else {
+                        mw->show();
+                    }
+                } else {
+                    QPEApplication::showDialog((QDialog*)mw,nomaximize);
                 }
-        } else {
-            QPEApplication::showDialog((QDialog*)mw,nomaximize);
-        }
-        } else {
-        if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
-            mw->resize(s);
-            mw->move(p);
-        } else {    //no stored rectangle, make an estimation
-            int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2;
-            int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2;
-            mw->move( QMAX(x,0), QMAX(y,0) );
+            } else {
+                if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
+                    mw->resize(s);
+                    mw->move(p);
+                } else {    //no stored rectangle, make an estimation
+                    int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2;
+                    int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2;
+                    mw->move( QMAX(x,0), QMAX(y,0) );
 #ifdef Q_WS_QWS
-            if ( !nomaximize )
-            mw->showMaximized();
+                    if ( !nomaximize )
+                        mw->showMaximized();
 #endif
+                }
+                if ( max && !nomaximize )
+                    mw->showMaximized();
+                else
+                    mw->show();
+            }
         }
-        if ( max && !nomaximize )
-            mw->showMaximized();
-        else
-            mw->show();
-        }
-    }
     }
 
     static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
     {
     maximized = TRUE;
     // 350 is the trigger in qwsdefaultdecoration for providing a resize button
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 579fc44..00d3d31 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -28,12 +28,13 @@
 #include <qwsdisplay_qws.h>
 #if defined(_WS_QWS_) && !defined(Q_WS_QWS)
 #define Q_WS_QWS
 #endif
 #include "qpedecoration_qws.h"
 #include "timestring.h"
+#include "qpeglobal.h"
 
 class QCopChannel;
 class QPEApplicationData;
 class QWSEvent;
 class QWSKeyEvent;
 
@@ -117,15 +118,16 @@ public:
 
     static void setInputMethodHint( QWidget *, InputMethodHint );
     static InputMethodHint inputMethodHint( QWidget * );
 
     void showMainWidget( QWidget*, bool nomax=FALSE );
     void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
-    static void showDialog( QDialog*, bool nomax=FALSE );
-    static int execDialog( QDialog*, bool nomax=FALSE );
-    static void showWidget( QWidget*, bool nomax=FALSE );
+
+    static void showDialog( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
+    static int execDialog ( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
+    static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
     /* Merge setTempScreenSaverMode */
 #ifdef QTOPIA_INTERNAL_INITAPP
     void initApp( int argv, char **argv );
 #endif
 
     static void setKeepRunning();
@@ -180,56 +182,13 @@ private:
     QPEApplicationData *d;
 
     bool reserved_sh;
 
 };
 
-inline void QPEApplication::showDialog( QDialog* d, bool nomax )
-{
-    showWidget( d, nomax );
-}
 
-inline int QPEApplication::execDialog( QDialog* d, bool nomax )
-{
-    showDialog( d, nomax );
-    return d->exec();
-}
-
-#ifdef Q_WS_QWS
-extern Q_EXPORT QRect qt_maxWindowRect;
-#endif
-
-inline void QPEApplication::showWidget( QWidget* wg, bool nomax )
-{
-    if ( wg->isVisible() )
-        wg->show();
-    else
-    {
-        if ( !nomax
-                && ( qApp->desktop()->width() <= 320 ) )
-        {
-            wg->showMaximized();
-        } else {
-            #ifdef Q_WS_QWS
-                QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() );
-            #else
-                QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() );
-            #endif
-
-            QSize sh = wg->sizeHint();
-            int w = QMAX( sh.width(), wg->width() );
-            int h = QMAX( sh.height(), wg->height() );
-            //              desktop                              widget-frame                      taskbar
-            w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) );
-            h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) );
-
-            wg->resize( w, h );
-            wg->show();
-        }
-    }
-}
 
 enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
 
 inline int TransToDeg ( Transformation t )
 {
     int d = static_cast<int>( t );
@@ -259,7 +218,14 @@ inline void QPEApplication::setCurrentRotation( int r )
 #else
     setDefaultRotation( r );
 #endif
 }
 
 
+/*
+ * -remove me
+ */ 
+#ifdef Q_WS_QWS
+extern Q_EXPORT QRect qt_maxWindowRect;
+#endif
+
 #endif
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index 8b02de6..fa38180 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -107,13 +107,14 @@ public:
                   && !inherits("QWizard") );
     }
 };
 
 static QImage scaleButton( const QImage &img, int height )
 {
-    if ( img.height() != 0 && img.height() != height ) {
+    //ML: We don't want to scale if the difference is less than 4 pixels to prevent blurring
+    if ( img.height() != 0 && ::abs( img.height()-height ) > 4 ) {
         return img.smoothScale( img.width()*height/img.height(), height );
     } else {
         return img;
     }
 }
 
diff --git a/library/qpeglobal.h b/library/qpeglobal.h
index 96ce3a6..a84e435 100644
--- a/library/qpeglobal.h
+++ b/library/qpeglobal.h
@@ -1,9 +1,13 @@
 /*
-               =.            This file is part of the OPIE Project
-             .=l.            Copyright (c)  2002,2003,2004 Holger Hans Peter Freyther <freyther@handhelds.org>
+                             This file is part of the OPIE Project
+                             Copyright (c)  2002,2003,2004 Holger Hans Peter Freyther <freyther@handhelds.org>
+                             Copyright (c)  2002,2003,2004 Stefan Eilers <eilers@handhelds.org>
+
+               =.
+             .=l.
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can 
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
@@ -23,33 +27,62 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#ifndef QPE_GLOBAL_H
-#define QPE_GLOBAL_H
+#ifndef QPE_GLOBAL_DEFINES_H
+#define QPE_GLOBAL_DEFINES_H
 
 /**
  * Defines for used compiler attributes
  *
  */
+
+/*
+ * commons
+ */
+#define QPE_DEPRECATED
+
+
 #if defined(Q_OS_MACX)
 #define QPE_WEAK_SYMBOL __attribute__((weak_import))
 #define QPE_SYMBOL_USED
 #define QPE_SYMBOL_UNUSED
+#define QPE_EXPORT_SYMBOL
 
 #elif defined(_OS_UNIX_)
 #define QPE_WEAK_SYMBOL  __attribute__((weak))
 #define QPE_SYMBOL_USED __attribute__((used))
 #define QPE_SYMBOL_UNUSED __attribute__((unused))
+#define QPE_EXPORT_SYMBOL
+
+
+/*
+ * mark method as deprecated
+ */
+#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2)
+  /* gcc >= 3.2 */
+#undef  QPE_DEPRECATED
+#define QPE_DEPRECATED __attribute__((deprecated))
+#endif
+
+/*
+ * Defined if Compiler supports attributes
+ */
+#ifdef GCC_SUPPORTS_VISIBILITY
+#undef QPE_EXPORT_SYMBOL
+#define QPE_EXPORT_SYMBOL __attribute__((visibility("default")))
+#endif
+
 
 
 #else // defined(Q_OS_WIN32)
 #define QPE_WEAK_SYMBOL
 #define QPE_SYMBOL_USED
 #define QPE_SYMBOL_UNUSED
+#define QPE_EXPORT_SYMBOL
 #endif
 
 
 
 #endif
diff --git a/library/qpemenubar.h b/library/qpemenubar.h
index 66d0c85..64bf39c 100644
--- a/library/qpemenubar.h
+++ b/library/qpemenubar.h
@@ -22,12 +22,14 @@
 #define QPEMENUBAR_H
 
 #include <qmenubar.h>
 #include <qguardedptr.h>
 #include <qvaluelist.h>
 
+#include <qtopia/qpeglobal.h>
+
 class QPEMenuToolFocusManager : public QObject
 {
     Q_OBJECT
 public:
     QPEMenuToolFocusManager();
 
@@ -56,13 +58,13 @@ private:
     
 private: // Sharp ROM compatibility
         void setMenukeyEnabled ( bool b );
 };
 
 
-class QPEMenuBar : public QMenuBar
+class QPE_DEPRECATED QPEMenuBar : public QMenuBar
 {
     Q_OBJECT
 public:
     QPEMenuBar( QWidget *parent=0, const char* name=0 );
     ~QPEMenuBar();
 
diff --git a/library/qpetoolbar.h b/library/qpetoolbar.h
index 53d21c0..c894ec9 100644
--- a/library/qpetoolbar.h
+++ b/library/qpetoolbar.h
@@ -19,16 +19,17 @@
 **********************************************************************/
 
 #ifndef QPETOOLBAR_H
 #define QPETOOLBAR_H
 
 #include <qtoolbar.h>
+#include <qtopia/qpeglobal.h>
 
 class QMainWindow;
 
-class QPEToolBar : public QToolBar
+class QPE_DEPRECATED QPEToolBar : public QToolBar
 {
     Q_OBJECT
 public:
     QPEToolBar( QMainWindow *parent = 0, const char *name = 0 );
 
 protected:
diff --git a/library/widget_showing.cpp b/library/widget_showing.cpp
new file mode 100644
index 0000000..43ece64
--- a/dev/null
+++ b/library/widget_showing.cpp
@@ -0,0 +1,74 @@
+/*
+                             This file is part of the OPIE Project
+                             Copyright (c) 2004 Andreas Richter <ar@handhelds.org>
+                             Copyright (c) 2004 Holger Hans Peter Freyther <freyther@handhelds.org>
+               =.
+             .=l.
+           .>+-=
+ _;:,     .>    :=|.         This library is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This library is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
+#include <qtopia/qpeapplication.h>
+
+#ifdef Q_WS_QWS
+extern Q_EXPORT QRect qt_maxWindowRect;
+#endif
+
+void QPEApplication::showDialog( QDialog* d, bool nomax )
+{
+    showWidget( d, nomax );
+}
+
+int QPEApplication::execDialog( QDialog* d, bool nomax )
+{
+    showDialog( d, nomax );
+    return d->exec();
+}
+
+void QPEApplication::showWidget( QWidget* wg, bool nomax ) {
+    if ( wg->isVisible() ) {
+        wg->show();
+        return;
+    }
+
+    if ( !nomax
+         && ( qApp->desktop()->width() <= 320 ) ){
+        wg->showMaximized();
+    } else {
+#ifdef Q_WS_QWS
+        QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() );
+#else
+        QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() );
+#endif
+
+        QSize sh = wg->sizeHint();
+        int w = QMAX( sh.width(), wg->width() );
+        int h = QMAX( sh.height(), wg->height() );
+//              desktop                              widget-frame                      taskbar
+        w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) );
+        h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) );
+        wg->resize( w, h );
+        wg->show();
+    }
+}