ported .ui widgets to Qt4. removed unused old widgets from project

1 files changed, 5 insertions, 4 deletions

diff --git a/muse2/muse/widgets/genset.h b/muse2/muse/widgets/genset.h
index 375cf197..e0494b2f 100644
--- a/muse2/muse/widgets/genset.h
+++ b/muse2/muse/widgets/genset.h
@@ -9,15 +9,15 @@
 #ifndef __GENSET_H__
 #define __GENSET_H__
 
-#include "gensetbase.h"
-//Added by qt3to4:
+#include "ui_gensetbase.h"
+
 #include <QShowEvent>
 
 //---------------------------------------------------------
 //   GlobalSettingsConfig
 //---------------------------------------------------------
 
-class GlobalSettingsConfig : public GlobalSettingsDialogBase {
+class GlobalSettingsConfig : public QDialog, public Ui::GlobalSettingsDialogBase {
       Q_OBJECT
 
    private slots:
@@ -33,9 +33,10 @@ class GlobalSettingsConfig : public GlobalSettingsDialogBase {
 
     protected:
       void showEvent(QShowEvent*);
+      QButtonGroup *startSongGroup;
       
    public:
-      GlobalSettingsConfig(QWidget* parent=0, const char* name=0);
+      GlobalSettingsConfig(QWidget* parent=0);
       };
 
 #endif