From 7b0d6ac9f903296c7537cec9ac606d49cb364049 Mon Sep 17 00:00:00 2001
From: Alexis211 <alexis211@gmail.com>
Date: Fri, 11 Sep 2009 16:22:30 +0200
Subject: Nothing, really

---
 Source/Kernel/Devices/Device.proto.h                  | 1 +
 Source/Kernel/Devices/Display/Display.proto.h         | 5 +++--
 Source/Kernel/Devices/Display/VGATextOutput.class.cpp | 2 +-
 Source/Kernel/Devices/Display/VGATextOutput.class.h   | 2 +-
 Source/Kernel/Devices/Keyboard/Keyboard.proto.h       | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'Source/Kernel/Devices')

diff --git a/Source/Kernel/Devices/Device.proto.h b/Source/Kernel/Devices/Device.proto.h
index d5d6422..4f216ec 100644
--- a/Source/Kernel/Devices/Device.proto.h
+++ b/Source/Kernel/Devices/Device.proto.h
@@ -7,6 +7,7 @@
 
 class Device {
 	public:
+	virtual ~Device() {};
 	virtual String getClass() = 0;	
 	virtual String getName() = 0;	
 
diff --git a/Source/Kernel/Devices/Display/Display.proto.h b/Source/Kernel/Devices/Display/Display.proto.h
index f2a98af..d4bd8fc 100644
--- a/Source/Kernel/Devices/Display/Display.proto.h
+++ b/Source/Kernel/Devices/Display/Display.proto.h
@@ -3,13 +3,14 @@
 
 #include <Core/common.wtf.h>
 #include <Devices/Device.proto.h>
-#include <Library/wchar.class.h>
+#include <Library/WChar.class.h>
 
 class Display : public Device {
 	public:
+	virtual ~Display() {}
 	virtual u16int textCols() = 0;
 	virtual u16int textRows() = 0;
-	virtual void putChar(u16int line, u16int col, wchar c, u8int color) = 0;	//Color : <bg 4byte><fg 4byte>
+	virtual void putChar(u16int line, u16int col, WChar c, u8int color) = 0;	//Color : <bg 4byte><fg 4byte>
 	virtual void moveCursor(u16int line, u16int col) = 0;
 	virtual void clear() = 0;
 };
diff --git a/Source/Kernel/Devices/Display/VGATextOutput.class.cpp b/Source/Kernel/Devices/Display/VGATextOutput.class.cpp
index 2a69754..aca5ce6 100644
--- a/Source/Kernel/Devices/Display/VGATextOutput.class.cpp
+++ b/Source/Kernel/Devices/Display/VGATextOutput.class.cpp
@@ -21,7 +21,7 @@ u16int VGATextOutput::textRows() {
 	return 25;
 }
 
-void VGATextOutput::putChar(u16int line, u16int col, wchar c, u8int color) {
+void VGATextOutput::putChar(u16int line, u16int col, WChar c, u8int color) {
 	u16int* where = (u16int*)RAM_ADDR;
 	where[(80 * line) + col] = (color << 8) | c.toAscii();
 }
diff --git a/Source/Kernel/Devices/Display/VGATextOutput.class.h b/Source/Kernel/Devices/Display/VGATextOutput.class.h
index 7746a7b..864ae35 100644
--- a/Source/Kernel/Devices/Display/VGATextOutput.class.h
+++ b/Source/Kernel/Devices/Display/VGATextOutput.class.h
@@ -10,7 +10,7 @@ class VGATextOutput : public Display {
 
 	u16int textCols();
 	u16int textRows();
-	void putChar(u16int line, u16int col, wchar c, u8int color);
+	void putChar(u16int line, u16int col, WChar c, u8int color);
 	void moveCursor(u16int line, u16int col);
 	void clear();
 };
diff --git a/Source/Kernel/Devices/Keyboard/Keyboard.proto.h b/Source/Kernel/Devices/Keyboard/Keyboard.proto.h
index d6898f8..f9f716c 100644
--- a/Source/Kernel/Devices/Keyboard/Keyboard.proto.h
+++ b/Source/Kernel/Devices/Keyboard/Keyboard.proto.h
@@ -5,6 +5,7 @@
 
 class Keyboard : public Device {
 	public:
+	virtual ~Keyboard() {}
 	virtual void updateLeds(u32int kbdstatus) = 0;
 };
 
-- 
cgit v1.2.3