From 2503a36016cbfc8cf56ec163356d0cf5e76f94e1 Mon Sep 17 00:00:00 2001
From: Morten Delenk <morten@dark32.cf>
Date: Mon, 24 Apr 2017 10:09:09 +0000
Subject: [PATCH] make it build

---
 kernel/src/include/kobject.hpp | 24 ++++++++++++------------
 kernel/src/include/tty.hpp     |  2 +-
 kernel/src/tty.cpp             |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kernel/src/include/kobject.hpp b/kernel/src/include/kobject.hpp
index 5c14d5d..bace557 100644
--- a/kernel/src/include/kobject.hpp
+++ b/kernel/src/include/kobject.hpp
@@ -9,25 +9,25 @@ class Kref {
         kobjectType type;
         void *ptr;
         unsigned int refctr;
-        bool set;
-        Kobject(kobjectType type) {
+        bool mset;
+        Kref(kobjectType type) {
             this->type = type;
             refctr = 1;
-            set = false;
+            mset = false;
         }
         template<typename T>
-        auto set(T *data) -> Kobject & {
-            if(set)
+        auto set(T *data) -> Kref & {
+            if(mset)
                 return *this;
             ptr = (void*)data;
-            set=true;
+            mset=true;
             return *this;
         }
         template<typename T>
         T *get() {
             return (T*)ptr;
         }
-        auto operator++(int) -> Kobject & {
+        auto operator++(int) -> Kref & {
             unsigned int old = refctr;
             refctr++;
             if(old > refctr) {
@@ -37,11 +37,11 @@ class Kref {
             }
             return *this;
         }
-        auto operator--(int) -> Kobject & {
+        auto operator--(int) -> Kref & {
             refctr--;
             if(!refctr) {
                 //delete ptr;
-                set = false;
+                mset = false;
                 ptr = nullptr;
             }
             return *this;
@@ -49,9 +49,9 @@ class Kref {
 };
 class Kobject {
     public:
-        KobjectType type;
+        kobjectType type;
         unsigned int refctr;
-        Kobject(KobjectType type):type(type),refctr(1) {}
+        Kobject(kobjectType type):type(type),refctr(1) {}
         virtual ~Kobject() {
             refctr=0;
         }
@@ -72,4 +72,4 @@ class Kobject {
             }
             return *this;
         }
-}
+};
diff --git a/kernel/src/include/tty.hpp b/kernel/src/include/tty.hpp
index 769b96c..68c4d3a 100644
--- a/kernel/src/include/tty.hpp
+++ b/kernel/src/include/tty.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <kobject.h>
+#include <kobject.hpp>
 enum Color {
     BLACK,
     BLUE,
diff --git a/kernel/src/tty.cpp b/kernel/src/tty.cpp
index b0d1110..2fc74a3 100644
--- a/kernel/src/tty.cpp
+++ b/kernel/src/tty.cpp
@@ -1,5 +1,5 @@
 #include <tty.hpp>
-TTY::TTY(int width, int height): x(0), y(0), width(width), height(height), curColor(WHITE), rgbColor(0xFFFFFF), useRGB(false), Kobject(KobjectType::TTY) {}
+TTY::TTY(int width, int height): x(0), y(0), width(width), height(height), curColor(WHITE), rgbColor(0xFFFFFF), useRGB(false), Kobject(kobjectType::TTY) {}
 TTY::~TTY() {}
 auto TTY::plotChar(int x, int y, int c) -> void {}
 auto TTY::rgbSupport() -> bool {return true;}