From c558fce8adb39e48c077946911faf94ceb54af62 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 16 Sep 2018 17:23:45 -0600 Subject: [PATCH] This commit moves the NxWidgets include directories into the correct position in the apps/ source tree. Squashed commit of the following: Clean-up some include path problems introduced with the previous set of changes. app/include/graphics, apps/NxWidgets/UnitTests: Update include paths for file in new location. apps/NxWidgets/nxwidgets and nxwm: Update include paths for file in new location. apps/graphics/NxWidgets: Move nxwidgets and nxwm include/ directories to apps/include/graphics --- graphics/NxWidgets/Doxygen/Doxyfile | 2 +- graphics/NxWidgets/README.txt | 4 +-- graphics/NxWidgets/UnitTests/CButton/Makefile | 11 -------- .../UnitTests/CButton/cbutton_main.cxx | 2 +- .../UnitTests/CButton/cbuttontest.cxx | 6 ++-- .../UnitTests/CButton/cbuttontest.hxx | 16 +++++------ .../NxWidgets/UnitTests/CButtonArray/Makefile | 11 -------- .../CButtonArray/cbuttonarray_main.cxx | 4 +-- .../CButtonArray/cbuttonarraytest.cxx | 6 ++-- .../CButtonArray/cbuttonarraytest.hxx | 16 +++++------ .../NxWidgets/UnitTests/CCheckBox/Makefile | 11 -------- .../UnitTests/CCheckBox/ccheckbox_main.cxx | 6 ++-- .../UnitTests/CCheckBox/ccheckboxtest.cxx | 10 +++---- .../UnitTests/CCheckBox/ccheckboxtest.hxx | 12 ++++---- .../NxWidgets/UnitTests/CGlyphButton/Makefile | 11 -------- .../CGlyphButton/cglyphbutton_main.cxx | 4 +-- .../CGlyphButton/cglyphbuttontest.cxx | 6 ++-- .../CGlyphButton/cglyphbuttontest.hxx | 18 ++++++------ .../UnitTests/CGlyphSliderHorizontal/Makefile | 11 -------- .../cglyphsliderhorizontal_main.cxx | 2 +- .../cglyphsliderhorizontaltest.cxx | 8 +++--- .../cglyphsliderhorizontaltest.hxx | 12 ++++---- graphics/NxWidgets/UnitTests/CImage/Makefile | 11 -------- .../UnitTests/CImage/cimage_main.cxx | 6 ++-- .../NxWidgets/UnitTests/CImage/cimagetest.cxx | 8 +++--- .../NxWidgets/UnitTests/CImage/cimagetest.hxx | 16 +++++------ graphics/NxWidgets/UnitTests/CKeypad/Makefile | 11 -------- .../UnitTests/CKeypad/ckeypad_main.cxx | 4 +-- .../UnitTests/CKeypad/ckeypadtest.cxx | 12 ++++---- .../UnitTests/CKeypad/ckeypadtest.hxx | 18 ++++++------ graphics/NxWidgets/UnitTests/CLabel/Makefile | 11 -------- .../UnitTests/CLabel/clabel_main.cxx | 2 +- .../NxWidgets/UnitTests/CLabel/clabeltest.cxx | 6 ++-- .../NxWidgets/UnitTests/CLabel/clabeltest.hxx | 16 +++++------ .../NxWidgets/UnitTests/CLatchButton/Makefile | 11 -------- .../CLatchButton/clatchbutton_main.cxx | 2 +- .../CLatchButton/clatchbuttontest.cxx | 6 ++-- .../CLatchButton/clatchbuttontest.hxx | 16 +++++------ .../UnitTests/CLatchButtonArray/Makefile | 11 -------- .../clatchbuttonarray_main.cxx | 4 +-- .../clatchbuttonarraytest.cxx | 6 ++-- .../clatchbuttonarraytest.hxx | 16 +++++------ .../NxWidgets/UnitTests/CListBox/Makefile | 11 -------- .../UnitTests/CListBox/clistbox_main.cxx | 2 +- .../UnitTests/CListBox/clistboxtest.cxx | 6 ++-- .../UnitTests/CListBox/clistboxtest.hxx | 12 ++++---- .../NxWidgets/UnitTests/CProgressBar/Makefile | 11 -------- .../CProgressBar/cprogressbar_main.cxx | 2 +- .../CProgressBar/cprogressbartest.cxx | 6 ++-- .../CProgressBar/cprogressbartest.hxx | 12 ++++---- .../NxWidgets/UnitTests/CRadioButton/Makefile | 11 -------- .../CRadioButton/cradiobutton_main.cxx | 6 ++-- .../CRadioButton/cradiobuttontest.cxx | 10 +++---- .../CRadioButton/cradiobuttontest.hxx | 14 +++++----- .../UnitTests/CScrollbarHorizontal/Makefile | 11 -------- .../cscrollbarhorizontal_main.cxx | 2 +- .../cscrollbarhorizontaltest.cxx | 6 ++-- .../cscrollbarhorizontaltest.hxx | 12 ++++---- .../UnitTests/CScrollbarVertical/Makefile | 11 -------- .../cscrollbarvertical_main.cxx | 2 +- .../cscrollbarverticaltest.cxx | 6 ++-- .../cscrollbarverticaltest.hxx | 12 ++++---- .../UnitTests/CSliderHorizonal/Makefile | 11 -------- .../csliderhorizontal_main.cxx | 2 +- .../csliderhorizontaltest.cxx | 6 ++-- .../csliderhorizontaltest.hxx | 12 ++++---- .../UnitTests/CSliderVertical/Makefile | 11 -------- .../CSliderVertical/cslidervertical_main.cxx | 2 +- .../CSliderVertical/csliderverticaltest.cxx | 6 ++-- .../CSliderVertical/csliderverticaltest.hxx | 12 ++++---- .../NxWidgets/UnitTests/CTextBox/Makefile | 11 -------- .../UnitTests/CTextBox/ctextbox_main.cxx | 2 +- .../UnitTests/CTextBox/ctextboxtest.cxx | 6 ++-- .../UnitTests/CTextBox/ctextboxtest.hxx | 16 +++++------ graphics/NxWidgets/UnitTests/nxwm/Makefile | 18 ------------ .../NxWidgets/UnitTests/nxwm/nxwm_main.cxx | 16 +++++------ .../{libnxwidgets => nxwidgets}/.gitignore | 0 .../{libnxwidgets => nxwidgets}/COPYING | 0 .../{libnxwidgets => nxwidgets}/Kconfig | 0 .../{libnxwidgets => nxwidgets}/Make.defs | 4 +-- .../{libnxwidgets => nxwidgets}/Makefile | 7 +---- .../doc/mainpage.h | 0 .../src/cbgwindow.cxx | 8 +++--- .../src/cbitmap.cxx | 4 +-- .../src/cbutton.cxx | 6 ++-- .../src/cbuttonarray.cxx | 8 +++--- .../src/ccallback.cxx | 6 ++-- .../src/ccheckbox.cxx | 16 +++++------ .../src/ccyclebutton.cxx | 10 +++---- .../src/cglyphbutton.cxx | 12 ++++---- .../src/cglyphsliderhorizontal.cxx | 14 +++++----- .../src/cglyphsliderhorizontalgrip.cxx | 6 ++-- .../src/cgraphicsport.cxx | 20 ++++++------- .../src/cimage.cxx | 12 ++++---- .../src/ckeypad.cxx | 8 +++--- .../src/clabel.cxx | 8 +++--- .../src/clatchbutton.cxx | 8 +++--- .../src/clatchbuttonarray.cxx | 8 +++--- .../src/clistbox.cxx | 12 ++++---- .../src/clistboxdataitem.cxx | 6 ++-- .../src/clistdata.cxx | 6 ++-- .../src/clistdataitem.cxx | 6 ++-- .../src/cmultilinetextbox.cxx | 18 ++++++------ .../src/cnumericedit.cxx | 10 +++---- .../src/cnxfont.cxx | 12 ++++---- .../src/cnxserver.cxx | 8 +++--- .../src/cnxstring.cxx | 6 ++-- .../src/cnxtimer.cxx | 4 +-- .../src/cnxtkwindow.cxx | 10 +++---- .../src/cnxtoolbar.cxx | 8 +++--- .../src/cnxwidget.cxx | 18 ++++++------ .../src/cnxwindow.cxx | 8 +++--- .../src/cprogressbar.cxx | 6 ++-- .../src/cradiobutton.cxx | 16 +++++------ .../src/cradiobuttongroup.cxx | 8 +++--- .../{libnxwidgets => nxwidgets}/src/crect.cxx | 4 +-- .../src/crlepalettebitmap.cxx | 6 ++-- .../src/cscaledbitmap.cxx | 4 +-- .../src/cscrollbarhorizontal.cxx | 20 ++++++------- .../src/cscrollbarpanel.cxx | 6 ++-- .../src/cscrollbarvertical.cxx | 14 +++++----- .../src/cscrollinglistbox.cxx | 8 +++--- .../src/cscrollingpanel.cxx | 10 +++---- .../src/cscrollingtextbox.cxx | 8 +++--- .../src/csliderhorizontal.cxx | 10 +++---- .../src/csliderhorizontalgrip.cxx | 10 +++---- .../src/cslidervertical.cxx | 10 +++---- .../src/csliderverticalgrip.cxx | 10 +++---- .../src/cstickybutton.cxx | 6 ++-- .../src/cstickybuttonarray.cxx | 8 +++--- .../src/cstickyimage.cxx | 6 ++-- .../src/cstringiterator.cxx | 6 ++-- .../src/ctabpanel.cxx | 8 +++--- .../{libnxwidgets => nxwidgets}/src/ctext.cxx | 6 ++-- .../src/ctextbox.cxx | 12 ++++---- .../src/cwidgetcontrol.cxx | 20 ++++++------- .../src/cwidgeteventhandlerlist.cxx | 8 +++--- .../src/cwindoweventhandlerlist.cxx | 8 +++--- .../src/glyph_arrowdown.cxx | 8 +++--- .../src/glyph_arrowleft.cxx | 8 +++--- .../src/glyph_arrowright.cxx | 8 +++--- .../src/glyph_arrowup.cxx | 8 +++--- .../src/glyph_backspace.cxx | 8 +++--- .../src/glyph_capslock.cxx | 8 +++--- .../src/glyph_checkboxmu.cxx | 8 +++--- .../src/glyph_checkboxoff.cxx | 8 +++--- .../src/glyph_checkboxon.cxx | 8 +++--- .../src/glyph_control.cxx | 8 +++--- .../src/glyph_cycle.cxx | 8 +++--- .../src/glyph_nxlogo160x160.cxx | 8 +++--- .../src/glyph_nxlogo320x320.cxx | 8 +++--- .../src/glyph_radiobuttonmu.cxx | 8 +++--- .../src/glyph_radiobuttonoff.cxx | 8 +++--- .../src/glyph_radiobuttonon.cxx | 8 +++--- .../src/glyph_return.cxx | 8 +++--- .../src/glyph_screendepthdown.cxx | 8 +++--- .../src/glyph_screendepthup.cxx | 8 +++--- .../src/glyph_screenflipdown.cxx | 8 +++--- .../src/glyph_screenflipup.cxx | 8 +++--- .../src/glyph_shift.cxx | 8 +++--- .../src/glyph_windowclose.cxx | 8 +++--- .../src/glyph_windowdepthdown.cxx | 8 +++--- .../src/glyph_windowdepthup.cxx | 8 +++--- .../src/singletons.cxx | 14 +++++----- graphics/NxWidgets/nxwm/Makefile | 8 ------ .../NxWidgets/nxwm/src/capplicationwindow.cxx | 14 +++++----- graphics/NxWidgets/nxwm/src/ccalibration.cxx | 8 +++--- .../NxWidgets/nxwm/src/cfullscreenwindow.cxx | 12 ++++---- .../NxWidgets/nxwm/src/chexcalculator.cxx | 8 +++--- graphics/NxWidgets/nxwm/src/ckeyboard.cxx | 4 +-- graphics/NxWidgets/nxwm/src/cmediaplayer.cxx | 10 +++---- graphics/NxWidgets/nxwm/src/cnxterm.cxx | 8 +++--- graphics/NxWidgets/nxwm/src/cstartwindow.cxx | 10 +++---- graphics/NxWidgets/nxwm/src/ctaskbar.cxx | 12 ++++---- graphics/NxWidgets/nxwm/src/ctouchscreen.cxx | 12 ++++---- .../NxWidgets/nxwm/src/cwindowmessenger.cxx | 6 ++-- .../nxwm/src/glyph_calculator24x25.cxx | 6 ++-- .../nxwm/src/glyph_calculator47x49.cxx | 6 ++-- .../nxwm/src/glyph_calibration24x21.cxx | 6 ++-- .../nxwm/src/glyph_calibration48x42.cxx | 6 ++-- .../NxWidgets/nxwm/src/glyph_cmd25x22.cxx | 6 ++-- .../NxWidgets/nxwm/src/glyph_cmd49x43.cxx | 6 ++-- .../nxwm/src/glyph_mediagrip60x30.cxx | 6 ++-- .../nxwm/src/glyph_mediaplayer24x24.cxx | 6 ++-- .../nxwm/src/glyph_mediaplayer44x50.cxx | 6 ++-- .../nxwm/src/glyph_minimize21x21.cxx | 6 ++-- .../nxwm/src/glyph_minimize42x42.cxx | 6 ++-- .../nxwm/src/glyph_mplayer_controls32x32.cxx | 6 ++-- .../nxwm/src/glyph_mplayer_controls43x41.cxx | 6 ++-- .../NxWidgets/nxwm/src/glyph_play24x24.cxx | 6 ++-- .../NxWidgets/nxwm/src/glyph_play48x48.cxx | 6 ++-- .../NxWidgets/nxwm/src/glyph_stop21x21.cxx | 6 ++-- .../NxWidgets/nxwm/src/glyph_stop42x42.cxx | 6 ++-- .../graphics/nxwidgets}/cbgwindow.hxx | 14 +++++----- .../graphics/nxwidgets}/cbitmap.hxx | 12 ++++---- .../graphics/nxwidgets}/cbutton.hxx | 12 ++++---- .../graphics/nxwidgets}/cbuttonarray.hxx | 12 ++++---- .../graphics/nxwidgets}/ccallback.hxx | 10 +++---- .../graphics/nxwidgets}/ccheckbox.hxx | 12 ++++---- .../graphics/nxwidgets}/ccyclebutton.hxx | 20 ++++++------- .../graphics/nxwidgets}/cglyphbutton.hxx | 12 ++++---- .../nxwidgets}/cglyphsliderhorizontal.hxx | 12 ++++---- .../nxwidgets}/cglyphsliderhorizontalgrip.hxx | 12 ++++---- .../graphics/nxwidgets}/cgraphicsport.hxx | 12 ++++---- .../graphics/nxwidgets}/cimage.hxx | 10 +++---- .../graphics/nxwidgets}/ckeypad.hxx | 10 +++---- .../graphics/nxwidgets}/clabel.hxx | 14 +++++----- .../graphics/nxwidgets}/clatchbutton.hxx | 12 ++++---- .../graphics/nxwidgets}/clatchbuttonarray.hxx | 10 +++---- .../graphics/nxwidgets}/clistbox.hxx | 22 +++++++-------- .../graphics/nxwidgets}/clistboxdataitem.hxx | 12 ++++---- .../graphics/nxwidgets}/clistdata.hxx | 16 +++++------ .../nxwidgets}/clistdataeventargs.hxx | 10 +++---- .../graphics/nxwidgets}/clistdataitem.hxx | 10 +++---- .../graphics/nxwidgets}/cmultilinetextbox.hxx | 20 ++++++------- .../graphics/nxwidgets}/cnumericedit.hxx | 14 +++++----- .../graphics/nxwidgets}/cnxfont.hxx | 8 +++--- .../graphics/nxwidgets}/cnxserver.hxx | 14 +++++----- .../graphics/nxwidgets}/cnxstring.hxx | 10 +++---- .../graphics/nxwidgets}/cnxtimer.hxx | 10 +++---- .../graphics/nxwidgets}/cnxtkwindow.hxx | 12 ++++---- .../graphics/nxwidgets}/cnxtoolbar.hxx | 14 +++++----- .../graphics/nxwidgets}/cnxwidget.hxx | 24 ++++++++-------- .../graphics/nxwidgets}/cnxwindow.hxx | 12 ++++---- .../graphics/nxwidgets}/cprogressbar.hxx | 10 +++---- .../graphics/nxwidgets}/cradiobutton.hxx | 12 ++++---- .../graphics/nxwidgets}/cradiobuttongroup.hxx | 16 +++++------ .../graphics/nxwidgets}/crect.hxx | 8 +++--- .../graphics/nxwidgets}/crlepalettebitmap.hxx | 12 ++++---- .../graphics/nxwidgets}/cscaledbitmap.hxx | 12 ++++---- .../nxwidgets}/cscrollbarhorizontal.hxx | 16 +++++------ .../graphics/nxwidgets}/cscrollbarpanel.hxx | 24 ++++++++-------- .../nxwidgets}/cscrollbarvertical.hxx | 16 +++++------ .../graphics/nxwidgets}/cscrollinglistbox.hxx | 22 +++++++-------- .../graphics/nxwidgets}/cscrollingpanel.hxx | 14 +++++----- .../graphics/nxwidgets}/cscrollingtextbox.hxx | 18 ++++++------ .../graphics/nxwidgets}/csliderhorizontal.hxx | 14 +++++----- .../nxwidgets}/csliderhorizontalgrip.hxx | 10 +++---- .../graphics/nxwidgets}/cslidervertical.hxx | 14 +++++----- .../nxwidgets}/csliderverticalgrip.hxx | 10 +++---- .../graphics/nxwidgets}/cstickybutton.hxx | 12 ++++---- .../nxwidgets}/cstickybuttonarray.hxx | 12 ++++---- .../graphics/nxwidgets}/cstickyimage.hxx | 12 ++++---- .../graphics/nxwidgets}/cstringiterator.hxx | 8 +++--- .../graphics/nxwidgets}/ctabpanel.hxx | 16 +++++------ .../graphics/nxwidgets}/ctext.hxx | 16 +++++------ .../graphics/nxwidgets}/ctextbox.hxx | 18 ++++++------ .../graphics/nxwidgets}/cwidgetcontrol.hxx | 24 ++++++++-------- .../graphics/nxwidgets}/cwidgeteventargs.hxx | 12 ++++---- .../nxwidgets}/cwidgeteventhandler.hxx | 10 +++---- .../nxwidgets}/cwidgeteventhandlerlist.hxx | 12 ++++---- .../graphics/nxwidgets}/cwidgetstyle.hxx | 8 +++--- .../nxwidgets}/cwindoweventhandler.hxx | 10 +++---- .../nxwidgets}/cwindoweventhandlerlist.hxx | 12 ++++---- .../graphics/nxwidgets}/glyphs.hxx | 8 +++--- .../graphics/nxwidgets}/ibitmap.hxx | 8 +++--- .../graphics/nxwidgets}/ilistbox.hxx | 10 +++---- .../nxwidgets}/ilistdataeventhandler.hxx | 10 +++---- .../graphics/nxwidgets}/inxwindow.hxx | 8 +++--- .../graphics/nxwidgets}/iscrollable.hxx | 8 +++--- .../graphics/nxwidgets}/islider.hxx | 8 +++--- .../graphics/nxwidgets}/itextbox.hxx | 14 +++++----- .../graphics/nxwidgets}/nxconfig.hxx | 8 +++--- .../graphics/nxwidgets}/singletons.hxx | 10 +++---- .../graphics/nxwidgets}/teventargs.hxx | 8 +++--- .../graphics/nxwidgets}/tnxarray.hxx | 10 +++---- .../graphics/nxwm}/capplicationwindow.hxx | 26 ++++++++--------- .../graphics/nxwm}/ccalibration.hxx | 24 ++++++++-------- .../graphics/nxwm}/cfullscreenwindow.hxx | 14 +++++----- .../graphics/nxwm}/chexcalculator.hxx | 20 ++++++------- .../graphics/nxwm}/ckeyboard.hxx | 6 ++-- .../graphics/nxwm}/cmediaplayer.hxx | 28 +++++++++---------- .../graphics/nxwm}/cnxterm.hxx | 14 +++++----- .../graphics/nxwm}/cstartwindow.hxx | 14 +++++----- .../graphics/nxwm}/ctaskbar.hxx | 26 ++++++++--------- .../graphics/nxwm}/ctouchscreen.hxx | 12 ++++---- .../graphics/nxwm}/cwindowmessenger.hxx | 14 +++++----- .../graphics/nxwm}/iapplication.hxx | 12 ++++---- .../graphics/nxwm}/iapplicationwindow.hxx | 16 +++++------ .../graphics/nxwm}/nxwmconfig.hxx | 12 ++++---- .../graphics/nxwm}/nxwmglyphs.hxx | 12 ++++---- 281 files changed, 1293 insertions(+), 1522 deletions(-) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/.gitignore (100%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/COPYING (100%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/Kconfig (100%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/Make.defs (94%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/Makefile (93%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/doc/mainpage.h (100%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cbgwindow.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cbitmap.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cbutton.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cbuttonarray.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/ccallback.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/ccheckbox.cxx (95%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/ccyclebutton.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cglyphbutton.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cglyphsliderhorizontal.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cglyphsliderhorizontalgrip.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cgraphicsport.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cimage.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/ckeypad.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/clabel.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/clatchbutton.cxx (96%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/clatchbuttonarray.cxx (95%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/clistbox.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/clistboxdataitem.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/clistdata.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/clistdataitem.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cmultilinetextbox.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnumericedit.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxfont.cxx (96%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxserver.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxstring.cxx (99%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxtimer.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxtkwindow.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxtoolbar.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxwidget.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cnxwindow.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cprogressbar.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cradiobutton.cxx (95%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cradiobuttongroup.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/crect.cxx (99%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/crlepalettebitmap.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cscaledbitmap.cxx (99%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cscrollbarhorizontal.cxx (95%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cscrollbarpanel.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cscrollbarvertical.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cscrollinglistbox.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cscrollingpanel.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cscrollingtextbox.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/csliderhorizontal.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/csliderhorizontalgrip.cxx (96%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cslidervertical.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/csliderverticalgrip.cxx (96%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cstickybutton.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cstickybuttonarray.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cstickyimage.cxx (96%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cstringiterator.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/ctabpanel.cxx (95%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/ctext.cxx (99%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/ctextbox.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cwidgetcontrol.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cwidgeteventhandlerlist.cxx (98%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/cwindoweventhandlerlist.cxx (95%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_arrowdown.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_arrowleft.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_arrowright.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_arrowup.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_backspace.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_capslock.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_checkboxmu.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_checkboxoff.cxx (96%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_checkboxon.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_control.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_cycle.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_nxlogo160x160.cxx (99%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_nxlogo320x320.cxx (99%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_radiobuttonmu.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_radiobuttonoff.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_radiobuttonon.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_return.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_screendepthdown.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_screendepthup.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_screenflipdown.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_screenflipup.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_shift.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_windowclose.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_windowdepthdown.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/glyph_windowdepthup.cxx (97%) rename graphics/NxWidgets/{libnxwidgets => nxwidgets}/src/singletons.cxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cbgwindow.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cbitmap.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cbutton.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cbuttonarray.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ccallback.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ccheckbox.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ccyclebutton.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cglyphbutton.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cglyphsliderhorizontal.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cglyphsliderhorizontalgrip.hxx (94%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cgraphicsport.hxx (98%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cimage.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ckeypad.hxx (94%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clabel.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clatchbutton.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clatchbuttonarray.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clistbox.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clistboxdataitem.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clistdata.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clistdataeventargs.hxx (94%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/clistdataitem.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cmultilinetextbox.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnumericedit.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxfont.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxserver.hxx (93%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxstring.hxx (98%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxtimer.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxtkwindow.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxtoolbar.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxwidget.hxx (98%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cnxwindow.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cprogressbar.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cradiobutton.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cradiobuttongroup.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/crect.hxx (98%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/crlepalettebitmap.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cscaledbitmap.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cscrollbarhorizontal.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cscrollbarpanel.hxx (94%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cscrollbarvertical.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cscrollinglistbox.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cscrollingpanel.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cscrollingtextbox.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/csliderhorizontal.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/csliderhorizontalgrip.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cslidervertical.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/csliderverticalgrip.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cstickybutton.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cstickybuttonarray.hxx (94%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cstickyimage.hxx (94%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cstringiterator.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ctabpanel.hxx (90%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ctext.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ctextbox.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cwidgetcontrol.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cwidgeteventargs.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cwidgeteventhandler.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cwidgeteventhandlerlist.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cwidgetstyle.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cwindoweventhandler.hxx (92%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/cwindoweventhandlerlist.hxx (92%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/glyphs.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ibitmap.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ilistbox.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/ilistdataeventhandler.hxx (94%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/inxwindow.hxx (97%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/iscrollable.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/islider.hxx (96%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/itextbox.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/nxconfig.hxx (98%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/singletons.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/teventargs.hxx (95%) rename {graphics/NxWidgets/libnxwidgets/include => include/graphics/nxwidgets}/tnxarray.hxx (97%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/capplicationwindow.hxx (91%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/ccalibration.hxx (96%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/cfullscreenwindow.hxx (93%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/chexcalculator.hxx (95%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/ckeyboard.hxx (98%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/cmediaplayer.hxx (95%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/cnxterm.hxx (95%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/cstartwindow.hxx (96%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/ctaskbar.hxx (95%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/ctouchscreen.hxx (96%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/cwindowmessenger.hxx (92%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/iapplication.hxx (96%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/iapplicationwindow.hxx (93%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/nxwmconfig.hxx (98%) rename {graphics/NxWidgets/nxwm/include => include/graphics/nxwm}/nxwmglyphs.hxx (91%) diff --git a/graphics/NxWidgets/Doxygen/Doxyfile b/graphics/NxWidgets/Doxygen/Doxyfile index 75585cfba..13cf8dd25 100644 --- a/graphics/NxWidgets/Doxygen/Doxyfile +++ b/graphics/NxWidgets/Doxygen/Doxyfile @@ -574,7 +574,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = "../libnxwidgets" "../nxwm" +INPUT = "../nxwidgets" "../nxwm" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/graphics/NxWidgets/README.txt b/graphics/NxWidgets/README.txt index b3932743f..0d864afd7 100644 --- a/graphics/NxWidgets/README.txt +++ b/graphics/NxWidgets/README.txt @@ -59,7 +59,7 @@ Kconfig When copied to that location, it will be used by the NuttX configuration systems to configure settings for NxWidgets and NxWM -libnxwidgets +nxwidgets The source code, header files, and build environment for NxWidgets is provided in this directory. @@ -67,7 +67,7 @@ libnxwidgets UnitTests Provides a collection of unit-level tests for many of the individual - widgets provided by libnxwidgets. + widgets provided by nxwidgets. nxwm diff --git a/graphics/NxWidgets/UnitTests/CButton/Makefile b/graphics/NxWidgets/UnitTests/CButton/Makefile index 7aa3b9fc6..d6bb0a2d5 100644 --- a/graphics/NxWidgets/UnitTests/CButton/Makefile +++ b/graphics/NxWidgets/UnitTests/CButton/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CButton unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx b/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx index 73fea2e8b..bba1a7d1a 100644 --- a/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx +++ b/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx @@ -46,7 +46,7 @@ #include -#include "cbuttontest.hxx" +#include "nxwidgets/cbuttontest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx b/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx index d5b510766..9992882c7 100644 --- a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx +++ b/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbuttontest.hxx" -#include "cbgwindow.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbuttontest.hxx" +#include "nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx b/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx index 61c05d5a2..6424a69a3 100644 --- a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx +++ b/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx @@ -49,14 +49,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "cbutton.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/cbutton.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/Makefile b/graphics/NxWidgets/UnitTests/CButtonArray/Makefile index fb5810204..8e05fa088 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/Makefile +++ b/graphics/NxWidgets/UnitTests/CButtonArray/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CButtonArray unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx index bffb57169..76090db5d 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx +++ b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx @@ -47,8 +47,8 @@ #include -#include "cnxstring.hxx" -#include "cbuttonarraytest.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/cbuttonarraytest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx index e69cdd5fd..09625da88 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx +++ b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbuttonarraytest.hxx" -#include "cbgwindow.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbuttonarraytest.hxx" +#include "nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx index 9bbf2f48e..593c52a7b 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx +++ b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx @@ -49,14 +49,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "cbuttonarray.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/cbuttonarray.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/Makefile b/graphics/NxWidgets/UnitTests/CCheckBox/Makefile index 4ba4b5525..8b9a01432 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/Makefile +++ b/graphics/NxWidgets/UnitTests/CCheckBox/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CCheckBox unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx index 509c19489..99d3f6ec4 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx +++ b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx @@ -48,9 +48,9 @@ #include -#include "crlepalettebitmap.hxx" -#include "glyphs.hxx" -#include "ccheckboxtest.hxx" +#include "nxwidgets/crlepalettebitmap.hxx" +#include "nxwidgets/glyphs.hxx" +#include "nxwidgets/ccheckboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx index 15a1a6c88..0d26e56b2 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx +++ b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx @@ -47,11 +47,11 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "ccheckboxtest.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/ccheckboxtest.hxx" +#include "nxwidgets/cbitmap.hxx" +#include "nxwidgets/glyphs.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx index cf0dc58e2..586ebe6e3 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx +++ b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "ccheckbox.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/ccheckbox.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile b/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile index 0021304dc..bcd18c32f 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile +++ b/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CGlyphButton unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx index fbc5d1a52..712241ded 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx +++ b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx @@ -48,8 +48,8 @@ #include -#include "cglyphbuttontest.hxx" -#include "glyphs.hxx" +#include "nxwidgets/cglyphbuttontest.hxx" +#include "nxwidgets/glyphs.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx index 4f155ef45..e7ed69383 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx +++ b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cglyphbuttontest.hxx" -#include "cbgwindow.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cglyphbuttontest.hxx" +#include "nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx index 7eccb7454..3db971112 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx +++ b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx @@ -49,15 +49,15 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "cglyphbutton.hxx" -#include "cbitmap.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/cglyphbutton.hxx" +#include "nxwidgets/cbitmap.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile index e4e7a0df6..4d43f43d4 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile +++ b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CGlyphSliderHorizontal unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx index f088d5db9..21010f153 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx +++ b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx @@ -48,7 +48,7 @@ #include -#include "cglyphsliderhorizontaltest.hxx" +#include "nxwidgets/cglyphsliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx index d13156929..98d790b25 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx +++ b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx @@ -47,10 +47,10 @@ #include #include -#include "nxconfig.hxx" -#include "crlepalettebitmap.hxx" -#include "cbgwindow.hxx" -#include "cglyphsliderhorizontaltest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/crlepalettebitmap.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cglyphsliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx index d1253f087..aa0e8a984 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx +++ b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cglyphsliderhorizontal.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cglyphsliderhorizontal.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CImage/Makefile b/graphics/NxWidgets/UnitTests/CImage/Makefile index c30b6eae6..8f714b9ad 100644 --- a/graphics/NxWidgets/UnitTests/CImage/Makefile +++ b/graphics/NxWidgets/UnitTests/CImage/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CImage unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx b/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx index 4b6e70370..5f8fd5831 100644 --- a/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx +++ b/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx @@ -48,9 +48,9 @@ #include -#include "crlepalettebitmap.hxx" -#include "glyphs.hxx" -#include "cimagetest.hxx" +#include "nxwidgets/crlepalettebitmap.hxx" +#include "nxwidgets/glyphs.hxx" +#include "nxwidgets/cimagetest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx b/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx index addc1e20e..65eebb358 100644 --- a/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx +++ b/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx @@ -47,10 +47,10 @@ #include #include -#include "nxconfig.hxx" -#include "ibitmap.hxx" -#include "cbgwindow.hxx" -#include "cimagetest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/ibitmap.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cimagetest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx b/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx index 0be2e227b..c7ff9dd08 100644 --- a/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx +++ b/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx @@ -49,14 +49,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "cimage.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/cimage.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CKeypad/Makefile b/graphics/NxWidgets/UnitTests/CKeypad/Makefile index 52b0bc9f0..ccad82e9b 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/Makefile +++ b/graphics/NxWidgets/UnitTests/CKeypad/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CKeyPad unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx index d3d893331..2c40b1c27 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx +++ b/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx @@ -47,8 +47,8 @@ #include -#include "cnxstring.hxx" -#include "ckeypadtest.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/ckeypadtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx b/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx index 2b726685e..7cdaab2d3 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx +++ b/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx @@ -47,12 +47,12 @@ #include #include -#include "nxconfig.hxx" -#include "ckeypadtest.hxx" -#include "cbgwindow.hxx" -#include "cnxstring.hxx" -#include "cnxfont.hxx" -#include "crect.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/ckeypadtest.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/crect.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx b/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx index 6d1ad52a2..9d8ac76ff 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx +++ b/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx @@ -49,15 +49,15 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "ctextbox.hxx" -#include "ckeypad.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/ctextbox.hxx" +#include "nxwidgets/ckeypad.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLabel/Makefile b/graphics/NxWidgets/UnitTests/CLabel/Makefile index 0a0cf1029..ae7709c28 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/Makefile +++ b/graphics/NxWidgets/UnitTests/CLabel/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CLabel unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx b/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx index 68ec43dc6..b74c55473 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx +++ b/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx @@ -46,7 +46,7 @@ #include -#include "clabeltest.hxx" +#include "nxwidgets/clabeltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx b/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx index fa79a9566..de63a01ad 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx +++ b/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "clabeltest.hxx" -#include "cbgwindow.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/clabeltest.hxx" +#include "nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx b/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx index 58b6ec834..fe7558b2e 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx +++ b/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx @@ -49,14 +49,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "clabel.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/clabel.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/Makefile b/graphics/NxWidgets/UnitTests/CLatchButton/Makefile index 04e52760a..25cf23d40 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/Makefile +++ b/graphics/NxWidgets/UnitTests/CLatchButton/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CLatchButton unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx index 7e6ceab89..7ff5d3390 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx +++ b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx @@ -46,7 +46,7 @@ #include -#include "clatchbuttontest.hxx" +#include "nxwidgets/clatchbuttontest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx index e321a7cb8..43c96f27a 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx +++ b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "clatchbuttontest.hxx" -#include "cbgwindow.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/clatchbuttontest.hxx" +#include "nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx index c55e1003f..5ee6a6fb3 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx +++ b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx @@ -49,14 +49,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "clatchbutton.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/clatchbutton.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile b/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile index d7d66b920..a43bf3997 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile +++ b/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CLatchButtonArray unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx index 834cd32b5..a541a393e 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx +++ b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx @@ -47,8 +47,8 @@ #include -#include "cnxstring.hxx" -#include "clatchbuttonarraytest.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/clatchbuttonarraytest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx index e50349606..85acebe3a 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx +++ b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "clatchbuttonarraytest.hxx" -#include "cbgwindow.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/clatchbuttonarraytest.hxx" +#include "nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx index 1f0737a98..59be6b3c2 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx +++ b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx @@ -49,14 +49,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "clatchbuttonarray.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/clatchbuttonarray.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CListBox/Makefile b/graphics/NxWidgets/UnitTests/CListBox/Makefile index 5cc135a43..78e8ede0d 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/Makefile +++ b/graphics/NxWidgets/UnitTests/CListBox/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CListBox unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx index 62fe34271..ec682cd8d 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx +++ b/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx @@ -48,7 +48,7 @@ #include -#include "clistboxtest.hxx" +#include "nxwidgets/clistboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx b/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx index b6dc12c38..0c56eb199 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx +++ b/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "clistboxtest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/clistboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx b/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx index b58090e7b..ce457de14 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx +++ b/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "clistbox.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/clistbox.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/Makefile b/graphics/NxWidgets/UnitTests/CProgressBar/Makefile index 7963fcf36..d85ddd0c6 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/Makefile +++ b/graphics/NxWidgets/UnitTests/CProgressBar/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CProgressBar unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx index 1d5c8f85e..4d50b7ae1 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx +++ b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx @@ -48,7 +48,7 @@ #include -#include "cprogressbartest.hxx" +#include "nxwidgets/cprogressbartest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx index a44e0a6d5..aa392ecfa 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx +++ b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "cprogressbartest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cprogressbartest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx index 5a1312660..2cd079330 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx +++ b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cprogressbar.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cprogressbar.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/Makefile b/graphics/NxWidgets/UnitTests/CRadioButton/Makefile index 799c42470..fa8a0407c 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/Makefile +++ b/graphics/NxWidgets/UnitTests/CRadioButton/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CRadioButton unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx index d7a7cc2ef..5217c47f2 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx +++ b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx @@ -48,9 +48,9 @@ #include -#include "crlepalettebitmap.hxx" -#include "glyphs.hxx" -#include "cradiobuttontest.hxx" +#include "nxwidgets/crlepalettebitmap.hxx" +#include "nxwidgets/glyphs.hxx" +#include "nxwidgets/cradiobuttontest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx index b8b625267..6196aa352 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx +++ b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx @@ -47,11 +47,11 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "cradiobuttontest.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cradiobuttontest.hxx" +#include "nxwidgets/cbitmap.hxx" +#include "nxwidgets/glyphs.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx index c0af7092c..65e574bdb 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx +++ b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx @@ -49,13 +49,13 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cradiobutton.hxx" -#include "cradiobuttongroup.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cradiobutton.hxx" +#include "nxwidgets/cradiobuttongroup.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile index 3c982d6e0..c0944ad1f 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile +++ b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CScrollbarHorizontal unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx index f1c5a3b4c..2f1f7bca3 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx +++ b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx @@ -48,7 +48,7 @@ #include -#include "cscrollbarhorizontaltest.hxx" +#include "nxwidgets/cscrollbarhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx index 2847bd11c..f08a2712a 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx +++ b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "cscrollbarhorizontaltest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cscrollbarhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx index d8d44467f..b3d9729cc 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx +++ b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cscrollbarhorizontal.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cscrollbarhorizontal.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile b/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile index 797e7b416..e9c677a0a 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile +++ b/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CScrollbarVertical unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx index 5a026e1e2..f24ebebc5 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx +++ b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx @@ -48,7 +48,7 @@ #include -#include "cscrollbarverticaltest.hxx" +#include "nxwidgets/cscrollbarverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx index 80d5848e7..321b08f7c 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx +++ b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "cscrollbarverticaltest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cscrollbarverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx index f14140c75..aada208fe 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx +++ b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cscrollbarvertical.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cscrollbarvertical.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile b/graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile index 0e2a99526..048416bd6 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile +++ b/graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CSliderHorizontal unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx index 846954c3f..f1c2191fb 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx +++ b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx @@ -48,7 +48,7 @@ #include -#include "csliderhorizontaltest.hxx" +#include "nxwidgets/csliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx index fb6773996..80e2583f0 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx +++ b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "csliderhorizontaltest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/csliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx index 40b62e90c..8fd656f86 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx +++ b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "csliderhorizontal.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/csliderhorizontal.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile b/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile index 41d29ae1f..e8d2412fd 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile +++ b/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CSliderVertical unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx index 5817a2de4..c90e828e0 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx +++ b/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx @@ -48,7 +48,7 @@ #include -#include "csliderverticaltest.hxx" +#include "nxwidgets/csliderverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx b/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx index 4ff61d374..d6f6f6802 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx +++ b/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx @@ -48,9 +48,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbgwindow.hxx" -#include "csliderverticaltest.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/csliderverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx b/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx index e9d990ff7..01a7c35dd 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx +++ b/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx @@ -49,12 +49,12 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cslidervertical.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cslidervertical.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CTextBox/Makefile b/graphics/NxWidgets/UnitTests/CTextBox/Makefile index 09fda632a..a18ac1616 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/Makefile +++ b/graphics/NxWidgets/UnitTests/CTextBox/Makefile @@ -35,17 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} -endif - # CTextBox unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx b/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx index a24f434d5..0478f346d 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx +++ b/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx @@ -46,7 +46,7 @@ #include -#include "ctextboxtest.hxx" +#include "nxwidgets/ctextboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx b/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx index 64c7a679a..3f6879ded 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx +++ b/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx @@ -48,9 +48,9 @@ #include #include -#include "nxconfig.hxx" -#include "ctextboxtest.hxx" -#include "cbgwindow.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/ctextboxtest.hxx" +#include "nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx b/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx index 1c5898717..bf458cd4e 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx +++ b/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx @@ -49,14 +49,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" -#include "cbgwindow.hxx" -#include "cnxserver.hxx" -#include "cnxfont.hxx" -#include "cnxstring.hxx" -#include "ctextbox.hxx" +#include "nxwidgets/nxconfig.hxx" +#include "nxwidgets/cwidgetcontrol.hxx" +#include "nxwidgets/ccallback.hxx" +#include "nxwidgets/cbgwindow.hxx" +#include "nxwidgets/cnxserver.hxx" +#include "nxwidgets/cnxfont.hxx" +#include "nxwidgets/cnxstring.hxx" +#include "nxwidgets/ctextbox.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/nxwm/Makefile b/graphics/NxWidgets/UnitTests/nxwm/Makefile index 500222378..b96cf1f38 100644 --- a/graphics/NxWidgets/UnitTests/nxwm/Makefile +++ b/graphics/NxWidgets/UnitTests/nxwm/Makefile @@ -35,24 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets" -NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include" - -NXWM_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)nxwm" -NXWM_INC = "$(NXWM_DIR)$(DELIM)include" - -ifeq ($(WINTOOL),y) - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} - CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWM_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWM_INC)"} -else - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} - CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWM_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} - CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWM_INC)"} -endif - # NxWM unit test ASRCS = diff --git a/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx b/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx index 13d112086..ecbace455 100644 --- a/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx +++ b/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx @@ -53,26 +53,26 @@ # include "platform/cxxinitialize.h" #endif -#include "ctaskbar.hxx" -#include "cstartwindow.hxx" +#include "graphics/nxwm/ctaskbar.hxx" +#include "graphics/nxwm/cstartwindow.hxx" #ifdef CONFIG_NXWM_NXTERM -# include "cnxterm.hxx" +# include "graphics/nxwm/cnxterm.hxx" #endif -#include "chexcalculator.hxx" +#include "graphics/nxwm/chexcalculator.hxx" #ifdef CONFIG_NXWM_MEDIAPLAYER -# include "cmediaplayer.hxx" +# include "graphics/nxwm/cmediaplayer.hxx" #endif #ifdef CONFIG_NXWM_TOUCHSCREEN -# include "ctouchscreen.hxx" -# include "ccalibration.hxx" +# include "graphics/nxwm/ctouchscreen.hxx" +# include "graphics/nxwm/ccalibration.hxx" #endif #ifdef CONFIG_NXWM_KEYBOARD -# include "ckeyboard.hxx" +# include "graphics/nxwm/ckeyboard.hxx" #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/graphics/NxWidgets/libnxwidgets/.gitignore b/graphics/NxWidgets/nxwidgets/.gitignore similarity index 100% rename from graphics/NxWidgets/libnxwidgets/.gitignore rename to graphics/NxWidgets/nxwidgets/.gitignore diff --git a/graphics/NxWidgets/libnxwidgets/COPYING b/graphics/NxWidgets/nxwidgets/COPYING similarity index 100% rename from graphics/NxWidgets/libnxwidgets/COPYING rename to graphics/NxWidgets/nxwidgets/COPYING diff --git a/graphics/NxWidgets/libnxwidgets/Kconfig b/graphics/NxWidgets/nxwidgets/Kconfig similarity index 100% rename from graphics/NxWidgets/libnxwidgets/Kconfig rename to graphics/NxWidgets/nxwidgets/Kconfig diff --git a/graphics/NxWidgets/libnxwidgets/Make.defs b/graphics/NxWidgets/nxwidgets/Make.defs similarity index 94% rename from graphics/NxWidgets/libnxwidgets/Make.defs rename to graphics/NxWidgets/nxwidgets/Make.defs index e724dec62..67b0a96ed 100644 --- a/graphics/NxWidgets/libnxwidgets/Make.defs +++ b/graphics/NxWidgets/nxwidgets/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/libnxwidgets/Make.defs +# apps/graphics/NxWidgets/nxwidgets/Make.defs # Adds selected applications to apps/ build # # Copyright (C) Gregory Nutt. All rights reserved. @@ -35,6 +35,6 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS),y) -CONFIGURED_APPS += graphics/NxWidgets/libnxwidgets +CONFIGURED_APPS += graphics/NxWidgets/nxwidgets endif diff --git a/graphics/NxWidgets/libnxwidgets/Makefile b/graphics/NxWidgets/nxwidgets/Makefile similarity index 93% rename from graphics/NxWidgets/libnxwidgets/Makefile rename to graphics/NxWidgets/nxwidgets/Makefile index 2b05e0f1b..a77d3bde2 100644 --- a/graphics/NxWidgets/libnxwidgets/Makefile +++ b/graphics/NxWidgets/nxwidgets/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# appx/graphics/NxWidgets/libnxwidgets/Makefile +# appx/graphics/NxWidgets/nxwidgets/Makefile # # Copyright (C) 2012-2014, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -35,8 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWIDGETDIR := ${shell pwd | sed -e 's/ /\\ /g'} - ASRCS = CSRCS = @@ -75,9 +73,6 @@ CXXSRCS += glyph_capslock.cxx glyph_radiobuttonon.cxx glyph_windowdepthdown.cxx CXXSRCS += glyph_checkboxmu.cxx glyph_return.cxx glyph_windowdepthup.cxx CXXSRCS += glyph_checkboxoff.cxx glyph_screendepthdown.cxx -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} -CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} - VPATH = src include $(APPDIR)/Application.mk diff --git a/graphics/NxWidgets/libnxwidgets/doc/mainpage.h b/graphics/NxWidgets/nxwidgets/doc/mainpage.h similarity index 100% rename from graphics/NxWidgets/libnxwidgets/doc/mainpage.h rename to graphics/NxWidgets/nxwidgets/doc/mainpage.h diff --git a/graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx b/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx rename to graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx index 7816e8dac..57c5a90fe 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,9 +42,9 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cbgwindow.hxx" -#include "cbitmap.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cbitmap.cxx b/graphics/NxWidgets/nxwidgets/src/cbitmap.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cbitmap.cxx rename to graphics/NxWidgets/nxwidgets/src/cbitmap.cxx index 0d52e0a5d..326ff8ee8 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cbitmap.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cbitmap.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cbitmap.hxx + * apps/graphics/NxWidgets/nxwidgets/src/cbitmap.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,7 +79,7 @@ #include -#include "cbitmap.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cbutton.cxx b/graphics/NxWidgets/nxwidgets/src/cbutton.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cbutton.cxx rename to graphics/NxWidgets/nxwidgets/src/cbutton.cxx index f26a273aa..714c8af36 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cbutton.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cbutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cbutton.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cbutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,8 +79,8 @@ #include -#include "cbutton.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cbutton.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cbuttonarray.cxx b/graphics/NxWidgets/nxwidgets/src/cbuttonarray.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cbuttonarray.cxx rename to graphics/NxWidgets/nxwidgets/src/cbuttonarray.cxx index a362a60d3..c33549e82 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cbuttonarray.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cbuttonarray.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.cxx + * apps/graphics/NxWidgets/nxwidgets/include/cbuttonarray.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,9 +44,9 @@ #include -#include "cbuttonarray.hxx" -#include "cgraphicsport.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cbuttonarray.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/ccallback.cxx b/graphics/NxWidgets/nxwidgets/src/ccallback.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/ccallback.cxx rename to graphics/NxWidgets/nxwidgets/src/ccallback.cxx index 61594943d..883191743 100644 --- a/graphics/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/graphics/NxWidgets/nxwidgets/src/ccallback.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/ccallback.cxx + * apps/graphics/NxWidgets/nxwidgets/src/ccallback.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,8 +48,8 @@ # include #endif -#include "cwidgetcontrol.hxx" -#include "ccallback.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/ccallback.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx b/graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx rename to graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx index 399663e73..d6b28cf2f 100644 --- a/graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx +++ b/graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx + * apps/graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,13 +76,13 @@ #include #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "ccheckbox.hxx" -#include "cgraphicsport.hxx" -#include "cbitmap.hxx" -#include "singletons.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/ccheckbox.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/singletons.hxx" +#include "graphics/nxwidgets/glyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx b/graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx rename to graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx index 8460abec7..c92701ada 100644 --- a/graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx +++ b/graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx + * apps/graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,10 +79,10 @@ #include -#include "ccyclebutton.hxx" -#include "cgraphicsport.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/ccyclebutton.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx b/graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx rename to graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx index 3ac3f8e8e..870ae77a5 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,11 +79,11 @@ #include -#include "nxconfig.hxx" -#include "cglyphbutton.hxx" -#include "cgraphicsport.hxx" -#include "cbitmap.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cglyphbutton.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx b/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx rename to graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx index 05699b92f..b731ec7de 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -79,12 +79,12 @@ #include #include -#include "ibitmap.hxx" -#include "cwidgetcontrol.hxx" -#include "cglyphsliderhorizontal.hxx" -#include "cglyphsliderhorizontalgrip.hxx" -#include "cimage.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cglyphsliderhorizontal.hxx" +#include "graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx" +#include "graphics/nxwidgets/cimage.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx b/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx rename to graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx index 19f956a85..50ff5a0d1 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -73,8 +73,8 @@ * Included Files ****************************************************************************/ -#include "cglyphsliderhorizontalgrip.hxx" -#include "ibitmap.hxx" +#include "graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx b/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx rename to graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx index 5ef051915..d5c7c6457 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -82,15 +82,15 @@ #include #include -#include "nxconfig.hxx" -#include "inxwindow.hxx" -#include "cnxstring.hxx" -#include "crect.hxx" -#include "cnxfont.hxx" -#include "cgraphicsport.hxx" -#include "cwidgetstyle.hxx" -#include "cbitmap.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/inxwindow.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/crect.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cimage.cxx b/graphics/NxWidgets/nxwidgets/src/cimage.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cimage.cxx rename to graphics/NxWidgets/nxwidgets/src/cimage.cxx index 7f5b370e2..ddb5794e0 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cimage.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cimage.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cimage.cxx + * apps/graphics/NxWidgets/nxwidgets/include/cimage.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,11 +79,11 @@ #include -#include "nxconfig.hxx" -#include "cgraphicsport.hxx" -#include "ibitmap.hxx" -#include "cbitmap.hxx" -#include "cimage.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/cimage.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx b/graphics/NxWidgets/nxwidgets/src/ckeypad.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx rename to graphics/NxWidgets/nxwidgets/src/ckeypad.cxx index 069b1a355..aaf13b50f 100644 --- a/graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx +++ b/graphics/NxWidgets/nxwidgets/src/ckeypad.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx + * apps/graphics/NxWidgets/nxwidgets/src/ckeypad.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,9 +45,9 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cwidgetstyle.hxx" -#include "ckeypad.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/ckeypad.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/clabel.cxx b/graphics/NxWidgets/nxwidgets/src/clabel.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/clabel.cxx rename to graphics/NxWidgets/nxwidgets/src/clabel.cxx index 7c2a9f218..f7654571c 100644 --- a/graphics/NxWidgets/libnxwidgets/src/clabel.cxx +++ b/graphics/NxWidgets/nxwidgets/src/clabel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/clabel.cxx + * apps/graphics/NxWidgets/nxwidgets/src/clabel.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,9 +79,9 @@ #include -#include "nxconfig.hxx" -#include "clabel.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx b/graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx rename to graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx index 22ba42d91..6f5b47ec3 100644 --- a/graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx +++ b/graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx + * apps/graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,9 +79,9 @@ #include -#include "cstickybutton.hxx" -#include "clatchbutton.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cstickybutton.hxx" +#include "graphics/nxwidgets/clatchbutton.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx b/graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx rename to graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx index dde71d755..96d85f41d 100644 --- a/graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx +++ b/graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx + * apps/graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,9 +45,9 @@ #include -#include "cstickybuttonarray.hxx" -#include "clatchbuttonarray.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cstickybuttonarray.hxx" +#include "graphics/nxwidgets/clatchbuttonarray.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/clistbox.cxx b/graphics/NxWidgets/nxwidgets/src/clistbox.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/clistbox.cxx rename to graphics/NxWidgets/nxwidgets/src/clistbox.cxx index 1c8db483e..4410a16c5 100644 --- a/graphics/NxWidgets/libnxwidgets/src/clistbox.cxx +++ b/graphics/NxWidgets/nxwidgets/src/clistbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/clistbox.cxx + * apps/graphics/NxWidgets/nxwidgets/src/clistbox.cxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,11 +76,11 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "clistbox.hxx" -#include "cgraphicsport.hxx" -#include "cnxfont.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/clistbox.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx b/graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx rename to graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx index 980519a3b..113a1495f 100644 --- a/graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx +++ b/graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx + * apps/graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,8 +76,8 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "clistboxdataitem.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/clistboxdataitem.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/clistdata.cxx b/graphics/NxWidgets/nxwidgets/src/clistdata.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/clistdata.cxx rename to graphics/NxWidgets/nxwidgets/src/clistdata.cxx index 952cc697e..4ce860ea5 100644 --- a/graphics/NxWidgets/libnxwidgets/src/clistdata.cxx +++ b/graphics/NxWidgets/nxwidgets/src/clistdata.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/clistdata.cxx + * apps/graphics/NxWidgets/nxwidgets/src/clistdata.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -77,8 +77,8 @@ #include #include -#include "clistdata.hxx" -#include "ilistdataeventhandler.hxx" +#include "graphics/nxwidgets/clistdata.hxx" +#include "graphics/nxwidgets/ilistdataeventhandler.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/clistdataitem.cxx b/graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/clistdataitem.cxx rename to graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx index 1db0d92e9..9bb20ec50 100644 --- a/graphics/NxWidgets/libnxwidgets/src/clistdataitem.cxx +++ b/graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/clistdataitem.cxx + * apps/graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,8 +76,8 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "clistdataitem.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/clistdataitem.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx b/graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx rename to graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx index 7bf027e94..7dbf52c7c 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,14 +76,14 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cnxfont.hxx" -#include "ctext.hxx" -#include "cgraphicsport.hxx" -#include "singletons.hxx" -#include "cstringiterator.hxx" -#include "cnxtimer.hxx" -#include "cmultilinetextbox.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/ctext.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/singletons.hxx" +#include "graphics/nxwidgets/cstringiterator.hxx" +#include "graphics/nxwidgets/cnxtimer.hxx" +#include "graphics/nxwidgets/cmultilinetextbox.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnumericedit.cxx b/graphics/NxWidgets/nxwidgets/src/cnumericedit.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cnumericedit.cxx rename to graphics/NxWidgets/nxwidgets/src/cnumericedit.cxx index 2a41608a5..a5c9bdbed 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnumericedit.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnumericedit.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnumericedit.cxx + * apps/graphics/NxWidgets/nxwidgets/include/cnumericedit.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -82,10 +82,10 @@ #include #include -#include "cnumericedit.hxx" -#include "cbutton.hxx" -#include "clabel.hxx" -#include "cnxtimer.hxx" +#include "graphics/nxwidgets/cnumericedit.hxx" +#include "graphics/nxwidgets/cbutton.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/cnxtimer.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxfont.cxx b/graphics/NxWidgets/nxwidgets/src/cnxfont.cxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/src/cnxfont.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxfont.cxx index b73f4d4a6..629505916 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxfont.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxfont.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxfont.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxfont.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,11 +47,11 @@ #include #include -#include "nxconfig.hxx" -#include "cnxstring.hxx" -#include "cstringiterator.hxx" -#include "cnxfont.hxx" -#include "cbitmap.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cstringiterator.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxserver.cxx b/graphics/NxWidgets/nxwidgets/src/cnxserver.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cnxserver.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxserver.cxx index 759431ecb..ef7cea1a2 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxserver.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxserver.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxserver.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxserver.cxx * * Copyright (C) 2012, 2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -58,9 +58,9 @@ # include #endif -#include "nxconfig.hxx" -#include "singletons.hxx" -#include "cnxserver.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/singletons.hxx" +#include "graphics/nxwidgets/cnxserver.hxx" /**************************************************************************** * Static Data Members diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxstring.cxx b/graphics/NxWidgets/nxwidgets/src/cnxstring.cxx similarity index 99% rename from graphics/NxWidgets/libnxwidgets/src/cnxstring.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxstring.cxx index e262e23e1..ad3d08876 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxstring.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxstring.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxstring.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxstring.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -78,8 +78,8 @@ #include #include -#include "cnxstring.hxx" -#include "cstringiterator.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cstringiterator.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxtimer.cxx b/graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cnxtimer.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx index acc28964a..555f6b84d 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxtimer.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxtimer.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -83,7 +83,7 @@ #include #include -#include "cnxtimer.hxx" +#include "graphics/nxwidgets/cnxtimer.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx b/graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx index 3874f360d..0b7626c01 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,10 +44,10 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cnxtkwindow.hxx" -#include "cnxtoolbar.hxx" -#include "cbitmap.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cnxtkwindow.hxx" +#include "graphics/nxwidgets/cnxtoolbar.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx b/graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx index 8f5198a7e..a47916380 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,9 +42,9 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cnxtoolbar.hxx" -#include "cbitmap.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cnxtoolbar.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxwidget.cxx b/graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cnxwidget.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx index f6a756490..f999aab72 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxwidget.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxwidget.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,14 +76,14 @@ #include #include -#include "cnxwidget.hxx" -#include "cgraphicsport.hxx" -#include "cwidgeteventhandler.hxx" -#include "cnxfont.hxx" -#include "cwidgetstyle.hxx" -#include "cwidgeteventargs.hxx" -#include "cwidgetcontrol.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cnxwindow.cxx b/graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cnxwindow.cxx rename to graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx index 3702e5c88..1d5fe6695 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cnxwindow.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cnxwindow.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx * * Copyright (C) 2012, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,9 +42,9 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cnxwindow.hxx" -#include "cbitmap.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cnxwindow.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cprogressbar.cxx b/graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cprogressbar.cxx rename to graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx index 11af436cc..e7b8251f5 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cprogressbar.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cprogressbar.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,8 +81,8 @@ #include -#include "cprogressbar.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cprogressbar.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cradiobutton.cxx b/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/src/cradiobutton.cxx rename to graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx index 8f1c04345..676938839 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cradiobutton.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cradiobutton.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,13 +79,13 @@ #include -#include "cwidgetcontrol.hxx" -#include "cradiobutton.hxx" -#include "cradiobuttongroup.hxx" -#include "cgraphicsport.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cradiobutton.hxx" +#include "graphics/nxwidgets/cradiobuttongroup.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx b/graphics/NxWidgets/nxwidgets/src/cradiobuttongroup.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx rename to graphics/NxWidgets/nxwidgets/src/cradiobuttongroup.cxx index 062aee07a..7ee4a8763 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cradiobuttongroup.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cradiobutton.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,9 +79,9 @@ #include -#include "cradiobuttongroup.hxx" -#include "cradiobutton.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cradiobuttongroup.hxx" +#include "graphics/nxwidgets/cradiobutton.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/crect.cxx b/graphics/NxWidgets/nxwidgets/src/crect.cxx similarity index 99% rename from graphics/NxWidgets/libnxwidgets/src/crect.cxx rename to graphics/NxWidgets/nxwidgets/src/crect.cxx index 6cca00109..5944f3d58 100644 --- a/graphics/NxWidgets/libnxwidgets/src/crect.cxx +++ b/graphics/NxWidgets/nxwidgets/src/crect.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,7 +76,7 @@ #include #include -#include "crect.hxx" +#include "graphics/nxwidgets/crect.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx b/graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx rename to graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.cxx index 9d7e52636..855693d11 100644 --- a/graphics/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx +++ b/graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/crlepalettebitmap.hxx + * apps/graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,8 +79,8 @@ #include -#include "nxconfig.hxx" -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx b/graphics/NxWidgets/nxwidgets/src/cscaledbitmap.cxx similarity index 99% rename from graphics/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx rename to graphics/NxWidgets/nxwidgets/src/cscaledbitmap.cxx index 0e4c71a0a..f20fce23f 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cscaledbitmap.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cscaledbitmap.hxx + * apps/graphics/NxWidgets/nxwidgets/src/cscaledbitmap.hxx * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include -#include "cscaledbitmap.hxx" +#include "graphics/nxwidgets/cscaledbitmap.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx b/graphics/NxWidgets/nxwidgets/src/cscrollbarhorizontal.cxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx rename to graphics/NxWidgets/nxwidgets/src/cscrollbarhorizontal.cxx index 53f1ce184..9ccf40026 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cscrollbarhorizontal.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx + * apps/graphics/NxWidgets/nxwidgets/include/cscrollbarhorizontal.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -78,15 +78,15 @@ #include -#include "nxconfig.hxx" -#include "cnxwidget.hxx" -#include "cwidgeteventhandler.hxx" -#include "islider.hxx" -#include "cscrollbarhorizontal.hxx" -#include "cglyphbutton.hxx" -#include "csliderhorizontal.hxx" -#include "cnxtimer.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/islider.hxx" +#include "graphics/nxwidgets/cscrollbarhorizontal.hxx" +#include "graphics/nxwidgets/cglyphbutton.hxx" +#include "graphics/nxwidgets/csliderhorizontal.hxx" +#include "graphics/nxwidgets/cnxtimer.hxx" +#include "graphics/nxwidgets/glyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cscrollbarpanel.cxx b/graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cscrollbarpanel.cxx rename to graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx index 0fe685d70..3b179d1c7 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cscrollbarpanel.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cscrollbarpanel.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,8 +76,8 @@ #include #include -#include "cscrollbarpanel.hxx" -#include "cbutton.hxx" +#include "graphics/nxwidgets/cscrollbarpanel.hxx" +#include "graphics/nxwidgets/cbutton.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx b/graphics/NxWidgets/nxwidgets/src/cscrollbarvertical.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx rename to graphics/NxWidgets/nxwidgets/src/cscrollbarvertical.cxx index 94931cd79..0ca6dd5ec 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cscrollbarvertical.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx + * apps/graphics/NxWidgets/nxwidgets/include/cscrollbarhorizontal.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -78,12 +78,12 @@ #include -#include "nxconfig.hxx" -#include "cscrollbarvertical.hxx" -#include "cglyphbutton.hxx" -#include "cslidervertical.hxx" -#include "cnxtimer.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cscrollbarvertical.hxx" +#include "graphics/nxwidgets/cglyphbutton.hxx" +#include "graphics/nxwidgets/cslidervertical.hxx" +#include "graphics/nxwidgets/cnxtimer.hxx" +#include "graphics/nxwidgets/glyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx b/graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx rename to graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx index 9886563ef..a6fe8c23d 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,9 +76,9 @@ #include #include -#include "cscrollinglistbox.hxx" -#include "cscrollbarvertical.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cscrollinglistbox.hxx" +#include "graphics/nxwidgets/cscrollbarvertical.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx b/graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx rename to graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx index 0000a2a3f..d0561a274 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -77,10 +77,10 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cscrollingpanel.hxx" -#include "cgraphicsport.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cscrollingpanel.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx b/graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx rename to graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx index fbe0b4a28..4de9fdb1d 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,9 +76,9 @@ #include #include -#include "cscrollingtextbox.hxx" -#include "cscrollbarvertical.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cscrollingtextbox.hxx" +#include "graphics/nxwidgets/cscrollbarvertical.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx b/graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx rename to graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx index b94dea2de..06dd4baf0 100644 --- a/graphics/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx +++ b/graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx + * apps/graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,10 +76,10 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "csliderhorizontal.hxx" -#include "csliderhorizontalgrip.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/csliderhorizontal.hxx" +#include "graphics/nxwidgets/csliderhorizontalgrip.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx b/graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx rename to graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx index fca1cc12d..9483890e2 100644 --- a/graphics/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx +++ b/graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx + * apps/graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,10 +76,10 @@ #include #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "csliderhorizontalgrip.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/csliderhorizontalgrip.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cslidervertical.cxx b/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cslidervertical.cxx rename to graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx index 6d483688b..a9afc0105 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cslidervertical.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cslidervertical.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,10 +76,10 @@ #include #include -#include "cwidgetcontrol.hxx" -#include "cslidervertical.hxx" -#include "csliderverticalgrip.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cslidervertical.hxx" +#include "graphics/nxwidgets/csliderverticalgrip.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx b/graphics/NxWidgets/nxwidgets/src/csliderverticalgrip.cxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx rename to graphics/NxWidgets/nxwidgets/src/csliderverticalgrip.cxx index 0c7413403..db5d40473 100644 --- a/graphics/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx +++ b/graphics/NxWidgets/nxwidgets/src/csliderverticalgrip.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cslidervertical.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,10 +76,10 @@ #include #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "csliderverticalgrip.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/csliderverticalgrip.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cstickybutton.cxx b/graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cstickybutton.cxx rename to graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx index d00c094ad..f77af1f0c 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cstickybutton.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cstickybutton.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,8 +79,8 @@ #include -#include "cstickybutton.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cstickybutton.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx b/graphics/NxWidgets/nxwidgets/src/cstickybuttonarray.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx rename to graphics/NxWidgets/nxwidgets/src/cstickybuttonarray.cxx index 57f51168f..089714f80 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cstickybuttonarray.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.cxx + * apps/graphics/NxWidgets/nxwidgets/include/cstickybuttonarray.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,9 +44,9 @@ #include -#include "cstickybuttonarray.hxx" -#include "cgraphicsport.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cstickybuttonarray.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cstickyimage.cxx b/graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/src/cstickyimage.cxx rename to graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx index af4eb945b..a28b43ed0 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cstickyimage.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cstickyimage.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,8 +45,8 @@ #include -#include "cstickyimage.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cstickyimage.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cstringiterator.cxx b/graphics/NxWidgets/nxwidgets/src/cstringiterator.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/cstringiterator.cxx rename to graphics/NxWidgets/nxwidgets/src/cstringiterator.cxx index bd0b4d54a..188bf6758 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cstringiterator.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cstringiterator.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,8 +76,8 @@ #include #include -#include "cnxstring.hxx" -#include "cstringiterator.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cstringiterator.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/ctabpanel.cxx b/graphics/NxWidgets/nxwidgets/src/ctabpanel.cxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/src/ctabpanel.cxx rename to graphics/NxWidgets/nxwidgets/src/ctabpanel.cxx index 1f448cc45..714d6853a 100644 --- a/graphics/NxWidgets/libnxwidgets/src/ctabpanel.cxx +++ b/graphics/NxWidgets/nxwidgets/src/ctabpanel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/ctabpanel.hxx + * apps/graphics/NxWidgets/nxwidgets/src/ctabpanel.hxx * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Petteri Aimonen @@ -44,9 +44,9 @@ #include -#include "ctabpanel.hxx" -#include "cgraphicsport.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/ctabpanel.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/ctext.cxx b/graphics/NxWidgets/nxwidgets/src/ctext.cxx similarity index 99% rename from graphics/NxWidgets/libnxwidgets/src/ctext.cxx rename to graphics/NxWidgets/nxwidgets/src/ctext.cxx index 65baa9e9b..f63684b6d 100644 --- a/graphics/NxWidgets/libnxwidgets/src/ctext.cxx +++ b/graphics/NxWidgets/nxwidgets/src/ctext.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/ctext.cxx + * apps/graphics/NxWidgets/nxwidgets/src/ctext.cxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,8 +76,8 @@ #include #include -#include "ctext.hxx" -#include "cstringiterator.hxx" +#include "graphics/nxwidgets/ctext.hxx" +#include "graphics/nxwidgets/cstringiterator.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/ctextbox.cxx b/graphics/NxWidgets/nxwidgets/src/ctextbox.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/ctextbox.cxx rename to graphics/NxWidgets/nxwidgets/src/ctextbox.cxx index 9771d1e32..31a855cbd 100644 --- a/graphics/NxWidgets/libnxwidgets/src/ctextbox.cxx +++ b/graphics/NxWidgets/nxwidgets/src/ctextbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/ctextbox.cxx + * apps/graphics/NxWidgets/nxwidgets/src/ctextbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,11 +79,11 @@ #include -#include "nxconfig.hxx" -#include "ctextbox.hxx" -#include "cgraphicsport.hxx" -#include "cnxtimer.hxx" -#include "cstringiterator.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ctextbox.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cnxtimer.hxx" +#include "graphics/nxwidgets/cstringiterator.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx b/graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx rename to graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx index 4e6dc7f3f..786a23caf 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,15 +45,15 @@ #include #include -#include "nxconfig.hxx" -#include "cnxserver.hxx" -#include "cnxwidget.hxx" -#include "cnxfont.hxx" -#include "cwidgetstyle.hxx" -#include "cnxtimer.hxx" -#include "cgraphicsport.hxx" -#include "cwidgetcontrol.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cnxserver.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxtimer.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx b/graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx rename to graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx index 8a6fbcdad..a22b2545e 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,9 +76,9 @@ #include #include -#include "cnxwidget.hxx" -#include "cwidgeteventhandler.hxx" -#include "cwidgeteventargs.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx b/graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx rename to graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx index d49f5b0f1..f83a357d0 100644 --- a/graphics/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx +++ b/graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx + * apps/graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,10 +37,10 @@ * Included Files ****************************************************************************/ -#include "nxconfig.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" -#include "cwindoweventhandler.hxx" -#include "cwindoweventhandlerlist.hxx" +#include "graphics/nxwidgets/cwindoweventhandler.hxx" +#include "graphics/nxwidgets/cwindoweventhandlerlist.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx index df9e1f414..d4dc2db39 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_arrowleft.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_arrowleft.cxx index d498e01e1..fa2026a4c 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_arrowleft.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_glypharrowleft.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_glypharrowleft.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx index cc40dc855..234119596 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx index b2b7cd5e4..6e4a994a3 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_backspace.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_backspace.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx index ec3746b69..23e8c2147 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_backspace.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_backspace.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_capslock.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_capslock.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx index b991a6655..096ee5931 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_capslock.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_capslock.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx index 21692a3d6..91aa9c58c 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx index 3c6fcf82d..3ae09b77c 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -80,9 +80,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx index ea03ba16f..93340cad8 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_control.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_control.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_control.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_control.cxx index 0736555b8..885eaef7d 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_control.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_control.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_control.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_control.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_cycle.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_cycle.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx index db81d8fce..e81b4b0f5 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_cycle.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_cycle.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx similarity index 99% rename from graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx index 6235480ce..c429346d9 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "crlepalettebitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx similarity index 99% rename from graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx index 042bb3aa9..0df35ebf0 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxconfig.hxx" -#include "crlepalettebitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx index 45115657a..8e0497b4a 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx index 78bb44e0b..18c60bac5 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx index cefdb8920..51e5c061b 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_return.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_return.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_return.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_return.cxx index 955ea3122..9ff121aa2 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_return.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_return.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_return.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_return.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx index 9415917d2..3848348fc 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx index db89f9700..c3f4e5352 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx index cad7240f8..a67d3ccc6 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx index f95583b65..fd22e9b1c 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_shift.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_shift.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx index e2a0ef333..89be845fa 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_shift.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_shift.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx index 03eecd6ba..26f21f40a 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx index 76aa84aae..45eb4b720 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx b/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx rename to graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx index 90a716f6e..e88b39bbf 100644 --- a/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx +++ b/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx + * apps/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -81,9 +81,9 @@ #include #include -#include "nxconfig.hxx" -#include "cbitmap.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxwidgets/glyphs.hxx" #if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format diff --git a/graphics/NxWidgets/libnxwidgets/src/singletons.cxx b/graphics/NxWidgets/nxwidgets/src/singletons.cxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/src/singletons.cxx rename to graphics/NxWidgets/nxwidgets/src/singletons.cxx index afc4c3573..983cc3ace 100644 --- a/graphics/NxWidgets/libnxwidgets/src/singletons.cxx +++ b/graphics/NxWidgets/nxwidgets/src/singletons.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/src/singletons.cxx + * apps/graphics/NxWidgets/nxwidgets/src/singletons.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -79,12 +79,12 @@ #include #include -#include "nxconfig.hxx" -#include "cnxserver.hxx" -#include "cnxstring.hxx" -#include "cwidgetstyle.hxx" -#include "cnxfont.hxx" -#include "singletons.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cnxserver.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/Makefile b/graphics/NxWidgets/nxwm/Makefile index 3a49e8bc9..5f3870385 100644 --- a/graphics/NxWidgets/nxwm/Makefile +++ b/graphics/NxWidgets/nxwm/Makefile @@ -35,9 +35,6 @@ -include $(TOPDIR)/Make.defs -NXWMDIR := ${shell pwd | sed -e 's/ /\\ /g'} -NXWIDGETDIR := $(NXWMDIR)$(DELIM)..$(DELIM)libnxwidgets - ASRCS = CSRCS = @@ -87,11 +84,6 @@ CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx endif endif -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)$(DELIM)include} -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} -CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)$(DELIM)include} -CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} - VPATH = src include $(APPDIR)/Application.mk diff --git a/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx b/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx index 6015d6611..d274210f7 100644 --- a/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx +++ b/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx @@ -41,14 +41,14 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "cwindowmessenger.hxx" -#include "capplicationwindow.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/cwindowmessenger.hxx" +#include "graphics/nxwm/capplicationwindow.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/ccalibration.cxx b/graphics/NxWidgets/nxwm/src/ccalibration.cxx index 6c9d316dd..4e5f450af 100644 --- a/graphics/NxWidgets/nxwm/src/ccalibration.cxx +++ b/graphics/NxWidgets/nxwm/src/ccalibration.cxx @@ -49,10 +49,10 @@ # include "platform/configdata.h" #endif -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "ctouchscreen.hxx" -#include "ccalibration.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/ctouchscreen.hxx" +#include "graphics/nxwm/ccalibration.hxx" /**************************************************************************** * Pre-processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx b/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx index 1a61e1644..205a6163b 100644 --- a/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx +++ b/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx @@ -41,13 +41,13 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "cfullscreenwindow.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/cfullscreenwindow.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/chexcalculator.cxx b/graphics/NxWidgets/nxwm/src/chexcalculator.cxx index fd5216551..b7c3319ae 100644 --- a/graphics/NxWidgets/nxwm/src/chexcalculator.cxx +++ b/graphics/NxWidgets/nxwm/src/chexcalculator.cxx @@ -42,11 +42,11 @@ #include #include -#include "cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "chexcalculator.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/chexcalculator.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/ckeyboard.cxx b/graphics/NxWidgets/nxwm/src/ckeyboard.cxx index ac3b84b22..966f7edbe 100644 --- a/graphics/NxWidgets/nxwm/src/ckeyboard.cxx +++ b/graphics/NxWidgets/nxwm/src/ckeyboard.cxx @@ -48,8 +48,8 @@ #include #include -#include "nxwmconfig.hxx" -#include "ckeyboard.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/ckeyboard.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx b/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx index fbb96ac5a..9fe06aa0e 100644 --- a/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx +++ b/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx @@ -50,14 +50,14 @@ #include #include -#include "system/nxplayer.h" +#include "graphics/nxwidgets/system/nxplayer.h" #include -#include "cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "cmediaplayer.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/cmediaplayer.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/cnxterm.cxx b/graphics/NxWidgets/nxwm/src/cnxterm.cxx index 493ea4a4c..b5b364992 100644 --- a/graphics/NxWidgets/nxwm/src/cnxterm.cxx +++ b/graphics/NxWidgets/nxwm/src/cnxterm.cxx @@ -51,11 +51,11 @@ #include "nshlib/nshlib.h" -#include "cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "cnxterm.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/cnxterm.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/cstartwindow.cxx b/graphics/NxWidgets/nxwm/src/cstartwindow.cxx index 36073954a..95e551116 100644 --- a/graphics/NxWidgets/nxwm/src/cstartwindow.cxx +++ b/graphics/NxWidgets/nxwm/src/cstartwindow.cxx @@ -44,12 +44,12 @@ #include #include -#include "cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "ctaskbar.hxx" -#include "cstartwindow.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/ctaskbar.hxx" +#include "graphics/nxwm/cstartwindow.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/ctaskbar.cxx b/graphics/NxWidgets/nxwm/src/ctaskbar.cxx index d0ff8f9aa..087a54c46 100644 --- a/graphics/NxWidgets/nxwm/src/ctaskbar.cxx +++ b/graphics/NxWidgets/nxwm/src/ctaskbar.cxx @@ -43,13 +43,13 @@ #include -#include "crect.hxx" -#include "cwidgetcontrol.hxx" -#include "cnxtkwindow.hxx" -#include "cscaledbitmap.hxx" +#include "graphics/nxwidgets/crect.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cnxtkwindow.hxx" +#include "graphics/nxwidgets/cscaledbitmap.hxx" -#include "cwindowmessenger.hxx" -#include "ctaskbar.hxx" +#include "graphics/nxwm/cwindowmessenger.hxx" +#include "graphics/nxwm/ctaskbar.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx b/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx index 892de113a..b73694fb4 100644 --- a/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx +++ b/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx @@ -52,13 +52,13 @@ #include -#include "nxconfig.hxx" -#include "cwidgetcontrol.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" -#include "ctouchscreen.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxwm/ctouchscreen.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx b/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx index 125b40f68..19c96a40f 100644 --- a/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx +++ b/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx @@ -44,9 +44,9 @@ #include -#include "nxwmconfig.hxx" -#include "cstartwindow.hxx" -#include "cwindowmessenger.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/cstartwindow.hxx" +#include "graphics/nxwm/cwindowmessenger.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx b/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx index fbbf98429..553584187 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx b/graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx index 4c38526b5..d51047005 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx b/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx index 28de9093e..f26069d6a 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx b/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx index 6441147d6..4947992e3 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx b/graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx index 92a145faf..b41f6d5c7 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx b/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx index 41b2f4304..581159a97 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx b/graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx index 2b419e6aa..c8fe6a7a5 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx b/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx index 8e1daac74..8cd7e04b5 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx b/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx index f23aee2af..c84a27512 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx b/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx index db42ff72b..9a54c8740 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx b/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx index 48d233c80..a54ff5690 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx b/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx index 391d9ba2c..8f69586b8 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx @@ -50,10 +50,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** diff --git a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx b/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx index 726f5c566..6f9584f6a 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx @@ -50,10 +50,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx b/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx index b2f9fe54a..2c0ff0672 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx b/graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx index 24127a09b..e3333cc59 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx b/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx index 797705543..e96745fee 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx b/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx index e9ebf298e..63759e454 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx +++ b/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx @@ -47,10 +47,10 @@ #include #include -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx b/include/graphics/nxwidgets/cbgwindow.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx rename to include/graphics/nxwidgets/cbgwindow.hxx index e1b2fe9e6..c2d799b6f 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx +++ b/include/graphics/nxwidgets/cbgwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx + * apps/include/graphics/nxwidgets/cbgwindow.hxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBGWINDOW_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBGWINDOW_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBGWINDOW_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBGWINDOW_HXX /**************************************************************************** * Included Files @@ -48,9 +48,9 @@ #include #include -#include "nxconfig.hxx" -#include "ccallback.hxx" -#include "inxwindow.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ccallback.hxx" +#include "graphics/nxwidgets/inxwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -342,5 +342,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBGWINDOW_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBGWINDOW_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx b/include/graphics/nxwidgets/cbitmap.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx rename to include/graphics/nxwidgets/cbitmap.hxx index 47d8239c5..461a12261 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx +++ b/include/graphics/nxwidgets/cbitmap.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx + * apps/include/graphics/nxwidgets/cbitmap.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBITMAP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBITMAP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBITMAP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBITMAP_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "nxconfig.hxx" -#include "ibitmap.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -210,4 +210,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBITMAP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBITMAP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cbutton.hxx b/include/graphics/nxwidgets/cbutton.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cbutton.hxx rename to include/graphics/nxwidgets/cbutton.hxx index a4517d3ce..42fa67a08 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cbutton.hxx +++ b/include/graphics/nxwidgets/cbutton.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cbutton.hxx + * apps/include/graphics/nxwidgets/cbutton.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTON_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTON_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBUTTON_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBUTTON_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "clabel.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -241,4 +241,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTON_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBUTTON_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx b/include/graphics/nxwidgets/cbuttonarray.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx rename to include/graphics/nxwidgets/cbuttonarray.hxx index 572284c6d..c80a6205e 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx +++ b/include/graphics/nxwidgets/cbuttonarray.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx + * apps/include/graphics/nxwidgets/cbuttonarray.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTONARRAY_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTONARRAY_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBUTTONARRAY_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBUTTONARRAY_HXX /**************************************************************************** * Included Files @@ -47,8 +47,8 @@ #include -#include "clabel.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -323,4 +323,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTONARRAY_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CBUTTONARRAY_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ccallback.hxx b/include/graphics/nxwidgets/ccallback.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/ccallback.hxx rename to include/graphics/nxwidgets/ccallback.hxx index d75f58a0a..3b91dd262 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ccallback.hxx +++ b/include/graphics/nxwidgets/ccallback.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ccallback.hxx + * apps/include/graphics/nxwidgets/ccallback.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECCALLBACK_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECCALLBACK_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCALLBACK_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCALLBACK_HXX /**************************************************************************** * Included Files @@ -53,7 +53,7 @@ # include #endif -#include "crect.hxx" +#include "graphics/nxwidgets/crect.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -266,5 +266,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECCALLBACK_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCALLBACK_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx b/include/graphics/nxwidgets/ccheckbox.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx rename to include/graphics/nxwidgets/ccheckbox.hxx index 5d7266a9e..fb6eab5c0 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx +++ b/include/graphics/nxwidgets/ccheckbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx + * apps/include/graphics/nxwidgets/ccheckbox.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECCHECKBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECCHECKBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCHECKBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCHECKBOX_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "cbutton.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cbutton.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -206,5 +206,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECCHECKBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCHECKBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx b/include/graphics/nxwidgets/ccyclebutton.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx rename to include/graphics/nxwidgets/ccyclebutton.hxx index 9e019bc3f..9b911879e 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx +++ b/include/graphics/nxwidgets/ccyclebutton.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx + * apps/include/graphics/nxwidgets/ccyclebutton.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECCYLEBUTTON_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECCYLEBUTTON_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCYLEBUTTON_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCYLEBUTTON_HXX /**************************************************************************** * Included Files @@ -81,12 +81,12 @@ #include -#include "cbutton.hxx" -#include "ilistdataeventhandler.hxx" -#include "clistdata.hxx" -#include "clistdataitem.hxx" -#include "cwidgetstyle.hxx" -#include "cnxstring.hxx" +#include "graphics/nxwidgets/cbutton.hxx" +#include "graphics/nxwidgets/ilistdataeventhandler.hxx" +#include "graphics/nxwidgets/clistdata.hxx" +#include "graphics/nxwidgets/clistdataitem.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -353,4 +353,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECCYLEBUTTON_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CCYLEBUTTON_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cglyphbutton.hxx b/include/graphics/nxwidgets/cglyphbutton.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cglyphbutton.hxx rename to include/graphics/nxwidgets/cglyphbutton.hxx index a36fb9d49..ff77a3d4a 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cglyphbutton.hxx +++ b/include/graphics/nxwidgets/cglyphbutton.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cbutton.hxx + * apps/include/graphics/nxwidgets/cbutton.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHBUTTON_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHBUTTON_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHBUTTON_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHBUTTON_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "cnxwidget.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -235,4 +235,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHBUTTON_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHBUTTON_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx b/include/graphics/nxwidgets/cglyphsliderhorizontal.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx rename to include/graphics/nxwidgets/cglyphsliderhorizontal.hxx index 04bb55cb7..317215400 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx +++ b/include/graphics/nxwidgets/cglyphsliderhorizontal.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx + * apps/include/graphics/nxwidgets/cglyphsliderhorizontal.hxx * * Copyright (C) 2013, 2014 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -67,15 +67,15 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTAL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTAL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHSLIDERHORIZONTAL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHSLIDERHORIZONTAL_HXX /**************************************************************************** * Included Files ****************************************************************************/ -#include "csliderhorizontal.hxx" -#include "cglyphsliderhorizontalgrip.hxx" +#include "graphics/nxwidgets/csliderhorizontal.hxx" +#include "graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -337,5 +337,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTAL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHSLIDERHORIZONTAL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx b/include/graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx similarity index 94% rename from graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx rename to include/graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx index 88b8beda7..bfb16576b 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx +++ b/include/graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx + * apps/include/graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx * * Copyright (C) 2012 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -67,15 +67,15 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTALGRIP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTALGRIP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHSLIDERHORIZONTALGRIP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHSLIDERHORIZONTALGRIP_HXX /**************************************************************************** * Included Files ****************************************************************************/ -#include "csliderhorizontalgrip.hxx" -#include "cimage.hxx" +#include "graphics/nxwidgets/csliderhorizontalgrip.hxx" +#include "graphics/nxwidgets/cimage.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -202,5 +202,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTALGRIP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGLYPHSLIDERHORIZONTALGRIP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx b/include/graphics/nxwidgets/cgraphicsport.hxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx rename to include/graphics/nxwidgets/cgraphicsport.hxx index 500cf9f33..bc893caeb 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx +++ b/include/graphics/nxwidgets/cgraphicsport.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx + * apps/include/graphics/nxwidgets/cgraphicsport.hxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGRAPHICSPORT_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGRAPHICSPORT_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGRAPHICSPORT_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGRAPHICSPORT_HXX /**************************************************************************** * Included Files @@ -79,8 +79,8 @@ #include #include -#include "nxconfig.hxx" -#include "inxwindow.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/inxwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -486,4 +486,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGRAPHICSPORT_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CGRAPHICSPORT_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cimage.hxx b/include/graphics/nxwidgets/cimage.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/cimage.hxx rename to include/graphics/nxwidgets/cimage.hxx index 364817d99..aaf60bf65 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cimage.hxx +++ b/include/graphics/nxwidgets/cimage.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cimage.hxx + * apps/include/graphics/nxwidgets/cimage.hxx * * Copyright (C) 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECIMAGE_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECIMAGE_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CIMAGE_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CIMAGE_HXX /**************************************************************************** * Included Files @@ -81,7 +81,7 @@ #include -#include "cnxwidget.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -343,4 +343,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECIMAGE_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CIMAGE_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx b/include/graphics/nxwidgets/ckeypad.hxx similarity index 94% rename from graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx rename to include/graphics/nxwidgets/ckeypad.hxx index 9721677db..35cdece8b 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx +++ b/include/graphics/nxwidgets/ckeypad.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx + * apps/include/graphics/nxwidgets/ckeypad.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECKEYPAD_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECKEYPAD_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CKEYPAD_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CKEYPAD_HXX /**************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include -#include "cbuttonarray.hxx" +#include "graphics/nxwidgets/cbuttonarray.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -153,4 +153,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECKEYPAD_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CKEYPAD_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clabel.hxx b/include/graphics/nxwidgets/clabel.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/clabel.hxx rename to include/graphics/nxwidgets/clabel.hxx index 6c27c7e11..6d7decf8f 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clabel.hxx +++ b/include/graphics/nxwidgets/clabel.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/clabel.hxx + * apps/include/graphics/nxwidgets/clabel.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLABEL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLABEL_HXX /**************************************************************************** * Included Files @@ -81,9 +81,9 @@ #include -#include "cnxwidget.hxx" -#include "cwidgetstyle.hxx" -#include "cnxstring.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -354,4 +354,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLABEL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx b/include/graphics/nxwidgets/clatchbutton.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx rename to include/graphics/nxwidgets/clatchbutton.hxx index f92698333..62e32c5b8 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx +++ b/include/graphics/nxwidgets/clatchbutton.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx + * apps/include/graphics/nxwidgets/clatchbutton.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTON_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTON_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLATCHBUTTON_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLATCHBUTTON_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "cstickybutton.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cstickybutton.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -170,4 +170,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTON_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLATCHBUTTON_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx b/include/graphics/nxwidgets/clatchbuttonarray.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx rename to include/graphics/nxwidgets/clatchbuttonarray.hxx index a6031b62e..47cdbea6a 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx +++ b/include/graphics/nxwidgets/clatchbuttonarray.hxx @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTONARRAY_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTONARRAY_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLATCHBUTTONARRAY_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLATCHBUTTONARRAY_HXX /**************************************************************************** * Included Files @@ -47,8 +47,8 @@ #include -#include "cstickybuttonarray.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cstickybuttonarray.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -167,4 +167,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTONARRAY_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLATCHBUTTONARRAY_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clistbox.hxx b/include/graphics/nxwidgets/clistbox.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/clistbox.hxx rename to include/graphics/nxwidgets/clistbox.hxx index e66af619c..8cd4ad1a3 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clistbox.hxx +++ b/include/graphics/nxwidgets/clistbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/clistbox.hxx + * apps/include/graphics/nxwidgets/clistbox.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTBOX_HXX /**************************************************************************** * Included Files @@ -81,13 +81,13 @@ #include -#include "nxconfig.hxx" -#include "cscrollingpanel.hxx" -#include "ilistdataeventhandler.hxx" -#include "clistdata.hxx" -#include "clistboxdataitem.hxx" -#include "cwidgetstyle.hxx" -#include "ilistbox.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cscrollingpanel.hxx" +#include "graphics/nxwidgets/ilistdataeventhandler.hxx" +#include "graphics/nxwidgets/clistdata.hxx" +#include "graphics/nxwidgets/clistboxdataitem.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/ilistbox.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -427,5 +427,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx b/include/graphics/nxwidgets/clistboxdataitem.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx rename to include/graphics/nxwidgets/clistboxdataitem.hxx index 72915d095..6cfde7074 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx +++ b/include/graphics/nxwidgets/clistboxdataitem.hxx @@ -1,6 +1,6 @@ /**************************************************************************** * include/clistboxdataitem.hxx - * apps/graphics/NxWidgets/libnxwidgets/ + *apps/include/graphics/nxwidgets/ * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -68,8 +68,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOXDATAITEM_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOXDATAITEM_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTBOXDATAITEM_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTBOXDATAITEM_HXX /**************************************************************************** * Included Files @@ -82,8 +82,8 @@ #include -#include "clistdataitem.hxx" -#include "cnxstring.hxx" +#include "graphics/nxwidgets/clistdataitem.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -176,5 +176,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOXDATAITEM_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTBOXDATAITEM_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clistdata.hxx b/include/graphics/nxwidgets/clistdata.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/clistdata.hxx rename to include/graphics/nxwidgets/clistdata.hxx index 03f5bfb7e..9c1f9ccbd 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clistdata.hxx +++ b/include/graphics/nxwidgets/clistdata.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/clistdata.hxx + * apps/include/graphics/nxwidgets/clistdata.hxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATA_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATA_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATA_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATA_HXX /**************************************************************************** * Included Files @@ -81,10 +81,10 @@ #include -#include "tnxarray.hxx" -#include "ilistdataeventhandler.hxx" -#include "clistdataitem.hxx" -#include "cnxstring.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" +#include "graphics/nxwidgets/ilistdataeventhandler.hxx" +#include "graphics/nxwidgets/clistdataitem.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -355,4 +355,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATA_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATA_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx b/include/graphics/nxwidgets/clistdataeventargs.hxx similarity index 94% rename from graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx rename to include/graphics/nxwidgets/clistdataeventargs.hxx index 28b9e48d9..dad7c4945 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx +++ b/include/graphics/nxwidgets/clistdataeventargs.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx + * apps/include/graphics/nxwidgets/clistdataeventargs.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAEVENTARGS_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAEVENTARGS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATAEVENTARGS_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATAEVENTARGS_HXX /**************************************************************************** * Included Files @@ -79,7 +79,7 @@ #include #include -#include "teventargs.hxx" +#include "graphics/nxwidgets/teventargs.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -118,4 +118,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAEVENTARGS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATAEVENTARGS_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx b/include/graphics/nxwidgets/clistdataitem.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx rename to include/graphics/nxwidgets/clistdataitem.hxx index fe88d1bd6..00171210c 100644 --- a/graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx +++ b/include/graphics/nxwidgets/clistdataitem.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx + * apps/include/graphics/nxwidgets/clistdataitem.hxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAITEM_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAITEM_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATAITEM_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATAITEM_HXX /**************************************************************************** * Included Files @@ -81,7 +81,7 @@ #include -#include "cnxstring.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -186,4 +186,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAITEM_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLISTDATAITEM_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx b/include/graphics/nxwidgets/cmultilinetextbox.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx rename to include/graphics/nxwidgets/cmultilinetextbox.hxx index 99256c49e..7abb23e22 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx +++ b/include/graphics/nxwidgets/cmultilinetextbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx + * apps/include/graphics/nxwidgets/cmultilinetextbox.hxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECMULTILINETEXTBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECMULTILINETEXTBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CMULTILINETEXTBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CMULTILINETEXTBOX_HXX /**************************************************************************** * Included Files @@ -82,12 +82,12 @@ #include #include -#include "cscrollingpanel.hxx" -#include "cwidgetstyle.hxx" -#include "cnxstring.hxx" -#include "ctext.hxx" -#include "cwidgeteventhandler.hxx" -#include "itextbox.hxx" +#include "graphics/nxwidgets/cscrollingpanel.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/ctext.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/itextbox.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -629,4 +629,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECMULTILINETEXTBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CMULTILINETEXTBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx b/include/graphics/nxwidgets/cnumericedit.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx rename to include/graphics/nxwidgets/cnumericedit.hxx index 54cd33ab6..e5514490e 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx +++ b/include/graphics/nxwidgets/cnumericedit.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx + * apps/include/graphics/nxwidgets/cnumericedit.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -68,8 +68,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNUMERICEDIT_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNUMERICEDIT_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNUMERICEDIT_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNUMERICEDIT_HXX /**************************************************************************** * Included Files @@ -82,9 +82,9 @@ #include -#include "cnxwidget.hxx" -#include "cwidgetstyle.hxx" -#include "cnxstring.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -210,4 +210,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CLABEL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx b/include/graphics/nxwidgets/cnxfont.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx rename to include/graphics/nxwidgets/cnxfont.hxx index 0ee437849..d7cc57a47 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx +++ b/include/graphics/nxwidgets/cnxfont.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx + * apps/include/graphics/nxwidgets/cnxfont.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXFONT_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXFONT_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXFONT_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXFONT_HXX /**************************************************************************** * Included Files @@ -235,4 +235,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXFONT_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXFONT_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx b/include/graphics/nxwidgets/cnxserver.hxx similarity index 93% rename from graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx rename to include/graphics/nxwidgets/cnxserver.hxx index ea067e168..a44fb2f05 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx +++ b/include/graphics/nxwidgets/cnxserver.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx + * apps/include/graphics/nxwidgets/cnxserver.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSERVER_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSERVER_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXSERVER_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXSERVER_HXX /**************************************************************************** * Included Files @@ -48,9 +48,9 @@ #include -#include "cnxwindow.hxx" -#include "cnxtkwindow.hxx" -#include "cbgwindow.hxx" +#include "graphics/nxwidgets/cnxwindow.hxx" +#include "graphics/nxwidgets/cnxtkwindow.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -186,4 +186,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSERVER_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXSERVER_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxstring.hxx b/include/graphics/nxwidgets/cnxstring.hxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/include/cnxstring.hxx rename to include/graphics/nxwidgets/cnxstring.hxx index 30cb92196..b4d49f963 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxstring.hxx +++ b/include/graphics/nxwidgets/cnxstring.hxx @@ -1,6 +1,6 @@ /**************************************************************************** * include/cnxtring.hxx - * apps/graphics/NxWidgets/libnxwidgets/ + *apps/include/graphics/nxwidgets/ * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -68,8 +68,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSTRING_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSTRING_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXSTRING_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXSTRING_HXX /**************************************************************************** * Included Files @@ -81,7 +81,7 @@ #include #include -#include "nxconfig.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -493,4 +493,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSTRING_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXSTRING_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx b/include/graphics/nxwidgets/cnxtimer.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx rename to include/graphics/nxwidgets/cnxtimer.hxx index 5e207e242..38b4eb373 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx +++ b/include/graphics/nxwidgets/cnxtimer.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx + * apps/include/graphics/nxwidgets/cnxtimer.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTIMER_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTIMER_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTIMER_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTIMER_HXX /**************************************************************************** * Included Files @@ -82,7 +82,7 @@ #include -#include "cnxwidget.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -204,4 +204,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTIMER_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTIMER_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx b/include/graphics/nxwidgets/cnxtkwindow.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx rename to include/graphics/nxwidgets/cnxtkwindow.hxx index 23f684896..ee46509c7 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx +++ b/include/graphics/nxwidgets/cnxtkwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx + * apps/include/graphics/nxwidgets/cnxtkwindow.hxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTKWINDOW_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTKWINDOW_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTKWINDOW_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTKWINDOW_HXX /**************************************************************************** * Included Files @@ -49,8 +49,8 @@ #include #include -#include "ccallback.hxx" -#include "inxwindow.hxx" +#include "graphics/nxwidgets/ccallback.hxx" +#include "graphics/nxwidgets/inxwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -363,5 +363,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTKWINDOW_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTKWINDOW_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx b/include/graphics/nxwidgets/cnxtoolbar.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx rename to include/graphics/nxwidgets/cnxtoolbar.hxx index 75d85ccdc..9c4ed5c68 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx +++ b/include/graphics/nxwidgets/cnxtoolbar.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx + * apps/include/graphics/nxwidgets/cnxtoolbar.hxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTOOLBAR_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTOOLBAR_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTOOLBAR_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTOOLBAR_HXX /**************************************************************************** * Included Files @@ -49,9 +49,9 @@ #include #include -#include "ccallback.hxx" -#include "inxwindow.hxx" -#include "cnxtkwindow.hxx" +#include "graphics/nxwidgets/ccallback.hxx" +#include "graphics/nxwidgets/inxwindow.hxx" +#include "graphics/nxwidgets/cnxtkwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -332,5 +332,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTOOLBAR_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXTOOLBAR_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/include/graphics/nxwidgets/cnxwidget.hxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/include/cnxwidget.hxx rename to include/graphics/nxwidgets/cnxwidget.hxx index f84e19d49..a186b3c6d 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxwidget.hxx +++ b/include/graphics/nxwidgets/cnxwidget.hxx @@ -1,6 +1,6 @@ /**************************************************************************** * include/cnxwidget.hxx - * apps/graphics/NxWidgets/libnxwidgets/ + *apps/include/graphics/nxwidgets/ * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -68,8 +68,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWIDGET_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWIDGET_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXWIDGET_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXWIDGET_HXX /**************************************************************************** * Included Files @@ -83,14 +83,14 @@ #include -#include "cnxstring.hxx" -#include "cnxfont.hxx" -#include "crect.hxx" -#include "cwidgetstyle.hxx" -#include "cwidgeteventargs.hxx" -#include "cwidgeteventhandler.hxx" -#include "cwidgeteventhandlerlist.hxx" -#include "tnxarray.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/crect.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cwidgeteventhandlerlist.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -1352,5 +1352,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWIDGET_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXWIDGET_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx b/include/graphics/nxwidgets/cnxwindow.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx rename to include/graphics/nxwidgets/cnxwindow.hxx index 1c1cbce65..00655a0ac 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx +++ b/include/graphics/nxwidgets/cnxwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx + * apps/include/graphics/nxwidgets/cnxwindow.hxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWINDOW_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWINDOW_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXWINDOW_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXWINDOW_HXX /**************************************************************************** * Included Files @@ -49,8 +49,8 @@ #include #include -#include "ccallback.hxx" -#include "inxwindow.hxx" +#include "graphics/nxwidgets/ccallback.hxx" +#include "graphics/nxwidgets/inxwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -336,5 +336,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWINDOW_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CNXWINDOW_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx b/include/graphics/nxwidgets/cprogressbar.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx rename to include/graphics/nxwidgets/cprogressbar.hxx index 5ecc271c1..c181b5cd6 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx +++ b/include/graphics/nxwidgets/cprogressbar.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx + * apps/include/graphics/nxwidgets/cprogressbar.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECPROGRESSBAR_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECPROGRESSBAR_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CPROGRESSBAR_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CPROGRESSBAR_HXX /**************************************************************************** * Included Files @@ -81,7 +81,7 @@ #include -#include "cnxwidget.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -248,4 +248,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECPROGRESSBAR_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CPROGRESSBAR_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx b/include/graphics/nxwidgets/cradiobutton.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx rename to include/graphics/nxwidgets/cradiobutton.hxx index 13294489e..a6986ab73 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx +++ b/include/graphics/nxwidgets/cradiobutton.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx + * apps/include/graphics/nxwidgets/cradiobutton.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTON_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTON_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRADIOBUTTON_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRADIOBUTTON_HXX /**************************************************************************** * Included Files @@ -82,8 +82,8 @@ #include #include -#include "cbutton.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cbutton.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -204,4 +204,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTON_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRADIOBUTTON_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx b/include/graphics/nxwidgets/cradiobuttongroup.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx rename to include/graphics/nxwidgets/cradiobuttongroup.hxx index e800b7fdb..a47f09111 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx +++ b/include/graphics/nxwidgets/cradiobuttongroup.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx + * apps/include/graphics/nxwidgets/cradiobuttongroup.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTONGROUP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTONGROUP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRADIOBUTTONGROUP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRADIOBUTTONGROUP_HXX /**************************************************************************** * Included Files @@ -82,10 +82,10 @@ #include #include -#include "cnxwidget.hxx" -#include "cbutton.hxx" -#include "cwidgetstyle.hxx" -#include "cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cbutton.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -250,4 +250,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTONGROUP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRADIOBUTTONGROUP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/crect.hxx b/include/graphics/nxwidgets/crect.hxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/include/crect.hxx rename to include/graphics/nxwidgets/crect.hxx index 422839b95..8c51f0f2a 100644 --- a/graphics/NxWidgets/libnxwidgets/include/crect.hxx +++ b/include/graphics/nxwidgets/crect.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx + * apps/include/graphics/nxwidgets/cbgwindow.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRECT_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRECT_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRECT_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRECT_HXX /**************************************************************************** * Included Files @@ -433,4 +433,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRECT_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRECT_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx b/include/graphics/nxwidgets/crlepalettebitmap.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx rename to include/graphics/nxwidgets/crlepalettebitmap.hxx index 92bf66272..b316de9f2 100644 --- a/graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx +++ b/include/graphics/nxwidgets/crlepalettebitmap.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx + * apps/include/graphics/nxwidgets/crlepalettebitmap.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRLEPALETTBITMAP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRLEPALETTBITMAP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRLEPALETTBITMAP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRLEPALETTBITMAP_HXX /**************************************************************************** * Included Files @@ -48,8 +48,8 @@ #include -#include "nxconfig.hxx" -#include "ibitmap.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -266,4 +266,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRLEPALETTBITMAP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CRLEPALETTBITMAP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx b/include/graphics/nxwidgets/cscaledbitmap.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx rename to include/graphics/nxwidgets/cscaledbitmap.hxx index 722dfd5f5..f7b558eb1 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx +++ b/include/graphics/nxwidgets/cscaledbitmap.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx + * apps/include/graphics/nxwidgets/cscaledbitmap.hxx * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCALEDBITMAP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCALEDBITMAP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCALEDBITMAP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCALEDBITMAP_HXX /**************************************************************************** * Included Files @@ -50,8 +50,8 @@ #include #include -#include "nxconfig.hxx" -#include "ibitmap.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -206,4 +206,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCALEDBITMAP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCALEDBITMAP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx b/include/graphics/nxwidgets/cscrollbarhorizontal.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx rename to include/graphics/nxwidgets/cscrollbarhorizontal.hxx index abf7dada5..4116c1456 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx +++ b/include/graphics/nxwidgets/cscrollbarhorizontal.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx + * apps/include/graphics/nxwidgets/cscrollbarhorizontal.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARHORIZONTAL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARHORIZONTAL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARHORIZONTAL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARHORIZONTAL_HXX /**************************************************************************** * Included Files @@ -81,10 +81,10 @@ #include -#include "cnxwidget.hxx" -#include "cwidgeteventhandler.hxx" -#include "cwidgetstyle.hxx" -#include "islider.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/islider.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -289,5 +289,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARHORIZONTAL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARHORIZONTAL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx b/include/graphics/nxwidgets/cscrollbarpanel.hxx similarity index 94% rename from graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx rename to include/graphics/nxwidgets/cscrollbarpanel.hxx index c85821e1d..190bd8009 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx +++ b/include/graphics/nxwidgets/cscrollbarpanel.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx + * apps/include/graphics/nxwidgets/cscrollbarpanel.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARPANEL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARPANEL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARPANEL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARPANEL_HXX /**************************************************************************** * Included Files @@ -81,14 +81,14 @@ #include -#include "cnxwidget.hxx" -#include "cscrollingpanel.hxx" -#include "cwidgetstyle.hxx" -#include "cscrollbarvertical.hxx" -#include "cscrollbarhorizontal.hxx" -#include "cwidgeteventhandler.hxx" -#include "iscrollable.hxx" -#include "cgraphicsport.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cscrollingpanel.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cscrollbarvertical.hxx" +#include "graphics/nxwidgets/cscrollbarhorizontal.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/iscrollable.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -305,5 +305,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARPANEL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARPANEL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx b/include/graphics/nxwidgets/cscrollbarvertical.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx rename to include/graphics/nxwidgets/cscrollbarvertical.hxx index 98f911bf6..03219a2d9 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx +++ b/include/graphics/nxwidgets/cscrollbarvertical.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx + * apps/include/graphics/nxwidgets/cscrollbarvertical.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARVERTICAL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARVERTICAL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARVERTICAL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARVERTICAL_HXX /**************************************************************************** * Included Files @@ -81,10 +81,10 @@ #include -#include "cnxwidget.hxx" -#include "cwidgeteventhandler.hxx" -#include "cwidgetstyle.hxx" -#include "islider.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/islider.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -288,4 +288,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARVERTICAL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLBARVERTICAL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx b/include/graphics/nxwidgets/cscrollinglistbox.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx rename to include/graphics/nxwidgets/cscrollinglistbox.hxx index 5eae2de2b..01659876b 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx +++ b/include/graphics/nxwidgets/cscrollinglistbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx + * apps/include/graphics/nxwidgets/cscrollinglistbox.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGLISTBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGLISTBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGLISTBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGLISTBOX_HXX /**************************************************************************** * Included Files @@ -81,13 +81,13 @@ #include -#include "cnxwidget.hxx" -#include "clistbox.hxx" -#include "cwidgeteventhandler.hxx" -#include "clistdata.hxx" -#include "clistboxdataitem.hxx" -#include "cwidgetstyle.hxx" -#include "ilistbox.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/clistbox.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/clistdata.hxx" +#include "graphics/nxwidgets/clistboxdataitem.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/ilistbox.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -477,4 +477,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGLISTBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGLISTBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx b/include/graphics/nxwidgets/cscrollingpanel.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx rename to include/graphics/nxwidgets/cscrollingpanel.hxx index fb1155cce..08a4bc3cb 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx +++ b/include/graphics/nxwidgets/cscrollingpanel.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx + * apps/include/graphics/nxwidgets/cscrollingpanel.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGPANEL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGPANEL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGPANEL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGPANEL_HXX /**************************************************************************** * Included Files @@ -81,9 +81,9 @@ #include -#include "cnxwidget.hxx" -#include "iscrollable.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/iscrollable.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -369,5 +369,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGPANEL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGPANEL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx b/include/graphics/nxwidgets/cscrollingtextbox.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx rename to include/graphics/nxwidgets/cscrollingtextbox.hxx index 1f3c1a762..ab03bd4e1 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx +++ b/include/graphics/nxwidgets/cscrollingtextbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx + * apps/include/graphics/nxwidgets/cscrollingtextbox.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGTEXTBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGTEXTBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGTEXTBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGTEXTBOX_HXX /**************************************************************************** * Included Files @@ -81,11 +81,11 @@ #include -#include "cmultilinetextbox.hxx" -#include "cwidgeteventhandler.hxx" -#include "cwidgetstyle.hxx" -#include "cnxstring.hxx" -#include "iscrollable.hxx" +#include "graphics/nxwidgets/cmultilinetextbox.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/iscrollable.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -463,5 +463,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGTEXTBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSCROLLINGTEXTBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx b/include/graphics/nxwidgets/csliderhorizontal.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx rename to include/graphics/nxwidgets/csliderhorizontal.hxx index 8bc0f4b25..1bf8db00e 100644 --- a/graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx +++ b/include/graphics/nxwidgets/csliderhorizontal.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx + * apps/include/graphics/nxwidgets/csliderhorizontal.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTAL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTAL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERHORIZONTAL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERHORIZONTAL_HXX /**************************************************************************** * Included Files @@ -81,9 +81,9 @@ #include -#include "cnxwidget.hxx" -#include "cwidgeteventhandler.hxx" -#include "islider.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/islider.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -340,5 +340,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTAL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERHORIZONTAL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx b/include/graphics/nxwidgets/csliderhorizontalgrip.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx rename to include/graphics/nxwidgets/csliderhorizontalgrip.hxx index 9691a58f2..fafa0629e 100644 --- a/graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx +++ b/include/graphics/nxwidgets/csliderhorizontalgrip.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx + * apps/include/graphics/nxwidgets/csliderhorizontalgrip.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTALGRIP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTALGRIP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERHORIZONTALGRIP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERHORIZONTALGRIP_HXX /**************************************************************************** * Included Files @@ -81,7 +81,7 @@ #include -#include "cnxwidget.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -199,5 +199,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTALGRIP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERHORIZONTALGRIP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx b/include/graphics/nxwidgets/cslidervertical.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx rename to include/graphics/nxwidgets/cslidervertical.hxx index b071e3c42..1eb50c30c 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx +++ b/include/graphics/nxwidgets/cslidervertical.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx + * apps/include/graphics/nxwidgets/cslidervertical.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICAL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICAL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERVERTICAL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERVERTICAL_HXX /**************************************************************************** * Included Files @@ -81,9 +81,9 @@ #include -#include "cnxwidget.hxx" -#include "cwidgeteventhandler.hxx" -#include "islider.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/islider.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -340,5 +340,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICAL_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERVERTICAL_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx b/include/graphics/nxwidgets/csliderverticalgrip.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx rename to include/graphics/nxwidgets/csliderverticalgrip.hxx index 3bb5887c2..5ca84f0c9 100644 --- a/graphics/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx +++ b/include/graphics/nxwidgets/csliderverticalgrip.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx + * apps/include/graphics/nxwidgets/cslidervertical.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICALGRIP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICALGRIP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERVERTICALGRIP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERVERTICALGRIP_HXX /**************************************************************************** * Included Files @@ -81,7 +81,7 @@ #include -#include "cnxwidget.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -198,5 +198,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICALGRIP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSLIDERVERTICALGRIP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx b/include/graphics/nxwidgets/cstickybutton.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx rename to include/graphics/nxwidgets/cstickybutton.hxx index d13f1bb29..d5abda902 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx +++ b/include/graphics/nxwidgets/cstickybutton.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx + * apps/include/graphics/nxwidgets/cstickybutton.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTON_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTON_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKYBUTTON_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKYBUTTON_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "cbutton.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cbutton.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -234,4 +234,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTON_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKYBUTTON_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx b/include/graphics/nxwidgets/cstickybuttonarray.hxx similarity index 94% rename from graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx rename to include/graphics/nxwidgets/cstickybuttonarray.hxx index a58ae6575..cf89b0884 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx +++ b/include/graphics/nxwidgets/cstickybuttonarray.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx + * apps/include/graphics/nxwidgets/cstickybuttonarray.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTONARRAY_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTONARRAY_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKYBUTTONARRAY_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKYBUTTONARRAY_HXX /**************************************************************************** * Included Files @@ -47,8 +47,8 @@ #include -#include "cbuttonarray.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cbuttonarray.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -171,4 +171,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTONARRAY_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKYBUTTONARRAY_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx b/include/graphics/nxwidgets/cstickyimage.hxx similarity index 94% rename from graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx rename to include/graphics/nxwidgets/cstickyimage.hxx index a70bca96f..9a9b58048 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx +++ b/include/graphics/nxwidgets/cstickyimage.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx + * apps/include/graphics/nxwidgets/cstickyimage.hxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKIMAGE_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKIMAGE_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKIMAGE_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKIMAGE_HXX /**************************************************************************** * Included Files @@ -47,8 +47,8 @@ #include -#include "cimage.hxx" -#include "cwidgetstyle.hxx" +#include "graphics/nxwidgets/cimage.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -187,4 +187,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKIMAGE_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTICKIMAGE_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx b/include/graphics/nxwidgets/cstringiterator.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx rename to include/graphics/nxwidgets/cstringiterator.hxx index 889000fdf..18f398185 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx +++ b/include/graphics/nxwidgets/cstringiterator.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx + * apps/include/graphics/nxwidgets/cstringiterator.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTRINGITERATOR_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTRINGITERATOR_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTRINGITERATOR_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTRINGITERATOR_HXX /**************************************************************************** * Included Files @@ -189,4 +189,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTRINGITERATOR_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CSTRINGITERATOR_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx b/include/graphics/nxwidgets/ctabpanel.hxx similarity index 90% rename from graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx rename to include/graphics/nxwidgets/ctabpanel.hxx index 2dac6f1a2..ee1a00b71 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx +++ b/include/graphics/nxwidgets/ctabpanel.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx + * apps/include/graphics/nxwidgets/ctabpanel.hxx * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Petteri Aimonen @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECTABPANEL_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECTABPANEL_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTABPANEL_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTABPANEL_HXX /**************************************************************************** * Included Files @@ -47,11 +47,11 @@ #include -#include "cnxwidget.hxx" -#include "cwidgetstyle.hxx" -#include "cnxstring.hxx" -#include "tnxarray.hxx" -#include "clatchbuttonarray.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" +#include "graphics/nxwidgets/clatchbuttonarray.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/libnxwidgets/include/ctext.hxx b/include/graphics/nxwidgets/ctext.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/ctext.hxx rename to include/graphics/nxwidgets/ctext.hxx index 98b47d1f6..6a0158228 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ctext.hxx +++ b/include/graphics/nxwidgets/ctext.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ctext.hxx + * apps/include/graphics/nxwidgets/ctext.hxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXT_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXT_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTEXT_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTEXT_HXX /**************************************************************************** * Included Files @@ -82,10 +82,10 @@ #include #include -#include "nxconfig.hxx" -#include "cnxfont.hxx" -#include "tnxarray.hxx" -#include "cnxstring.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -388,5 +388,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXT_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTEXT_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx b/include/graphics/nxwidgets/ctextbox.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx rename to include/graphics/nxwidgets/ctextbox.hxx index 02a90ac93..aaf053930 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx +++ b/include/graphics/nxwidgets/ctextbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx + * apps/include/graphics/nxwidgets/ctextbox.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXTBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXTBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTEXTBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTEXTBOX_HXX /**************************************************************************** * Included Files @@ -81,11 +81,11 @@ #include -#include "clabel.hxx" -#include "cnxstring.hxx" -#include "cwidgetstyle.hxx" -#include "cwidgeteventargs.hxx" -#include "itextbox.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" +#include "graphics/nxwidgets/itextbox.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -372,4 +372,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXTBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CTEXTBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx b/include/graphics/nxwidgets/cwidgetcontrol.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx rename to include/graphics/nxwidgets/cwidgetcontrol.hxx index 589609b34..eef05dcc2 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx +++ b/include/graphics/nxwidgets/cwidgetcontrol.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx + * apps/include/graphics/nxwidgets/cwidgetcontrol.hxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETCONTROLT_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETCONTROLT_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETCONTROLT_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETCONTROLT_HXX /**************************************************************************** * Included Files @@ -48,14 +48,14 @@ #include #include -#include "nxconfig.hxx" -#include "cgraphicsport.hxx" -#include "cnxwidget.hxx" -#include "crect.hxx" -#include "cwidgetstyle.hxx" -#include "cwindoweventhandler.hxx" -#include "cwindoweventhandlerlist.hxx" -#include "tnxarray.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxwidgets/cnxwidget.hxx" +#include "graphics/nxwidgets/crect.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cwindoweventhandler.hxx" +#include "graphics/nxwidgets/cwindoweventhandlerlist.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -798,4 +798,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETCONTROLT_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETCONTROLT_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx b/include/graphics/nxwidgets/cwidgeteventargs.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx rename to include/graphics/nxwidgets/cwidgeteventargs.hxx index ab71c015a..cf197f368 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx +++ b/include/graphics/nxwidgets/cwidgeteventargs.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx + * apps/include/graphics/nxwidgets/cwidgeteventargs.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTARGS_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTARGS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTARGS_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTARGS_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "nxconfig.hxx" -#include "teventargs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/teventargs.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -234,4 +234,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTARGS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTARGS_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx b/include/graphics/nxwidgets/cwidgeteventhandler.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx rename to include/graphics/nxwidgets/cwidgeteventhandler.hxx index 81d3c879a..2b7728a6f 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx +++ b/include/graphics/nxwidgets/cwidgeteventhandler.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx + * apps/include/graphics/nxwidgets/cwidgeteventhandler.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLER_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLER_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTHANDLER_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTHANDLER_HXX /**************************************************************************** * Included Files @@ -79,7 +79,7 @@ #include #include -#include "cwidgeteventargs.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -281,4 +281,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLER_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTHANDLER_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx b/include/graphics/nxwidgets/cwidgeteventhandlerlist.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx rename to include/graphics/nxwidgets/cwidgeteventhandlerlist.hxx index 14668f682..acd0dffa7 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx +++ b/include/graphics/nxwidgets/cwidgeteventhandlerlist.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx + * apps/include/graphics/nxwidgets/cwidgeteventhandlerlist.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLERLIST_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLERLIST_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTHANDLERLIST_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTHANDLERLIST_HXX /**************************************************************************** * Included Files @@ -81,8 +81,8 @@ #include -#include "cwidgeteventhandler.hxx" -#include "tnxarray.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -355,4 +355,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLERLIST_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETEVENTHANDLERLIST_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx b/include/graphics/nxwidgets/cwidgetstyle.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx rename to include/graphics/nxwidgets/cwidgetstyle.hxx index 152ac612a..4295dfde9 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx +++ b/include/graphics/nxwidgets/cwidgetstyle.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx + * apps/include/graphics/nxwidgets/cwidgetstyle.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETSTYLE_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETSTYLE_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETSTYLE_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETSTYLE_HXX /**************************************************************************** * Included Files @@ -132,4 +132,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETSTYLE_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWIDGETSTYLE_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx b/include/graphics/nxwidgets/cwindoweventhandler.hxx similarity index 92% rename from graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx rename to include/graphics/nxwidgets/cwindoweventhandler.hxx index cd199b125..4c26412be 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx +++ b/include/graphics/nxwidgets/cwindoweventhandler.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx + * apps/include/graphics/nxwidgets/cwindoweventhandler.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,14 +33,14 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLER_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLER_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWINDOWEVENTHANDLER_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWINDOWEVENTHANDLER_HXX /**************************************************************************** * Included Files ****************************************************************************/ -#include "nxconfig.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -118,4 +118,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLER_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWINDOWEVENTHANDLER_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx b/include/graphics/nxwidgets/cwindoweventhandlerlist.hxx similarity index 92% rename from graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx rename to include/graphics/nxwidgets/cwindoweventhandlerlist.hxx index 4ebabb0d6..cf1894f74 100644 --- a/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx +++ b/include/graphics/nxwidgets/cwindoweventhandlerlist.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx + * apps/include/graphics/nxwidgets/cwindoweventhandlerlist.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLERLIST_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLERLIST_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWINDOWEVENTHANDLERLIST_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWINDOWEVENTHANDLERLIST_HXX /**************************************************************************** * Included Files @@ -47,8 +47,8 @@ #include -#include "cwindoweventhandler.hxx" -#include "tnxarray.hxx" +#include "graphics/nxwidgets/cwindoweventhandler.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -173,4 +173,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLERLIST_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_CWINDOWEVENTHANDLERLIST_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/glyphs.hxx b/include/graphics/nxwidgets/glyphs.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/glyphs.hxx rename to include/graphics/nxwidgets/glyphs.hxx index eb170826c..56b1ff060 100644 --- a/graphics/NxWidgets/libnxwidgets/include/glyphs.hxx +++ b/include/graphics/nxwidgets/glyphs.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/glyphs.hxx + * apps/include/graphics/nxwidgets/glyphs.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEGLYPHS_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEGLYPHS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_GLYPHS_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_GLYPHS_HXX /**************************************************************************** * Included Files @@ -129,4 +129,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEGLYPHS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_GLYPHS_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx b/include/graphics/nxwidgets/ibitmap.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx rename to include/graphics/nxwidgets/ibitmap.hxx index dc42629dc..cab43c212 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx +++ b/include/graphics/nxwidgets/ibitmap.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx + * apps/include/graphics/nxwidgets/ibitmap.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEIBITMAP_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEIBITMAP_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_IBITMAP_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_IBITMAP_HXX /**************************************************************************** * Included Files @@ -181,4 +181,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEIBITMAP_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_IBITMAP_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx b/include/graphics/nxwidgets/ilistbox.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx rename to include/graphics/nxwidgets/ilistbox.hxx index 8d9191f6a..1353d011e 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx +++ b/include/graphics/nxwidgets/ilistbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx + * apps/include/graphics/nxwidgets/ilistbox.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ILISTBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ILISTBOX_HXX /**************************************************************************** * Included Files @@ -81,7 +81,7 @@ #include -#include "clistboxdataitem.hxx" +#include "graphics/nxwidgets/clistboxdataitem.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -277,5 +277,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ILISTBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx b/include/graphics/nxwidgets/ilistdataeventhandler.hxx similarity index 94% rename from graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx rename to include/graphics/nxwidgets/ilistdataeventhandler.hxx index 76d619541..f8a4d2bca 100644 --- a/graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx +++ b/include/graphics/nxwidgets/ilistdataeventhandler.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx + * apps/include/graphics/nxwidgets/ilistdataeventhandler.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTDATAEVENTHANDLERR_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTDATAEVENTHANDLERR_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ILISTDATAEVENTHANDLERR_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ILISTDATAEVENTHANDLERR_HXX /**************************************************************************** * Included Files @@ -79,7 +79,7 @@ #include #include -#include "clistdataeventargs.hxx" +#include "graphics/nxwidgets/clistdataeventargs.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -133,4 +133,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTDATAEVENTHANDLERR_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ILISTDATAEVENTHANDLERR_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx b/include/graphics/nxwidgets/inxwindow.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx rename to include/graphics/nxwidgets/inxwindow.hxx index d532f8d03..a78f42280 100644 --- a/graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx +++ b/include/graphics/nxwidgets/inxwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx + * apps/include/graphics/nxwidgets/inxwindow.hxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEINXWINDOW_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEINXWINDOW_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_INXWINDOW_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_INXWINDOW_HXX /**************************************************************************** * Included Files @@ -314,5 +314,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEINXWINDOW_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_INXWINDOW_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx b/include/graphics/nxwidgets/iscrollable.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx rename to include/graphics/nxwidgets/iscrollable.hxx index 7c761f190..af2b5e0c1 100644 --- a/graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx +++ b/include/graphics/nxwidgets/iscrollable.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx + * apps/include/graphics/nxwidgets/iscrollable.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEISCROLLABLE_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEISCROLLABLE_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ISCROLLABLE_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ISCROLLABLE_HXX /**************************************************************************** * Included Files @@ -213,5 +213,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEISCROLLABLE_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ISCROLLABLE_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/islider.hxx b/include/graphics/nxwidgets/islider.hxx similarity index 96% rename from graphics/NxWidgets/libnxwidgets/include/islider.hxx rename to include/graphics/nxwidgets/islider.hxx index 88f60a2a4..e7f58bb37 100644 --- a/graphics/NxWidgets/libnxwidgets/include/islider.hxx +++ b/include/graphics/nxwidgets/islider.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/islider.hxx + * apps/include/graphics/nxwidgets/islider.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEISLIDER_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEISLIDER_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ISLIDER_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ISLIDER_HXX /**************************************************************************** * Included Files @@ -192,5 +192,5 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEISLIDER_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ISLIDER_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/itextbox.hxx b/include/graphics/nxwidgets/itextbox.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/itextbox.hxx rename to include/graphics/nxwidgets/itextbox.hxx index 354dbb60c..16eae2902 100644 --- a/graphics/NxWidgets/libnxwidgets/include/itextbox.hxx +++ b/include/graphics/nxwidgets/itextbox.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/itextbox.hxx + * apps/include/graphics/nxwidgets/itextbox.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEITEXTBOX_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEITEXTBOX_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ITEXTBOX_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ITEXTBOX_HXX /**************************************************************************** * Included Files @@ -81,9 +81,9 @@ #include -#include "cnxstring.hxx" -#include "cwidgetstyle.hxx" -#include "cwidgeteventargs.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -214,4 +214,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEITEXTBOX_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_ITEXTBOX_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx b/include/graphics/nxwidgets/nxconfig.hxx similarity index 98% rename from graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx rename to include/graphics/nxwidgets/nxconfig.hxx index cf8a8348c..b627416a9 100644 --- a/graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx +++ b/include/graphics/nxwidgets/nxconfig.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx + * apps/include/graphics/nxwidgets/nxconfig.hxx * * Copyright (C) 2012-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDENXCONFIG_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDENXCONFIG_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_NXCONFIG_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_NXCONFIG_HXX /**************************************************************************** * Included Files @@ -463,4 +463,4 @@ namespace NXWidgets * Implementation Classes ****************************************************************************/ -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDENXCONFIG_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_NXCONFIG_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/singletons.hxx b/include/graphics/nxwidgets/singletons.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/singletons.hxx rename to include/graphics/nxwidgets/singletons.hxx index 8a1fbee0e..dcafb9e36 100644 --- a/graphics/NxWidgets/libnxwidgets/include/singletons.hxx +++ b/include/graphics/nxwidgets/singletons.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/singletons.hxx + * apps/include/graphics/nxwidgets/singletons.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDESINGLETONS_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDESINGLETONS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_SINGLETONS_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_SINGLETONS_HXX /**************************************************************************** * Included Files @@ -79,7 +79,7 @@ #include #include -#include +#include "graphics/nxwidgets/cnxtimer.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -133,4 +133,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDESINGLETONS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_SINGLETONS_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/teventargs.hxx b/include/graphics/nxwidgets/teventargs.hxx similarity index 95% rename from graphics/NxWidgets/libnxwidgets/include/teventargs.hxx rename to include/graphics/nxwidgets/teventargs.hxx index 64691ada5..7512c07cd 100644 --- a/graphics/NxWidgets/libnxwidgets/include/teventargs.hxx +++ b/include/graphics/nxwidgets/teventargs.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/teventargs.hxx + * apps/include/graphics/nxwidgets/teventargs.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDETEVENTARGS_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDETEVENTARGS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_TEVENTARGS_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_TEVENTARGS_HXX /**************************************************************************** * Included Files @@ -133,4 +133,4 @@ namespace NXWidgets #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDETEVENTARGS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_TEVENTARGS_HXX diff --git a/graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx b/include/graphics/nxwidgets/tnxarray.hxx similarity index 97% rename from graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx rename to include/graphics/nxwidgets/tnxarray.hxx index 817d19523..45980e980 100644 --- a/graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx +++ b/include/graphics/nxwidgets/tnxarray.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx + * apps/include/graphics/nxwidgets/tnxarray.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDETNXARRAY_HXX -#define __APPS_GRAPHICS_NXWIDGETS_INCLUDETNXARRAY_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_TNXARRAY_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_TNXARRAY_HXX /**************************************************************************** * Included Files @@ -79,7 +79,7 @@ #include #include -#include "nxconfig.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -434,4 +434,4 @@ void TNxArray::clear() #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDETNXARRAY_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_TNXARRAY_HXX diff --git a/graphics/NxWidgets/nxwm/include/capplicationwindow.hxx b/include/graphics/nxwm/capplicationwindow.hxx similarity index 91% rename from graphics/NxWidgets/nxwm/include/capplicationwindow.hxx rename to include/graphics/nxwm/capplicationwindow.hxx index 15faebd21..3be677ee2 100644 --- a/graphics/NxWidgets/nxwm/include/capplicationwindow.hxx +++ b/include/graphics/nxwm/capplicationwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/capplicationwindow.hxx + * apps/include/graphics/nxwm/capplicationwindow.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECAPPLICATIONWINDOW_NXX -#define __APPS_GRAPHICS_NXWM_INCLUDECAPPLICATIONWINDOW_NXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_NXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_NXX /**************************************************************************** * Included Files @@ -42,16 +42,16 @@ #include -#include "cnxtkwindow.hxx" -#include "cnxtoolbar.hxx" -#include "cwidgetcontrol.hxx" -#include "cwidgeteventargs.hxx" -#include "cwidgeteventhandler.hxx" -#include "cimage.hxx" -#include "clabel.hxx" -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/cnxtkwindow.hxx" +#include "graphics/nxwidgets/cnxtoolbar.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cimage.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "iapplicationwindow.hxx" +#include "graphics/nxwm/iapplicationwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -230,4 +230,4 @@ namespace NxWM #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDECAPPLICATIONWINDOW_NXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_NXX diff --git a/graphics/NxWidgets/nxwm/include/ccalibration.hxx b/include/graphics/nxwm/ccalibration.hxx similarity index 96% rename from graphics/NxWidgets/nxwm/include/ccalibration.hxx rename to include/graphics/nxwm/ccalibration.hxx index f226fa120..cb907ada3 100644 --- a/graphics/NxWidgets/nxwm/include/ccalibration.hxx +++ b/include/graphics/nxwm/ccalibration.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/ccalibration.hxx + * apps/include/graphics/nxwm/ccalibration.hxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECCALIBRATION_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDECCALIBRATION_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CCALIBRATION_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CCALIBRATION_HXX /**************************************************************************** * Included Files @@ -45,15 +45,15 @@ #include #include -#include "cnxstring.hxx" -#include "cwidgeteventhandler.hxx" -#include "cwidgetcontrol.hxx" -#include "clabel.hxx" -#include "cnxfont.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" -#include "ctaskbar.hxx" -#include "iapplication.hxx" -#include "cfullscreenwindow.hxx" +#include "graphics/nxwm/ctaskbar.hxx" +#include "graphics/nxwm/iapplication.hxx" +#include "graphics/nxwm/cfullscreenwindow.hxx" /**************************************************************************** * Pre-processor Definitions @@ -449,4 +449,4 @@ namespace NxWM }; } -#endif // __APPS_GRAPHICS_NXWM_INCLUDECCALIBRATION_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CCALIBRATION_HXX diff --git a/graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx b/include/graphics/nxwm/cfullscreenwindow.hxx similarity index 93% rename from graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx rename to include/graphics/nxwm/cfullscreenwindow.hxx index 55237c9b7..1e5c5e4b0 100644 --- a/graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx +++ b/include/graphics/nxwm/cfullscreenwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx + * apps/include/graphics/nxwm/cfullscreenwindow.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECFULLSCREENWINDOW_NXX -#define __APPS_GRAPHICS_NXWM_INCLUDECFULLSCREENWINDOW_NXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_NXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_NXX /**************************************************************************** * Included Files @@ -42,10 +42,10 @@ #include -#include "cnxwindow.hxx" -#include "cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cnxwindow.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" -#include "iapplicationwindow.hxx" +#include "graphics/nxwm/iapplicationwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -182,4 +182,4 @@ namespace NxWM #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDECFULLSCREENWINDOW_NXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_NXX diff --git a/graphics/NxWidgets/nxwm/include/chexcalculator.hxx b/include/graphics/nxwm/chexcalculator.hxx similarity index 95% rename from graphics/NxWidgets/nxwm/include/chexcalculator.hxx rename to include/graphics/nxwm/chexcalculator.hxx index 990b7ea65..4e7118b8f 100644 --- a/graphics/NxWidgets/nxwm/include/chexcalculator.hxx +++ b/include/graphics/nxwm/chexcalculator.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/chexcalculator.hxx + * apps/include/graphics/nxwm/chexcalculator.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECHEXCALCULATOR_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDECHEXCALCULATOR_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CHEXCALCULATOR_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CHEXCALCULATOR_HXX /**************************************************************************** * Included Files @@ -46,13 +46,13 @@ #include #include -#include "cbuttonarray.hxx" -#include "clabel.hxx" -#include "cnxfont.hxx" +#include "graphics/nxwidgets/cbuttonarray.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" -#include "iapplication.hxx" -#include "capplicationwindow.hxx" -#include "ctaskbar.hxx" +#include "graphics/nxwm/iapplication.hxx" +#include "graphics/nxwm/capplicationwindow.hxx" +#include "graphics/nxwm/ctaskbar.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -327,4 +327,4 @@ namespace NxWM } #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDECHEXCALCULATOR_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CHEXCALCULATOR_HXX diff --git a/graphics/NxWidgets/nxwm/include/ckeyboard.hxx b/include/graphics/nxwm/ckeyboard.hxx similarity index 98% rename from graphics/NxWidgets/nxwm/include/ckeyboard.hxx rename to include/graphics/nxwm/ckeyboard.hxx index 330c30f28..85395eb5c 100644 --- a/graphics/NxWidgets/nxwm/include/ckeyboard.hxx +++ b/include/graphics/nxwm/ckeyboard.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/keyboard.hxx + * apps/include/graphics/nxwm/keyboard.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,8 +47,8 @@ #include -#include "cnxserver.hxx" -#include "ccalibration.hxx" +#include "graphics/nxwidgets/cnxserver.hxx" +#include "graphics/nxwm/ccalibration.hxx" /**************************************************************************** * Pre-processor Definitions diff --git a/graphics/NxWidgets/nxwm/include/cmediaplayer.hxx b/include/graphics/nxwm/cmediaplayer.hxx similarity index 95% rename from graphics/NxWidgets/nxwm/include/cmediaplayer.hxx rename to include/graphics/nxwm/cmediaplayer.hxx index 3d33c515a..53d629eb2 100644 --- a/graphics/NxWidgets/nxwm/include/cmediaplayer.hxx +++ b/include/graphics/nxwm/cmediaplayer.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/cmediaplayer.hxx + * apps/include/graphics/nxwm/cmediaplayer.hxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECMEDIAPLAYER_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDECMEDIAPLAYER_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CMEDIAPLAYER_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CMEDIAPLAYER_HXX /**************************************************************************** * Included Files @@ -48,17 +48,17 @@ #include #include -#include "cnxfont.hxx" -#include "cimage.hxx" -#include "cstickyimage.hxx" -#include "clabel.hxx" -#include "clistbox.hxx" -#include "clistboxdataitem.hxx" -#include "cglyphsliderhorizontal.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/cimage.hxx" +#include "graphics/nxwidgets/cstickyimage.hxx" +#include "graphics/nxwidgets/clabel.hxx" +#include "graphics/nxwidgets/clistbox.hxx" +#include "graphics/nxwidgets/clistboxdataitem.hxx" +#include "graphics/nxwidgets/cglyphsliderhorizontal.hxx" -#include "iapplication.hxx" -#include "capplicationwindow.hxx" -#include "ctaskbar.hxx" +#include "graphics/nxwm/iapplication.hxx" +#include "graphics/nxwm/capplicationwindow.hxx" +#include "graphics/nxwm/ctaskbar.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -477,4 +477,4 @@ namespace NxWM } #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDECMEDIAPLAYER_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CMEDIAPLAYER_HXX diff --git a/graphics/NxWidgets/nxwm/include/cnxterm.hxx b/include/graphics/nxwm/cnxterm.hxx similarity index 95% rename from graphics/NxWidgets/nxwm/include/cnxterm.hxx rename to include/graphics/nxwm/cnxterm.hxx index 27d7c3b42..50ae18e0e 100644 --- a/graphics/NxWidgets/nxwm/include/cnxterm.hxx +++ b/include/graphics/nxwm/cnxterm.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/cnxterm.hxx + * apps/include/graphics/nxwm/cnxterm.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECNXTERM_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDECNXTERM_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CNXTERM_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CNXTERM_HXX /**************************************************************************** * Included Files @@ -46,9 +46,9 @@ #include #include -#include "iapplication.hxx" -#include "capplicationwindow.hxx" -#include "ctaskbar.hxx" +#include "graphics/nxwm/iapplication.hxx" +#include "graphics/nxwm/capplicationwindow.hxx" +#include "graphics/nxwm/ctaskbar.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -242,4 +242,4 @@ namespace NxWM } #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDECNXTERM_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CNXTERM_HXX diff --git a/graphics/NxWidgets/nxwm/include/cstartwindow.hxx b/include/graphics/nxwm/cstartwindow.hxx similarity index 96% rename from graphics/NxWidgets/nxwm/include/cstartwindow.hxx rename to include/graphics/nxwm/cstartwindow.hxx index 654f8a9d2..1ec96559e 100644 --- a/graphics/NxWidgets/nxwm/include/cstartwindow.hxx +++ b/include/graphics/nxwm/cstartwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/cnxstart.hxx + * apps/include/graphics/nxwm/cnxstart.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECSTARTWINDOW_NXX -#define __APPS_GRAPHICS_NXWM_INCLUDECSTARTWINDOW_NXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_NXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_NXX /**************************************************************************** * Included Files @@ -44,10 +44,10 @@ #include -#include "tnxarray.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" -#include "iapplication.hxx" -#include "capplicationwindow.hxx" +#include "graphics/nxwm/iapplication.hxx" +#include "graphics/nxwm/capplicationwindow.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -301,4 +301,4 @@ namespace NxWM #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDECSTARTWINDOW_NXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_NXX diff --git a/graphics/NxWidgets/nxwm/include/ctaskbar.hxx b/include/graphics/nxwm/ctaskbar.hxx similarity index 95% rename from graphics/NxWidgets/nxwm/include/ctaskbar.hxx rename to include/graphics/nxwm/ctaskbar.hxx index e78bca4a2..b29a59476 100644 --- a/graphics/NxWidgets/nxwm/include/ctaskbar.hxx +++ b/include/graphics/nxwm/ctaskbar.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/cnxtaskbar.hxx + * apps/include/graphics/nxwm/cnxtaskbar.hxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,19 +42,19 @@ #include -#include "nxconfig.hxx" -#include "tnxarray.hxx" -#include "cnxwindow.hxx" -#include "cnxserver.hxx" -#include "cwidgeteventhandler.hxx" -#include "cwidgeteventargs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/tnxarray.hxx" +#include "graphics/nxwidgets/cnxwindow.hxx" +#include "graphics/nxwidgets/cnxserver.hxx" +#include "graphics/nxwidgets/cwidgeteventhandler.hxx" +#include "graphics/nxwidgets/cwidgeteventargs.hxx" -#include "nxwmconfig.hxx" -#include "nxwmglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" +#include "graphics/nxwm/nxwmglyphs.hxx" -#include "capplicationwindow.hxx" -#include "cfullscreenwindow.hxx" -#include "iapplication.hxx" +#include "graphics/nxwm/capplicationwindow.hxx" +#include "graphics/nxwm/cfullscreenwindow.hxx" +#include "graphics/nxwm/iapplication.hxx" /**************************************************************************** * Pre-processor Definitions @@ -383,7 +383,7 @@ namespace NxWM /** * Minimize an application by moving its window to the bottom of the - * and redrawing the next visible appliation. + * and redrawing the next visible application. * * @param app. The new application to add to the task bar * @return true on success diff --git a/graphics/NxWidgets/nxwm/include/ctouchscreen.hxx b/include/graphics/nxwm/ctouchscreen.hxx similarity index 96% rename from graphics/NxWidgets/nxwm/include/ctouchscreen.hxx rename to include/graphics/nxwm/ctouchscreen.hxx index eadb37198..2e1c04b74 100644 --- a/graphics/NxWidgets/nxwm/include/ctouchscreen.hxx +++ b/include/graphics/nxwm/ctouchscreen.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/ctouchscreen.hxx + * apps/include/graphics/nxwm/ctouchscreen.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECTOUCHSCREEN_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDECTOUCHSCREEN_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CTOUCHSCREEN_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CTOUCHSCREEN_HXX /**************************************************************************** * Included Files @@ -47,8 +47,8 @@ #include -#include "cnxserver.hxx" -#include "ccalibration.hxx" +#include "graphics/nxwidgets/cnxserver.hxx" +#include "graphics/nxwm/ccalibration.hxx" /**************************************************************************** * Pre-processor Definitions @@ -218,4 +218,4 @@ namespace NxWM }; } -#endif // __APPS_GRAPHICS_NXWM_INCLUDECTOUCHSCREEN_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CTOUCHSCREEN_HXX diff --git a/graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx b/include/graphics/nxwm/cwindowmessenger.hxx similarity index 92% rename from graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx rename to include/graphics/nxwm/cwindowmessenger.hxx index c5f4c564e..8d20caccb 100644 --- a/graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx +++ b/include/graphics/nxwm/cwindowmessenger.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx + * apps/include/graphics/nxwm/cwindowmessenger.hxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDECWINDOWMESSENGER_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDECWINDOWMESSENGER_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CWINDOWMESSENGER_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_CWINDOWMESSENGER_HXX /**************************************************************************** * Included Files @@ -48,9 +48,9 @@ #include #include -#include "cwindoweventhandler.hxx" -#include "cwidgetstyle.hxx" -#include "cwidgetcontrol.hxx" +#include "graphics/nxwidgets/cwindoweventhandler.hxx" +#include "graphics/nxwidgets/cwidgetstyle.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -146,4 +146,4 @@ namespace NxWM } #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDECWINDOWMESSENGER_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CWINDOWMESSENGER_HXX diff --git a/graphics/NxWidgets/nxwm/include/iapplication.hxx b/include/graphics/nxwm/iapplication.hxx similarity index 96% rename from graphics/NxWidgets/nxwm/include/iapplication.hxx rename to include/graphics/nxwm/iapplication.hxx index aff69b7c2..5da235004 100644 --- a/graphics/NxWidgets/nxwm/include/iapplication.hxx +++ b/include/graphics/nxwm/iapplication.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/iapplication.hxx + * apps/include/graphics/nxwm/iapplication.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATION_NXX -#define __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATION_NXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_NXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_NXX /**************************************************************************** * Included Files @@ -42,8 +42,8 @@ #include -#include "cnxstring.hxx" -#include "ibitmap.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -247,4 +247,4 @@ namespace NxWM #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATION_NXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_NXX diff --git a/graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx b/include/graphics/nxwm/iapplicationwindow.hxx similarity index 93% rename from graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx rename to include/graphics/nxwm/iapplicationwindow.hxx index 71c0576fa..1de875e5c 100644 --- a/graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx +++ b/include/graphics/nxwm/iapplicationwindow.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx + * apps/include/graphics/nxwm/iapplicationwindow.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATIONWINDOW_NXX -#define __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATIONWINDOW_NXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_NXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_NXX /**************************************************************************** * Included Files @@ -42,11 +42,11 @@ #include -#include "inxwindow.hxx" -#include "cnxstring.hxx" -#include "cwidgetcontrol.hxx" +#include "graphics/nxwidgets/inxwindow.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cwidgetcontrol.hxx" -#include "iapplication.hxx" +#include "graphics/nxwm/iapplication.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -201,4 +201,4 @@ namespace NxWM #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATIONWINDOW_NXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_NXX diff --git a/graphics/NxWidgets/nxwm/include/nxwmconfig.hxx b/include/graphics/nxwm/nxwmconfig.hxx similarity index 98% rename from graphics/NxWidgets/nxwm/include/nxwmconfig.hxx rename to include/graphics/nxwm/nxwmconfig.hxx index c5c9dcbec..b010ceafd 100644 --- a/graphics/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/include/graphics/nxwm/nxwmconfig.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/nxwmconfig.hxx + * apps/include/graphics/nxwm/nxwmconfig.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDENXWMCONFIG_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDENXWMCONFIG_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_NXWMCONFIG_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_NXWMCONFIG_HXX /**************************************************************************** * Included Files @@ -44,8 +44,8 @@ #include -#include "nxconfig.hxx" -#include "crlepalettebitmap.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -706,4 +706,4 @@ void showTestStepMemory(FAR const char *msg); # define showTestStepMemory(msg) #endif -#endif // __APPS_GRAPHICS_NXWM_INCLUDENXWMCONFIG_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_NXWMCONFIG_HXX diff --git a/graphics/NxWidgets/nxwm/include/nxwmglyphs.hxx b/include/graphics/nxwm/nxwmglyphs.hxx similarity index 91% rename from graphics/NxWidgets/nxwm/include/nxwmglyphs.hxx rename to include/graphics/nxwm/nxwmglyphs.hxx index 1238215d2..984ef559a 100644 --- a/graphics/NxWidgets/nxwm/include/nxwmglyphs.hxx +++ b/include/graphics/nxwm/nxwmglyphs.hxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/include/nxwmconfig.hxx + * apps/include/graphics/nxwm/nxwmconfig.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __APPS_GRAPHICS_NXWM_INCLUDENXWMGLYPHS_HXX -#define __APPS_GRAPHICS_NXWM_INCLUDENXWMGLYPHS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_NXWMGLYPHS_HXX +#define __APPS_INCLUDE_GRAPHICS_NXWM_NXWMGLYPHS_HXX /**************************************************************************** * Included Files @@ -42,8 +42,8 @@ #include -#include "nxconfig.hxx" -#include "glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/glyphs.hxx" /**************************************************************************** * Pre-Processor Definitions @@ -74,4 +74,4 @@ namespace NxWM } #endif // __cplusplus -#endif // __APPS_GRAPHICS_NXWM_INCLUDENXWMGLYPHS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXWM_NXWMGLYPHS_HXX