a massive fix of FLTK headers inclusion;

This commit is contained in:
Sanel Zukan 2008-09-15 11:00:23 +00:00
parent 65492f45b7
commit e399841a6d
35 changed files with 111 additions and 111 deletions

View File

@ -10,14 +10,14 @@
* See COPYING for details. * See COPYING for details.
*/ */
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Group.h> #include <FL/Fl_Group.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/Fl_Text_Display.h> #include <FL/Fl_Text_Display.H>
#include <FL/Fl_Text_Buffer.h> #include <FL/Fl_Text_Buffer.H>
#include <FL/Fl_Pixmap.h> #include <FL/Fl_Pixmap.H>
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include "icons/ede.xpm" #include "icons/ede.xpm"

View File

@ -22,11 +22,11 @@
#include <edelib/Run.h> #include <edelib/Run.h>
#include <edelib/File.h> #include <edelib/File.h>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Shared_Image.h> #include <FL/Fl_Shared_Image.H>
#include <FL/fl_draw.h> #include <FL/fl_draw.H>
typedef edelib::list<edelib::String> StrList; typedef edelib::list<edelib::String> StrList;
typedef edelib::list<edelib::String>::iterator StrListIter; typedef edelib::list<edelib::String>::iterator StrListIter;

View File

@ -13,9 +13,9 @@
#include "icons/core.xpm" #include "icons/core.xpm"
#include "CrashDialog.h" #include "CrashDialog.h"
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/Fl_Pixmap.h> #include <FL/Fl_Pixmap.H>
#include <FL/Fl_File_Chooser.h> #include <FL/Fl_File_Chooser.H>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -13,12 +13,12 @@
#ifndef __CRASHDIALOG_H__ #ifndef __CRASHDIALOG_H__
#define __CRASHDIALOG_H__ #define __CRASHDIALOG_H__
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/Fl_Pixmap.h> #include <FL/Fl_Pixmap.H>
#include <FL/Fl_Text_Display.h> #include <FL/Fl_Text_Display.H>
#include <FL/Fl_Text_Buffer.h> #include <FL/Fl_Text_Buffer.H>
#include <edelib/String.h> #include <edelib/String.h>

View File

@ -10,11 +10,11 @@
* See COPYING for details. * See COPYING for details.
*/ */
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/fl_draw.h> #include <FL/fl_draw.H>
#include <FL/Fl_Shared_Image.h> #include <FL/Fl_Shared_Image.H>
#include <FL/Fl_Menu_Button.h> #include <FL/Fl_Menu_Button.H>
#include <FL/x.h> #include <FL/x.H>
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <edelib/IconTheme.h> #include <edelib/IconTheme.h>

View File

@ -13,11 +13,11 @@
#ifndef __DESKTOPICON_H__ #ifndef __DESKTOPICON_H__
#define __DESKTOPICON_H__ #define __DESKTOPICON_H__
#include <FL/Fl_Widget.h> #include <FL/Fl_Widget.H>
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/Fl_Image.h> #include <FL/Fl_Image.H>
#include <X11/Xlib.h> // Pixmap #include <X11/Xlib.h> // Pixmap

View File

@ -16,13 +16,13 @@
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/Fl_Tabs.h> #include <FL/Fl_Tabs.H>
#include <FL/Fl_Group.h> #include <FL/Fl_Group.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/Fl_Input.h> #include <FL/Fl_Input.H>
#include <FL/Fl_Output.h> #include <FL/Fl_Output.H>
#include <FL/Fl_Shared_Image.h> #include <FL/Fl_Shared_Image.H>
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <edelib/Window.h> #include <edelib/Window.h>

View File

@ -12,7 +12,7 @@
#include "Utils.h" #include "Utils.h"
#include <X11/Xproto.h> // CARD32 #include <X11/Xproto.h> // CARD32
#include <FL/x.h> #include <FL/x.H>
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <string.h> // strrchr, strncpy, strlen #include <string.h> // strrchr, strncpy, strlen

View File

@ -13,8 +13,8 @@
#ifndef __UTILS_H__ #ifndef __UTILS_H__
#define __UTILS_H__ #define __UTILS_H__
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Image.h> #include <FL/Fl_Image.H>
#include <X11/Xlib.h> // Pixmap #include <X11/Xlib.h> // Pixmap

View File

@ -15,10 +15,10 @@
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <FL/Fl_Shared_Image.h> #include <FL/Fl_Shared_Image.H>
#include <FL/Fl_RGB_Image.h> #include <FL/Fl_RGB_Image.H>
#include <FL/fl_draw.h> #include <FL/fl_draw.H>
#include <FL/x.h> #include <FL/x.H>
#include <string.h> // memcpy #include <string.h> // memcpy
#include <stdlib.h> // malloc #include <stdlib.h> // malloc

View File

@ -13,7 +13,7 @@
#ifndef __WALLPAPER_H__ #ifndef __WALLPAPER_H__
#define __WALLPAPER_H__ #define __WALLPAPER_H__
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <X11/Xlib.h> // XImage, Pixmap #include <X11/Xlib.h> // XImage, Pixmap

View File

@ -31,13 +31,13 @@
#include <edelib/Util.h> #include <edelib/Util.h>
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/x.h> #include <FL/x.H>
#include <FL/fl_draw.h> #include <FL/fl_draw.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Shared_Image.h> #include <FL/Fl_Shared_Image.H>
#include <FL/Fl_Menu_Button.h> #include <FL/Fl_Menu_Button.H>
#include <FL/fl_ask.h> #include <FL/fl_ask.H>
#include <unistd.h> // sleep #include <unistd.h> // sleep
#include <signal.h> #include <signal.h>

View File

@ -16,11 +16,11 @@
#ifdef USE_EDELIB_WINDOW #ifdef USE_EDELIB_WINDOW
#include <edelib/Window.h> #include <edelib/Window.h>
#else #else
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Double_Window.h> #include <FL/Fl_Double_Window.H>
#endif #endif
#include <FL/Fl_Image.h> #include <FL/Fl_Image.H>
#include <edelib/String.h> #include <edelib/String.h>
#include <edelib/Resource.h> #include <edelib/Resource.h>

View File

@ -3,8 +3,8 @@
#include <FL/Fl_Input.H> #include <FL/Fl_Input.H>
#include <FL/Fl_Button.H> #include <FL/Fl_Button.H>
#include <FL/Fl_Box.H> #include <FL/Fl_Box.H>
#include <FL/fl_show_colormap.h> #include <FL/fl_show_colormap.H>
#include <FL/x.h> #include <FL/x.H>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

View File

@ -11,7 +11,7 @@
*/ */
#include "Background.h" #include "Background.h"
#include <FL/Fl_Shared_Image.h> #include <FL/Fl_Shared_Image.H>
#include <edelib/Debug.h> #include <edelib/Debug.h>
bool Background::load_images(const char* bpath, const char* ppath) { bool Background::load_images(const char* bpath, const char* ppath) {

View File

@ -13,7 +13,7 @@
#ifndef __BACKGROUND_H__ #ifndef __BACKGROUND_H__
#define __BACKGROUND_H__ #define __BACKGROUND_H__
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
class Fl_Image; class Fl_Image;

View File

@ -15,8 +15,8 @@
#include <edelib/Config.h> #include <edelib/Config.h>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/x.h> #include <FL/x.H>
#include <stdlib.h> #include <stdlib.h>
ElmaService::ElmaService() : config(NULL), theme(NULL) { ElmaService::ElmaService() : config(NULL), theme(NULL) {

View File

@ -10,7 +10,7 @@
* See COPYING for details. * See COPYING for details.
*/ */
#include <FL/Fl.h> #include <FL/Fl.H>
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -13,7 +13,7 @@
#ifndef __ELMAWINDOW_H__ #ifndef __ELMAWINDOW_H__
#define __ELMAWINDOW_H__ #define __ELMAWINDOW_H__
#include <FL/Fl_Double_Window.h> #include <FL/Fl_Double_Window.H>
class Background; class Background;
class TextArea; class TextArea;

View File

@ -13,7 +13,7 @@
#ifndef __TEXTAREA_H__ #ifndef __TEXTAREA_H__
#define __TEXTAREA_H__ #define __TEXTAREA_H__
#include <FL/Fl_Input.h> #include <FL/Fl_Input.H>
#include <edelib/Debug.h> #include <edelib/Debug.h>
/* /*

View File

@ -14,8 +14,8 @@
#if 0 #if 0
#include <string.h> #include <string.h>
#include <FL/x.h> #include <FL/x.H>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <edelib/String.h> #include <edelib/String.h>
#include <edelib/Config.h> #include <edelib/Config.h>

View File

@ -10,13 +10,13 @@
* See COPYING for the details. * See COPYING for the details.
*/ */
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Check_Button.h> #include <FL/Fl_Check_Button.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/Fl_Group.h> #include <FL/Fl_Group.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Pixmap.h> #include <FL/Fl_Pixmap.H>
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <edelib/Config.h> #include <edelib/Config.h>

View File

@ -15,8 +15,8 @@
#include "EvokeService.h" #include "EvokeService.h"
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <FL/Fl_Pixmap.h> #include <FL/Fl_Pixmap.H>
#include <FL/Fl.h> #include <FL/Fl.H>
Fl_Pixmap warnpix(warning_xpm); Fl_Pixmap warnpix(warning_xpm);

View File

@ -13,10 +13,10 @@
#ifndef __AUTOSTART_H__ #ifndef __AUTOSTART_H__
#define __AUTOSTART_H__ #define __AUTOSTART_H__
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Check_Browser.h> #include <FL/Fl_Check_Browser.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <edelib/String.h> #include <edelib/String.h>

View File

@ -16,8 +16,8 @@
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <FL/x.h> #include <FL/x.H>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <string.h> // memcpy #include <string.h> // memcpy
#include <stdlib.h> // malloc, realloc #include <stdlib.h> // malloc, realloc

View File

@ -589,7 +589,7 @@ void EvokeService::service_watcher(int pid, int ret) {
write(wake_up_pipe[1], &ret, sizeof(int)); write(wake_up_pipe[1], &ret, sizeof(int));
} }
#include <FL/fl_ask.h> #include <FL/fl_ask.H>
void EvokeService::wake_up(int fd) { void EvokeService::wake_up(int fd) {
puts("=== wake_up() ==="); puts("=== wake_up() ===");

View File

@ -13,7 +13,7 @@
#ifndef __EVOKESERVICE_H__ #ifndef __EVOKESERVICE_H__
#define __EVOKESERVICE_H__ #define __EVOKESERVICE_H__
#include <FL/x.h> #include <FL/x.H>
#include <pthread.h> #include <pthread.h>
#include <edelib/List.h> #include <edelib/List.h>

View File

@ -10,13 +10,13 @@
* See COPYING for details. * See COPYING for details.
*/ */
#include <FL/Fl_Double_Window.h> #include <FL/Fl_Double_Window.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/Fl_Round_Button.h> #include <FL/Fl_Round_Button.H>
#include <FL/Fl_RGB_Image.h> #include <FL/Fl_RGB_Image.H>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/x.h> #include <FL/x.H>
#include <string.h> // memset #include <string.h> // memset
#include <edelib/Nls.h> #include <edelib/Nls.h>

View File

@ -12,8 +12,8 @@
#include <stdio.h> // snprintf #include <stdio.h> // snprintf
#include <FL/Fl_Shared_Image.h> #include <FL/Fl_Shared_Image.H>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <edelib/Run.h> #include <edelib/Run.h>
#include <edelib/Debug.h> #include <edelib/Debug.h>

View File

@ -13,8 +13,8 @@
#ifndef __SPLASH_H__ #ifndef __SPLASH_H__
#define __SPLASH_H__ #define __SPLASH_H__
#include <FL/Fl_Double_Window.h> #include <FL/Fl_Double_Window.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include "EvokeService.h" #include "EvokeService.h"

View File

@ -13,7 +13,7 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include <FL/x.h> #include <FL/x.H>
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include <edelib/Debug.h> #include <edelib/Debug.h>

View File

@ -17,8 +17,8 @@
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <edelib/File.h> #include <edelib/File.h>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/x.h> #include <FL/x.H>
#include "EvokeService.h" #include "EvokeService.h"

View File

@ -1,8 +1,8 @@
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/Fl_Double_Window.h> #include <FL/Fl_Double_Window.H>
#include <FL/Fl_Input.h> #include <FL/Fl_Input.H>
#include <FL/Fl_Button.h> #include <FL/Fl_Button.H>
#include <FL/x.h> #include <FL/x.H>
#include <string.h> #include <string.h>

View File

@ -1,8 +1,8 @@
#include <FL/Fl.h> #include <FL/Fl.H>
#include <FL/Fl_Window.h> #include <FL/Fl_Window.H>
#include <FL/Fl_Box.h> #include <FL/Fl_Box.H>
#include <FL/Fl_Value_Slider.h> #include <FL/Fl_Value_Slider.H>
#include <FL/x.h> #include <FL/x.H>
#include <stdio.h> #include <stdio.h>

View File

@ -1,5 +1,5 @@
#include <FL/x.h> #include <FL/x.H>
#include <FL/Fl.h> #include <FL/Fl.H>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>