X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=emul%2Femulkbd.cpp;h=19c6d88033852b23df40a16449c351c254778ec4;hb=49d4f9b278ec7da35bbf2dcd3f5013940d1a74e3;hp=2c6c3f8ce6665536296b3651ed2699c8b9d916a6;hpb=ccdd34ae9e26f226d77859be9c44c5b2b5d516ba;p=bertos.git

diff --git a/emul/emulkbd.cpp b/emul/emulkbd.cpp
old mode 100755
new mode 100644
index 2c6c3f8c..19c6d880
--- 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,13 +41,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 +57,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 +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)
@@ -76,14 +101,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 +121,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 +133,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 +148,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 +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());