Port to Qt 4.1.

[bertos.git] / emul / emulkbd.h

diff --git a/emul/emulkbd.h b/emul/emulkbd.h
index 1eb243229f111d276936bbacce6c6cb2ed277432..0263db1d0bca5bf66000c206903523a5ce4ab7a3 100755 (executable)
--- a/emul/emulkbd.h
+++ b/emul/emulkbd.h
@@ -20,7 +20,11 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
+#if _QT < 4
 #include <qframe.h>
+#else
+#include <QtGui/QFrame>
+#endif
 
 // fwd decl
 class QGridLayout;
@@ -38,7 +42,7 @@ protected:
 
 // Construction
 public:
-       EmulKbd(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
+       EmulKbd(QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0);
        virtual ~EmulKbd();
 
 // Public methods
@@ -63,7 +67,11 @@ protected:
 
 // Private helper class for EmulKbd
 // NOTE: with protected inheritance, dynamic_cast<> does not work (gcc 2.96)
+#if _QT < 4
 #include <qpushbutton.h>
+#else
+#include <QtGui/qpushbutton.h>
+#endif
 class EmulKey : public QPushButton
 {
        Q_OBJECT