Skip to content

Commit

Permalink
Fixing internal includes and reformatting
Browse files Browse the repository at this point in the history
  • Loading branch information
flamewing committed Feb 19, 2021
1 parent 63fe868 commit 5ab99b2
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 22 deletions.
10 changes: 5 additions & 5 deletions include/s2ssedit/abstractaction.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
#ifndef ABSTRACTACTION_H
#define ABSTRACTACTION_H

#include <s2ssedit/ignore_unused_variable_warning.hh>
#include <s2ssedit/object.hh>
#include <s2ssedit/sslevelobjs.hh>
#include <s2ssedit/ssobjfile.hh>
#include <s2ssedit/sssegmentobjs.hh>
#include "s2ssedit/ignore_unused_variable_warning.hh"
#include "s2ssedit/object.hh"
#include "s2ssedit/sslevelobjs.hh"
#include "s2ssedit/ssobjfile.hh"
#include "s2ssedit/sssegmentobjs.hh"

#include <algorithm>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion include/s2ssedit/object.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef OBJECT_H
#define OBJECT_H

#include <s2ssedit/ssobjfile.hh>
#include "s2ssedit/ssobjfile.hh"

class object {
private:
Expand Down
7 changes: 4 additions & 3 deletions include/s2ssedit/sseditor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
#ifndef SSEDITOR_H
#define SSEDITOR_H

#include "s2ssedit/abstractaction.hh"
#include "s2ssedit/object.hh"
#include "s2ssedit/ssobjfile.hh"

#include <gtkmm.h>
#include <s2ssedit/abstractaction.hh>
#include <s2ssedit/object.hh>
#include <s2ssedit/ssobjfile.hh>

#include <array>
#include <deque>
Expand Down
2 changes: 1 addition & 1 deletion include/s2ssedit/sslevelobjs.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef SSLEVELOBJS_H
#define SSLEVELOBJS_H

#include <s2ssedit/sssegmentobjs.hh>
#include "s2ssedit/sssegmentobjs.hh"

#include <istream>
#include <ostream>
Expand Down
2 changes: 1 addition & 1 deletion include/s2ssedit/ssobjfile.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef SSOBJFILE_H
#define SSOBJFILE_H

#include <s2ssedit/sslevelobjs.hh>
#include "s2ssedit/sslevelobjs.hh"

#include <algorithm>
#include <istream>
Expand Down
2 changes: 1 addition & 1 deletion include/s2ssedit/sssegmentobjs.hh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef SSSEGMENTOBJS_H
#define SSSEGMENTOBJS_H

#include <s2ssedit/ignore_unused_variable_warning.hh>
#include "s2ssedit/ignore_unused_variable_warning.hh"

#include <istream>
#include <map>
Expand Down
5 changes: 3 additions & 2 deletions src/drag.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "s2ssedit/ignore_unused_variable_warning.hh"
#include "s2ssedit/sseditor.hh"

#include <mdcomp/bigendian_io.hh>
#include <s2ssedit/ignore_unused_variable_warning.hh>
#include <s2ssedit/sseditor.hh>

#include <set>
#include <sstream>
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include <s2ssedit/sseditor.hh>
#include "s2ssedit/sseditor.hh"

#include <array>
#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion src/signals.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include <s2ssedit/sseditor.hh>
#include "s2ssedit/sseditor.hh"

#include <cassert>
#include <fstream>
Expand Down
6 changes: 4 additions & 2 deletions src/sseditor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "s2ssedit/sseditor.hh"

#include "s2ssedit/ignore_unused_variable_warning.hh"

#include <gdkmm/rgba.h>
#include <s2ssedit/ignore_unused_variable_warning.hh>
#include <s2ssedit/sseditor.hh>

#include <iostream>
#include <set>
Expand Down
2 changes: 1 addition & 1 deletion src/sslevelobjs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include <s2ssedit/sslevelobjs.hh>
#include "s2ssedit/sslevelobjs.hh"

using std::istream;
using std::ostream;
Expand Down
6 changes: 4 additions & 2 deletions src/ssobjfile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "s2ssedit/ssobjfile.hh"

#include "s2ssedit/ignore_unused_variable_warning.hh"

#include <mdcomp/bigendian_io.hh>
#include <mdcomp/kosinski.hh>
#include <mdcomp/nemesis.hh>
#include <s2ssedit/ignore_unused_variable_warning.hh>
#include <s2ssedit/ssobjfile.hh>

#include <cstdio>
#include <cstring>
Expand Down
3 changes: 2 additions & 1 deletion src/sssegmentobjs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "s2ssedit/sssegmentobjs.hh"

#include <mdcomp/bigendian_io.hh>
#include <s2ssedit/sssegmentobjs.hh>

#include <cstring>
#include <iostream>
Expand Down

0 comments on commit 5ab99b2

Please sign in to comment.