QT: Removed many debug prints.

wb/exe/wb/qt/wb_qt.cpp

@@ -72,7 +72,6 @@ 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)
 {
-  debug_print("Creating a WVselQt\n");
   return new WVselQt(status, NULL, mainwindow, name, ldhwbctx, volumename,
       bc_success, bc_cancel, bc_time_to_exit, show_volumes, wb_type);
 }
@@ -133,7 +132,7 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
       switch (argv[i][1]) {
       case 'h':
         usage();
-        debug_print("Shutting down...\n"); exit(0);
+        exit(0);
       case 'a':
         // Load all volumes
         sw_projectvolume = 0;
@@ -150,7 +149,7 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
       case 'l':
         if (i + 1 >= argc) {
           usage();
-          debug_print("Shutting down...\n"); exit(0);
+          exit(0);
         }
         Lng::set(argv[i + 1]);
         i++;
@@ -158,14 +157,14 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
       case 'f':
         if (i + 1 >= argc) {
           usage();
-          debug_print("Shutting down...\n"); exit(0);
+          exit(0);
         }
         i++;
         break;
       case 'c':
         if (i + 1 >= argc) {
           usage();
-          debug_print("Shutting down...\n"); exit(0);
+          exit(0);
         }
         sw_classeditor = 1;
         strcpy(filename, argv[i + 1]);
@@ -201,7 +200,6 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
   fprintf(stderr, "\n");
 
   toplevel = new QWidget();
-  toplevel->setToolTip(fl("WbQt widget"));
   toplevel->setMinimumSize(100, 100);
   toplevel->setWindowTitle(fl("Pwr wb"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -210,7 +208,6 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
   new wb_log_qt(toplevel);
 
   // Create message window
-  debug_print("Creating a MsgWindowQt\n");
   MsgWindowQt* msg_window
       = new MsgWindowQt(0, mainwindow, "Workbench messages", &sts);
   msg_window->find_wnav_cb = Wb::find_wnav_cb;
@@ -219,7 +216,6 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
   MsgWindow::message('I', "Development environment started");
 
   // Create help window
-  debug_print("Creating a CoXHelpQt\n");
   CoXHelpQt* xhelp = new CoXHelpQt(mainwindow, 0, xhelp_eUtility_Wtt, &sts);
   CoXHelp::set_default(xhelp);
 
@@ -278,9 +274,7 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
     strcpy(title, CoLogin::username());
     strcat(title, " on ");
     strcat(title, projectname);
-    debug_print("Opening project volume %s\n", projectname);
     Wtt* wtt = wtt_new(title, "Navigator", wbctx, volume, 0, 0, &sts);
-    debug_print("Opening project volume sts=%d\n", sts);
     if (ODD(sts)) {
       appl_count++;
       wtt->close_cb = Wb::wtt_close;
@@ -291,14 +285,11 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
       psts(sts, NULL);
     }
   } else if (sw_classeditor) {
-    debug_print("Opening class editor\n");
     wtt_open_volume(
         0, wb_eType_ClassEditor, filename, wow_eFileSelType_WblClass);
   } else if (sw_projectlist) {
-    debug_print("Opening project list\n");
     wtt_open_volume(0, wb_eType_ExternVolume, "ProjectList", wow_eFileSelType_);
   } else if (nav_display && !login_display) {
-    debug_print("Opening navigator\n");
     if (CoLogin::privilege() & pwr_mPrv_DevRead) {
       strcpy(title, "PwR Navigator: ");
       strcat(title, CoLogin::username());
@@ -311,7 +302,6 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
       exit(LOGIN__NOPRIV);
     }
   } else if (login_display) {
-    debug_print("Opening a CoLoginQt\n");
     new CoLoginQt(NULL, mainwindow, "PwR Login", systemgroup,
         &Wb::login_success, &Wb::login_cancel, 0, &sts);
   }
@@ -324,7 +314,6 @@ WbQt::WbQt(int argc, char* argv[]) : mainwindow(0)
   toplevel->hide();
 
   if (!quiet) {
-    debug_print("Creating a CoWowQt\n");
     CoWowQt* wow = new CoWowQt(toplevel);
     // Use timeout to get in on the top of the display
     QTimer::singleShot(100, wow->object, SLOT(DisplayWarranty()));

wb/lib/wb/qt/wb_foe_qt.cqt

@@ -744,7 +744,6 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
 {
   pwr_tStatus sts;
 
-  toplevel->setToolTip(fl("wb_foe widget"));
   toplevel->setMinimumSize(1100, 1000);
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
 

wb/lib/wb/qt/wb_pal_qt.cqt

@@ -55,7 +55,6 @@ PalQt::PalQt(void* pal_parent_ctx, QWidget* pal_parent_wid,
 
   debug_print("creating a scrolledbrowwidgetqt\n");
   QScrollArea* scrolledbrow = ((QScrollArea*) scrolledbrowwidgetqt_new(Pal::init_brow_cb, this, &brow_widget));
-  brow_widget->setToolTip(fl("PalQt"));
 
   form_widget = wrapInFrame(scrolledbrow);
 
@@ -111,6 +110,7 @@ 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_vsel_qt.cqt

@@ -245,7 +245,6 @@ WVselQt::WVselQt(pwr_tStatus* status, void* wv_parent_ctx,
 
   // Create the window
   toplevel = new WVselQtWidget(this, wv_parent_wid);
-  toplevel->setToolTip(fl("wb_vsel widget"));
   toplevel->setMinimumSize(500, 400);
   toplevel->setWindowTitle(fl(name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

wb/lib/wb/qt/wb_watt_qt.cqt

@@ -360,7 +360,6 @@ void WAttQt::update_title()
 
 void WAttQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("WAttQtWidget::closeEvent\n");
   if (watt->close_cb) {
     (watt->close_cb)(watt);
   } else {
@@ -369,6 +368,11 @@ void WAttQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
+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)
@@ -385,7 +389,6 @@ WAttQt::WAttQt(QWidget* wa_parent_wid, void* wa_parent_ctx,
   }
 
   toplevel = new WAttQtWidget(this, wa_parent_wid);
-  toplevel->setToolTip(fl("wb_watt widget"));
   toplevel->setFixedSize(410, 570);
   toplevel->setWindowTitle(fl(namep));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

wb/lib/wb/qt/wb_watt_qt.h

@@ -54,6 +54,7 @@ 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();
   QWidget* brow_widget;
   QWidget* form_widget;
   QLabel* msg_label;

wb/lib/wb/qt/wb_wattnav_qt.cpp

@@ -52,7 +52,6 @@ WAttNavQt::WAttNavQt(void* wa_parent_ctx, wattnav_eType wa_type,
     : WAttNav(wa_parent_ctx, wa_type, wa_name, wa_ldhses, wa_aref, wa_editmode,
           wa_advanced_user, wa_display_objectname, wa_utility, status)
 {
-  debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget
       = scrolledbrowwidgetqt_new(WAttNav::init_brow_cb, this, &brow_widget);
 
@@ -64,7 +63,6 @@ WAttNavQt::WAttNavQt(void* wa_parent_ctx, wattnav_eType wa_type,
 
 WAttNavQt::~WAttNavQt()
 {
-  debug_print("WAttNavQt::~WAttNavQt\n");
   delete brow;
   form_widget->close();
 }

wb/lib/wb/qt/wb_wnav_qt.cqt

@@ -89,7 +89,6 @@ WNavQt::WNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
   debug_print("creating a scrolledbrowwidgetqt\n");
   QScrollArea* scrolledbrow = ((QScrollArea*)scrolledbrowwidgetqt_new(
       WNav::init_brow_base_cb, this, &brow_widget));
-  brow_widget->setToolTip(fl("WNavQt"));
 
   form_widget = wrapInFrame(scrolledbrow);
 
@@ -114,7 +113,7 @@ WNavQt::WNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
   serverAttrRef->listen("PWR_ATTRREF");
   QObject::connect(serverAttrRef, SIGNAL(newConnection()), trace_obj,
       SLOT(sel_convert_cb()));
-  
+
   gbl.load_config(this);
 
   if (root_menu && !ldhses) {
@@ -123,7 +122,6 @@ WNavQt::WNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
 
   wow = new CoWowQt(parent_wid);
 
-  form_widget->setToolTip(fl("wb_wnav widget"));
   *status = 1;
 }
 

wb/lib/wb/qt/wb_wtt_qt.cqt

@@ -1891,7 +1891,6 @@ WttQt::WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name,
 
   // Qt
   toplevel = new WttQtWidget(this, wt_parent_wid);
-  toplevel->setToolTip(fl("wb_wtt widget"));
   toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -2311,12 +2310,18 @@ WttQt::~WttQt()
     (close_cb)(this);
   }
 
+  if (utedctx) {
+    delete utedctx;
+  }
+
   wnav->closing_down = 1;
   wnavnode->closing_down = 1;
   if (mcp) {
     free(mcp);
   }
-  delete Wtt::palette;
+  delete wnav;
+  delete wnavnode;
+  delete palette;
 
   if (options_form) {
     options_form->close();

xtt/exe/rt_xtt/qt/rt_xtt_qt.cqt

@@ -562,16 +562,15 @@ int main(int argc, char* argv[])
 
 XttQt::~XttQt()
 {
-  debug_print("XttQt::~XttQt\n");
   delete cmd_recall;
   delete value_recall;
   delete hotkey;
   delete methodtoolbar;
+  delete xnav;
 }
 
 void XttQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("XttQtWidget::closeEvent\n");
   xtt->close(xtt,
       xtt->xnav->op || xtt->xnav->ge_main || xtt->xnav->multiview_main ? 0 : 1);
   QWidget::closeEvent(event);

xtt/lib/cow/qt/cow_login_qt.cqt

@@ -76,7 +76,7 @@ void CoLoginQtWidget::activate_cancel()
 
 void CoLoginQtWidget::valchanged_password()
 {
-  if (!login->password->text().isEmpty()) {
+  if (del && !login->password->text().isEmpty()) {
     activate_ok();
   }
 }
@@ -90,7 +90,6 @@ void CoLoginQtWidget::valchanged_username()
 
 void CoLoginQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("CoLoginQtWidget::closeEvent\n");
   if (del) {
     login->activate_cancel();
     del = false;
@@ -106,7 +105,6 @@ CoLoginQt::CoLoginQt(void* wl_parent_ctx, QWidget* wl_parent_wid,
 {
   // Create an input dialog
   toplevel = new CoLoginQtWidget(this, wl_parent_wid);
-  toplevel->setToolTip(fl("cow_login widget"));
   toplevel->setWindowTitle(fl("Proview Login"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
 

xtt/lib/cow/qt/cow_logw_qt.cqt

@@ -49,7 +49,6 @@ CoLogWQt::CoLogWQt(void* logw_parent_ctx, QWidget* logw_parent_wid,
     : CoLogW(logw_parent_ctx, logw_name, l_show_item, status)
 {
   toplevel = new CoLogWQtWidget(this, logw_parent_wid);
-  toplevel->setToolTip(fl("cow_logw widget"));
   toplevel->setMinimumSize(800, 600);
   toplevel->setWindowTitle(fl(logw_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

xtt/lib/cow/qt/cow_msgwindow_qt.cqt

@@ -58,7 +58,6 @@ MsgWindowQt::MsgWindowQt(void* msg_parent_ctx, QWidget* msg_parent_wid,
     : MsgWindow(msg_parent_ctx, msg_name, status)
 {
   toplevel = new MsgWindowQtWidget(this, msg_parent_wid);
-  toplevel->setToolTip(fl("cow_msgwindow widget"));
   toplevel->setFixedSize(800, 600);
   toplevel->setWindowTitle(translate_utf8(msg_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

xtt/lib/cow/qt/cow_rtmon_qt.cqt

@@ -88,7 +88,6 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
   strcat(title, rtmon_name);
 
   toplevel = new RtMonQtWidget(this, rtmon_parent_wid);
-  toplevel->setToolTip(fl("cow_rtmon widget"));
   toplevel->setMinimumHeight(340);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -254,6 +253,7 @@ RtMonQt::~RtMonQt()
   if (timerid) {
     delete timerid;
   }
+  delete nodelistnav;
 }
 
 void RtMonQt::pop()

xtt/lib/cow/qt/cow_statusmon_nodelist_qt.cqt

@@ -64,8 +64,7 @@ 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),
-      add_india_widget(0), mod_india_widget(0)
+          nodelist_view_node_descr, status)
 {
   pwr_tStatus sts;
 
@@ -119,18 +118,24 @@ NodelistQt::NodelistQt(void* nodelist_parent_ctx, QWidget* nodelist_parent_wid,
   // Submenu Mode
   QMenu* view_mode = view->addMenu(fl("&Mode"));
   QActionGroup* mode_group = new QActionGroup(toplevel);
-  addMenuRadioItem(toplevel, view_mode, "&SystemStatus",
-      SLOT(activate_mode_systemstatus()), mode_group);
-  addMenuRadioItem(toplevel, view_mode, "UserStatus&1",
-      SLOT(activate_mode_userstatus1()), mode_group);
-  addMenuRadioItem(toplevel, view_mode, "UserStatus&2",
-      SLOT(activate_mode_userstatus2()), mode_group);
-  addMenuRadioItem(toplevel, view_mode, "UserStatus&3",
-      SLOT(activate_mode_userstatus3()), mode_group);
-  addMenuRadioItem(toplevel, view_mode, "UserStatus&4",
-      SLOT(activate_mode_userstatus4()), mode_group);
-  addMenuRadioItem(toplevel, view_mode, "UserStatus&5",
-      SLOT(activate_mode_userstatus5()), mode_group);
+  QAction *a = addMenuRadioItem(toplevel, view_mode, "&SystemStatus",
+      SLOT(activate_mode()), mode_group);
+  a->setData(nodelist_eMode_SystemStatus);
+  a = addMenuRadioItem(toplevel, view_mode, "UserStatus&1",
+      SLOT(activate_mode()), mode_group);
+  a->setData(nodelist_eMode_Status1);
+  a = addMenuRadioItem(toplevel, view_mode, "UserStatus&2",
+      SLOT(activate_mode()), mode_group);
+  a->setData(nodelist_eMode_Status2);
+  a = addMenuRadioItem(toplevel, view_mode, "UserStatus&3",
+      SLOT(activate_mode()), mode_group);
+  a->setData(nodelist_eMode_Status3);
+  a = addMenuRadioItem(toplevel, view_mode, "UserStatus&4",
+      SLOT(activate_mode()), mode_group);
+  a->setData(nodelist_eMode_Status4);
+  a = addMenuRadioItem(toplevel, view_mode, "UserStatus&5",
+      SLOT(activate_mode()), mode_group);
+  a->setData(nodelist_eMode_Status5);
 
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
       "zoom-in");
@@ -185,6 +190,11 @@ NodelistQt::NodelistQt(void* nodelist_parent_ctx, QWidget* nodelist_parent_wid,
   *status = 1;
 }
 
+NodelistQt::~NodelistQt()
+{
+  delete nodelistnav;
+}
+
 void NodelistQt::pop()
 {
   ::pop(toplevel);
@@ -274,34 +284,10 @@ void NodelistQtWidget::activate_gui_qt()
   strcpy(nodelist->remote_gui, "qt");
 }
 
-void NodelistQtWidget::activate_mode_systemstatus()
-{
-  nodelist->nodelistnav->set_mode(nodelist_eMode_SystemStatus);
-}
-
-void NodelistQtWidget::activate_mode_userstatus1()
-{
-  nodelist->nodelistnav->set_mode(nodelist_eMode_Status1);
-}
-
-void NodelistQtWidget::activate_mode_userstatus2()
-{
-  nodelist->nodelistnav->set_mode(nodelist_eMode_Status2);
-}
-
-void NodelistQtWidget::activate_mode_userstatus3()
+void NodelistQtWidget::activate_mode()
 {
-  nodelist->nodelistnav->set_mode(nodelist_eMode_Status3);
-}
-
-void NodelistQtWidget::activate_mode_userstatus4()
-{
-  nodelist->nodelistnav->set_mode(nodelist_eMode_Status4);
-}
-
-void NodelistQtWidget::activate_mode_userstatus5()
-{
-  nodelist->nodelistnav->set_mode(nodelist_eMode_Status5);
+  int data = ((QAction*)sender())->data().toInt();
+  nodelist->nodelistnav->set_mode(data);
 }
 
 void NodelistQtWidget::activate_zoom_in()
@@ -328,25 +314,26 @@ void NodelistQt::open_add_input_dialog(const char* text, const char* text2,
     const char* text3, const char* title, const char* init_text,
     void (*ok_cb)(Nodelist*, char*, char*, char*))
 {
-  create_add_input_dialog();
-
-  add_india_widget->setWindowTitle(fl(title));
-  add_india_widget->setAttribute(Qt::WA_DeleteOnClose);
-  add_india_widget->setVisible(true);
-
-  add_india_widget->label->setText(fl(text));
-  add_india_widget->label2->setText(fl(text2));
-  add_india_widget->label3->setText(fl(text3));
-
-  add_india_widget->text->setText(fl(init_text));
+  NodelistInputDialogQt *w = new NodelistInputDialogQt(
+    this, toplevel, title, text, text2, text3, init_text);
+  w->ok_cb = ok_cb;
+}
 
-  add_india_ok_cb = ok_cb;
+void NodelistQt::open_mod_input_dialog(const char* text, const char* text2,
+    const char* text3, const char* title, const char* init_text,
+    const char* init_text2, const char* init_text3,
+    void (*ok_cb)(Nodelist*, char*, char*, char*))
+{
+  NodelistInputDialogQt *w = new NodelistInputDialogQt(
+    this, toplevel, title, text, text2, text3,
+    init_text, init_text2, init_text3, false);
+  w->ok_cb = ok_cb;
 }
 
 void NodelistInputDialogQt::activate_ok()
 {
-  (nodelist->add_india_ok_cb)(nodelist, qPrintableLatin1(text->text()),
-      qPrintableLatin1(text2->text()), qPrintableLatin1(text3->text()));
+  (ok_cb)(nodelist, qPrintableLatin1(text->text()),
+          qPrintableLatin1(text2->text()), qPrintableLatin1(text3->text()));
 
   accept();
 }
@@ -357,25 +344,27 @@ void NodelistInputDialogQt::activate_cancel()
 }
 
 NodelistInputDialogQt::NodelistInputDialogQt(
-    NodelistQt* parent_ctx, QWidget* parent, bool input_callback)
+    NodelistQt* parent_ctx, QWidget* parent, const char* title,
+    const char* l1, const char* l2, const char* l3,
+    const char* txt1, const char* txt2, const char* txt3, bool input_callback)
     : QDialog(parent), nodelist(parent_ctx)
 {
   setFixedSize(600, 150);
-  setWindowTitle(fl("Input Dialog"));
+  setWindowTitle(fl(title));
   setAttribute(Qt::WA_DeleteOnClose);
 
-  text = new QLineEdit();
-  text2 = new QLineEdit();
-  text3 = new QLineEdit();
+  text = new QLineEdit(txt1);
+  text2 = new QLineEdit(txt2);
+  text3 = new QLineEdit(txt3);
   if (input_callback) {
     connect(text, SIGNAL(returnPressed()), this, SLOT(activate_ok()));
     connect(text2, SIGNAL(returnPressed()), this, SLOT(activate_ok()));
     connect(text3, SIGNAL(returnPressed()), this, SLOT(activate_ok()));
   }
 
-  label = new QLabel();
-  label2 = new QLabel();
-  label3 = new QLabel();
+  label = new QLabel(l1);
+  label2 = new QLabel(l2);
+  label3 = new QLabel(l3);
 
   QLabel* image = new QLabel();
   image->setPixmap(QApplication::style()
@@ -383,11 +372,9 @@ NodelistInputDialogQt::NodelistInputDialogQt(
                        .pixmap(48));
 
   QPushButton* ok = new QPushButton(fl("Ok"));
-  ok->setFixedSize(70, 25);
   connect(ok, SIGNAL(clicked()), this, SLOT(activate_ok()));
 
   QPushButton* cancel = new QPushButton(fl("Cancel"));
-  cancel->setFixedSize(70, 25);
   connect(cancel, SIGNAL(clicked()), this, SLOT(activate_cancel()));
 
   QVBoxLayout* vboxtext = new QVBoxLayout();
@@ -415,48 +402,5 @@ NodelistInputDialogQt::NodelistInputDialogQt(
   vbox->addLayout(hboxbuttons);
 
   setLayout(vbox);
-  setVisible(false);
-}
-
-void NodelistQt::create_add_input_dialog()
-{
-  if (add_india_widget) {
-    add_india_widget->setVisible(true);
-    return;
-  }
-
-  add_india_widget = new NodelistInputDialogQt(this, toplevel);
-}
-
-void NodelistQt::open_mod_input_dialog(const char* text, const char* text2,
-    const char* text3, const char* title, const char* init_text,
-    const char* init_text2, const char* init_text3,
-    void (*ok_cb)(Nodelist*, char*, char*, char*))
-{
-  create_mod_input_dialog();
-
-  mod_india_widget->setWindowTitle(fl(title));
-  mod_india_widget->setAttribute(Qt::WA_DeleteOnClose);
-  mod_india_widget->setVisible(true);
-
-  mod_india_widget->label->setText(translate_utf8(text));
-  mod_india_widget->label2->setText(translate_utf8(text2));
-  mod_india_widget->label3->setText(translate_utf8(text3));
-
-  mod_india_widget->text->setText(translate_utf8(init_text));
-  mod_india_widget->text2->setText(translate_utf8(init_text2));
-  mod_india_widget->text3->setText(translate_utf8(init_text3));
-
-  mod_india_ok_cb = ok_cb;
-}
-
-void NodelistQt::create_mod_input_dialog()
-{
-  if (mod_india_widget) {
-    mod_india_widget->setVisible(true);
-    return;
-  }
-
-  // Create an input dialog
-  mod_india_widget = new NodelistInputDialogQt(this, toplevel, false);
+  setVisible(true);
 }
\ No newline at end of file

xtt/lib/cow/qt/cow_statusmon_nodelist_qt.h

@@ -53,7 +53,10 @@ class NodelistInputDialogQt : public QDialog {
 
 public:
   NodelistInputDialogQt(
-      NodelistQt* parent_ctx, QWidget* parent, bool input_callback = true);
+      NodelistQt* parent_ctx, QWidget* parent, const char* title,
+      const char* label1, const char* label2, const char* label3,
+      const char* txt1, const char* txt2 = "", const char* txt3 = "",
+      bool input_callback = true);
 
   QLabel* label;
   QLabel* label2;
@@ -61,6 +64,7 @@ public:
   QLineEdit* text;
   QLineEdit* text2;
   QLineEdit* text3;
+  void (*ok_cb)(Nodelist*, char*, char*, char*);
 
 public slots:
   void activate_ok();
@@ -75,19 +79,15 @@ 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();
 
   QWidget* nodelistnav_widget;
 
-  NodelistInputDialogQt* add_india_widget;
-  NodelistInputDialogQt* mod_india_widget;
-
   CoWowFocusTimerQt focustimer;
 
   void pop();
   void set_clock_cursor();
   void reset_cursor();
-  void create_add_input_dialog();
-  void create_mod_input_dialog();
   void open_add_input_dialog(const char* text, const char* text2,
       const char* text3, const char* title, const char* init_text,
       void (*ok_cb)(Nodelist*, char*, char*, char*));
@@ -126,12 +126,7 @@ public slots:
   void activate_gui_motif();
   void activate_gui_gtk();
   void activate_gui_qt();
-  void activate_mode_systemstatus();
-  void activate_mode_userstatus1();
-  void activate_mode_userstatus2();
-  void activate_mode_userstatus3();
-  void activate_mode_userstatus4();
-  void activate_mode_userstatus5();
+  void activate_mode();
   void activate_zoom_in();
   void activate_zoom_out();
   void activate_zoom_reset();

xtt/lib/cow/qt/cow_wow_qt.cqt

@@ -321,14 +321,12 @@ void CoWowQt::DeleteList(void* data)
 
 void CoWowWarrantQt::reject()
 {
-  debug_print("Shutting down...\n");
   QDialog::reject();
   exit(0);
 }
 
 void CoWowWarrantQt::destroy(bool destroyWindow, bool destroySubWindows)
 {
-  debug_print("Shutting down...\n");
   QDialog::destroy(destroyWindow, destroySubWindows);
   exit(0);
 }
@@ -409,7 +407,6 @@ CoWowWarrantQt::CoWowWarrantQt(CoWowQtObject* parent)
 
   adjustSize();
   setWindowTitle(translate_utf8("Accept License Terms"));
-  debug_print("Created a CoWowWarrantQt\n");
   setAttribute(Qt::WA_DeleteOnClose);
 
   pop(this);
@@ -424,7 +421,6 @@ void CoWowQtObject::DisplayLicense()
 {
   QMessageBox* mbox = new QMessageBox(parent_wid);
   mbox->setWindowTitle(translate_utf8("License"));
-  debug_print("Created a DisplayLicense\n");
   mbox->setAttribute(Qt::WA_DeleteOnClose);
 
   QScrollArea* scroll = new QScrollArea(mbox);
@@ -544,7 +540,6 @@ CoWowTimerQt::CoWowTimerQt()
 
 CoWowTimerQt::~CoWowTimerQt()
 {
-  debug_print("CoWowTimerQt::~CoWowTimerQt\n");
   delete object;
 }
 
@@ -624,7 +619,6 @@ CoWowFocusTimerQt::CoWowFocusTimerQt() : set_focus_disabled(0), request_cnt(0)
 
 CoWowFocusTimerQt::~CoWowFocusTimerQt()
 {
-  debug_print("CoWowFocusTimerQt::~CoWowFocusTimerQt\n");
 }
 
 void CoWowQt::SetWindowIcon(QWidget* w)
@@ -696,7 +690,6 @@ CoWowModalDialogQt::CoWowModalDialogQt(QWidget* parent, const char* title,
 
   setFixedSize(400, 150);
   setWindowTitle(fl(title));
-  debug_print("Created a CoWowModalDialogQt\n");
   setAttribute(Qt::WA_DeleteOnClose);
 
   QLabel* text_w = new QLabel(fl(text));

xtt/lib/cow/qt/cow_xhelp_qt.cqt

@@ -158,7 +158,6 @@ void CoXHelpQt::print()
 
 void CoXHelpQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("CoXHelpQtWidget::closeEvent\n");
   if (xhelp->close_cb) {
     (xhelp->close_cb)(xhelp->parent_ctx, xhelp);
   } else {
@@ -175,6 +174,12 @@ void CoXHelpQt::pop()
   displayed = 1;
 }
 
+CoXHelpQt::~CoXHelpQt()
+{
+  debug_print("~CoXHelpQt()\n");
+  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)
@@ -185,7 +190,6 @@ CoXHelpQt::CoXHelpQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   strcpy(title, Lng::translate("Help"));
 
   toplevel = new CoXHelpQtWidget(this, xa_parent_wid);
-  toplevel->setToolTip(fl("cow_xhelp widget"));
   toplevel->setFixedSize(700, 600);
   toplevel->setWindowTitle(fl(title));
 

xtt/lib/cow/qt/cow_xhelp_qt.h

@@ -47,6 +47,7 @@ class CoXHelpQt : public CoXHelp {
 public:
   CoXHelpQt(QWidget* xa_parent_wid, void* xa_parent_ctx, xhelp_eUtility utility,
       int* xa_sts);
+  ~CoXHelpQt();
 
   CoXHelpQtWidget* toplevel;
   QWidget* brow_widget;

xtt/lib/cow/qt/cow_xhelpnav_qt.cpp

@@ -49,7 +49,6 @@ CoXHelpNavQt::CoXHelpNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
     char* xn_name, xhelp_eUtility xn_utility, QWidget** w, pwr_tStatus* status)
     : CoXHelpNav(xn_parent_ctx, xn_name, xn_utility, status)
 {
-  debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(
       CoXHelpNav::init_brow_base_cb, this, &brow_widget);
 

xtt/lib/flow/qt/flow_scroll_widget_qt.cqt

@@ -227,7 +227,6 @@ void QtScrollWidgetFlow::paintEvent(QPaintEvent* event)
 
 void QtScrollWidgetFlow::closeEvent(QCloseEvent* event)
 {
-  debug_print("QtScrollWidgetFlow::closeEvent\n");
   if (!destroyed) {
     destroyed = 1;
     if (is_navigator && parent_ctx) {

xtt/lib/flow/qt/flow_widget_qt.cpp

@@ -73,7 +73,6 @@ QWidget* scrolledflowwidgetqt_new(
 {
   QtScrollWidgetFlow* w = new QtScrollWidgetFlow();
   *flowwidget = w;
-  debug_print("creating a new flow scroll widget\n");
   return w->initScroll(
       flow_eCtxType_Flow, init_proc, client_data, flow_init_proc);
 }
@@ -81,7 +80,6 @@ QWidget* scrolledflowwidgetqt_new(
 QWidget* flownavwidgetqt_new(QWidget* main_flow)
 {
   QtScrollWidgetFlow* w = new QtScrollWidgetFlow();
-  debug_print("creating a new flow scroll widget\n");
   w->init(flow_eCtxType_Flow, main_flow);
   return w;
 }

xtt/lib/ge/qt/ge_graph_qt.cqt

@@ -59,11 +59,9 @@ GraphQt::GraphQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
 
   default_access = xn_default_access;
   if (scrollbar) {
-    debug_print("creating a scrolledgrowwidgetqt\n");
     form_widget
         = scrolledgrowwidgetqt_new(graph_init_grow_base_cb, this, &grow_widget);
   } else {
-    debug_print("creating a growwidgetqt\n");
     grow_widget = form_widget = growwidgetqt_new(graph_init_grow_base_cb, this);
   }
 
@@ -77,7 +75,6 @@ GraphQt::GraphQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
 
 GraphQt::~GraphQt()
 {
-  debug_print("GraphQt::~GraphQt\n");
   Attr* attrctx;
   int sts;
 
@@ -122,7 +119,6 @@ void GraphQt::trace_timer_add(int time)
 
 int GraphQt::create_navigator(QWidget* parent)
 {
-  debug_print("creating a grownavwidgetqt\n");
   nav_widget = grownavwidgetqt_new(grow_widget);
   return 1;
 }

xtt/lib/ge/qt/ge_qt.cqt

@@ -1348,7 +1348,6 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
   }
 
   toplevel = new GeQtWidget(this, x_parent_widget);
-  toplevel->setToolTip(fl("ge widget"));
 
   toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(fl(title));

xtt/lib/glow/qt/glow_scroll_widget_qt.cqt

@@ -228,7 +228,6 @@ void QtScrollWidgetGlow::paintEvent(QPaintEvent* event)
 
 void QtScrollWidgetGlow::closeEvent(QCloseEvent* event)
 {
-  debug_print("QtScrollWidgetGlow::closeEvent\n");
   if (!destroyed) {
     destroyed = 1;
     if (is_navigator && parent_ctx) {

xtt/lib/xtt/qt/xtt_ev_qt.cqt

@@ -528,7 +528,8 @@ EvQt::~EvQt()
       ((EvAlaQt*)sala[i])->toplevel->close();
     }
   }
-  delete object;
+  if (object)
+    delete object;
 }
 
 void EvQt::map_eve(unsigned int options)

xtt/lib/xtt/qt/xtt_ev_qt.h

@@ -82,7 +82,7 @@ public:
       unsigned int options = 0, void* widget = 0);
 
 private:
-  EvQtObject* object;
+  EvQtObject* object = NULL;
 };
 
 class EvQtObject : public QObject {

xtt/lib/xtt/qt/xtt_eveve_qt.cqt

@@ -36,8 +36,6 @@
 
 /* xtt_ev_qt.cpp -- Alarm and event window in xtt */
 
-//#include "pwr_baseclasses.h"
-
 #include "rt_gdh.h"
 #include "rt_xnav_msg.h"
 

xtt/lib/xtt/qt/xtt_evlist_qt.cpp

@@ -36,8 +36,6 @@
 
 /* xtt_evlist_qt.cpp -- Alarm or event list in xtt */
 
-//#include "pwr_baseclasses.h"
-
 #include "co_dcli.h"
 #include "co_syi.h"
 

xtt/lib/xtt/qt/xtt_ge_qt.cqt

@@ -215,7 +215,6 @@ void XttGeQtWidget::action_resize(QResizeEvent* event)
 
 XttGeQt::~XttGeQt()
 {
-  debug_print("XttGeQt::~XttGeQt\n");
   if (close_cb) {
     (close_cb)(parent_ctx, this);
   }
@@ -240,7 +239,6 @@ void XttGeQt::iconify()
 
 void XttGeQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("XttGeQtWidget::closeEvent\n");
   if (ge->options & ge_mOptions_IsMain) {
     (ge->close_cb)(ge->parent_ctx, ge);
   } else if (!(ge->options & ge_mOptions_Embedded)) {

xtt/lib/xtt/qt/xtt_hist_qt.cqt

@@ -58,7 +58,6 @@
 
 void HistQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("HistQtWidget::closeEvent\n");
   hist->close_cb(hist);
   QWidget::closeEvent(event);
 }
@@ -75,7 +74,6 @@ HistQt::HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
 
   // Qt
   toplevel = new HistQtWidget(this, hist_parent_wid);
-  toplevel->setToolTip(fl("xtt_hist widget"));
   toplevel->setMinimumSize(hist_width, hist_height);
   toplevel->setWindowTitle(translate_utf8(hist_name));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -340,6 +338,12 @@ HistQt::HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
   *status = 1;
 }
 
+HistQt::~HistQt()
+{
+  if (hist)
+    delete hist;
+}
+
 void HistQtWidget::focusInEvent(QFocusEvent* event)
 {
   hist->hist->set_input_focus();

xtt/lib/xtt/qt/xtt_hist_qt.h

@@ -53,6 +53,7 @@ class HistQt : public Hist {
 public:
   HistQt(void* hist_parent_ctx, QWidget* hist_parent_wid, char* hist_name,
       pwr_tAttrRef* arp, pwr_tStatus* status);
+  ~HistQt();
 
   QWidget* form_hist;
   QWidget* hist_widget;

xtt/lib/xtt/qt/xtt_methodtoolbar_qt.cqt

@@ -69,7 +69,6 @@ XttMethodToolbarQt::XttMethodToolbarQt(void* parent_ctx, void* xnav,
 
 XttMethodToolbarQt::~XttMethodToolbarQt()
 {
-  debug_print("XttMethodToolbarQt::~XttMethodToolbarQt\n");
   if (m_toolbar_w) {
     delete m_toolbar_w;
   }

xtt/lib/xtt/qt/xtt_trace_qt.cqt

@@ -43,8 +43,6 @@
 #include <sys/stat.h>
 #endif
 
-//#include "pwr_baseclasses.h"
-
 #include "co_cdh.h"
 #include "co_time.h"
 
@@ -290,7 +288,6 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
 
   // Qt
   toplevel = new RtTraceQtWidget(this, tr_parent_wid);
-  toplevel->setToolTip(fl("xtt_trace widget"));
   toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(QString::fromLatin1(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);

xtt/lib/xtt/qt/xtt_xatt_qt.cqt

@@ -335,7 +335,6 @@ void XAttQt::print()
 
 void XAttQtWidget::closeEvent(QCloseEvent* event)
 {
-  debug_print("XAttQtWidget::closeEvent\n");
   if (xatt->close_cb) {
     (xatt->close_cb)(xatt->parent_ctx, xatt);
   } else {
@@ -344,6 +343,11 @@ void XAttQtWidget::closeEvent(QCloseEvent* event)
   QWidget::closeEvent(event);
 }
 
+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)
     : XAtt(xa_parent_ctx, xa_objar, xa_advanced_user, xa_sts)
@@ -359,7 +363,6 @@ XAttQt::XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   str_StrncpyCutOff(title, title, 100, 1);
 
   toplevel = new XAttQtWidget(this, xa_parent_wid);
-  toplevel->setToolTip(fl("xtt_xatt widget"));
   toplevel->setFixedSize(420, 600);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -385,7 +388,7 @@ XAttQt::XAttQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
       "CTRL+L");
   addMenuItem(toplevel, functions, "&Display object in Navigator",
       SLOT(activate_display_object()), "CTRL+D");
-  addMenuItem(toplevel, functions, "&Show C_rossreferences",
+  addMenuItem(toplevel, functions, "Show C&rossreferences",
       SLOT(activate_show_cross()), "CTRL+R");
   addMenuItem(toplevel, functions, "Open &ClassGraph",
       SLOT(activate_open_classgraph()), "CTRL+G");

xtt/lib/xtt/qt/xtt_xatt_qt.h

@@ -53,6 +53,7 @@ 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();
   QWidget* brow_widget;
   QWidget* form_widget;
   QLabel* msg_label;

xtt/lib/xtt/qt/xtt_xattnav_qt.cpp

@@ -49,12 +49,8 @@ XAttNavQt::XAttNavQt(void* xa_parent_ctx, QWidget* xa_parent_wid,
     : XAttNav(xa_parent_ctx, xa_type, xa_name, xa_objar, xa_advanced_user,
           xa_userdata, status)
 {
-  debug_print("\n");
-  debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
 
-  //showNow(brow_widget);
-
   // Create the root item
   *w = form_widget;
 
@@ -65,7 +61,6 @@ XAttNavQt::XAttNavQt(void* xa_parent_ctx, QWidget* xa_parent_wid,
 
 XAttNavQt::~XAttNavQt()
 {
-  debug_print("XAttNavQt::~XAttNavQt\n");
   if (trace_started) {
     trace_timerid->remove();
   }

xtt/lib/xtt/qt/xtt_xattone_qt.cqt

@@ -255,8 +255,7 @@ XAttOneQt::XAttOneQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   }
 
   toplevel = new XAttOneQtWidget(this, xa_parent_wid);
-  toplevel->setToolTip(fl("xtt_xattone widget"));
-  toplevel->setMinimumSize(500, 200);
+  toplevel->setMinimumWidth(500);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
 

xtt/lib/xtt/qt/xtt_xcrr_qt.cqt

@@ -122,7 +122,6 @@ XCrrQt::XCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   }
 
   toplevel = new XCrrQtWidget(this, xa_parent_wid);
-  toplevel->setToolTip(fl("xtt_xcrr widget"));
   toplevel->setFixedSize(600, 420);
   toplevel->setWindowTitle(convert_utf8(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
@@ -157,7 +156,7 @@ XCrrQt::XCrrQt(QWidget* xa_parent_wid, void* xa_parent_ctx,
   xcrrnav->init_cb = &init_cb;
 
   vbox->setMenuBar(menu_bar);
-  vbox->addWidget(brow_widget);
+  add_expanding(vbox, brow_widget);
 
   toplevel->setLayout(vbox);
   toplevel->show();

xtt/lib/xtt/qt/xtt_xnav_qt.cqt

@@ -81,7 +81,6 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
           xn_op_close_button, status),
       parent_wid(xn_parent_wid)
 {
-  debug_print("creating a scrolledbrowwidgetqt\n");
   form_widget = scrolledbrowwidgetqt_new(init_brow_base_cb, this, &brow_widget);
 
   displayed = 1;
@@ -100,7 +99,6 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
   trace_timerid = wow->timer_new();
   autoack_timerid = wow->timer_new();
 
-  form_widget->setToolTip(fl("xtt_xnav widget"));
   *status = 1;
 
   popup_obj = new XNavQtPopupObject(this);
@@ -108,7 +106,6 @@ XNavQt::XNavQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
 
 XNavQt::~XNavQt()
 {
-  debug_print("XNavQt::~XNavQt\n");
   closing_down = 1;
 
   delete autoack_timerid;