Standarizing header file extensions

.clang-format

@@ -0,0 +1,121 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortLambdasOnASingleLine: None
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit:     0
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: BeforeHash
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        2
+UseTab:          Never
+...

.github/workflows/make.yml

@@ -1,8 +1,6 @@
 name: Build and Run Tests
 
 on:
-  push:
-    branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 

.gitignore

@@ -1,3 +1,5 @@
+run-clang-format
+
 # Things
 .vscode
 

.run-clang-format.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+if [[ $# -ne 1 ]]; then
+    echo "Usage: $0 <check|fix>"
+    exit 1
+fi
+task="${1}"; shift
+
+function check()
+{
+  if [ ! $? -eq 0 ]; then 
+    echo "Error fixing style."
+    exit -1 
+  fi
+}
+
+function check_syntax()
+{
+    # If run-clang-format is not installed, clone it
+    if [ ! -f  run-clang-format/run-clang-format.py ]; then
+
+      git clone https://github.com/Sarcasm/run-clang-format.git
+      if [ ! $? -eq 0 ]; then
+        echo "Error installing run-clang-format."
+        exit 1
+      fi
+    fi
+
+     python3 run-clang-format/run-clang-format.py --recursive source --extensions "cpp,hpp"
+
+     if [ ! $? -eq 0 ]; then
+       echo "Error: C++ Code formatting in source is not normalized."
+       echo "Solution: Please run this program with the 'fix' argument"
+       exit -1
+     fi
+}
+
+function fix_syntax()
+{
+      src_files=`find source -type f -name "*.cpp" -o -name "*.hpp"`
+      echo $src_files | xargs -n6 -P2 clang-format -style=file -i "$@"
+      check
+}
+
+##############################################
+### Testing/fixing C++ Code Style
+##############################################
+command -v clang-format >/dev/null
+if [ ! $? -eq 0 ]; then
+    echo "Error: please install clang-format on your system."
+    exit -1
+fi
+ 
+if [[ "${task}" == 'check' ]]; then
+    check_syntax
+else
+    fix_syntax
+fi
+
+exit 0

extern/hqn/hqn.h

@@ -1,7 +1,7 @@
 #ifndef __HQN_H__
 #define __HQN_H__
 
-#include <Nes_Emu.h>
+#include <Nes_Emu.hpp>
 #include <cstdint>
 #include <stdio.h>
 

source/quickerNES/Nes_Core.hpp

@@ -18,10 +18,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 #include <cstdio>
 #include <string>
-#include "apu/apu.h"
-#include "Nes_Cpu.h"
-#include "ppu/Nes_Ppu.h"
-#include "mappers/mapper.h"
+#include "apu/apu.hpp"
+#include "Nes_Cpu.hpp"
+#include "ppu/Nes_Ppu.hpp"
+#include "mappers/mapper.hpp"
 
 class Nes_Cart;
 

source/quickerNES/Nes_Cpu.cpp

@@ -3,8 +3,8 @@
 #include <cstring>
 #include <climits>
 #include <cstdio>
-#include <Nes_Cpu.h>
-#include <Nes_Core.h>
+#include "Nes_Cpu.hpp"
+#include "Nes_Core.hpp"
 
 /**
  * Optimizations by Sergio Martin (eien86) 2023-2024

source/quickerNES/Nes_Emu.cpp

@@ -1,8 +1,8 @@
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
 #include <cstring>
-#include "mappers/mapper.h"
-#include "Nes_Emu.h"
+#include "mappers/mapper.hpp"
+#include "Nes_Emu.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/Nes_Emu.hpp

@@ -4,9 +4,9 @@
 
 // Nes_Emu 0.7.0
 
-#include "apu/Multi_Buffer.h"
-#include "Nes_Cart.h"
-#include "Nes_Core.h"
+#include "apu/Multi_Buffer.hpp"
+#include "Nes_Cart.hpp"
+#include "Nes_Core.hpp"
 
 class Nes_State;
 

source/quickerNES/apu/Blip_Buffer.cpp

@@ -1,12 +1,12 @@
 
 // Blip_Buffer 0.4.0. http://www.slack.net/~ant/
 
-#include "Blip_Buffer.h"
-
 #include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
+#include "Blip_Buffer.hpp"
+
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser
@@ -19,10 +19,6 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
-#ifdef BLARGG_ENABLE_OPTIMIZER
-	#include BLARGG_ENABLE_OPTIMIZER
-#endif
-
 int const buffer_extra = blip_widest_impulse_ + 2;
 
 Blip_Buffer::Blip_Buffer()

source/quickerNES/apu/Effects_Buffer.cpp

@@ -1,8 +1,7 @@
-
 // Game_Music_Emu 0.3.0. http://www.slack.net/~ant/
 
-#include "Effects_Buffer.h"
 #include <cstring>
+#include "Effects_Buffer.hpp"
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/Effects_Buffer.hpp

@@ -1,13 +1,10 @@
+#pragma once
 
 // Multi-channel effects buffer with panning, echo and reverb
-
 // Game_Music_Emu 0.3.0
 
-#ifndef EFFECTS_BUFFER_H
-#define EFFECTS_BUFFER_H
-
 #include <stdint.h>
-#include "Multi_Buffer.h"
+#include "Multi_Buffer.hpp"
 
 // Effects_Buffer uses several buffers and outputs stereo sample pairs.
 class Effects_Buffer : public Multi_Buffer {
@@ -90,4 +87,3 @@ private:
 		return channels [i % chan_count];
 	}
 	
-#endif

source/quickerNES/apu/Multi_Buffer.cpp

@@ -1,7 +1,7 @@
 
 // Blip_Buffer 0.4.0. http://www.slack.net/~ant/
 
-#include "Multi_Buffer.h"
+#include "Multi_Buffer.hpp"
 #include <cstdint>
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you

source/quickerNES/apu/Multi_Buffer.hpp

@@ -1,12 +1,10 @@
 
+#pragma once
+
 // Multi-channel sound buffer interface, and basic mono and stereo buffers
-
 // Blip_Buffer 0.4.0
 
-#ifndef MULTI_BUFFER_H
-#define MULTI_BUFFER_H
-
-#include "Blip_Buffer.h"
+#include "Blip_Buffer.hpp"
 
 // Interface to one or more Blip_Buffers mapped to one or more channels
 // consisting of left, center, and right buffers.
@@ -186,4 +184,3 @@ inline long Mono_Buffer::read_samples( blip_sample_t* p, long s ) { return buf.r
 
 inline long Mono_Buffer::samples_avail() const { return buf.samples_avail(); }
 
-#endif

source/quickerNES/apu/Nes_Buffer.cpp

@@ -1,7 +1,7 @@
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/
 
-#include "apu/Nes_Buffer.h"
-#include "apu/apu.h"
+#include "apu/Nes_Buffer.hpp"
+#include "apu/apu.hpp"
 
 /* Library Copyright (C) 2003-2006 Shay Green. This library is free software;
 you can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/Nes_Buffer.hpp

@@ -1,12 +1,9 @@
+#pragma once 
 
 // NES non-linear audio buffer
-
 // Nes_Emu 0.7.0
 
-#ifndef NES_BUFFER_H
-#define NES_BUFFER_H
-
-#include "Multi_Buffer.h"
+#include "Multi_Buffer.hpp"
 #include <cstdint>
 
 class Nes_Apu;
@@ -68,5 +65,3 @@ public:
 	virtual void SaveAudioBufferState();
 	virtual void RestoreAudioBufferState();
 };
-
-#endif

source/quickerNES/apu/Nes_Effects_Buffer.cpp

@@ -1,8 +1,8 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/
 
-#include "apu/Nes_Effects_Buffer.h"
-#include "apu/apu.h"
+#include "apu/Nes_Effects_Buffer.hpp"
+#include "apu/apu.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/Nes_Effects_Buffer.hpp

@@ -1,13 +1,10 @@
+#pragma once 
 
 // Effects_Buffer with non-linear sound
-
 // Nes_Emu 0.7.0
 
-#ifndef NES_EFFECTS_BUFFER_H
-#define NES_EFFECTS_BUFFER_H
-
-#include "Nes_Buffer.h"
-#include "Effects_Buffer.h"
+#include "Nes_Buffer.hpp"
+#include "Effects_Buffer.hpp"
 
 // Effects_Buffer uses several buffers and outputs stereo sample pairs.
 class Nes_Effects_Buffer : public Effects_Buffer {
@@ -36,5 +33,3 @@ private:
 	Nes_Nonlinearizer nonlin;
 	friend Multi_Buffer* set_apu( Nes_Effects_Buffer*, Nes_Apu* );
 };
-
-#endif

source/quickerNES/apu/Nes_Oscs.cpp

@@ -1,7 +1,7 @@
 
 // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/
 
-#include "apu.h"
+#include "apu.hpp"
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/Nes_Oscs.hpp

@@ -1,12 +1,10 @@
 
+#pragma once 
+
 // Private oscillators used by Nes_Apu
-
 // Nes_Snd_Emu 0.1.7
 
-#ifndef NES_OSCS_H
-#define NES_OSCS_H
-
-#include "Blip_Buffer.h"
+#include "Blip_Buffer.hpp"
 
 class Nes_Apu;
 
@@ -148,4 +146,3 @@ struct Nes_Dmc : Nes_Osc
 	nes_time_t next_read_time() const;
 };
 
-#endif

source/quickerNES/apu/apu.cpp

@@ -1,7 +1,6 @@
-
 // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/
 
-#include "apu.h"
+#include "apu.hpp"
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/apu.hpp

@@ -1,13 +1,12 @@
 #pragma once
 
 // NES 2A03 APU sound chip emulator
-
 // Nes_Snd_Emu 0.1.7
 
 #include <cstdint>
 #include <cstdint>
 #include <climits>
-#include "Nes_Oscs.h"
+#include "Nes_Oscs.hpp"
 
 class Nes_Apu {
 public:

source/quickerNES/apu/fme7/apu.cpp

@@ -1,8 +1,8 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "apu/fme7/apu.h"
 #include <cstring>
+#include "apu/fme7/apu.hpp"
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/fme7/apu.hpp

@@ -4,7 +4,7 @@
 // Nes_Emu 0.7.0
 
 #include <cstdint>
-#include "apu/Blip_Buffer.h"
+#include "apu/Blip_Buffer.hpp"
 
 struct fme7_apu_state_t
 {

source/quickerNES/apu/namco/apu.cpp

@@ -1,8 +1,8 @@
 
 // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/
 
-#include "apu/Blip_Buffer.h"
-#include "apu/namco/apu.h"
+#include "apu/Blip_Buffer.hpp"
+#include "apu/namco/apu.hpp"
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/namco/apu.hpp

@@ -4,7 +4,7 @@
 // Nes_Snd_Emu 0.1.7
 
 #include <cstdint>
-#include "apu/apu.h"
+#include "apu/apu.hpp"
 
 struct namco_state_t
 {

source/quickerNES/apu/vrc6/apu.cpp

@@ -1,7 +1,7 @@
 
 // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/
 
-#include "apu/vrc6/apu.h"
+#include "apu/vrc6/apu.hpp"
 
 /* Copyright (C) 2003-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/apu/vrc6/apu.hpp

@@ -5,8 +5,8 @@
 // Nes_Snd_Emu 0.1.7
 
 #include <cstdint>
-#include "apu/apu.h"
-#include "apu/Blip_Buffer.h"
+#include "apu/apu.hpp"
+#include "apu/Blip_Buffer.hpp"
 
 struct vrc6_apu_state_t;
 

source/quickerNES/apu/vrc7/apu.cpp

@@ -1,5 +1,5 @@
-#include "apu/vrc7/apu.h"
-#include "apu/vrc7/emu2413.h"
+#include "apu/vrc7/apu.hpp"
+#include "apu/vrc7/emu2413.hpp"
 #include <cstring>
 
 #define BYTESWAP(xxxx) {uint32_t _temp = (uint32_t)(xxxx);\

source/quickerNES/apu/vrc7/apu.hpp

@@ -5,8 +5,8 @@
 // Nes_Snd_Emu 0.1.7. Copyright (C) 2003-2005 Shay Green. GNU LGPL license.
 
 #include <cstdint>
-#include "apu/vrc7/emu2413_state.h"
-#include "apu/Blip_Buffer.h"
+#include "apu/vrc7/emu2413_state.hpp"
+#include "apu/Blip_Buffer.hpp"
 
 struct vrc7_snapshot_t;
 typedef long nes_time_t;

source/quickerNES/apu/vrc7/emu2413.cpp

@@ -59,7 +59,7 @@ if the origin of this software is not misrepresented.
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "emu2413.h"
+#include "emu2413.hpp"
 
 static const unsigned char default_inst[15][8] = {
   	/* 2019-03-19 VRC7 instrument patchset dumped by Nuke.YKT */

source/quickerNES/apu/vrc7/emu2413_state.cpp

@@ -1,5 +1,5 @@
-#include "emu2413_state.h"
 #include <stdint.h>
+#include "emu2413_state.hpp"
 
 #ifdef __cplusplus
 extern "C"

source/quickerNES/apu/vrc7/emu2413_state.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "emu2413.h"
+#include "emu2413.hpp"
 
 typedef struct {
 	e_int32 feedback;

source/quickerNES/mappers/mapper.cpp

@@ -2,8 +2,8 @@
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
 #include <cstring>
-#include "mappers/mapper.h"
-#include "Nes_Core.h"
+#include "mappers/mapper.hpp"
+#include "Nes_Core.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper.hpp

@@ -1,12 +1,11 @@
 #pragma once 
 
 // NES mapper interface
-
 // Nes_Emu 0.7.0
 
 #include <climits>
-#include "Nes_Cart.h"
-#include "Nes_Cpu.h"
+#include "Nes_Cart.hpp"
+#include "Nes_Cpu.hpp"
 
 class Blip_Buffer;
 class blip_eq_t;

source/quickerNES/mappers/mapper000.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper001.hpp

@@ -2,7 +2,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 #include <cstring>
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you

source/quickerNES/mappers/mapper002.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper003.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper004.hpp

@@ -2,10 +2,10 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 #include <cstring>
-#include "Nes_Core.h"
+#include "Nes_Core.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper005.hpp

@@ -4,10 +4,9 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
-
-#include "Nes_Core.h"
 #include <cstring>
+#include "mappers/mapper.hpp"
+#include "Nes_Core.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper007.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper009.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstring>
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // MMC2 
 

source/quickerNES/mappers/mapper010.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <cstring>
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // MMC4 
 

source/quickerNES/mappers/mapper011.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper015.hpp

@@ -17,7 +17,7 @@
  * 100-in-1 Contra Function 16
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct Mapper015_state_t
 {

source/quickerNES/mappers/mapper019.hpp

@@ -4,8 +4,8 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
-#include "apu/namco/apu.h"
+#include "mappers/mapper.hpp"
+#include "apu/namco/apu.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper021.hpp

@@ -26,7 +26,7 @@
  * VRC-2/VRC-4 Konami
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct vrc2_state_t
 {

source/quickerNES/mappers/mapper022.hpp

@@ -26,7 +26,7 @@
  * VRC-2/VRC-4 Konami
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 #include "mappers/mapper021.hpp"
 
 typedef Mapper_VRC2_4<false,true> Mapper022;

source/quickerNES/mappers/mapper023.hpp

@@ -26,6 +26,6 @@
  * VRC-2/VRC-4 Konami
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 typedef Mapper_VRC2_4<false, false> Mapper023;

source/quickerNES/mappers/mapper024.hpp

@@ -4,8 +4,8 @@
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
 #include <cstring>
-#include "mappers/mapper.h"
-#include "apu/vrc6/apu.h"
+#include "mappers/mapper.hpp"
+#include "apu/vrc6/apu.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper025.hpp

@@ -26,6 +26,6 @@
  * VRC-2/VRC-4 Konami
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 typedef Mapper_VRC2_4<true,false> Mapper025;

source/quickerNES/mappers/mapper026.hpp

@@ -4,6 +4,6 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 typedef Mapper_Vrc6<3> Mapper026;

source/quickerNES/mappers/mapper030.hpp

@@ -27,7 +27,7 @@
  * Tested only on Troll Burner and Mystic Origins demo.
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Unrom512 
 

source/quickerNES/mappers/mapper032.hpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct mapper32_state_t
 {

source/quickerNES/mappers/mapper033.hpp

@@ -23,7 +23,7 @@
  * 
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct tc0190_state_t
 {

source/quickerNES/mappers/mapper034.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper060.hpp

@@ -17,7 +17,7 @@
  * 4-in-1 Multicart ( Reset-based )
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // NROM-128 4-in-1 multicart
 

source/quickerNES/mappers/mapper066.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper069.hpp

@@ -4,8 +4,8 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/
 
-#include "mappers/mapper.h"
-#include "apu/fme7/apu.h"
+#include "mappers/mapper.hpp"
+#include "apu/fme7/apu.hpp"
 
 /* Copyright (C) 2005 Chris Moeller */
 /* Copyright (C) 2005-2006 Shay Green. This module is free software; you

source/quickerNES/mappers/mapper070.hpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Mapper_74x161x162x32
 

source/quickerNES/mappers/mapper071.hpp

@@ -4,7 +4,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper073.hpp

@@ -23,7 +23,7 @@
  * VRC-3 Konami, Salamander
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct vrc3_state_t
 {

source/quickerNES/mappers/mapper075.hpp

@@ -17,7 +17,7 @@
  * VRC-1 Konami
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct vrc1_state_t
 {

source/quickerNES/mappers/mapper078.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Holy Diver and Uchuusen - Cosmo Carrier.
 

source/quickerNES/mappers/mapper079.hpp

@@ -25,7 +25,7 @@
  * Nina-03 / Nina-06
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 template < bool multicart >
 class Mapper_AveNina : public Nes_Mapper {

source/quickerNES/mappers/mapper085.hpp

@@ -3,8 +3,8 @@
 // Nes_Emu 0.5.4. http://www.slack.net/~ant/
 
 #include <cstring>
-#include "mappers/mapper.h"
-#include "apu/vrc7/apu.h"
+#include "mappers/mapper.hpp"
+#include "apu/vrc7/apu.hpp"
 
 /* Copyright (C) 2004-2005 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper087.hpp

@@ -3,7 +3,7 @@
 // Optional less-common simple mappers
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper088.hpp

@@ -25,7 +25,7 @@
  * Mapper 206
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct namco_34x3_state_t
 {

source/quickerNES/mappers/mapper089.hpp

@@ -22,7 +22,7 @@
  * Mapper 93 - Sunsoft-2
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Sunsoft2b
 

source/quickerNES/mappers/mapper093.hpp

@@ -22,7 +22,7 @@
  * Mapper 93 - Sunsoft-2
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Sunsoft2a 
 

source/quickerNES/mappers/mapper094.hpp

@@ -24,7 +24,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
  
 // Un1rom 
 

source/quickerNES/mappers/mapper097.hpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
  
 // Irem_Tam_S1 
 

source/quickerNES/mappers/mapper140.hpp

@@ -24,7 +24,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Jaleco_JF11 
 

source/quickerNES/mappers/mapper156.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // DIS23C01 DAOU ROM CONTROLLER
 

source/quickerNES/mappers/mapper180.hpp

@@ -23,7 +23,7 @@
  *
  */
  
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
  
 // UxROM (inverted)
 

source/quickerNES/mappers/mapper184.hpp

@@ -22,7 +22,7 @@
  * Mapper 184 - Sunsoft-1
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Sunsoft1
 

source/quickerNES/mappers/mapper190.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // Magic Kid Googoo
 

source/quickerNES/mappers/mapper193.hpp

@@ -25,7 +25,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
  
 // NTDEC's TC-112 mapper IC.
 

source/quickerNES/mappers/mapper206.hpp

@@ -25,7 +25,7 @@
  * Mapper 206
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct namco_34xx_state_t
 {

source/quickerNES/mappers/mapper207.hpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 struct taito_x1005_state_t
 {

source/quickerNES/mappers/mapper232.hpp

@@ -5,7 +5,7 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/mappers/mapper240.hpp

@@ -21,7 +21,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // https://www.nesdev.org/wiki/INES_Mapper240
 

source/quickerNES/mappers/mapper241.hpp

@@ -21,7 +21,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
  
 // https://www.nesdev.org/wiki/INES_Mapper241
 

source/quickerNES/mappers/mapper244.hpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // https://www.nesdev.org/wiki/INES_Mapper244
 

source/quickerNES/mappers/mapper246.hpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "mappers/mapper.h"
+#include "mappers/mapper.hpp"
 
 // https://www.nesdev.org/wiki/INES_Mapper246
 

source/quickerNES/ppu/Nes_Ppu.cpp

@@ -4,8 +4,8 @@
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
 #include <cstring>
-#include "Nes_Ppu.h"
-#include "Nes_Core.h"
+#include "Nes_Ppu.hpp"
+#include "Nes_Core.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/ppu/Nes_Ppu.hpp

@@ -1,10 +1,9 @@
 #pragma once 
 
 // NES PPU emulator
-
 // Nes_Emu 0.7.0
 
-#include "Nes_Ppu_Rendering.h"
+#include "Nes_Ppu_Rendering.hpp"
 #include <climits>
 
 class Nes_Mapper;

source/quickerNES/ppu/Nes_Ppu_Impl.cpp

@@ -3,7 +3,7 @@
 #include <cstring>
 #include <cstdint>
 #include <cstdio>
-#include "Nes_Ppu_Impl.h"
+#include "Nes_Ppu_Impl.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

source/quickerNES/ppu/Nes_Ppu_Rendering.cpp

@@ -1,9 +1,9 @@
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
-#include "Nes_Ppu_Rendering.h"
 #include <algorithm>
 #include <cstring>
 #include <cstddef>
+#include "Nes_Ppu_Rendering.hpp"
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser
@@ -287,7 +287,7 @@ void Nes_Ppu_Rendering::draw_sprites_( int begin, int end )
 			int visible = sprite_height;
 			
 			#define CLIPPED 0
-			#include "Nes_Ppu_Sprites.h"
+			#include "Nes_Ppu_Sprites.hpp"
 		}
 		else
 		{
@@ -308,7 +308,7 @@ void Nes_Ppu_Rendering::draw_sprites_( int begin, int end )
 			//      begin, end, top_minus_one + 1, skip, visible );
 			
 			#define CLIPPED 1
-			#include "Nes_Ppu_Sprites.h"
+			#include "Nes_Ppu_Sprites.hpp"
 		}
 	}
 	while ( index < 0x100 );

source/quickerNES/ppu/Nes_Ppu_Rendering.hpp

@@ -1,10 +1,9 @@
 #pragma once 
 
 // NES PPU emulator graphics rendering
-
 // Nes_Emu 0.7.0
 
-#include "Nes_Ppu_Impl.h"
+#include "Nes_Ppu_Impl.hpp"
 
 class Nes_Ppu_Rendering : public Nes_Ppu_Impl {
 	typedef Nes_Ppu_Impl base;

source/quickerNES/quickerNESInstance.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Nes_Emu.h>
+#include <Nes_Emu.hpp>
 #include <emuInstance.hpp>
 
 class QuickerNESInstance : public EmuInstance

tests/arkanoid/warpless.test

@@ -1,5 +1,5 @@
 {
-  "Rom File": "Arkanoid (U) [!].nes",
+  "Rom File": "../roms/Arkanoid (U) [!].nes",
   "Expected ROM SHA1": "B2B30C4F30DD853C215C17B0C67CFE63D61A3062",
   "Initial State File": "",
   "Sequence File": "warpless.sol"

tests/arkanoid/warps.test

@@ -1,5 +1,5 @@
 {
-  "Rom File": "Arkanoid (U) [!].nes",
+  "Rom File": "../roms/Arkanoid (U) [!].nes",
   "Expected ROM SHA1": "B2B30C4F30DD853C215C17B0C67CFE63D61A3062",
   "Initial State File": "",
   "Sequence File": "warps.sol"