Fix trivial warning and errors.

[bertos.git] / emul / emulkbd.h

diff --git a/emul/emulkbd.h b/emul/emulkbd.h
old mode 100755 (executable)
new mode 100644 (file)
index 0263db1..d7caa0c
--- a/emul/emulkbd.h
+++ b/emul/emulkbd.h
@@ -20,11 +20,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#if _QT < 4
-#include <qframe.h>
-#else
 #include <QtGui/QFrame>
-#endif
 
 // fwd decl
 class QGridLayout;
@@ -42,7 +38,7 @@ protected:
 
 // Construction
 public:
-       EmulKbd(QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0);
+       EmulKbd(QWidget *parent = 0, Qt::WFlags f = 0);
        virtual ~EmulKbd();
 
 // Public methods
@@ -67,11 +63,7 @@ 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