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

diff --git a/emul/emulkbd.cpp b/emul/emulkbd.cpp
index 2c6c3f8c..95b70214 100755
--- a/emul/emulkbd.cpp
+++ b/emul/emulkbd.cpp
@@ -16,13 +16,24 @@
 #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>
+#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
 
 
 EmulKey::EmulKey(EmulKbd *kbd, const char *label, int _keycode, int _row, int _col) :
@@ -31,7 +42,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 +57,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 +86,14 @@ void EmulKey::keyReleased(void)
 }
 
 
-EmulKbd::EmulKbd(QWidget *parent, const char *name, WFlags f) :
-	QFrame(parent, name, WRepaintNoErase | WResizeNoErase | f),
+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)),
 	active_row(0)
 {
 	setFrameStyle(QFrame::Box | QFrame::Sunken);
 	setLineWidth(1);
-	setFocusPolicy(StrongFocus);
+	setFocusPolicy(Qt::StrongFocus);
 	frame_width = frameWidth();
 }
 
@@ -100,7 +110,7 @@ QSizePolicy EmulKbd::sizePolicy() const
 }
 
 
-void EmulKbd::resizeEvent(QResizeEvent * event)
+void EmulKbd::resizeEvent(QResizeEvent *event)
 {
 	// Let our superclass process the event first
 	QFrame::resizeEvent(event);
@@ -108,7 +118,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 +133,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);