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/axis_edit.h

@@ -1,22 +1,16 @@
 #ifndef AXIS_EDIT_H
 #define AXIS_EDIT_H
-
+//to refer to the axis we're editing
 //for building up the dialog we need
-#include <qdialog.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qframe.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-
+#include "axis.h"
+#include <QComboBox>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QLabel>
 //for my home-brewed widgets
 #include "joyslider.h"
 #include "keycode.h"
 
-//to refer to the axis we're editing
-#include "axis.h"
-
 class AxisEdit : public QDialog {
 	Q_OBJECT
 	public: