-rw-r--r-- | library/config.cpp | 12 | ||||
-rw-r--r-- | library/config.h | 5 | ||||
-rw-r--r-- | library/datebookmonth.cpp | 12 | ||||
-rw-r--r-- | library/datebookmonth.h | 15 | ||||
-rw-r--r-- | library/qpemenubar.cpp | 9 | ||||
-rw-r--r-- | library/qpemenubar.h | 7 |
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 @@ -99,12 +99,24 @@ Config::Config( const QString &name, Domain domain ) 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 ) diff --git a/library/config.h b/library/config.h index 1dc32fa..0bab7ca 100644 --- a/library/config.h +++ b/library/config.h @@ -32,13 +32,13 @@ 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; @@ -81,12 +81,15 @@ protected: 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); } diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp index 4a9dcbd..e8be313 100644 --- a/library/datebookmonth.cpp +++ b/library/datebookmonth.cpp @@ -745,6 +745,18 @@ void DateButton::setDateFormat( DateFormat f ) 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 @@ -25,12 +25,13 @@ #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; @@ -206,8 +207,22 @@ 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 @@ -41,12 +41,21 @@ public: } } } }; +// Sharp ROM compatibility +void QPEMenuToolFocusManager::setMenukeyEnabled ( bool ) +{ +} +int QPEMenuBar::getOldFocus ( ) +{ + return 0; +} + QPEMenuToolFocusManager *QPEMenuToolFocusManager::me = 0; QPEMenuToolFocusManager::QPEMenuToolFocusManager() : QObject() { qApp->installEventFilter( this ); } diff --git a/library/qpemenubar.h b/library/qpemenubar.h index 05abc4e..66d0c85 100644 --- a/library/qpemenubar.h +++ b/library/qpemenubar.h @@ -50,12 +50,15 @@ private slots: 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 @@ -69,10 +72,14 @@ protected: /* 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 |