FreeBSD 10 clang port

cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh

@@ -27,7 +27,7 @@ class WXmTextField;
 class WXmText;
 #include <WWL/WXmPushButtonGadget.h>
 class Mark;
-class MarkMoved;
+struct MarkMoved;
 
 class BookmarkEdit : public Dialog, public UAS_Receiver<MarkMoved>
 {

cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C

@@ -435,21 +435,16 @@ GraphicAgent::create_ui()
   PixmapGraphic &pgraphic = *(f_graphic->pixmap_graphic());
 
   Graphic *graphic = f_graphic ;
+  UAS_String buffer = CATGETS(Set_GraphicAgent, 8, "Dtinfo: ");
   UAS_String titleStr(graphic->title());
   const char *title = titleStr ;
 
   if (title == NULL || *title == '\0')	// empty string 
     title = (char *)CATGETS(Set_GraphicAgent, 2, "Detached Graphic");
+  buffer = buffer + title;
 
-  {
-
-    UAS_String buffer = CATGETS(Set_GraphicAgent, 8, "Dtinfo: ");
-    buffer = buffer + title;
-
-    f_shell.Title((char*)buffer);
-    f_shell.IconName((char*)buffer);
-
-  }
+  f_shell.Title((char*)buffer);
+  f_shell.IconName((char*)buffer);
 
   args.Reset();
   panner.CanvasWidth (pgraphic.width(), args);

cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.hh

@@ -95,7 +95,6 @@ private:
   UAS_Pointer<UAS_Common>	f_node_ptr ;
   UAS_Pointer<Graphic>	f_graphic ;
   WXawPanner           *f_panner;
-  WXmLabel	       *f_label;
   WPixmap	       *f_pixmap_widget ;
   unsigned int		f_panner_state ;
   unsigned int          f_current_scale;

cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh

@@ -38,7 +38,7 @@ class IcccmAgent;
 
 struct OutlineListSelectionData;
 
-class TrackingEntry;
+struct TrackingEntry;
 
 class LibraryAgent : public Agent,
 		     public UAS_Receiver<UAS_DocumentRetrievedMsg>

cde/programs/dtinfo/dtinfo/src/Agents/MarkCanvas.hh

@@ -29,8 +29,8 @@
 class Agent;
 class Mark;
 class MarkIcon;
-class MarkSelectionChanged;
-class MarkChanged;
+struct MarkSelectionChanged;
+struct MarkChanged;
 
 class MarkCanvas : public Destructable, 
 		   public UAS_Receiver<MarkChanged> 

cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.C

@@ -93,8 +93,7 @@ MarkIcon::MarkIcon (Widget parent,
 		    Widget chooser_parent,
 		    MarkCanvas *mark, 
 		    int ypos, int scrollbar_offset)
-: f_icon_char (0),
-  f_selected (FALSE),
+: f_selected (FALSE),
   f_y_position (ypos),
   f_chooser_parent (chooser_parent)
 {

cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.hh

@@ -88,7 +88,6 @@ private:
   // MarkTml objects are stored in reverse order in the list
   // to allow quick access to the last element. 
   xList<MarkCanvas *> f_mark_list;
-  char             f_icon_char;
   bool             f_selected;
   unsigned int     f_offset;
   unsigned int	   f_y_position ;

cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.hh

@@ -32,8 +32,8 @@
 #include <WWL/WXmPushButton.h>
 #include <WWL/WXmList.h>
 
-class MarkCreated;
-class MarkDeleted;
+struct MarkCreated;
+struct MarkDeleted;
 
 class MarkListView : public WWL,
 		     public UAS_Receiver<MarkCreated>,

cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C

@@ -630,9 +630,11 @@ g_view_mark()
 }
 
 
+#if 0
 static unsigned
 find_segment_offset (_DtCvSegment *start, const _DtCvSegment *target,
 		     unsigned &offset);
+#endif
 
 static void
 arm_callback (void *client_data)
@@ -4451,6 +4453,7 @@ NodeWindowAgent::SetTopic(_DtCvTopicPtr topic)
 // stack of the parents
 
 
+#if 0
 static _DtCvSegment *
 contains(_DtCvSegment *root, _DtCvSegment *segment)
 {
@@ -4527,6 +4530,7 @@ next_string_segment(_DtCvSegment *root, _DtCvSegment *start)
 
   return 0;
 }
+#endif
 
 
 
@@ -4650,6 +4654,7 @@ NodeWindowAgent::create_canvas_mark(_DtCvHandle  canvas,
   return mark_canvas ;
 }
 
+#if 0
 static unsigned
 find_segment_offset (_DtCvSegment *start, const _DtCvSegment *target,
 		     unsigned &offset)
@@ -4701,6 +4706,7 @@ find_segment_offset (_DtCvSegment *start, const _DtCvSegment *target,
   
   return found ;
 }
+#endif
 
 void
 NodeWindowAgent::link_to (const char *locator)

cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.hh

@@ -51,15 +51,15 @@ class WXmCascadeButton;
 class WXmForm;
 class HitList;
 class Ancestor;
-class SelectionChanged;
+struct SelectionChanged;
 class BookTab;
 class PixmapGraphic;
-class MarkSelectionChanged;
+struct MarkSelectionChanged;
 class ScopeMenu;
 class Graphic;
 class Mark;
-class MarkCreated;
-class MarkDeleted;
+struct MarkCreated;
+struct MarkDeleted;
 class MarkCanvas ;
 class MarkIcon ;
 // class DetachGraphic;

cde/programs/dtinfo/dtinfo/src/Agents/ScopeMenu.hh

@@ -36,7 +36,7 @@
 
 #include <WWL/WXmMenu.h>
 class WXmArrowButton;
-class UpdateMenu;
+struct UpdateMenu;
 
 
 // A ScopeMenu is not a real menu, it's only an object responsible to update

cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C

@@ -55,8 +55,8 @@ public: // functions
   HashBucket()
     // NOTE: remove 3rd param after testing
     : List (10, 10, List::GROW_ADD) { };
-  FolioObject *find (const FolioObject &);
-  void remove (const FolioObject &);
+  int find (FolioObject &);
+  void remove (FolioObject &);
 };
 
 
@@ -64,18 +64,18 @@ public: // functions
 // bucket find
 // /////////////////////////////////////////////////////////////////
 
-FolioObject *
-HashBucket::find (const FolioObject &element)
+int
+HashBucket::find (FolioObject &element)
 {
   register int i;
 
   for (i = 0; i < f_length; i++)
     {
       if (((Hashable *)f_list_element[i])->equals ((Hashable &) element))
-	return ((Hashable *) f_list_element[i]);
+	return (i);
     }
 
-  return (NULL);
+  return (-1);
 }
 
 
@@ -84,7 +84,7 @@ HashBucket::find (const FolioObject &element)
 // /////////////////////////////////////////////////////////////////
 
 void
-HashBucket::remove (const FolioObject &element)
+HashBucket::remove (FolioObject &element)
 {
   register int i;
 
@@ -140,7 +140,7 @@ HashTbl::add (Hashable &element)
     f_hash_bucket[where] = new HashBucket();
 
   /* -------- See if it exists. -------- */
-  if (f_hash_bucket[where]->find (element) == NULL)
+  if (f_hash_bucket[where]->find (element) == -1)
     /* -------- Finally, add it. -------- */
     f_hash_bucket[where]->append (element);
 }
@@ -150,15 +150,15 @@ HashTbl::add (Hashable &element)
 // find - find an entry in the hash table
 // /////////////////////////////////////////////////////////////////
 
-Hashable *
-HashTbl::find (const Hashable &element) const
+int
+HashTbl::find (Hashable &element) const
 {
   u_int where = element.hash_code (0, f_num_buckets - 1);
 
   if (f_hash_bucket[where] != NULL)
-    return ((Hashable *) f_hash_bucket[where]->find (element));
+    return (f_hash_bucket[where]->find (element));
   else
-    return (NULL);
+    return (-1);
 }
 
 
@@ -167,7 +167,7 @@ HashTbl::find (const Hashable &element) const
 // /////////////////////////////////////////////////////////////////
 
 void
-HashTbl::remove (const Hashable &element)
+HashTbl::remove (Hashable &element)
 {
   u_int where = element.hash_code (0, f_num_buckets - 1);
   if (f_hash_bucket[where] != NULL)

cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.hh

@@ -31,9 +31,9 @@ public: // functions
   void add (Hashable &);
   void add (Hashable *h)
     { add (*h); }
-  void remove (const Hashable &);
+  void remove (Hashable &);
   void remove_all (bool delete_elements = FALSE);
-  Hashable *find (const Hashable &) const;
+  int find (Hashable &) const;
 
 protected: // variables
   HashBucket **f_hash_bucket;

cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.hh

@@ -99,7 +99,6 @@ private:   // data
   char                 *f_lang;
   char                 *f_home;
   char                 *f_user_path;
-  char                 *f_lang_normalized;
 
     // option flags and data
   UAS_String            f_infolibsStr;

cde/programs/dtinfo/dtinfo/src/Managers/GlobalHistoryMgr.hh

@@ -27,8 +27,8 @@
 
 #include "UAS.hh"
 
-class HistoryDelete;
-class HistoryAdd;
+struct HistoryDelete;
+struct HistoryAdd;
 class NodeHistoryAgent;
 
 class GlobalHistoryMgr : public Long_Lived,

cde/programs/dtinfo/dtinfo/src/Managers/LocalHistoryMgr.hh

@@ -27,7 +27,7 @@
 
 #include "UAS.hh"
 
-class Anchor;
+struct Anchor;
 
 class LocalHistoryEntry
 {

cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.hh

@@ -30,7 +30,7 @@
 
 class Mark;
 class MarkBase;
-class Anchor;
+struct Anchor;
 class MarkListView;
 
 class MarkMgr : public Long_Lived

cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.C

@@ -156,8 +156,7 @@ MessageMgr::MessageMgr() :
  f_nodeview_process(0),
  f_popped_up(False),
  f_pressed_ok(False),
- f_exit_flag(False),
- f_dialog_active(False)
+ f_exit_flag(False)
 
 {
     MessageAgent::request ((UAS_Receiver<CancelOperation> *) this);

cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.hh

@@ -83,7 +83,6 @@ private: // variables
   bool			f_popped_up;
   bool			f_pressed_ok;
   bool			f_exit_flag;
-  bool			f_dialog_active;
 
 private:
   LONG_LIVED_HH(MessageMgr,message_mgr);

cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C

@@ -128,7 +128,7 @@ static PrintNode node_printer;
 // /////////////////////////////////////////////////////////////////
 
 PrintMgr::PrintMgr()
-    : f_print_panel(NULL), f_npa(NULL), f_font_scale(0)
+    : f_npa(NULL), f_font_scale(0)
 {
     RCS_DEBUG("PrintMgr::PrintMgr called.");
     set_font_scale(pref_mgr().get_int(PrefMgr::FontScale));

cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.hh

@@ -71,7 +71,6 @@ public:
     void set_font_scale(int);  
 
 private:
-    PrintPanelAgent * f_print_panel;
     NodePrintAgent * f_npa;      
     UAS_Pointer<UAS_Common> f_last_printed;	
     int	f_font_scale ; // for old style.sheet    

cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.hh

@@ -79,7 +79,6 @@ class TtIpcMgr : public Long_Lived
  private: // data
 
     char  	*procid ;		// tt id for process
-    Tt_pattern  *sess_patterns ;	// tt patterns array for process
     Tt_status	 tt_state ;
 } ;
 

cde/programs/dtinfo/dtinfo/src/Marks/Anchor.hh

@@ -26,7 +26,7 @@
  */
 
 
-class Anchor
+struct Anchor
 {
 public:
   Anchor (const char *location, const char *format, bool keep = FALSE)

cde/programs/dtinfo/dtinfo/src/Marks/Mark.hh

@@ -31,12 +31,12 @@
  # include "UAS.hh"
 
 
-class Anchor;
-class MarkChanged;
-class MarkDeleted;
-class MarkMoved;
-class EditMark;
-class ViewMark;
+struct Anchor;
+struct MarkChanged;
+struct MarkDeleted;
+struct MarkMoved;
+struct EditMark;
+struct ViewMark;
 
 class Mark
 {

cde/programs/dtinfo/dtinfo/src/Marks/MarkBase.hh

@@ -23,7 +23,7 @@
 
 template <class T> class xList;
 class Mark;
-class Anchor;
+struct Anchor;
 
 class MarkBase
 {

cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C

@@ -1835,7 +1835,6 @@ PartialElementFeatures::~PartialElementFeatures()
 ElementFeatures::ElementFeatures(CanvasRenderer* renderer)
 : PartialElementFeatures(renderer),
   f_row (NULL),
-  f_graphic (0),
   f_border (_DtCvBORDER_NONE),
   f_border_width(-1), // invalid border width
   f_table (NULL),

cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.hh

@@ -449,7 +449,6 @@ public:
 
 private:
   RowDefn*	f_row ;
-  unsigned	f_graphic;
 
   _DtCvFrmtOption	f_border;
   int			f_border_width;

cde/programs/dtinfo/dtinfo/src/Query/QueryTerm.hh

@@ -95,7 +95,6 @@ private:
   u_char  f_connective;
   char   *f_weight;
   char   *f_proximity;
-  char   *f_scope;
   bool f_term_string_fixed;
   u_char f_type;
   // may need some way to verify the scope... 

cde/programs/dtinfo/dtinfo/src/Templates.C

@@ -53,7 +53,7 @@ class LinkAction;
 class BookTab;
 class MarkTml;
 class MarkIcon;
-class MarkCreated;
+struct MarkCreated;
 class MarkSelectionChanged;
 #ifndef _IBMR2
 class DisplayDocument;

cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c

@@ -962,9 +962,7 @@ static void set_tree_size (tw, insetvalues, width, height)
     return;
 }
 
-static void layout_tree (tw, insetvalues)
-    TreeWidget tw;
-    Boolean insetvalues;
+static void layout_tree (TreeWidget tw, Boolean insetvalues)
 {
     int i;
     Dimension *dp;