QT: Cleaned up unused constructor parameters.

profibus/exe/profinet_viewer/qt/pn_viewer_qt.cqt

@@ -119,13 +119,12 @@ PnViewerQt::PnViewerQt(const char* v_name, const char* v_device,
   QLabel* header_left = new QLabel("Devices on Network");
   QLabel* header_right = new QLabel("Devices from Configuration");
 
-  viewernav
-      = new PnViewerNavQt(this, nav_right, viewer_eType_Network, &nav_widget);
+  viewernav = new PnViewerNavQt(this, viewer_eType_Network, &nav_widget);
   viewernav->change_value_cb = &change_value;
   viewernav->message_cb = &message_cb;
 
-  viewernavconf = new PnViewerNavQt(
-      this, nav_left, viewer_eType_Configuration, &navconf_widget);
+  viewernavconf = new PnViewerNavQt(this, viewer_eType_Configuration,
+      &navconf_widget);
   viewernavconf->change_value_cb = &change_value;
   viewernavconf->message_cb = &message_cb;
 

profibus/exe/profinet_viewer/qt/pn_viewer_qt.h

@@ -71,8 +71,7 @@ class PnViewerQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  PnViewerQtWidget(PnViewerQt* parent_ctx)
-      : QWidget(), viewer(parent_ctx){}
+  PnViewerQtWidget(PnViewerQt* parent_ctx) : QWidget(), viewer(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

profibus/exe/profinet_viewer/qt/pn_viewernav_qt.cpp

@@ -44,7 +44,7 @@
 #include "pn_viewernav_qt.h"
 
 PnViewerNavQt::PnViewerNavQt(
-    void* l_parent_ctx, QWidget* l_parent_wid, viewer_eType l_type, QWidget** w)
+    void* l_parent_ctx, viewer_eType l_type, QWidget** w)
     : PnViewerNav(l_parent_ctx, l_type)
 {
   form_widget

profibus/exe/profinet_viewer/qt/pn_viewernav_qt.h

@@ -43,8 +43,7 @@
 
 class PnViewerNavQt : public PnViewerNav {
 public:
-  PnViewerNavQt(void* v_parent_ctx, QWidget* v_parent_wid, viewer_eType v_type,
-      QWidget** w);
+  PnViewerNavQt(void* v_parent_ctx, viewer_eType v_type, QWidget** w);
   ~PnViewerNavQt();
 
   QWidget* brow_widget;

profibus/exe/profinet_viewer/qt/profinet_viewer_qt.cpp

@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
   }
 
   // Create help window
-  CoXHelpQt* xhelp = new CoXHelpQt(viewer->toplevel, 0, xhelp_eUtility_Wtt, (int*)&sts);
+  CoXHelpQt* xhelp = new CoXHelpQt(NULL, xhelp_eUtility_Wtt, (int*)&sts);
   CoXHelpQt::set_default(xhelp);
 
   try {

profibus/lib/cow/qt/cow_pb_gsd_attr_qt.cqt

@@ -214,13 +214,12 @@ GsdAttrQt::~GsdAttrQt()
   delete attrnav;
 }
 
-GsdAttrQt::GsdAttrQt(QWidget* a_parent_wid, void* a_parent_ctx, void* a_object,
-    pb_gsd* a_gsd, int a_edit_mode)
-    : GsdAttr(a_parent_ctx, a_object, a_gsd, a_edit_mode)
+GsdAttrQt::GsdAttrQt(void* a_parent_ctx, void* a_object, pb_gsd* a_gsd,
+    int a_edit_mode) : GsdAttr(a_parent_ctx, a_object, a_gsd, a_edit_mode)
 {
   int sts;
 
-  toplevel = new GsdAttrQtWidget(this, a_parent_wid);
+  toplevel = new GsdAttrQtWidget(this);
   toplevel->setMinimumSize(500, 500);
   toplevel->setWindowTitle(fl("pbGsdEditor"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -264,8 +263,7 @@ GsdAttrQt::GsdAttrQt(QWidget* a_parent_wid, void* a_parent_ctx, void* a_object,
       toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
 
   // Navigator
-  attrnav = new GsdAttrNavQt(
-      this, toplevel, "Plant", gsd, edit_mode, &brow_widget, &sts);
+  attrnav = new GsdAttrNavQt(this, "Plant", gsd, edit_mode, &brow_widget, &sts);
   attrnav->message_cb = &GsdAttr::gsdattr_message;
   attrnav->change_value_cb = &GsdAttr::gsdattr_change_value_cb;
 

profibus/lib/cow/qt/cow_pb_gsd_attr_qt.h

@@ -61,8 +61,7 @@ public:
   static CoWowRecall value_recall;
   CoWowEntryQt* cmd_entry;
 
-  GsdAttrQt(QWidget* a_parent_wid, void* a_parent_ctx, void* a_object,
-      pb_gsd* a_gsd, int a_edit_mode);
+  GsdAttrQt(void* a_parent_ctx, void* a_object, pb_gsd* a_gsd, int a_edit_mode);
   ~GsdAttrQt();
 
   void message(char severity, const char* message);
@@ -77,10 +76,7 @@ class GsdAttrQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  GsdAttrQtWidget(GsdAttrQt* parent_ctx, QWidget* parent)
-      : QWidget(), attr(parent_ctx)
-  {
-  }
+  GsdAttrQtWidget(GsdAttrQt* parent_ctx) : QWidget(), attr(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

profibus/lib/cow/qt/cow_pb_gsd_attrnav_qt.cpp

@@ -43,9 +43,8 @@
 
 #include "cow_pb_gsd_attrnav_qt.h"
 
-GsdAttrNavQt::GsdAttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    const char* xn_name, pb_gsd* xn_gsd, int xn_edit_mode, QWidget** w,
-    pwr_tStatus* status)
+GsdAttrNavQt::GsdAttrNavQt(void* xn_parent_ctx, const char* xn_name,
+    pb_gsd* xn_gsd, int xn_edit_mode, QWidget** w, pwr_tStatus* status)
     : GsdAttrNav(xn_parent_ctx, xn_name, xn_gsd, xn_edit_mode, status)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);

profibus/lib/cow/qt/cow_pb_gsd_attrnav_qt.h

@@ -46,8 +46,8 @@
 //! The navigation area of the attribute editor.
 class GsdAttrNavQt : public GsdAttrNav {
 public:
-  GsdAttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-      pb_gsd* xn_gsd, int xn_edit_mode, QWidget** w, pwr_tStatus* status);
+  GsdAttrNavQt(void* xn_parent_ctx, const char* xn_name, pb_gsd* xn_gsd,
+      int xn_edit_mode, QWidget** w, pwr_tStatus* status);
   ~GsdAttrNavQt();
   void set_inputfocus();
 

profibus/lib/cow/qt/cow_pn_gsdml_attr_qt.cqt

@@ -250,14 +250,13 @@ GsdmlAttrQt::~GsdmlAttrQt()
   delete attrnav;
 }
 
-GsdmlAttrQt::GsdmlAttrQt(QWidget* a_parent_wid, void* a_parent_ctx,
-    void* a_object, pn_gsdml* a_gsdml, int a_edit_mode,
-    const char* a_data_filename, pwr_tStatus* a_sts)
+GsdmlAttrQt::GsdmlAttrQt(void* a_parent_ctx, void* a_object, pn_gsdml* a_gsdml,
+    int a_edit_mode, const char* a_data_filename, pwr_tStatus* a_sts)
     : GsdmlAttr(a_parent_ctx, a_object, a_gsdml, a_edit_mode, a_data_filename)
 {
   int sts;
 
-  toplevel = new GsdmlAttrQtWidget(this, a_parent_wid);
+  toplevel = new GsdmlAttrQtWidget(this);
   toplevel->setMinimumSize(700, 700);
   toplevel->setWindowTitle(fl("profinetConfigurator"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -316,8 +315,8 @@ GsdmlAttrQt::GsdmlAttrQt(QWidget* a_parent_wid, void* a_parent_ctx,
       toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
 
   // Navigator
-  attrnav = new GsdmlAttrNavQt(
-      this, toplevel, "Plant", gsdml, edit_mode, &brow_widget, &sts);
+  attrnav = new GsdmlAttrNavQt(this, "Plant", gsdml, edit_mode, &brow_widget,
+      &sts);
   attrnav->message_cb = &GsdmlAttr::gsdmlattr_message;
   attrnav->change_value_cb = &GsdmlAttr::gsdmlattr_change_value_cb;
 

profibus/lib/cow/qt/cow_pn_gsdml_attr_qt.h

@@ -65,9 +65,8 @@ public:
   static CoWowRecall value_recall;
   CoWowEntryQt* cmd_entry;
 
-  GsdmlAttrQt(QWidget* a_parent_wid, void* a_parent_ctx, void* a_object,
-      pn_gsdml* a_gsdml, int a_edit_mode, const char* a_data_filename,
-      pwr_tStatus* a_sts);
+  GsdmlAttrQt(void* a_parent_ctx, void* a_object, pn_gsdml* a_gsdml,
+      int a_edit_mode, const char* a_data_filename, pwr_tStatus* a_sts);
   ~GsdmlAttrQt();
 
   void message(char severity, const char* message);
@@ -80,10 +79,7 @@ class GsdmlAttrQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  GsdmlAttrQtWidget(GsdmlAttrQt* parent_ctx, QWidget* parent)
-      : QWidget(), attr(parent_ctx)
-  {
-  }
+  GsdmlAttrQtWidget(GsdmlAttrQt* parent_ctx) : QWidget(), attr(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

profibus/lib/cow/qt/cow_pn_gsdml_attrnav_qt.cpp

@@ -43,9 +43,8 @@
 #include "cow_pn_gsdml_attr_qt.h"
 #include "cow_pn_gsdml_attrnav_qt.h"
 
-GsdmlAttrNavQt::GsdmlAttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    const char* xn_name, pn_gsdml* xn_gsdml, int xn_edit_mode, QWidget** w,
-    pwr_tStatus* status)
+GsdmlAttrNavQt::GsdmlAttrNavQt(void* xn_parent_ctx, const char* xn_name,
+    pn_gsdml* xn_gsdml, int xn_edit_mode, QWidget** w, pwr_tStatus* status)
     : GsdmlAttrNav(xn_parent_ctx, xn_name, xn_gsdml, xn_edit_mode, status)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);

profibus/lib/cow/qt/cow_pn_gsdml_attrnav_qt.h

@@ -46,9 +46,8 @@
 //! The navigation area of the attribute editor.
 class GsdmlAttrNavQt : public GsdmlAttrNav {
 public:
-  GsdmlAttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-      const char* xn_name, pn_gsdml* xn_gsdml, int xn_edit_mode, QWidget** w,
-      pwr_tStatus* status);
+  GsdmlAttrNavQt(void* xn_parent_ctx, const char* xn_name, pn_gsdml* xn_gsdml,
+      int xn_edit_mode, QWidget** w, pwr_tStatus* status);
   ~GsdmlAttrNavQt();
   void set_inputfocus();
   void display_attr_help_text();

profibus/lib/wb/qt/wb_c_pb_dp_slave_qt.cpp

@@ -57,8 +57,7 @@ static pwr_tStatus Configure(ldh_sMenuCall* ip)
     return sts;
   }
 
-  ctx->attr = new GsdAttrQt(
-      CoXHelpQt::get_widget(), ctx, 0, ctx->gsd, ctx->edit_mode);
+  ctx->attr = new GsdAttrQt(ctx, 0, ctx->gsd, ctx->edit_mode);
   ctx->attr->close_cb = pb_dp_slave_close_cb;
   ctx->attr->save_cb = pb_dp_slave_save_cb;
   ctx->attr->help_cb = pb_dp_slave_help_cb;

profibus/lib/wb/qt/wb_c_pndevice_qt.cpp

@@ -75,8 +75,8 @@ static pwr_tStatus Configure(ldh_sMenuCall* ip)
     return sts;
   }
 
-  ctx->attr = new GsdmlAttrQt(CoXHelpQt::get_widget(), ctx, 0, ctx->gsdml,
-      ctx->edit_mode, datafile, &sts);
+  ctx->attr = new GsdmlAttrQt(ctx, 0, ctx->gsdml, ctx->edit_mode, datafile,
+      &sts);
   if (sts == PB__CONFIGABORTED) {
     ((GsdmlAttrQt*)ctx->attr)->toplevel->close();
     return 1;

profibus/lib/xtt/qt/xtt_c_pb_dp_slave_qt.cpp

@@ -56,8 +56,7 @@ static pwr_tStatus ShowConfiguration(xmenu_sMenuCall* ip)
     return sts;
   }
 
-  ctx->attr
-      = new GsdAttrQt(CoXHelpQt::get_widget(), ctx, 0, ctx->gsd, edit_mode);
+  ctx->attr = new GsdAttrQt(ctx, 0, ctx->gsd, edit_mode);
   ctx->attr->close_cb = xtt_pb_dp_slave_close_cb;
   ctx->attr->save_cb = xtt_pb_dp_slave_save_cb;
   ctx->attr->help_cb = xtt_pb_dp_slave_help_cb;

profibus/lib/xtt/qt/xtt_c_pndevice_qt.cpp

@@ -71,8 +71,7 @@ static pwr_tStatus ShowConfiguration(xmenu_sMenuCall* ip)
   if (EVEN(sts))
     return sts;
 
-  ctx->attr = new GsdmlAttrQt(
-      CoXHelpQt::get_widget(), ctx, 0, ctx->gsdml, 0, datafile, &sts);
+  ctx->attr = new GsdmlAttrQt(ctx, 0, ctx->gsdml, 0, datafile, &sts);
   if (sts == PB__CONFIGABORTED) {
     delete ctx->attr;
     return 1;

sev/exe/sev_xtt/qt/sev_xtt_qt.cpp

@@ -95,7 +95,7 @@ int main(int argc, char* argv[])
   setlocale(LC_NUMERIC, "POSIX");
   setlocale(LC_TIME, "en_US");
 
-  XttTblQt* tbl = new XttTblQt(0, 0, sevcli, items, itemcnt);
+  XttTblQt* tbl = new XttTblQt(NULL, sevcli, items, itemcnt);
   tbl->close_cb = tbl_close_cb;
 
   return app.exec();

sev/exe/sev_xtt/qt/xtt_tbl_qt.cqt

@@ -176,9 +176,8 @@ XttSevHist* XttTblQt::sevhist_new(pwr_tOid* oidv, pwr_tOName* anamev,
     pwr_tOName* onamev, bool* sevhistobjectv, pwr_tStatus* sts)
 {
   QWidget* w;
-  return new XttSevHistQt(this, toplevel, "Process History", &w, oidv, anamev,
-      onamev, sevhistobjectv, sevcli, 0, 0, 0, 0, time_ePeriod_LastHour, 0,
-      sts);
+  return new XttSevHistQt(this, "Process History", &w, oidv, anamev, onamev,
+      sevhistobjectv, sevcli, 0, 0, 0, 0, time_ePeriod_LastHour, 0, sts);
 }
 
 CoLogin* XttTblQt::login_new(const char* name, const char* groupname,
@@ -232,13 +231,12 @@ void XttTblQtWidget::valchanged_cmd_input()
   tbl->tblnav->set_inputfocus();
 }
 
-XttTblQt::XttTblQt(QWidget* a_parent_wid, void* a_parent_ctx,
-    sevcli_tCtx a_sevcli, sevcli_sHistItem* itemlist, int item_cnt)
-    : XttTbl(a_parent_ctx, a_sevcli)
+XttTblQt::XttTblQt(void* a_parent_ctx, sevcli_tCtx a_sevcli,
+    sevcli_sHistItem* itemlist, int item_cnt) : XttTbl(a_parent_ctx, a_sevcli)
 {
   int sts;
 
-  toplevel = new XttTblQtWidget(this, a_parent_wid);
+  toplevel = new XttTblQtWidget(this);
   toplevel->setMinimumSize(500, 700);
   toplevel->setWindowTitle(fl("SevXtt Navigator"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -311,7 +309,7 @@ XttTblQt::XttTblQt(QWidget* a_parent_wid, void* a_parent_ctx,
   statusbar->addWidget(cmd_prompt);
   add_expanding(statusbar, cmd_entry);
 
-  tblnav = new TblNavQt(this, toplevel, itemlist, item_cnt, &brow_widget, &sts);
+  tblnav = new TblNavQt(this, itemlist, item_cnt, &brow_widget, &sts);
   tblnav->message_cb = &XttTbl::message;
   tblnav->is_authorized_cb = &XttTbl::is_authorized;
   tblnav->command_cb = &XttTbl::command_cb;
@@ -329,7 +327,7 @@ XttTblQt::XttTblQt(QWidget* a_parent_wid, void* a_parent_ctx,
   cmd_entry->setVisible(false);
 
   // Create help window
-  CoXHelp* xhelp = new CoXHelpQt(toplevel, this, xhelp_eUtility_Xtt, &sts);
+  CoXHelp* xhelp = new CoXHelpQt(this, xhelp_eUtility_Xtt, &sts);
   CoXHelp::set_default(xhelp);
 
   wow = new CoWowQt(toplevel);

sev/exe/sev_xtt/qt/xtt_tbl_qt.h

@@ -49,8 +49,8 @@ class XttTblQtWidget;
 
 class XttTblQt : public XttTbl {
 public:
-  XttTblQt(QWidget* a_parent_wid, void* a_parent_ctx, sevcli_tCtx a_sevcli,
-      sevcli_sHistItem* itemlist, int item_cnt);
+  XttTblQt(void* a_parent_ctx, sevcli_tCtx a_sevcli, sevcli_sHistItem* itemlist,
+      int item_cnt);
   ~XttTblQt();
 
   XttTblQtWidget* toplevel;
@@ -74,10 +74,7 @@ class XttTblQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XttTblQtWidget(XttTblQt* parent_ctx, QWidget* parent)
-      : QWidget(), tbl(parent_ctx)
-  {
-  }
+  XttTblQtWidget(XttTblQt* parent_ctx) : QWidget(), tbl(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

sev/exe/sev_xtt/qt/xtt_tblnav_qt.cpp

@@ -42,9 +42,8 @@
 
 #include "xtt_tblnav_qt.h"
 
-TblNavQt::TblNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    sevcli_sHistItem* xn_itemlist, int xn_item_cnt, QWidget** w,
-    pwr_tStatus* status)
+TblNavQt::TblNavQt(void* xn_parent_ctx, sevcli_sHistItem* xn_itemlist,
+    int xn_item_cnt, QWidget** w, pwr_tStatus* status)
     : TblNav(xn_parent_ctx, xn_itemlist, xn_item_cnt, status)
 {
   form_widget

sev/exe/sev_xtt/qt/xtt_tblnav_qt.h

@@ -46,9 +46,8 @@
 //! The navigation area of the attribute editor.
 class TblNavQt : public TblNav {
 public:
-  TblNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-      sevcli_sHistItem* xn_itemlist, int xn_item_cnt, QWidget** w,
-      pwr_tStatus* status);
+  TblNavQt(void* xn_parent_ctx, sevcli_sHistItem* xn_itemlist, int xn_item_cnt,
+      QWidget** w, pwr_tStatus* status);
   ~TblNavQt();
 
   QWidget* brow_widget;

wb/exe/wb/qt/wb_qt.cpp

@@ -63,8 +63,8 @@ Wtt* WbQt::wtt_new(const char* name, const char* iconname,
     ldh_tWBContext ldhwbctx, pwr_tVolumeId volid, ldh_tVolume volctx,
     wnav_sStartMenu* root_menu, pwr_tStatus* status)
 {
-  return new WttQt(
-      0, toplevel, name, iconname, ldhwbctx, volid, volctx, root_menu, status);
+  return new WttQt(0, name, iconname, ldhwbctx, volid, volctx, root_menu,
+      status);
 }
 
 WVsel* WbQt::vsel_new(pwr_tStatus* status, const char* name,
@@ -72,7 +72,7 @@ WVsel* WbQt::vsel_new(pwr_tStatus* status, const char* name,
     int (*bc_success)(void*, pwr_tVolumeId*, int), void (*bc_cancel)(),
     int (*bc_time_to_exit)(void*), int show_volumes, wb_eType wb_type)
 {
-  return new WVselQt(status, NULL, mainwindow, name, ldhwbctx, volumename,
+  return new WVselQt(status, NULL, name, ldhwbctx, volumename,
       bc_success, bc_cancel, bc_time_to_exit, show_volumes, wb_type);
 }
 
@@ -90,7 +90,7 @@ int main(int argc, char* argv[])
   return app.exec();
 }
 
-WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
+WbQt::WbQt(int argc, char* argv[])
 {
   pwr_tStatus sts;
   int login_display = 0;
@@ -210,14 +210,14 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
 
   // Create message window
   MsgWindowQt* msg_window
-      = new MsgWindowQt(0, mainwindow, "Workbench messages", &sts);
+      = new MsgWindowQt(0, "Workbench messages", &sts);
   msg_window->find_wnav_cb = Wb::find_wnav_cb;
   msg_window->find_plc_cb = Wb::find_plc_cb;
   MsgWindow::set_default(msg_window);
   MsgWindow::message('I', "Development environment started");
 
   // Create help window
-  CoXHelpQt* xhelp = new CoXHelpQt(mainwindow, 0, xhelp_eUtility_Wtt, &sts);
+  CoXHelpQt* xhelp = new CoXHelpQt(0, xhelp_eUtility_Wtt, &sts);
   CoXHelp::set_default(xhelp);
 
   sts = ldh_OpenWB(&wbctx, volumename_p, options);
@@ -303,7 +303,7 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
       exit(LOGIN__NOPRIV);
     }
   } else if (login_display) {
-    new CoLoginQt(NULL, mainwindow, "PwR Login", systemgroup,
+    new CoLoginQt(NULL, NULL, "PwR Login", systemgroup,
         &Wb::login_success, &Wb::login_cancel, 0, &sts);
   }
 

wb/exe/wb/qt/wb_qt.h

@@ -44,7 +44,6 @@
 class WbQt : public Wb {
 public:
   QWidget* toplevel;
-  QWidget* mainwindow;
 
   WbQt(int argc, char* argv[]);
   ~WbQt() {}

wb/lib/wb/qt/wb_bckw_qt.cqt

@@ -45,13 +45,12 @@
 #include <QMenuBar>
 #include <QVBoxLayout>
 
-WbBckWQt::WbBckWQt(void* bckw_parent_ctx, QWidget* bckw_parent_wid,
-    ldh_tSession bckw_ldhses, const char* bckw_name, wb_bck_list* l_list,
-    int l_editmode, pwr_tStatus* status)
-    : WbBckW(
-          bckw_parent_ctx, bckw_ldhses, bckw_name, l_list, l_editmode, status)
+WbBckWQt::WbBckWQt(void* bckw_parent_ctx, ldh_tSession bckw_ldhses,
+    const char* bckw_name, wb_bck_list* l_list, int l_editmode,
+    pwr_tStatus* status) : WbBckW(bckw_parent_ctx, bckw_ldhses, bckw_name,
+        l_list, l_editmode, status)
 {
-  toplevel = new WbBckWQtWidget(this, bckw_parent_wid);
+  toplevel = new WbBckWQtWidget(this);
   toplevel->setMinimumSize(1100, 600);
   toplevel->setWindowTitle(fl(bckw_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -95,8 +94,7 @@ WbBckWQt::WbBckWQt(void* bckw_parent_ctx, QWidget* bckw_parent_wid,
   QVBoxLayout* form = new QVBoxLayout(toplevel);
 
   // Create bckwnav
-  bckwnav = new WbBckWNavQt(
-      this, toplevel, bckw_ldhses, l_list, l_editmode, &nav_widget);
+  bckwnav = new WbBckWNavQt(this, bckw_ldhses, l_list, l_editmode, &nav_widget);
 
   form->setMenuBar(menu_bar);
   add_expanding(form, nav_widget);

wb/lib/wb/qt/wb_bckw_qt.h

@@ -47,9 +47,8 @@ class WbBckWQtWidget;
 
 class WbBckWQt : public WbBckW {
 public:
-  WbBckWQt(void* l_parent_ctx, QWidget* l_parent_wid, ldh_tSession l_ldhses,
-      const char* l_name, wb_bck_list* l_list, int l_editmode,
-      pwr_tStatus* status);
+  WbBckWQt(void* l_parent_ctx, ldh_tSession l_ldhses, const char* l_name,
+      wb_bck_list* l_list, int l_editmode, pwr_tStatus* status);
   ~WbBckWQt();
 
   QWidget* nav_widget;
@@ -69,10 +68,7 @@ class WbBckWQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WbBckWQtWidget(WbBckWQt* parent_ctx, QWidget* parent)
-      : QWidget(), bck(parent_ctx)
-  {
-  }
+  WbBckWQtWidget(WbBckWQt* parent_ctx) : QWidget(), bck(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_bckwnav_qt.cpp

@@ -42,8 +42,8 @@
 
 #include "wb_bckwnav_qt.h"
 
-WbBckWNavQt::WbBckWNavQt(void* l_parent_ctx, QWidget* l_parent_wid,
-    ldh_tSession l_ldhses, wb_bck_list* l_list, int l_editmode, QWidget** w)
+WbBckWNavQt::WbBckWNavQt(void* l_parent_ctx, ldh_tSession l_ldhses,
+    wb_bck_list* l_list, int l_editmode, QWidget** w)
     : WbBckWNav(l_parent_ctx, l_ldhses, l_list, l_editmode)
 {
   form_widget

wb/lib/wb/qt/wb_bckwnav_qt.h

@@ -45,9 +45,8 @@
 
 class WbBckWNavQt : public WbBckWNav {
 public:
-  WbBckWNavQt(void* bckw_parent_ctx, QWidget* bckw_parent_wid,
-      ldh_tSession bckw_ldhses, wb_bck_list* l_list, int l_editmode,
-      QWidget** w);
+  WbBckWNavQt(void* bckw_parent_ctx, ldh_tSession bckw_ldhses,
+      wb_bck_list* l_list, int l_editmode, QWidget** w);
   ~WbBckWNavQt();
 
   QWidget* brow_widget;

wb/lib/wb/qt/wb_expw_qt.cqt

@@ -45,13 +45,12 @@
 #include <QMenuBar>
 #include <QVBoxLayout>
 
-WbExpWQt::WbExpWQt(void* expw_parent_ctx, QWidget* expw_parent_wid,
-    ldh_tSession expw_ldhses, const char* expw_name, int l_type, int l_editmode,
-    pwr_tStatus* status)
-    : WbExpW(
-          expw_parent_ctx, expw_ldhses, expw_name, l_type, l_editmode, status)
+WbExpWQt::WbExpWQt(void* expw_parent_ctx, ldh_tSession expw_ldhses,
+    const char* expw_name, int l_type, int l_editmode, pwr_tStatus* status)
+    : WbExpW(expw_parent_ctx, expw_ldhses, expw_name, l_type, l_editmode,
+        status)
 {
-  toplevel = new WbExpWQtWidget(this, expw_parent_wid);
+  toplevel = new WbExpWQtWidget(this);
   toplevel->setMinimumSize(1100, 600);
   toplevel->setWindowTitle(fl(expw_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -106,8 +105,7 @@ WbExpWQt::WbExpWQt(void* expw_parent_ctx, QWidget* expw_parent_wid,
   QVBoxLayout* form = new QVBoxLayout(toplevel);
 
   // Create expwnav
-  expwnav = new WbExpWNavQt(
-      this, toplevel, expw_ldhses, l_type, l_editmode, &nav_widget);
+  expwnav = new WbExpWNavQt(this, expw_ldhses, l_type, l_editmode, &nav_widget);
 
   form->setMenuBar(menu_bar);
   form->addWidget(tools);

wb/lib/wb/qt/wb_expw_qt.h

@@ -47,8 +47,8 @@ class WbExpWQtWidget;
 
 class WbExpWQt : public WbExpW {
 public:
-  WbExpWQt(void* l_parent_ctx, QWidget* l_parent_wid, ldh_tSession l_ldhses,
-      const char* l_name, int type, int l_editmode, pwr_tStatus* status);
+  WbExpWQt(void* l_parent_ctx, ldh_tSession l_ldhses, const char* l_name,
+      int type, int l_editmode, pwr_tStatus* status);
   ~WbExpWQt();
 
   QWidget* form;
@@ -66,10 +66,7 @@ class WbExpWQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WbExpWQtWidget(WbExpWQt* parent_ctx, QWidget* parent)
-      : QWidget(), expw(parent_ctx)
-  {
-  }
+  WbExpWQtWidget(WbExpWQt* parent_ctx) : QWidget(), expw(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_expwnav_qt.cpp

@@ -42,8 +42,8 @@
 
 #include "wb_expwnav_qt.h"
 
-WbExpWNavQt::WbExpWNavQt(void* l_parent_ctx, QWidget* l_parent_wid,
-    ldh_tSession l_ldhses, int l_type, int l_editmode, QWidget** w)
+WbExpWNavQt::WbExpWNavQt(void* l_parent_ctx, ldh_tSession l_ldhses, int l_type,
+    int l_editmode, QWidget** w)
     : WbExpWNav(l_parent_ctx, l_ldhses, l_type, l_editmode)
 {
   form_widget

wb/lib/wb/qt/wb_expwnav_qt.h

@@ -45,8 +45,8 @@
 
 class WbExpWNavQt : public WbExpWNav {
 public:
-  WbExpWNavQt(void* expw_parent_ctx, QWidget* expw_parent_wid,
-      ldh_tSession expw_ldhses, int l_type, int l_editmode, QWidget** w);
+  WbExpWNavQt(void* expw_parent_ctx, ldh_tSession expw_ldhses, int l_type,
+      int l_editmode, QWidget** w);
   ~WbExpWNavQt();
 
   QWidget* brow_widget;

wb/lib/wb/qt/wb_foe_qt.cqt

@@ -107,7 +107,7 @@ void WFoeQtWidget::activate_history()
 
   strcpy(title, "History ");
   strcat(title, wname);
-  CoLogWQt* logw = new CoLogWQt(this, this, title, 0, &sts);
+  CoLogWQt* logw = new CoLogWQt(foe, title, 0, &sts);
   logw->CoLogW::show(categories, wname);
 }
 
@@ -556,15 +556,14 @@ WAtt* WFoeQt::watt_new(void* a_parent_ctx, ldh_tSesContext a_ldhses,
     pwr_sAttrRef a_aref, int a_editmode, int a_advanced_user,
     int a_display_objectname)
 {
-  return new WAttQt(toplevel->parentWidget(), a_parent_ctx, a_ldhses, a_aref,
-      a_editmode, a_advanced_user, a_display_objectname);
+  return new WAttQt(a_parent_ctx, a_ldhses, a_aref, a_editmode, a_advanced_user,
+      a_display_objectname);
 }
 
 WAttText* WFoeQt::watttext_new(void* a_parent_ctx, ldh_tSesContext a_ldhses,
     pwr_sAttrRef a_aref, int a_editmode, pwr_tStatus* status)
 {
-  return new WAttTextQt(toplevel->parentWidget(), a_parent_ctx, a_ldhses,
-      a_aref, a_editmode, status);
+  return new WAttTextQt(a_parent_ctx, a_ldhses, a_aref, a_editmode, status);
 }
 
 // Destroys a foe instance.
@@ -603,7 +602,7 @@ WFoe* WFoeQt::subwindow_new(void* f_parent_ctx, char* f_name,
     int f_map_window, ldh_eAccess f_access, foe_eFuncAccess function_access,
     unsigned int f_options, pwr_tStatus* sts)
 {
-  WFoeQt* foe = new WFoeQt(f_parent_ctx, foe_window, f_name, plcprogram,
+  WFoeQt* foe = new WFoeQt(f_parent_ctx, f_name, plcprogram,
       ldhwbctx, ldhsesctx, nodeobject, windowindex, new_window, f_map_window,
       f_access, function_access, f_options, sts);
   if (ODD(*sts)) {
@@ -672,24 +671,22 @@ void WFoeQt::popupmsg(const char* new_label, void (*yes_procedure)(WFoe*),
   }
 }
 
-WFoeQt::WFoeQt(void* f_parent_ctx, QWidget* f_parent_wid, const char* f_name,
-    pwr_tObjid plcprogram, ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx,
-    vldh_t_node nodeobject, unsigned long windowindex, unsigned long new_window,
-    int f_map_window, ldh_eAccess f_access, foe_eFuncAccess function_access,
-    unsigned int f_options, pwr_tStatus* sts)
-    : WFoe(f_parent_ctx, f_name, plcprogram, ldhwbctx, ldhsesctx, nodeobject,
-          windowindex, new_window, f_map_window, f_access, function_access,
-          f_options, sts)
+WFoeQt::WFoeQt(void* f_parent_ctx, const char* f_name, pwr_tObjid plcprogram,
+    ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx, vldh_t_node nodeobject,
+    unsigned long windowindex, unsigned long new_window, int f_map_window,
+    ldh_eAccess f_access, foe_eFuncAccess function_access,
+    unsigned int f_options, pwr_tStatus* sts) : WFoe(f_parent_ctx, f_name,
+        plcprogram, ldhwbctx, ldhsesctx, nodeobject, windowindex, new_window,
+        f_map_window, f_access, function_access, f_options, sts)
 {
-  toplevel = new WFoeQtWidget(this, f_parent_wid);
+  toplevel = new WFoeQtWidget(this);
   *sts = new_local(plcprogram, ldhwbctx, ldhsesctx, nodeobject, windowindex,
       new_window, function_access);
 }
 
-WFoeQt::WFoeQt(void* f_parent_ctx, QWidget* f_parent_wid, const char* f_name,
-    pwr_tObjid plcprogram, ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx,
-    int f_map_window, ldh_eAccess f_access, unsigned int f_options,
-    pwr_tStatus* sts)
+WFoeQt::WFoeQt(void* f_parent_ctx, const char* f_name, pwr_tObjid plcprogram,
+    ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx, int f_map_window,
+    ldh_eAccess f_access, unsigned int f_options, pwr_tStatus* sts)
     : WFoe(f_parent_ctx, f_name, plcprogram, ldhwbctx, ldhsesctx, f_map_window,
           f_access, f_options, sts)
 {
@@ -715,7 +712,7 @@ WFoeQt::WFoeQt(void* f_parent_ctx, QWidget* f_parent_wid, const char* f_name,
   }
 
   strcpy(name, new_name);
-  toplevel = new WFoeQtWidget(this, f_parent_wid);
+  toplevel = new WFoeQtWidget(this);
   *sts = new_local(
       plcprogram, ldhwbctx, ldhsesctx, 0, 0, 0, foe_eFuncAccess_Edit);
 }
@@ -1037,16 +1034,16 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
 
   subpane = new QSplitter(Qt::Vertical);
   QHBoxLayout* palbox = new QHBoxLayout();
-  node_palctx = new PalQt(this, subpane, "Objects", ldhsession,
-      "PlcEditorPalette", &node_palette, &sts);
+  node_palctx = new PalQt(this, "Objects", ldhsession, "PlcEditorPalette",
+      &node_palette, &sts);
   node_palette_managed = 1;
   node_palctx->select_cb = pal_select_cb;
 
-  con_palctx = new PalQt(this, subpane, "Connections", ldhsession,
-      "PlcEditorConPalette", &con_palette, &sts);
+  con_palctx = new PalQt(this, "Connections", ldhsession, "PlcEditorConPalette",
+      &con_palette, &sts);
 
-  navctx = new NavQt(
-      this, subpane, "Plant", ldhsession, "NavigatorW1", &nav_palette, &sts);
+  navctx = new NavQt(this, "Plant", ldhsession, "NavigatorW1", &nav_palette,
+      &sts);
 
   add_expanding(palbox, node_palette);
   add_expanding(palbox, con_palette);
@@ -1055,7 +1052,7 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
   add_expanding(subpane, palbox);
 
   pane = new QSplitter(Qt::Horizontal);
-  gre = new WGreQt(this, pane, "Name");
+  gre = new WGreQt(this, "Name");
 
   ((WGreQt*)gre)->new_navigator(subpane);
   subpane->addWidget(((WGreQt*)gre)->nav_widget);

wb/lib/wb/qt/wb_foe_qt.h

@@ -55,7 +55,6 @@ public:
   QSplitter* pane;
   QSplitter* subpane;
   QWidget* caution;
-  QWidget* foe_window;
   QWidget* popupmenu;
   QAction* save;
   QAction* exit;
@@ -115,12 +114,11 @@ public:
   QAction* select_cp_nextdown;
   CoWowFocusTimerQt focustimer;
 
-  WFoeQt(void* f_parent_ctx, QWidget* f_parent_wid, const char* f_name,
-      pwr_tObjid plcprogram, ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx,
-      int f_map_window, ldh_eAccess f_access, unsigned int f_options,
-      pwr_tStatus* sts);
-  WFoeQt(void* f_parent_ctx, QWidget* f_parent_wid, const char* f_name,
-      pwr_tObjid plcprogram, ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx,
+  WFoeQt(void* f_parent_ctx, const char* f_name, pwr_tObjid plcprogram,
+      ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx, int f_map_window,
+      ldh_eAccess f_access, unsigned int f_options, pwr_tStatus* sts);
+  WFoeQt(void* f_parent_ctx, const char* f_name, pwr_tObjid plcprogram,
+      ldh_tWBContext ldhwbctx, ldh_tSesContext ldhsesctx,
       vldh_t_node nodeobject, unsigned long windowindex,
       unsigned long new_window, int f_map_window, ldh_eAccess f_access,
       foe_eFuncAccess function_access, unsigned int f_options,
@@ -161,9 +159,7 @@ class WFoeQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WFoeQtWidget(WFoeQt* parent_ctx, QWidget* parent) : QWidget(), foe(parent_ctx)
-  {
-  }
+  WFoeQtWidget(WFoeQt* parent_ctx) : QWidget(), foe(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_gre_qt.cqt

@@ -49,8 +49,7 @@
 
 #include <QTimer>
 
-WGreQt::WGreQt(void* wg_parent_ctx, QWidget* wg_parent_wid, const char* name)
-    : WGre(wg_parent_ctx, 0)
+WGreQt::WGreQt(void* wg_parent_ctx, const char* name) : WGre(wg_parent_ctx, 0)
 {
   trace_obj = new WGreQtTraceObject(this);
   trace_timerid = new QTimer(trace_obj);

wb/lib/wb/qt/wb_gre_qt.h

@@ -52,7 +52,7 @@ public:
 
   QTimer* trace_timerid;
 
-  WGreQt(void* parent_ctx, QWidget* parent_wid, const char* name);
+  WGreQt(void* parent_ctx, const char* name);
   ~WGreQt();
 
   void trace_start();
@@ -70,9 +70,7 @@ class WGreQtTraceObject : public QObject {
   Q_OBJECT
 
 public:
-  WGreQtTraceObject(WGreQt* parent) : QObject(), wgre(parent)
-  {
-  }
+  WGreQtTraceObject(WGreQt* parent) : QObject(), wgre(parent) {}
 
 public slots:
   void trace_scan();

wb/lib/wb/qt/wb_nav_qt.cqt

@@ -46,9 +46,9 @@
 
 #include <qlocalsocket.h>
 
-NavQt::NavQt(void* nav_parent_ctx, QWidget* nav_parent_wid,
-    const char* nav_name, ldh_tSesContext nav_ldhses, const char* nav_root_name,
-    QWidget** w, pwr_tStatus* status)
+NavQt::NavQt(void* nav_parent_ctx, const char* nav_name,
+    ldh_tSesContext nav_ldhses, const char* nav_root_name, QWidget** w,
+    pwr_tStatus* status)
     : Nav(nav_parent_ctx, nav_name, nav_ldhses, nav_root_name, status)
 {
   trace_obj = new NavQtTraceObject(this);

wb/lib/wb/qt/wb_nav_qt.h

@@ -49,9 +49,8 @@ class NavQtTraceObject;
 
 class NavQt : public Nav {
 public:
-  NavQt(void* parent_ctx, QWidget* parent_wid, const char* name,
-      ldh_tSesContext ldhses, const char* root_name, QWidget** w,
-      pwr_tStatus* status);
+  NavQt(void* parent_ctx, const char* name, ldh_tSesContext ldhses,
+      const char* root_name, QWidget** w, pwr_tStatus* status);
   ~NavQt();
 
   QWidget* brow_widget;
@@ -70,9 +69,7 @@ class NavQtTraceObject : public QObject {
   Q_OBJECT
 
 public:
-  NavQtTraceObject(NavQt* parent) : QObject(), nav(parent)
-  {
-  }
+  NavQtTraceObject(NavQt* parent) : QObject(), nav(parent) {}
 
 public slots:
   void sel_convert_cb();

wb/lib/wb/qt/wb_pal_qt.cqt

@@ -46,9 +46,9 @@
 
 #include <qlocalsocket.h>
 
-PalQt::PalQt(void* pal_parent_ctx, QWidget* pal_parent_wid,
-    const char* pal_name, ldh_tSesContext pal_ldhses, const char* pal_root_name,
-    QWidget** w, pwr_tStatus* status)
+PalQt::PalQt(void* pal_parent_ctx, const char* pal_name,
+    ldh_tSesContext pal_ldhses, const char* pal_root_name, QWidget** w,
+    pwr_tStatus* status)
     : Pal(pal_parent_ctx, pal_name, pal_ldhses, pal_root_name, status)
 {
   trace_obj = new PalQtTraceObject(this);

wb/lib/wb/qt/wb_pal_qt.h

@@ -47,9 +47,8 @@ class PalQtTraceObject;
 
 class PalQt : public Pal {
 public:
-  PalQt(void* parent_ctx, QWidget* parent_wid, const char* name,
-      ldh_tSesContext ldhses, const char* root_name, QWidget** w,
-      pwr_tStatus* status);
+  PalQt(void* parent_ctx, const char* name, ldh_tSesContext ldhses,
+      const char* root_name, QWidget** w, pwr_tStatus* status);
   ~PalQt();
 
   QWidget* brow_widget;
@@ -69,9 +68,7 @@ class PalQtTraceObject : public QObject {
   Q_OBJECT
 
 public:
-  PalQtTraceObject(PalQt* parent) : QObject(), pal(parent)
-  {
-  }
+  PalQtTraceObject(PalQt* parent) : QObject(), pal(parent) {}
 
 public slots:
   void sel_convert_cb();

wb/lib/wb/qt/wb_uted_qt.cqt

@@ -143,14 +143,13 @@ void WUtedQt::update_title(int editmode)
   CoWowQt::update_title(toplevel, editmode);
 }
 
-WUtedQt::WUtedQt(void* wu_parent_ctx, QWidget* wu_parent_wid,
-    const char* wu_name, const char* wu_iconname, ldh_tWBContext wu_ldhwb,
-    ldh_tSesContext wu_ldhses, int wu_editmode, void (*wu_quit_cb)(void*),
-    pwr_tStatus* status)
+WUtedQt::WUtedQt(void* wu_parent_ctx, const char* wu_name,
+    const char* wu_iconname, ldh_tWBContext wu_ldhwb, ldh_tSesContext wu_ldhses,
+    int wu_editmode, void (*wu_quit_cb)(void*), pwr_tStatus* status)
     : WUted(wu_parent_ctx, wu_name, wu_iconname, wu_ldhwb, wu_ldhses,
           wu_editmode, wu_quit_cb, status)
 {
-  toplevel = new WUtedQtWidget(this, wu_parent_wid);
+  toplevel = new WUtedQtWidget(this);
   toplevel->setMinimumSize(800, 400);
   toplevel->setWindowTitle(fl("Wb Utilities"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

wb/lib/wb/qt/wb_uted_qt.h

@@ -56,10 +56,9 @@ public:
   QCheckBox* present[UTED_QUALS];
   QAction* optmenubuttons[UTED_MAX_COMMANDS];
 
-  WUtedQt(void* wu_parent_ctx, QWidget* wu_parent_wid, const char* wu_name,
-      const char* wu_iconname, ldh_tWBContext wu_ldhwb,
-      ldh_tSesContext wu_ldhses, int wu_editmode, void (*wu_quit_cb)(void*),
-      pwr_tStatus* status);
+  WUtedQt(void* wu_parent_ctx, const char* wu_name, const char* wu_iconname,
+      ldh_tWBContext wu_ldhwb, ldh_tSesContext wu_ldhses, int wu_editmode,
+      void (*wu_quit_cb)(void*), pwr_tStatus* status);
   ~WUtedQt();
   void remove_command_window();
   void reset_qual();
@@ -85,10 +84,7 @@ class WUtedQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WUtedQtWidget(WUtedQt* parent_ctx, QWidget* parent)
-      : QWidget(), uted(parent_ctx)
-  {
-  }
+  WUtedQtWidget(WUtedQt* parent_ctx) : QWidget(), uted(parent_ctx) {}
 
 protected:
   void closeEvent(QCloseEvent* event);

wb/lib/wb/qt/wb_utl_qt.cpp

@@ -59,8 +59,8 @@ int wb_utl_qt::utl_foe_new(const char* name, pwr_tOid plcpgm,
 
   *foe = WFoe::get(plcpgm);
   if (!*foe) {
-    *foe = new WFoeQt(0, widget, name, plcpgm, ldhwbctx, ldhsesctx, map_window,
-        access, 0, &sts);
+    *foe = new WFoeQt(0, name, plcpgm, ldhwbctx, ldhsesctx, map_window, access,
+        0, &sts);
   }
   return sts;
 }
@@ -74,9 +74,8 @@ int wb_utl_qt::utl_foe_new_local(WFoe* foe, const char* name, pwr_tOid plcpgm,
 
   *return_foe = WFoe::get(plcpgm);
   if (!*return_foe) {
-    *return_foe = new WFoeQt(foe, ((WFoeQt*)foe)->foe_window, name, plcpgm,
-        ldhwbctx, ldhsesctx, nodeobject, windowindex, new_window, map_window,
-        access, function_access, 0, &sts);
+    *return_foe = new WFoeQt(foe, name, plcpgm, ldhwbctx, ldhsesctx, nodeobject,
+        windowindex, new_window, map_window, access, function_access, 0, &sts);
   }
   return sts;
 }

wb/lib/wb/qt/wb_utl_qt.h

@@ -45,13 +45,9 @@ class wb_utl_qt : public wb_utl {
 public:
   QWidget* widget;
 
-  wb_utl_qt(QWidget* w) : widget(w)
-  {
-  }
+  wb_utl_qt(QWidget* w) : widget(w) {}
 
-  ~wb_utl_qt()
-  {
-  }
+  ~wb_utl_qt() {}
 
   int create_mainwindow(int argc, char** argv);
   int destroy_mainwindow();

wb/lib/wb/qt/wb_vsel_qt.cqt

@@ -162,7 +162,6 @@ void WVselQtWidget::activate_showall(bool set)
 *
 * Type		Parameter	IOGF	Description
 * void 		*parent_ctx	I	Parent context adress
-* Widget	parent_wid	I	Parent Widget adress
 * char *	name		I	Name of the created object
 *
 * Description:
@@ -170,10 +169,9 @@ void WVselQtWidget::activate_showall(bool set)
 **************************************************************************/
 
 WVselQt::WVselQt(pwr_tStatus* status, void* wv_parent_ctx,
-    QWidget* wv_parent_wid, const char* wv_name, ldh_tWBContext wv_wbctx,
-    char* volumename, int (*bc_success)(void*, pwr_tVolumeId*, int),
-    void (*bc_cancel)(), int (*bc_time_to_exit)(void*), int show_volumes,
-    wb_eType wv_wb_type)
+    const char* wv_name, ldh_tWBContext wv_wbctx, char* volumename,
+    int (*bc_success)(void*, pwr_tVolumeId*, int), void (*bc_cancel)(),
+    int (*bc_time_to_exit)(void*), int show_volumes, wb_eType wv_wb_type)
     : WVsel(status, wv_parent_ctx, wv_name, wv_wbctx, volumename, bc_success,
           bc_cancel, bc_time_to_exit, show_volumes, wv_wb_type)
 {
@@ -244,7 +242,7 @@ WVselQt::WVselQt(pwr_tStatus* status, void* wv_parent_ctx,
   }
 
   // Create the window
-  toplevel = new WVselQtWidget(this, wv_parent_wid);
+  toplevel = new WVselQtWidget(this);
   toplevel->setMinimumSize(500, 400);
   toplevel->setWindowTitle(fl(name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

wb/lib/wb/qt/wb_vsel_qt.h

@@ -47,8 +47,8 @@ class WVselQtWidget;
 
 class WVselQt : public WVsel {
 public:
-  WVselQt(pwr_tStatus* status, void* wv_parent_ctx, QWidget* wv_parent_wid,
-      const char* wv_name, ldh_tWBContext wv_wbctx, char* volumename,
+  WVselQt(pwr_tStatus* status, void* wv_parent_ctx, const char* wv_name,
+      ldh_tWBContext wv_wbctx, char* volumename,
       int (*bc_success)(void*, pwr_tVolumeId*, int), void (*bc_cancel)(),
       int (*bc_time_to_exit)(void*), int show_volumes, wb_eType wv_wb_type);
 
@@ -63,10 +63,7 @@ class WVselQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WVselQtWidget(WVselQt* parent_ctx, QWidget* parent)
-      : QWidget(), sel(parent_ctx)
-  {
-  }
+  WVselQtWidget(WVselQt* parent_ctx) : QWidget(), sel(parent_ctx) {}
 
 public slots:
   // Backcall functions from uil

wb/lib/wb/qt/wb_watt_qt.cqt

@@ -371,11 +371,10 @@ WAttQt::~WAttQt()
   delete wattnav;
 }
 
-WAttQt::WAttQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
-    ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref, int wa_editmode,
-    int wa_advanced_user, int wa_display_objectname)
-    : WAtt(wa_parent_ctx, wa_ldhses, wa_aref, wa_editmode, wa_advanced_user,
-          wa_display_objectname)
+WAttQt::WAttQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
+    pwr_sAttrRef wa_aref, int wa_editmode, int wa_advanced_user,
+    int wa_display_objectname) : WAtt(wa_parent_ctx, wa_ldhses, wa_aref,
+        wa_editmode, wa_advanced_user, wa_display_objectname)
 {
   int sts;
   int size;
@@ -386,7 +385,7 @@ WAttQt::WAttQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
     return;
   }
 
-  toplevel = new WAttQtWidget(this, wa_parent_wid);
+  toplevel = new WAttQtWidget(this);
   toplevel->setMinimumSize(410, 570);
   toplevel->setWindowTitle(fl(namep));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -421,8 +420,8 @@ WAttQt::WAttQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
   }
   utility = ((WUtility*)parent_ctx)->utype;
 
-  wattnav = new WAttNavQt(this, wattnav_eType_Object, pane, "Plant", ldhses,
-      aref, wa_editmode, wa_advanced_user, wa_display_objectname, utility,
+  wattnav = new WAttNavQt(this, wattnav_eType_Object, "Plant", ldhses, aref,
+      wa_editmode, wa_advanced_user, wa_display_objectname, utility,
       &brow_widget, &sts);
   wattnav->message_cb = &WAtt::message_cb;
   wattnav->change_value_cb = &WAtt::change_value_cb;

wb/lib/wb/qt/wb_watt_qt.h

@@ -51,9 +51,8 @@ class WAttQtWidget;
 
 class WAttQt : public WAtt {
 public:
-  WAttQt(QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
-      pwr_sAttrRef wa_aref, int wa_editmode, int wa_advanced_user,
-      int wa_display_objectname);
+  WAttQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref,
+      int wa_editmode, int wa_advanced_user, int wa_display_objectname);
   ~WAttQt();
   QWidget* brow_widget;
   QWidget* form_widget;
@@ -84,10 +83,7 @@ class WAttQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WAttQtWidget(WAttQt* parent_ctx, QWidget* parent)
-      : QWidget(), watt(parent_ctx)
-  {
-  }
+  WAttQtWidget(WAttQt* parent_ctx) : QWidget(), watt(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_wattnav_qt.cpp

@@ -45,10 +45,9 @@
 #include "wb_wattnav_qt.h"
 
 WAttNavQt::WAttNavQt(void* wa_parent_ctx, wattnav_eType wa_type,
-    QWidget* wa_parent_wid, const char* wa_name, ldh_tSesContext wa_ldhses,
-    pwr_sAttrRef wa_aref, int wa_editmode, int wa_advanced_user,
-    int wa_display_objectname, wb_eUtility wa_utility, QWidget** w,
-    pwr_tStatus* status)
+    const char* wa_name, ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref,
+    int wa_editmode, int wa_advanced_user, int wa_display_objectname,
+    wb_eUtility wa_utility, QWidget** w, pwr_tStatus* status)
     : WAttNav(wa_parent_ctx, wa_type, wa_name, wa_ldhses, wa_aref, wa_editmode,
           wa_advanced_user, wa_display_objectname, wa_utility, status)
 {

wb/lib/wb/qt/wb_wattnav_qt.h

@@ -43,10 +43,10 @@
 
 class WAttNavQt : public WAttNav {
 public:
-  WAttNavQt(void* wa_parent_ctx, wattnav_eType wa_type, QWidget* wa_parent_wid,
-      const char* wa_name, ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref,
-      int wa_editmode, int wa_advanced_user, int wa_display_objectname,
-      wb_eUtility wa_utility, QWidget** w, pwr_tStatus* status);
+  WAttNavQt(void* wa_parent_ctx, wattnav_eType wa_type, const char* wa_name,
+      ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref, int wa_editmode,
+      int wa_advanced_user, int wa_display_objectname, wb_eUtility wa_utility,
+      QWidget** w, pwr_tStatus* status);
   ~WAttNavQt();
 
   QWidget* brow_widget;

wb/lib/wb/qt/wb_watttext_qt.cqt

@@ -179,9 +179,8 @@ WAttTextQt::~WAttTextQt()
   }
 }
 
-WAttTextQt::WAttTextQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
-    ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref, int wa_editmode,
-    pwr_tStatus* status)
+WAttTextQt::WAttTextQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
+    pwr_sAttrRef wa_aref, int wa_editmode, pwr_tStatus* status)
     : WAttText(wa_parent_ctx, wa_ldhses, wa_aref, wa_editmode, status), init(1)
 {
   int sts;
@@ -198,7 +197,7 @@ WAttTextQt::WAttTextQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
     return;
   }
 
-  toplevel = new WAttTextQtWidget(this, wa_parent_wid);
+  toplevel = new WAttTextQtWidget(this);
   toplevel->setMinimumSize(800, 700);
   toplevel->setWindowTitle(fl(namep));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

wb/lib/wb/qt/wb_watttext_qt.h

@@ -48,9 +48,8 @@ class WAttTextQtWidget;
 
 class WAttTextQt : public WAttText {
 public:
-  WAttTextQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
-      ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref, int wa_editmode,
-      pwr_tStatus* status);
+  WAttTextQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
+      pwr_sAttrRef wa_aref, int wa_editmode, pwr_tStatus* status);
   ~WAttTextQt();
   QLabel* msg_label;
   QTextEdit* textbuffer;
@@ -70,10 +69,7 @@ class WAttTextQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WAttTextQtWidget(WAttTextQt* parent_ctx, QWidget* parent)
-      : QWidget(), atxt(parent_ctx)
-  {
-  }
+  WAttTextQtWidget(WAttTextQt* parent_ctx) : QWidget(), atxt(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_wda_qt.cqt

@@ -461,16 +461,15 @@ void WdaQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-WdaQt::WdaQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
-    ldh_tSesContext wa_ldhses, pwr_tObjid wa_objid, pwr_tClassId wa_classid,
-    const char* wa_attribute, int wa_editmode, int wa_advanced_user,
-    int wa_display_objectname)
+WdaQt::WdaQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
+    pwr_tObjid wa_objid, pwr_tClassId wa_classid, const char* wa_attribute,
+    int wa_editmode, int wa_advanced_user, int wa_display_objectname)
     : Wda(wa_parent_ctx, wa_ldhses, wa_objid, wa_classid, wa_attribute,
           wa_editmode, wa_advanced_user, wa_display_objectname)
 {
   int sts;
 
-  toplevel = new WdaQtWidget(this, wa_parent_wid);
+  toplevel = new WdaQtWidget(this);
   toplevel->setMinimumSize(700, 700);
   toplevel->setWindowTitle(fl("Spreadsheet Editor"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -513,7 +512,7 @@ WdaQt::WdaQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
   pane = new QSplitter(Qt::Vertical);
 
   utility = ((WUtility*)parent_ctx)->utype;
-  wdanav = new WdaNavQt(this, pane, "Plant", ldhses, objid, classid, attribute,
+  wdanav = new WdaNavQt(this, "Plant", ldhses, objid, classid, attribute,
       wa_editmode, wa_advanced_user, wa_display_objectname, utility,
       &brow_widget, &sts);
   wdanav->message_cb = &Wda::message_cb;

wb/lib/wb/qt/wb_wda_qt.h

@@ -52,9 +52,9 @@ class WdaQtWidget;
 
 class WdaQt : public Wda {
 public:
-  WdaQt(QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
-      pwr_tObjid wa_objid, pwr_tClassId wa_classid, const char* wa_attribute,
-      int wa_editmode, int wa_advanced_user, int wa_display_objectname);
+  WdaQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses, pwr_tObjid wa_objid,
+      pwr_tClassId wa_classid, const char* wa_attribute, int wa_editmode,
+      int wa_advanced_user, int wa_display_objectname);
   ~WdaQt();
   QWidget* brow_widget;
   QWidget* form_widget;
@@ -85,9 +85,7 @@ class WdaQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WdaQtWidget(WdaQt* parent_ctx, QWidget* parent) : QWidget(), wda(parent_ctx)
-  {
-  }
+  WdaQtWidget(WdaQt* parent_ctx) : QWidget(), wda(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_wdanav_qt.cpp

@@ -42,14 +42,13 @@
 
 #include "wb_wdanav_qt.h"
 
-WdaNavQt::WdaNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid,
-    const char* wa_name, ldh_tSesContext wa_ldhses, pwr_tObjid wa_objid,
-    pwr_tClassId wa_classid, char* wa_attribute, int wa_editmode,
-    int wa_advanced_user, int wa_display_objectname, wb_eUtility wa_utility,
-    QWidget** w, pwr_tStatus* status)
-    : WdaNav(wa_parent_ctx, wa_name, wa_ldhses, wa_objid, wa_classid,
-          wa_attribute, wa_editmode, wa_advanced_user, wa_display_objectname,
-          wa_utility, status)
+WdaNavQt::WdaNavQt(void* wa_parent_ctx, const char* wa_name,
+    ldh_tSesContext wa_ldhses, pwr_tObjid wa_objid, pwr_tClassId wa_classid,
+    char* wa_attribute, int wa_editmode, int wa_advanced_user,
+    int wa_display_objectname, wb_eUtility wa_utility, QWidget** w,
+    pwr_tStatus* status) : WdaNav(wa_parent_ctx, wa_name, wa_ldhses, wa_objid,
+        wa_classid, wa_attribute, wa_editmode, wa_advanced_user,
+        wa_display_objectname, wa_utility, status)
 {
   form_widget
       = scrolledbrowwidgetqt_new(WdaNav::init_brow_cb, this, &brow_widget);

wb/lib/wb/qt/wb_wdanav_qt.h

@@ -41,11 +41,10 @@
 
 class WdaNavQt : public WdaNav {
 public:
-  WdaNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid, const char* wa_name,
-      ldh_tSesContext wa_ldhses, pwr_tObjid wa_objid, pwr_tClassId wa_classid,
-      char* wa_attribute, int wa_editmode, int wa_advanced_user,
-      int wa_display_objectname, wb_eUtility wa_utility, QWidget** w,
-      pwr_tStatus* status);
+  WdaNavQt(void* wa_parent_ctx, const char* wa_name, ldh_tSesContext wa_ldhses,
+      pwr_tObjid wa_objid, pwr_tClassId wa_classid, char* wa_attribute,
+      int wa_editmode, int wa_advanced_user, int wa_display_objectname,
+      wb_eUtility wa_utility, QWidget** w, pwr_tStatus* status);
   ~WdaNavQt();
 
   QWidget* brow_widget;

wb/lib/wb/qt/wb_wge_qt.cqt

@@ -177,10 +177,9 @@ void WGeQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-WGeQt::WGeQt(QWidget* wge_parent_wid, void* wge_parent_ctx, char* wge_name,
-    char* wge_filename, int wge_scrollbar, int wge_menu, int wge_navigator,
-    int wge_width, int wge_height, int x, int y, char* object_name,
-    int wge_modal = 0)
+WGeQt::WGeQt(void* wge_parent_ctx, char* wge_name, char* wge_filename,
+    int wge_scrollbar, int wge_menu, int wge_navigator, int wge_width,
+    int wge_height, int x, int y, char* object_name, int wge_modal = 0)
     : WGe(wge_parent_ctx, wge_name, wge_filename, wge_scrollbar, wge_menu,
           wge_navigator, wge_width, wge_height, x, y, object_name, wge_modal),
       value_dialog(0)
@@ -197,7 +196,7 @@ WGeQt::WGeQt(QWidget* wge_parent_wid, void* wge_parent_ctx, char* wge_name,
   str_StrncpyCutOff(title, name, sizeof(title), 1);
 
   // Qt
-  toplevel = new WGeQtWidget(this, wge_parent_wid);
+  toplevel = new WGeQtWidget(this);
   toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -209,7 +208,7 @@ WGeQt::WGeQt(QWidget* wge_parent_wid, void* wge_parent_ctx, char* wge_name,
   }
 
   QVBoxLayout* graph_form = new QVBoxLayout();
-  graph = new GraphQt(this, toplevel, "Plant", &grow_widget, &sts, "pwrp_exe:",
+  graph = new GraphQt(this, "Plant", &grow_widget, &sts, "pwrp_exe:",
       graph_eMode_Runtime, scrollbar, 1, object_name, 0, 0);
   graph->message_cb = &message;
   graph->close_cb = &graph_close_cb;

wb/lib/wb/qt/wb_wge_qt.h

@@ -60,9 +60,9 @@ public:
   void set_size(int width, int height);
   void set_subwindow_release();
 
-  WGeQt(QWidget* parent_wid, void* parent_ctx, char* name, char* filename,
-      int scrollbar, int menu, int navigator, int width, int height, int x,
-      int y, char* object_name, int modal);
+  WGeQt(void* parent_ctx, char* name, char* filename, int scrollbar, int menu,
+      int navigator, int width, int height, int x, int y, char* object_name,
+      int modal);
   ~WGeQt();
 
   static void change_value_cb(void* ge_ctx, void* value_object, char* text);
@@ -77,9 +77,7 @@ class WGeQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WGeQtWidget(WGeQt* parent_ctx, QWidget* parent) : QWidget(), ge(parent_ctx)
-  {
-  }
+  WGeQtWidget(WGeQt* parent_ctx) : QWidget(), ge(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_wnav_qt.cqt

@@ -214,13 +214,13 @@ Ge* WNavQt::ge_new(char* graph_name, int nojournal)
     options |= ge_mOption_IgnoreJournal;
   }
 
-  return new GeQt(NULL, form_widget, ldhses, 0, options, graph_name);
+  return new GeQt(NULL, ldhses, 0, options, graph_name);
 }
 
 WGe* WNavQt::wge_new(char* name, char* filename, char* object_name, int modal)
 {
-  return new WGeQt(parent_wid, this, name, filename, 0, 1, 1, 0, 0, 0, 0,
-      object_name, modal);
+  return new WGeQt(this, name, filename, 0, 1, 1, 0, 0, 0, 0, object_name,
+      modal);
 }
 
 wb_utl* WNavQt::utl_new()
@@ -230,7 +230,7 @@ wb_utl* WNavQt::utl_new()
 
 WRev* WNavQt::rev_new()
 {
-  return new WRevQt(parent_wid, this, ldhses);
+  return new WRevQt(this, ldhses);
 }
 
 void WNavQt::logw_new(char* item, wlog_eCategory* categories, int show_item)
@@ -259,7 +259,7 @@ void WNavQt::logw_new(char* item, wlog_eCategory* categories, int show_item)
     title[strlen(title) - 1] = 0;
   }
 
-  CoLogWQt* logw = new CoLogWQt(this, parent_wid, title, show_item, &sts);
+  CoLogWQt* logw = new CoLogWQt(this, title, show_item, &sts);
   if (categories) {
     logw->CoLogW::show(categories_str, item);
   } else {
@@ -385,8 +385,8 @@ int WNavQt::open_foe(const char* name, pwr_tOid plcpgm, void** foectx,
   if (foe) {
     foe->pop();
   } else {
-    foe = new WFoeQt((void*)this, parent_wid, name, plcpgm, wbctx, ldhses,
-        map_window, access, options, &sts);
+    foe = new WFoeQt((void*)this, name, plcpgm, wbctx, ldhses, map_window,
+        access, options, &sts);
     if (EVEN(sts)) {
       return sts;
     }
@@ -402,7 +402,7 @@ int WNavQt::open_foe(const char* name, pwr_tOid plcpgm, void** foectx,
 void WNavQt::wda_new(pwr_tOid oid, pwr_tCid cid, char* attribute, int edit_mode,
     int advuser, int display_objectname)
 {
-  new WdaQt(parent_wid, this, ldhses, oid, cid, attribute, edit_mode, advuser,
+  new WdaQt(this, ldhses, oid, cid, attribute, edit_mode, advuser,
       display_objectname);
 }
 
@@ -415,23 +415,23 @@ CoLogin* WNavQt::login_new(const char* name, const char* groupname,
 
 WCrr* WNavQt::wcrr_new(pwr_tAttrRef* aref, pwr_tStatus* status)
 {
-  return new WCrrQt(parent_wid, this, ldhses, aref, gbl.advanced_user, status);
+  return new WCrrQt(this, ldhses, aref, gbl.advanced_user, status);
 }
 
 WbBckW* WNavQt::bckw_new(char* name, wb_bck_list* list, pwr_tStatus* status)
 {
-  return new WbBckWQt(this, parent_wid, ldhses, name, list, editmode, status);
+  return new WbBckWQt(this, ldhses, name, list, editmode, status);
 }
 
 WbExpW* WNavQt::expw_new(char* name, int type, pwr_tStatus* status)
 {
-  return new WbExpWQt(this, parent_wid, ldhses, name, type, 1, status);
+  return new WbExpWQt(this, ldhses, name, type, 1, status);
 }
 
 WAttText* WNavQt::watttext_new(
     pwr_tAttrRef aref, int editmode, pwr_tStatus* status)
 {
-  return new WAttTextQt(parent_wid, this, ldhses, aref, editmode, status);
+  return new WAttTextQt(this, ldhses, aref, editmode, status);
 }
 
 void WNavQt::wge_subwindow_loop(WGe* wge)

wb/lib/wb/qt/wb_wpkg_qt.cqt

@@ -120,7 +120,7 @@ void WPkgQtWidget::activate_history()
   strcpy(categories[2], "");
 
   strcpy(title, "Distributor History");
-  CoLogWQt* logw = new CoLogWQt(this, this, title, 1, &sts);
+  CoLogWQt* logw = new CoLogWQt(pkg, title, 1, &sts);
   logw->CoLogW::show(categories, 0);
 }
 
@@ -170,12 +170,11 @@ void WPkgQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-WPkgQt::WPkgQt(QWidget* wa_parent_wid, void* wa_parent_ctx)
-    : WPkg(wa_parent_ctx)
+WPkgQt::WPkgQt(void* wa_parent_ctx) : WPkg(wa_parent_ctx)
 {
   int sts;
 
-  toplevel = new WPkgQtWidget(this, wa_parent_wid);
+  toplevel = new WPkgQtWidget(this);
   toplevel->setMinimumSize(600, 600);
   toplevel->setWindowTitle(fl("Distributor"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -233,7 +232,7 @@ WPkgQt::WPkgQt(QWidget* wa_parent_wid, void* wa_parent_ctx)
   QVBoxLayout* vbox = new QVBoxLayout(toplevel);
 
   utility = ((WUtility*)parent_ctx)->utype;
-  wpkgnav = new WPkgNavQt(this, tools, "Packages", utility, &brow_widget, &sts);
+  wpkgnav = new WPkgNavQt(this, "Packages", utility, &brow_widget, &sts);
   ((WPkgNav*)wpkgnav)->message_cb = message_cb;
   ((WPkgNav*)wpkgnav)->set_clock_cursor_cb = set_clock_cursor_cb;
   ((WPkgNav*)wpkgnav)->reset_cursor_cb = reset_cursor_cb;

wb/lib/wb/qt/wb_wpkg_qt.h

@@ -49,7 +49,7 @@ class WPkgQtWidget;
 
 class WPkgQt : public WPkg {
 public:
-  WPkgQt(QWidget* wa_parent_wid, void* wa_parent_ctx);
+  WPkgQt(void* wa_parent_ctx);
   ~WPkgQt();
 
   QWidget* brow_widget;
@@ -71,9 +71,7 @@ class WPkgQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WPkgQtWidget(WPkgQt* parent_ctx, QWidget* parent) : QWidget(), pkg(parent_ctx)
-  {
-  }
+  WPkgQtWidget(WPkgQt* parent_ctx) : QWidget(), pkg(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_wpkgnav_qt.cpp

@@ -40,9 +40,8 @@
 
 #include "wb_wpkgnav_qt.h"
 
-WPkgNavQt::WPkgNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid,
-    const char* wa_name, wb_eUtility wa_utility, QWidget** w,
-    pwr_tStatus* status)
+WPkgNavQt::WPkgNavQt(void* wa_parent_ctx, const char* wa_name,
+    wb_eUtility wa_utility, QWidget** w, pwr_tStatus* status)
     : WPkgNav(wa_parent_ctx, wa_name, wa_utility, status)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);

wb/lib/wb/qt/wb_wpkgnav_qt.h

@@ -41,8 +41,8 @@
 
 class WPkgNavQt : public WPkgNav {
 public:
-  WPkgNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid, const char* wa_name,
-      wb_eUtility wa_utility, QWidget** w, pwr_tStatus* status);
+  WPkgNavQt(void* wa_parent_ctx, const char* wa_name, wb_eUtility wa_utility,
+      QWidget** w, pwr_tStatus* status);
   ~WPkgNavQt();
 
   QWidget* brow_widget;

wb/lib/wb/qt/wb_wrev_qt.cqt

@@ -68,8 +68,7 @@ void WRevQtWidget::activate_history()
   wb_log::category_to_string(wlog_eCategory_RevisionRestore, categories[1]);
   strcpy(categories[2], "");
 
-  CoLogWQt* logw
-      = new CoLogWQt(rev, parentWidget(), "Revision History", 1, &sts);
+  CoLogWQt* logw = new CoLogWQt(rev, "Revision History", 1, &sts);
   logw->CoLogW::show(categories, 0);
 }
 
@@ -161,13 +160,12 @@ WRevQt::~WRevQt()
   delete wrevnav;
 }
 
-WRevQt::WRevQt(
-    QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSession wa_ldhses)
+WRevQt::WRevQt(void* wa_parent_ctx, ldh_tSession wa_ldhses)
     : WRev(wa_parent_ctx, wa_ldhses), india_widget(0)
 {
   int sts;
 
-  toplevel = new WRevQtWidget(this, wa_parent_wid);
+  toplevel = new WRevQtWidget(this);
   toplevel->setMinimumSize(700, 300);
   toplevel->setWindowTitle(fl("Revisions"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -217,8 +215,7 @@ WRevQt::WRevQt(
   QVBoxLayout* vbox = new QVBoxLayout(toplevel);
 
   utility = ((WUtility*)parent_ctx)->utype;
-  wrevnav = new WRevNavQt(
-      this, toplevel, ldhses, "Packages", utility, &brow_widget, &sts);
+  wrevnav = new WRevNavQt(this, ldhses, "Packages", utility, &brow_widget, &sts);
   ((WRevNav*)wrevnav)->message_cb = message_cb;
   ((WRevNav*)wrevnav)->set_clock_cursor_cb = set_clock_cursor_cb;
   ((WRevNav*)wrevnav)->reset_cursor_cb = reset_cursor_cb;

wb/lib/wb/qt/wb_wrev_qt.h

@@ -71,7 +71,7 @@ class WRevQtWidget;
 
 class WRevQt : public WRev {
 public:
-  WRevQt(QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSession wb_ldhses);
+  WRevQt(void* wa_parent_ctx, ldh_tSession wb_ldhses);
   ~WRevQt();
 
   QWidget* brow_widget;
@@ -97,9 +97,7 @@ class WRevQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WRevQtWidget(WRevQt* parent_ctx, QWidget* parent) : QWidget(), rev(parent_ctx)
-  {
-  }
+  WRevQtWidget(WRevQt* parent_ctx) : QWidget(), rev(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_wrevnav_qt.cpp

@@ -40,9 +40,9 @@
 
 #include "wb_wrevnav_qt.h"
 
-WRevNavQt::WRevNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid,
-    ldh_tSession wa_ldhses, const char* wa_name, wb_eUtility wa_utility,
-    QWidget** w, pwr_tStatus* status)
+WRevNavQt::WRevNavQt(void* wa_parent_ctx, ldh_tSession wa_ldhses,
+    const char* wa_name, wb_eUtility wa_utility, QWidget** w,
+    pwr_tStatus* status)
     : WRevNav(wa_parent_ctx, wa_ldhses, wa_name, wa_utility, status)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);

wb/lib/wb/qt/wb_wrevnav_qt.h

@@ -41,9 +41,8 @@
 
 class WRevNavQt : public WRevNav {
 public:
-  WRevNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid, ldh_tSession wb_ldhses,
-      const char* wa_name, wb_eUtility wa_utility, QWidget** w,
-      pwr_tStatus* status);
+  WRevNavQt(void* wa_parent_ctx, ldh_tSession wb_ldhses, const char* wa_name,
+      wb_eUtility wa_utility, QWidget** w, pwr_tStatus* status);
   ~WRevNavQt();
 
   QWidget* brow_widget;

wb/lib/wb/qt/wb_wtt_qt.cqt

@@ -731,21 +731,19 @@ void WttQt::set_prompt(const char* prompt)
 
 void WttQt::watt_new(pwr_tAttrRef aref)
 {
-  new WAttQt(
-      toplevel, this, ldhses, aref, editmode, wnavnode->gbl.advanced_user, 1);
+  new WAttQt(this, ldhses, aref, editmode, wnavnode->gbl.advanced_user, 1);
 }
 
 void WttQt::wda_new(pwr_tOid oid)
 {
-  new WdaQt(
-      toplevel, this, ldhses, oid, 0, "", editmode, wnav->gbl.advanced_user, 1);
+  new WdaQt(this, ldhses, oid, 0, "", editmode, wnav->gbl.advanced_user, 1);
 }
 
 Ge* WttQt::ge_new(char* graph_name)
 {
   unsigned int opt
       = wnavnode->gbl.enable_comment ? ge_mOption_EnableComment : 0;
-  return new GeQt(this, toplevel, ldhses, 0, opt, graph_name);
+  return new GeQt(this, ldhses, 0, opt, graph_name);
 }
 
 void WttQt::wcast_new(pwr_tAttrRef aref, pwr_tStatus* sts)
@@ -760,14 +758,14 @@ wb_build* WttQt::build_new()
 
 void WttQt::wpkg_new()
 {
-  wpkg = new WPkgQt(toplevel, this);
+  wpkg = new WPkgQt(this);
   wpkg->close_cb = Wtt::wpkg_quit_cb;
 }
 
 int WttQt::ute_new(char* title)
 {
   pwr_tStatus sts;
-  utedctx = new WUtedQt(this, toplevel, title, "Utilites",
+  utedctx = new WUtedQt(this, title, "Utilites",
       ldh_SessionToWB(ldhses), ldhses, editmode, uted_quit_cb, &sts);
   return sts;
 }
@@ -999,14 +997,14 @@ static void wtt_help_cb(void* ctx, const char* topic)
 void WttQtWidget::activate_rtmon()
 {
   pwr_tStatus sts;
-  RtMon* rtmon = new RtMonQt(this, this, "Runtime Monitor", 0, &sts);
+  RtMon* rtmon = new RtMonQt(this, "Runtime Monitor", 0, &sts);
   rtmon->help_cb = wtt_help_cb;
 }
 
 void WttQtWidget::activate_statusmon()
 {
   pwr_tStatus sts;
-  Nodelist* nl = new NodelistQt(this, this, "Supervision Center",
+  Nodelist* nl = new NodelistQt(this, "Supervision Center",
       nodelist_eMode_SystemStatus, 0, 0, &sts);
   nl->set_scantime(3);
   nl->help_cb = wtt_help_cb;
@@ -1061,7 +1059,7 @@ void WttQtWidget::activate_history()
 
   strcpy(title, "History Configurator ");
   strcat(title, vname);
-  CoLogWQt* logw = new CoLogWQt(wtt, parentWidget(), title, 0, &sts);
+  CoLogWQt* logw = new CoLogWQt(wtt, title, 0, &sts);
   logw->CoLogW::show(categories, vname);
 }
 
@@ -1713,11 +1711,10 @@ void WttQtWidget::closeEvent(QCloseEvent* event)
   event->ignore();
 }
 
-WttQt::WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name,
-    const char* iconname, void* wt_wbctx, pwr_tVolumeId wt_volid,
-    ldh_tVolume wt_volctx, wnav_sStartMenu* root_menu, pwr_tStatus* status)
-    : Wtt(wt_parent_ctx, wt_name, iconname, wt_wbctx, wt_volid, wt_volctx,
-          root_menu, status),
+WttQt::WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
+    void* wt_wbctx, pwr_tVolumeId wt_volid, ldh_tVolume wt_volctx,
+    wnav_sStartMenu* root_menu, pwr_tStatus* status) : Wtt(wt_parent_ctx,
+        wt_name, iconname, wt_wbctx, wt_volid, wt_volctx, root_menu, status),
       boot_dia(0), options_form(0), set_focus_disabled(0), disfocus_timerid(0),
       avoid_deadlock(0), realized(0)
 {
@@ -1886,7 +1883,7 @@ WttQt::WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name,
   }
 
   // Qt
-  toplevel = new WttQtWidget(this, wt_parent_wid);
+  toplevel = new WttQtWidget(this);
   toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -2133,8 +2130,8 @@ WttQt::WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name,
   palette_paned = new QSplitter(Qt::Horizontal);
   wnav_paned = new QSplitter(Qt::Horizontal);
 
-  Wtt::palette = new PalQt(this, palette_paned, "Objects", ldhses,
-      layout_palette, &palette_widget, &sts);
+  Wtt::palette = new PalQt(this, "Objects", ldhses, layout_palette,
+      &palette_widget, &sts);
   Wtt::palette->set_focus_cb = &Wtt::set_focus_cb;
   Wtt::palette->traverse_focus_cb = &Wtt::traverse_focus;
   Wtt::palette->create_popup_menu_cb = &Wtt::create_pal_popup_menu_cb;
@@ -2367,7 +2364,7 @@ void OptionsDialog::activate_options_cancel()
 }
 
 OptionsDialog::OptionsDialog(WttQt* parent_ctx, QWidget* parent)
-    : QDialog(), wtt(parent_ctx)
+    : QDialog(parent), wtt(parent_ctx)
 {
   setMinimumSize(650, 450);
   setWindowTitle(fl("Options"));

wb/lib/wb/qt/wb_wtt_qt.h

@@ -90,13 +90,11 @@ class WttQtWidget;
 
 class WttQt : public Wtt {
 public:
-  WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name,
-      const char* iconname, ldh_tWBContext wt_wbctx, pwr_tVolumeId wt_volid,
-      ldh_tVolume wt_volctx, wnav_sStartMenu* root_menu, pwr_tStatus* status);
+  WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
+      ldh_tWBContext wt_wbctx, pwr_tVolumeId wt_volid, ldh_tVolume wt_volctx,
+      wnav_sStartMenu* root_menu, pwr_tStatus* status);
 
-  WttQt()
-  {
-  }
+  WttQt() {}
   ~WttQt();
 
   QWidget* wnav_brow_widget;
@@ -227,9 +225,7 @@ class WttQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WttQtWidget(WttQt* parent_ctx, QWidget* parent) : QWidget(), wtt(parent_ctx)
-  {
-  }
+  WttQtWidget(WttQt* parent_ctx) : QWidget(), wtt(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

wb/lib/wb/qt/wb_xcrr_qt.cqt

@@ -112,9 +112,8 @@ WCrrQt::~WCrrQt()
   delete xcrrnav;
 }
 
-WCrrQt::WCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
-    ldh_tSesContext xa_ldhses, pwr_sAttrRef* xa_objar, int xa_advanced_user,
-    int* xa_sts)
+WCrrQt::WCrrQt(void* xa_parent_ctx, ldh_tSesContext xa_ldhses,
+    pwr_sAttrRef* xa_objar, int xa_advanced_user, int* xa_sts)
     : WCrr(xa_parent_ctx, xa_ldhses, xa_objar, xa_advanced_user, xa_sts)
 {
   int sts;
@@ -129,7 +128,7 @@ WCrrQt::WCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
 
   strncpy(title, namep, sizeof(title));
 
-  toplevel = new WCrrQtWidget(this, xa_parent_wid);
+  toplevel = new WCrrQtWidget(this);
   toplevel->setMinimumSize(600, 420);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -158,9 +157,9 @@ WCrrQt::WCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   addMenuItem(toplevel, help, "&Overview", SLOT(activate_help()), "CTRL+H",
       "system-help");
 
-  xcrrnav = new WAttNavQt(this, wattnav_eType_CrossRef, toplevel, "Plant",
-      xa_ldhses, objar, 0, xa_advanced_user, 1, wb_eUtility_AttributeEditor,
-      &brow_widget, &sts);
+  xcrrnav = new WAttNavQt(this, wattnav_eType_CrossRef, "Plant", xa_ldhses,
+      objar, 0, xa_advanced_user, 1, wb_eUtility_AttributeEditor, &brow_widget,
+      &sts);
   // xcrrnav->popup_menu_cb = &xcrr_popup_menu_cb;
   // xcrrnav->start_trace_cb = &xcrr_start_trace_cb;
   // xcrrnav->close_cb = &xcrr_close_cb;

wb/lib/wb/qt/wb_xcrr_qt.h

@@ -47,8 +47,8 @@ class WCrrQtWidget;
 
 class WCrrQt : public WCrr {
 public:
-  WCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx, ldh_tSesContext xa_ldhses,
-      pwr_sAttrRef* xa_objar, int xa_advanced_user, int* xa_sts);
+  WCrrQt(void* xa_parent_ctx, ldh_tSesContext xa_ldhses, pwr_sAttrRef* xa_objar,
+      int xa_advanced_user, int* xa_sts);
   ~WCrrQt();
   QWidget* brow_widget;
   QWidget* form_widget;
@@ -65,9 +65,7 @@ class WCrrQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  WCrrQtWidget(WCrrQt* parent_ctx, QWidget* parent) : QWidget(), crr(parent_ctx)
-  {
-  }
+  WCrrQtWidget(WCrrQt* parent_ctx) : QWidget(), crr(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/exe/co_help/qt/co_help_qt.cpp

@@ -87,7 +87,7 @@ CoHelpQt::CoHelpQt(int argc, char* argv[], int* return_sts)
   fprintf(stderr, "\n");
 
   // Create help window
-  xhelp = new CoXHelpQt(0 /*toplevel*/, this, xhelp_eUtility_Xtt, &sts);
+  xhelp = new CoXHelpQt(this, xhelp_eUtility_Xtt, &sts);
   // xhelp->open_URL_cb = open_URL_cb;
   CoXHelp::set_default(xhelp);
   xhelp->close_cb = close_cb;

xtt/exe/pwr_rtmon/qt/pwr_rtmon_qt.cpp

@@ -94,10 +94,10 @@ int main(int argc, char* argv[])
   setlocale(LC_TIME, "en_US");
 
   // Create help window
-  xhelp = new CoXHelpQt(0, 0, xhelp_eUtility_Xtt, &sts);
+  xhelp = new CoXHelpQt(NULL, xhelp_eUtility_Xtt, &sts);
   CoXHelp::set_default(xhelp);
 
-  rtmon = new RtMonQt(NULL, NULL, "Runtime Monitor", display, &sts);
+  rtmon = new RtMonQt(NULL, "Runtime Monitor", display, &sts);
   rtmon->help_cb = rtmon_help_cb;
   rtmon->close_cb = rtmon_close_cb;
 

xtt/exe/rt_statusmon/qt/rt_statusmon_qt.cpp

@@ -118,10 +118,11 @@ int main(int argc, char* argv[])
   setlocale(LC_NUMERIC, "POSIX");
   setlocale(LC_TIME, "en_US");
 
-  xhelp = new CoXHelpQt(0, 0, xhelp_eUtility_Xtt, &sts);
+  xhelp = new CoXHelpQt(NULL, xhelp_eUtility_Xtt, &sts);
   CoXHelp::set_default(xhelp);
 
-  nl = new NodelistQt(0, 0, "Status Monitor", mode, view_descr, msgw_ePop_No, &sts);
+  nl = new NodelistQt(NULL, "Status Monitor", mode, view_descr, msgw_ePop_No,
+      &sts);
   nl->close_cb = statusmon_close;
   nl->set_scantime(3);
 

xtt/exe/rt_xtt/qt/rt_xtt_qt.cqt

@@ -732,8 +732,8 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
 
   statusbar->show();
 
-  xnav = new XNavQt(this, NULL, "Plant", &brow_widget,
-      (xnav_sStartMenu*)root_menu, opplace_str, op_close_button, &sts);
+  xnav = new XNavQt(this, "Plant", &brow_widget, (xnav_sStartMenu*)root_menu,
+      opplace_str, op_close_button, &sts);
   xnav->message_cb = &xtt_message_cb;
   xnav->close_cb = &close;
   xnav->map_cb = ↦
@@ -770,7 +770,7 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
   cmd_entry->setVisible(false);
 
   // Create help window
-  CoXHelp* xhelp = new CoXHelpQt(toplevel, this, xhelp_eUtility_Xtt, &sts);
+  CoXHelp* xhelp = new CoXHelpQt(this, xhelp_eUtility_Xtt, &sts);
   xhelp->open_URL_cb = open_URL_cb;
   CoXHelp::set_default(xhelp);
 

xtt/exe/rt_xtt/qt/rt_xtt_qt.h

@@ -87,9 +87,7 @@ class XttQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XttQtWidget(XttQt* parent_ctx) : QWidget(), xtt(parent_ctx)
-  {
-  }
+  XttQtWidget(XttQt* parent_ctx) : QWidget(), xtt(parent_ctx) {}
   bool eventFilter(QObject* obj, QEvent* event);
 
 protected:

xtt/exe/rt_xtt_cmd/qt/rt_xtt_cmd_qt.cpp

@@ -57,7 +57,7 @@ XttCmdQt::XttCmdQt()
   pwr_tStatus sts;
   pwr_tOName opplace = "";
 
-  xnav = new XNavQt(this, NULL, "Plant", &brow_widget, (xnav_sStartMenu*)root_menu,
+  xnav = new XNavQt(this, "Plant", &brow_widget, (xnav_sStartMenu*)root_menu,
       opplace, 0, &sts);
 
   xnav->message_cb = &message_cb;

xtt/exe/wb_ge/qt/wb_ge_qt.cpp

@@ -56,7 +56,6 @@
 /*  Fallback resources  */
 
 static QWidget* toplevel;
-static QWidget* mainwindow;
 
 static void usage()
 {
@@ -86,7 +85,7 @@ int main(int argc, char* argv[])
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
 
   // Create help window
-  CoXHelpQt* xhelp = new CoXHelpQt(mainwindow, 0, xhelp_eUtility_Wtt, &sts);
+  CoXHelpQt* xhelp = new CoXHelpQt(0, xhelp_eUtility_Wtt, &sts);
   CoXHelpQt::set_default(xhelp);
 
   debug_print("%s ", argv[0]);
@@ -109,7 +108,7 @@ int main(int argc, char* argv[])
       // Execute script
       pwr_tStatus sts;
 
-      gectx = new GeQt(NULL, toplevel, 0, 1, 0, NULL);
+      gectx = new GeQt(NULL, 0, 1, 0, NULL);
       sts = gectx->command(file);
       if (EVEN(sts)) {
         gectx->message(sts);
@@ -117,13 +116,13 @@ int main(int argc, char* argv[])
     } else {
       // Open graph
       strcpy(graph_name, file);
-      gectx = new GeQt(NULL, mainwindow, 0, 1, opt, graph_name);
+      gectx = new GeQt(NULL, 0, 1, opt, graph_name);
 
       sprintf(fname, "@%s.pwr_com", wnav_cInitFile);
       gectx->command(fname);
     }
   } else {
-    gectx = new GeQt(NULL, mainwindow, 0, 1, opt, NULL);
+    gectx = new GeQt(NULL, 0, 1, opt, NULL);
 
     sprintf(fname, "@%s.pwr_com", wnav_cInitFile);
     gectx->command(fname);
@@ -135,8 +134,7 @@ int main(int argc, char* argv[])
   new wb_log_qt(toplevel);
 
   // Create message window
-  MsgWindowQt* msg_window
-      = new MsgWindowQt(gectx, mainwindow, "Ge messages", &sts);
+  MsgWindowQt* msg_window = new MsgWindowQt(gectx, "Ge messages", &sts);
   msg_window->find_ge_cb = Ge::find_ge_cb;
   MsgWindow::set_default(msg_window);
 

xtt/lib/cow/qt/cow_login_qt.h

@@ -58,9 +58,7 @@ public:
   CoLoginQt(void* wl_parent_ctx, QWidget* wl_parent_wid, const char* wl_name,
       const char* wl_groupname, void (*wl_bc_success)(void*),
       void (*wl_bc_cancel)(void*), void* base_widget, pwr_tStatus* sts);
-  ~CoLoginQt()
-  {
-  }
+  ~CoLoginQt() {}
 
   pwr_tStatus get_values();
   void message(const char* new_label);
@@ -72,9 +70,7 @@ class CoLoginQtWidget : public QDialog {
 
 public:
   CoLoginQtWidget(CoLoginQt* parent_ctx, QWidget* parent)
-      : QDialog(parent), login(parent_ctx), del(true)
-  {
-  }
+      : QDialog(parent), login(parent_ctx), del(true) {}
 
 protected:
   void closeEvent(QCloseEvent* event);

xtt/lib/cow/qt/cow_logw_qt.cqt

@@ -44,11 +44,11 @@
 #include <QMenuBar>
 #include <QVBoxLayout>
 
-CoLogWQt::CoLogWQt(void* logw_parent_ctx, QWidget* logw_parent_wid,
-    const char* logw_name, int l_show_item, pwr_tStatus* status)
+CoLogWQt::CoLogWQt(void* logw_parent_ctx, const char* logw_name,
+    int l_show_item, pwr_tStatus* status)
     : CoLogW(logw_parent_ctx, logw_name, l_show_item, status)
 {
-  toplevel = new CoLogWQtWidget(this, logw_parent_wid);
+  toplevel = new CoLogWQtWidget(this);
   toplevel->setMinimumSize(800, 600);
   toplevel->setWindowTitle(fl(logw_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -76,7 +76,7 @@ CoLogWQt::CoLogWQt(void* logw_parent_ctx, QWidget* logw_parent_wid,
   QVBoxLayout* form = new QVBoxLayout(toplevel);
 
   // Create logwnav
-  logwnav = new CoLogWNavQt(this, toplevel, l_show_item, &nav_widget);
+  logwnav = new CoLogWNavQt(this, l_show_item, &nav_widget);
 
   form->setMenuBar(menu_bar);
   add_expanding(form, nav_widget);

xtt/lib/cow/qt/cow_logw_qt.h

@@ -47,8 +47,8 @@ class CoLogWQtWidget;
 
 class CoLogWQt : public CoLogW {
 public:
-  CoLogWQt(void* msg_parent_ctx, QWidget* msg_parent_wid, const char* msg_name,
-      int l_show_item, pwr_tStatus* status);
+  CoLogWQt(void* msg_parent_ctx, const char* msg_name, int l_show_item,
+      pwr_tStatus* status);
   ~CoLogWQt();
 
   QWidget* nav_widget;
@@ -64,10 +64,7 @@ class CoLogWQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  CoLogWQtWidget(CoLogWQt* parent_ctx, QWidget* parent)
-      : QWidget(), logw(parent_ctx)
-  {
-  }
+  CoLogWQtWidget(CoLogWQt* parent_ctx) : QWidget(), logw(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/cow/qt/cow_logwnav_qt.cpp

@@ -41,8 +41,7 @@
 
 #include "flow_browwidget_qt.h"
 
-CoLogWNavQt::CoLogWNavQt(
-    void* l_parent_ctx, QWidget* l_parent_wid, int l_show_item, QWidget** w)
+CoLogWNavQt::CoLogWNavQt(void* l_parent_ctx, int l_show_item, QWidget** w)
     : CoLogWNav(l_parent_ctx, l_show_item)
 {
   form_widget

xtt/lib/cow/qt/cow_logwnav_qt.h

@@ -45,8 +45,7 @@
 
 class CoLogWNavQt : public CoLogWNav {
 public:
-  CoLogWNavQt(void* ev_parent_ctx, QWidget* ev_parent_wid, int l_show_item,
-      QWidget** w);
+  CoLogWNavQt(void* ev_parent_ctx, int l_show_item, QWidget** w);
   ~CoLogWNavQt();
 
   QWidget* brow_widget;

xtt/lib/cow/qt/cow_msglist_qt.cpp

@@ -41,7 +41,7 @@
 
 #include "flow_browwidget_qt.h"
 
-MsgListQt::MsgListQt(void* ev_parent_ctx, QWidget* ev_parent_wid, QWidget** w)
+MsgListQt::MsgListQt(void* ev_parent_ctx, QWidget** w)
     : MsgList(ev_parent_ctx)
 {
   form_widget

xtt/lib/cow/qt/cow_msglist_qt.h

@@ -45,7 +45,7 @@
 
 class MsgListQt : public MsgList {
 public:
-  MsgListQt(void* ev_parent_ctx, QWidget* ev_parent_wid, QWidget** w);
+  MsgListQt(void* ev_parent_ctx, QWidget** w);
   ~MsgListQt();
 
   QWidget* brow_widget;

xtt/lib/cow/qt/cow_msgwindow_qt.cqt

@@ -53,11 +53,10 @@ void MsgWindowQtWidget::closeEvent(QCloseEvent* event)
   event->ignore();
 }
 
-MsgWindowQt::MsgWindowQt(void* msg_parent_ctx, QWidget* msg_parent_wid,
-    const char* msg_name, pwr_tStatus* status)
-    : MsgWindow(msg_parent_ctx, msg_name, status)
+MsgWindowQt::MsgWindowQt(void* msg_parent_ctx, const char* msg_name,
+    pwr_tStatus* status) : MsgWindow(msg_parent_ctx, msg_name, status)
 {
-  toplevel = new MsgWindowQtWidget(this, msg_parent_wid);
+  toplevel = new MsgWindowQtWidget(this);
   toplevel->setMinimumSize(800, 600);
   toplevel->setWindowTitle(translate_utf8(msg_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -84,7 +83,7 @@ MsgWindowQt::MsgWindowQt(void* msg_parent_ctx, QWidget* msg_parent_wid,
 
   // Create msgnav
   QVBoxLayout* form = new QVBoxLayout();
-  msgnav = new MsgListQt(this, toplevel, &nav_widget);
+  msgnav = new MsgListQt(this, &nav_widget);
   msgnav->find_wnav_cb = MsgWindow::msgw_find_wnav_cb;
   msgnav->find_plc_cb = MsgWindow::msgw_find_plc_cb;
   msgnav->find_ge_cb = MsgWindow::msgw_find_ge_cb;

xtt/lib/cow/qt/cow_msgwindow_qt.h

@@ -47,8 +47,7 @@ class MsgWindowQtWidget;
 
 class MsgWindowQt : public MsgWindow {
 public:
-  MsgWindowQt(void* msg_parent_ctx, QWidget* msg_parent_wid,
-      const char* msg_name, pwr_tStatus* status);
+  MsgWindowQt(void* msg_parent_ctx, const char* msg_name, pwr_tStatus* status);
 
   QWidget* nav_widget;
   CoWowFocusTimerQt focustimer;
@@ -66,10 +65,7 @@ class MsgWindowQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  MsgWindowQtWidget(MsgWindowQt* parent_ctx, QWidget* parent)
-      : QWidget(), msgwin(parent_ctx)
-  {
-  }
+  MsgWindowQtWidget(MsgWindowQt* parent_ctx) : QWidget(), msgwin(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/cow/qt/cow_rtmon_qt.cqt

@@ -72,8 +72,8 @@ static QPushButton* addButton(
   return button;
 }
 
-RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
-    const char* rtmon_name, const char* rtmon_display, pwr_tStatus* status)
+RtMonQt::RtMonQt(void* rtmon_parent_ctx, const char* rtmon_name,
+    const char* rtmon_display, pwr_tStatus* status)
     : RtMon(rtmon_parent_ctx, rtmon_name, rtmon_display, status), timerid(0),
       old_status(9999)
 {
@@ -86,7 +86,7 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
   strcat(title, " ");
   strcat(title, rtmon_name);
 
-  toplevel = new RtMonQtWidget(this, rtmon_parent_wid);
+  toplevel = new RtMonQtWidget(this);
   toplevel->setMinimumHeight(340);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -120,7 +120,7 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
       toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
 
   QVBoxLayout* vbox = new QVBoxLayout();
-  nodelistnav = new NodelistNavQt(this, toplevel, 0, nodename,
+  nodelistnav = new NodelistNavQt(this, 0, nodename,
       nodelist_eMode_SystemStatus, 0, 0, &nodelistnav_widget);
 
   // Toolbar

xtt/lib/cow/qt/cow_rtmon_qt.h

@@ -50,8 +50,8 @@ class RtMonQtWidget;
 
 class RtMonQt : public RtMon {
 public:
-  RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
-      const char* rtmon_name, const char* rtmon_display, pwr_tStatus* status);
+  RtMonQt(void* rtmon_parent_ctx, const char* rtmon_name,
+      const char* rtmon_display, pwr_tStatus* status);
   ~RtMonQt();
 
   QWidget* nodelistnav_widget;
@@ -83,10 +83,7 @@ class RtMonQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  RtMonQtWidget(RtMonQt* parent_ctx, QWidget* parent)
-      : QWidget(), rtmon(parent_ctx)
-  {
-  }
+  RtMonQtWidget(RtMonQt* parent_ctx) : QWidget(), rtmon(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/cow/qt/cow_statusmon_nodelist_qt.cqt

@@ -59,15 +59,14 @@ void NodelistQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-NodelistQt::NodelistQt(void* nodelist_parent_ctx, QWidget* nodelist_parent_wid,
-    const char* nodelist_name, int nodelist_mode, int nodelist_view_node_descr,
-    int msgw_pop, pwr_tStatus* status)
-    : Nodelist(nodelist_parent_ctx, nodelist_name, nodelist_mode,
-          nodelist_view_node_descr, status)
+NodelistQt::NodelistQt(void* nodelist_parent_ctx, const char* nodelist_name,
+    int nodelist_mode, int nodelist_view_node_descr, int msgw_pop,
+    pwr_tStatus* status) : Nodelist(nodelist_parent_ctx, nodelist_name,
+    nodelist_mode, nodelist_view_node_descr, status)
 {
   pwr_tStatus sts;
 
-  toplevel = new NodelistQtWidget(this, nodelist_parent_wid);
+  toplevel = new NodelistQtWidget(this);
   toplevel->setMinimumSize(850, 300);
   toplevel->setWindowTitle(fl(nodelist_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -147,13 +146,13 @@ NodelistQt::NodelistQt(void* nodelist_parent_ctx, QWidget* nodelist_parent_wid,
   addMenuItem(
       toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
 
-  msg_window = new MsgWindowQt(this, toplevel, "Status Events", &sts);
+  msg_window = new MsgWindowQt(this, "Status Events", &sts);
   msg_window->find_wnav_cb = find_node_cb;
   msg_window->msg('I', "Status Montitor started");
 
   QVBoxLayout* vbox = new QVBoxLayout();
-  nodelistnav = new NodelistNavQt(this, toplevel, msg_window, 0, mode,
-      view_node_descr, msgw_pop, &nodelistnav_widget);
+  nodelistnav = new NodelistNavQt(this, msg_window, 0, mode, view_node_descr,
+      msgw_pop, &nodelistnav_widget);
 
   // Toolbar
   QToolBar* tools = new QToolBar();

xtt/lib/cow/qt/cow_statusmon_nodelist_qt.h

@@ -76,9 +76,9 @@ private:
 
 class NodelistQt : public Nodelist {
 public:
-  NodelistQt(void* nodelist_parent_ctx, QWidget* nodelist_parent_wid,
-      const char* nodelist_name, int nodelist_mode,
-      int nodelist_view_node_descr, int msgw_pop, pwr_tStatus* status);
+  NodelistQt(void* nodelist_parent_ctx, const char* nodelist_name,
+      int nodelist_mode, int nodelist_view_node_descr, int msgw_pop,
+      pwr_tStatus* status);
   ~NodelistQt();
 
   QWidget* nodelistnav_widget;
@@ -104,10 +104,7 @@ class NodelistQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  NodelistQtWidget(NodelistQt* parent_ctx, QWidget* parent)
-      : QWidget(), nodelist(parent_ctx)
-  {
-  }
+  NodelistQtWidget(NodelistQt* parent_ctx) : QWidget(), nodelist(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/cow/qt/cow_statusmon_nodelistnav_qt.cqt

@@ -46,9 +46,8 @@
 #include <QTimer>
 
 NodelistNavQt::NodelistNavQt(void* nodelist_parent_ctx,
-    QWidget* nodelist_parent_wid, MsgWindow* nodelist_msg_window,
-    char* nodelist_nodename, int nodelist_mode, int nodelist_view_node_descr,
-    int nodelist_msgw_pop, QWidget** w)
+    MsgWindow* nodelist_msg_window, char* nodelist_nodename, int nodelist_mode,
+    int nodelist_view_node_descr, int nodelist_msgw_pop, QWidget** w)
     : NodelistNav(nodelist_parent_ctx, nodelist_msg_window, nodelist_nodename,
           nodelist_mode, nodelist_view_node_descr, nodelist_msgw_pop)
 {

xtt/lib/cow/qt/cow_statusmon_nodelistnav_qt.h

@@ -49,10 +49,9 @@ class NodelistNavQtTraceObject;
 
 class NodelistNavQt : public NodelistNav {
 public:
-  NodelistNavQt(void* ev_parent_ctx, QWidget* nodelistnav_parent_wid,
-      MsgWindow* nodelistnav_msg_window, char* nodelistnav_msg_nodename,
-      int nodelistnav_mode, int nodelistnav_view_node_descr,
-      int nodelist_msgw_pop, QWidget** w);
+  NodelistNavQt(void* ev_parent_ctx, MsgWindow* nodelistnav_msg_window,
+      char* nodelistnav_msg_nodename, int nodelistnav_mode,
+      int nodelistnav_view_node_descr, int nodelist_msgw_pop, QWidget** w);
   ~NodelistNavQt();
 
   QWidget* brow_widget;

xtt/lib/cow/qt/cow_style_qt.h

@@ -43,9 +43,7 @@ class PwrStyle : public QGtkStyle {
   Q_OBJECT
 
 public:
-  PwrStyle() : QGtkStyle()
-  {
-  }
+  PwrStyle() : QGtkStyle() {}
 
   int pixelMetric(PixelMetric which, const QStyleOption* option,
       const QWidget* widget = 0) const;

xtt/lib/cow/qt/cow_tree_qt.cqt

@@ -118,10 +118,9 @@ void CowTreeQt::pop()
   ::pop(toplevel);
 }
 
-CowTreeQt::CowTreeQt(QWidget* a_parent_wid, void* a_parent_ctx,
-    const char* title, pwr_tAttrRef* itemlist, int item_cnt,
-    unsigned int options, pwr_tStatus (*get_object_info)(void*, pwr_tAttrRef*,
-                              char*, int, char*, char*, int),
+CowTreeQt::CowTreeQt(void* a_parent_ctx, const char* title,
+    pwr_tAttrRef* itemlist, int item_cnt, unsigned int options, pwr_tStatus
+    (*get_object_info)(void*, pwr_tAttrRef*, char*, int, char*, char*, int),
     pwr_tStatus (*get_node_info)(void*, char*, char*, int),
     pwr_tStatus (*action)(void*, pwr_tAttrRef*))
     : CowTree(a_parent_ctx, itemlist, item_cnt, options, get_object_info,
@@ -129,7 +128,7 @@ CowTreeQt::CowTreeQt(QWidget* a_parent_wid, void* a_parent_ctx,
 {
   int sts;
 
-  toplevel = new CowTreeQtWidget(this, a_parent_wid);
+  toplevel = new CowTreeQtWidget(this);
   toplevel->setMinimumSize(600, 400);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -191,8 +190,8 @@ CowTreeQt::CowTreeQt(QWidget* a_parent_wid, void* a_parent_ctx,
   msg_label = new QLabel("");
   statusbar->addWidget(msg_label);
 
-  treenav = new TreeNavQt(this, toplevel, itemlist, item_cnt, options,
-      get_object_info, get_node_info, &brow_widget, &sts);
+  treenav = new TreeNavQt(this, itemlist, item_cnt, options, get_object_info,
+      get_node_info, &brow_widget, &sts);
   treenav->message_cb = &CowTree::message;
 
   vbox->setMenuBar(menu_bar);

xtt/lib/cow/qt/cow_tree_qt.h

@@ -48,10 +48,9 @@ class CowTreeQtWidget;
 
 class CowTreeQt : public CowTree {
 public:
-  CowTreeQt(QWidget* a_parent_wid, void* a_parent_ctx, const char* title,
-      pwr_tAttrRef* itemlist, int item_cnt, unsigned int options,
-      pwr_tStatus (*get_object_info)(
-          void*, pwr_tAttrRef*, char*, int, char*, char*, int),
+  CowTreeQt(void* a_parent_ctx, const char* title, pwr_tAttrRef* itemlist,
+      int item_cnt, unsigned int options, pwr_tStatus (*get_object_info)(void*,
+      pwr_tAttrRef*, char*, int, char*, char*, int),
       pwr_tStatus (*get_node_info)(void*, char*, char*, int),
       pwr_tStatus (*action)(void*, pwr_tAttrRef*));
   QWidget* brow_widget;
@@ -70,10 +69,7 @@ class CowTreeQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  CowTreeQtWidget(CowTreeQt* parent_ctx, QWidget* parent)
-      : QWidget(), tree(parent_ctx)
-  {
-  }
+  CowTreeQtWidget(CowTreeQt* parent_ctx) : QWidget(), tree(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/cow/qt/cow_treenav_qt.cpp

@@ -41,9 +41,8 @@
 
 #include "flow_browwidget_qt.h"
 
-TreeNavQt::TreeNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    pwr_tAttrRef* xn_itemlist, int xn_item_cnt, unsigned int xn_options,
-    pwr_tStatus (*xn_get_object_info)(
+TreeNavQt::TreeNavQt(void* xn_parent_ctx, pwr_tAttrRef* xn_itemlist,
+    int xn_item_cnt, unsigned int xn_options, pwr_tStatus (*xn_get_object_info)(
         void*, pwr_tAttrRef*, char*, int, char*, char*, int),
     pwr_tStatus (*xn_get_node_info)(void*, char*, char*, int), QWidget** w,
     pwr_tStatus* status)

xtt/lib/cow/qt/cow_treenav_qt.h

@@ -46,9 +46,8 @@
 //! The navigation area of the attribute editor.
 class TreeNavQt : public TreeNav {
 public:
-  TreeNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-      pwr_tAttrRef* xn_itemlist, int xn_item_cnt, unsigned int xn_options,
-      pwr_tStatus (*xn_get_object_info)(
+  TreeNavQt(void* xn_parent_ctx, pwr_tAttrRef* xn_itemlist, int xn_item_cnt,
+      unsigned int xn_options, pwr_tStatus (*xn_get_object_info)(
           void*, pwr_tAttrRef*, char*, int, char*, char*, int),
       pwr_tStatus (*xn_get_node_info)(void*, char*, char*, int), QWidget** w,
       pwr_tStatus* status);

xtt/lib/cow/qt/cow_wow_qt.h

@@ -124,9 +124,7 @@ class CoWowTimerQtObject : public QObject {
   Q_OBJECT
 
 public:
-  CoWowTimerQtObject(CoWowTimerQt* parent) : QObject(), wow_timer(parent)
-  {
-  }
+  CoWowTimerQtObject(CoWowTimerQt* parent) : QObject(), wow_timer(parent) {}
 
 public slots:
   void timer_cb();
@@ -236,9 +234,7 @@ class CoWowQtObject : public QObject {
   Q_OBJECT
 
 public:
-  CoWowQtObject(QWidget* parent) : QObject(), parent_wid(parent)
-  {
-  }
+  CoWowQtObject(QWidget* parent) : QObject(), parent_wid(parent) {}
   QWidget* parent_wid;
 
 public slots:

xtt/lib/cow/qt/cow_xhelp_qt.cqt

@@ -176,16 +176,15 @@ CoXHelpQt::~CoXHelpQt()
   delete xhelpnav;
 }
 
-CoXHelpQt::CoXHelpQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
-    xhelp_eUtility utility, int* xa_sts)
-    : CoXHelp(xa_parent_ctx, utility, xa_sts), parent_wid(xa_parent_wid)
+CoXHelpQt::CoXHelpQt(void* xa_parent_ctx, xhelp_eUtility utility, int* xa_sts)
+    : CoXHelp(xa_parent_ctx, utility, xa_sts)
 {
   int sts;
   char title[80];
 
   strcpy(title, Lng::translate("Help"));
 
-  toplevel = new CoXHelpQtWidget(this, xa_parent_wid);
+  toplevel = new CoXHelpQtWidget(this);
   toplevel->setMinimumSize(700, 600);
   toplevel->setWindowTitle(fl(title));
 
@@ -249,8 +248,7 @@ CoXHelpQt::CoXHelpQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
 
   QVBoxLayout* vbox = new QVBoxLayout();
 
-  xhelpnav
-      = new CoXHelpNavQt(this, toplevel, title, utility, &brow_widget, &sts);
+  xhelpnav = new CoXHelpNavQt(this, title, utility, &brow_widget, &sts);
   xhelpnav->open_URL_cb = CoXHelp::open_URL;
 
   vbox->setMenuBar(menu_bar);
@@ -262,4 +260,13 @@ CoXHelpQt::CoXHelpQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   toplevel->hide();
 
   *xa_sts = 1;
+}
+
+QWidget* CoXHelpQt::get_widget()
+{
+  if (default_xhelp) {
+    return ((CoXHelpQt*)default_xhelp)->toplevel;
+  } else {
+    return 0;
+  }
 }
\ No newline at end of file

xtt/lib/cow/qt/cow_xhelp_qt.h

@@ -45,14 +45,12 @@ class CoXHelpQtWidget;
 
 class CoXHelpQt : public CoXHelp {
 public:
-  CoXHelpQt(QWidget* xa_parent_wid, void* xa_parent_ctx, xhelp_eUtility utility,
-      int* xa_sts);
+  CoXHelpQt(void* xa_parent_ctx, xhelp_eUtility utility, int* xa_sts);
   ~CoXHelpQt();
 
   CoXHelpQtWidget* toplevel;
   QWidget* brow_widget;
   QWidget* form_widget;
-  QWidget* parent_wid;
   CoWowFocusTimerQt focustimer;
 
   void set_dimension(int width, int height);
@@ -61,24 +59,14 @@ public:
   void open_input_dialog(const char* text, const char* title,
       const char* init_text, void (*ok_cb)(CoXHelp*, char*));
 
-  static QWidget* get_widget()
-  {
-    if (default_xhelp) {
-      return ((CoXHelpQt*)default_xhelp)->parent_wid;
-    } else {
-      return 0;
-    }
-  }
+  static QWidget* get_widget();
 };
 
 class CoXHelpQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  CoXHelpQtWidget(CoXHelpQt* parent_ctx, QWidget* parent)
-      : QWidget(), xhelp(parent_ctx)
-  {
-  }
+  CoXHelpQtWidget(CoXHelpQt* parent_ctx) : QWidget(), xhelp(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/cow/qt/cow_xhelpnav_qt.cpp

@@ -45,8 +45,8 @@ void CoXHelpNavQt::pop()
 {
 }
 
-CoXHelpNavQt::CoXHelpNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    char* xn_name, xhelp_eUtility xn_utility, QWidget** w, pwr_tStatus* status)
+CoXHelpNavQt::CoXHelpNavQt(void* xn_parent_ctx, char* xn_name,
+    xhelp_eUtility xn_utility, QWidget** w, pwr_tStatus* status)
     : CoXHelpNav(xn_parent_ctx, xn_name, xn_utility, status)
 {
   form_widget = scrolledbrowwidgetqt_new(

xtt/lib/cow/qt/cow_xhelpnav_qt.h

@@ -45,8 +45,8 @@
 
 class CoXHelpNavQt : public CoXHelpNav {
 public:
-  CoXHelpNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, char* xn_name,
-      xhelp_eUtility xn_utility, QWidget** w, pwr_tStatus* status);
+  CoXHelpNavQt(void* xn_parent_ctx, char* xn_name, xhelp_eUtility xn_utility,
+      QWidget** w, pwr_tStatus* status);
   ~CoXHelpNavQt();
 
   QWidget* brow_widget;

xtt/lib/flow/qt/flow_draw_qt.h

@@ -194,9 +194,7 @@ public:
   }
 
   void move_input(
-      FlowCtx* ctx, void* data, int x, int y, flow_ePosition pos_type)
-  {
-  }
+      FlowCtx* ctx, void* data, int x, int y, flow_ePosition pos_type) {}
 
   void delete_secondary_ctx(FlowCtx* ctx);
   int create_secondary_ctx(FlowCtx* flow_ctx, void** secondary_flow_ctx,

xtt/lib/ge/qt/ge_attr_qt.cqt

@@ -165,8 +165,8 @@ int AttrQt::reconfigure_attr()
   }
   reconfigure_attr_cb(parent_ctx, object, &itemlist, &item_cnt, &client_data);
 
-  attrnav = new AttrNavQt(
-      this, pane, type, "Plant", itemlist, item_cnt, &brow_widget, &sts);
+  attrnav = new AttrNavQt(this, type, "Plant", itemlist, item_cnt, &brow_widget,
+      &sts);
   if (pane->widget(0)) {
     pane->widget(0)->setParent(NULL);
   }
@@ -347,8 +347,8 @@ AttrQt::AttrQt(QWidget* a_parent_wid, void* a_parent_ctx, attr_eType a_type,
 
     pane = new QSplitter(Qt::Vertical);
 
-    attrnav = new AttrNavQt(
-        this, pane, type, "Plant", itemlist, item_cnt, &brow_widget, &sts);
+    attrnav = new AttrNavQt(this, type, "Plant", itemlist, item_cnt,
+        &brow_widget, &sts);
     attrnav->message_cb = &Attr::message;
     attrnav->change_value_cb = &Attr::change_value_c;
     attrnav->get_subgraph_info_cb = &Attr::get_subgraph_info_c;
@@ -417,8 +417,8 @@ AttrQt::AttrQt(QWidget* a_parent_wid, void* a_parent_ctx, attr_eType a_type,
       toplevel->setModal(true);
     }
   } else {
-    attrnav = new AttrNavQt(this, a_parent_wid, type, "Plant", itemlist,
-        item_cnt, &brow_widget, &sts);
+    attrnav = new AttrNavQt(this, type, "Plant", itemlist, item_cnt,
+        &brow_widget, &sts);
     attrnav->message_cb = &Attr::message;
     attrnav->change_value_cb = &Attr::change_value_c;
     attrnav->get_subgraph_info_cb = &Attr::get_subgraph_info_c;

xtt/lib/ge/qt/ge_attr_qt.h

@@ -85,9 +85,7 @@ class AttrQtWidget : public QDialog {
 
 public:
   AttrQtWidget(AttrQt* parent_ctx, QWidget* parent)
-      : QDialog(parent), attr(parent_ctx)
-  {
-  }
+      : QDialog(parent), attr(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/ge/qt/ge_attrnav_qt.cqt

@@ -44,9 +44,9 @@
 
 #include <QTimer>
 
-AttrNavQt::AttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    attr_eType xn_type, const char* xn_name, attr_sItem* xn_itemlist,
-    int xn_item_cnt, QWidget** w, pwr_tStatus* status)
+AttrNavQt::AttrNavQt(void* xn_parent_ctx, attr_eType xn_type,
+    const char* xn_name, attr_sItem* xn_itemlist, int xn_item_cnt, QWidget** w,
+    pwr_tStatus* status)
     : AttrNav(xn_parent_ctx, xn_type, xn_name, xn_itemlist, xn_item_cnt, status)
 {
   trace_obj = new AttrNavQtTraceObject(this);

xtt/lib/ge/qt/ge_attrnav_qt.h

@@ -49,9 +49,9 @@ class AttrNavQtTraceObject;
 //! The navigation area of the attribute editor.
 class AttrNavQt : public AttrNav {
 public:
-  AttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, attr_eType xn_type,
-      const char* xn_name, attr_sItem* xn_itemlist, int xn_item_cnt,
-      QWidget** w, pwr_tStatus* status);
+  AttrNavQt(void* xn_parent_ctx, attr_eType xn_type, const char* xn_name,
+      attr_sItem* xn_itemlist, int xn_item_cnt, QWidget** w,
+      pwr_tStatus* status);
   ~AttrNavQt();
 
   QWidget* brow_widget;

xtt/lib/ge/qt/ge_curve_qt.cqt

@@ -719,10 +719,9 @@ void GeCurveQtWidget::focusInEvent(QFocusEvent* event)
   QWidget::focusInEvent(event);
 }
 
-GeCurveQt::GeCurveQt(void* gc_parent_ctx, QWidget* parent_widget,
-    char* curve_name, char* filename, GeCurveData* curve_data, int pos_right,
-    int gc_width, int gc_height, unsigned int gc_options, int gc_color_theme,
-    void* basewidget)
+GeCurveQt::GeCurveQt(void* gc_parent_ctx, char* curve_name, char* filename,
+    GeCurveData* curve_data, int pos_right, int gc_width, int gc_height,
+    unsigned int gc_options, int gc_color_theme, void* basewidget)
     : GeCurve(gc_parent_ctx, curve_name, filename, curve_data, pos_right,
           gc_width, gc_height, gc_options, gc_color_theme),
       disable_timecombo_callback(0)

xtt/lib/ge/qt/ge_curve_qt.h

@@ -50,10 +50,9 @@ class GeCurveQtWidget;
 
 class GeCurveQt : public GeCurve {
 public:
-  GeCurveQt(void* gc_parent_ctx, QWidget* parent_widget, char* curve_name,
-      char* filename, GeCurveData* curve_data, int pos_right, int gc_width,
-      int gc_height, unsigned int gc_options, int gc_color_theme,
-      void* basewidget);
+  GeCurveQt(void* gc_parent_ctx, char* curve_name, char* filename,
+      GeCurveData* curve_data, int pos_right, int gc_width, int gc_height,
+      unsigned int gc_options, int gc_color_theme, void* basewidget);
   ~GeCurveQt();
 
   GeCurveQtWidget* toplevel;
@@ -106,10 +105,7 @@ class GeCurveQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  GeCurveQtWidget(GeCurveQt* parent)
-      : QWidget(), curve(parent)
-  {
-  }
+  GeCurveQtWidget(GeCurveQt* parent) : QWidget(), curve(parent) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/ge/qt/ge_graph_qt.cqt

@@ -43,16 +43,15 @@
 
 #include <QTimer>
 
-GraphQt::GraphQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    const char* xn_name, QWidget** w, pwr_tStatus* status,
-    const char* xn_default_path, graph_eMode graph_mode, int scrollbar,
-    int xn_gdh_init_done, const char* xn_object_name, int xn_use_default_access,
-    unsigned int xn_default_access, unsigned int xn_options, int xn_color_theme,
+GraphQt::GraphQt(void* xn_parent_ctx, const char* xn_name, QWidget** w,
+    pwr_tStatus* status, const char* xn_default_path, graph_eMode graph_mode,
+    int scrollbar, int xn_gdh_init_done, const char* xn_object_name,
+    int xn_use_default_access, unsigned int xn_default_access,
+    unsigned int xn_options, int xn_color_theme,
     void (*xn_keyboard_cb)(void*, int, int))
     : Graph(xn_parent_ctx, xn_name, xn_default_path, graph_mode,
-          xn_gdh_init_done, xn_object_name, xn_use_default_access,
-          xn_default_access, xn_options, xn_color_theme, xn_keyboard_cb),
-      parent_wid(xn_parent_wid)
+        xn_gdh_init_done, xn_object_name, xn_use_default_access,
+        xn_default_access, xn_options, xn_color_theme, xn_keyboard_cb)
 {
   trace_obj = new GraphQtTraceObject(this);
   trace_timerid = new QTimer(trace_obj);
@@ -126,7 +125,7 @@ QWidget* GraphQt::create_navigator()
 Attr* GraphQt::attr_new(void* parent_ctx, attr_eType type, void* object,
     attr_sItem* itemlist, int item_cnt)
 {
-  return new AttrQt(parent_wid, parent_ctx, type, object, itemlist, item_cnt);
+  return new AttrQt(form_widget, parent_ctx, type, object, itemlist, item_cnt);
 }
 
 void GraphQt::set_inputfocus(int focus)

xtt/lib/ge/qt/ge_graph_qt.h

@@ -50,7 +50,6 @@ public:
   //! Constructor
   /*!
     \param xn_parent_ctx	Parent context.
-    \param xn_parent_wid	Parent widget.
     \param xn_name		Name.
     \param w			Graph widget.
     \param status		Returned status.
@@ -66,8 +65,8 @@ public:
     \param xn_default_access	Default access. Can be used to override the
     access of the current user.
   */
-  GraphQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-      QWidget** w, pwr_tStatus* status, const char* xn_default_path,
+  GraphQt(void* xn_parent_ctx, const char* xn_name, QWidget** w,
+      pwr_tStatus* status, const char* xn_default_path,
       graph_eMode graph_mode = graph_eMode_Development, int scrollbar = 1,
       int xn_gdh_init_done = 0, const char* xn_object_name = 0,
       int xn_use_default_access = 0, unsigned int xn_default_access = 0,
@@ -90,7 +89,6 @@ public:
   ~GraphQt();
 
 private:
-  QWidget* parent_wid;
   GraphQtTraceObject* trace_obj;
 };
 
@@ -98,9 +96,7 @@ class GraphQtTraceObject : public QObject {
   Q_OBJECT
 
 public:
-  GraphQtTraceObject(GraphQt* parent) : QObject(), graph(parent)
-  {
-  }
+  GraphQtTraceObject(GraphQt* parent) : QObject(), graph(parent) {}
 
 public slots:
   void trace_scan();

xtt/lib/ge/qt/ge_qt.cqt

@@ -78,9 +78,7 @@
 // This QFontDelegate is more or less a copy of the one in QFontComboBox.
 class QFontDelegate : public QAbstractItemDelegate {
 public:
-  explicit QFontDelegate(QObject* parent) : QAbstractItemDelegate(parent)
-  {
-  }
+  explicit QFontDelegate(QObject* parent) : QAbstractItemDelegate(parent) {}
   void paint(QPainter* painter, const QStyleOptionViewItem& option,
       const QModelIndex& index) const;
   QSize sizeHint(
@@ -150,8 +148,8 @@ void GeQt::subgraphs_new()
     subgraphs_widget->close();
   }
 
-  subgraphs = new SubGraphsQt(this, toplevel, "SubGraphs",
-      (void*)graph->grow->ctx, &subgraphs_widget, &sts);
+  subgraphs = new SubGraphsQt(this, "SubGraphs", (void*)graph->grow->ctx,
+      &subgraphs_widget, &sts);
   subgraphs->message_cb = &Ge::message_cb;
   subgraphs->close_cb = &Ge::subgraphs_close_cb;
 }
@@ -701,7 +699,7 @@ void GeQtWidget::activate_history()
 
   strcpy(title, "History ");
   strcat(title, name);
-  CoLogWQt* logw = new CoLogWQt(this, this, title, 0, &sts);
+  CoLogWQt* logw = new CoLogWQt(this, title, 0, &sts);
   logw->CoLogW::show(categories, name);
 }
 
@@ -1297,9 +1295,8 @@ GeQt::~GeQt()
   }
 }
 
-GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
-    ldh_tSesContext x_ldhses, int x_exit_when_close, unsigned int x_options,
-    char* graph_name)
+GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
+    unsigned int x_options, char* graph_name)
     : Ge(x_parent_ctx, x_ldhses, x_exit_when_close, x_options)
 {
   const int window_width = 980;
@@ -1324,7 +1321,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
     strcat(title, tmp_name);
   }
 
-  toplevel = new GeQtWidget(this, x_parent_widget);
+  toplevel = new GeQtWidget(this);
 
   toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(fl(title));
@@ -1896,8 +1893,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
   unsigned int opt
       = x_options & ge_mOption_IgnoreJournal ? graph_mOption_IgnoreJournal : 0;
 
-  graph = new GraphQt(this, toplevel, "GraphQt", &grow_widget, &sts,
-      "pwrp_pop:", graph_eMode_Development, 1, 0, 0, 0, 0, opt);
+  graph = new GraphQt(this, "GraphQt", &grow_widget, &sts, "pwrp_pop:",
+      graph_eMode_Development, 1, 0, 0, 0, 0, opt);
   graph->message_cb = &Ge::message_cb;
   graph->get_current_subgraph_cb = &Ge::subpalette_get_select;
   graph->get_current_colors_cb = &Ge::colorpalette_get_current;
@@ -1925,8 +1922,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
   QHBoxLayout* palbox = new QHBoxLayout();
 
   // SubGraphs palette
-  subpalette
-      = new SubPaletteQt(this, toplevel, "SubGraphs", &subpalette_widget, &sts);
+  subpalette = new SubPaletteQt(this, "SubGraphs", &subpalette_widget, &sts);
   subpalette->message_cb = &Ge::message_cb;
   subpalette->set_focus_cb = &Ge::set_focus_cb;
   subpalette->traverse_focus_cb = &Ge::traverse_focus;
@@ -1939,8 +1935,8 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
       Ge::init_colorpalette_cb, this, &colorpalette_widget);
 
   if (ldhses) {
-    plantctx = new NavQt(
-        this, toplevel, "Plant", ldhses, "NavigatorW1", &plant_widget, &sts);
+    plantctx = new NavQt(this, "Plant", ldhses, "NavigatorW1", &plant_widget,
+        &sts);
     ((NavQt*)plantctx)->get_plant_select_cb = Ge::get_plant_select_cb;
     ((NavQt*)plantctx)->set_focus_cb = Ge::set_focus_cb;
     ((NavQt*)plantctx)->traverse_focus_cb = Ge::traverse_focus;

xtt/lib/ge/qt/ge_qt.h

@@ -79,8 +79,8 @@ public:
   CoWowEntryQt* recall_entry;
 
 public:
-  GeQt(void* parent_ctx, QWidget* parent_widget, ldh_tSesContext ldhses,
-      int exit_when_close, unsigned int options, char* graph_name);
+  GeQt(void* parent_ctx, ldh_tSesContext ldhses, int exit_when_close,
+        unsigned int options, char* graph_name);
   ~GeQt();
 
   virtual void set_title(char* title);
@@ -117,10 +117,7 @@ class GeQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  GeQtWidget(GeQt* parent_ctx, QWidget* parent)
-      : QWidget(), ge(parent_ctx)
-  {
-  }
+  GeQtWidget(GeQt* parent_ctx) : QWidget(), ge(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/ge/qt/ge_subgraphs_qt.cqt

@@ -112,12 +112,11 @@ void SubGraphsQtWidget::subgraphs_activate_help()
 {
 }
 
-SubGraphsQt::SubGraphsQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    const char* xn_name, void* xn_growctx, QWidget** w, pwr_tStatus* status)
-    : SubGraphs(xn_parent_ctx, xn_name, xn_growctx, status),
-      parent_wid(xn_parent_wid)
+SubGraphsQt::SubGraphsQt(void* xn_parent_ctx, const char* xn_name,
+    void* xn_growctx, QWidget** w, pwr_tStatus* status)
+    : SubGraphs(xn_parent_ctx, xn_name, xn_growctx, status)
 {
-  toplevel = new SubGraphsQtWidget(this, xn_parent_wid);
+  toplevel = new SubGraphsQtWidget(this);
   toplevel->setMinimumSize(300, 500);
   toplevel->setWindowTitle(fl(name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -179,7 +178,7 @@ void SubGraphsQt::trace_start()
   toplevel->trace_scan();
 }
 
-SubGraphsQtWidget::SubGraphsQtWidget(SubGraphsQt* parent_ctx, QWidget* parent)
+SubGraphsQtWidget::SubGraphsQtWidget(SubGraphsQt* parent_ctx)
     : QWidget(), subgraphs(parent_ctx)
 {
   trace_timerid = new QTimer(this);
@@ -196,6 +195,5 @@ void SubGraphsQtWidget::trace_scan()
 
 Attr* SubGraphsQt::new_attr(void* object, attr_sItem* items, int num)
 {
-  return new AttrQt(
-      parent_wid, this, attr_eType_Attributes, object, items, num);
+  return new AttrQt(toplevel, this, attr_eType_Attributes, object, items, num);
 }
\ No newline at end of file

xtt/lib/ge/qt/ge_subgraphs_qt.h

@@ -51,8 +51,8 @@ class SubGraphsQtWidget;
 //! Display loaded subgraphs.
 class SubGraphsQt : public SubGraphs {
 public:
-  SubGraphsQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-      void* grow_ctx, QWidget** w, pwr_tStatus* status);
+  SubGraphsQt(void* xn_parent_ctx, const char* xn_name, void* grow_ctx,
+      QWidget** w, pwr_tStatus* status);
 
   QWidget* brow_widget;
   QWidget* form_widget;
@@ -63,14 +63,13 @@ public:
 
 private:
   SubGraphsQtWidget* toplevel;
-  QWidget* parent_wid;
 };
 
 class SubGraphsQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  SubGraphsQtWidget(SubGraphsQt* parent_ctx, QWidget* parent);
+  SubGraphsQtWidget(SubGraphsQt* parent_ctx);
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/ge/qt/ge_subpalette_qt.cqt

@@ -45,9 +45,9 @@
 
 #include <QMenu>
 
-SubPaletteQt::SubPaletteQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
-    const char* xn_name, QWidget** w, pwr_tStatus* status)
-    : SubPalette(xn_parent_ctx, xn_name, status), parent_widget(xn_parent_wid)
+SubPaletteQt::SubPaletteQt(void* xn_parent_ctx, const char* xn_name,
+    QWidget** w, pwr_tStatus* status)
+    : SubPalette(xn_parent_ctx, xn_name, status)
 {
   object = new SubPaletteQtObject(this);
 
@@ -83,7 +83,7 @@ void SubPaletteQt::create_popup_menu(char* filename, int x, int y)
 
   CoWowQt::PopupPosition(form_widget, x, y, &wind_x, &wind_y);
 
-  QMenu* menu = new QMenu(parent_widget);
+  QMenu* menu = new QMenu();
   addMenuItem(object, menu, "Help", SLOT(activate_help()));
 
   menu->popup(QPoint(wind_x, wind_y));

xtt/lib/ge/qt/ge_subpalette_qt.h

@@ -50,8 +50,8 @@ class SubPaletteQtObject;
 
 class SubPaletteQt : public SubPalette {
 public:
-  SubPaletteQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-      QWidget** w, pwr_tStatus* status);
+  SubPaletteQt(void* xn_parent_ctx, const char* xn_name, QWidget** w,
+      pwr_tStatus* status);
   ~SubPaletteQt();
 
   SubPaletteQtObject* object;
@@ -61,19 +61,13 @@ public:
 
   void set_inputfocus(int focus);
   void create_popup_menu(char* filename, int x, int y);
-
-private:
-  QWidget* parent_widget;
 };
 
 class SubPaletteQtObject : public QObject {
   Q_OBJECT
 
 public:
-  SubPaletteQtObject(SubPaletteQt* parent_ctx)
-      : QObject(), subpalette(parent_ctx)
-  {
-  }
+  SubPaletteQtObject(SubPaletteQt* parent_ctx) : QObject(), subpalette(parent_ctx) {}
 
 public slots:
   void activate_help();

xtt/lib/glow/qt/glow_draw_qt.h

@@ -281,9 +281,7 @@ public slots:
 
 class DrawPs {
 public:
-  DrawPs(char* filename) : fp(filename), x(0), y(0)
-  {
-  }
+  DrawPs(char* filename) : fp(filename), x(0), y(0) {}
 
   ~DrawPs()
   {
@@ -301,9 +299,7 @@ public:
   {
     memset(color_vect, 0, sizeof(color_vect));
   }
-  ~GlowCustomColorsQt()
-  {
-  }
+  ~GlowCustomColorsQt() {}
 
   QColor
       color_vect[glow_eDrawType_CustomColor__ - glow_eDrawType_CustomColor1];

xtt/lib/xtt/qt/xtt_block_qt.cqt

@@ -134,8 +134,8 @@ void BlockQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-BlockQt::BlockQt(void* b_parent_ctx, QWidget* b_parent_wid, pwr_sAttrRef* b_oar,
-    char* name, unsigned int priv, pwr_tStatus* sts)
+BlockQt::BlockQt(void* b_parent_ctx, pwr_sAttrRef* b_oar, char* name,
+    unsigned int priv, pwr_tStatus* sts)
     : Block(b_parent_ctx, b_oar, name, priv, sts)
 {
   char title[400];
@@ -146,7 +146,7 @@ BlockQt::BlockQt(void* b_parent_ctx, QWidget* b_parent_wid, pwr_sAttrRef* b_oar,
     return;
   }
 
-  toplevel = new BlockQtWidget(this, b_parent_wid);
+  toplevel = new BlockQtWidget(this);
   strcpy(title, name);
   strcat(title, "    ");
   strcat(title, aname);
@@ -204,7 +204,7 @@ BlockQt::BlockQt(void* b_parent_ctx, QWidget* b_parent_wid, pwr_sAttrRef* b_oar,
     toggleNo->setEnabled(false);
   }
 
-  wow = new CoWowQt(b_parent_wid);
+  wow = new CoWowQt(toplevel);
 
   update();
 }
\ No newline at end of file

xtt/lib/xtt/qt/xtt_block_qt.h

@@ -48,8 +48,8 @@ class BlockQtWidget;
 
 class BlockQt : public Block {
 public:
-  BlockQt(void* b_parent_ctx, QWidget* b_parent_wid, pwr_sAttrRef* b_oar,
-      char* name, unsigned int priv, pwr_tStatus* status);
+  BlockQt(void* b_parent_ctx, pwr_sAttrRef* b_oar, char* name,
+      unsigned int priv, pwr_tStatus* status);
   ~BlockQt();
   int execute();
   void update();
@@ -71,10 +71,7 @@ class BlockQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  BlockQtWidget(BlockQt* parent_ctx, QWidget* parent)
-      : QWidget(), block(parent_ctx)
-  {
-  }
+  BlockQtWidget(BlockQt* parent_ctx) : QWidget(), block(parent_ctx) {}
 
 protected:
   void closeEvent(QCloseEvent* event);

xtt/lib/xtt/qt/xtt_clog_qt.cqt

@@ -62,11 +62,10 @@ void CLogQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-CLogQt::CLogQt(void* clog_parent_ctx, QWidget* clog_parent_wid,
-    const char* clog_name, pwr_tStatus* status)
-    : CLog(clog_parent_ctx, clog_name, status), parent_wid(clog_parent_wid)
+CLogQt::CLogQt(void* clog_parent_ctx, const char* clog_name,
+    pwr_tStatus* status) : CLog(clog_parent_ctx, clog_name, status)
 {
-  toplevel = new CLogQtWidget(this, clog_parent_wid);
+  toplevel = new CLogQtWidget(this);
   toplevel->setMinimumSize(1000, 800);
   toplevel->setWindowTitle(translate_utf8(clog_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -107,7 +106,7 @@ CLogQt::CLogQt(void* clog_parent_ctx, QWidget* clog_parent_wid,
   addMenuItem(
       toplevel, help, "Help on &Selected Message", SLOT(activate_helpmsg()));
 
-  clognav = new CLogNavQt(this, toplevel, &clognav_widget);
+  clognav = new CLogNavQt(this, &clognav_widget);
 
   vbox->setMenuBar(menu_bar);
   add_expanding(vbox, clognav_widget);

xtt/lib/xtt/qt/xtt_clog_qt.h

@@ -48,11 +48,9 @@ class CLogQtWidget;
 
 class CLogQt : public CLog {
 public:
-  CLogQt(void* clog_parent_ctx, QWidget* clog_parent_wid, const char* clog_name,
-      pwr_tStatus* status);
+  CLogQt(void* clog_parent_ctx, const char* clog_name, pwr_tStatus* status);
   ~CLogQt();
 
-  QWidget* parent_wid;
   QWidget* clognav_widget;
 
   void pop();
@@ -71,10 +69,7 @@ class CLogQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  CLogQtWidget(CLogQt* parent_ctx, QWidget* parent)
-      : QWidget(), clog(parent_ctx)
-  {
-  }
+  CLogQtWidget(CLogQt* parent_ctx) : QWidget(), clog(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_clognav_qt.cpp

@@ -42,8 +42,7 @@
 
 #include "xtt_clognav_qt.h"
 
-CLogNavQt::CLogNavQt(
-    void* clog_parent_ctx, QWidget* clog_parent_wid, QWidget** w)
+CLogNavQt::CLogNavQt(void* clog_parent_ctx, QWidget** w)
     : CLogNav(clog_parent_ctx)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);

xtt/lib/xtt/qt/xtt_clognav_qt.h

@@ -45,7 +45,7 @@
 
 class CLogNavQt : public CLogNav {
 public:
-  CLogNavQt(void* ev_parent_ctx, QWidget* ev_parent_wid, QWidget** w);
+  CLogNavQt(void* ev_parent_ctx, QWidget** w);
   ~CLogNavQt();
 
   QWidget* brow_widget;

xtt/lib/xtt/qt/xtt_ev_qt.cqt

@@ -78,16 +78,14 @@ void CallbackWidget::focusInEvent(QFocusEvent* event)
   QDialog::focusInEvent(event);
 }
 
-EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
-    char* ala_name, char* blk_name, pwr_tObjid ev_user, int display_ala,
-    int display_eve, int display_blk, int display_return, int display_ack,
-    int ev_beep, pwr_tMask ev_pop_mask, int ev_eventname_seg,
-    pwr_tStatus* status)
+EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
+    pwr_tObjid ev_user, int display_ala, int display_eve, int display_blk,
+    int display_return, int display_ack, int ev_beep, pwr_tMask ev_pop_mask,
+    int ev_eventname_seg, pwr_tStatus* status)
     : Ev(ev_parent_ctx, eve_name, ala_name, blk_name, ev_user, display_ala,
           display_eve, display_blk, display_return, display_ack, ev_beep,
           ev_pop_mask, ev_eventname_seg, status),
-      parent_wid(ev_parent_wid), parent_wid_eve(0), parent_wid_ala(0),
-      parent_wid_blk(0)
+      parent_wid_eve(0), parent_wid_ala(0), parent_wid_blk(0)
 {
   pwr_tStatus sts;
   pwr_sClass_OpPlace* opp;
@@ -170,8 +168,8 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
         object, help, "Help Selected Event", SLOT(eve_activate_helpevent()));
 
     // Create eve evlist
-    eve = new EvListQt(parent_wid_eve, parent_wid_eve, ev_eType_EventList,
-        eve_size, eventname_seg, &eve_widget);
+    eve = new EvListQt(this, ev_eType_EventList, eve_size, eventname_seg,
+        &eve_widget);
     eve->start_trace_cb = &eve_start_trace_cb;
     eve->display_in_xnav_cb = &eve_display_in_xnav_cb;
     eve->name_to_alias_cb = &ev_name_to_alias_cb;
@@ -302,8 +300,8 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
         object, help, "Help Selected Event", SLOT(ala_activate_helpevent()));
 
     // Create ala evlist
-    ala = new EvListQt(parent_wid_ala, parent_wid_ala, ev_eType_AlarmList,
-        ala_size, eventname_seg, &ala_widget);
+    ala = new EvListQt(this, ev_eType_AlarmList, ala_size, eventname_seg,
+        &ala_widget);
     ala->start_trace_cb = &ala_start_trace_cb;
     ala->display_in_xnav_cb = &ala_display_in_xnav_cb;
     ala->name_to_alias_cb = &ev_name_to_alias_cb;
@@ -405,8 +403,8 @@ EvQt::EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
         "system-help");
 
     // Create blk evlist
-    blk = new EvListQt(parent_wid_blk, parent_wid_blk, ev_eType_BlockList,
-        blk_size, eventname_seg, &blk_widget);
+    blk = new EvListQt(this, ev_eType_BlockList, blk_size, eventname_seg,
+        &blk_widget);
     blk->start_trace_cb = &blk_start_trace_cb;
     blk->display_in_xnav_cb = &blk_display_in_xnav_cb;
     blk->name_to_alias_cb = &ev_name_to_alias_cb;
@@ -458,8 +456,8 @@ EvAla* EvQt::open_alarmlist_satellite(const char* title, pwr_tStatus* sts,
     return 0;
   }
 
-  sala[sala_cnt++] = new EvAlaQt(this, parent_wid, (char*)title, user,
-      eventname_seg, width, height, x, y, view, options, widget, sts);
+  sala[sala_cnt++] = new EvAlaQt(this, (char*)title, user, eventname_seg, width,
+      height, x, y, view, options, widget, sts);
   if (EVEN(*sts)) {
     return 0;
   }
@@ -487,8 +485,8 @@ EvEve* EvQt::open_eventlist_satellite(const char* title, pwr_tStatus* sts,
     return 0;
   }
 
-  seve[seve_cnt++] = new EvEveQt(this, parent_wid, (char*)title, user,
-      eventname_seg, width, height, x, y, view, options, widget, sts);
+  seve[seve_cnt++] = new EvEveQt(this, (char*)title, user, eventname_seg, width,
+      height, x, y, view, options, widget, sts);
   if (EVEN(*sts)) {
     return 0;
   }

xtt/lib/xtt/qt/xtt_ev_qt.h

@@ -48,14 +48,12 @@ class EvQtObject;
 
 class EvQt : public Ev {
 public:
-  EvQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
-      char* ala_name, char* blk_name, pwr_tObjid ev_user, int display_ala,
-      int display_eve, int display_blk, int display_return, int display_ack,
-      int ev_beep, pwr_tMask ev_pop_mask, int ev_eventname_seg,
-      pwr_tStatus* status);
+  EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
+      pwr_tObjid ev_user, int display_ala, int display_eve, int display_blk,
+      int display_return, int display_ack, int ev_beep, pwr_tMask ev_pop_mask,
+      int ev_eventname_seg, pwr_tStatus* status);
   ~EvQt();
 
-  QWidget* parent_wid;
   QDialog* parent_wid_eve;
   QDialog* parent_wid_ala;
   QDialog* parent_wid_blk;
@@ -89,9 +87,7 @@ class EvQtObject : public QObject {
   Q_OBJECT
 
 public:
-  EvQtObject(EvQt* parent_ctx) : QObject(), ev(parent_ctx)
-  {
-  }
+  EvQtObject(EvQt* parent_ctx) : QObject(), ev(parent_ctx) {}
 
 public slots:
   void eve_action_inputfocus();

xtt/lib/xtt/qt/xtt_evala_qt.cqt

@@ -50,12 +50,12 @@
 #include <QMenuBar>
 #include <QToolBar>
 
-EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
-    pwr_tObjid ev_user, int ev_eventname_seg, int ev_width, int ev_height,
-    int ev_x, int ev_y, pwr_tObjid ev_view, unsigned int ev_options,
-    void* widget, pwr_tStatus* status)
+EvAlaQt::EvAlaQt(void* ev_parent_ctx, char* ala_name, pwr_tObjid ev_user,
+    int ev_eventname_seg, int ev_width, int ev_height, int ev_x, int ev_y,
+    pwr_tObjid ev_view, unsigned int ev_options, void* widget,
+    pwr_tStatus* status)
     : EvAla(ev_parent_ctx, ala_name, ev_user, ev_eventname_seg, ev_width,
-          ev_height, ev_x, ev_y, ev_view, ev_options, status)
+            ev_height, ev_x, ev_y, ev_view, ev_options, status)
 {
   pwr_tStatus sts;
   pwr_sClass_OpPlace* opp;
@@ -85,17 +85,13 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
 
   // Ala Window
 
+  toplevel = new EvAlaQtWidget(this);
   if (!(options & ev_mAlaOptions_Embedded)) {
-    toplevel = new EvAlaQtWidget(this, ev_parent_wid);
     toplevel->setMinimumSize(ala_width, ala_height);
     toplevel->setWindowTitle(translate_utf8(ala_name));
     toplevel->setAttribute(Qt::WA_DeleteOnClose);
 
-    parent_wid_ala = toplevel;
-
-    CoWowQt::SetWindowIcon(parent_wid_ala);
-  } else {
-    parent_wid_ala = (QWidget*)widget;
+    CoWowQt::SetWindowIcon(toplevel);
   }
 
   // Menu
@@ -166,8 +162,8 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
       toplevel, help, "Help Selected Event", SLOT(ala_activate_helpevent()));
 
   // Create ala evlist
-  ala = new EvListQt(this, parent_wid_ala, ev_eType_AlarmList, ala_size,
-      eventname_seg, &ala_widget, ala_init_cb);
+  ala = new EvListQt(this, ev_eType_AlarmList, ala_size, eventname_seg,
+      &ala_widget, ala_init_cb);
   ala->start_trace_cb = &ala_start_trace_cb;
   ala->display_in_xnav_cb = &ala_display_in_xnav_cb;
   ala->name_to_alias_cb = &ala_name_to_alias_cb;
@@ -217,18 +213,16 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
   ala_vbox->addLayout(ala_toolsbox);
   add_expanding(ala_vbox, ala_widget);
 
-  if (!(options & ev_mAlaOptions_Embedded)) {
-    parent_wid_ala->setLayout(ala_vbox);
-  }
+  toplevel->setLayout(ala_vbox);
 
   ala_methodtoolbar->set_sensitive();
   ala_sup_methodtoolbar->set_sensitive();
 
   if (!(options & ev_mAlaOptions_Embedded)) {
-    parent_wid_ala->show();
+    toplevel->show();
     if (!(EvAla::x == 0 && EvAla::y == 0)) {
       // Set position
-      parent_wid_ala->move(EvAla::x, EvAla::y);
+      toplevel->move(EvAla::x, EvAla::y);
     }
   } else {
     ala_widget->setMinimumSize(ala_width, ala_height);
@@ -236,7 +230,7 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
 
   ala_displayed = 1;
 
-  wow = new CoWowQt(parent_wid_ala);
+  wow = new CoWowQt(toplevel);
 
   *status = 1;
 }
@@ -254,14 +248,14 @@ EvAlaQt::~EvAlaQt()
 
 void EvAlaQt::map_ala()
 {
-  pop(parent_wid_ala);
+  pop(toplevel);
   ala_displayed = 1;
 }
 
 void EvAlaQt::unmap_ala()
 {
   if (ala_displayed) {
-    parent_wid_ala->setVisible(false);
+    toplevel->setVisible(false);
     ala_displayed = 0;
   }
 }
@@ -269,10 +263,15 @@ void EvAlaQt::unmap_ala()
 void EvAlaQt::set_title_ala(char* title)
 {
   if (!(options & ev_mAlaOptions_Embedded)) {
-    parent_wid_ala->setWindowTitle(fl(title));
+    toplevel->setWindowTitle(fl(title));
   }
 }
 
+QWidget* EvAlaQt::get_widget()
+{
+  return toplevel;
+}
+
 void EvAlaQtWidget::focusInEvent(QFocusEvent* event)
 {
   if (ala->ala_displayed) {

xtt/lib/xtt/qt/xtt_evala_qt.h

@@ -48,14 +48,13 @@ class EvAlaQtWidget;
 
 class EvAlaQt : public EvAla {
 public:
-  EvAlaQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* ala_name,
-      pwr_tObjid ev_user, int ev_eventname_seg, int ev_width, int ev_height,
-      int ev_x, int ev_y, pwr_tObjid ev_view, unsigned int ev_options,
-      void* widget, pwr_tStatus* status);
+  EvAlaQt(void* ev_parent_ctx, char* ala_name, pwr_tObjid ev_user,
+      int ev_eventname_seg, int ev_width, int ev_height,  int ev_x, int ev_y,
+      pwr_tObjid ev_view, unsigned int ev_options, void* widget,
+      pwr_tStatus* status);
   ~EvAlaQt();
 
   EvAlaQtWidget* toplevel;
-  QWidget* parent_wid_ala;
   QWidget* ala_widget;
   QVBoxLayout* ala_vbox;
   pwr_tObjid alarm_views[25];
@@ -64,20 +63,14 @@ public:
   void unmap_ala();
   void set_title_ala(char* title);
 
-  QWidget* get_widget()
-  {
-    return parent_wid_ala;
-  }
+  QWidget* get_widget();
 };
 
 class EvAlaQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  EvAlaQtWidget(EvAlaQt* parent_ctx, QWidget* parent)
-      : QWidget(), ala(parent_ctx)
-  {
-  }
+  EvAlaQtWidget(EvAlaQt* parent_ctx) : QWidget(), ala(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_eveve_qt.cqt

@@ -49,12 +49,12 @@
 
 #include <QMenuBar>
 
-EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
-    pwr_tObjid ev_user, int ev_eventname_seg, int ev_width, int ev_height,
-    int ev_x, int ev_y, pwr_tObjid ev_view, unsigned int ev_options,
-    void* widget, pwr_tStatus* status)
+EvEveQt::EvEveQt(void* ev_parent_ctx, char* eve_name, pwr_tObjid ev_user,
+    int ev_eventname_seg, int ev_width, int ev_height, int ev_x, int ev_y,
+    pwr_tObjid ev_view, unsigned int ev_options, void* widget,
+    pwr_tStatus* status)
     : EvEve(ev_parent_ctx, eve_name, ev_user, ev_eventname_seg, ev_width,
-          ev_height, ev_x, ev_y, ev_view, ev_options, status)
+            ev_height, ev_x, ev_y, ev_view, ev_options, status)
 {
   pwr_tStatus sts;
   pwr_sClass_OpPlace* opp;
@@ -82,17 +82,13 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
   eve_size = opp->MaxNoOfAlarms;
 
   // Eve Window
+  toplevel = new EvEveQtWidget(this);
   if (!(options & ev_mAlaOptions_Embedded)) {
-    toplevel = new EvEveQtWidget(this, ev_parent_wid);
     toplevel->setMinimumSize(eve_width, eve_height);
     toplevel->setWindowTitle(translate_utf8(eve_name));
     toplevel->setAttribute(Qt::WA_DeleteOnClose);
 
-    parent_wid_ala = toplevel;
-
-    CoWowQt::SetWindowIcon(parent_wid_ala);
-  } else {
-    parent_wid_ala = (QWidget*)widget;
+    CoWowQt::SetWindowIcon(toplevel);
   }
 
   eve_vbox = new QVBoxLayout();
@@ -157,8 +153,8 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
       toplevel, help, "Help Selected Event", SLOT(eve_activate_helpevent()));
 
   // Create ala evlist
-  ala = new EvListQt(this, parent_wid_ala, ev_eType_EventList, eve_size,
-      eventname_seg, &eve_widget, eve_init_cb);
+  ala = new EvListQt(this, ev_eType_EventList, eve_size, eventname_seg,
+      &eve_widget, eve_init_cb);
   ala->start_trace_cb = &eve_start_trace_cb;
   ala->display_in_xnav_cb = &eve_display_in_xnav_cb;
   ala->name_to_alias_cb = &eve_name_to_alias_cb;
@@ -205,18 +201,16 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
   eve_vbox->addLayout(eve_toolsbox);
   add_expanding(eve_vbox, eve_widget);
 
-  if (!(options & ev_mAlaOptions_Embedded)) {
-    parent_wid_ala->setLayout(eve_vbox);
-  }
+  toplevel->setLayout(eve_vbox);
 
   eve_methodtoolbar->set_sensitive();
   eve_sup_methodtoolbar->set_sensitive();
 
   if (!(options & ev_mAlaOptions_Embedded)) {
-    parent_wid_ala->show();
+    toplevel->show();
     if (!(EvEve::x == 0 && EvEve::y == 0)) {
       // Set position
-      parent_wid_ala->move(EvEve::x, EvEve::y);
+      toplevel->move(EvEve::x, EvEve::y);
     }
   } else {
     eve_widget->setMinimumSize(eve_width, eve_height);
@@ -224,7 +218,7 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
 
   eve_displayed = 1;
 
-  wow = new CoWowQt(parent_wid_ala);
+  wow = new CoWowQt(toplevel);
 
   *status = 1;
 }
@@ -242,14 +236,14 @@ EvEveQt::~EvEveQt()
 
 void EvEveQt::map_ala()
 {
-  pop(parent_wid_ala);
+  pop(toplevel);
   eve_displayed = 1;
 }
 
 void EvEveQt::unmap_ala()
 {
   if (eve_displayed) {
-    parent_wid_ala->setVisible(false);
+    toplevel->setVisible(false);
     eve_displayed = 0;
   }
 }
@@ -257,10 +251,15 @@ void EvEveQt::unmap_ala()
 void EvEveQt::set_title_ala(char* title)
 {
   if (!(options & ev_mAlaOptions_Embedded)) {
-    parent_wid_ala->setWindowTitle(fl(title));
+    toplevel->setWindowTitle(fl(title));
   }
 }
 
+QWidget* EvEveQt::get_widget()
+{
+  return toplevel;
+}
+
 void EvEveQtWidget::focusInEvent(QFocusEvent* event)
 {
   if (eve->eve_displayed) {

xtt/lib/xtt/qt/xtt_eveve_qt.h

@@ -48,14 +48,13 @@ class EvEveQtWidget;
 
 class EvEveQt : public EvEve {
 public:
-  EvEveQt(void* ev_parent_ctx, QWidget* ev_parent_wid, char* eve_name,
-      pwr_tObjid ev_user, int ev_eventname_seg, int ev_width, int ev_height,
-      int ev_x, int ev_y, pwr_tObjid ev_view, unsigned int ev_options,
-      void* widget, pwr_tStatus* status);
+  EvEveQt(void* ev_parent_ctx, char* eve_name, pwr_tObjid ev_user,
+      int ev_eventname_seg, int ev_width, int ev_height, int ev_x, int ev_y,
+      pwr_tObjid ev_view, unsigned int ev_options, void* widget,
+      pwr_tStatus* status);
   ~EvEveQt();
 
   EvEveQtWidget* toplevel;
-  QWidget* parent_wid_ala;
   QWidget* eve_widget;
   QVBoxLayout* eve_vbox;
   pwr_tObjid alarm_views[25];
@@ -64,20 +63,14 @@ public:
   void unmap_ala();
   void set_title_ala(char* title);
 
-  QWidget* get_widget()
-  {
-    return parent_wid_ala;
-  }
+  QWidget* get_widget();
 };
 
 class EvEveQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  EvEveQtWidget(EvEveQt* parent_ctx, QWidget* parent)
-      : QWidget(), eve(parent_ctx)
-  {
-  }
+  EvEveQtWidget(EvEveQt* parent_ctx) : QWidget(), eve(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_evlist_qt.cpp

@@ -48,9 +48,8 @@
 
 #include <QApplication>
 
-EvListQt::EvListQt(void* ev_parent_ctx, QWidget* ev_parent_wid,
-    ev_eType ev_type, int ev_size, int ev_eventname_seg, QWidget** w,
-    void (*ev_init_cb)(void*))
+EvListQt::EvListQt(void* ev_parent_ctx, ev_eType ev_type, int ev_size,
+    int ev_eventname_seg, QWidget** w, void (*ev_init_cb)(void*))
     : EvList(ev_parent_ctx, ev_type, ev_size, ev_eventname_seg, ev_init_cb)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);

xtt/lib/xtt/qt/xtt_evlist_qt.h

@@ -43,9 +43,8 @@
 
 class EvListQt : public EvList {
 public:
-  EvListQt(void* ev_parent_ctx, QWidget* ev_parent_wid, ev_eType ev_type,
-      int ev_size, int ev_evenname_seg, QWidget** w,
-      void (*ev_init_cb)(void*) = 0);
+  EvListQt(void* ev_parent_ctx, ev_eType ev_type, int ev_size,
+      int ev_evenname_seg, QWidget** w, void (*ev_init_cb)(void*) = 0);
   ~EvListQt();
 
   QWidget* brow_widget;

xtt/lib/xtt/qt/xtt_fast_qt.cpp

@@ -48,9 +48,9 @@
 
 #include "xtt_fast_qt.h"
 
-XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, char* name,
-    QWidget** w, pwr_sAttrRef* fast_arp, int width, int height,
-    unsigned int options, int xn_color_theme, void* basewidget, int* sts)
+XttFastQt::XttFastQt(void* parent_ctx, char* name, QWidget** w,
+    pwr_sAttrRef* fast_arp, int width, int height, unsigned int options,
+    int xn_color_theme, void* basewidget, int* sts)
     : XttFast(parent_ctx, name, fast_arp, xn_color_theme, sts)
 {
   if (EVEN(*sts)) {
@@ -66,20 +66,20 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, char* name,
     gdh_AttrrefToName(fast_arp, title, sizeof(title), cdh_mNName);
   }
 
-  curve = new GeCurveQt(this, parent_wid, title, NULL, gcd, 0, width, height,
-      options, color_theme, basewidget);
+  curve = new GeCurveQt(this, title, NULL, gcd, 0, width, height, options,
+      color_theme, basewidget);
   curve->close_cb = fast_close_cb;
   curve->help_cb = fast_help_cb;
   curve->export_cb = fast_export_cb;
   setup();
 
-  wow = new CoWowQt(parent_wid);
+  wow = new CoWowQt(((GeCurveQt*)curve)->toplevel);
   timerid = wow->timer_new();
 
   timerid->add(1000, fast_scan, this);
 }
 
-XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, const char* name,
+XttFastQt::XttFastQt(void* parent_ctx, const char* name,
     QWidget** w, char* filename, int xn_color_theme, void* basewidget, int* sts)
     : XttFast(parent_ctx, name, filename, xn_color_theme, sts)
 {
@@ -92,13 +92,13 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, const char* name,
   }
   *sts = XNAV__SUCCESS;
 
-  curve = new GeCurveQt(
-      this, parent_wid, title, NULL, gcd, 1, 0, 0, 0, color_theme, basewidget);
+  curve = new GeCurveQt(this, title, NULL, gcd, 1, 0, 0, 0, color_theme,
+      basewidget);
   curve->close_cb = fast_close_cb;
   curve->help_cb = fast_help_cb;
   curve->enable(0);
 
-  wow = new CoWowQt(parent_wid);
+  wow = new CoWowQt(((GeCurveQt*)curve)->toplevel);
   timerid = wow->timer_new();
 
   // timerid->add( 1000, fast_scan, this);

xtt/lib/xtt/qt/xtt_fast_qt.h

@@ -43,12 +43,11 @@
 
 class XttFastQt : public XttFast {
 public:
-  XttFastQt(void* xn_parent_ctx, QWidget* xn_parent_wid, char* xn_name,
-      QWidget** w, pwr_sAttrRef* fast_arp, int width, int height,
-      unsigned int xn_options, int xn_color_theme, void* basewidget, int* sts);
-  XttFastQt(void* parent_ctx, QWidget* parent_wid, const char* name,
-      QWidget** w, char* filename, int xn_color_theme, void* basewidget,
-      int* sts);
+  XttFastQt(void* xn_parent_ctx, char* xn_name, QWidget** w,
+      pwr_sAttrRef* fast_arp, int width, int height, unsigned int xn_options,
+      int xn_color_theme, void* basewidget, int* sts);
+  XttFastQt(void* parent_ctx, const char* name, QWidget** w, char* filename,
+      int xn_color_theme, void* basewidget, int* sts);
   ~XttFastQt();
 };
 

xtt/lib/xtt/qt/xtt_fileview_qt.h

@@ -53,9 +53,7 @@ public:
       char* xn_title, char* xn_dir, char* xn_pattern, int xn_type,
       char* xn_target_attr, char* xn_trigger_attr, char* xn_filetype);
 
-  ~XttFileviewQt()
-  {
-  }
+  ~XttFileviewQt() {}
 
   QWidget* list;
   pwr_tFileName dir;
@@ -83,9 +81,7 @@ class XttFileviewQtWidget : public QFileDialog {
 
 public:
   XttFileviewQtWidget(XttFileviewQt* parent_ctx, QWidget* parent)
-      : QFileDialog(parent), fileview(parent_ctx)
-  {
-  }
+      : QFileDialog(parent), fileview(parent_ctx) {}
 
 protected:
   void closeEvent(QCloseEvent* event);

xtt/lib/xtt/qt/xtt_ge_qt.cqt

@@ -229,12 +229,11 @@ void XttGeQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-XttGeQt::XttGeQt(QWidget* xg_parent_wid, void* xg_parent_ctx,
-    const char* xg_name, const char* xg_filename, int xg_scrollbar, int xg_menu,
-    int xg_navigator, int xg_width, int xg_height, int x, int y,
-    double scan_time, const char* object_name, int use_default_access,
-    unsigned int access, unsigned int options, void* basewidget,
-    double* borders, int color_theme,
+XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name,
+    const char* xg_filename, int xg_scrollbar, int xg_menu, int xg_navigator,
+    int xg_width, int xg_height, int x, int y, double scan_time,
+    const char* object_name, int use_default_access, unsigned int access,
+    unsigned int options, void* basewidget, double* borders, int color_theme,
     int (*xg_command_cb)(void*, char*, char*, void*),
     int (*xg_get_current_objects_cb)(void*, pwr_sAttrRef**, int**),
     int (*xg_is_authorized_cb)(void*, unsigned int),
@@ -282,9 +281,9 @@ XttGeQt::XttGeQt(QWidget* xg_parent_wid, void* xg_parent_ctx,
 
   QVBoxLayout* graph_form = new QVBoxLayout();
   this->graph_form = layout_to_widget(graph_form);
-  graph = new GraphQt(this, this->graph_form, "Plant", &grow_widget, &sts,
-      "pwrp_exe:", graph_eMode_Runtime, scrollbar, 1, object_name,
-      use_default_access, access, 0, color_theme, ge_keyboard_cb);
+  graph = new GraphQt(this, "Plant", &grow_widget, &sts, "pwrp_exe:",
+      graph_eMode_Runtime, scrollbar, 1, object_name, use_default_access,
+      access, 0, color_theme, ge_keyboard_cb);
   // graph->set_scantime( scan_time);
   graph->message_cb = &message_cb;
   graph->close_cb = &graph_close_cb;

xtt/lib/xtt/qt/xtt_ge_qt.h

@@ -57,11 +57,11 @@ public:
   QMessageBox* confirm_widget = NULL;
   CoWowFocusTimerQt focustimer;
 
-  XttGeQt(QWidget* parent_wid, void* parent_ctx, const char* name,
-      const char* filename, int scrollbar, int menu, int navigator, int width,
-      int height, int x, int y, double scan_time, const char* object_name,
-      int use_default_access, unsigned int access, unsigned int options,
-      void* basewidget, double* borders, int color_theme,
+  XttGeQt(void* parent_ctx, const char* name, const char* filename,
+      int scrollbar, int menu, int navigator, int width, int height, int x,
+      int y, double scan_time, const char* object_name, int use_default_access,
+      unsigned int access, unsigned int options, void* basewidget,
+      double* borders, int color_theme,
       int (*xg_command_cb)(void*, char*, char*, void*),
       int (*xg_get_current_objects_cb)(void*, pwr_sAttrRef**, int**),
       int (*xg_is_authorized_cb)(void*, unsigned int),
@@ -96,10 +96,7 @@ class XttGeQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XttGeQtWidget(XttGeQt* parent)
-      : QWidget(), ge(parent)
-  {
-  }
+  XttGeQtWidget(XttGeQt* parent) : QWidget(), ge(parent) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_hist_qt.cqt

@@ -62,9 +62,8 @@ void HistQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-HistQt::HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
-    pwr_tAttrRef* arp, pwr_tStatus* status)
-    : Hist(hist_parent_ctx, hist_name, arp, status)
+HistQt::HistQt(void* hist_parent_ctx, char* hist_name, pwr_tAttrRef* arp,
+    pwr_tStatus* status) : Hist(hist_parent_ctx, hist_name, arp, status)
 {
   const int hist_width = 1335;
   const int hist_height = 700;
@@ -73,7 +72,7 @@ HistQt::HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
   hist_size = 100000;
 
   // Qt
-  toplevel = new HistQtWidget(this, hist_parent_wid);
+  toplevel = new HistQtWidget(this);
   toplevel->setMinimumSize(hist_width, hist_height);
   toplevel->setWindowTitle(translate_utf8(hist_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -276,8 +275,8 @@ HistQt::HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
   search_vbox = layout_to_widget(search_vbox_layout);
 
   // Create hist
-  hist = new EvListQt(this, toplevel, ev_eType_HistList, hist_size, 0,
-      &hist_widget, hist_init_cb);
+  hist = new EvListQt(this, ev_eType_HistList, hist_size, 0, &hist_widget,
+      hist_init_cb);
   hist->start_trace_cb = &hist_start_trace_cb;
   hist->display_in_xnav_cb = &hist_display_in_xnav_cb;
   hist->popup_menu_cb = &hist_popup_menu_cb;

xtt/lib/xtt/qt/xtt_hist_qt.h

@@ -51,8 +51,8 @@ class HistQtWidget;
 
 class HistQt : public Hist {
 public:
-  HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
-      pwr_tAttrRef* arp, pwr_tStatus* status);
+  HistQt(void* hist_parent_ctx, char* hist_name, pwr_tAttrRef* arp,
+      pwr_tStatus* status);
   ~HistQt();
 
   QWidget* form_hist;
@@ -98,10 +98,7 @@ class HistQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  HistQtWidget(HistQt* parent_ctx, QWidget* parent)
-      : QWidget(), hist(parent_ctx)
-  {
-  }
+  HistQtWidget(HistQt* parent_ctx) : QWidget(), hist(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);
@@ -136,11 +133,8 @@ private:
 
 class HistQt : public Hist {
 public:
-  HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
-      pwr_tAttrRef* arp, pwr_tStatus* status)
-      : Hist(hist_parent_ctx, hist_name, arp, status)
-  {
-  }
+  HistQt(void* hist_parent_ctx, char* hist_name, pwr_tAttrRef* arp,
+      pwr_tStatus* status) : Hist(hist_parent_ctx, hist_name, arp, status) {}
 };
 
 #endif

xtt/lib/xtt/qt/xtt_hotkey_qt.h

@@ -71,9 +71,7 @@ public:
   std::vector<HotkeyAction> m_actions;
   std::vector<HotkeyKey> m_keys;
   XttHotkey(const char* filename);
-  ~XttHotkey()
-  {
-  }
+  ~XttHotkey() {}
   void register_action(
       const char* name, void (*action)(char*, void*), void* userdata);
   int read_file();
@@ -85,18 +83,12 @@ public:
 
 class XttHotkey {
 public:
-  XttHotkey(const char* filename)
-  {
-  }
+  XttHotkey(const char* filename) {}
 
-  ~XttHotkey()
-  {
-  }
+  ~XttHotkey() {}
 
   void register_action(
-      const char* name, void (*action)(char*, void*), void* userdata)
-  {
-  }
+      const char* name, void (*action)(char*, void*), void* userdata) {}
 
   static int event_handler(QEvent* xevent, QObject* obj)
   {

xtt/lib/xtt/qt/xtt_keyboard_qt.h

@@ -65,9 +65,7 @@ private:
 class XttKeyboardQtWidget : public QDialog {
 public:
   XttKeyboardQtWidget(XttKeyboardQt* parent_ctx, QWidget* parent)
-      : QDialog(parent), kb(parent_ctx)
-  {
-  }
+      : QDialog(parent), kb(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_methodtoolbar_qt.h

@@ -75,9 +75,7 @@ class XttMethodToolbarQtObject : public QObject {
 
 public:
   XttMethodToolbarQtObject(XttMethodToolbarQt* parent_ctx)
-      : QObject(), toolbar(parent_ctx)
-  {
-  }
+      : QObject(), toolbar(parent_ctx) {}
 
 public slots:
   void activate_button();

xtt/lib/xtt/qt/xtt_multiview_qt.cpp

@@ -119,11 +119,10 @@ void XttMultiViewQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
-    const char* mv_name, pwr_tAttrRef* mv_aref, int mv_width, int mv_height,
-    int mv_x, int mv_y, unsigned int mv_options, void* basewidget,
-    int mv_color_theme, pwr_tStatus* sts,
-    int (*mv_command_cb)(void*, char*, char*, void*),
+XttMultiViewQt::XttMultiViewQt(void* mv_parent_ctx, const char* mv_name,
+    pwr_tAttrRef* mv_aref, int mv_width, int mv_height, int mv_x, int mv_y,
+    unsigned int mv_options, void* basewidget, int mv_color_theme,
+    pwr_tStatus* sts, int (*mv_command_cb)(void*, char*, char*, void*),
     int (*mv_get_current_objects_cb)(void*, pwr_sAttrRef**, int**),
     int (*mv_is_authorized_cb)(void*, unsigned int),
     void (*mv_keyboard_cb)(void*, void*, int, int))
@@ -153,7 +152,7 @@ XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
   }
 
   // Qt
-  toplevel = new XttMultiViewQtWidget(this, mv_parent_wid);
+  toplevel = new XttMultiViewQtWidget(this);
   toplevel->setMinimumSize(window_width, window_height);
   if (!(options & ge_mOptions_Embedded)) {
     toplevel->setWindowTitle(QString::fromLatin1(mv.Title));
@@ -272,11 +271,10 @@ XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
             bordersp = borders;
           }
 
-          XttGeQt* ge = new XttGeQt(toplevel, toplevel,
-              "No title", graph_name, scrollbar, menu, 0, w, h, mv_x, mv_y, 1.0,
-              objectname_p, 0, 0, ge_mOptions_Embedded, 0, bordersp,
-              color_theme, multiview_ge_command_cb,
-              multiview_ge_get_current_objects_cb,
+          XttGeQt* ge = new XttGeQt(this, "No title", graph_name, scrollbar,
+              menu, 0, w, h, mv_x, mv_y, 1.0, objectname_p, 0, 0,
+              ge_mOptions_Embedded, 0, bordersp, color_theme,
+              multiview_ge_command_cb, multiview_ge_get_current_objects_cb,
               multiview_ge_is_authorized_cb, multiview_keyboard_cb);
           setDataAndTag(idx, type, ge);
 
@@ -309,10 +307,9 @@ XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
             break;
           }
 
-          XttMultiViewQt* mv = new XttMultiViewQt(toplevel, this,
-              "No title", &graph_aref, w, h, mv_x, mv_y, ge_mOptions_Embedded,
-              0, color_theme, &lsts, multiview_ge_command_cb,
-              multiview_ge_get_current_objects_cb,
+          XttMultiViewQt* mv = new XttMultiViewQt(this, "No title", &graph_aref,
+              w, h, mv_x, mv_y, ge_mOptions_Embedded, 0, color_theme, &lsts,
+              multiview_ge_command_cb, multiview_ge_get_current_objects_cb,
               multiview_ge_is_authorized_cb, multiview_keyboard_cb);
           setDataAndTag(idx, type, mv);
           mv->close_cb = multiview_ge_close_cb;
@@ -348,16 +345,16 @@ XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
           XttTrendQt* trend;
           if (classid == pwr_cClass_PlotGroup) {
             arefv[0] = mv.Action[idx].Object[0];
-            trend = new XttTrendQt(this, toplevel,
-                (char*)"No title", &widget, 0, &(arefv[0]), w, h,
-                (unsigned int)curve_mOptions_Embedded, color_theme, 0, sts);
+            trend = new XttTrendQt(this, (char*)"No title", &widget, 0,
+                &(arefv[0]), w, h, (unsigned int)curve_mOptions_Embedded,
+                color_theme, 0, sts);
             setDataAndTag(idx, type, trend);
           } else if (classid == pwr_cClass_DsTrend || classid == pwr_cClass_DsTrendCurve) {
             arefv[0] = mv.Action[idx].Object[0];
             memset(&arefv[1], 0, sizeof(arefv[0]));
-            trend = new XttTrendQt(this, toplevel,
-                (char*)"No title", &widget, arefv, 0, w, h,
-                (unsigned int)curve_mOptions_Embedded, color_theme, 0, sts);
+            trend = new XttTrendQt(this, (char*)"No title", &widget, arefv, 0,
+                w, h, (unsigned int)curve_mOptions_Embedded, color_theme, 0,
+                sts);
             setDataAndTag(idx, type, trend);
           } else {
             break;
@@ -590,10 +587,10 @@ XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
           }
 
           QWidget* widget;
-          XttSevHistQt* sevhist = new XttSevHistQt(this, toplevel,
-              (char*)"No title", &widget, oidv, anamev, onamev, sevhistobjectv,
-              xnav->scctx, w, h, (unsigned int)curve_mOptions_Embedded,
-              color_theme, time_ePeriod_, 0, sts);
+          XttSevHistQt* sevhist = new XttSevHistQt(this, (char*)"No title",
+              &widget, oidv, anamev, onamev, sevhistobjectv, xnav->scctx, w, h,
+              (unsigned int)curve_mOptions_Embedded, color_theme, time_ePeriod_,
+              0, sts);
           if (EVEN(*sts)) {
             QString s = "Unable to load history data\n";
             char str1[200];
@@ -663,9 +660,9 @@ XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
             options |= strm_mOptions_CgiParameterAuthentication;
           }
 
-          XttStreamQt* stream = new XttStreamQt(toplevel, this,
-              "No title", xttcamera.URL, mv.Action[idx].Width,
-              mv.Action[idx].Height, 0, 0, 0, options, 1, &aref, sts);
+          XttStreamQt* stream = new XttStreamQt(this, "No title", xttcamera.URL,
+              mv.Action[idx].Width, mv.Action[idx].Height, 0, 0, 0, options, 1,
+              &aref, sts);
           setDataAndTag(idx, type, stream);
 
           stream->close_cb = multiview_strm_close_cb;
@@ -866,10 +863,10 @@ int XttMultiViewQt::set_subwindow_source(const char* name, char* source,
           switch (type) { // TODO: Add support for AlarmList, EventList and FastCurve
           case pwr_eMultiViewContentEnum_Graph:
           case pwr_eMultiViewContentEnum_ObjectGraph: {
-            XttGeQt* ge = new XttGeQt(toplevel, toplevel,
-                "No title", source, scrollbar, menu, 0, w, h, 0, 0, 1.0, object,
-                0, 0, ge_mOptions_Embedded, 0, borders, color_theme,
-                multiview_ge_command_cb, multiview_ge_get_current_objects_cb,
+            XttGeQt* ge = new XttGeQt(this, "No title", source, scrollbar, menu,
+                0, w, h, 0, 0, 1.0, object, 0, 0, ge_mOptions_Embedded, 0,
+                borders, color_theme, multiview_ge_command_cb,
+                multiview_ge_get_current_objects_cb,
                 multiview_ge_is_authorized_cb, multiview_keyboard_cb);
 
             appl.remove(views[idx].data);
@@ -903,9 +900,9 @@ int XttMultiViewQt::set_subwindow_source(const char* name, char* source,
               break;
             }
 
-            XttMultiViewQt* mv = new XttMultiViewQt(toplevel, this,
-                "No title", &source_aref, w, h, 0, 0, ge_mOptions_Embedded, 0,
-                color_theme, &sts, multiview_ge_command_cb,
+            XttMultiViewQt* mv = new XttMultiViewQt(this, "No title",
+                &source_aref, w, h, 0, 0, ge_mOptions_Embedded, 0, color_theme,
+                &sts, multiview_ge_command_cb,
                 multiview_ge_get_current_objects_cb,
                 multiview_ge_is_authorized_cb, multiview_keyboard_cb);
 
@@ -952,15 +949,15 @@ int XttMultiViewQt::set_subwindow_source(const char* name, char* source,
             XttTrendQt* trend;
             if (classid == pwr_cClass_PlotGroup) {
               arefv[0] = object_aref;
-              trend = new XttTrendQt(this, toplevel,
-                  (char*)"No title", &comp_w, 0, &(arefv[0]), w, h,
-                  (unsigned int)curve_mOptions_Embedded, color_theme, 0, &lsts);
+              trend = new XttTrendQt(this, (char*)"No title", &comp_w, 0,
+                  &(arefv[0]), w, h, (unsigned int)curve_mOptions_Embedded,
+                  color_theme, 0, &lsts);
             } else if (classid == pwr_cClass_DsTrend || classid == pwr_cClass_DsTrendCurve) {
               arefv[0] = object_aref;
               memset(&arefv[1], 0, sizeof(arefv[0]));
-              trend = new XttTrendQt(this, toplevel,
-                  (char*)"No title", &comp_w, arefv, 0, w, h,
-                  (unsigned int)curve_mOptions_Embedded, color_theme, 0, &lsts);
+              trend = new XttTrendQt(this, (char*)"No title", &comp_w, arefv, 0,
+                  w, h, (unsigned int)curve_mOptions_Embedded, color_theme, 0,
+                  &lsts);
             } else {
               break;
             }
@@ -1173,10 +1170,9 @@ int XttMultiViewQt::set_subwindow_source(const char* name, char* source,
             }
 
             QWidget* comp_w;
-            XttSevHistQt* sevhist = new XttSevHistQt(this, toplevel,
-                (char*)"No title", &comp_w, oidv, anamev, onamev,
-                sevhistobjectv, xnav->scctx, w, h,
-                (unsigned int)curve_mOptions_Embedded, color_theme,
+            XttSevHistQt* sevhist = new XttSevHistQt(this, (char*)"No title",
+                &comp_w, oidv, anamev, onamev, sevhistobjectv, xnav->scctx, w,
+                h, (unsigned int)curve_mOptions_Embedded, color_theme,
                 time_ePeriod_, 0, &lsts);
             if (EVEN(lsts)) {
               break;
@@ -1213,8 +1209,8 @@ int XttMultiViewQt::set_subwindow_source(const char* name, char* source,
             }
 
 
-            XttStreamQt* stream = new XttStreamQt(toplevel, this,
-                "No title", xttcamera.URL, w, h, 0, 0, 0, xttcamera.Options, 1,
+            XttStreamQt* stream = new XttStreamQt(this, "No title",
+                xttcamera.URL, w, h, 0, 0, 0, xttcamera.Options, 1,
                 &object_aref, &lsts);
 
             appl.remove(views[idx].data);

xtt/lib/xtt/qt/xtt_multiview_qt.h

@@ -58,9 +58,9 @@ public:
   std::vector<View> views;
   CoWowFocusTimerQt focustimer;
 
-  XttMultiViewQt(QWidget* parent_wid, void* parent_ctx, const char* name,
-      pwr_tAttrRef* aref, int width, int height, int x, int y,
-      unsigned int options, void* basewidget, int color_theme, pwr_tStatus* sts,
+  XttMultiViewQt(void* parent_ctx, const char* name, pwr_tAttrRef* aref,
+      int width, int height, int x, int y, unsigned int options,
+      void* basewidget, int color_theme, pwr_tStatus* sts,
       int (*mv_command_cb)(void*, char*, char*, void*),
       int (*mv_get_current_objects_cb)(void*, pwr_sAttrRef**, int**),
       int (*mv_is_authorized_cb)(void*, unsigned int),
@@ -84,10 +84,7 @@ private:
 
 class XttMultiViewQtWidget : public QWidget {
 public:
-  XttMultiViewQtWidget(XttMultiViewQt* parent_ctx, QWidget* parent)
-      : QWidget(parent), multiview(parent_ctx)
-  {
-  }
+  XttMultiViewQtWidget(XttMultiViewQt* parent) : QWidget(), multiview(parent) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_op_qt.cqt

@@ -134,8 +134,7 @@ void ClickableFrame::mousePressEvent(QMouseEvent* event) {
     emit clicked();
 }
 
-OpQt::OpQt(void* op_parent_ctx, QWidget* op_parent_wid, char* opplace,
-    pwr_tStatus* status)
+OpQt::OpQt(void* op_parent_ctx, char* opplace, pwr_tStatus* status)
     : Op(op_parent_ctx, opplace, status), title_label(0), a_height(2),
       text_size(12)
 {
@@ -150,7 +149,7 @@ OpQt::OpQt(void* op_parent_ctx, QWidget* op_parent_wid, char* opplace,
   green_color = QColor("green");
   gray_color = QColor("gray");
 
-  toplevel = new OpQtWidget(this, op_parent_wid);
+  toplevel = new OpQtWidget(this);
   toplevel->setMinimumSize(1100, OP_HEIGHT_MIN + OP_HEIGHT_STATUSBAR);
   toplevel->setWindowFlags(Qt::CustomizeWindowHint);
 

xtt/lib/xtt/qt/xtt_op_qt.h

@@ -65,8 +65,7 @@ class OpQtWidget;
 
 class OpQt : public Op {
 public:
-  OpQt(void* op_parent_ctx, QWidget* op_parent_wid, char* opplace,
-      pwr_tStatus* status);
+  OpQt(void* op_parent_ctx, char* opplace, pwr_tStatus* status);
   ~OpQt();
 
   QLabel* alarmcnt_label;
@@ -127,10 +126,7 @@ class OpQtWidget : public QFrame {
   Q_OBJECT
 
 public:
-  OpQtWidget(OpQt* parent_ctx, QWidget* parent)
-      : QFrame(), op(parent_ctx)
-  {
-  }
+  OpQtWidget(OpQt* parent_ctx) : QFrame(), op(parent_ctx) {}
 
 protected:
   void closeEvent(QCloseEvent* event);

xtt/lib/xtt/qt/xtt_otree_qt.cpp

@@ -41,14 +41,13 @@
 
 /* xtt_otree_qt.cpp -- Object tree viewer */
 
-XttOTreeQt::XttOTreeQt(QWidget* parent_wid, void* xn_parent_ctx,
-    const char* title, pwr_tAttrRef* xn_itemlist, int xn_item_cnt,
-    unsigned int xn_options, pwr_tStatus (*xn_action_cb)(void*, pwr_tAttrRef*))
-    : XttOTree(
-          xn_parent_ctx, xn_itemlist, xn_item_cnt, xn_options, xn_action_cb)
+XttOTreeQt::XttOTreeQt(void* xn_parent_ctx, const char* title,
+    pwr_tAttrRef* xn_itemlist, int xn_item_cnt, unsigned int xn_options,
+    pwr_tStatus (*xn_action_cb)(void*, pwr_tAttrRef*)) : XttOTree(xn_parent_ctx,
+        xn_itemlist, xn_item_cnt, xn_options, xn_action_cb)
 {
-  cowtree = new CowTreeQt(parent_wid, this, title, xn_itemlist, xn_item_cnt,
-      xn_options, &get_object_info, &get_node_info, &action);
+  cowtree = new CowTreeQt(this, title, xn_itemlist, xn_item_cnt, xn_options,
+      &get_object_info, &get_node_info, &action);
   cowtree->close_cb = close;
 }
 

xtt/lib/xtt/qt/xtt_otree_qt.h

@@ -45,8 +45,8 @@
 
 class XttOTreeQt : public XttOTree {
 public:
-  XttOTreeQt(QWidget* parent_wid, void* xn_parent_ctx, const char* title,
-      pwr_tAttrRef* xn_itemlist, int xn_item_cnt, unsigned int xn_options,
+  XttOTreeQt(void* xn_parent_ctx, const char* title, pwr_tAttrRef* xn_itemlist,
+      int xn_item_cnt, unsigned int xn_options,
       pwr_tStatus (*action_cb)(void*, pwr_tAttrRef*));
   virtual ~XttOTreeQt();
 };

xtt/lib/xtt/qt/xtt_sevhist_qt.cpp

@@ -45,14 +45,13 @@
 #include "xtt_otree_qt.h"
 #include "xtt_sevhist_qt.h"
 
-XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
-    const char* name, QWidget** w, pwr_tOid* xn_oidv, pwr_tOName* xn_anamev,
-    pwr_tOName* xn_onamev, bool* sevhistobjectv, sevcli_tCtx xn_scctx,
-    int xn_width, int xn_height, unsigned int xn_options, int xn_color_theme,
-    time_ePeriod xn_time_range, void* basewidget, int* sts)
+XttSevHistQt::XttSevHistQt(void* parent_ctx, const char* name, QWidget** w,
+    pwr_tOid* xn_oidv, pwr_tOName* xn_anamev, pwr_tOName* xn_onamev,
+    bool* sevhistobjectv, sevcli_tCtx xn_scctx, int xn_width, int xn_height,
+    unsigned int xn_options, int xn_color_theme, time_ePeriod xn_time_range,
+    void* basewidget, int* sts)
     : XttSevHist(parent_ctx, name, xn_oidv, xn_anamev, xn_onamev,
-          sevhistobjectv, xn_scctx, xn_color_theme, xn_time_range, sts),
-      parent_wid(x_parent_wid)
+        sevhistobjectv, xn_scctx, xn_color_theme, xn_time_range, sts)
 {
   char title[250];
   strncpy(title, name, sizeof(title));
@@ -63,7 +62,7 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
   }
   *sts = XNAV__SUCCESS;
 
-  curve = new GeCurveQt(this, parent_wid, title, NULL, gcd, 1, xn_width,
+  curve = new GeCurveQt(this, title, NULL, gcd, 1, xn_width,
       xn_height, xn_options, color_theme, basewidget);
   curve->close_cb = sevhist_close_cb;
   curve->help_cb = sevhist_help_cb;
@@ -87,17 +86,15 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
     *w = (QWidget*)curve->get_widget();
   }
 
-  wow = new CoWowQt(parent_wid);
+  wow = new CoWowQt(((GeCurveQt*)curve)->toplevel);
   timerid = wow->timer_new();
 
   timerid->add(1000, sevhist_scan, this);
 }
 
-XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
-    const char* name, QWidget** w, char* filename, int xn_color_theme,
-    void* basewidget, int* sts)
-    : XttSevHist(parent_ctx, name, filename, xn_color_theme, sts),
-      parent_wid(x_parent_wid)
+XttSevHistQt::XttSevHistQt(void* parent_ctx, const char* name, QWidget** w,
+    char* filename, int xn_color_theme, void* basewidget, int* sts)
+    : XttSevHist(parent_ctx, name, filename, xn_color_theme, sts)
 {
   char title[250];
   strncpy(title, name, sizeof(title));
@@ -108,13 +105,13 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
   }
   *sts = XNAV__SUCCESS;
 
-  curve = new GeCurveQt(
-      this, parent_wid, title, NULL, gcd, 1, 0, 0, 0, color_theme, basewidget);
+  curve = new GeCurveQt(this, title, NULL, gcd, 1, 0, 0, 0, color_theme,
+      basewidget);
   curve->close_cb = sevhist_close_cb;
   curve->help_cb = sevhist_help_cb;
   curve->enable(0);
 
-  wow = new CoWowQt(parent_wid);
+  wow = new CoWowQt(((GeCurveQt*)curve)->toplevel);
   timerid = wow->timer_new();
 
   timerid->add(1000, sevhist_scan, this);
@@ -143,6 +140,5 @@ XttOTree* XttSevHistQt::tree_new(const char* title, pwr_tAttrRef* itemlist,
     int itemcnt, unsigned int layout,
     pwr_tStatus (*action_cb)(void*, pwr_tAttrRef*))
 {
-  return new XttOTreeQt(
-      parent_wid, this, title, itemlist, itemcnt, layout, action_cb);
+  return new XttOTreeQt(this, title, itemlist, itemcnt, layout, action_cb);
 }
\ No newline at end of file

xtt/lib/xtt/qt/xtt_sevhist_qt.h

@@ -43,21 +43,17 @@
 
 class XttSevHistQt : public XttSevHist {
 public:
-  XttSevHistQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-      QWidget** w, pwr_tOid* xn_oidv, pwr_tOName* xn_anamev,
-      pwr_tOName* xn_onamev, bool* sevhistobjectv, sevcli_tCtx xn_scctx,
-      int width, int height, unsigned int options, int xn_color_theme,
-      time_ePeriod xn_time_range, void* basewidget, int* sts);
-  XttSevHistQt(void* parent_ctx, QWidget* parent_wid, const char* name,
-      QWidget** w, char* filename, int xn_color_theme, void* basewidget,
-      int* sts);
+  XttSevHistQt(void* xn_parent_ctx, const char* xn_name, QWidget** w,
+      pwr_tOid* xn_oidv, pwr_tOName* xn_anamev, pwr_tOName* xn_onamev,
+      bool* sevhistobjectv, sevcli_tCtx xn_scctx, int width, int height,
+      unsigned int options, int xn_color_theme, time_ePeriod xn_time_range,
+      void* basewidget, int* sts);
+  XttSevHistQt(void* parent_ctx, const char* name, QWidget** w, char* filename,
+      int xn_color_theme, void* basewidget, int* sts);
   ~XttSevHistQt();
 
   XttOTree* tree_new(const char* title, pwr_tAttrRef* itemlist, int itemcnt,
       unsigned int layout, pwr_tStatus (*action_cb)(void*, pwr_tAttrRef*));
-
-private:
-  QWidget* parent_wid;
 };
 
 #endif
\ No newline at end of file

xtt/lib/xtt/qt/xtt_stream_qt.cqt

@@ -333,20 +333,18 @@ void XttStreamQt::scroll_cb(void* data)
   stream->hidePtz();
 }
 
-XttStreamQt::XttStreamQt(QWidget* st_parent_wid, void* st_parent_ctx,
-    const char* name, const char* st_uri, int width, int height, int x, int y,
-    double scan_time, unsigned int st_options, int st_embedded,
-    pwr_tAttrRef* st_arp, pwr_tStatus* sts)
-    : XttStream(st_parent_ctx, name, st_uri, width, height, x, y, scan_time,
-          st_options, st_embedded, st_arp),
-      scroll_cnt(0), no_uri(0)
+XttStreamQt::XttStreamQt(void* st_parent_ctx, const char* name,
+    const char* st_uri, int width, int height, int x, int y, double scan_time,
+    unsigned int st_options, int st_embedded, pwr_tAttrRef* st_arp,
+    pwr_tStatus* sts) : XttStream(st_parent_ctx, name, st_uri, width, height,
+    x, y, scan_time, st_options, st_embedded, st_arp), scroll_cnt(0), no_uri(0)
 {
   if (width == 0 || height == 0) {
     width = 640;
     height = 480;
   }
 
-  toplevel = new XttStreamQtWidget(this, st_parent_wid);
+  toplevel = new XttStreamQtWidget(this);
 
   /* Create the elements */
   playbin2 = new Phonon::VideoPlayer(toplevel);

xtt/lib/xtt/qt/xtt_stream_qt.h

@@ -72,9 +72,9 @@ public:
   CoWowTimer* reconnect_timerid;
   int no_uri;
 
-  XttStreamQt(QWidget* parent_wid, void* parent_ctx, const char* name,
-      const char* uri, int width, int height, int x, int y, double scan_time,
-      unsigned int options, int embedded, pwr_tAttrRef* arp, pwr_tStatus* sts);
+  XttStreamQt(void* parent_ctx, const char* name, const char* uri, int width,
+      int height, int x, int y, double scan_time, unsigned int options,
+      int embedded, pwr_tAttrRef* arp, pwr_tStatus* sts);
   ~XttStreamQt();
 
   void pop();
@@ -99,10 +99,7 @@ class XttStreamQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XttStreamQtWidget(XttStreamQt* parent_ctx, QWidget* parent)
-      : QWidget(parent), stream(parent_ctx)
-  {
-  }
+  XttStreamQtWidget(XttStreamQt* parent_ctx) : QWidget(), stream(parent_ctx) {}
 
 protected:
   void closeEvent(QCloseEvent* event);

xtt/lib/xtt/qt/xtt_tcurve_qt.cpp

@@ -44,10 +44,9 @@
 
 #include "xtt_tcurve_qt.h"
 
-XttTCurveQt::XttTCurveQt(void* parent_ctx, QWidget* parent_wid,
-    const char* name, QWidget** w, pwr_tAttrRef* xn_arefv, int xn_width,
-    int xn_height, unsigned int xn_options, int xn_color_theme,
-    void* basewidget, int* sts)
+XttTCurveQt::XttTCurveQt(void* parent_ctx, const char* name, QWidget** w,
+    pwr_tAttrRef* xn_arefv, int xn_width, int xn_height,
+    unsigned int xn_options, int xn_color_theme, void* basewidget, int* sts)
     : XttTCurve(parent_ctx, name, xn_arefv, xn_color_theme, sts)
 {
   char title[250];
@@ -60,8 +59,8 @@ XttTCurveQt::XttTCurveQt(void* parent_ctx, QWidget* parent_wid,
 
   *sts = XNAV__SUCCESS;
 
-  curve = new GeCurveQt(this, parent_wid, title, NULL, gcd, 1, xn_width,
-      xn_height, xn_options, color_theme, basewidget);
+  curve = new GeCurveQt(this, title, NULL, gcd, 1, xn_width, xn_height,
+      xn_options, color_theme, basewidget);
   curve->close_cb = tcurve_close_cb;
   curve->help_cb = tcurve_help_cb;
   curve->increase_period_cb = tcurve_increase_period_cb;
@@ -79,7 +78,7 @@ XttTCurveQt::XttTCurveQt(void* parent_ctx, QWidget* parent_wid,
       | curve_mEnable_Open | curve_mEnable_Save | curve_mEnable_CurveType
       | curve_mEnable_CurveTypeSquare | curve_mEnable_FillCurve);
 
-  wow = new CoWowQt(parent_wid);
+  wow = new CoWowQt(((GeCurveQt*)curve)->toplevel);
   timerid = wow->timer_new();
 
   timerid->add(1000, tcurve_scan, this);

xtt/lib/xtt/qt/xtt_tcurve_qt.h

@@ -43,8 +43,8 @@
 
 class XttTCurveQt : public XttTCurve {
 public:
-  XttTCurveQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-      QWidget** w, pwr_tAttrRef* xn_arefv, int xn_width, int xn_height,
+  XttTCurveQt(void* xn_parent_ctx, const char* xn_name, QWidget** w,
+      pwr_tAttrRef* xn_arefv, int xn_width, int xn_height,
       unsigned int xn_options, int xn_color_theme, void* basewidget, int* sts);
   ~XttTCurveQt();
 };

xtt/lib/xtt/qt/xtt_trace_qt.cqt

@@ -205,7 +205,7 @@ void RtTraceQt::popup_menu_position(int event_x, int event_y, int* x, int* y)
 
 RtTrace* RtTraceQt::subwindow_new(void* ctx, pwr_tObjid oid, pwr_tStatus* sts)
 {
-  return new RtTraceQt(ctx, flow_widget, oid, sts);
+  return new RtTraceQt(ctx, oid, sts);
 }
 
 void RtTraceQtWidget::closeEvent(QCloseEvent* event)
@@ -214,8 +214,8 @@ void RtTraceQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
-    pwr_tObjid tr_objid, pwr_tStatus* status)
+RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
+    pwr_tStatus* status)
     : RtTrace(tr_parent_ctx, tr_objid, status), nav_shell(0)
 {
   const int window_width = 900;
@@ -282,7 +282,7 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
   }
 
   // Qt
-  toplevel = new RtTraceQtWidget(this, tr_parent_wid);
+  toplevel = new RtTraceQtWidget(this);
   toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(QString::fromLatin1(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

xtt/lib/xtt/qt/xtt_trace_qt.h

@@ -55,8 +55,7 @@ public:
   QWidget* nav_shell;
   QWidget* nav_widget;
 
-  RtTraceQt(void* parent_ctx, QWidget* parent_wid, pwr_tObjid objid,
-      pwr_tStatus* status);
+  RtTraceQt(void* parent_ctx, pwr_tObjid objid, pwr_tStatus* status);
   ~RtTraceQt();
 
   void pop();
@@ -71,10 +70,7 @@ class RtTraceQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  RtTraceQtWidget(RtTraceQt* parent_ctx, QWidget* parent)
-      : QWidget(), rt(parent_ctx)
-  {
-  }
+  RtTraceQtWidget(RtTraceQt* parent_ctx) : QWidget(), rt(parent_ctx) {}
 
 protected:
   void closeEvent(QCloseEvent* event);

xtt/lib/xtt/qt/xtt_trend_qt.cpp

@@ -49,13 +49,11 @@
 #include "xtt_otree_qt.h"
 #include "xtt_trend_qt.h"
 
-XttTrendQt::XttTrendQt(void* parent_ctx, QWidget* x_parent_wid, char* name,
-    QWidget** w, pwr_sAttrRef* trend_list, pwr_sAttrRef* plotgroup, int width,
-    int height, unsigned int x_options, int x_color_theme, void* basewidget,
-    int* sts)
+XttTrendQt::XttTrendQt(void* parent_ctx, char* name, QWidget** w,
+    pwr_sAttrRef* trend_list, pwr_sAttrRef* plotgroup, int width, int height,
+    unsigned int x_options, int x_color_theme, void* basewidget, int* sts)
     : XttTrend(parent_ctx, name, trend_list, plotgroup, x_options,
-          x_color_theme, sts),
-      parent_wid(x_parent_wid)
+        x_color_theme, sts)
 {
   if (EVEN(*sts)) {
     // Error from XttTrend constructor
@@ -63,8 +61,8 @@ XttTrendQt::XttTrendQt(void* parent_ctx, QWidget* x_parent_wid, char* name,
   }
   *sts = XNAV__SUCCESS;
 
-  curve = new GeCurveQt(this, parent_wid, name, NULL, gcd, 1, width, height,
-      options, color_theme, basewidget);
+  curve = new GeCurveQt(this, name, NULL, gcd, 1, width, height, options,
+      color_theme, basewidget);
   curve->close_cb = trend_close_cb;
   curve->help_cb = trend_help_cb;
   curve->snapshot_cb = trend_snapshot_cb;
@@ -82,7 +80,7 @@ XttTrendQt::XttTrendQt(void* parent_ctx, QWidget* x_parent_wid, char* name,
         curve_mEnable_Add | curve_mEnable_CurveType | curve_mEnable_FillCurve);
   }
 
-  wow = new CoWowQt(parent_wid);
+  wow = new CoWowQt(((GeCurveQt*)curve)->toplevel);
   timerid = wow->timer_new();
   timerid->add(1000, trend_scan, this);
 }
@@ -110,6 +108,5 @@ XttOTree* XttTrendQt::tree_new(const char* title, pwr_tAttrRef* itemlist,
     int itemcnt, unsigned int layout,
     pwr_tStatus (*action_cb)(void*, pwr_tAttrRef*))
 {
-  return new XttOTreeQt(
-      parent_wid, this, title, itemlist, itemcnt, layout, action_cb);
+  return new XttOTreeQt(this, title, itemlist, itemcnt, layout, action_cb);
 }
\ No newline at end of file

xtt/lib/xtt/qt/xtt_trend_qt.h

@@ -43,16 +43,12 @@
 
 class XttTrendQt : public XttTrend {
 public:
-  XttTrendQt(void* xn_parent_ctx, QWidget* xn_parent_wid, char* xn_name,
-      QWidget** w, pwr_sAttrRef* objid, pwr_sAttrRef* plotgroup, int width,
-      int height, unsigned int options, int x_color_theme, void* basewidget,
-      int* sts);
+  XttTrendQt(void* xn_parent_ctx, char* xn_name, QWidget** w,
+      pwr_sAttrRef* objid, pwr_sAttrRef* plotgroup, int width, int height,
+      unsigned int options, int x_color_theme, void* basewidget, int* sts);
   XttOTree* tree_new(const char* title, pwr_tAttrRef* itemlist, int itemcnt,
       unsigned int layout, pwr_tStatus (*action_cb)(void*, pwr_tAttrRef*));
   ~XttTrendQt();
-
-private:
-  QWidget* parent_wid;
 };
 
 #endif
\ No newline at end of file

xtt/lib/xtt/qt/xtt_xatt_qt.cqt

@@ -346,8 +346,8 @@ XAttQt::~XAttQt()
   delete xattnav;
 }
 
-XAttQt::XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
-    pwr_sAttrRef* xa_objar, int xa_advanced_user, int* xa_sts)
+XAttQt::XAttQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
+    int xa_advanced_user, int* xa_sts)
     : XAtt(xa_parent_ctx, xa_objar, xa_advanced_user, xa_sts)
 {
   int sts;
@@ -360,7 +360,7 @@ XAttQt::XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
 
   str_StrncpyCutOff(title, title, 100, 1);
 
-  toplevel = new XAttQtWidget(this, xa_parent_wid);
+  toplevel = new XAttQtWidget(this);
   toplevel->setMinimumSize(420, 600);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -398,7 +398,7 @@ XAttQt::XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
 
   pane = new QSplitter(Qt::Vertical);
 
-  xattnav = new XAttNavQt(this, pane, xattnav_eType_Object, "Plant", &objar,
+  xattnav = new XAttNavQt(this, xattnav_eType_Object, "Plant", &objar,
       xa_advanced_user, 0, &brow_widget, &sts);
   xattnav->message_cb = &message_cb;
   xattnav->change_value_cb = &change_value_cb;

xtt/lib/xtt/qt/xtt_xatt_qt.h

@@ -51,8 +51,8 @@ class XAttQtWidget;
 
 class XAttQt : public XAtt {
 public:
-  XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
-      int xa_advanced_user, int* xa_sts);
+  XAttQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar, int xa_advanced_user,
+      int* xa_sts);
   ~XAttQt();
   QWidget* brow_widget;
   QWidget* form_widget;
@@ -81,10 +81,7 @@ class XAttQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XAttQtWidget(XAttQt* parent_ctx, QWidget* parent)
-      : QWidget(), xatt(parent_ctx)
-  {
-  }
+  XAttQtWidget(XAttQt* parent_ctx) : QWidget(), xatt(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_xattnav_qt.cpp

@@ -43,11 +43,11 @@
 
 #include "xtt_xattnav_qt.h"
 
-XAttNavQt::XAttNavQt(void* xa_parent_ctx, QWidget* xa_parent_wid,
-    xattnav_eType xa_type, const char* xa_name, pwr_sAttrRef* xa_objar,
-    int xa_advanced_user, void* xa_userdata, QWidget** w, pwr_tStatus* status)
+XAttNavQt::XAttNavQt(void* xa_parent_ctx, xattnav_eType xa_type,
+    const char* xa_name, pwr_sAttrRef* xa_objar, int xa_advanced_user,
+    void* xa_userdata, QWidget** w, pwr_tStatus* status)
     : XAttNav(xa_parent_ctx, xa_type, xa_name, xa_objar, xa_advanced_user,
-          xa_userdata, status)
+        xa_userdata, status)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
 

xtt/lib/xtt/qt/xtt_xattnav_qt.h

@@ -45,9 +45,9 @@
 
 class XAttNavQt : public XAttNav {
 public:
-  XAttNavQt(void* xa_parent_ctx, QWidget* xa_parent_wid, xattnav_eType xa_type,
-      const char* xa_name, pwr_sAttrRef* xa_objar, int xa_advanced_user,
-      void* xa_userdata, QWidget** w, pwr_tStatus* status);
+  XAttNavQt(void* xa_parent_ctx, xattnav_eType xa_type, const char* xa_name,
+      pwr_sAttrRef* xa_objar, int xa_advanced_user, void* xa_userdata,
+      QWidget** w, pwr_tStatus* status);
   ~XAttNavQt();
 
   QWidget* brow_widget;

xtt/lib/xtt/qt/xtt_xattone_qt.cqt

@@ -248,8 +248,8 @@ void XAttOneQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-XAttOneQt::XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
-    pwr_sAttrRef* xa_aref, char* xa_title, unsigned int xa_priv, int* xa_sts)
+XAttOneQt::XAttOneQt(void* xa_parent_ctx, pwr_sAttrRef* xa_aref, char* xa_title,
+    unsigned int xa_priv, int* xa_sts)
     : XAttOne(xa_parent_ctx, xa_aref, xa_title, xa_priv, xa_sts)
 {
   pwr_tAName title;
@@ -259,7 +259,7 @@ XAttOneQt::XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
     return;
   }
 
-  toplevel = new XAttOneQtWidget(this, xa_parent_wid);
+  toplevel = new XAttOneQtWidget(this);
   toplevel->setMinimumWidth(500);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

xtt/lib/xtt/qt/xtt_xattone_qt.h

@@ -50,8 +50,8 @@ class XAttOneQtWidget;
 
 class XAttOneQt : public XAttOne {
 public:
-  XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
-      char* xa_title, unsigned int xa_priv, int* xa_sts);
+  XAttOneQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar, char* xa_title,
+      unsigned int xa_priv, int* xa_sts);
   ~XAttOneQt();
 
   QWidget* form_widget;
@@ -78,10 +78,7 @@ class XAttOneQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XAttOneQtWidget(XAttOneQt* parent_ctx, QWidget* parent)
-      : QWidget(), attone(parent_ctx)
-  {
-  }
+  XAttOneQtWidget(XAttOneQt* parent_ctx) : QWidget(), attone(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_xcolwind_qt.cqt

@@ -422,17 +422,16 @@ void XColWindQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
-XColWindQt::XColWindQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
-    pwr_sAttrRef* xa_objar_list, char* xa_title, int xa_advanced_user,
-    xcolwind_eType xa_type, int* xa_sts)
+XColWindQt::XColWindQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar_list,
+    char* xa_title, int xa_advanced_user, xcolwind_eType xa_type, int* xa_sts)
     : XColWind(xa_parent_ctx, xa_objar_list, xa_title, xa_advanced_user,
-          xa_type, xa_sts)
+               xa_type, xa_sts)
 {
   int sts;
   pwr_tAttrRef ar;
   xattnav_eType xattnav_type;
 
-  toplevel = new XColWindQtWidget(this, xa_parent_wid);
+  toplevel = new XColWindQtWidget(this);
   toplevel->setMinimumSize(420, 600);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -525,8 +524,8 @@ XColWindQt::XColWindQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
     break;
   }
 
-  xattnav = new XAttNavQt(this, pane, xattnav_type, "Plant", &ar,
-      xa_advanced_user, objar_list, &brow_widget, &sts);
+  xattnav = new XAttNavQt(this, xattnav_type, "Plant", &ar, xa_advanced_user,
+      objar_list, &brow_widget, &sts);
   xattnav->message_cb = &message_cb;
   xattnav->change_value_cb = &change_value_cb;
   xattnav->popup_menu_cb = &xcolwind_popup_menu_cb;

xtt/lib/xtt/qt/xtt_xcolwind_qt.h

@@ -51,9 +51,8 @@ class XColWindQtWidget;
 
 class XColWindQt : public XColWind {
 public:
-  XColWindQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
-      pwr_sAttrRef* xa_objar, char* xa_title, int xa_advanced_user,
-      xcolwind_eType xa_type, int* xa_sts);
+  XColWindQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar, char* xa_title,
+      int xa_advanced_user, xcolwind_eType xa_type, int* xa_sts);
   ~XColWindQt();
 
   QWidget* brow_widget;
@@ -86,10 +85,7 @@ class XColWindQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XColWindQtWidget(XColWindQt* parent_ctx, QWidget* parent)
-      : QWidget(), colwind(parent_ctx)
-  {
-  }
+  XColWindQtWidget(XColWindQt* parent_ctx) : QWidget(), colwind(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_xcrr_qt.cqt

@@ -110,8 +110,8 @@ XCrrQt::~XCrrQt()
   delete xcrrnav;
 }
 
-XCrrQt::XCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
-    pwr_sAttrRef* xa_objar, int xa_advanced_user, int* xa_sts)
+XCrrQt::XCrrQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
+    int xa_advanced_user, int* xa_sts)
     : XCrr(xa_parent_ctx, xa_objar, xa_advanced_user, xa_sts)
 {
   int sts;
@@ -122,7 +122,7 @@ XCrrQt::XCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
     return;
   }
 
-  toplevel = new XCrrQtWidget(this, xa_parent_wid);
+  toplevel = new XCrrQtWidget(this);
   toplevel->setMinimumSize(600, 420);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -149,8 +149,8 @@ XCrrQt::XCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
       toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
 
   QVBoxLayout* vbox = new QVBoxLayout();
-  xcrrnav = new XAttNavQt(this, toplevel, xattnav_eType_CrossRef, "Plant",
-      &objar, xa_advanced_user, 0, &brow_widget, &sts);
+  xcrrnav = new XAttNavQt(this, xattnav_eType_CrossRef, "Plant", &objar,
+      xa_advanced_user, 0, &brow_widget, &sts);
   xcrrnav->popup_menu_cb = &xcrr_popup_menu_cb;
   xcrrnav->start_trace_cb = &xcrr_start_trace_cb;
   xcrrnav->close_cb = &xcrr_close_cb;

xtt/lib/xtt/qt/xtt_xcrr_qt.h

@@ -47,8 +47,8 @@ class XCrrQtWidget;
 
 class XCrrQt : public XCrr {
 public:
-  XCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
-      int xa_advanced_user, int* xa_sts);
+  XCrrQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar, int xa_advanced_user,
+      int* xa_sts);
   ~XCrrQt();
   QWidget* brow_widget;
   QWidget* form_widget;
@@ -65,10 +65,7 @@ class XCrrQtWidget : public QWidget {
   Q_OBJECT
 
 public:
-  XCrrQtWidget(XCrrQt* parent_ctx, QWidget* parent)
-      : QWidget(), xcrr(parent_ctx)
-  {
-  }
+  XCrrQtWidget(XCrrQt* parent_ctx) : QWidget(), xcrr(parent_ctx) {}
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/xtt/qt/xtt_xnav_qt.cqt

@@ -74,12 +74,10 @@
 
 #include <QApplication>
 
-XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-    QWidget** w, xnav_sStartMenu* root_menu, char* xn_opplace_name,
-    int xn_op_close_button, pwr_tStatus* status)
-    : XNav(xn_parent_ctx, xn_name, root_menu, xn_opplace_name,
-          xn_op_close_button, status),
-      parent_wid(xn_parent_wid)
+XNavQt::XNavQt(void* xn_parent_ctx, const char* xn_name, QWidget** w,
+    xnav_sStartMenu* root_menu, char* xn_opplace_name, int xn_op_close_button,
+    pwr_tStatus* status) : XNav(xn_parent_ctx, xn_name, root_menu,
+                                xn_opplace_name, xn_op_close_button, status)
 {
   form_widget = scrolledbrowwidgetqt_new(init_brow_base_cb, this, &brow_widget);
 
@@ -95,7 +93,7 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
     logg[i].init(i, (void*)this);
   }
 
-  wow = new CoWowQt(parent_wid);
+  wow = new CoWowQt(form_widget);
   trace_timerid = wow->timer_new();
   autoack_timerid = wow->timer_new();
 
@@ -180,23 +178,23 @@ void XNavQt::set_transient(void* basewidget)
 
 RtTrace* XNavQt::plctrace_new(pwr_tOid oid, pwr_tStatus* sts)
 {
-  return new RtTraceQt(this, form_widget, oid, sts);
+  return new RtTraceQt(this, oid, sts);
 }
 
 XAtt* XNavQt::xatt_new(pwr_tAttrRef* arp, int advanced_user, pwr_tStatus* sts)
 {
-  return new XAttQt(form_widget, this, arp, advanced_user, sts);
+  return new XAttQt(this, arp, advanced_user, sts);
 }
 
 XCrr* XNavQt::xcrr_new(pwr_tAttrRef* arp, int advanced_user, pwr_tStatus* sts)
 {
-  return new XCrrQt(form_widget, this, arp, advanced_user, sts);
+  return new XCrrQt(this, arp, advanced_user, sts);
 }
 
 XColWind* XNavQt::xcolwind_new(pwr_tAttrRef* ar_list, char* title,
     int advanced_user, int type, pwr_tStatus* sts)
 {
-  return new XColWindQt(form_widget, this, ar_list, title, advanced_user,
+  return new XColWindQt(this, ar_list, title, advanced_user,
       (xcolwind_eType)type, sts);
 }
 
@@ -205,25 +203,25 @@ Ev* XNavQt::ev_new(char* eve_name, char* ala_name, char* blk_name,
     int display_return, int display_ack, int ev_beep, pwr_tMask ev_pop_mask,
     int ev_eventname_seg, pwr_tStatus* status)
 {
-  return new EvQt(this, parent_wid, eve_name, ala_name, blk_name, ev_user,
+  return new EvQt(this, eve_name, ala_name, blk_name, ev_user,
       display_ala, display_eve, display_blk, display_return, display_ack,
       ev_beep, ev_pop_mask, ev_eventname_seg, status);
 }
 
 Hist* XNavQt::hist_new(char* title, pwr_tAttrRef* arp, pwr_tStatus* sts)
 {
-  return new HistQt(this, parent_wid, title, arp, sts);
+  return new HistQt(this, title, arp, sts);
 }
 
 Block* XNavQt::block_new(
     pwr_tAttrRef* arp, char* name, unsigned int priv, pwr_tStatus* sts)
 {
-  return new BlockQt(this, parent_wid, arp, name, priv, sts);
+  return new BlockQt(this, arp, name, priv, sts);
 }
 
 Op* XNavQt::op_new(char* opplace, pwr_tStatus* sts)
 {
-  return new OpQt(this, parent_wid, opplace, sts);
+  return new OpQt(this, opplace, sts);
 }
 
 XttTrend* XNavQt::xtttrend_new(char* name, pwr_tAttrRef* objar,
@@ -232,7 +230,7 @@ XttTrend* XNavQt::xtttrend_new(char* name, pwr_tAttrRef* objar,
 {
   QWidget* w;
 
-  return new XttTrendQt(this, parent_wid, name, &w, objar, plotgroup, width,
+  return new XttTrendQt(this, name, &w, objar, plotgroup, width,
       height, options, color_theme, basewidget, sts);
 }
 
@@ -245,12 +243,12 @@ XttSevHist* XNavQt::xttsevhist_new(char* name, pwr_tOid* oidv,
   QWidget* w;
 
   if (!filename) {
-    return new XttSevHistQt(this, parent_wid, name, &w, oidv, anamev, onamev,
+    return new XttSevHistQt(this, name, &w, oidv, anamev, onamev,
         sevhistobjectv, scctx, width, height, options, color_theme, time_range,
         basewidget, sts);
   } else {
     return new XttSevHistQt(
-        this, parent_wid, name, &w, filename, color_theme, basewidget, sts);
+        this, name, &w, filename, color_theme, basewidget, sts);
   }
 }
 
@@ -260,7 +258,7 @@ XttTCurve* XNavQt::xtttcurve_new(char* name, pwr_tAttrRef* arefv, int width,
 {
   QWidget* w;
 
-  return new XttTCurveQt(this, parent_wid, name, &w, arefv, width, height,
+  return new XttTCurveQt(this, name, &w, arefv, width, height,
       options, color_theme, basewidget, sts);
 }
 
@@ -271,23 +269,23 @@ XttFast* XNavQt::xttfast_new(char* name, pwr_tAttrRef* objar, int width,
   QWidget* w;
 
   if (!filename) {
-    return new XttFastQt(this, parent_wid, name, &w, objar, width, height,
+    return new XttFastQt(this, name, &w, objar, width, height,
         options, color_theme, basewidget, sts);
   } else {
     return new XttFastQt(
-        this, parent_wid, name, &w, filename, color_theme, basewidget, sts);
+        this, name, &w, filename, color_theme, basewidget, sts);
   }
 }
 
 XAttOne* XNavQt::xattone_new(
     pwr_tAttrRef* objar, char* title, unsigned int priv, pwr_tStatus* sts)
 {
-  return new XAttOneQt(parent_wid, this, objar, title, priv, sts);
+  return new XAttOneQt(this, objar, title, priv, sts);
 }
 
 CLog* XNavQt::clog_new(const char* name, pwr_tStatus* sts)
 {
-  return new CLogQt(this, parent_wid, name, sts);
+  return new CLogQt(this, name, sts);
 }
 
 XttOTree* XNavQt::tree_new(const char* title, pwr_tAttrRef* itemlist,
@@ -295,7 +293,7 @@ XttOTree* XNavQt::tree_new(const char* title, pwr_tAttrRef* itemlist,
     pwr_tStatus (*action_cb)(void*, pwr_tAttrRef*))
 {
   return new XttOTreeQt(
-      parent_wid, this, title, itemlist, itemcnt, options, action_cb);
+      this, title, itemlist, itemcnt, options, action_cb);
 }
 
 XttGe* XNavQt::xnav_ge_new(const char* name, const char* filename,
@@ -308,7 +306,7 @@ XttGe* XNavQt::xnav_ge_new(const char* name, const char* filename,
     int (*is_authorized_cb)(void*, unsigned int),
     void (*keyboard_cb)(void*, void*, int, int))
 {
-  return new XttGeQt(parent_wid, this, name, filename, scrollbar, menu,
+  return new XttGeQt(this, name, filename, scrollbar, menu,
       navigator, width, height, x, y, scan_time, object_name,
       use_default_access, access, options, basewidget, borders, color_theme,
       command_cb, get_current_objects_cb, is_authorized_cb, keyboard_cb);
@@ -322,7 +320,7 @@ XttMultiView* XNavQt::multiview_new(const char* name, pwr_tAttrRef* aref,
     int (*is_authorized_cb)(void*, unsigned int),
     void (*keyboard_cb)(void*, void*, int, int))
 {
-  return new XttMultiViewQt(parent_wid, this, name, aref, width, height, x, y,
+  return new XttMultiViewQt(this, name, aref, width, height, x, y,
       options, basewidget, color_theme, sts, command_cb, get_current_objects_cb,
       is_authorized_cb, keyboard_cb);
 }
@@ -331,14 +329,14 @@ XttStream* XNavQt::stream_new(const char* name, const char* uri, int width,
     int height, int x, int y, double scan_time, unsigned int options,
     int embedded, pwr_tAttrRef* arp, pwr_tStatus* sts)
 {
-  return new XttStreamQt(parent_wid, this, name, uri, width, height, x, y,
+  return new XttStreamQt(this, name, uri, width, height, x, y,
       scan_time, options, embedded, arp, sts);
 }
 
 GeCurve* XNavQt::gecurve_new(char* name, char* filename, GeCurveData* data,
     int pos_right, unsigned int options, int color_theme, void* basewidget)
 {
-  return new GeCurveQt(this, parent_wid, name, filename, data, pos_right, 0, 0,
+  return new GeCurveQt(this, name, filename, data, pos_right, 0, 0,
       options, color_theme, basewidget);
 }
 
@@ -346,7 +344,7 @@ XttFileview* XNavQt::fileview_new(pwr_tOid oid, char* title, char* dir,
     char* pattern, int type, char* target_attr, char* trigger_attr,
     char* filetype)
 {
-  return new XttFileviewQt(this, parent_wid, oid, title, dir, pattern, type,
+  return new XttFileviewQt(this, NULL, oid, title, dir, pattern, type,
       target_attr, trigger_attr, filetype);
 }
 
@@ -354,7 +352,7 @@ CoLogin* XNavQt::login_new(const char* name, const char* groupname,
     void (*bc_success)(void*), void (*bc_cancel)(void*), void* basewidget,
     pwr_tStatus* status)
 {
-  return new CoLoginQt(this, parent_wid, name, groupname, bc_success, bc_cancel,
+  return new CoLoginQt(this, NULL, name, groupname, bc_success, bc_cancel,
       basewidget, status);
 }
 
@@ -363,7 +361,7 @@ XttKeyboard* XNavQt::keyboard_new(const char* name, keyboard_eKeymap keymap,
 {
   QWidget* w;
   return new XttKeyboardQt(
-      this, parent_wid, name, &w, keymap, type, color_theme, sts);
+      this, NULL, name, &w, keymap, type, color_theme, sts);
 }
 
 void XNavQt::bell(int time)
@@ -389,7 +387,7 @@ void XNavQt::get_popup_menu(pwr_sAttrRef attrref, xmenu_eItemType item_type,
 
 QMenu* XNavQt::build_menu(const char* Callback, xmenu_sMenuItem* Items, int* idx)
 {
-  QMenu* menu = new QMenu(parent_wid);
+  QMenu* menu = new QMenu();
   int i;
   unsigned int Level = Items[*idx].Level;
 

xtt/lib/xtt/qt/xtt_xnav_qt.h

@@ -48,9 +48,9 @@ class XNavQtPopupObject;
 
 class XNavQt : public XNav {
 public:
-  XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
-      QWidget** w, xnav_sStartMenu* root_menu, char* xn_opplace_name,
-      int xn_op_close_button, pwr_tStatus* status);
+  XNavQt(void* xn_parent_ctx, const char* xn_name, QWidget** w,
+      xnav_sStartMenu* root_menu, char* xn_opplace_name, int xn_op_close_button,
+      pwr_tStatus* status);
   ~XNavQt();
 
   void set_inputfocus();
@@ -130,7 +130,6 @@ public:
   QWidget* form_widget;
 
 private:
-  QWidget* parent_wid;
   XNavQtPopupObject* popup_obj;
 };
 
@@ -138,9 +137,7 @@ class XNavQtPopupObject : public QObject {
   Q_OBJECT
 
 public:
-  XNavQtPopupObject(XNavQt* parent) : QObject(), xnav(parent)
-  {
-  }
+  XNavQtPopupObject(XNavQt* parent) : QObject(), xnav(parent) {}
 
 public slots:
   void popup_button_cb();