Doc fixes.

[bertos.git] / emul / emulkbd.cpp

diff --git a/emul/emulkbd.cpp b/emul/emulkbd.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 1dfdd9d..19c6d88
--- a/emul/emulkbd.cpp
+++ b/emul/emulkbd.cpp
@@ -1,9 +1,34 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2001 Bernardo Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -16,24 +41,14 @@
 #include "emulkbd.h"
 #include "emul.h"
 
-#if _QT < 4
-       #include <qpainter.h>
-       #include <qpixmap.h>
-       #include <qsizepolicy.h>
-       #include <qsize.h>
-       #include <qrect.h>
-       #include <qlayout.h>
-       #include <qobjectlist.h>
-#else
-       #include <QtGui/QPainter>
-       #include <QtGui/QPixmap>
-       #include <QtGui/QSizePolicy>
-       #include <QtGui/QLayout>
-       #include <QtGui/QKeyEvent>
-       #include <QtCore/QEvent>
-       #include <QtCore/QSize>
-       #include <QtCore/QRect>
-#endif
+#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) :
@@ -57,8 +72,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)
@@ -87,9 +101,9 @@ void EmulKey::keyReleased(void)
 }
 
 
-EmulKbd::EmulKbd(QWidget *parent, const char *name, Qt::WFlags f) :
-       QFrame(parent, name, Qt::WRepaintNoErase | Qt::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);
@@ -107,7 +121,7 @@ EmulKbd::~EmulKbd()
 
 QSizePolicy EmulKbd::sizePolicy() const
 {
-       return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed, false);
+       return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 }
 
 
@@ -191,6 +205,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());