Reorganize libkms++utils header

5 files changed, 18 insertions, 22 deletions

diff --git a/libkms++util/colorbar.cpp b/libkms++util/colorbar.cpp
index 9fbec28..6a5dbc4 100644
--- a/libkms++util/colorbar.cpp
+++ b/libkms++util/colorbar.cpp
@@ -1,8 +1,7 @@
 #include <cstdint>
 
 #include <kms++.h>
-
-#include "test.h"
+#include "kms++util.h"
 
 namespace kms
 {
diff --git a/libkms++util/extcpuframebuffer.cpp b/libkms++util/extcpuframebuffer.cpp
index 145168f..bd0b10c 100644
--- a/libkms++util/extcpuframebuffer.cpp
+++ b/libkms++util/extcpuframebuffer.cpp
@@ -1,6 +1,6 @@
 
 #include "extcpuframebuffer.h"
-#include "test.h"
+#include "kms++util.h"
 
 using namespace std;
 
diff --git a/libkms++util/test.h b/libkms++util/kms++util.h
index 3631f2c..c02c12c 100644
--- a/libkms++util/test.h
+++ b/libkms++util/kms++util.h
@@ -1,7 +1,19 @@
 #pragma once
 
 #include "color.h"
-#include "kmstest.h"
+#include <cstdio>
+#include <cstdlib>
+
+namespace kms
+{
+class IMappedFramebuffer;
+
+void draw_color_bar(IMappedFramebuffer& buf, int old_xpos, int xpos, int width);
+
+void draw_test_pattern(IMappedFramebuffer &fb);
+
+void draw_rect(IMappedFramebuffer &fb, uint32_t x, uint32_t y, uint32_t w, uint32_t h, RGB color);
+}
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
diff --git a/libkms++util/kmstest.h b/libkms++util/kmstest.h
deleted file mode 100644
index aed40fe..0000000
--- a/libkms++util/kmstest.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "color.h"
-#include "framebuffer.h"
-
-namespace kms
-{
-class IMappedFramebuffer;
-
-void draw_color_bar(IMappedFramebuffer& buf, int old_xpos, int xpos, int width);
-
-void draw_test_pattern(IMappedFramebuffer &fb);
-
-void draw_rect(IMappedFramebuffer &fb, uint32_t x, uint32_t y, uint32_t w, uint32_t h, RGB color);
-}
diff --git a/libkms++util/testpat.cpp b/libkms++util/testpat.cpp
index 68f4385..cee6e85 100644
--- a/libkms++util/testpat.cpp
+++ b/libkms++util/testpat.cpp
@@ -5,9 +5,9 @@
 #include <cstring>
 #include <cassert>
 
-#include "kms++.h"
-#include "test.h"
-#include "cpuframebuffer.h"
+#include <kms++.h>
+#include <kms++util.h>
+#include <cpuframebuffer.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))