diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-24 20:49:01 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-24 20:49:01 +0000 |
| commit | 73624b6e68013b718cee96dc8d3c628cb84431ba (patch) | |
| tree | 2cc60df3d4276714aa0eb4ba5340a8dddffdabc0 /nuttx/graphics/nxtk | |
| parent | e79139d4ea59a424356d0b6695a2ce841267817d (diff) | |
| download | px4-nuttx-73624b6e68013b718cee96dc8d3c628cb84431ba.tar.gz px4-nuttx-73624b6e68013b718cee96dc8d3c628cb84431ba.tar.bz2 px4-nuttx-73624b6e68013b718cee96dc8d3c628cb84431ba.zip | |
Move NX header files to include/nuttx/nx
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3816 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics/nxtk')
24 files changed, 47 insertions, 47 deletions
diff --git a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c index 69d1badf4..6a2063a26 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c @@ -42,8 +42,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c index e4670c6f7..a439f5f79 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c +++ b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c @@ -42,8 +42,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxtk.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxtk.h> +#include <nuttx/nx/nx.h> #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_closetoolbar.c b/nuttx/graphics/nxtk/nxtk_closetoolbar.c index eaaef83e7..dff621a44 100644 --- a/nuttx/graphics/nxtk/nxtk_closetoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_closetoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_closewindow.c b/nuttx/graphics/nxtk/nxtk_closewindow.c index edc9e457d..e921f669e 100644 --- a/nuttx/graphics/nxtk/nxtk_closewindow.c +++ b/nuttx/graphics/nxtk/nxtk_closewindow.c @@ -44,8 +44,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_containerclip.c b/nuttx/graphics/nxtk/nxtk_containerclip.c index 386425de3..3671851f1 100644 --- a/nuttx/graphics/nxtk/nxtk_containerclip.c +++ b/nuttx/graphics/nxtk/nxtk_containerclip.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_drawframe.c b/nuttx/graphics/nxtk/nxtk_drawframe.c index d86d55312..edf3dcac8 100644 --- a/nuttx/graphics/nxtk/nxtk_drawframe.c +++ b/nuttx/graphics/nxtk/nxtk_drawframe.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_drawframe.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,9 +43,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_events.c b/nuttx/graphics/nxtk/nxtk_events.c index cbcbabe4b..e778b2736 100644 --- a/nuttx/graphics/nxtk/nxtk_events.c +++ b/nuttx/graphics/nxtk/nxtk_events.c @@ -47,7 +47,7 @@ #include <errno.h> #include <assert.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxtk_internal.h" /**************************************************************************** diff --git a/nuttx/graphics/nxtk/nxtk_filltoolbar.c b/nuttx/graphics/nxtk/nxtk_filltoolbar.c index f151876ec..c39199e6a 100644 --- a/nuttx/graphics/nxtk/nxtk_filltoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_filltoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c b/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c index d3362fa6f..1f04e9b43 100644 --- a/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_filltrapwindow.c b/nuttx/graphics/nxtk/nxtk_filltrapwindow.c index a489364c4..c84c055f8 100644 --- a/nuttx/graphics/nxtk/nxtk_filltrapwindow.c +++ b/nuttx/graphics/nxtk/nxtk_filltrapwindow.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_fillwindow.c b/nuttx/graphics/nxtk/nxtk_fillwindow.c index fe0b1c8d4..e971ce06b 100644 --- a/nuttx/graphics/nxtk/nxtk_fillwindow.c +++ b/nuttx/graphics/nxtk/nxtk_fillwindow.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_getposition.c b/nuttx/graphics/nxtk/nxtk_getposition.c index 24ca26b70..e6cce6026 100644 --- a/nuttx/graphics/nxtk/nxtk_getposition.c +++ b/nuttx/graphics/nxtk/nxtk_getposition.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_internal.h b/nuttx/graphics/nxtk/nxtk_internal.h index fe7792476..f76304b78 100644 --- a/nuttx/graphics/nxtk/nxtk_internal.h +++ b/nuttx/graphics/nxtk/nxtk_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_internal.h * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <nuttx/config.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxtk.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxtk/nxtk_lower.c b/nuttx/graphics/nxtk/nxtk_lower.c index e0b59f285..256ed27da 100644 --- a/nuttx/graphics/nxtk/nxtk_lower.c +++ b/nuttx/graphics/nxtk/nxtk_lower.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_movetoolbar.c b/nuttx/graphics/nxtk/nxtk_movetoolbar.c index 430e5461e..088611382 100644 --- a/nuttx/graphics/nxtk/nxtk_movetoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_movetoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_movewindow.c b/nuttx/graphics/nxtk/nxtk_movewindow.c index 134d1935e..4c45c101c 100644 --- a/nuttx/graphics/nxtk/nxtk_movewindow.c +++ b/nuttx/graphics/nxtk/nxtk_movewindow.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_opentoolbar.c b/nuttx/graphics/nxtk/nxtk_opentoolbar.c index e2de68226..0bcc02fa8 100644 --- a/nuttx/graphics/nxtk/nxtk_opentoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_opentoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_openwindow.c b/nuttx/graphics/nxtk/nxtk_openwindow.c index c57918869..3716e63ca 100644 --- a/nuttx/graphics/nxtk/nxtk_openwindow.c +++ b/nuttx/graphics/nxtk/nxtk_openwindow.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_raise.c b/nuttx/graphics/nxtk/nxtk_raise.c index 33c22b722..1e35f3ab2 100644 --- a/nuttx/graphics/nxtk/nxtk_raise.c +++ b/nuttx/graphics/nxtk/nxtk_raise.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_setposition.c b/nuttx/graphics/nxtk/nxtk_setposition.c index 053f74256..dd090e639 100644 --- a/nuttx/graphics/nxtk/nxtk_setposition.c +++ b/nuttx/graphics/nxtk/nxtk_setposition.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_setsize.c b/nuttx/graphics/nxtk/nxtk_setsize.c index 07e9e0242..054a62c59 100644 --- a/nuttx/graphics/nxtk/nxtk_setsize.c +++ b/nuttx/graphics/nxtk/nxtk_setsize.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_setsubwindows.c b/nuttx/graphics/nxtk/nxtk_setsubwindows.c index 5ddb2ce03..251008361 100644 --- a/nuttx/graphics/nxtk/nxtk_setsubwindows.c +++ b/nuttx/graphics/nxtk/nxtk_setsubwindows.c @@ -44,7 +44,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxtk_internal.h" /**************************************************************************** diff --git a/nuttx/graphics/nxtk/nxtk_subwindowclip.c b/nuttx/graphics/nxtk/nxtk_subwindowclip.c index 7600074ce..4d453eeca 100644 --- a/nuttx/graphics/nxtk/nxtk_subwindowclip.c +++ b/nuttx/graphics/nxtk/nxtk_subwindowclip.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_subwindowmove.c b/nuttx/graphics/nxtk/nxtk_subwindowmove.c index f532c6675..ed6a264e7 100644 --- a/nuttx/graphics/nxtk/nxtk_subwindowmove.c +++ b/nuttx/graphics/nxtk/nxtk_subwindowmove.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" |