1 files changed, 8 insertions, 8 deletions
diff --git a/fluid/panels/template_panel.cxx b/fluid/panels/template_panel.cxx
index 11227a549..7c2a9ac2b 100644
--- a/fluid/panels/template_panel.cxx
+++ b/fluid/panels/template_panel.cxx
@@ -17,7 +17,7 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.0500
 
 #include "template_panel.h"
-#include "app/fluid.h"
+#include "Fluid.h"
 #include "tools/filename.h"
 #include <FL/Fl_Shared_Image.H>
 #include <FL/fl_ask.H>
@@ -84,7 +84,7 @@ static void cb_template_browser(Fl_Browser*, void*) {
   char pngfile[1024], *ext;
 
   strlcpy(pngfile, flfile, sizeof(pngfile));
-  if ((ext = strrchr(pngfile, '.')) == NULL) return;
+  if ((ext = strrchr(pngfile, '.')) == nullptr) return;
   strcpy(ext, ".png");
 
   img = Fl_Shared_Image::get(pngfile);
@@ -183,7 +183,7 @@ void template_clear() {
   void *filename;
 
   for (i = 1; i <= template_browser->size(); i ++) {
-    if ((filename = template_browser->data(i)) != NULL) free(filename);
+    if ((filename = template_browser->data(i)) != nullptr) free(filename);
   }
 
   template_browser->deselect();
@@ -208,7 +208,7 @@ void template_delete_cb(Fl_Button *, void *) {
 
   char pngfile[1024], *ext;
   strlcpy(pngfile, flfile, sizeof(pngfile));
-  if ((ext = strrchr(pngfile, '.')) != NULL) {
+  if ((ext = strrchr(pngfile, '.')) != nullptr) {
     strcpy(ext, ".png");
     fl_unlink(pngfile);
   }
@@ -284,12 +284,12 @@ void template_load() {
   struct dirent **files;
   int num_files;
 
-  fluid_prefs.getUserdataPath(path, sizeof(path));
+  Fluid.preferences.getUserdataPath(path, sizeof(path));
   strlcat(path, "templates", sizeof(path));
   fl_make_path(path);
 
   int sample_templates_generated = 0;
-  fluid_prefs.get("sample_templates_generated", sample_templates_generated, 0);
+  Fluid.preferences.get("sample_templates_generated", sample_templates_generated, 0);
 
   if (sample_templates_generated < 2) {
     strcpy(filename, path);
@@ -311,8 +311,8 @@ void template_load() {
     template_install(path, "/FLTK_License.fl", tmpl_FLTK_License_fl, sizeof(tmpl_FLTK_License_fl), tmpl_FLTK_License_fl_size);
     template_install(path, "/1of7GUIs.fl", tmpl_1of7GUIs_fl, sizeof(tmpl_1of7GUIs_fl), tmpl_1of7GUIs_fl_size);
     sample_templates_generated = 2;
-    fluid_prefs.set("sample_templates_generated", sample_templates_generated);
-    fluid_prefs.flush();
+    Fluid.preferences.set("sample_templates_generated", sample_templates_generated);
+    Fluid.preferences.flush();
   }
 
   num_files = fl_filename_list(path, &files);