From eb14bca73b01613524e4809cae8062fa10513182 Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Sun, 12 May 2013 00:24:38 +0200 Subject: [PATCH] WPrefs: Moved content of 'double.h' into 'WPrefs.h' It is not a good idea to multiply the number of header files, specially in this case where 'double.h' defined so few things (and lacked the usual copyright notice / include guards). --- WPrefs.app/Makefile.am | 1 - WPrefs.app/MouseSettings.c | 2 -- WPrefs.app/WPrefs.h | 6 ++++++ WPrefs.app/double.c | 2 +- WPrefs.app/double.h | 6 ------ 5 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 WPrefs.app/double.h diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am index 15f0b6e8..22a9628c 100644 --- a/WPrefs.app/Makefile.am +++ b/WPrefs.app/Makefile.am @@ -36,7 +36,6 @@ WPrefs_SOURCES = \ WindowHandling.c \ Workspace.c \ double.c \ - double.h \ editmenu.c \ editmenu.h \ xmodifier.c diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c index b684c5ce..5409108a 100644 --- a/WPrefs.app/MouseSettings.c +++ b/WPrefs.app/MouseSettings.c @@ -28,8 +28,6 @@ #include #include -/* double-click tester */ -#include "double.h" #define XSET "xset" diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 2987abfc..ef64556b 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -111,6 +111,12 @@ void SetBoolForKey(Bool value, const char *defaultName); void SetSpeedForKey(int speed, const char *defaultName); +/* ---[ double.c ] ------------------------------------------------------- */ +typedef struct W_DoubleTest DoubleTest; + +DoubleTest *CreateDoubleTest(WMWidget *parent, char *text); + + /* ---[ main.c ] --------------------------------------------------------- */ void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data); diff --git a/WPrefs.app/double.c b/WPrefs.app/double.c index d708b0d8..3db5748f 100644 --- a/WPrefs.app/double.c +++ b/WPrefs.app/double.c @@ -5,8 +5,8 @@ */ #include +#include "WPrefs.h" -#include "double.h" typedef struct W_DoubleTest { W_Class widgetClass; diff --git a/WPrefs.app/double.h b/WPrefs.app/double.h deleted file mode 100644 index 3d0b8132..00000000 --- a/WPrefs.app/double.h +++ /dev/null @@ -1,6 +0,0 @@ - -typedef struct W_DoubleTest DoubleTest; - - -DoubleTest *CreateDoubleTest(WMWidget *parent, char *text); -