drop refactor

[guile-irrlicht.git] / src / IrrlichtDevice.cpp

diff --git a/src/IrrlichtDevice.cpp b/src/IrrlichtDevice.cpp
index 82b729d040e5f2f580f2d2c47ef7808808a0648f..9cccd58067803b28daf69f74bd232e233ca1793d 100644 (file)
--- a/src/IrrlichtDevice.cpp
+++ b/src/IrrlichtDevice.cpp
@@ -28,7 +28,8 @@
 #include "IrrlichtDevice.h"
 #include "ISceneManager.h"
 #include "IVideoDriver.h"
-#include "util.h"
+#include "wchar.h"
+#include "wrapped.h"
 
 extern "C" {
 
@@ -44,7 +45,8 @@ extern "C" {
   }
 
   DEFINE_WRAPPED_TYPE (irr::IrrlichtDevice*, "device",
-                       init_device_type, wrap_device, unwrap_device);
+                       init_device_type, device_p,
+                       wrap_device, unwrap_device);
 
   SCM
   irr_createDevice (SCM deviceType,
@@ -66,34 +68,34 @@ extern "C" {
   }
 
   SCM
-  irr_getGUIEnvironment (SCM device_obj)
+  irr_getGUIEnvironment (SCM wrapped_device)
   {
-    irr::IrrlichtDevice* device = unwrap_device (device_obj);
-    irr::gui::IGUIEnvironment* gui_environment = device->getGUIEnvironment();
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    irr::gui::IGUIEnvironment* gui_environment = device->getGUIEnvironment ();
     return wrap_gui_environment (gui_environment);
   }
 
   SCM
-  irr_getSceneManager (SCM device_obj)
+  irr_getSceneManager (SCM wrapped_device)
   {
-    irr::IrrlichtDevice* device = unwrap_device (device_obj);
-    irr::scene::ISceneManager* scene_manager = device->getSceneManager();
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    irr::scene::ISceneManager* scene_manager = device->getSceneManager ();
     return wrap_scene_manager (scene_manager);
   }
 
   SCM
-  irr_getVideoDriver (SCM device_obj)
+  irr_getVideoDriver (SCM wrapped_device)
   {
-    irr::IrrlichtDevice* device = unwrap_device (device_obj);
-    irr::video::IVideoDriver* driver = device->getVideoDriver();
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    irr::video::IVideoDriver* driver = device->getVideoDriver ();
     return wrap_video_driver (driver);
   }
 
   SCM
-  irr_setWindowCaption (SCM device_obj,
+  irr_setWindowCaption (SCM wrapped_device,
                         SCM text)
   {
-    irr::IrrlichtDevice* device = unwrap_device (device_obj);
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
     device->setWindowCaption (scm_to_wide_char_string (text));
     return SCM_UNSPECIFIED;
   }