From 364b729f87e2d5efc36965088658bfdb5dee3631 Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Fri, 20 Feb 2009 13:10:21 +0000 Subject: [PATCH] Fixing code to use config.h as default config incude file --- ede-panel/Jamfile | 27 +++++++++++++++++++ ede-panel/Makefile | 45 -------------------------------- ede-panel/aboutdialog.cpp | 5 +++- ede-panel/batterymonitor.cpp | 18 ++++++------- ede-panel/batterymonitor.h | 4 ++- ede-panel/cpumonitor.h | 4 ++- ede-panel/keyboardchooser.cpp | 1 + ede-panel/keyboardchooser.h | 3 --- ede-panel/mainmenu.cpp | 5 +++- ede-panel/menu.h | 5 +++- ede-panel/workpanel.cpp | 1 - edewm/Frame.h | 2 +- edewm/Icccm.cpp | 6 +++-- edewm/Jamfile | 31 ++++++++++++++++++++++ edewm/Makefile | 49 ----------------------------------- edewm/Theme.cpp | 2 +- edewm/Theme.h | 2 +- edewm/main.cpp | 5 +++- 18 files changed, 97 insertions(+), 118 deletions(-) create mode 100644 ede-panel/Jamfile delete mode 100644 ede-panel/Makefile create mode 100644 edewm/Jamfile delete mode 100644 edewm/Makefile diff --git a/ede-panel/Jamfile b/ede-panel/Jamfile new file mode 100644 index 0000000..74a9931 --- /dev/null +++ b/ede-panel/Jamfile @@ -0,0 +1,27 @@ +# +# $Id$ +# +# Part of Equinox Desktop Environment (EDE). +# Copyright (c) 2009 EDE Authors. +# +# This program is licensed under terms of the +# GNU General Public License version 2 or newer. +# See COPYING for details. + +SubDir TOP ede-panel ; + +SOURCE = aboutdialog.cpp + logoutdialog.cpp + panelbutton.cpp + keyboardchooser.cpp + taskbutton.cpp + workpanel.cpp + item.cpp + cpumonitor.cpp + batterymonitor.cpp + dock.cpp + mainmenu.cpp + mainmenu_scan.cpp ; + +EfltkProgram ede-panel : $(SOURCE) ; +TranslationStrings locale : $(SOURCE) ; diff --git a/ede-panel/Makefile b/ede-panel/Makefile deleted file mode 100644 index 2fe1463..0000000 --- a/ede-panel/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# $Id$ -# -# Part of Equinox Desktop Environment (EDE). -# Copyright (c) 2000-2006 EDE Authors. -# -# This program is licenced under terms of the -# GNU General Public Licence version 2 or newer. -# See COPYING for details. - -CPPFILES = aboutdialog.cpp\ - logoutdialog.cpp\ - panelbutton.cpp\ - keyboardchooser.cpp\ - taskbutton.cpp\ - workpanel.cpp\ - item.cpp\ - cpumonitor.cpp\ - batterymonitor.cpp\ - dock.cpp\ - mainmenu.cpp\ - mainmenu_scan.cpp - -TARGET = eworkpanel - -POFILES = locale/ru.po\ - locale/sr.po\ - locale/sk.po\ - locale/hu.po\ - locale/de.po\ - locale/fr.po - -include ../makeinclude - -install: - $(INSTALL_PROGRAM) $(TARGET) $(bindir) - $(INSTALL_LOCALE) - -uninstall: - $(RM) $(bindir)/$(TARGET) - -clean: - $(RM) $(TARGET) - $(RM) *.o - diff --git a/ede-panel/aboutdialog.cpp b/ede-panel/aboutdialog.cpp index a9ea18f..330c511 100644 --- a/ede-panel/aboutdialog.cpp +++ b/ede-panel/aboutdialog.cpp @@ -10,6 +10,10 @@ * See COPYING for details. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -18,7 +22,6 @@ #include #include #include -#include #include "aboutdialog.h" #include "icons/ede.xpm" diff --git a/ede-panel/batterymonitor.cpp b/ede-panel/batterymonitor.cpp index 5aacbf3..34e326c 100644 --- a/ede-panel/batterymonitor.cpp +++ b/ede-panel/batterymonitor.cpp @@ -346,15 +346,15 @@ void battery_check(void) typedef struct apm_info { char driver_version[10]; - int apm_version_major; - int apm_version_minor; - int apm_flags; - int ac_line_status; - int battery_status; - int battery_flags; - int battery_percentage; - int battery_time; - int using_minutes; + int apm_version_major; + int apm_version_minor; + unsigned int apm_flags; + unsigned int ac_line_status; + unsigned int battery_status; + unsigned int battery_flags; + int battery_percentage; + int battery_time; + int using_minutes; } apm_info; diff --git a/ede-panel/batterymonitor.h b/ede-panel/batterymonitor.h index 3e49ecb..7268a3c 100644 --- a/ede-panel/batterymonitor.h +++ b/ede-panel/batterymonitor.h @@ -1,7 +1,9 @@ #ifndef _batterymonitor_h_ #define _batterymonitor_h_ -#include +#ifdef HAVE_CONFIG_H +#include +#endif #include #include diff --git a/ede-panel/cpumonitor.h b/ede-panel/cpumonitor.h index a7bff90..90d1475 100644 --- a/ede-panel/cpumonitor.h +++ b/ede-panel/cpumonitor.h @@ -1,7 +1,9 @@ #ifndef _CPUMONITOR_H_ #define _CPUMONITOR_H_ -#include +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef HAVE_KSTAT_H #include diff --git a/ede-panel/keyboardchooser.cpp b/ede-panel/keyboardchooser.cpp index 239d6c7..7a4a777 100644 --- a/ede-panel/keyboardchooser.cpp +++ b/ede-panel/keyboardchooser.cpp @@ -4,6 +4,7 @@ // See COPYING for details. #include "keyboardchooser.h" +#include "icons/keyboard.xpm" #define MAX_KEYBOARDS 5 diff --git a/ede-panel/keyboardchooser.h b/ede-panel/keyboardchooser.h index 64aa784..ecd3224 100644 --- a/ede-panel/keyboardchooser.h +++ b/ede-panel/keyboardchooser.h @@ -21,9 +21,6 @@ #include #include -#include "icons/keyboard.xpm" - - class KeyboardChooser : public Fl_Menu_Button { public: diff --git a/ede-panel/mainmenu.cpp b/ede-panel/mainmenu.cpp index 0853c16..67f049a 100644 --- a/ede-panel/mainmenu.cpp +++ b/ede-panel/mainmenu.cpp @@ -1,7 +1,10 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "mainmenu.h" #include "menu.h" -#include #include #include #include diff --git a/ede-panel/menu.h b/ede-panel/menu.h index afe0941..540af18 100644 --- a/ede-panel/menu.h +++ b/ede-panel/menu.h @@ -1,4 +1,7 @@ -#include +#ifdef HAVE_CONFIG_H +#include +#endif + static const char default_menu[] = "\n\ \n\ diff --git a/ede-panel/workpanel.cpp b/ede-panel/workpanel.cpp index 0777859..e8ee036 100644 --- a/ede-panel/workpanel.cpp +++ b/ede-panel/workpanel.cpp @@ -415,7 +415,6 @@ void FL_WM_handler(Fl_Widget *w, void *d) } } -#define DEBUG void terminationHandler(int signum) { #ifndef DEBUG diff --git a/edewm/Frame.h b/edewm/Frame.h index 2a11cc0..651bfc8 100644 --- a/edewm/Frame.h +++ b/edewm/Frame.h @@ -89,7 +89,7 @@ enum { // values for state_flags: // These change over time enum { - IGNORE_UNMAP = 0x01, // we did something that echos an UnmapNotify + IGNORE_UNMAP = 0x01 // we did something that echos an UnmapNotify }; class Icon; diff --git a/edewm/Icccm.cpp b/edewm/Icccm.cpp index a1c406d..7885dcf 100644 --- a/edewm/Icccm.cpp +++ b/edewm/Icccm.cpp @@ -1,10 +1,12 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "Icccm.h" #include "Frame.h" #include "Winhints.h" #include "Windowmanager.h" -#include - static void icccm_send_state(Window wid, long state) { long data[2]; diff --git a/edewm/Jamfile b/edewm/Jamfile new file mode 100644 index 0000000..27b7acd --- /dev/null +++ b/edewm/Jamfile @@ -0,0 +1,31 @@ +# +# $Id$ +# +# Part of Equinox Desktop Environment (EDE). +# Copyright (c) 2009 EDE Authors. +# +# This program is licensed under terms of the +# GNU General Public License version 2 or newer. +# See COPYING for details. + +SubDir TOP edewm ; + +SOURCE = WMWindow.cpp + Theme.cpp + Netwm.cpp + Mwm.cpp + Icccm.cpp + Icon.cpp + Cursor.cpp + Desktop.cpp + Events.cpp + Frame.cpp + Hotkeys.cpp + Tabmenu.cpp + Titlebar.cpp + Windowmanager.cpp + Winhints.cpp + main.cpp ; + +EfltkProgram edewm : $(SOURCE) ; +TranslationStrings locale : $(SOURCE) ; diff --git a/edewm/Makefile b/edewm/Makefile deleted file mode 100644 index 62620af..0000000 --- a/edewm/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# $Id: Makefile 1957 2007-06-25 19:42:47Z vljubovic $ -# -# Part of Equinox Desktop Environment (EDE). -# Copyright (c) 2000-2006 EDE Authors. -# -# This program is licenced under terms of the -# GNU General Public Licence version 2 or newer. -# See COPYING for details. - -CPPFILES = WMWindow.cpp\ - Theme.cpp\ - Netwm.cpp\ - Mwm.cpp\ - Icccm.cpp\ - Icon.cpp\ - Cursor.cpp\ - Desktop.cpp\ - Events.cpp\ - Frame.cpp\ - Hotkeys.cpp\ - Tabmenu.cpp\ - Titlebar.cpp\ - Windowmanager.cpp\ - Winhints.cpp\ - main.cpp - -TARGET = edewm - -POFILES = locale/ru.po\ - locale/sr.po\ - locale/sk.po\ - locale/hu.po\ - locale/de.po\ - locale/fr.po - -include ../makeinclude - -install: - $(INSTALL_PROGRAM) $(TARGET) $(bindir) - $(INSTALL_LOCALE) - -uninstall: - $(RM) $(bindir)/$(TARGET) - -clean: - $(RM) $(TARGET) - $(RM) *.o - diff --git a/edewm/Theme.cpp b/edewm/Theme.cpp index fbeaa90..0a8d87c 100644 --- a/edewm/Theme.cpp +++ b/edewm/Theme.cpp @@ -113,5 +113,5 @@ Fl_Color frame_color() return _frame_color; } -}; /* namespace Theme */ +} /* namespace Theme */ diff --git a/edewm/Theme.h b/edewm/Theme.h index dc6be23..321b566 100644 --- a/edewm/Theme.h +++ b/edewm/Theme.h @@ -26,6 +26,6 @@ extern void unload_theme(); extern Fl_Image *image(int which); extern Fl_Color frame_color(); -}; +} #endif diff --git a/edewm/main.cpp b/edewm/main.cpp index aae036d..9cd8c0b 100644 --- a/edewm/main.cpp +++ b/edewm/main.cpp @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "Frame.h" #include "Desktop.h" #include "Windowmanager.h" @@ -11,7 +15,6 @@ #include "config.h" #include "debug.h" -#include #include