Merge changes from trunk

(bzr r14949.1.64)

1 files changed, 12 insertions, 74 deletions

diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 042637d22..e8c1bf723 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -754,16 +754,9 @@ FileOpenDialogImplGtk::~FileOpenDialogImplGtk()
 
 void FileOpenDialogImplGtk::addFilterMenu(Glib::ustring name, Glib::ustring pattern)
 {
-
-#if WITH_GTKMM_3_0
-    Glib::RefPtr<Gtk::FileFilter> allFilter = Gtk::FileFilter::create();
+    auto allFilter = Gtk::FileFilter::create();
     allFilter->set_name(_(name.c_str()));
     allFilter->add_pattern(pattern);
-#else
-    Gtk::FileFilter allFilter;
-    allFilter.set_name(_(name.c_str()));
-    allFilter.add_pattern(pattern);
-#endif
     extensionMap[Glib::ustring(_("All Files"))] = NULL;
     add_filter(allFilter);
 }
@@ -775,51 +768,27 @@ void FileOpenDialogImplGtk::createFilterMenu()
     }
 
     if (_dialogType == EXE_TYPES) {
-#if WITH_GTKMM_3_0
-        Glib::RefPtr<Gtk::FileFilter> allFilter = Gtk::FileFilter::create();
+        auto allFilter = Gtk::FileFilter::create();
         allFilter->set_name(_("All Files"));
         allFilter->add_pattern("*");
-#else
-        Gtk::FileFilter allFilter;
-        allFilter.set_name(_("All Files"));
-        allFilter.add_pattern("*");
-#endif
         extensionMap[Glib::ustring(_("All Files"))] = NULL;
         add_filter(allFilter);
     } else {
-#if WITH_GTKMM_3_0
-        Glib::RefPtr<Gtk::FileFilter> allInkscapeFilter = Gtk::FileFilter::create();
+        auto allInkscapeFilter = Gtk::FileFilter::create();
         allInkscapeFilter->set_name(_("All Inkscape Files"));
 
-        Glib::RefPtr<Gtk::FileFilter> allFilter = Gtk::FileFilter::create();
+        auto allFilter = Gtk::FileFilter::create();
         allFilter->set_name(_("All Files"));
         allFilter->add_pattern("*");
 
-        Glib::RefPtr<Gtk::FileFilter> allImageFilter = Gtk::FileFilter::create();
+        auto allImageFilter = Gtk::FileFilter::create();
         allImageFilter->set_name(_("All Images"));
 
-        Glib::RefPtr<Gtk::FileFilter> allVectorFilter = Gtk::FileFilter::create();
+        auto allVectorFilter = Gtk::FileFilter::create();
         allVectorFilter->set_name(_("All Vectors"));
 
-        Glib::RefPtr<Gtk::FileFilter> allBitmapFilter = Gtk::FileFilter::create();
+        auto allBitmapFilter = Gtk::FileFilter::create();
         allBitmapFilter->set_name(_("All Bitmaps"));
-#else
-        Gtk::FileFilter allInkscapeFilter;
-        allInkscapeFilter.set_name(_("All Inkscape Files"));
-
-        Gtk::FileFilter allFilter;
-        allFilter.set_name(_("All Files"));
-        allFilter.add_pattern("*");
-
-        Gtk::FileFilter allImageFilter;
-        allImageFilter.set_name(_("All Images"));
-
-        Gtk::FileFilter allVectorFilter;
-        allVectorFilter.set_name(_("All Vectors"));
-
-        Gtk::FileFilter allBitmapFilter;
-        allBitmapFilter.set_name(_("All Bitmaps"));
-#endif
         extensionMap[Glib::ustring(_("All Inkscape Files"))] = NULL;
         add_filter(allInkscapeFilter);
 
@@ -854,29 +823,16 @@ void FileOpenDialogImplGtk::createFilterMenu()
 
             Glib::ustring uname(_(imod->get_filetypename()));
 
-#if WITH_GTKMM_3_0
-            Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
+            auto filter = Gtk::FileFilter::create();
             filter->set_name(uname);
             filter->add_pattern(upattern);
-#else
-            Gtk::FileFilter filter;
-            filter.set_name(uname);
-            filter.add_pattern(upattern);
-#endif
-
             add_filter(filter);
             extensionMap[uname] = imod;
 
 // g_message("ext %s:%s '%s'\n", ioext->name, ioext->mimetype, upattern.c_str());
-#if WITH_GTKMM_3_0
             allInkscapeFilter->add_pattern(upattern);
             if (strncmp("image", imod->get_mimetype(), 5) == 0)
                 allImageFilter->add_pattern(upattern);
-#else
-            allInkscapeFilter.add_pattern(upattern);
-            if (strncmp("image", imod->get_mimetype(), 5) == 0)
-                allImageFilter.add_pattern(upattern);
-#endif
 
             // uncomment this to find out all mime types supported by Inkscape import/open
             // g_print ("%s\n", imod->get_mimetype());
@@ -896,17 +852,9 @@ void FileOpenDialogImplGtk::createFilterMenu()
                 strncmp("image/x-tga", imod->get_mimetype(), 11) == 0 ||
                 strncmp("image/x-pcx", imod->get_mimetype(), 11) == 0)
             {
-#if WITH_GTKMM_3_0
                 allBitmapFilter->add_pattern(upattern);
-#else
-                allBitmapFilter.add_pattern(upattern);
-#endif
              } else {
-#if WITH_GTKMM_3_0
                 allVectorFilter->add_pattern(upattern);
-#else
-                allVectorFilter.add_pattern(upattern);
-#endif
             }
         }
     }
@@ -972,18 +920,13 @@ Glib::ustring FileOpenDialogImplGtk::getFilename(void)
  */
 std::vector<Glib::ustring> FileOpenDialogImplGtk::getFilenames()
 {
-#if WITH_GTKMM_3_0
-    std::vector<std::string> result_tmp = get_filenames();
+    auto result_tmp = get_filenames();
 
     // Copy filenames to a vector of type Glib::ustring
     std::vector<Glib::ustring> result;
 
-    for (std::vector<std::string>::iterator it = result_tmp.begin(); it != result_tmp.end(); ++it)
-        result.push_back(*it);
-
-#else
-    std::vector<Glib::ustring> result = get_filenames();
-#endif
+    for (auto it : result_tmp)
+        result.push_back(it);
 
 #ifdef WITH_GNOME_VFS
     if (result.empty() && gnome_vfs_initialized())
@@ -1170,13 +1113,8 @@ void FileSaveDialogImplGtk::fileTypeChangedCallback()
     // g_message("selected: %s\n", type.name.c_str());
 
     extension = type.extension;
-#if WITH_GTKMM_3_0
-    Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
+    auto filter = Gtk::FileFilter::create();
     filter->add_pattern(type.pattern);
-#else
-    Gtk::FileFilter filter;
-    filter.add_pattern(type.pattern);
-#endif
     set_filter(filter);
 
     updateNameAndExtension();