enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / qt4 / QChanges.C

diff --git a/src/frontends/qt4/QChanges.C b/src/frontends/qt4/QChanges.C
index c07af77a69f852880af51c12d145fb6f2fa7675c..79e03757036c5e0d3ca13e8d698d63365819e951 100644 (file)
--- a/src/frontends/qt4/QChanges.C
+++ b/src/frontends/qt4/QChanges.C
@@ -19,8 +19,8 @@
 
 #include "controllers/ControlChanges.h"
 
-#include <qpushbutton.h>
-#include <q3textview.h>
+#include <QPushButton>
+#include <QTextBrowser>
 
 using lyx::support::bformat;
 
@@ -33,7 +33,7 @@ typedef QController<ControlChanges, QView<QChangesDialog> > base_class;
 
 
 QChanges::QChanges(Dialog & parent)
-       : base_class(parent, _("Merge Changes"))
+       : base_class(parent, lyx::to_utf8(_("Merge Changes")))
 {
 }
 
@@ -58,16 +58,16 @@ void QChanges::next()
 {
        controller().find();
 
-       string text;
-       string author(controller().getChangeAuthor());
-       string date(controller().getChangeDate());
+       docstring text;
+       docstring author = lyx::from_utf8(controller().getChangeAuthor());
+       docstring date = lyx::from_utf8(controller().getChangeDate());
 
        if (!author.empty())
                text += bformat(_("Change by %1$s\n\n"), author);
        if (!date.empty())
                text += bformat(_("Change made at %1$s\n"), date);
 
-       dialog_->changeTV->setText(toqstr(text));
+       dialog_->changeTB->setPlainText(toqstr(text));
 }