Revision: 6230
Author: nogu.dev
Date: Fri Mar 5 06:45:30 2010
Log: * xim/canddisp.cpp
* xim/compose.cpp
* xim/connection.cpp
* xim/convdisp.cpp
* xim/helper.cpp
* xim/locale.cpp
* xim/main.cpp
* xim/util.cpp
* xim/util.h
* xim/xim.h
* xim/ximic.cpp
* xim/ximim.cpp
* xim/ximpacket.cpp
* xim/ximserver.cpp
* xim/ximtrans.cpp
- Don't include header files such as <stdio.h>, <stdlib.h> and <string.h>.
They are deprecated in C++ (ISO/IEC 14882:2003).
http://code.google.com/p/uim/source/detail?r=6230
Modified:
/trunk/xim/canddisp.cpp
/trunk/xim/compose.cpp
/trunk/xim/connection.cpp
/trunk/xim/convdisp.cpp
/trunk/xim/helper.cpp
/trunk/xim/locale.cpp
/trunk/xim/main.cpp
/trunk/xim/util.cpp
/trunk/xim/util.h
/trunk/xim/xim.h
/trunk/xim/ximic.cpp
/trunk/xim/ximim.cpp
/trunk/xim/ximpacket.cpp
/trunk/xim/ximserver.cpp
/trunk/xim/ximtrans.cpp
=======================================
--- /trunk/xim/canddisp.cpp Sat Sep 26 11:30:24 2009
+++ /trunk/xim/canddisp.cpp Fri Mar 5 06:45:30 2010
@@ -34,12 +34,12 @@
# include <config.h>
#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "uim/uim.h"
#include "uim/uim-util.h"
=======================================
--- /trunk/xim/compose.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/compose.cpp Fri Mar 5 06:45:30 2010
@@ -32,15 +32,15 @@
#include <config.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cerrno>
+#include <clocale>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iconv.h>
#include <sys/stat.h>
#include <sys/param.h>
-#include <locale.h>
-#include <iconv.h>
-#include <errno.h>
#include <X11/keysym.h>
#include <X11/Xlib.h>
=======================================
--- /trunk/xim/connection.cpp Wed Jun 24 00:12:20 2009
+++ /trunk/xim/connection.cpp Fri Mar 5 06:45:30 2010
@@ -36,13 +36,14 @@
# include <config.h>
#endif
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
#include "connection.h"
+
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
#include <list>
#include <map>
+#include <unistd.h>
#include <X11/Xatom.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
=======================================
--- /trunk/xim/convdisp.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/convdisp.cpp Fri Mar 5 06:45:30 2010
@@ -42,8 +42,8 @@
#if HAVE_XFT_UTF8_STRING
#include <X11/Xft/Xft.h>
#endif
-#include <stdlib.h>
-#include <locale.h>
+#include <clocale>
+#include <cstdlib>
#include "xim.h"
#include "ximserver.h"
#include "convdisp.h"
=======================================
--- /trunk/xim/helper.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/helper.cpp Fri Mar 5 06:45:30 2010
@@ -36,9 +36,9 @@
# include <config.h>
#endif
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <unistd.h>
#include <sys/types.h>
=======================================
--- /trunk/xim/locale.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/locale.cpp Fri Mar 5 06:45:30 2010
@@ -36,11 +36,11 @@
# include <config.h>
#endif
-#include <stdio.h>
-#include <string.h>
-#include <locale.h>
+#include <cerrno>
+#include <clocale>
+#include <cstdio>
+#include <cstring>
#include <iconv.h>
-#include <errno.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "ximserver.h"
=======================================
--- /trunk/xim/main.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/main.cpp Fri Mar 5 06:45:30 2010
@@ -37,11 +37,11 @@
# include <config.h>
#endif
-#include <stdio.h>
-#include <string.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <signal.h>
+#include <clocale>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <sys/select.h>
#include "xim.h"
=======================================
--- /trunk/xim/util.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/util.cpp Fri Mar 5 06:45:30 2010
@@ -36,12 +36,12 @@
# include <config.h>
#endif
-#include <stdio.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <unistd.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <string.h>
#include "util.h"
=======================================
--- /trunk/xim/util.h Tue Jan 20 18:11:15 2009
+++ /trunk/xim/util.h Fri Mar 5 06:45:30 2010
@@ -51,7 +51,7 @@
#endif
#ifndef HAVE_VASPRINTF
-#include <stdarg.h>
+#include <cstdarg>
int vasprintf(char **ptr, const char *fmt, va_list ap);
#endif
=======================================
--- /trunk/xim/xim.h Tue Jan 20 18:11:15 2009
+++ /trunk/xim/xim.h Fri Mar 5 06:45:30 2010
@@ -38,8 +38,8 @@
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/Xos.h>
+#include <cstdio>
#include <list>
-#include <stdio.h>
#include "ximserver.h"
#include "ximpn.h"
#include "compose.h"
=======================================
--- /trunk/xim/ximic.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/ximic.cpp Fri Mar 5 06:45:30 2010
@@ -37,10 +37,10 @@
# include <config.h>
#endif
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include "xim.h"
#include "convdisp.h"
=======================================
--- /trunk/xim/ximim.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/ximim.cpp Fri Mar 5 06:45:30 2010
@@ -36,9 +36,9 @@
# include <config.h>
#endif
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <map>
#include "xim.h"
=======================================
--- /trunk/xim/ximpacket.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/ximpacket.cpp Fri Mar 5 06:45:30 2010
@@ -34,10 +34,10 @@
# include <config.h>
#endif
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <list>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
#include "xim.h"
#include "util.h"
=======================================
--- /trunk/xim/ximserver.cpp Sat Feb 14 22:22:13 2009
+++ /trunk/xim/ximserver.cpp Fri Mar 5 06:45:30 2010
@@ -36,9 +36,9 @@
#define UIM_XIM_USE_JAPANESE_KANA_KEYBOARD_HACK 1
-#include <stdio.h>
-#include <ctype.h>
-#include <locale.h>
+#include <cctype>
+#include <clocale>
+#include <cstdio>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
=======================================
--- /trunk/xim/ximtrans.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/xim/ximtrans.cpp Fri Mar 5 06:45:30 2010
@@ -36,8 +36,8 @@
# include <config.h>
#endif
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <X11/Xos.h>
#include "xim.h"
#include "util.h"
