Replace LString.h with support/std_string.h,

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

diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index 74d517b112d4082617660fc3fdb11fda9adc5d93..191542d595177cfca5de78a98a5539c5c062b68d 100644 (file)
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -5,21 +5,16 @@
  *
  * \author Kalle Dalheimer
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "support/lstrings.h"
-#include "Lsstream.h"
-#include "debug.h"
+#include "support/std_sstream.h"
 #include "qt_helpers.h"
-#include "LyXView.h"
-#include "ButtonControllerBase.h"
+#include "ButtonController.h"
 #include "ControlAboutlyx.h"
 
 #include <qlabel.h>
@@ -30,13 +25,15 @@
 #include "Qt2BC.h"
 #include "QAbout.h"
 
+using namespace lyx::support;
+
 using std::getline;
 
-typedef Qt2CB<ControlAboutlyx, Qt2DB<QAboutDialog> > base_class;
+typedef QController<ControlAboutlyx, QView<QAboutDialog> > base_class;
 
 
-QAbout::QAbout()
-       : base_class(qt_("About LyX"))
+QAbout::QAbout(Dialog & parent)
+       : base_class(parent, _("About LyX"))
 {
 }
 
@@ -100,7 +97,7 @@ void QAbout::build_dialog()
        }
 #endif
 
-       dialog_->creditsTV->setText(toqstr(out.str()));
+       dialog_->creditsTV->setText(toqstr(STRCONV(out.str())));
 
        // try to resize to a good size
        dialog_->copyright->hide();
@@ -109,6 +106,6 @@ void QAbout::build_dialog()
        dialog_->setMinimumSize(dialog_->sizeHint());
 
        // Manage the cancel/close button
-       bc().setCancel(dialog_->closePB);
+       bcview().setCancel(dialog_->closePB);
        bc().refresh();
 }