Change naming conventions of methods to comply with vala naming conve…

…ntions
GijsGoudzwaard · Aug 23, 2024 · 6cfacdc · 6cfacdc
1 parent 1f2972a
commit 6cfacdc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/Application.vala b/src/Application.vala
@@ -33,8 +33,8 @@ class Application : Granite.Application {
       foreach (File file in files) {
         var uri = file.get_path ().replace ("%20", " ").replace ("file://", "");
 
-        var name = Image.getFileName (uri);
-        var type = Image.getFileType (file.get_basename ());
+        var name = Image.get_file_name (uri);
+        var type = Image.get_file_type (file.get_basename ());
 
         if (Image.is_valid (type.down ())) {
           this.images += new Image (uri, name, type.down ());

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -191,8 +191,8 @@ public class MainWindow : Gtk.Window {
     foreach (string uri in data.get_uris ()) {
       uri = uri.replace ("%20", " "). replace ("file://", "");
 
-      var name = Image.getFileName (uri);
-      var type = Image.getFileType (name);
+      var name = Image.get_file_name (uri);
+      var type = Image.get_file_type (name);
 
       if (Image.is_valid (type.down ())) {
         this.images += new Image (uri, name, type.down ());
@@ -227,8 +227,8 @@ public class MainWindow : Gtk.Window {
 
     if (file_chooser.run () == Gtk.ResponseType.ACCEPT) {
       foreach (string uri in file_chooser.get_filenames ()) {
-        var name = Image.getFileName (uri);
-        var type = Image.getFileType (name);
+        var name = Image.get_file_name (uri);
+        var type = Image.get_file_type (name);
 
         if (Image.is_valid (type.down ())) {
           this.images += new Image (uri, name, type.down ());

diff --git a/src/Utils/Image.vala b/src/Utils/Image.vala
@@ -68,7 +68,7 @@ public class Image {
    * @param  string path
    * @return string
    */
-  public static string getFileName (string path) {
+  public static string get_file_name (string path) {
     var array = path.split ("/");
 
     return array[array.length - 1];
@@ -80,7 +80,7 @@ public class Image {
    * @param  string name
    * @return string
    */
-  public static string getFileType (string name) {
+  public static string get_file_type (string name) {
     var array = name.split (".");
 
     return array[array.length - 1];

diff --git a/src/Utils/JpegOptim.vala b/src/Utils/JpegOptim.vala
@@ -35,7 +35,7 @@ public class JpegOptim {
    *
    * @return void
    */
-  public void addImage (string image) {
+  public void add_image (string image) {
     this.images += image;
   }
 

diff --git a/src/Utils/OptiPng.vala b/src/Utils/OptiPng.vala
@@ -35,7 +35,7 @@ public class OptiPng {
    *
    * @return void
    */
-  public void addImage (string image) {
+  public void add_image (string image) {
     this.images += image;
   }
 

diff --git a/src/Utils/Optimizer.vala b/src/Utils/Optimizer.vala
@@ -27,9 +27,9 @@ public class Optimizer {
 
     foreach (var image in this.images) {
       if (Utils.in_array ({"jpg", "jpeg"}, image.type)) {
-        jpegoptim.addImage (image.path);
+        jpegoptim.add_image (image.path);
       } else if (Utils.in_array ({"png", "bmp"}, image.type)) {
-        optipng.addImage (image.path);
+        optipng.add_image (image.path);
       }
     }