Fix bug in randpool_getN.

[bertos.git] / emul / emulkbd.cpp

diff --git a/emul/emulkbd.cpp b/emul/emulkbd.cpp
index 2c6c3f8ce6665536296b3651ed2699c8b9d916a6..fad4ee6ec3c2cdcd201643d77bafb47acb1d4769 100755 (executable)
--- a/emul/emulkbd.cpp
+++ b/emul/emulkbd.cpp
@@ -16,13 +16,14 @@
 #include "emulkbd.h"
 #include "emul.h"
 
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qsizepolicy.h>
-#include <qsize.h>
-#include <qrect.h>
-#include <qlayout.h>
-#include <qobjectlist.h>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QSizePolicy>
+#include <QtGui/QLayout>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QEvent>
+#include <QtCore/QSize>
+#include <QtCore/QRect>
 
 
 EmulKey::EmulKey(EmulKbd *kbd, const char *label, int _keycode, int _row, int _col) :
@@ -31,7 +32,7 @@ EmulKey::EmulKey(EmulKbd *kbd, const char *label, int _keycode, int _row, int _c
        keycode(_keycode)
 {
        // don't let the widget get focus
-       setFocusPolicy(QWidget::NoFocus);
+       setFocusPolicy(Qt::NoFocus);
 
        // unused
        connect(this, SIGNAL(pressed()), this, SLOT(keyPressed()));
@@ -46,8 +47,7 @@ EmulKey::~EmulKey()
 
 
 /**
- * \reimp
- * Override standad QButton behaviour: we must also emit the signals
+ * Override standad QButton behaviour: we must also emit the signals.
  */
 // unused
 void EmulKey::setDown(bool enable)
@@ -76,14 +76,14 @@ void EmulKey::keyReleased(void)
 }
 
 
-EmulKbd::EmulKbd(QWidget *parent, const char *name, WFlags f) :
-       QFrame(parent, name, WRepaintNoErase | WResizeNoErase | f),
-       layout(new QGridLayout(this, 4, 4, 4)),
+EmulKbd::EmulKbd(QWidget *parent, Qt::WFlags f) :
+       QFrame(parent, f),
+       layout(new QGridLayout(this)),
        active_row(0)
 {
        setFrameStyle(QFrame::Box | QFrame::Sunken);
        setLineWidth(1);
-       setFocusPolicy(StrongFocus);
+       setFocusPolicy(Qt::StrongFocus);
        frame_width = frameWidth();
 }
 
@@ -96,11 +96,11 @@ EmulKbd::~EmulKbd()
 
 QSizePolicy EmulKbd::sizePolicy() const
 {
-       return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed, false);
+       return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 }
 
 
-void EmulKbd::resizeEvent(QResizeEvent * event)
+void EmulKbd::resizeEvent(QResizeEvent *event)
 {
        // Let our superclass process the event first
        QFrame::resizeEvent(event);
@@ -108,7 +108,7 @@ void EmulKbd::resizeEvent(QResizeEvent * event)
 
 
 // handle key presses for all keys in keyboard
-bool EmulKbd::event(QEvent * _e)
+bool EmulKbd::event(QEvent *_e)
 {
        switch (_e->type())
        {
@@ -123,10 +123,10 @@ bool EmulKbd::event(QEvent * _e)
                        if (!e->isAutoRepeat())
                        {
                                // scan all children
-                               for (QObjectListIt it(*children()); *it; ++it)
+                               for (QObjectList::const_iterator it(children().begin()); it != children().end(); ++it)
                                {
                                        // only keys, not other children!
-                                       if ((*it)->metaObject() == EmulKey::staticMetaObject())
+                                       if ((*it)->metaObject() == &EmulKey::staticMetaObject)
                                        // if ((key = dynamic_cast<EmulKey *>(*it)))
                                        {
                                                key = static_cast<EmulKey *>(*it);
@@ -180,6 +180,7 @@ int EmulKbd::readCols(void)
        EmulKey *key;
        int cols = 0;
 
+       // FIXME: QLayoutIterator is obsolete in Qt4
        for(QLayoutIterator it(layout->iterator()); (item = it.current()); ++it)
        {
                key = static_cast<EmulKey *>(item->widget());