From: joncruz Date: Sun, 3 May 2009 05:16:27 +0000 (+0000) Subject: Warning cleanup X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b56e1eb7fd3d6845b1474fac556e96720f95ac2e;p=inkscape.git Warning cleanup --- diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp index 90220d296..d80782d20 100644 --- a/src/display/nr-filter-gaussian.cpp +++ b/src/display/nr-filter-gaussian.cpp @@ -585,13 +585,12 @@ int FilterGaussian::render(FilterSlot &slot, FilterUnits const &units) Geom::Matrix trans = units.get_matrix_primitiveunits2pb(); // Some common constants - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int const width_org = in->area.x1-in->area.x0, height_org = in->area.y1-in->area.y0; double const deviation_x_org = _deviation_x * trans.expansionX(); double const deviation_y_org = _deviation_y * trans.expansionY(); int const PC = NR_PIXBLOCK_BPP(in); #if HAVE_OPENMP - int const NTHREADS = std::max(1,std::min(8,prefs->getInt("/options/threading/numthreads",omp_get_num_procs()))); + int const NTHREADS = std::max(1,std::min(8, Inkscape::Preferences::get()->getInt("/options/threading/numthreads", omp_get_num_procs()))); #else int const NTHREADS = 1; #endif // HAVE_OPENMP diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 0dba9df8f..84cc45de9 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -120,8 +120,7 @@ static void update_pref(Glib::ustring const &pref_path, gchar const *pref_default) // , GSList *extension_family) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - Glib::ustring pref = prefs->getString(pref_path); + Glib::ustring pref = Inkscape::Preferences::get()->getString(pref_path); /* gboolean missing=TRUE; for (GSList *list = extension_family; list; list = g_slist_next(list)) { @@ -134,7 +133,7 @@ update_pref(Glib::ustring const &pref_path, } */ if (!Inkscape::Extension::db.get( pref.data() ) /*missing*/) { - prefs->setString(pref_path, pref_default); + Inkscape::Preferences::get()->setString(pref_path, pref_default); } } @@ -148,8 +147,6 @@ update_pref(Glib::ustring const &pref_path, void init() { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - /* TODO: Change to Internal */ Internal::Svg::init(); Internal::Svgz::init();