QT: Cleaned up a lot of debug_prints, added a missing destructor.

profibus/exe/profinet_viewer/qt/pn_viewernav_qt.cpp

@@ -51,8 +51,6 @@ PnViewerNavQt::PnViewerNavQt(
   form_widget
       = scrolledbrowwidgetqt_new(PnViewerNav::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 }

profibus/lib/cow/qt/cow_pb_gsd_attrnav_qt.cpp

@@ -50,7 +50,6 @@ GsdAttrNavQt::GsdAttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
 {
   debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
-  showNow(brow_widget);
 
   *w = form_widget;
 

profibus/lib/cow/qt/cow_pn_gsdml_attrnav_qt.cpp

@@ -50,7 +50,6 @@ GsdmlAttrNavQt::GsdmlAttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
 {
   debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
-  showNow(brow_widget);
 
   *w = form_widget;
 

sev/exe/sev_xtt/qt/xtt_tblnav_qt.cpp

@@ -51,8 +51,6 @@ TblNavQt::TblNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
   form_widget
       = scrolledbrowwidgetqt_new(TblNav::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 

wb/lib/wb/qt/wb_bckw_qt.cqt

@@ -142,8 +142,7 @@ void WbBckWQtWidget::closeEvent(QCloseEvent* event)
 
 WbBckWQt::~WbBckWQt()
 {
-  if (bckwnav)
-    delete bckwnav;
+  delete bckwnav;
 }
 
 void WbBckWQt::set_title(char* title)

wb/lib/wb/qt/wb_bckwnav_qt.cpp

@@ -46,6 +46,7 @@ WbBckWNavQt::WbBckWNavQt(void* l_parent_ctx, QWidget* l_parent_wid,
     ldh_tSession l_ldhses, wb_bck_list* l_list, int l_editmode, QWidget** w)
     : WbBckWNav(l_parent_ctx, l_ldhses, l_list, l_editmode)
 {
+  debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget
       = scrolledbrowwidgetqt_new(WbBckWNav::init_brow_cb, this, &brow_widget);
 
@@ -55,6 +56,7 @@ WbBckWNavQt::WbBckWNavQt(void* l_parent_ctx, QWidget* l_parent_wid,
 
 WbBckWNavQt::~WbBckWNavQt()
 {
+  debug_print("WbBckWNavQt::~WbBckWNavQt\n");
   form_widget->close();
 }
 

wb/lib/wb/qt/wb_expw_qt.cqt

@@ -123,6 +123,11 @@ WbExpWQt::WbExpWQt(void* expw_parent_ctx, QWidget* expw_parent_wid,
   // expwnav->check_all();
 }
 
+WbExpWQt::~WbExpWQt()
+{
+  delete expwnav;
+}
+
 void WbExpWQt::print()
 {
   pwr_tStatus sts;
@@ -143,7 +148,6 @@ void WbExpWQtWidget::focusInEvent(QFocusEvent* event)
 
 void WbExpWQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("WbExpWQtWidget::closeEvent\n");
   delete expw;
   QWidget::closeEvent(event);
 }

wb/lib/wb/qt/wb_expw_qt.h

@@ -49,6 +49,7 @@ 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();
 
   QWidget* form;
   QWidget* nav_widget;

wb/lib/wb/qt/wb_expwnav_qt.cpp

@@ -50,8 +50,6 @@ WbExpWNavQt::WbExpWNavQt(void* l_parent_ctx, QWidget* l_parent_wid,
   form_widget
       = scrolledbrowwidgetqt_new(WbExpWNav::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 }

wb/lib/wb/qt/wb_foe_qt.cqt

@@ -575,8 +575,16 @@ void WFoeQt::destroy()
 {
   gre->wind->hw.foe = 0;
 
+  delete gre;
+  delete node_palctx;
+  delete con_palctx;
+  delete navctx;
+
   /* Destroy the widget */
   toplevel->close();
+
+  // Yes, this is intentional, we want to call the destructor here.
+  delete this;
 }
 
 void WFoeQt::set_title()

wb/lib/wb/qt/wb_gre_qt.cqt

@@ -55,21 +55,20 @@ WGreQt::WGreQt(void* wg_parent_ctx, QWidget* wg_parent_wid, const char* name)
   trace_obj = new WGreQtTraceObject(this);
   trace_timerid = new QTimer(trace_obj);
   ctx_init();
-  debug_print("creating a scrolledflowwidgetqt\n");
   form_widget = scrolledflowwidgetqt_new(init_flow, this, &flow_widget);
-  showNow(flow_widget);
   popupmenu_mode = GRE_POPUPMENUMODE_OBJECT;
 }
 
 WGreQt::~WGreQt()
 {
-  debug_print("WGreQt::~WGreQt\n");
   form_widget->close();
+  if (nav_widget) {
+    nav_widget->close();
+  }
 }
 
 int WGreQt::new_navigator(QWidget* parent)
 {
-  debug_print("creating a flownavwidgetqt\n");
   nav_widget = flownavwidgetqt_new(flow_widget);
   return 1;
 }

wb/lib/wb/qt/wb_gre_qt.h

@@ -48,7 +48,7 @@ public:
   QWidget* flow_widget;
   QWidget* form_widget;
   QWidget* nav_shell;
-  QWidget* nav_widget;
+  QWidget* nav_widget = NULL;
 
   QTimer* trace_timerid;
 

wb/lib/wb/qt/wb_nav_qt.cqt

@@ -53,7 +53,6 @@ NavQt::NavQt(void* nav_parent_ctx, QWidget* nav_parent_wid,
 {
   trace_obj = new NavQtTraceObject(this);
 
-  debug_print("creating a scrolledbrowwidgetqt\n");
   QScrollArea* scrolledbrow = ((QScrollArea*) scrolledbrowwidgetqt_new(Nav::init_brow_cb, this, &brow_widget));
 
   form_widget = wrapInFrame(scrolledbrow);
@@ -63,8 +62,6 @@ NavQt::NavQt(void* nav_parent_ctx, QWidget* nav_parent_wid,
   QObject::connect(
       server, SIGNAL(newConnection()), trace_obj, SLOT(sel_convert_cb()));
 
-  showNow(brow_widget);
-
   set_inputfocus(0);
 
   *w = form_widget;
@@ -73,7 +70,6 @@ NavQt::NavQt(void* nav_parent_ctx, QWidget* nav_parent_wid,
 
 NavQt::~NavQt()
 {
-  debug_print("NavQt::~NavQt\n");
   PalFile::config_tree_free(menu);
   free_pixmaps();
   delete trace_obj;

wb/lib/wb/qt/wb_pal_qt.cqt

@@ -53,13 +53,10 @@ PalQt::PalQt(void* pal_parent_ctx, QWidget* pal_parent_wid,
 {
   trace_obj = new PalQtTraceObject(this);
 
-  debug_print("creating a scrolledbrowwidgetqt\n");
   QScrollArea* scrolledbrow = ((QScrollArea*) scrolledbrowwidgetqt_new(Pal::init_brow_cb, this, &brow_widget));
 
   form_widget = wrapInFrame(scrolledbrow);
 
-  showNow(brow_widget);
-
   server = new QLocalServer(trace_obj);
   server->listen("STRING");
   QObject::connect(
@@ -73,10 +70,9 @@ PalQt::PalQt(void* pal_parent_ctx, QWidget* pal_parent_wid,
 
 PalQt::~PalQt()
 {
-  debug_print("PalQt::~PalQt\n");
+  delete trace_obj;
   PalFile::config_tree_free(menu);
   free_pixmaps();
-  delete trace_obj;
   form_widget->close();
 }
 
@@ -110,7 +106,6 @@ void PalQt::set_inputfocus(int focus)
 void PalQt::set_selection_owner()
 {
   selection_owner = 1;
-  debug_print("PalQt::set_selection_owner\n");
   brow_SetInverseColor(brow_ctx, flow_eDrawType_Line);
 }
 

wb/lib/wb/qt/wb_wattnav_qt.cpp

@@ -55,8 +55,6 @@ WAttNavQt::WAttNavQt(void* wa_parent_ctx, wattnav_eType wa_type,
   form_widget
       = scrolledbrowwidgetqt_new(WAttNav::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   *w = form_widget;
   *status = 1;
 }

wb/lib/wb/qt/wb_wnav_qt.cqt

@@ -86,14 +86,11 @@ WNavQt::WNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
 
   trace_obj = new WNavQtTraceObject(this);
 
-  debug_print("creating a scrolledbrowwidgetqt\n");
   QScrollArea* scrolledbrow = ((QScrollArea*)scrolledbrowwidgetqt_new(
       WNav::init_brow_base_cb, this, &brow_widget));
 
   form_widget = wrapInFrame(scrolledbrow);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 
@@ -127,11 +124,11 @@ WNavQt::WNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
 
 WNavQt::~WNavQt()
 {
-  debug_print("WNavQt::~WNavQt\n");
   closing_down = 1;
 
   delete trace_obj;
 
+  delete wow;
   form_widget->close();
 }
 

wb/lib/wb/qt/wb_wtt_qt.cqt

@@ -1573,7 +1573,6 @@ void BootDialog::boot_cancel_cb()
 // Destroy callback
 void BootDialog::closeEvent(QCloseEvent* event)
 {
-  debug_print("BootDialog::closeEvent\n");
   if (wtt->boot_volumelist && wtt->boot_volumecount) {
     free((char*)wtt->boot_volumelist);
     wtt->boot_volumelist = 0;
@@ -1711,7 +1710,6 @@ void WttQt::set_options()
 
 void WttQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("WttQtWidget::closeEvent\n");
   Wtt::close(wtt);
   event->ignore();
 }
@@ -2305,7 +2303,6 @@ WttQt::WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name,
 
 WttQt::~WttQt()
 {
-  debug_print("WttQt::~WttQt\n");
   if (close_cb) {
     (close_cb)(this);
   }
@@ -2342,7 +2339,6 @@ void WttQt::pop()
 
 void OptionsDialog::closeEvent(QCloseEvent* event)
 {
-  debug_print("OptionsDialog::closeEvent\n");
   wtt->update_options_form();
   QWidget::closeEvent(event);
 }

wb/lib/wb/qt/wb_xcrr_qt.cqt

@@ -108,11 +108,17 @@ void WCrrQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
+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)
     : WCrr(xa_parent_ctx, xa_ldhses, xa_objar, xa_advanced_user, xa_sts)
 {
+  debug_print("\n");
   int sts;
   char* namep;
   int size;

wb/lib/wb/qt/wb_xcrr_qt.h

@@ -49,6 +49,7 @@ 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();
   QWidget* brow_widget;
   QWidget* form_widget;
   CoWowFocusTimerQt focustimer;

xtt/lib/cow/qt/cow_logwnav_qt.cpp

@@ -49,8 +49,6 @@ CoLogWNavQt::CoLogWNavQt(
   form_widget
       = scrolledbrowwidgetqt_new(CoLogWNav::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 }

xtt/lib/cow/qt/cow_msglist_qt.cpp

@@ -47,8 +47,6 @@ MsgListQt::MsgListQt(void* ev_parent_ctx, QWidget* ev_parent_wid, QWidget** w)
   form_widget
       = scrolledbrowwidgetqt_new(MsgList::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 }

xtt/lib/cow/qt/cow_msgwindow_qt.cqt

@@ -93,6 +93,7 @@ MsgWindowQt::MsgWindowQt(void* msg_parent_ctx, QWidget* msg_parent_wid,
   add_expanding(form, nav_widget);
 
   toplevel->setLayout(form);
+  toplevel->show(); // The MsgList must be realized.
   toplevel->hide();
 
   wow = new CoWowQt(toplevel);

xtt/lib/cow/qt/cow_qt_helpers.cpp

@@ -72,11 +72,6 @@ void pop(QWidget* w)
   w->activateWindow();
 }
 
-void showNow(QWidget* w)
-{
-  QApplication::sendEvent(w, new QShowEvent());
-}
-
 QIcon get_icon(const char* iconName)
 {
   if (strcmp(iconName, "")) {

xtt/lib/cow/qt/cow_qt_helpers.h

@@ -58,7 +58,6 @@ QString fl(const char* text);
 QString convert_utf8(const char* str);
 QString translate_utf8(const char* str);
 void pop(QWidget* w);
-void showNow(QWidget* w);
 QIcon get_icon(const char* iconName);
 QAction* addMenuItem(QObject* parent, QMenu* menu, const char* text,
     const char* callback, const char* shortcut = "", const char* iconName = "");

xtt/lib/cow/qt/cow_statusmon_nodelistnav_qt.cqt

@@ -57,8 +57,6 @@ NodelistNavQt::NodelistNavQt(void* nodelist_parent_ctx,
   debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   *w = form_widget;
 
   wow = new CoWowQt(trace_obj);

xtt/lib/cow/qt/cow_treenav_qt.cpp

@@ -54,8 +54,6 @@ TreeNavQt::TreeNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
   form_widget
       = scrolledbrowwidgetqt_new(TreeNav::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 

xtt/lib/cow/qt/cow_xhelp_qt.cqt

@@ -262,6 +262,7 @@ CoXHelpQt::CoXHelpQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   vbox->addWidget(brow_widget);
 
   toplevel->setLayout(vbox);
+  toplevel->show(); // The xhelpnav must be realized.
   toplevel->hide();
 
   *xa_sts = 1;

xtt/lib/cow/qt/cow_xhelpnav_qt.cpp

@@ -52,8 +52,6 @@ CoXHelpNavQt::CoXHelpNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
   form_widget = scrolledbrowwidgetqt_new(
       CoXHelpNav::init_brow_base_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   displayed = 1;
 
   *w = form_widget;

xtt/lib/ge/qt/ge_attr_qt.cqt

@@ -172,7 +172,6 @@ int AttrQt::reconfigure_attr()
   }
   brow_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
   pane->insertWidget(0, brow_widget);
-  showNow(brow_widget);
 
   attrnav->message_cb = &Attr::message;
   attrnav->change_value_cb = &Attr::change_value_c;

xtt/lib/ge/qt/ge_attrnav_qt.cqt

@@ -55,8 +55,6 @@ AttrNavQt::AttrNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
   form_widget
       = scrolledbrowwidgetqt_new(AttrNav::init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 

xtt/lib/xtt/qt/xtt_clognav_qt.cpp

@@ -49,8 +49,6 @@ CLogNavQt::CLogNavQt(
   debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   *w = form_widget;
 }
 

xtt/lib/xtt/qt/xtt_evlist_qt.cpp

@@ -56,8 +56,6 @@ EvListQt::EvListQt(void* ev_parent_ctx, QWidget* ev_parent_wid,
   debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
 
-  showNow(brow_widget);
-
   *w = form_widget;
 }
 

xtt/lib/xtt/qt/xtt_trace_qt.cqt

@@ -397,7 +397,6 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
   debug_print("creating a scrolledflowwidgetqt\n");
   QWidget* flow_scrolled
       = scrolledflowwidgetqt_new(init_flow, this, &flow_widget);
-  showNow(flow_widget);
   debug_print("creating a flownavwidgetqt\n");
   nav_widget = flownavwidgetqt_new(flow_widget);