Minor changes to some #include header files

src/app/app.cpp

@@ -74,12 +74,6 @@
 #include "ui/ui.h"
 
 #include <iostream>
-#include <memory>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 
 namespace app {
 

src/app/commands/filters/cmd_convolution_matrix.cpp

@@ -35,7 +35,7 @@
 #include "ui/widget.h"
 #include "ui/window.h"
 
-#include <string.h>
+#include <cstring>
 
 namespace app {
 

src/app/commands/filters/filter_worker.cpp

@@ -9,9 +9,6 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "app/app.h"
 #include "app/commands/filters/filter_manager_impl.h"
 #include "app/console.h"
@@ -26,6 +23,9 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
+#include <cstdlib>
+#include <cstring>
+
 namespace app {
 
 using namespace base;

src/app/file/fli/fli.cpp

@@ -19,12 +19,14 @@
 
 /* Modified by David Capello to use with Aseprite (2001-2012). */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "fli.h"
 
+using namespace std;
+
 /*
  * To avoid endian-problems I wrote these functions:
  */

src/app/ui/app_menuitem.cpp

@@ -22,9 +22,9 @@
 #include "ui/preferred_size_event.h"
 #include "ui/widget.h"
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
 
 namespace app {
 

src/app/util/boundary.cpp

@@ -13,16 +13,16 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 //////////////////////////////////////////////////////////////////////
 // For Aseprite
-#include <limits.h>
+#include "app/util/boundary.h"
 #include "base/memory.h"
 #include "doc/image.h"
 #include "doc/image_bits.h"
-#include "app/util/boundary.h"
+#include <climits>
 
 #define g_new(struct_type, n_structs) \
   ((struct_type*)base_malloc(sizeof(struct_type) * (n_structs)))

src/app/util/filetoks.cpp

@@ -9,8 +9,8 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 static int line_num;
 

src/base/chrono_unix.h

@@ -1,10 +1,10 @@
 // Aseprite Base Library
-// Copyright (c) 2001-2013 David Capello
+// Copyright (c) 2001-2013, 2015 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
 
-#include <time.h>
+#include <ctime>
 #include <sys/time.h>
 
 class base::Chrono::ChronoImpl {

src/doc/layer.cpp

@@ -17,7 +17,7 @@
 #include "doc/sprite.h"
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 
 namespace doc {
 

src/doc/path.cpp

@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2014 David Capello
+// Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -10,14 +10,14 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
 #include "doc/blend.h"
 #include "doc/image.h"
 #include "doc/path.h"
 
 #include "libart_lgpl/libart.h"
 
+#include <cstring>
+
 namespace doc {
 
 static int path_get_element(Path* path, double x, double y);

src/gfx/region.cpp

@@ -10,15 +10,13 @@
 
 #include <pixman.h>
 
-#include "gfx/region.h"
 #include "gfx/point.h"
-#include <limits>
-#include <cassert>
+#include "gfx/region.h"
 
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 namespace gfx {
 

src/ui/grid.cpp

@@ -8,10 +8,6 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "base/memory.h"
 #include "gfx/size.h"
 #include "ui/grid.h"
@@ -21,6 +17,10 @@
 #include "ui/theme.h"
 #include "ui/widget.h"
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 namespace ui {
 
 using namespace gfx;