X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=emul%2Femulkbd.cpp;h=fad4ee6ec3c2cdcd201643d77bafb47acb1d4769;hb=06db9a2922f9eb0881c2d5faf8e253cb8c871337;hp=1dfdd9d5500cc92e0c2835e4be6ef945b9dbc2d0;hpb=20d3c79024c12bb366270c0c1fdda53c4c55e734;p=bertos.git

diff --git a/emul/emulkbd.cpp b/emul/emulkbd.cpp
index 1dfdd9d5..fad4ee6e 100755
--- a/emul/emulkbd.cpp
+++ b/emul/emulkbd.cpp
@@ -16,24 +16,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 +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)
@@ -87,9 +76,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 +96,7 @@ EmulKbd::~EmulKbd()
 
 QSizePolicy EmulKbd::sizePolicy() const
 {
-	return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed, false);
+	return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 }
 
 
@@ -191,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());