Browse Source

Split lib/widget/widget.[ch] and lib/widget/wtools.[ch] files

...into small: one widget in one file.
Renamed most if WInput functions.
Minor optimization.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 14 years ago
parent
commit
71364f88c3

+ 2 - 1
lib/Makefile.am

@@ -8,7 +8,8 @@ SUBLIB_includes = \
 	search.h \
 	skin.h \
 	strescape.h \
-	strutil.h
+	strutil.h \
+	widget.h
 
 SRC_mc_utils = \
 	utilunix.c \

+ 1 - 1
lib/lock.c

@@ -56,7 +56,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/util.h"           /* tilde_expand() */
 #include "lib/lock.h"
-#include "lib/widget/wtools.h"         /* query_dialog() */
+#include "lib/widget.h"         /* query_dialog() */
 
 /*** global variables ****************************************************************************/
 

+ 1 - 1
lib/utilunix.c

@@ -55,7 +55,7 @@
 #include "lib/vfs/mc-vfs/vfs.h" /* VFS_ENCODING_PREFIX */
 #include "lib/strutil.h"        /* str_move() */
 #include "lib/util.h"
-#include "lib/widget/wtools.h"  /* message() */
+#include "lib/widget.h"         /* message() */
 
 #include "src/execute.h"
 #ifdef HAVE_CHARSET

+ 1 - 1
lib/vfs/mc-vfs/cpio.c

@@ -32,7 +32,7 @@
 #include "lib/global.h"
 #include "lib/unixcompat.h"
 #include "lib/util.h"
-#include "lib/widget/wtools.h"  /* message() */
+#include "lib/widget.h"         /* message() */
 
 #include "vfs-impl.h"
 #include "utilvfs.h"

+ 3 - 1
lib/vfs/mc-vfs/direntry.c

@@ -41,7 +41,9 @@
 
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
 #include "lib/util.h"           /* concat_dir_and_file */
-#include "lib/widget/wtools.h"  /* message() */
+#if 0
+#include "lib/widget.h"         /* message() */
+#endif
 
 #include "src/main.h"           /* print_vfs_message */
 

+ 1 - 1
lib/vfs/mc-vfs/extfs.c

@@ -49,7 +49,7 @@
 #include "lib/global.h"
 #include "lib/fileloc.h"
 #include "lib/util.h"
-#include "lib/widget/wtools.h"  /* message() */
+#include "lib/widget.h"         /* message() */
 
 #include "src/main.h"           /* shell */
 #include "src/execute.h"        /* For shell_execute */

+ 0 - 2
lib/vfs/mc-vfs/fish.c

@@ -57,12 +57,10 @@
 #include <stdint.h>             /* uintmax_t */
 
 #include "lib/global.h"
-#include "lib/fs.h"
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
 #include "lib/strescape.h"
 #include "lib/unixcompat.h"
 #include "lib/fileloc.h"
-#include "lib/widget/wtools.h"  /* message() */
 
 #include "src/main.h"           /* print_vfs_message */
 

+ 1 - 1
lib/vfs/mc-vfs/ftpfs.c

@@ -90,7 +90,7 @@ What to do with this?
 #include "lib/util.h"
 
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
-#include "lib/widget/wtools.h"  /* message() */
+#include "lib/widget.h"         /* message() */
 
 #include "src/main.h"           /* print_vfs_message */
 #include "src/history.h"

+ 1 - 1
lib/vfs/mc-vfs/sfs.c

@@ -43,7 +43,7 @@
 
 #include "lib/global.h"
 #include "lib/util.h"
-#include "lib/widget/wtools.h"  /* D_ERROR, D_NORMAL */
+#include "lib/widget.h"         /* D_ERROR, D_NORMAL */
 
 #include "src/main.h"           /* mc_home */
 #include "src/execute.h"        /* EXECUTE_AS_SHELL */

+ 1 - 2
lib/vfs/mc-vfs/smbfs.c

@@ -41,8 +41,7 @@
 #include <string.h>
 
 #include "lib/global.h"
-
-#include "src/wtools.h"         /* message() */
+#include "lib/widget.h"         /* message() */
 
 #undef  PACKAGE_BUGREPORT
 #undef  PACKAGE_NAME

Some files were not shown because too many files changed in this diff