X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=emul%2Femulkbd.h;h=82048367bf54f26551d3bd55dd9c40b4f28f0e22;hb=8ed6318f92444e347d2043f585362bc4b1107f84;hp=0263db1d0bca5bf66000c206903523a5ce4ab7a3;hpb=20d3c79024c12bb366270c0c1fdda53c4c55e734;p=bertos.git diff --git a/emul/emulkbd.h b/emul/emulkbd.h old mode 100755 new mode 100644 index 0263db1d..82048367 --- a/emul/emulkbd.h +++ b/emul/emulkbd.h @@ -1,9 +1,34 @@ /** * \file * * * \version $Id$ @@ -20,11 +45,7 @@ #pragma once #endif // _MSC_VER > 1000 -#if _QT < 4 -#include -#else #include -#endif // fwd decl class QGridLayout; @@ -42,7 +63,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 +88,7 @@ protected: // Private helper class for EmulKbd // NOTE: with protected inheritance, dynamic_cast<> does not work (gcc 2.96) -#if _QT < 4 -#include -#else #include -#endif class EmulKey : public QPushButton { Q_OBJECT