straight copy of qt4 branch over to trunk, merge refused to work

git-svn-id: svn://svn.code.sf.net/p/qjoypad/code/trunk@95 c05e91a0-76c8-4ec0-b377-ef19ce7cc080

src/button_edit.h

@@ -1,14 +1,13 @@
 #ifndef BUTTON_EDIT_H
 #define BUTTON_EDIT_H
 
-//used to build the dialog:
-#include <qdialog.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
+#include <QPushButton>
+#include <QCheckBox>
 
 //we need to edit a Button
 #include "button.h"
+
+
 //to get a new key for the button.
 #include "keycode.h"