remove some lyx:: etc

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18012 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/controllers/BCView.cpp b/src/frontends/controllers/BCView.cpp
index 4979c0d458d589965ccaa708a1fcb21228c99da0..d4f55f0bff0e46a174a4123545e60812c4e5541a 100644 (file)
--- a/src/frontends/controllers/BCView.cpp
+++ b/src/frontends/controllers/BCView.cpp
@@ -16,10 +16,6 @@
 namespace lyx {
 namespace frontend {
 
-CheckedWidget::~CheckedWidget()
-{}
-
-
 BCView::BCView(ButtonController const & p)
        : parent(p)
 {}

diff --git a/src/frontends/controllers/BCView.h b/src/frontends/controllers/BCView.h
index c90f66ec5b341f438dee0de11340ded8bcbe6cf5..5699c6ce81e948f1637ed964d41d765343f83d31 100644 (file)
--- a/src/frontends/controllers/BCView.h
+++ b/src/frontends/controllers/BCView.h
@@ -39,7 +39,7 @@ class ButtonPolicy;
 class CheckedWidget {
 public:
        ///
-       virtual ~CheckedWidget();
+       virtual ~CheckedWidget() {}
 
        /** Returns true if the widget is in a valid state.
        *  Might also change the visual appearance of the widget,
@@ -95,7 +95,7 @@ class GuiBC : public BCView {
 public:
        ///
        GuiBC(ButtonController const & parent,
-             lyx::docstring const & cancel, lyx::docstring const & close);
+             docstring const & cancel, docstring const & close);
 
        //@{
        /** Store pointers to these widgets. The pointers are _not_
@@ -124,10 +124,10 @@ private:
        /// Enable/Disable a button
        virtual void setButtonEnabled(Button * obj, bool enable) const = 0;
        /// Set the Label on the button
-       virtual void setButtonLabel(Button * obj, lyx::docstring const & label) const = 0;
+       virtual void setButtonLabel(Button * obj, docstring const & label) const = 0;
 
-       lyx::docstring const cancel_label_;
-       lyx::docstring const close_label_;
+       docstring const cancel_label_;
+       docstring const close_label_;
 
        Button * okay_;
        Button * apply_;

diff --git a/src/frontends/controllers/ControlChanges.h b/src/frontends/controllers/ControlChanges.h
index 7168cc655fd021384680dd4402850bda49ed78c5..de5b6cf6ff992fc86a5215b42ff280b2f358ee38 100644 (file)
--- a/src/frontends/controllers/ControlChanges.h
+++ b/src/frontends/controllers/ControlChanges.h
@@ -42,10 +42,10 @@ public:
        void next();
 
        /// return date of change
-       lyx::docstring const getChangeDate();
+       docstring const getChangeDate();
 
        /// return author of change
-       lyx::docstring const getChangeAuthor();
+       docstring const getChangeAuthor();
 
        /// accept the current change
        void accept();

diff --git a/src/frontends/controllers/ControlExternal.h b/src/frontends/controllers/ControlExternal.h
index 432924c02e944d5bb0bc04197d823767e97c5b07..e27c5fd9c32dac71165e053083da35fe3533fae7 100644 (file)
--- a/src/frontends/controllers/ControlExternal.h
+++ b/src/frontends/controllers/ControlExternal.h
@@ -68,8 +68,8 @@ public:
        std::string const 
        getTemplateFilters(std::string const & template_name) const;
        ///
-       lyx::docstring const browse(lyx::docstring const & input_file,
-                                lyx::docstring const & template_name) const;
+       docstring const browse(docstring const & input_file,
+                                docstring const & template_name) const;
 
        /// Read the Bounding Box from a eps or ps-file
        std::string const readBB(std::string const & file);

diff --git a/src/frontends/controllers/ControlLog.h b/src/frontends/controllers/ControlLog.h
index 7c76010951bdce89da432ffac19470f3b6b589a5..bf66375010d2516f207c1712e55c0f831453a45b 100644 (file)
--- a/src/frontends/controllers/ControlLog.h
+++ b/src/frontends/controllers/ControlLog.h
@@ -39,7 +39,7 @@ public:
        virtual bool isBufferDependent() const { return true; }
 
        /// The title displayed by the dialog reflects the \c LOGTYPE
-       lyx::docstring const title() const;
+       docstring const title() const;
        /// put the log file into the ostream
        void getContents(std::ostream & ss) const;
 

diff --git a/src/frontends/controllers/ControlPrefs.h b/src/frontends/controllers/ControlPrefs.h
index 1faade0cb9b5c8acfdb901248c0709f625a4d3c1..c86af8c029bd22a6d833758ebd35855edf231683 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.h
+++ b/src/frontends/controllers/ControlPrefs.h
@@ -52,18 +52,18 @@ public:
        Movers const & movers() const { return movers_; }
 
        /// various file pickers
-       lyx::docstring const browsebind(lyx::docstring const & file) const;
-       lyx::docstring const browseUI(lyx::docstring const & file) const;
-       lyx::docstring const browsekbmap(lyx::docstring const & file) const;
-       lyx::docstring const browsedict(lyx::docstring const & file) const;
+       docstring const browsebind(docstring const & file) const;
+       docstring const browseUI(docstring const & file) const;
+       docstring const browsekbmap(docstring const & file) const;
+       docstring const browsedict(docstring const & file) const;
 
        /// general browse
-       lyx::docstring const browse(lyx::docstring const & file,
-                                lyx::docstring const & title) const;
+       docstring const browse(docstring const & file,
+                                docstring const & title) const;
 
        /// browse directory
-       lyx::docstring const browsedir(lyx::docstring const & path,
-                                   lyx::docstring const & title) const;
+       docstring const browsedir(docstring const & path,
+                                   docstring const & title) const;
 
        /// set a color
        void setColor(LColor_color col, std::string const & hex);

diff --git a/src/frontends/controllers/ControlPrint.h b/src/frontends/controllers/ControlPrint.h
index 0ec1be7571afb287fac04ed4a894d7b0f6a41130..f1d0b3c825b4427aa68b8a5ae7a4df8040df24de 100644 (file)
--- a/src/frontends/controllers/ControlPrint.h
+++ b/src/frontends/controllers/ControlPrint.h
@@ -43,7 +43,7 @@ public:
        virtual kb_action getLfun() const { return LFUN_BUFFER_PRINT; }
 
        /// Browse for a file
-       lyx::docstring const browse(lyx::docstring const &) const;
+       docstring const browse(docstring const &) const;
        ///
        PrinterParams & params() const;
 private:

diff --git a/src/frontends/controllers/ControlRef.h b/src/frontends/controllers/ControlRef.h
index acc93b235044e54b9c2f69d835afdd185c1f050c..5829a0bffb1af558a3fa6f25dc496531a494b9aa 100644 (file)
--- a/src/frontends/controllers/ControlRef.h
+++ b/src/frontends/controllers/ControlRef.h
@@ -26,7 +26,7 @@ public:
        ///
        ControlRef(Dialog &);
        ///
-       std::vector<lyx::docstring> const getLabelList(std::string const &) const;
+       std::vector<docstring> const getLabelList(std::string const &) const;
        ///
        void gotoRef(std::string const &);
        ///

diff --git a/src/frontends/controllers/ControlViewSource.h b/src/frontends/controllers/ControlViewSource.h
index f55ca2d222a47899fbc8b8379400c64266a9f0e8..16a05b7996cdd90d039fb05eccec1913d7bed104 100644 (file)
--- a/src/frontends/controllers/ControlViewSource.h
+++ b/src/frontends/controllers/ControlViewSource.h
@@ -37,12 +37,12 @@ public:
        virtual bool isBufferDependent() const { return true; }
 
        /// The title displayed by the dialog reflects source type. 
-       lyx::docstring const title() const;
+       docstring const title() const;
 
        /** get the source code of selected paragraphs, or the whole document
                \param fullSource get full source code
         */
-       lyx::docstring const updateContent(bool fullSource);
+       docstring const updateContent(bool fullSource);
 };
 
 } // namespace frontend

diff --git a/src/frontends/controllers/Dialog.cpp b/src/frontends/controllers/Dialog.cpp
index 6c0aee8d2cbad378cd92b2d35ab03d8b7caf9515..3d8bf212d69a284d112483a1b552dec4aecf7381 100644 (file)
--- a/src/frontends/controllers/Dialog.cpp
+++ b/src/frontends/controllers/Dialog.cpp
@@ -21,7 +21,6 @@
 #include "FuncStatus.h"
 #include "lyxfunc.h"
 
-using lyx::docstring;
 
 using std::string;
 
@@ -34,10 +33,6 @@ Dialog::Dialog(LyXView & lv, string const & name)
 {}
 
 
-Dialog::~Dialog()
-{}
-
-
 void Dialog::ApplyButton()
 {
        apply();
@@ -208,7 +203,7 @@ Dialog::Controller::Controller(Dialog & parent)
 bool Dialog::Controller::canApply() const
 {
        FuncRequest const fr(getLfun(), dialog().name());
-       FuncStatus const fs(lyx::getStatus(fr));
+       FuncStatus const fs(getStatus(fr));
        return fs.enabled();
 }
 

diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/controllers/Dialog.h
index defc1d792fd8375c5ebfb0678d9a7a7881d96b2c..143874d6aea71531339fe59f5e5f957f83c0dc90 100644 (file)
--- a/src/frontends/controllers/Dialog.h
+++ b/src/frontends/controllers/Dialog.h
@@ -37,7 +37,6 @@ public:
        /// \param name is the identifier given to the dialog by its parent
        /// container.
        Dialog(LyXView & lv, std::string const & name);
-       ~Dialog();
 
        /** The Dialog's name is the means by which a dialog identifies
         *  itself to the kernel.
@@ -228,7 +227,7 @@ public:
        /** \param parent Dialog owning this Controller.
         *  \param title  is the dialog title displayed by the WM.
         */
-       View(Dialog & parent, lyx::docstring title);
+       View(Dialog & parent, docstring title);
        virtual ~View() {}
 
        /** \name Generic View
@@ -266,9 +265,9 @@ public:
        virtual void partialUpdate(int id);
 
        /// sets the title of the dialog (window caption)
-       void setTitle(lyx::docstring const &);
+       void setTitle(docstring const &);
        /// gets the title of the dialog (window caption)
-       lyx::docstring const & getTitle() const;
+       docstring const & getTitle() const;
 
        /** \name View Access
         *  Enable the derived classes to access the other parts of the whole.
@@ -290,7 +289,7 @@ protected:
 
 private:
        Dialog & p_;
-       lyx::docstring title_;
+       docstring title_;
 };
 
 } // namespace frontend