From acd3ef6caebabdb8314b41ec028fc0d209526cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 18 Apr 2008 19:52:16 +0000 Subject: [PATCH] cosmetics git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24333 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiExternal.cpp | 22 +++++++--------------- src/frontends/qt4/GuiExternal.h | 11 +---------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp index b527d906bb..c14ccbedf2 100644 --- 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 80f272363a..3a41a1833b 100644 --- a/src/frontends/qt4/GuiExternal.h +++ b/src/frontends/qt4/GuiExternal.h @@ -24,14 +24,6 @@ #include 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 MapType; -private: /// bool activateAspectratio() const; /// Apply changes