From 5be9ff7b6715a661e85f99b108f96340de7ef435 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 1 Jan 2016 11:50:53 -0200 Subject: Update copyright to 2016 in headers --- platform/haiku/audio_driver_media_kit.cpp | 2 +- platform/haiku/audio_driver_media_kit.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/haiku') diff --git a/platform/haiku/audio_driver_media_kit.cpp b/platform/haiku/audio_driver_media_kit.cpp index 3fabe4f96f..96fd868a81 100644 --- a/platform/haiku/audio_driver_media_kit.cpp +++ b/platform/haiku/audio_driver_media_kit.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/haiku/audio_driver_media_kit.h b/platform/haiku/audio_driver_media_kit.h index a23ec447f1..cdaf602831 100644 --- a/platform/haiku/audio_driver_media_kit.h +++ b/platform/haiku/audio_driver_media_kit.h @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ -- cgit v1.2.3 From cabf9234849508ba7285d1a5bafd3bab692eb80f Mon Sep 17 00:00:00 2001 From: Emmanuel Leblond Date: Mon, 4 Jan 2016 11:46:16 +0100 Subject: Remove unnecessary null pointer checks --- platform/haiku/audio_driver_media_kit.cpp | 3 +-- platform/haiku/haiku_direct_window.cpp | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'platform/haiku') diff --git a/platform/haiku/audio_driver_media_kit.cpp b/platform/haiku/audio_driver_media_kit.cpp index 96fd868a81..c7eed1c7cd 100644 --- a/platform/haiku/audio_driver_media_kit.cpp +++ b/platform/haiku/audio_driver_media_kit.cpp @@ -118,8 +118,7 @@ void AudioDriverMediaKit::unlock() { } void AudioDriverMediaKit::finish() { - if (player) - delete player; + delete player; if (samples_in) { memdelete_arr(samples_in); diff --git a/platform/haiku/haiku_direct_window.cpp b/platform/haiku/haiku_direct_window.cpp index 3914ee272a..184d64f840 100644 --- a/platform/haiku/haiku_direct_window.cpp +++ b/platform/haiku/haiku_direct_window.cpp @@ -16,9 +16,7 @@ HaikuDirectWindow::HaikuDirectWindow(BRect p_frame) HaikuDirectWindow::~HaikuDirectWindow() { - if (update_runner) { - delete update_runner; - } + delete update_runner; } void HaikuDirectWindow::SetHaikuGLView(HaikuGLView* p_view) { -- cgit v1.2.3