diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2019-01-23 01:58:28 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2019-03-06 01:26:24 +0000 |
| commit | e71e984af918104579da59e45785fe1651c5e992 (patch) | |
| tree | 9fe91c6e2b1237055e46dc4974c1003c2abc8d61 /src/ui/dialog/filedialogimpl-win32.cpp | |
| parent | Revert modal fix to fix #108 (diff) | |
| download | inkscape-e71e984af918104579da59e45785fe1651c5e992.tar.gz inkscape-e71e984af918104579da59e45785fe1651c5e992.zip | |
Avoid the “using std::*;” or “using namespace std;” constructs.
This makes the code a lot less readable and greppable for no reason.
Diffstat (limited to 'src/ui/dialog/filedialogimpl-win32.cpp')
| -rw-r--r-- | src/ui/dialog/filedialogimpl-win32.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index dbe84ea38..d993c2113 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -21,6 +21,8 @@ #include <gdkmm/general.h> #include <glibmm/fileutils.h> #include <glibmm/i18n.h> +#include <list> +#include <vector> //Inkscape includes #include "display/cairo-utils.h" @@ -34,7 +36,6 @@ #include "util/units.h" -using namespace std; using namespace Glib; using namespace Cairo; using namespace Gdk::Cairo; @@ -184,7 +185,7 @@ FileOpenDialogImplWin32::~FileOpenDialogImplWin32() void FileOpenDialogImplWin32::addFilterMenu(Glib::ustring name, Glib::ustring pattern) { - list<Filter> filter_list; + std::list<Filter> filter_list; int extension_index = 0; int filter_length = 1; @@ -210,7 +211,7 @@ void FileOpenDialogImplWin32::addFilterMenu(Glib::ustring name, Glib::ustring pa _filter = new wchar_t[filter_length]; wchar_t *filterptr = _filter; - for(list<Filter>::iterator filter_iterator = filter_list.begin(); + for(std::list<Filter>::iterator filter_iterator = filter_list.begin(); filter_iterator != filter_list.end(); ++filter_iterator) { const Filter &filter = *filter_iterator; @@ -242,7 +243,7 @@ void FileOpenDialogImplWin32::addFilterMenu(Glib::ustring name, Glib::ustring pa void FileOpenDialogImplWin32::createFilterMenu() { - list<Filter> filter_list; + std::list<Filter> filter_list; int extension_index = 0; int filter_length = 1; @@ -427,7 +428,7 @@ void FileOpenDialogImplWin32::createFilterMenu() _filter = new wchar_t[filter_length]; wchar_t *filterptr = _filter; - for(list<Filter>::iterator filter_iterator = filter_list.begin(); + for(std::list<Filter>::iterator filter_iterator = filter_list.begin(); filter_iterator != filter_list.end(); ++filter_iterator) { const Filter &filter = *filter_iterator; @@ -1609,7 +1610,7 @@ FileSaveDialogImplWin32::~FileSaveDialogImplWin32() void FileSaveDialogImplWin32::createFilterMenu() { - list<Filter> filter_list; + std::list<Filter> filter_list; knownExtensions.clear(); @@ -1655,7 +1656,7 @@ void FileSaveDialogImplWin32::createFilterMenu() _filter = new wchar_t[filter_length]; wchar_t *filterptr = _filter; - for(list<Filter>::iterator filter_iterator = filter_list.begin(); + for(std::list<Filter>::iterator filter_iterator = filter_list.begin(); filter_iterator != filter_list.end(); ++filter_iterator) { const Filter &filter = *filter_iterator; @@ -1685,7 +1686,7 @@ void FileSaveDialogImplWin32::createFilterMenu() void FileSaveDialogImplWin32::addFileType(Glib::ustring name, Glib::ustring pattern) { - list<Filter> filter_list; + std::list<Filter> filter_list; knownExtensions.clear(); @@ -1716,7 +1717,7 @@ void FileSaveDialogImplWin32::addFileType(Glib::ustring name, Glib::ustring patt _filter = new wchar_t[filter_length]; wchar_t *filterptr = _filter; - for(list<Filter>::iterator filter_iterator = filter_list.begin(); + for(std::list<Filter>::iterator filter_iterator = filter_list.begin(); filter_iterator != filter_list.end(); ++filter_iterator) { const Filter &filter = *filter_iterator; |