QT: Clean up.

profibus/exe/profinet_viewer/qt/pn_viewer_qt.h

@@ -57,7 +57,6 @@ public:
   QLabel* msg_label;
   QLabel* cmd_prompt;
   CoWowFocusTimerQt focustimer;
-  CoWowFocusTimerQt maptimer;
   CoWowRecall* value_recall;
   CoWowEntryQt* cmd_entry;
 

profibus/lib/cow/qt/cow_pb_gsd_attr_qt.h

@@ -54,7 +54,6 @@ public:
   QLabel* msg_label;
   QLabel* cmd_prompt;
   QLineEdit* cmd_input;
-  QWidget* attrnav_form;
   QAction* menubutton_copy;
   QAction* menubutton_cut;
   QAction* menubutton_paste;

profibus/lib/cow/qt/cow_pn_gsdml_attr_qt.h

@@ -61,7 +61,6 @@ public:
   QAction* menubutton_cut;
   QAction* menubutton_paste;
   QAction* menubutton_changevalue;
-  QAction* menubutton_viewio;
   CoWowFocusTimerQt focustimer;
   static CoWowRecall value_recall;
   CoWowEntryQt* cmd_entry;

wb/lib/wb/qt/wb_bckw_qt.h

@@ -56,7 +56,6 @@ public:
   QWidget* edit_check_all;
   QWidget* edit_check_clear;
   CoWowFocusTimerQt focustimer;
-  CoWowFocusTimerQt maptimer;
 
   void print();
   void set_title(char* title);

wb/lib/wb/qt/wb_expw_qt.h

@@ -52,13 +52,7 @@ public:
 
   QWidget* form;
   QWidget* nav_widget;
-  QWidget* edit_check_all;
-  QWidget* edit_check_clear;
-  QWidget* edit_check_reset;
-  QWidget* edit_show_all;
-  QWidget* file_export;
   CoWowFocusTimerQt focustimer;
-  CoWowFocusTimerQt maptimer;
 
   void print();
   void set_title(char* title);

wb/lib/wb/qt/wb_foe_qt.h

@@ -55,11 +55,8 @@ public:
   QSplitter* pane;
   QSplitter* subpane;
   QWidget* caution;
-  QWidget* caution_label;
-  QWidget* adb;
   QWidget* foe_window;
   QWidget* popupmenu;
-  QWidget* file_entry;
   QAction* save;
   QAction* exit;
   QAction* savetrace;
@@ -84,8 +81,6 @@ public:
   QAction* expand;
   QAction* compress;
   QMenu* edit; /* entry of the menu */
-  QWidget* search_entry; /* entry of the menu */
-  QWidget* customize_entry; /* entry of the menu */
   QAction* trace_togg; /* togg under the function entry of the menu */
   QAction* simulate_togg; /* togg under the function entry of the menu */
   QAction* view_togg; /* togg under the function entry of the menu */
@@ -158,11 +153,6 @@ public:
   virtual void popupmsg(const char* new_label, void (*yes_procedure)(WFoe*),
       void (*no_procedure)(WFoe*), void (*cancel_procedure)(WFoe*));
 
-  int register_callbacks();
-
-  static void reset_current_node(WFoe* foe);
-  static void delete_subwindow_ok_cb(void* ctx, void* data);
-
 private:
   WFoeQtWidget* toplevel;
 };

wb/lib/wb/qt/wb_gre_qt.h

@@ -45,7 +45,6 @@ class WGreQtTraceObject;
 
 class WGreQt : public WGre {
 public:
-  QWidget* gre_window;
   QWidget* flow_widget;
   QWidget* form_widget;
   QWidget* nav_shell;

wb/lib/wb/qt/wb_uted_qt.h

@@ -47,24 +47,14 @@ class WUtedQtWidget;
 
 class WUtedQt : public WUted {
 public:
-  QWidget* uted_window;
   QLabel* label;
-  QWidget* adb;
-  QWidget* file_entry;
   QWidget* quit;
-  QWidget* batchoptmenu;
   QLabel* commandlabel;
-  QWidget* batch;
-  QWidget* currsess;
   QWidget* help;
-  QWidget* timelabel;
-  QWidget* timevalue;
   QLabel* qualifier[UTED_QUALS];
   QLineEdit* value[UTED_QUALS];
   QCheckBox* present[UTED_QUALS];
   QAction* optmenubuttons[UTED_MAX_COMMANDS];
-  QWidget* command_window;
-  QWidget* commandwind_button;
 
   WUtedQt(void* wu_parent_ctx, QWidget* wu_parent_wid, const char* wu_name,
       const char* wu_iconname, ldh_tWBContext wu_ldhwb,

wb/lib/wb/qt/wb_watt_qt.h

@@ -59,8 +59,6 @@ public:
   QLabel* msg_label;
   QLabel* cmd_prompt;
   QWidget* cmd_scrolledinput;
-  QWidget* cmd_scrolled_ok;
-  QWidget* cmd_scrolled_ca;
   QTextEdit* cmd_scrolled_buffer;
   QSplitter* pane;
   static CoWowRecall value_recall;

wb/lib/wb/qt/wb_watttext_qt.h

@@ -52,9 +52,6 @@ public:
       ldh_tSesContext wa_ldhses, pwr_sAttrRef wa_aref, int wa_editmode,
       pwr_tStatus* status);
   QLabel* msg_label;
-  QWidget* button_ok;
-  QWidget* button_apply;
-  QWidget* button_cancel;
   QTextEdit* textbuffer;
   int input_max_length;
   int init;

wb/lib/wb/qt/wb_wda_qt.h

@@ -60,8 +60,6 @@ public:
   QLabel* msg_label;
   QLabel* cmd_prompt;
   QWidget* cmd_scrolledinput;
-  QWidget* cmd_scrolled_ok;
-  QWidget* cmd_scrolled_ca;
   QTextEdit* cmd_scrolled_buffer;
   QSplitter* pane;
   QWidget* wdaclass_dia;
@@ -69,7 +67,6 @@ public:
   QLineEdit* wdaclass_namevalue;
   QLineEdit* wdaclass_classvalue;
   QCheckBox* wdaclass_attrobjects;
-  QWidget* wdaattr_dia;
   static CoWowRecall value_recall;
   CoWowEntryQt* cmd_entry;
   CoWowFocusTimerQt focustimer;

wb/lib/wb/qt/wb_wge_qt.h

@@ -51,7 +51,6 @@ public:
   QWidget* form_widget;
   QWidget* nav_shell;
   QWidget* nav_widget;
-  QWidget* menu_widget;
   QLineEdit* value_input;
   QWidget* value_dialog;
   QWidget* message_dia_widget;

wb/lib/wb/qt/wb_wnav_qt.h

@@ -61,7 +61,6 @@ public:
 
   QWidget* brow_widget;
   QWidget* form_widget;
-  QWidget* selection_widget;
 
   QLocalServer* serverString;
   QLocalServer* serverGraph;

wb/lib/wb/qt/wb_wpkg_qt.h

@@ -53,7 +53,6 @@ public:
   QWidget* brow_widget;
   QWidget* form_widget;
   QLabel* msg_label;
-  QWidget* wpkgnav_form;
   CoWowFocusTimerQt focustimer;
 
   void message(char severity, const char* message);

wb/lib/wb/qt/wb_wrev_qt.h

@@ -75,7 +75,6 @@ public:
   QWidget* brow_widget;
   QWidget* form_widget;
   QLabel* msg_label;
-  QWidget* wrevnav_form;
   QWidget* india_widget;
   CoWowFocusTimerQt focustimer;
 
@@ -84,7 +83,6 @@ public:
   void set_clock_cursor();
   void reset_cursor();
   void flush();
-  void create_input_dialog();
   void open_input_dialog(const char* text1, const char* text2,
       const char* title, const char* init_text1, const char* init_text2,
       void (*ok_cb)(WRev*, char*, char*));

wb/lib/wb/qt/wb_wtt_qt.h

@@ -105,7 +105,6 @@ public:
   QWidget* palette_widget;
   QLabel* msg_label;
   QLabel* cmd_prompt;
-  QWidget* wnav_form;
   QSplitter* palette_paned;
   QWidget* boot_dia;
   QAction* cm_normal_syntax;
@@ -170,7 +169,6 @@ public:
   QTimer* disfocus_timerid;
   QTimer* selection_timerid;
   int avoid_deadlock;
-  QTimer* deadlock_timerid;
   int popupmenu_x;
   int popupmenu_y;
   static CoWowRecall cmd_recall;
@@ -316,6 +314,4 @@ private:
   WttQt* wtt;
 };
 
-QWidget* wtt_create_popup_menu(Wtt* wtt, pwr_sAttrRef aref, pwr_tCid cid,
-    void (*message_cb)(void*, char, char*));
 #endif
\ No newline at end of file

wb/lib/wb/qt/wb_xcrr_qt.h

@@ -51,7 +51,6 @@ public:
       pwr_sAttrRef* xa_objar, int xa_advanced_user, int* xa_sts);
   QWidget* brow_widget;
   QWidget* form_widget;
-  QWidget* xcrrnav_form;
   CoWowFocusTimerQt focustimer;
 
   void pop();

xtt/exe/co_help/qt/co_help_qt.cpp

@@ -53,6 +53,11 @@ void CoHelpQt::close_cb(void* ctx, void* xhelp)
   exit(0);
 }
 
+void CoHelpQt::cohelp_mainloop()
+{
+  QApplication::exec();
+}
+
 int main(int argc, char* argv[])
 {
   int sts;
@@ -92,4 +97,6 @@ CoHelpQt::CoHelpQt(int argc, char* argv[], int* return_sts)
   xhelp->close_cb = close_cb;
 
   exec_help();
+
+  cohelp_mainloop();
 }
\ No newline at end of file

xtt/exe/rt_xtt/qt/rt_xtt_qt.cqt

@@ -79,7 +79,7 @@ void XttQt::hotkey_ResetDig(char* arg, void* userdata)
   hotkey_activate_resetdig(arg);
 }
 
-bool eventFilter(QObject* obj, QEvent* event)
+bool XttQtWidget::eventFilter(QObject* obj, QEvent* event)
 {
   return XttHotkey::event_handler(event, obj);
 }

xtt/exe/rt_xtt/qt/rt_xtt_qt.h

@@ -71,7 +71,6 @@ public:
       const char* init_text, void (*ok_cb)(Xtt*, char*));
   void set_prompt(const char* prompt);
   void open_change_value();
-  void create_input_dialog();
   void print();
 
   static void close(void* ctx, int terminate);
@@ -91,6 +90,7 @@ public:
   XttQtWidget(XttQt* parent_ctx) : QWidget(), xtt(parent_ctx)
   {
   }
+  bool eventFilter(QObject* obj, QEvent* event);
 
 protected:
   void focusInEvent(QFocusEvent* event);

xtt/lib/cow/qt/cow_logw_qt.h

@@ -52,7 +52,6 @@ public:
 
   QWidget* nav_widget;
   CoWowFocusTimerQt focustimer;
-  CoWowFocusTimerQt maptimer;
 
   void print();
 

xtt/lib/cow/qt/cow_qt_helpers.cpp

@@ -175,21 +175,6 @@ QAction* addMenuItem(QObject* parent, QMenu* menu, const char* text,
   return action;
 }
 
-QAction* addMenuItemMapped(QObject* parent, QMenu* menu, const char* text,
-    const char* callback, const char* signal, const char* shortcut,
-    const char* iconName)
-{
-  QAction* action
-      = new QAction(get_icon(iconName), translate_utf8(text), parent);
-  if (strcmp(shortcut, "")) {
-    action->setShortcut(fl(shortcut));
-  }
-  QObject::connect(action, signal, parent, callback);
-
-  menu->addAction(action);
-  return action;
-}
-
 QAction* addCheckableMenuItem(QObject* parent, QMenu* menu, const char* text,
     const char* callback, const char* shortcut, const char* iconName)
 {
@@ -230,28 +215,6 @@ QAction* addToolItem(QObject* parent, QToolBar* tools, const char* text,
   return action;
 }
 
-QAction* addToolItemMapped(QObject* parent, QToolBar* tools, const char* text,
-    const char* callback, const char* signal, const char* iconName)
-{
-  QAction* action
-      = new QAction(get_icon(iconName), translate_utf8(text), parent);
-  QObject::connect(action, signal, parent, callback);
-
-  tools->addAction(action);
-  return action;
-}
-
-QAction* addToolRadioItem(QObject* parent, QToolBar* tools, const char* text,
-    const char* callback, QActionGroup* group)
-{
-  QAction* action = new QAction(translate_utf8(text), parent);
-  QObject::connect(action, SIGNAL(triggered()), parent, callback);
-  action->setCheckable(true);
-  action->setActionGroup(group);
-  tools->addAction(action);
-  return action;
-}
-
 QAction* addCheckableToolItem(QObject* parent, QToolBar* tools,
     const char* text, const char* callback, const char* iconName)
 {

xtt/lib/cow/qt/cow_qt_helpers.h

@@ -81,19 +81,12 @@ 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 = "");
-QAction* addMenuItemMapped(QObject* parent, QMenu* menu, const char* text,
-    const char* callback, const char* signal, const char* shortcut = "",
-    const char* iconName = "");
 QAction* addCheckableMenuItem(QObject* parent, QMenu* menu, const char* text,
     const char* callback, const char* shortcut = "", const char* iconName = "");
 QAction* addMenuRadioItem(QObject* parent, QMenu* menu, const char* text,
     const char* callback, QActionGroup* group, const char* shortcut = "");
 QAction* addToolItem(QObject* parent, QToolBar* tools, const char* text,
     const char* callback, const char* iconName);
-QAction* addToolItemMapped(QObject* parent, QToolBar* tools, const char* text,
-    const char* callback, const char* signal, const char* iconName = "");
-QAction* addToolRadioItem(QObject* parent, QToolBar* tools, const char* text,
-    const char* callback, QActionGroup* group);
 QAction* addCheckableToolItem(QObject* parent, QToolBar* tools,
     const char* text, const char* callback, const char* iconName);
 QMenu* addToolMenu(QWidget* parent, QToolBar* tools, const char* text);

xtt/lib/cow/qt/cow_rtmon_qt.h

@@ -70,7 +70,6 @@ public:
   void pop();
   void set_clock_cursor();
   void reset_cursor();
-  void create_input_dialog();
   void open_input_dialog(
       char* text, char* title, char* init_text, void (*ok_cb)(RtMon*, char*));
 

xtt/lib/cow/qt/cow_statusmon_nodelist_qt.h

@@ -76,8 +76,6 @@ public:
       const char* nodelist_name, int nodelist_mode,
       int nodelist_view_node_descr, int msgw_pop, pwr_tStatus* status);
 
-  QWidget* parent_wid_nodelist;
-  QWidget* form_nodelist;
   QWidget* nodelistnav_widget;
 
   NodelistInputDialogQt* add_india_widget;

xtt/lib/cow/qt/cow_statusmon_nodelistnav_qt.h

@@ -64,7 +64,6 @@ public:
   void beep();
 
 private:
-  NodelistNav* nodelistnav;
   NodelistNavQtTraceObject* trace_obj;
 };
 

xtt/lib/cow/qt/cow_wow_qt.cqt

@@ -777,7 +777,7 @@ void CoWowModalDialogQt::destroy(bool destroyWindow, bool destroySubWindows)
   QDialog::destroy(destroyWindow, destroySubWindows);
 }
 
-void CoWowModalDialogQt::modaldia_activate_cb(QKeyEvent* e)
+void CoWowModalDialogQt::modaldia_activate_cb()
 {
   done(wow_eModalDialogReturn_ReturnPressed);
 }

xtt/lib/cow/qt/cow_wow_qt.h

@@ -80,7 +80,7 @@ protected:
   void destroy(bool destroyWindow = true, bool destroySubWindows = true);
 
 public slots:
-  void modaldia_activate_cb(QKeyEvent* e);
+  void modaldia_activate_cb();
   void modaldia_button1_cb();
   void modaldia_button2_cb();
   void modaldia_button3_cb();

xtt/lib/flow/qt/flow_browwidget_qt.cpp

@@ -68,14 +68,6 @@ static int brow_init_proc(QWidget* w, FlowCtx* fctx, void* client_data)
   return (brow->init_proc)(ctx, client_data);
 }
 
-QWidget* browwidgetqt_new(
-    int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data)
-{
-  QtScrollWidgetFlow* w = new QtScrollWidgetFlow();
-  w->init(flow_eCtxType_Brow, init_proc, client_data, brow_init_proc);
-  return w;
-}
-
 QWidget* scrolledbrowwidgetqt_new(
     int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data,
     QWidget** browwidget)
@@ -87,13 +79,6 @@ QWidget* scrolledbrowwidgetqt_new(
   return form;
 }
 
-QWidget* brownavwidgetqt_new(QWidget* main_brow)
-{
-  QtScrollWidgetFlow* w = new QtScrollWidgetFlow();
-  w->init(flow_eCtxType_Brow, main_brow);
-  return w;
-}
-
 void browwidgetqt_modify_ctx(QWidget* w, void* ctx)
 {
   ((QtScrollWidgetFlow*)w)->parent_ctx = ctx;

xtt/lib/flow/qt/flow_browwidget_qt.h

@@ -41,22 +41,10 @@
 
 #include <QWidget>
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
-QWidget* browwidgetqt_new(
-    int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data);
 QWidget* scrolledbrowwidgetqt_new(
     int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data,
     QWidget** browwidget);
 
-QWidget* brownavwidgetqt_new(QWidget* main_brow);
-
-void browwidgetqt_get_ctx(QWidget* w, void** ctx);
 void browwidgetqt_modify_ctx(QWidget* w, void* ctx);
 
-#if defined __cplusplus
-}
-#endif
 #endif
\ No newline at end of file

xtt/lib/flow/qt/flow_draw_qt.cqt

@@ -56,17 +56,6 @@
 
 #define DRAW_PRESS_PIX 9
 
-typedef struct {
-  QWidget* w;
-  int x;
-  int y;
-  int width;
-  int height;
-  FlowArrayElem* node;
-  int number;
-  FlowCtx* ctx;
-} draw_sAnnotData;
-
 typedef struct {
   QPixmap pixmap[DRAW_PIXMAP_SIZE];
 } draw_sPixmap;

xtt/lib/flow/qt/flow_draw_qt.h

@@ -207,7 +207,6 @@ public:
 
   void set_image_clip_mask(
       QPainter* painter, flow_tPixmap pixmap, int x, int y);
-  void reset_image_clip_mask();
 
   void set_white_background(FlowCtx* ctx);
 

xtt/lib/flow/qt/flow_widget_qt.cpp

@@ -67,15 +67,6 @@ static int flow_init_proc(QWidget* w, FlowCtx* fctx, void* client_data)
   return (flow->init_proc)(ctx, client_data);
 }
 
-QWidget* flowwidgetqt_new(
-    int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data)
-{
-  QtScrollWidgetFlow* w = new QtScrollWidgetFlow();
-  debug_print("creating a new flow scroll widget\n");
-  w->init(flow_eCtxType_Flow, init_proc, client_data, flow_init_proc);
-  return w;
-}
-
 QWidget* scrolledflowwidgetqt_new(
     int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data,
     QWidget** flowwidget)

xtt/lib/flow/qt/flow_widget_qt.h

@@ -41,22 +41,12 @@
 
 #include <QWidget>
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
-QWidget* flowwidgetqt_new(
-    int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data);
 QWidget* scrolledflowwidgetqt_new(
     int (*init_proc)(FlowCtx* ctx, void* client_data), void* client_data,
     QWidget** flowwidget);
 
 QWidget* flownavwidgetqt_new(QWidget* main_flow);
 
-void flowwidgetqt_get_ctx(QWidget* w, void** ctx);
 void flowwidgetqt_modify_ctx(QWidget* w, void* ctx);
 
-#if defined __cplusplus
-}
-#endif
 #endif
\ No newline at end of file

xtt/lib/ge/qt/ge_curve_qt.h

@@ -56,12 +56,6 @@ public:
   ~GeCurveQt();
 
   GeCurveQtWidget* toplevel;
-  QWidget* grow_widget;
-  QWidget* curve_widget;
-  QWidget* axisform_widget;
-  QWidget* nameform_widget;
-  QWidget* curveform_widget;
-  QWidget* pane_widget;
   QWidget* vbox;
   QWidget* growcurve_main_widget;
   QWidget* growaxis_main_widget;
@@ -75,7 +69,6 @@ public:
   QWidget* menu_open;
   QWidget* menu_snapshot;
   QWidget* menu_export;
-  QWidget* menu_add;
   QAction* tools_snapshot;
   QAction* tools_add;
   QAction* tools_curvetype_line;

xtt/lib/ge/qt/ge_item_view_qt.h

@@ -57,6 +57,8 @@ public:
   QWidget* widget();
   void update();
   void update(const char*, int);
+  QString selected_text();
+  QString selected_text(QTreeWidget*);
 
 protected:
   void focusOutEvent(QFocusEvent* event);
@@ -68,8 +70,6 @@ private:
 
 public slots:
   void directory_changed(const QString& path);
-  QString selected_text();
-  QString selected_text(QTreeWidget*);
   void activate_menu_open();
   void activate_menu_delete();
   void activate_tree_widget(QTreeWidgetItem* item, int idx);

xtt/lib/ge/qt/ge_subgraphs_qt.h

@@ -54,7 +54,6 @@ public:
   SubGraphsQt(void* xn_parent_ctx, QWidget* xn_parent_wid, const char* xn_name,
       void* grow_ctx, QWidget** w, pwr_tStatus* status);
 
-  QWidget* subgraphs_form;
   QWidget* brow_widget;
   QWidget* form_widget;
 

xtt/lib/glow/qt/glow_colpalwidget_qt.cpp

@@ -75,14 +75,6 @@ static int colpal_init_proc(QWidget* w, GlowCtx* fctx, void* client_data)
   }
 }
 
-QWidget* colpalwidgetqt_new(
-    int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data)
-{
-  QtScrollWidgetGlow* w = new QtScrollWidgetGlow();
-  w->init(glow_eCtxType_ColPal, init_proc, client_data, colpal_init_proc);
-  return w;
-}
-
 QWidget* scrolledcolpalwidgetqt_new(
     int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data,
     QWidget** colpalwidget)
@@ -91,11 +83,4 @@ QWidget* scrolledcolpalwidgetqt_new(
   *colpalwidget = w;
   return w->initScroll(
       glow_eCtxType_ColPal, init_proc, client_data, colpal_init_proc);
-}
-
-QWidget* colpalnavwidgetqt_new(QWidget* main_colpal)
-{
-  QtScrollWidgetGlow* w = new QtScrollWidgetGlow();
-  w->init(glow_eCtxType_ColPal, main_colpal);
-  return w;
 }
\ No newline at end of file

xtt/lib/glow/qt/glow_colpalwidget_qt.h

@@ -38,10 +38,6 @@
 
 #include <QWidget>
 
-QWidget* colpalwidgetqt_new(
-    int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data);
 QWidget* scrolledcolpalwidgetqt_new(
     int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data,
-    QWidget** growwidget);
-
+    QWidget** growwidget);
\ No newline at end of file
-QWidget* colpalnavwidgetqt_new(QWidget* main_grow);
\ No newline at end of file

xtt/lib/glow/qt/glow_curvewidget_qt.cpp

@@ -104,16 +104,6 @@ QWidget* curvewidgetqt_new(
   return (QWidget*)w;
 }
 
-QWidget* scrolledcurvewidgetqt_new(
-    int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data,
-    QWidget** curvewidget)
-{
-  CurveWidgetQt* w = new CurveWidgetQt();
-  *curvewidget = w;
-  return w->initScroll(
-      glow_eCtxType_Curve, init_proc, client_data, curve_init_proc);
-}
-
 QWidget* curvenavwidgetqt_new(QWidget* main_curve)
 {
   CurveWidgetQt* w = new CurveWidgetQt();

xtt/lib/glow/qt/glow_curvewidget_qt.h

@@ -49,8 +49,5 @@ protected:
 
 QWidget* curvewidgetqt_new(
     int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data);
-QWidget* scrolledcurvewidgetqt_new(
-    int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data,
-    QWidget** curvewidget);
 
 QWidget* curvenavwidgetqt_new(QWidget* main_curve);
\ No newline at end of file

xtt/lib/glow/qt/glow_draw_qt.h

@@ -175,8 +175,6 @@ public:
   virtual void set_image_clip_mask(
       QPainter* painter, glow_tPixmap pixmap, int x, int y);
 
-  virtual void reset_image_clip_mask(){}
-
   virtual int set_clip_rectangle(
       GlowWind* w, int ll_x, int ll_y, int ur_x, int ur_y);
   virtual void reset_clip_rectangle(GlowWind* w);

xtt/lib/glow/qt/glow_keyboardwidget_qt.cpp

@@ -61,10 +61,3 @@ QWidget* keyboardwidgetqt_new(
   w->init(glow_eCtxType_Keyboard, init_proc, client_data, keyboard_init_proc);
   return (QWidget*)w;
 }
-
-QWidget* keyboardnavwidgetqt_new(QWidget* main_keyboard)
-{
-  QtScrollWidgetGlow* w = new QtScrollWidgetGlow();
-  w->init(glow_eCtxType_Keyboard, main_keyboard);
-  return (QWidget*)w;
-}
\ No newline at end of file

xtt/lib/glow/qt/glow_keyboardwidget_qt.h

@@ -40,8 +40,3 @@
 
 QWidget* keyboardwidgetqt_new(
     int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data);
-QWidget* scrolledkeyboardwidgetqt_new(
-    int (*init_proc)(GlowCtx* ctx, void* client_data), void* client_data,
-    QWidget** growwidget);
-
-QWidget* keyboardnavwidgetqt_new(QWidget* main_grow);
\ No newline at end of file

xtt/lib/xtt/qt/xtt_clog_qt.h

@@ -52,8 +52,6 @@ public:
       pwr_tStatus* status);
 
   QWidget* parent_wid;
-  QWidget* parent_wid_clog;
-  QWidget* form_clog;
   QWidget* clognav_widget;
   QWidget* filter_form;
   QCheckBox* show_success_w;
@@ -63,8 +61,6 @@ public:
   QCheckBox* show_fatal_w;
   QCheckBox* show_text_w;
   QLineEdit* filter_string_w;
-  QWidget* filesel_form;
-  QWidget* filesel_list_w;
 
   void pop();
   void set_clock_cursor();

xtt/lib/xtt/qt/xtt_evlist_qt.h

@@ -50,7 +50,6 @@ public:
 
   QWidget* brow_widget;
   QWidget* form_widget;
-  char print_title[120];
 
   void set_input_focus();
   void bell();

xtt/lib/xtt/qt/xtt_fileview_qt.cpp

@@ -175,7 +175,7 @@ XttFileviewQt::XttFileviewQt(void* xn_parent_ctx, QWidget* xn_parent_wid,
   }
 
   QObject::connect(toplevel, SIGNAL(fileSelected(const QString&)), toplevel,
-      SLOT(list_ok_cb(const QString&)));
+      SLOT(XttFileviewQtWidget::list_ok_cb(const QString&)));
 
   toplevel->exec();
 }
\ No newline at end of file

xtt/lib/xtt/qt/xtt_fileview_qt.h

@@ -56,7 +56,6 @@ public:
   }
 
   QWidget* list;
-  QWidget* input_text;
   pwr_tFileName dir;
   pwr_tString40 pattern;
   pwr_tAName target_attr;

xtt/lib/xtt/qt/xtt_ge_qt.cqt

@@ -332,7 +332,7 @@ XttGeQt::XttGeQt(QWidget* xg_parent_wid, void* xg_parent_ctx,
 
   QObject::connect(((GraphQt*)graph)->grow_widget,
       SIGNAL(resize_signal(QResizeEvent*)), toplevel,
-      SLOT(action_resize(QResizeEvent*)));
+      SLOT(XttGeQtWidget::action_resize(QResizeEvent*)));
   // TODO: grow_widget must emit a resize_signal signal in resizeEvent()
 
   if (xg_menu) {

xtt/lib/xtt/qt/xtt_ge_qt.h

@@ -52,7 +52,6 @@ public:
   QWidget* form_widget;
   QWidget* nav_shell;
   QWidget* nav_widget;
-  QWidget* menu_widget;
   QWidget* graph_form;
   QLineEdit* value_input;
   QWidget* value_dialog;
@@ -107,7 +106,6 @@ protected:
   void resize(int width, int height);
   void focusInEvent(QFocusEvent* event);
   void closeEvent(QCloseEvent* event);
-  void action_resize(QResizeEvent* event);
 
 public slots:
   void activate_confirm_ok();
@@ -116,6 +114,7 @@ public slots:
   void activate_zoom_out();
   void activate_zoom_reset();
   void activate_help();
+  void action_resize(QResizeEvent* event);
 
 private:
   XttGeQt* ge;

xtt/lib/xtt/qt/xtt_multiview_qt.cpp

@@ -176,8 +176,6 @@ XttMultiViewQt::XttMultiViewQt(QWidget* mv_parent_wid, void* mv_parent_ctx,
     window_width = 600;
     window_height = 500;
   }
-  orig_width = window_width;
-  orig_height = window_height;
 
   // Qt
   if (!(options & ge_mOptions_Embedded)) {

xtt/lib/xtt/qt/xtt_multiview_qt.h

@@ -70,8 +70,6 @@ public:
   int comp_height[MV_SIZE];
   int comp_x[MV_SIZE];
   int comp_y[MV_SIZE];
-  int orig_width;
-  int orig_height;
   CoWowFocusTimerQt focustimer;
 
   XttMultiViewQt(QWidget* parent_wid, void* parent_ctx, const char* name,
@@ -85,8 +83,6 @@ public:
 
   void pop();
   void set_size(int width, int height);
-  void create_confirm_dialog();
-  void confirm_reply(int ok);
   void* get_widget();
   int set_subwindow_source(const char* name, char* source, char* object,
       double* borders, int insert = 1, int more = 0);

xtt/lib/xtt/qt/xtt_op_qt.h

@@ -69,14 +69,12 @@ public:
       pwr_tStatus* status);
   ~OpQt();
 
-  QWidget* parent_wid_op;
   QLabel* alarmcnt_label;
   QWidget* aalarm_mark;
   QLabel* aalarm_label[5];
   QWidget* aalarm_active[5];
   QWidget* aalarm_active_box[5];
   QWidget* aalarm_info[5];
-  QWidget* aalarm_filler[5];
   QWidget* aalarm_box[5];
   QLabel* balarm_label;
   QWidget* balarm_active;

xtt/lib/xtt/qt/xtt_xatt_qt.h

@@ -68,7 +68,6 @@ public:
   void message(char severity, const char* message);
   void set_prompt(const char* prompt);
   void change_value(int set_focus);
-  int open_changevalue(char* name);
   void change_value_close();
   void pop();
   void print();

xtt/lib/xtt/qt/xtt_xattone_qt.h

@@ -65,10 +65,8 @@ public:
   void message(char severity, const char* message);
   void set_prompt(char* prompt);
   int change_value(int set_focus);
-  int open_changevalue(char* name);
   void change_value_close();
   void pop();
-  void swap(int mode);
   int set_value();
 
 private:

xtt/lib/xtt/qt/xtt_xcolwind_qt.h

@@ -69,7 +69,6 @@ public:
   void message(char severity, const char* message);
   void set_prompt(const char* prompt);
   void change_value(int set_focus);
-  int open_changevalue(char* name);
   void change_value_close();
   void pop();
   void set_title(char* title);

xtt/lib/xtt/qt/xtt_xcrr_qt.h

@@ -51,7 +51,6 @@ public:
       int xa_advanced_user, int* xa_sts);
   QWidget* brow_widget;
   QWidget* form_widget;
-  QWidget* xcrrnav_form;
   CoWowFocusTimerQt focustimer;
 
   void pop();