Sharp ROM compatibilty upgrade:

All these functions are needed to get qtmail (from the Sharp ROM) running
on Opie - I have even tested qtmail on an iPAQ and it seems to work ..

6 files changed, 59 insertions, 1 deletions

diff --git a/library/config.cpp b/library/config.cpp
index 1121cd4..b47c620 100644
--- a/library/config.cpp
+++ b/library/config.cpp
@@ -89,32 +89,44 @@ QString Config::configFilename(const QString& name, Domain d)
   the configuration is user-specific. \a name should not contain "/" in
   this case, and in general should be the name of the C++ class that is
   primarily responsible for maintaining the configuration.
 
   In the File Domain, \a name is an absolute filename.
 */
 Config::Config( const QString &name, Domain domain )
     : filename( configFilename(name,domain) )
 {
     git = groups.end();
     read();
     QStringList l = Global::languageList();
     lang = l[0];
     glang = l[1];
 }
 
+
+// Sharp ROM compatibility
+Config::Config ( const QString &name, bool what )
+        : filename( configFilename(name,what ? User : File) )
+{
+    git = groups.end();
+    read();
+    QStringList l = Global::languageList();
+    lang = l[0];
+    glang = l[1];
+}
+
 /*!
   Writes any changes to disk and destroys the in-memory object.
 */
 Config::~Config()
 {
     if ( changed )
         write();
 }
 
 /*!
   Returns whether the current group has an entry called \a key.
 */
 bool Config::hasKey( const QString &key ) const
 {
     if ( groups.end() == git )
         return FALSE;
diff --git a/library/config.h b/library/config.h
index 1dc32fa..0bab7ca 100644
--- a/library/config.h
+++ b/library/config.h
@@ -22,33 +22,33 @@
 #define CONFIG_H
 
 // ##### could use QSettings with Qt 3.0
 
 #include <qmap.h>
 #include <qstringlist.h>
 
 class ConfigPrivate;
 class Config
 {
 public:
     typedef QMap< QString, QString > ConfigGroup;
     
     enum Domain { File, User };
     Config( const QString &name, Domain domain=User );
     ~Config();
-
+    
     bool operator == ( const Config & other ) const { return (filename == other.filename); }
     bool operator != ( const Config & other ) const { return (filename != other.filename); }
     
     bool isValid() const;
     bool hasKey( const QString &key ) const;
     
     void setGroup( const QString &gname );
     void writeEntry( const QString &key, const char* value );
     void writeEntry( const QString &key, const QString &value );
     void writeEntryCrypt( const QString &key, const QString &value );
     void writeEntry( const QString &key, int num );
 #ifdef Q_HAS_BOOL_TYPE
     void writeEntry( const QString &key, bool b );
 #endif
     void writeEntry( const QString &key, const QStringList &lst, const QChar &sep );
     void removeEntry( const QString &key );
@@ -71,32 +71,35 @@ public:
     void clearGroup();
     
     void write( const QString &fn = QString::null );
     
 protected:
     void read();
     bool parse( const QString &line );
     
     QMap< QString, ConfigGroup > groups;
     QMap< QString, ConfigGroup >::Iterator git;
     QString filename;
     QString lang;
     QString glang;
     bool changed;
     ConfigPrivate *d;
     static QString configFilename(const QString& name, Domain);
+
+private: // Sharp ROM compatibility
+    Config( const QString &name, bool what );
 };
 
 inline QString Config::readEntry( const QString &key, const QString &deflt ) const
 { return ((Config*)this)->readEntry(key,deflt); }
 inline QString Config::readEntryCrypt( const QString &key, const QString &deflt ) const
 { return ((Config*)this)->readEntryCrypt(key,deflt); }
 inline QString Config::readEntryDirect( const QString &key, const QString &deflt ) const
 { return ((Config*)this)->readEntryDirect(key,deflt); }
 inline int Config::readNumEntry( const QString &key, int deflt ) const
 { return ((Config*)this)->readNumEntry(key,deflt); }
 inline bool Config::readBoolEntry( const QString &key, bool deflt ) const
 { return ((Config*)this)->readBoolEntry(key,deflt); }
 inline QStringList Config::readListEntry( const QString &key, const QChar &sep ) const
 { return ((Config*)this)->readListEntry(key,sep); }
 
 #endif
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 4a9dcbd..e8be313 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -735,16 +735,28 @@ void DateButton::setDate( QDate d )
     setText( longFormat ? TimeString::longDateString( d, df ) :
              TimeString::shortDate( d, df ) );
 
 }
 
 void DateButton::setDateFormat( DateFormat f )
 {
     df = f;
     setDate( currDate );
 }
 
 bool DateButton::customWhatsThis() const
 {
     return TRUE;
 }
 
+
+// this class is only here for Sharp ROM compatibility
+// I have reverse engineered this class and it seems to
+// work (only qtmail seems to use it)   - sandman
+// DO NOT USE IT IN NEW CODE !!
+
+DateBookMonthPopup::DateBookMonthPopup ( QWidget *w )
+        : QPopupMenu ( w )
+{
+        m_dbm = new DateBookMonth( this, 0, TRUE );
+        insertItem( m_dbm );
+}
diff --git a/library/datebookmonth.h b/library/datebookmonth.h
index 3c57c19..cb436a8 100644
--- a/library/datebookmonth.h
+++ b/library/datebookmonth.h
@@ -15,32 +15,33 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef DATEBOOKMONTH
 #define DATEBOOKMONTH
 
 #include <qtopia/private/event.h>
 
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qdatetime.h>
 #include <qvaluelist.h>
 #include <qtable.h>
 #include <qpushbutton.h>
+#include <qpopupmenu.h>
 
 #include "calendar.h"
 #include "timestring.h"
 
 class QToolButton;
 class QComboBox;
 class QSpinBox;
 class Event;
 class DateBookDB;
 
 class DateBookMonthHeaderPrivate;
 class DateBookMonthHeader : public QHBox
 {
     Q_OBJECT
 
 public:
@@ -196,18 +197,32 @@ public slots:
     void setDate( int y, int m, int d );
     void setDate( QDate );
     void setWeekStartsMonday( int );
     void setDateFormat( DateFormat );
 
 private slots:
     void pickDate();
     void gotHide();
 
 private:
     bool longFormat;
     bool weekStartsMonday;
     QDate currDate;
     DateFormat df;
 };
 
+// this class is only here for Sharp ROM compatibility
+// I have reverse engineered this class and it seems to
+// work (only qtmail seems to use it)   - sandman
+// DO NOT USE IT IN NEW CODE !!
+
+class DateBookMonthPopup : public QPopupMenu 
+{
+        Q_OBJECT
+public:
+        DateBookMonthPopup ( QWidget *w );
+
+private:
+        DateBookMonth *m_dbm;
+};
 
 #endif
diff --git a/library/qpemenubar.cpp b/library/qpemenubar.cpp
index c658d10..4aa0bf3 100644
--- a/library/qpemenubar.cpp
+++ b/library/qpemenubar.cpp
@@ -31,32 +31,41 @@ class QMenuBarHack : public QMenuBar
 public:
     int activeItem() const { return actItem; }
 
     void goodbye()
     {
         activateItemAt(-1);
         for ( unsigned int i = 0; i < count(); i++ ) {
             QMenuItem *mi = findItem( idAt(i) );
             if ( mi->popup() ) {
                 mi->popup()->hide();
             }
         }
     }
 };
 
 
+// Sharp ROM compatibility
+void QPEMenuToolFocusManager::setMenukeyEnabled ( bool )
+{
+}
+int QPEMenuBar::getOldFocus ( )
+{
+        return 0;
+}
+
 QPEMenuToolFocusManager *QPEMenuToolFocusManager::me = 0;
 
 QPEMenuToolFocusManager::QPEMenuToolFocusManager() : QObject()
 {
     qApp->installEventFilter( this );
 }
 
 void QPEMenuToolFocusManager::addWidget( QWidget *w )
 {
     list.append( GuardedWidget(w) );
 }
 
 void QPEMenuToolFocusManager::removeWidget( QWidget *w )
 {
     list.remove( GuardedWidget(w) );
 }
diff --git a/library/qpemenubar.h b/library/qpemenubar.h
index 05abc4e..66d0c85 100644
--- a/library/qpemenubar.h
+++ b/library/qpemenubar.h
@@ -40,39 +40,46 @@ public:
     static QPEMenuToolFocusManager *manager();
     static void initialize();
 
 protected:
     void setFocus( QWidget *w, bool next=TRUE );
     bool eventFilter( QObject *object, QEvent *event );
 
 private slots:
     void deactivate();
 
 private:
     typedef QGuardedPtr<QWidget> GuardedWidget;
     QValueList<GuardedWidget> list;
     GuardedWidget inFocus;
     GuardedWidget oldFocus;
     static QPEMenuToolFocusManager *me;
+    
+private: // Sharp ROM compatibility
+        void setMenukeyEnabled ( bool b );
 };
 
 
 class QPEMenuBar : public QMenuBar
 {
     Q_OBJECT
 public:
     QPEMenuBar( QWidget *parent=0, const char* name=0 );
     ~QPEMenuBar();
 
 protected:
     virtual void keyPressEvent( QKeyEvent *e );
 
     /* Patch from Mickey
      * Sharp Qtopia1.5 seems to have these functions
      * TO BE RESOLVED  - zecke
      */
     void activateItem( int index );
     void goodbye();
+    
+    // This is a special "lineo" add-on for the Sharp ROM
+    // nobody knows, what it does, though ...
+        int getOldFocus ( );
 };
 
 #endif