diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-06-20 20:11:06 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-08 21:04:15 +0000 |
| commit | 009803005385d599007adcee3c4eda25f84b327d (patch) | |
| tree | f10d93c8b0e00cf144e0df62368648b8333e3b67 | |
| parent | Improvements to temming allow diferent on dark themes (diff) | |
| download | inkscape-009803005385d599007adcee3c4eda25f84b327d.tar.gz inkscape-009803005385d599007adcee3c4eda25f84b327d.zip | |
Fix coding style
| -rw-r--r-- | clang_format_diff | 36 | ||||
| -rw-r--r-- | src/object/sp-style-elem.cpp | 6 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 5 |
3 files changed, 41 insertions, 6 deletions
diff --git a/clang_format_diff b/clang_format_diff new file mode 100644 index 000000000..4d99eca83 --- /dev/null +++ b/clang_format_diff @@ -0,0 +1,36 @@ +--- src/ui/dialog/inkscape-preferences.cpp (before formatting) ++++ src/ui/dialog/inkscape-preferences.cpp (after formatting) +@@ -781,11 +781,10 @@ + try { + INKSCAPE.colorizeprovider->load_from_data(css_str); + } catch (const Gtk::CssProviderError &ex) { +- g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), +- ex.what().c_str()); ++ g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str()); + } + Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider, +- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + } + + void InkscapePreferences::toggleSymbolic() +--- src/object/sp-style-elem.cpp (before formatting) ++++ src/object/sp-style-elem.cpp (after formatting) +@@ -203,14 +203,14 @@ + CRStatus const parse_status = + cr_parser_parse_file (parser, reinterpret_cast<const guchar *>(import_file.c_str()), CR_UTF_8); + if (parse_status == CR_OK) { +- if(!document->getStyleSheet()) { ++ if (!document->getStyleSheet()) { + // if the style is the first style sheet that we've seen, set the document's + // first style sheet to this style and create a cascade object with it. + document->setStyleSheet(stylesheet); +- cr_cascade_set_sheet (document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR); ++ cr_cascade_set_sheet(document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR); + } else { + // If not the first, then chain up this style_sheet +- cr_stylesheet_append_import (document->getStyleSheet(), stylesheet); ++ cr_stylesheet_append_import(document->getStyleSheet(), stylesheet); + } + } else { + std::cerr << "import_style_cb: Could not parse: " << import_file << std::endl; diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp index dc9712938..3b93ff190 100644 --- a/src/object/sp-style-elem.cpp +++ b/src/object/sp-style-elem.cpp @@ -203,14 +203,14 @@ import_style_cb (CRDocHandler *a_handler, CRStatus const parse_status = cr_parser_parse_file (parser, reinterpret_cast<const guchar *>(import_file.c_str()), CR_UTF_8); if (parse_status == CR_OK) { - if(!document->getStyleSheet()) { + if (!document->getStyleSheet()) { // if the style is the first style sheet that we've seen, set the document's // first style sheet to this style and create a cascade object with it. document->setStyleSheet(stylesheet); - cr_cascade_set_sheet (document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR); + cr_cascade_set_sheet(document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR); } else { // If not the first, then chain up this style_sheet - cr_stylesheet_append_import (document->getStyleSheet(), stylesheet); + cr_stylesheet_append_import(document->getStyleSheet(), stylesheet); } } else { std::cerr << "import_style_cb: Could not parse: " << import_file << std::endl; diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 50edd7622..63efd790b 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -781,11 +781,10 @@ void InkscapePreferences::changeIconsColors() try { INKSCAPE.colorizeprovider->load_from_data(css_str); } catch (const Gtk::CssProviderError &ex) { - g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), - ex.what().c_str()); + g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str()); } Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider, - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } void InkscapePreferences::toggleSymbolic() |