Replace LString.h with support/std_string.h,

[features.git] / src / frontends / qt2 / QVCLog.C

diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C
index ed405a76ca9a6c6682f693bad589ccc7ce7307e9..bb40427d096ec5fe047e6915675e29a668974c8f 100644 (file)
--- a/src/frontends/qt2/QVCLog.C
+++ b/src/frontends/qt2/QVCLog.C
@@ -5,15 +5,15 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "qt_helpers.h"
-#include "LyXView.h"
+#include "support/lstrings.h"
 #include "ControlVCLog.h"
 
 #include "QVCLog.h"
@@ -23,13 +23,14 @@
 #include <qtextview.h>
 #include <qpushbutton.h>
 
-#include "BoostFormat.h"
 
-typedef Qt2CB<ControlVCLog, Qt2DB<QVCLogDialog> > base_class;
+using namespace lyx::support;
 
+typedef QController<ControlVCLog, QView<QVCLogDialog> > base_class;
 
-QVCLog::QVCLog()
-       : base_class(qt_("LyX: Version Control Log"))
+
+QVCLog::QVCLog(Dialog & parent)
+       : base_class(parent, _("LyX: Version Control Log"))
 {
 }
 
@@ -38,17 +39,15 @@ void QVCLog::build_dialog()
 {
        dialog_.reset(new QVCLogDialog(this));
 
-       bc().setCancel(dialog_->closePB);
+       bcview().setCancel(dialog_->closePB);
 }
 
 
 void QVCLog::update_contents()
 {
-#if USE_BOOST_FORMAT
-       dialog_->setCaption(toqstr(boost::io::str(boost::format(_("Version control log for %1$s")) % controller().getBufferFileName())));
-#else
-       dialog_->setCaption(toqstr(string(_("Version control log for ")) + controller().getBufferFileName()));
-#endif
+       setTitle(bformat(_("Version control log for %1$s"),
+                        controller().getBufferFileName()));
+
        dialog_->vclogTV->setText("");
 
        ostringstream ss;