Commit e5e10759 by Jessica Hawkwell

moving to new standard format

1 parent 2a9c35ed
Showing with 118 additions and 576 deletions
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
* Created on March 16, 2020 02:49 AM * Created on March 16, 2020 02:49 AM
*/ */
#ifndef NITROSVG_H #ifndef NitroSVG_h
#define NITROSVG_H #define NitroSVG_h
#ifndef GC_NAME_CONFLICT #ifndef GC_NAME_CONFLICT
#define GC_NAME_CONFLICT #define GC_NAME_CONFLICT
...@@ -53,5 +53,5 @@ ...@@ -53,5 +53,5 @@
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>
#endif /* NITROSVG_H */ #endif /* NitroSVG_h */
...@@ -24,13 +24,8 @@ ...@@ -24,13 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_svg_BoundingBox_h
* File: BoundingBox.h #define nitrogen_svg_BoundingBox_h
* Author: jlhawkwell
*/
#ifndef BoundingBox_h
#define BoundingBox_h
#include <NitroSVG.h> #include <NitroSVG.h>
...@@ -430,5 +425,5 @@ namespace nitrogen { ...@@ -430,5 +425,5 @@ namespace nitrogen {
} }
} }
#endif /* BoundingBox_h */ #endif /* nitrogen_svg_BoundingBox_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: NUtils.cpp
* Author: jlhawkwell
*
* Created on March 10, 2018, 10:39 PM
*/
#include "NUtils.h" #include "NUtils.h"
#include <unordered_map> #include <unordered_map>
......
...@@ -26,15 +26,8 @@ ...@@ -26,15 +26,8 @@
* *
*/ */
/* #ifndef NUtils_h
* File: NUtils.h #define NUtils_h
* Author: jlhawkwell
*
* Created on March 10, 2018, 10:39 PM
*/
#ifndef NUTILS_H
#define NUTILS_H
#include "NitroWin.h" #include "NitroWin.h"
...@@ -55,4 +48,4 @@ public: ...@@ -55,4 +48,4 @@ public:
static Window checkNitroWin(Window w); static Window checkNitroWin(Window w);
}; };
#endif // NUTILS_H #endif // NUtils_h
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: NWMAction.cpp
* Author: jlhawkwell
*
* Created on March 10, 2018, 10:39 PM
*/
#include "NWMAction.h" #include "NWMAction.h"
#include "NUtils.h" #include "NUtils.h"
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef NWMAction_h
* File: NWMAction.h #define NWMAction_h
* Author: jlhawkwell
*
* Created on March 10, 2018, 10:39 PM
*/
#ifndef NWMACTION_H
#define NWMACTION_H
#include "NitroWin.h" #include "NitroWin.h"
...@@ -106,5 +99,5 @@ public: ...@@ -106,5 +99,5 @@ public:
static void onDefaultEvent(XAnyEvent e); static void onDefaultEvent(XAnyEvent e);
}; };
#endif /* NWMACTION_H */ #endif /* NWMAction_h */
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef NWMANAGER_H #ifndef NWManager_h
#define NWMANAGER_H #define NWManager_h
#include "NitroWin.h" #include "NitroWin.h"
#include <unordered_map> #include <unordered_map>
...@@ -53,5 +53,5 @@ private: ...@@ -53,5 +53,5 @@ private:
static void onLoop(XEvent e); static void onLoop(XEvent e);
}; };
#endif /* NWMANAGER_H */ #endif /* NWManager_h */
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef NitroWin_h
* File: NitroWin.h #define NitroWin_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 12:49 PM
*/
#ifndef NITROWIN_H
#define NITROWIN_H
#define NITROWIN_NAME "@PROJECT_NAME@" #define NITROWIN_NAME "@PROJECT_NAME@"
#define NITROWIN_VERSION_MAJOR @Nitrogen_VERSION_MAJOR@ #define NITROWIN_VERSION_MAJOR @Nitrogen_VERSION_MAJOR@
...@@ -52,5 +45,5 @@ ...@@ -52,5 +45,5 @@
#include <gc/gc_backptr.h> #include <gc/gc_backptr.h>
#endif #endif
#endif /* NITROWIN_H */ #endif /* NitroWin_h */
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nde_h
* File: nde.h #define nde_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 12:49 PM
*/
#ifndef NDE_H
#define NDE_H
#ifndef GC_NAME_CONFLICT #ifndef GC_NAME_CONFLICT
#define GC_NAME_CONFLICT #define GC_NAME_CONFLICT
...@@ -60,5 +53,5 @@ namespace nitrogen { ...@@ -60,5 +53,5 @@ namespace nitrogen {
} }
} }
#endif /* NDE_H */ #endif /* nde_h */
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef NPOSITION_H #ifndef nitrogen_NPosition_h
#define NPOSITION_H #define nitrogen_NPosition_h
#include <nde.h> #include <nde.h>
...@@ -103,4 +103,4 @@ namespace nitrogen { ...@@ -103,4 +103,4 @@ namespace nitrogen {
}; };
} }
#endif // NPOSITION_H #endif /* nitrogen_NPosition_h */
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef NSIZE_H #ifndef nitrogen_NSize_h
#define NSIZE_H #define nitrogen_NSize_h
#include <nde.h> #include <nde.h>
...@@ -84,4 +84,4 @@ namespace nitrogen { ...@@ -84,4 +84,4 @@ namespace nitrogen {
}; };
} }
#endif // NSIZE_H #endif /* nitrogen_NSize_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: NComponent.cpp
* Author: jlhawkwell
*
* Created on March 16, 2018, 5:36 PM
*/
#include "NComponent.h" #include "NComponent.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef NComponent_h
* File: NComponent.h #define NComponent_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 5:36 PM
*/
#ifndef NCOMPONENT_H
#define NCOMPONENT_H
#include <ntk.h> #include <ntk.h>
...@@ -46,5 +39,5 @@ namespace nitrogen { ...@@ -46,5 +39,5 @@ namespace nitrogen {
private: private:
}; };
} }
#endif /* NCOMPONENT_H */ #endif /* NComponent_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Object.cpp
* Author: jlhawkwell
*
* Created on March 16, 2018, 11:12 AM
*/
#include "Object.h" #include "Object.h"
#include <ostream> #include <ostream>
......
...@@ -24,14 +24,8 @@ ...@@ -24,14 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef Object_h
* File: Object.h #define Object_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 11:12 AM
*/
#ifndef OBJECT_H
#define OBJECT_H
#include <ntk.h> #include <ntk.h>
...@@ -51,4 +45,4 @@ namespace nitrogen { ...@@ -51,4 +45,4 @@ namespace nitrogen {
}; };
} }
#endif /* OBJECT_H */ #endif /* Object_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: ActionEvent.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 9:24 AM
*/
#include "ActionEvent.h" #include "ActionEvent.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_ActionEvent_h
* File: ActionEvent.h #define nitrogen_nwt_ActionEvent_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 9:24 AM
*/
#ifndef ACTIONEVENT_H
#define ACTIONEVENT_H
#include <ntk.h> #include <ntk.h>
#include <nitrogen/nwt/NWTEvent.h> #include <nitrogen/nwt/NWTEvent.h>
...@@ -63,5 +56,5 @@ namespace nitrogen { ...@@ -63,5 +56,5 @@ namespace nitrogen {
} }
} }
#endif /* ACTIONEVENT_H */ #endif /* nitrogen_nwt_ActionEvent_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: ActionListener.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 9:43 AM
*/
#include "ActionListener.h" #include "ActionListener.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_ActionListener_h
* File: ActionListener.h #define nitrogen_nwt_ActionListener_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 9:43 AM
*/
#ifndef ACTIONLISTENER_H
#define ACTIONLISTENER_H
#include <ntk.h> #include <ntk.h>
#include <nitrogen/nwt/EventListener.h> #include <nitrogen/nwt/EventListener.h>
...@@ -52,5 +45,5 @@ namespace nitrogen { ...@@ -52,5 +45,5 @@ namespace nitrogen {
} }
} }
#endif /* ACTIONLISTENER_H */ #endif /* nitrogen_nwt_ActionListener_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Border.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 1:44 PM
*/
#include "nitrogen/nwt/Border.h" #include "nitrogen/nwt/Border.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Border_h
* File: Border.h #define nitrogen_nwt_Border_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 1:44 PM
*/
#ifndef BORDER_H
#define BORDER_H
#include <ntk.h> #include <ntk.h>
...@@ -63,5 +56,5 @@ namespace nitrogen { ...@@ -63,5 +56,5 @@ namespace nitrogen {
} }
} }
#endif /* BORDER_H */ #endif /* nitrogen_nwt_Border_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Color.cpp
* Author: jlhawkwell
*
* Created on March 16, 2018, 7:19 PM
*/
#include "Color.h" #include "Color.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Color_h
* File: Color.h #define nitrogen_nwt_Color_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 7:19 PM
*/
#ifndef COLOR_H
#define COLOR_H
#include <ntk.h> #include <ntk.h>
...@@ -91,5 +84,5 @@ namespace nitrogen { ...@@ -91,5 +84,5 @@ namespace nitrogen {
} }
} }
#endif /* COLOR_H */ #endif /* nitrogen_nwt_Color_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Component.cpp
* Author: jlhawkwell
*
* Created on March 16, 2018, 6:04 PM
*/
#include "Component.h" #include "Component.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Component_h
* File: Component.h #define nitrogen_nwt_Component_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 6:04 PM
*/
#ifndef COMPONENT_H
#define COMPONENT_H
#include <ntk.h> #include <ntk.h>
...@@ -121,5 +114,5 @@ namespace nitrogen { ...@@ -121,5 +114,5 @@ namespace nitrogen {
}; };
} }
} }
#endif /* COMPONENT_H */ #endif /* nitrogen_nwt_Component_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: ComponentEvent.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 4:20 PM
*/
#include "ComponentEvent.h" #include "ComponentEvent.h"
#include <nitrogen/nwt/Component.h> #include <nitrogen/nwt/Component.h>
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_ComponentEvent_h
* File: ComponentEvent.h #define nitrogen_nwt_ComponentEvent_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 4:20 PM
*/
#ifndef COMPONENTEVENT_H
#define COMPONENTEVENT_H
#include <ntk.h> #include <ntk.h>
//#include <nitrogen/nwt/Component.h> //#include <nitrogen/nwt/Component.h>
...@@ -54,5 +47,5 @@ namespace nitrogen { ...@@ -54,5 +47,5 @@ namespace nitrogen {
} }
} }
#endif /* COMPONENTEVENT_H */ #endif /* nitrogen_nwt_ComponentEvent_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Container.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 10:30 AM
*/
#include "Container.h" #include "Container.h"
#include "Insets.h" #include "Insets.h"
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Container_h
* File: Container.h #define nitrogen_nwt_Container_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 10:30 AM
*/
#ifndef CONTAINER_H
#define CONTAINER_H
#include <ntk.h> #include <ntk.h>
...@@ -70,5 +63,5 @@ namespace nitrogen { ...@@ -70,5 +63,5 @@ namespace nitrogen {
} }
} }
#endif /* CONTAINER_H */ #endif /* nitrogen_nwt_Container_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Dimension.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 12:30 AM
*/
#include "Dimension.h" #include "Dimension.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Dimension_h
* File: Dimension.h #define nitrogen_nwt_Dimension_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 12:30 AM
*/
#ifndef DIMENSION_H
#define DIMENSION_H
#include <ntk.h> #include <ntk.h>
...@@ -65,5 +58,5 @@ namespace nitrogen { ...@@ -65,5 +58,5 @@ namespace nitrogen {
} }
} }
#endif /* DIMENSION_H */ #endif /* nitrogen_nwt_Dimension_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: EmptyBorder.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 9:49 PM
*/
#include "EmptyBorder.h" #include "EmptyBorder.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_EmptyBorder_h
* File: EmptyBorder.h #define nitrogen_nwt_EmptyBorder_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 9:49 PM
*/
#ifndef EMPTYBORDER_H
#define EMPTYBORDER_H
#include <ntk.h> #include <ntk.h>
#include <nitrogen/nwt/Border.h> #include <nitrogen/nwt/Border.h>
...@@ -63,5 +56,5 @@ namespace nitrogen { ...@@ -63,5 +56,5 @@ namespace nitrogen {
} }
} }
#endif /* EMPTYBORDER_H */ #endif /* nitrogen_nwt_EmptyBorder_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: EventListener.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 7:58 PM
*/
#include "EventListener.h" #include "EventListener.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_EventListener_h
* File: EventListener.h #define nitrogen_nwt_EventListener_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 7:58 PM
*/
#ifndef EVENTLISTENER_H
#define EVENTLISTENER_H
#include <ntk.h> #include <ntk.h>
...@@ -50,5 +43,5 @@ namespace nitrogen { ...@@ -50,5 +43,5 @@ namespace nitrogen {
} }
} }
#endif /* EVENTLISTENER_H */ #endif /* nitrogen_nwt_EventListener_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: EventObject.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 2:36 PM
*/
#include "EventObject.h" #include "EventObject.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_EventObject_h
* File: EventObject.h #define nitrogen_nwt_EventObject_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 2:36 PM
*/
#ifndef EVENTOBJECT_H
#define EVENTOBJECT_H
#include <ntk.h> #include <ntk.h>
...@@ -57,5 +50,5 @@ namespace nitrogen { ...@@ -57,5 +50,5 @@ namespace nitrogen {
} }
} }
#endif /* EVENTOBJECT_H */ #endif /* nitrogen_nwt_EventObject_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: FlowLayout.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 8:53 PM
*/
#include "FlowLayout.h" #include "FlowLayout.h"
#include "Insets.h" #include "Insets.h"
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_FlowLayout_h
* File: FlowLayout.h #define nitrogen_nwt_FlowLayout_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 8:53 PM
*/
#ifndef FLOWLAYOUT_H
#define FLOWLAYOUT_H
#include <ntk.h> #include <ntk.h>
...@@ -79,5 +72,5 @@ namespace nitrogen { ...@@ -79,5 +72,5 @@ namespace nitrogen {
} }
} }
#endif /* FLOWLAYOUT_H */ #endif /* nitrogen_nwt_FlowLayout_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Font.cpp
* Author: jlhawkwell
*
* Created on March 16, 2018, 11:02 PM
*/
#include "Font.h" #include "Font.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Font_h
* File: Font.h #define nitrogen_nwt_Font_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 11:02 PM
*/
#ifndef FONT_H
#define FONT_H
#include <ntk.h> #include <ntk.h>
...@@ -64,5 +57,5 @@ namespace nitrogen { ...@@ -64,5 +57,5 @@ namespace nitrogen {
}; };
} }
} }
#endif /* FONT_H */ #endif /* nitrogen_nwt_Font_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: FontMetrics.cpp
* Author: jlhawkwell
*
* Created on March 16, 2018, 11:46 PM
*/
#include "FontMetrics.h" #include "FontMetrics.h"
#include <ntk.h> #include <ntk.h>
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_FontMetrics_h
* File: FontMetrics.h #define nitrogen_nwt_FontMetrics_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 11:46 PM
*/
#ifndef FONTMETRICS_H
#define FONTMETRICS_H
#include <ntk.h> #include <ntk.h>
...@@ -64,5 +57,5 @@ namespace nitrogen { ...@@ -64,5 +57,5 @@ namespace nitrogen {
} }
} }
#endif /* FONTMETRICS_H */ #endif /* nitrogen_nwt_FontMetrics_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Graphics.cpp
* Author: jlhawkwell
*
* Created on March 17, 2018, 2:16 PM
*/
#include "Graphics.h" #include "Graphics.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Graphics_h
* File: Graphics.h #define nitrogen_nwt_Graphics_h
* Author: jlhawkwell
*
* Created on March 17, 2018, 2:16 PM
*/
#ifndef GRAPHICS_H
#define GRAPHICS_H
#include <ntk.h> #include <ntk.h>
...@@ -80,5 +73,5 @@ namespace nitrogen { ...@@ -80,5 +73,5 @@ namespace nitrogen {
}; };
} }
} }
#endif /* GRAPHICS_H */ #endif /* nitrogen_nwt_Graphics_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: GridLayout.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 5:46 PM
*/
#include "GridLayout.h" #include "GridLayout.h"
#include "Insets.h" #include "Insets.h"
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_GridLayout_h
* File: GridLayout.h #define nitrogen_nwt_GridLayout_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 5:46 PM
*/
#ifndef GRIDLAYOUT_H
#define GRIDLAYOUT_H
#include <ntk.h> #include <ntk.h>
...@@ -71,5 +64,5 @@ namespace nitrogen { ...@@ -71,5 +64,5 @@ namespace nitrogen {
} }
} }
#endif /* GRIDLAYOUT_H */ #endif /* nitrogen_nwt_GridLayout_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: InputEvent.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 4:41 PM
*/
#include "InputEvent.h" #include "InputEvent.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_InputEvent_h
* File: InputEvent.h #define nitrogen_nwt_InputEvent_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 4:41 PM
*/
#ifndef INPUTEVENT_H
#define INPUTEVENT_H
#include <ntk.h> #include <ntk.h>
//#include <nitrogen/nwt/Component.h> //#include <nitrogen/nwt/Component.h>
...@@ -60,5 +53,5 @@ namespace nitrogen { ...@@ -60,5 +53,5 @@ namespace nitrogen {
} }
} }
#endif /* INPUTEVENT_H */ #endif /* nitrogen_nwt_InputEvent_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Insets.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 1:53 PM
*/
#include "Insets.h" #include "Insets.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Insets_h
* File: Insets.h #define nitrogen_nwt_Insets_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 1:53 PM
*/
#ifndef INSETS_H
#define INSETS_H
#include <ntk.h> #include <ntk.h>
...@@ -65,5 +58,5 @@ namespace nitrogen { ...@@ -65,5 +58,5 @@ namespace nitrogen {
} }
} }
#endif /* INSETS_H */ #endif /* nitrogen_nwt_Insets_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: LayoutManager.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 10:40 AM
*/
#include "LayoutManager.h" #include "LayoutManager.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_LayoutManager_h
* File: LayoutManager.h #define nitrogen_nwt_LayoutManager_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 10:40 AM
*/
#ifndef LAYOUTMANAGER_H
#define LAYOUTMANAGER_H
#include <ntk.h> #include <ntk.h>
...@@ -57,5 +50,5 @@ namespace nitrogen { ...@@ -57,5 +50,5 @@ namespace nitrogen {
} }
} }
#endif /* LAYOUTMANAGER_H */ #endif /* nitrogen_nwt_LayoutManager_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: MouseAdapter.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 10:22 PM
*/
#include "MouseAdapter.h" #include "MouseAdapter.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_MouseAdapter_h
* File: MouseAdapter.h #define nitrogen_nwt_MouseAdapter_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 10:22 PM
*/
#ifndef MOUSEADAPTER_H
#define MOUSEADAPTER_H
#include <ntk.h> #include <ntk.h>
...@@ -56,4 +49,4 @@ namespace nitrogen { ...@@ -56,4 +49,4 @@ namespace nitrogen {
} }
} }
#endif /* MOUSEADAPTER_H */ #endif /* nitrogen_nwt_MouseAdapter_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: MouseEvent.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 5:10 PM
*/
#include "MouseEvent.h" #include "MouseEvent.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_MouseEvent_h
* File: MouseEvent.h #define nitrogen_nwt_MouseEvent_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 5:10 PM
*/
#ifndef MOUSEEVENT_H
#define MOUSEEVENT_H
#include <ntk.h> #include <ntk.h>
//#include <nitrogen/nwt/Component.h> //#include <nitrogen/nwt/Component.h>
...@@ -80,5 +73,5 @@ namespace nitrogen { ...@@ -80,5 +73,5 @@ namespace nitrogen {
} }
} }
#endif /* MOUSEEVENT_H */ #endif /* nitrogen_nwt_MouseEvent_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: MouseListener.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 5:37 PM
*/
#include "MouseListener.h" #include "MouseListener.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_MouseListener_h
* File: MouseListener.h #define nitrogen_nwt_MouseListener_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 5:37 PM
*/
#ifndef MOUSELISTENER_H
#define MOUSELISTENER_H
#include <ntk.h> #include <ntk.h>
...@@ -56,4 +49,4 @@ namespace nitrogen { ...@@ -56,4 +49,4 @@ namespace nitrogen {
} }
} }
#endif /* MOUSELISTENER_H */ #endif /* nitrogen_nwt_MouseListener_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: NWTEvent.cpp
* Author: jlhawkwell
*
* Created on March 23, 2018, 2:35 PM
*/
#include "NWTEvent.h" #include "NWTEvent.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_NWTEvent_h
* File: NWTEvent.h #define nitrogen_nwt_NWTEvent_h
* Author: jlhawkwell
*
* Created on March 23, 2018, 2:35 PM
*/
#ifndef NWTEVENT_H
#define NWTEVENT_H
#include <ntk.h> #include <ntk.h>
#include <nitrogen/nwt/EventObject.h> #include <nitrogen/nwt/EventObject.h>
...@@ -61,5 +54,5 @@ namespace nitrogen { ...@@ -61,5 +54,5 @@ namespace nitrogen {
} }
} }
#endif /* NWTEVENT_H */ #endif /* nitrogen_nwt_NWTEvent_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: NativeGraphics.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 5:16 PM
*/
#include "NativeGraphics.h" #include "NativeGraphics.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_NativeGraphics_h
* File: NativeGraphics.h #define nitrogen_nwt_NativeGraphics_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 5:16 PM
*/
#ifndef NATIVEGRAPHICS_H
#define NATIVEGRAPHICS_H
#include <ntk.h> #include <ntk.h>
...@@ -104,5 +97,5 @@ namespace nitrogen { ...@@ -104,5 +97,5 @@ namespace nitrogen {
} }
} }
#endif /* NATIVEGRAPHICS_H */ #endif /* nitrogen_nwt_NativeGraphics_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Point.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 12:44 AM
*/
#include "Point.h" #include "Point.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Point_h
* File: Point.h #define nitrogen_nwt_Point_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 12:44 AM
*/
#ifndef POINT_H
#define POINT_H
#include <ntk.h> #include <ntk.h>
...@@ -66,5 +59,5 @@ namespace nitrogen { ...@@ -66,5 +59,5 @@ namespace nitrogen {
} }
} }
#endif /* POINT_H */ #endif /* nitrogen_nwt_Point_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: Rectangle.cpp
* Author: jlhawkwell
*
* Created on March 24, 2018, 11:24 AM
*/
#include "Rectangle.h" #include "Rectangle.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_nwt_Rectangle_h
* File: Rectangle.h #define nitrogen_nwt_Rectangle_h
* Author: jlhawkwell
*
* Created on March 24, 2018, 11:24 AM
*/
#ifndef RECTANGLE_H
#define RECTANGLE_H
#include <ntk.h> #include <ntk.h>
...@@ -66,5 +59,5 @@ namespace nitrogen { ...@@ -66,5 +59,5 @@ namespace nitrogen {
} }
} }
#endif /* RECTANGLE_H */ #endif /* nitrogen_nwt_Rectangle_h */
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* File: ComponentRenderer.cpp
* Author: jlhawkwell
*
* Created on March 25, 2018, 3:21 PM
*/
#include "ComponentRenderer.h" #include "ComponentRenderer.h"
namespace nitrogen { namespace nitrogen {
......
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef nitrogen_util_ComponentRenderer_h
* File: ComponentRenderer.h #define nitrogen_util_ComponentRenderer_h
* Author: jlhawkwell
*
* Created on March 25, 2018, 3:21 PM
*/
#ifndef COMPONENTRENDERER_H
#define COMPONENTRENDERER_H
#include <ntk.h> #include <ntk.h>
...@@ -73,4 +66,4 @@ namespace nitrogen { ...@@ -73,4 +66,4 @@ namespace nitrogen {
} }
} }
#endif /* COMPONENTRENDERER_H */ #endif /* nitrogen_util_ComponentRenderer_h */
...@@ -24,15 +24,8 @@ ...@@ -24,15 +24,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* #ifndef ntk_h
* File: ntk.h #define ntk_h
* Author: jlhawkwell
*
* Created on March 16, 2018, 12:49 PM
*/
#ifndef NTK_H
#define NTK_H
#ifndef GC_NAME_CONFLICT #ifndef GC_NAME_CONFLICT
#define GC_NAME_CONFLICT #define GC_NAME_CONFLICT
...@@ -64,5 +57,5 @@ namespace nitrogen { ...@@ -64,5 +57,5 @@ namespace nitrogen {
void init(); void init();
} }
#endif /* NTK_H */ #endif /* ntk_h */
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <ntk.h> #include <ntk.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!