Get rid of the static_casts.

[lyx.git] / src / frontends / qt2 / Qt2Base.h

diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h
index 0db44a869284a774c5a17bfee8cd9dfdf427aa02..027911319f1485e35a55388626eaaa2055a9b2ed 100644 (file)
--- a/src/frontends/qt2/Qt2Base.h
+++ b/src/frontends/qt2/Qt2Base.h
@@ -12,9 +12,6 @@
 #ifndef QT2BASE_H
 #define QT2BASE_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "ViewBase.h"
 #include <boost/scoped_ptr.hpp>
@@ -32,7 +29,7 @@ class Qt2Base : public QObject, public ViewBase {
        Q_OBJECT
 public:
        ///
-       Qt2Base(QString const &);
+       Qt2Base(string const &);
        ///
        virtual ~Qt2Base() {}
 protected:
@@ -54,7 +51,7 @@ protected:
        virtual bool isValid();
 
        ///
-       Qt2BC & bc();
+       Qt2BC & bcview();
 
        /// are we updating ?
        bool updating_;
@@ -76,17 +73,13 @@ protected slots:
 private:
        /// Pointer to the actual instantiation of the Qt dialog
        virtual QDialog * form() const = 0;
-
-private:
-       /// dialog title, displayed by WM.
-       QString title_;
 };
 
 
 template <class Dialog>
 class Qt2DB: public Qt2Base {
 protected:
-       Qt2DB(QString const &);
+       Qt2DB(string const &);
 
        /// update the dialog
        virtual void update();
@@ -104,7 +97,7 @@ protected:
 
 
 template <class Dialog>
-Qt2DB<Dialog>::Qt2DB(QString const & t)
+Qt2DB<Dialog>::Qt2DB(string const & t)
        : Qt2Base(t)
 {}
 
@@ -155,18 +148,19 @@ public:
                return controller().bufferIsReadonly();
        }
 
-protected:
-       ///
-       Qt2CB(QString const &);
        /// The parent controller
        Controller & controller();
        /// The parent controller
        Controller const & controller() const;
+
+protected:
+       ///
+       Qt2CB(string const &);
 };
 
 
 template <class Controller, class Base>
-Qt2CB<Controller, Base>::Qt2CB(QString const & t)
+Qt2CB<Controller, Base>::Qt2CB(string const & t)
        : Base(t)
 {}