Fixed integration of Qt generated form code

src/configdlg.cpp

@@ -43,8 +43,9 @@
 #include <xpm/icon.xpm>
 
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name ) :
-  UIConfigDlg( parent, name )
+  QDialog( parent, name )
 {
+  setupUi(this);
   setIcon(QPixmap((const char **)icon_xpm));
   
   ui_list->header()->hide();

src/configdlg.h

@@ -21,10 +21,11 @@
 #ifndef CONFIGDLG_HH
 #define CONFIGDLG_HH
 
-#include <uiconfigdlg.h>
 #include <dmmgraph.h>
 #include <readevent.h>
 
+#include <ui_uiconfigdlg.h>
+
 class SimpleCfg;
 class QPrinter;
 class RecorderPrefs;
@@ -35,7 +36,7 @@ class GraphPrefs;
 class IntegrationPrefs;
 class ExecutePrefs;
 
-class ConfigDlg : public UIConfigDlg
+class ConfigDlg : public QDialog, public Ui::UIConfigDlg
 {
   Q_OBJECT
 public:

src/displayprefs.cpp

@@ -27,8 +27,10 @@
 #include <display.xpm>
 
 DisplayPrefs::DisplayPrefs( QWidget *parent, const char *name ) :
-  UIDisplayPrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "Display settings" );
   m_description = tr( "<b>Here you can configure the visual"
                       " appearance of the DMM display.</b>" );

src/displayprefs.h

@@ -21,9 +21,11 @@
 #ifndef DISPLAYPREFS_HH
 #define DISPLAYPREFS_HH
 
-#include <uidisplayprefs.h>
+#include <ui_uidisplayprefs.h>
 
-class DisplayPrefs : public UIDisplayPrefs
+#include <QDialog>
+
+class DisplayPrefs : public PrefWidget, public Ui::UIDisplayPrefs
 {
   Q_OBJECT
 public:

src/dmmprefs.cpp

@@ -140,8 +140,10 @@ struct DMMInfo dmm_info[] = {
                             };
 
 DmmPrefs::DmmPrefs( QWidget *parent, const char *name ) :
-  UIDmmPrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "Multimeter settings" );
   m_description = tr( "<b>Here you can configure the serial port"
                       " and protocol for your DMM. There is"

src/dmmprefs.h

@@ -21,9 +21,11 @@
 #ifndef DMMPREFS_HH
 #define DMMPREFS_HH
 
-#include <uidmmprefs.h>
+#include <prefwidget.h>
 #include <readevent.h>
 
+#include <ui_uidmmprefs.h>
+
 struct DMMInfo
 {
   const char *name;
@@ -41,7 +43,7 @@ struct DMMInfo
   bool  dtr;
 };
 
-class DmmPrefs : public UIDmmPrefs
+class DmmPrefs : public PrefWidget, public Ui::UIDmmPrefs
 {
   Q_OBJECT
 public:

src/executeprefs.cpp

@@ -31,8 +31,10 @@
 #include <execute.xpm>
 
 ExecutePrefs::ExecutePrefs( QWidget *parent, const char *name ) :
-  UIExecutePrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "External application" );
   m_description = tr( "<b>Here you can configure if an external"
                       " command is to be started and when.</b>" );

src/executeprefs.h

@@ -21,9 +21,11 @@
 #ifndef EXECUTEPREFS_HH
 #define EXECUTEPREFS_HH
 
-#include <uiexecuteprefs.h>
+#include <prefwidget.h>
 
-class ExecutePrefs : public UIExecutePrefs
+#include <ui_uiexecuteprefs.h>
+
+class ExecutePrefs : public PrefWidget, public Ui::UIExecutePrefs
 {
   Q_OBJECT
 public:

src/graphprefs.cpp

@@ -29,8 +29,10 @@
 #include <graph.xpm>
 
 GraphPrefs::GraphPrefs( QWidget *parent, const char *name ) :
-  UIGraphPrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "Graph settings" );
   m_description = tr( "<b>Here you can configure the colors and"
                       " drawing style for the graph.</b>" );

src/graphprefs.h

@@ -21,9 +21,10 @@
 #ifndef GRAPHPREFS_HH
 #define GRAPHPREFS_HH
 
-#include <uigraphprefs.h>
+#include <prefwidget.h>
+#include <ui_uigraphprefs.h>
 
-class GraphPrefs : public UIGraphPrefs
+class GraphPrefs : public PrefWidget, public Ui::UIGraphPrefs
 {
   Q_OBJECT
 public:

src/guiprefs.cpp

@@ -27,8 +27,10 @@
 #include <gui.xpm>
 
 GuiPrefs::GuiPrefs( QWidget *parent, const char *name ) :
-  UIGuiPrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "GUI settings" );
   m_description = tr( "<b>Here you can configure QtDMM's visual"
                       " appearance and behaviour.</b>" );

src/guiprefs.h

@@ -21,9 +21,11 @@
 #ifndef GUIPREFS_HH
 #define GUIPREFS_HH
 
-#include <uiguiprefs.h>
+#include <prefwidget.h>
 
-class GuiPrefs : public UIGuiPrefs
+#include <ui_uiguiprefs.h>
+
+class GuiPrefs : public PrefWidget, public Ui::UIGuiPrefs
 {
   Q_OBJECT
 public:

src/integrationprefs.cpp

@@ -31,8 +31,10 @@
 #include <integration.xpm>
 
 IntegrationPrefs::IntegrationPrefs( QWidget *parent, const char *name ) :
-  UIIntegrationPrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "Integration" );
   m_description = tr( "<b>Here you can configure the parameter"
                       " for the integration curve.</b>" );

src/integrationprefs.h

@@ -21,9 +21,11 @@
 #ifndef INTEGRATIONPREFS_HH
 #define INTEGRATIONPREFS_HH
 
-#include <uiintegrationprefs.h>
+#include <prefwidget.h>
 
-class IntegrationPrefs : public UIIntegrationPrefs
+#include <ui_uiintegrationprefs.h>
+
+class IntegrationPrefs : public PrefWidget, public Ui::UIIntegrationPrefs
 {
   Q_OBJECT
 public:

src/mainwid.cpp

@@ -38,10 +38,12 @@
 #include <iostream>
 
 MainWid::MainWid( QWidget *parent, const char *name ) :
-  UIMainWid( parent, name ),
+  Q3Frame( parent, name ),
   m_display( 0 ),
   m_tipDlg( 0 )
 {
+  setupUi(this);
+
   setIcon( QPixmap((const char **)icon_xpm ) );
   
   m_dmm = new DMM( this );

src/mainwid.h

@@ -21,7 +21,8 @@
 #ifndef MAINWID_HH
 #define MAINWID_HH
 
-#include <uimainwid.h>
+#include <ui_uimainwid.h>
+
 #include <qprinter.h>
 
 class DMM;
@@ -31,7 +32,7 @@ class ConfigDlg;
 class DisplayWid;
 class TipDlg;
 
-class MainWid : public UIMainWid
+class MainWid : public Q3Frame, public Ui::UIMainWid
 {
   Q_OBJECT
 public:

src/mainwin.cpp

@@ -49,7 +49,7 @@
 #include <iostream>
 
 MainWin::MainWin( QWidget *parent, const char *name ) :
-  QMainWindow( parent, name ),
+  Q3MainWindow( parent, name ),
   m_running( false )
 {
   setIcon( QPixmap((const char **)icon_xpm) );

src/printdlg.cpp

@@ -25,8 +25,10 @@
 #include <qwhatsthis.h>
 
 PrintDlg::PrintDlg( QWidget *parent, const char *name ) :
-  UIPrintDlg( parent, name, true )
+  QDialog( parent, name, true )
 {
+  setupUi(this);
+
   connect( configBut, SIGNAL( clicked() ),
            this, SLOT( configSLOT() ));
   connect( helpBut, SIGNAL( clicked() ),

src/printdlg.h

@@ -21,11 +21,12 @@
 #ifndef PRINTDLG_HH
 #define PRINTDLG_HH
 
-#include <uiprintdlg.h>
+#include <ui_uiprintdlg.h>
+
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 
-class PrintDlg : public UIPrintDlg
+class PrintDlg : public QDialog, public Ui::UIPrintDlg
 {
   Q_OBJECT
 public:

src/recorderprefs.cpp

@@ -34,8 +34,10 @@
 #define DAY_SECS      60*60*24
 
 RecorderPrefs::RecorderPrefs( QWidget *parent, const char *name ) :
-  UIRecorderPrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "Recorder settings" );
   m_description = tr( "<b>Here you can configure the sampling"
                       " frequency and start options for the"

src/recorderprefs.h

@@ -21,10 +21,12 @@
 #ifndef RECORDERPREFS_HH
 #define RECORDERPREFS_HH
 
-#include <uirecorderprefs.h>
 #include <dmmgraph.h>
+#include <prefwidget.h>
 
-class RecorderPrefs : public UIRecorderPrefs
+#include <ui_uirecorderprefs.h>
+
+class RecorderPrefs : public PrefWidget, public Ui::UIRecorderPrefs
 {
   Q_OBJECT
 public:

src/scaleprefs.cpp

@@ -37,8 +37,10 @@
 #define DAY_SECS      60*60*24
 
 ScalePrefs::ScalePrefs( QWidget *parent, const char *name ) :
-  UIScalePrefs( parent, name )
+  PrefWidget( parent, name )
 {
+  setupUi(this);
+
   m_label = tr( "Scale settings" );
   m_description = tr( "<b>Here you can configure the vertical scale"
                       " of the recorder and the length (in time)"

src/scaleprefs.h

@@ -21,9 +21,11 @@
 #ifndef SCALEPREFS_HH
 #define SCALEPREFS_HH
 
-#include <uiscaleprefs.h>
+#include <prefwidget.h>
 
-class ScalePrefs : public UIScalePrefs
+#include <ui_uiscaleprefs.h>
+
+class ScalePrefs : public PrefWidget, public Ui::UIScalePrefs
 {
   Q_OBJECT
 public:

src/tipdlg.cpp

@@ -76,10 +76,12 @@ const char *TipDlg::s_tipText[] = {
     0 };
   
 TipDlg::TipDlg( QWidget *parent, const char *name ) :
-  UITipDlg( parent, name ),
+  QDialog( parent, name ),
   m_numTips(0),
   m_curTip(0)
 {
+  setupUi(this);
+
   ui_tip->setPaper( backgroundColor() );
   
   connect( ui_closeBut, SIGNAL( clicked() ),

src/tipdlg.h

@@ -21,9 +21,9 @@
 #ifndef TIPDLG_HH
 #define TIPDLG_HH
 
-#include <uitipdlg.h>
+#include <ui_uitipdlg.h>
 
-class TipDlg : public UITipDlg
+class TipDlg : public QDialog, public Ui::UITipDlg
 {
   Q_OBJECT
 public: