From b244f30480601ef701fb2cf612103e5a227e2f3d Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Thu, 12 Dec 2013 20:06:37 +0100 Subject: [PATCH] Moved the ctk files from core/lib into core/lib/ and core/lib/libconio --- apps/email/email.c | 2 +- apps/irc/irc.c | 2 +- apps/shell/gui-shell.c | 2 +- apps/webbrowser/www.c | 2 +- core/{lib => ctk}/ctk-filedialog.c | 2 +- core/{lib => ctk}/ctk-filedialog.h | 0 core/{lib => ctk}/ctk-textentry-checkbox.c | 0 core/{lib => ctk}/ctk-textentry-checkbox.h | 0 core/{lib => ctk}/ctk-textentry-cmdline.c | 2 +- core/{lib => ctk}/ctk-textentry-cmdline.h | 0 core/{lib => ctk}/ctk-textentry-multiline.c | 2 +- core/{lib => ctk}/ctk-textentry-multiline.h | 0 core/{lib => ctk/libconio}/libconio.c | 0 core/{lib => ctk/libconio}/libconio.h | 0 14 files changed, 7 insertions(+), 7 deletions(-) rename core/{lib => ctk}/ctk-filedialog.c (99%) rename core/{lib => ctk}/ctk-filedialog.h (100%) rename core/{lib => ctk}/ctk-textentry-checkbox.c (100%) rename core/{lib => ctk}/ctk-textentry-checkbox.h (100%) rename core/{lib => ctk}/ctk-textentry-cmdline.c (98%) rename core/{lib => ctk}/ctk-textentry-cmdline.h (100%) rename core/{lib => ctk}/ctk-textentry-multiline.c (98%) rename core/{lib => ctk}/ctk-textentry-multiline.h (100%) rename core/{lib => ctk/libconio}/libconio.c (100%) rename core/{lib => ctk/libconio}/libconio.h (100%) diff --git a/apps/email/email.c b/apps/email/email.c index ae74e4e1b..ddb21da01 100644 --- a/apps/email/email.c +++ b/apps/email/email.c @@ -38,7 +38,7 @@ #include "smtp.h" #include "lib/petsciiconv.h" -#include "lib/ctk-textentry-multiline.h" +#include "ctk/ctk-textentry-multiline.h" #include diff --git a/apps/irc/irc.c b/apps/irc/irc.c index 733426944..75cc9eccf 100644 --- a/apps/irc/irc.c +++ b/apps/irc/irc.c @@ -41,7 +41,7 @@ #include "ircc.h" #include "ctk/ctk.h" -#include "lib/ctk-textentry-cmdline.h" +#include "ctk/ctk-textentry-cmdline.h" #include "lib/petsciiconv.h" diff --git a/apps/shell/gui-shell.c b/apps/shell/gui-shell.c index 19e8a5b0d..5fe70db8d 100644 --- a/apps/shell/gui-shell.c +++ b/apps/shell/gui-shell.c @@ -36,7 +36,7 @@ #include "shell.h" -#include "lib/ctk-textentry-cmdline.h" +#include "ctk/ctk-textentry-cmdline.h" #include diff --git a/apps/webbrowser/www.c b/apps/webbrowser/www.c index 995038bd8..e8bd7effe 100644 --- a/apps/webbrowser/www.c +++ b/apps/webbrowser/www.c @@ -36,7 +36,7 @@ #include #include "ctk/ctk.h" -#include "lib/ctk-textentry-cmdline.h" +#include "ctk/ctk-textentry-cmdline.h" #include "contiki-net.h" #include "lib/petsciiconv.h" #include "sys/arg.h" diff --git a/core/lib/ctk-filedialog.c b/core/ctk/ctk-filedialog.c similarity index 99% rename from core/lib/ctk-filedialog.c rename to core/ctk/ctk-filedialog.c index cc88366a1..0bafcc4a8 100644 --- a/core/lib/ctk-filedialog.c +++ b/core/ctk/ctk-filedialog.c @@ -33,7 +33,7 @@ */ #include "contiki.h" -#include "lib/ctk-filedialog.h" +#include "ctk/ctk-filedialog.h" #include "ctk/ctk.h" #include "cfs/cfs.h" diff --git a/core/lib/ctk-filedialog.h b/core/ctk/ctk-filedialog.h similarity index 100% rename from core/lib/ctk-filedialog.h rename to core/ctk/ctk-filedialog.h diff --git a/core/lib/ctk-textentry-checkbox.c b/core/ctk/ctk-textentry-checkbox.c similarity index 100% rename from core/lib/ctk-textentry-checkbox.c rename to core/ctk/ctk-textentry-checkbox.c diff --git a/core/lib/ctk-textentry-checkbox.h b/core/ctk/ctk-textentry-checkbox.h similarity index 100% rename from core/lib/ctk-textentry-checkbox.h rename to core/ctk/ctk-textentry-checkbox.h diff --git a/core/lib/ctk-textentry-cmdline.c b/core/ctk/ctk-textentry-cmdline.c similarity index 98% rename from core/lib/ctk-textentry-cmdline.c rename to core/ctk/ctk-textentry-cmdline.c index 3f003ee71..7a18ff71b 100644 --- a/core/lib/ctk-textentry-cmdline.c +++ b/core/ctk/ctk-textentry-cmdline.c @@ -34,7 +34,7 @@ #include "ctk/ctk.h" -#include "lib/ctk-textentry-cmdline.h" +#include "ctk/ctk-textentry-cmdline.h" /*-----------------------------------------------------------------------------------*/ unsigned char diff --git a/core/lib/ctk-textentry-cmdline.h b/core/ctk/ctk-textentry-cmdline.h similarity index 100% rename from core/lib/ctk-textentry-cmdline.h rename to core/ctk/ctk-textentry-cmdline.h diff --git a/core/lib/ctk-textentry-multiline.c b/core/ctk/ctk-textentry-multiline.c similarity index 98% rename from core/lib/ctk-textentry-multiline.c rename to core/ctk/ctk-textentry-multiline.c index 970910f51..d84a22c62 100644 --- a/core/lib/ctk-textentry-multiline.c +++ b/core/ctk/ctk-textentry-multiline.c @@ -36,7 +36,7 @@ #include "ctk/ctk.h" -#include "lib/ctk-textentry-multiline.h" +#include "ctk/ctk-textentry-multiline.h" /*-----------------------------------------------------------------------------------*/ unsigned char diff --git a/core/lib/ctk-textentry-multiline.h b/core/ctk/ctk-textentry-multiline.h similarity index 100% rename from core/lib/ctk-textentry-multiline.h rename to core/ctk/ctk-textentry-multiline.h diff --git a/core/lib/libconio.c b/core/ctk/libconio/libconio.c similarity index 100% rename from core/lib/libconio.c rename to core/ctk/libconio/libconio.c diff --git a/core/lib/libconio.h b/core/ctk/libconio/libconio.h similarity index 100% rename from core/lib/libconio.h rename to core/ctk/libconio/libconio.h