Qtopia1-6 merge

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

1 files changed, 7 insertions, 2 deletions

diff --git a/library/qpemenubar.h b/library/qpemenubar.h
index 5bfbe83..05abc4e 100644
--- a/library/qpemenubar.h
+++ b/library/qpemenubar.h
@@ -1,73 +1,78 @@
 /**********************************************************************
-** Copyright (C) 2001 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QPEMENUBAR_H
 #define QPEMENUBAR_H
 
 #include <qmenubar.h>
 #include <qguardedptr.h>
 #include <qvaluelist.h>
 
 class QPEMenuToolFocusManager : public QObject
 {
     Q_OBJECT
 public:
     QPEMenuToolFocusManager();
 
     void addWidget( QWidget *w );
     void removeWidget( QWidget *w );
     void setActive( bool a );
     bool isActive() const;
     void moveFocus( bool next );
 
     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;
 };
 
 
 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();
 };
 
 #endif