From 793fa5a91f24358aa7ce21abf6ee4e93a17b04ee Mon Sep 17 00:00:00 2001 From: maxim nikonov Date: Fri, 6 Feb 2026 19:04:24 +0500 Subject: wip --- fluid/Fluid.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'fluid/Fluid.h') diff --git a/fluid/Fluid.h b/fluid/Fluid.h index 4e5a053a4..1449d3c03 100644 --- a/fluid/Fluid.h +++ b/fluid/Fluid.h @@ -44,14 +44,8 @@ class Fl_Button; class Fl_Check_Button; class Fl_Help_Dialog; -namespace fld { -namespace app { class Layout_List; -} -namespace widget { class App_Menu_Bar; -} - class Project; class Application { @@ -72,11 +66,11 @@ public: // Member Variables /// Application wide preferences Fl_Preferences preferences; /// Project history. - app::History history; + History history; /// Command line arguments - app::Args args; + Args args; /// List of available layouts - app::Layout_List *layout_list; + Layout_List *layout_list; /// Set, if Fluid runs in batch mode, and no user interface is activated. int batch_mode; @@ -105,7 +99,7 @@ public: // Member Variables // TODO: make this into a class: app::GUI Fl_Window *main_window; static Fl_Menu_Item main_menu[]; - fld::widget::App_Menu_Bar *main_menubar; + App_Menu_Bar *main_menubar; Fl_Menu_Item *save_item; Fl_Menu_Item *history_item; Fl_Menu_Item *widgetbin_item; @@ -199,9 +193,7 @@ public: // Methods #endif }; -} // namespace fld - -extern fld::Application Fluid; +extern Application Fluid; #endif // FLUID_FLUID_H -- cgit v1.2.3