Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / Tooltips.C

diff --git a/src/frontends/xforms/Tooltips.C b/src/frontends/xforms/Tooltips.C
index 07018bf3fdff02a582b3b6332c14102eca6a39a8..cca71af6cdf255ad3a243202d3fed26948743130 100644 (file)
--- a/src/frontends/xforms/Tooltips.C
+++ b/src/frontends/xforms/Tooltips.C
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 /* Tooltips for xforms. xforms 0.89 supports them directly, but 0.88 needs
@@ -16,19 +16,29 @@
 
 #include <config.h>
 
-
 #include "Tooltips.h"
+
 #include "xforms_helpers.h" // formatted
-#include "gettext.h"
+
 #include "support/lstrings.h"
-#include "support/LAssert.h"
-#include FORMS_H_LOCATION
+
+#include "lyx_forms.h"
 
 #include <boost/bind.hpp>
 
+using std::string;
+
+
+namespace lyx {
+
+using support::trim;
+
+namespace frontend {
+
+
 bool Tooltips::enabled_ = true;
 
-boost::signal0<void> Tooltips::toggled;
+boost::signal<void()> Tooltips::toggled;
 
 
 Tooltips::Tooltips()
@@ -61,7 +71,7 @@ void Tooltips::set()
 
 void Tooltips::init(FL_OBJECT * ob, string const & tip)
 {
-       lyx::Assert(ob && ob->form);
+       BOOST_ASSERT(ob && ob->form);
 
        // Store the tooltip string
        string const str = formatted(trim(tip), 400);
@@ -71,3 +81,6 @@ void Tooltips::init(FL_OBJECT * ob, string const & tip)
        char const * const c_str = enabled_ ? str.c_str() : 0;
        fl_set_object_helper(ob, c_str);
 }
+
+} // namespace frontend
+} // namespace lyx