cosmetics

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

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index b527d906bbd3ceaf8a185bbd5c25052135670bc7..c14ccbedf22f1d4f100403bc2183e5a52f0c391c 100644 (file)
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -537,17 +537,6 @@ static void getCrop(external::ClipData & data,
 }
 
 
-static void getExtra(external::ExtraData & data,
-             GuiExternal::MapType const & extra)
-{
-       typedef GuiExternal::MapType MapType;
-       MapType::const_iterator it = extra.begin();
-       MapType::const_iterator const end = extra.end();
-       for (; it != end; ++it)
-               data.set(fromqstr(it.key()), fromqstr(it.value().trimmed()));
-}
-
-
 void GuiExternal::updateContents()
 {
        tab->setCurrentIndex(0);
@@ -652,8 +641,7 @@ void GuiExternal::applyView()
        params_.draft = draftCB->isChecked();
 
        getDisplay(params_.display, params_.lyxscale,
-                  *displayCB, *showCO,
-                  *displayscaleED);
+               *displayCB, *showCO, *displayscaleED);
 
        if (tab->isTabEnabled(tab->indexOf(rotatetab)))
                getRotation(params_.rotationdata, *angleED, *originCO);
@@ -666,8 +654,12 @@ void GuiExternal::applyView()
                getCrop(params_.clipdata, *clipCB, *xlED, *ybED,
                        *xrED, *ytED, bbChanged_);
 
-       if (tab->isTabEnabled(tab->indexOf(optionstab)))
-               getExtra(params_.extradata, extra_);
+       if (tab->isTabEnabled(tab->indexOf(optionstab))) {
+               MapType::const_iterator it = extra_.begin();
+               MapType::const_iterator const end = extra_.end();
+               for (; it != end; ++it)
+                       params_.extradata.set(fromqstr(it.key()), fromqstr(it.value().trimmed()));
+       }
 }
 
 

diff --git a/src/frontends/qt4/GuiExternal.h b/src/frontends/qt4/GuiExternal.h
index 80f272363a4752345b7a377b54cd54a43133d8ea..3a41a1833b1db3c90682353126c9560f85c8c720 100644 (file)
--- a/src/frontends/qt4/GuiExternal.h
+++ b/src/frontends/qt4/GuiExternal.h
@@ -24,14 +24,6 @@
 #include <QHash>
 
 namespace lyx {
-
-namespace external {
-
-class Template;
-class RotationDataType;
-
-} // namespace external
-
 namespace frontend {
 
 class GuiExternal : public GuiDialog, public Ui::ExternalUi
@@ -53,11 +45,10 @@ private Q_SLOTS:
        void templateChanged();
        void widthUnitChanged();
 
-public:
+private:
        ///
        typedef QHash<QString, QString> MapType;
 
-private:
        ///
        bool activateAspectratio() const;
        /// Apply changes