run through astyle

rtgui/editorpanel.cc

@@ -90,6 +90,7 @@ bool find_default_monitor_profile(GdkWindow *rootwin, Glib::ustring &defprof, Gl
                 if (pos != Glib::ustring::npos) {
                     defprofname = defprofname.substr (0, pos);
                 }
+
                 defprof = Glib::ustring ("file:") + defprof;
                 return true;
             }
@@ -99,6 +100,7 @@ bool find_default_monitor_profile(GdkWindow *rootwin, Glib::ustring &defprof, Gl
 
         ReleaseDC (NULL, hDC);
     }
+
 #elif !defined(__APPLE__)
     // taken from geeqie (image.c) and adapted
     // Originally licensed as GPL v2+, with the following copyright:
@@ -109,24 +111,31 @@ bool find_default_monitor_profile(GdkWindow *rootwin, Glib::ustring &defprof, Gl
     gint proflen;
     GdkAtom type = GDK_NONE;
     gint format = 0;
+
     if (gdk_property_get (rootwin, gdk_atom_intern ("_ICC_PROFILE", FALSE), GDK_NONE, 0, 64 * 1024 * 1024, FALSE, &type, &format, &proflen, &prof) && proflen > 0) {
         cmsHPROFILE p = cmsOpenProfileFromMem (prof, proflen);
+
         if (p) {
             defprofname = "from GDK";
             defprof = Glib::build_filename (Options::rtdir, "GDK_ICC_PROFILE.icc");
+
             if (cmsSaveProfileToFile (p, defprof.c_str())) {
                 cmsCloseProfile (p);
+
                 if (prof) {
                     g_free (prof);
                 }
+
                 defprof = Glib::ustring ("file:") + defprof;
                 return true;
             }
         }
     }
+
     if (prof) {
         g_free (prof);
     }
+
 #endif
     return false;
 }
@@ -158,8 +167,10 @@ private:
 
         profileBox.append (M ("PREFERENCES_PROFILE_NONE"));
         Glib::ustring defprofname;
+
         if (find_default_monitor_profile (profileBox.get_root_window()->gobj(), defprof, defprofname)) {
             profileBox.append (M ("MONITOR_PROFILE_SYSTEM") + " (" + defprofname + ")");
+
             if (options.rtSettings.autoMonitorProfile) {
                 rtengine::ICCStore::getInstance()->setDefaultMonitorProfileName (defprof);
                 profileBox.set_active (1);
@@ -169,10 +180,13 @@ private:
         } else {
             profileBox.set_active (0);
         }
+
         const std::vector<Glib::ustring> profiles = rtengine::ICCStore::getInstance()->getProfiles (rtengine::ICCStore::ProfileType::MONITOR);
+
         for (const auto profile : profiles) {
             profileBox.append (profile);
         }
+
         profileBox.set_tooltip_text (profileBox.get_active_text ());
     }
 #endif
@@ -244,22 +258,27 @@ private:
         Glib::ustring profile;
 
 #if !defined(__APPLE__) // monitor profile not supported on apple
+
         if (!defprof.empty() && profileBox.get_active_row_number () == 1) {
             profile = defprof;
+
             if (profile.empty ()) {
                 profile = options.rtSettings.monitorProfile;
             }
+
             if (profile.empty ()) {
                 profile = "sRGB IEC61966-2.1";
             }
         } else if (profileBox.get_active_row_number () > 0) {
             profile = profileBox.get_active_text ();
         }
+
 #else
         profile = "RT_sRGB";
 #endif
 
 #if !defined(__APPLE__) // monitor profile not supported on apple
+
         if (profileBox.get_active_row_number () == 0) {
 
             profile.clear ();
@@ -296,8 +315,10 @@ private:
 
             profileBox.set_tooltip_text (profileBox.get_active_text ());
         }
+
 #endif
         rtengine::RenderingIntent intent;
+
         switch (intentBox.getSelected ()) {
             default:
             case 0:
@@ -320,8 +341,10 @@ private:
         if (!noEvent) {
             processor->beginUpdateParams ();
         }
+
         processor->setMonitorProfile (profile, intent);
         processor->setSoftProofing (softProof.get_sensitive() && softProof.get_active(), spGamutCheck.get_sensitive() && spGamutCheck.get_active());
+
         if (!noEvent) {
             processor->endUpdateParams (rtengine::EvMonitorTransform);
         }
@@ -338,22 +361,29 @@ private:
             softProof.set_sensitive (profileBox.get_active_row_number () > 0);
 #endif
         }
+
         spGamutCheck.set_sensitive (softProof.get_sensitive() && softProof.get_active());
 
 #if !defined(__APPLE__) // monitor profile not supported on apple
+
         if (profileBox.get_active_row_number () > 0) {
 #endif
+
             if (processor) {
                 if (!noEvent) {
                     processor->beginUpdateParams ();
                 }
+
                 processor->setSoftProofing (softProof.get_sensitive() && softProof.get_active(), spGamutCheck.get_sensitive() && spGamutCheck.get_active());
+
                 if (!noEvent) {
                     processor->endUpdateParams (rtengine::EvMonitorTransform);
                 }
             }
+
 #if !defined(__APPLE__) // monitor profile not supported on apple
         }
+
 #endif
     }
 
@@ -413,6 +443,7 @@ public:
         } else {
             setActiveTextOrIndex (profileBox, options.rtSettings.monitorProfile, 0);
         }
+
 #endif
 
         switch (options.rtSettings.monitorIntent) {
@@ -680,6 +711,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     iops->attach_next_to (*vsep2, Gtk::POS_LEFT, 1, 1);
     iops->attach_next_to (*progressLabel, Gtk::POS_LEFT, 1, 1);
     iops->attach_next_to (*vsep1, Gtk::POS_LEFT, 1, 1);
+
     if (!gimpPlugin) {
         iops->attach_next_to (*sendtogimp, Gtk::POS_LEFT, 1, 1);
     }
@@ -1123,7 +1155,8 @@ void EditorPanel::setProgressState (bool inProcessing)
     const auto func = [] (gpointer data) -> gboolean {
         spsparams* const p = static_cast<spsparams*> (data);
 
-        if (p->epih->destroyed) {
+        if (p->epih->destroyed)
+        {
             if (p->epih->pending == 1) {
                 delete p->epih;
             } else {
@@ -1246,7 +1279,8 @@ void EditorPanel::error (Glib::ustring title, Glib::ustring descr)
     const auto func = [] (gpointer data) -> gboolean {
         errparams* const p = static_cast<errparams*> (data);
 
-        if (p->epih->destroyed) {
+        if (p->epih->destroyed)
+        {
             if (p->epih->pending == 1) {
                 delete p->epih;
             } else {
@@ -1594,6 +1628,7 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event)
                     if (!gimpPlugin) {
                         saveAsPressed();
                     }
+
                     return true;
 
                 case GDK_KEY_b:
@@ -1607,6 +1642,7 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event)
                     if (!gimpPlugin) {
                         sendToGimpPressed();
                     }
+
                     return true;
 
                 case GDK_KEY_z:
@@ -1707,8 +1743,9 @@ bool EditorPanel::idle_saveImage (ProgressConnector<rtengine::IImage16*> *pc, Gl
         else if (sf.format == "jpg")
             ld->startFunc (sigc::bind (sigc::mem_fun (img, &rtengine::IImage16::saveAsJPEG), fname, sf.jpegQuality, sf.jpegSubSamp),
                            sigc::bind (sigc::mem_fun (*this, &EditorPanel::idle_imageSaved), ld, img, fname, sf));
-        else
+        else {
             delete ld;
+        }
     } else {
         Glib::ustring msg_ = Glib::ustring ("<b>") + fname + ": Error during image processing\n</b>";
         Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
@@ -1915,6 +1952,7 @@ bool EditorPanel::saveImmediately(const Glib::ustring &filename, const SaveForma
     rtengine::IImage16 *img = rtengine::processImage (job, err, nullptr, options.tunnelMetaData, false);
 
     int err = 0;
+
     if (sf.format == "tif") {
         err = img->saveAsTIFF (filename, sf.tiffBits, sf.tiffUncompressed);
     } else if (sf.format == "png") {
@@ -1924,6 +1962,7 @@ bool EditorPanel::saveImmediately(const Glib::ustring &filename, const SaveForma
     } else {
         err = 1;
     }
+
     img->free();
     return !err;
 }

rtgui/options.cc

@@ -1435,6 +1435,7 @@ int Options::readFromFile (Glib::ustring fname)
                 if (keyFile.has_key ("GUI", "ToolPanelsExpanded")) {
                     tpOpen = keyFile.get_integer_list ("GUI", "ToolPanelsExpanded");
                 }
+
                 if (keyFile.has_key ("GUI", "ToolPanelsExpandedAutoSave")) {
                     autoSaveTpOpen = keyFile.get_boolean ("GUI", "ToolPanelsExpandedAutoSave");
                 }

rtgui/options.h

@@ -42,8 +42,7 @@
 // Special name for the Dynamic profile
 #define DEFPROFILE_DYNAMIC  "Dynamic"
 
-struct SaveFormat
+struct SaveFormat {
-{
     SaveFormat() :
         format ("jpg"),
         pngBits (8),

rtgui/preferences.cc

@@ -993,8 +993,7 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     workflowGrid->attach_next_to (*btnSaveTpOpenNow, *ckbAutoSaveTpOpen, Gtk::POS_RIGHT, 1, 1);
 
     auto save_tp_open_now =
-        [&]() -> void
+    [&]() -> void {
-        {
         parent->writeToolExpandedStatus (moptions.tpOpen);
     };
     btnSaveTpOpenNow->signal_clicked().connect (save_tp_open_now);

rtgui/rtwindow.cc

@@ -130,12 +130,14 @@ RTWindow::RTWindow ()
 
     Gdk::Rectangle lMonitorRect;
     get_screen()->get_monitor_geometry (std::min (options.windowMonitor, Gdk::Screen::get_default()->get_n_monitors() - 1), lMonitorRect);
+
     if (options.windowMaximized) {
         move (lMonitorRect.get_x(), lMonitorRect.get_y());
         maximize();
     } else {
         unmaximize();
         resize (options.windowWidth, options.windowHeight);
+
         if (options.windowX <= lMonitorRect.get_x() + lMonitorRect.get_width() && options.windowY <= lMonitorRect.get_y() + lMonitorRect.get_height()) {
             move (options.windowX, options.windowY);
         } else {
@@ -273,6 +275,7 @@ RTWindow::RTWindow ()
 
         if (!argv1.empty() && !remote) {
             Thumbnail* thm = cacheMgr->getEntry (argv1);
+
             if (thm) {
                 fpanel->fileCatalog->openRequested ({thm});
             }
@@ -316,6 +319,7 @@ void RTWindow::on_realize ()
     std::regex pat ("(^[0-9.]+).*");
     std::smatch sm;
     std::vector<std::string> vMajor;
+
     for (const auto &v : vs) {
         if (std::regex_match (v, sm, pat)) {
             if (sm.size() == 2) {
@@ -361,6 +365,7 @@ bool RTWindow::on_window_state_event(GdkEventWindowState* event)
     if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
         options.windowMaximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
     }
+
     return Gtk::Widget::on_window_state_event (event);
 }
 
@@ -717,9 +722,11 @@ void RTWindow::showPreferences ()
     delete pref;
 
     fpanel->optionsChanged ();
+
     if (epanel) {
         epanel->defaultMonitorProfileChanged (options.rtSettings.monitorProfile, options.rtSettings.autoMonitorProfile);
     }
+
     for (const auto &p : epanels) {
         p.second->defaultMonitorProfileChanged (options.rtSettings.monitorProfile, options.rtSettings.autoMonitorProfile);
     }
@@ -825,6 +832,7 @@ void RTWindow::updateProfiles(const Glib::ustring &printerProfile, rtengine::Ren
 void RTWindow::updateTPVScrollbar (bool hide)
 {
     fpanel->updateTPVScrollbar (hide);
+
     if (epanel) {
         epanel->updateTPVScrollbar (hide);
     }
@@ -837,6 +845,7 @@ void RTWindow::updateTPVScrollbar (bool hide)
 void RTWindow::updateTabsUsesIcons (bool useIcons)
 {
     fpanel->updateTabsUsesIcons (useIcons);
+
     if (epanel) {
         epanel->updateTabsUsesIcons (useIcons);
     }
@@ -861,6 +870,7 @@ void RTWindow::updateHistogramPosition (int oldPosition, int newPosition)
     if (epanel) {
         epanel->updateHistogramPosition (oldPosition, newPosition);
     }
+
     for (auto panel : epanels) {
         panel.second->updateHistogramPosition (oldPosition, newPosition);
     }

rtgui/toolpanelcoord.cc

@@ -315,6 +315,7 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
 
     if (isRaw) {
         rawPanelSW->set_sensitive (true);
+
         if (isBayer) {
             sensorxtrans->FoldableToolPanel::hide();
             sensorbayer->FoldableToolPanel::show();
@@ -363,6 +364,7 @@ void ToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const Glib::
     }
 
     int tr = TR_NONE;
+
     if (params->coarse.rotate == 90) {
         tr = TR_R90;
     } else if (params->coarse.rotate == 180) {
@@ -446,6 +448,7 @@ void ToolPanelCoordinator::profileChange  (const PartialProfile *nparams, rtengi
     delete mergedParams;
 
     tr = TR_NONE;
+
     if (params->coarse.rotate == 90) {
         tr = TR_R90;
     } else if (params->coarse.rotate == 180) {