From e71e984af918104579da59e45785fe1651c5e992 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 23 Jan 2019 02:58:28 +0100 Subject: =?UTF-8?q?Avoid=20the=20=E2=80=9Cusing=20std::*;=E2=80=9D=20or=20?= =?UTF-8?q?=E2=80=9Cusing=20namespace=20std;=E2=80=9D=20constructs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the code a lot less readable and greppable for no reason. --- src/ui/widget/page-sizer.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/ui/widget/page-sizer.cpp') diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 030e90af0..df6af9626 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -27,9 +27,6 @@ #include "object/sp-root.h" #include "io/resource.h" -using std::pair; -using Inkscape::Util::unit_table; - namespace Inkscape { namespace UI { namespace Widget { @@ -133,7 +130,7 @@ PageSizer::PageSizer(Registry & _wr) snprintf(formatBuf, 79, "%0.1f x %0.1f", width, height); Glib::ustring desc = formatBuf; desc.append(" " + std::string(line[3])); - PaperSize paper(name, width, height, unit_table.getUnit(line[3])); + PaperSize paper(name, width, height, Inkscape::Util::unit_table.getUnit(line[3])); _paperSizeTable[name] = paper; Gtk::TreeModel::Row row = *(_paperSizeListStore->append()); row[_paperSizeListColumns.nameColumn] = name; @@ -450,12 +447,9 @@ PageSizer::updateFitMarginsUI(Inkscape::XML::Node *nv_repr) Gtk::ListStore::iterator PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const { - using Inkscape::Util::Quantity; - using std::swap; - // The code below assumes that w < h, so make sure that's the case: if ( h < w ) { - swap(h,w); + std::swap(h,w); } g_return_val_if_fail(w <= h, _paperSizeListStore->children().end()); @@ -464,8 +458,8 @@ PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity for (iter = _paperSizeTable.begin() ; iter != _paperSizeTable.end() ; ++iter) { PaperSize paper = iter->second; - Quantity smallX (paper.smaller, paper.unit); - Quantity largeX (paper.larger, paper.unit); + Inkscape::Util::Quantity smallX (paper.smaller, paper.unit); + Inkscape::Util::Quantity largeX (paper.larger, paper.unit); g_return_val_if_fail(smallX.quantity < largeX.quantity + 0.001, _paperSizeListStore->children().end()); -- cgit v1.2.3