From 634dc81de98ef0dec960b794ec9fc76425243535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 23 Jan 2007 18:58:17 +0000
Subject: [PATCH] remove zeta-specific stuff from the use of USB Kit, USBKit.h
 is all we need.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19924 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../media/media-add-ons/usb_webcam/CamDevice.cpp       |  1 -
 src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h | 10 +---------
 .../media/media-add-ons/usb_webcam/CamRoster.cpp       |  1 -
 src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h | 10 +---------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
index 17d36eb854..f7914e4c43 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
@@ -6,7 +6,6 @@
 
 #include <OS.h>
 #include <Autolock.h>
-#include <usb/USBDevice.h>
 
 //#define DEBUG_WRITE_DUMP
 //#define DEBUG_DISCARD_DATA
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
index f0f2e976ff..d456d41e07 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
@@ -3,19 +3,11 @@
 
 #include <OS.h>
 #include <image.h>
-#include <USB.h>
-#include <usb/USBEndpoint.h>
+#include <usb/USBKit.h>
 #include <Locker.h>
 #include <media/MediaAddOn.h>
 #include <support/String.h>
 
-namespace Z {
-	namespace USB {
-		class BUSBDevice;
-	}
-}
-
-using Z::USB::BUSBDevice;
 
 typedef struct {
 	usb_support_descriptor desc;
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
index 6885b78e45..98d174a414 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
@@ -5,7 +5,6 @@
 #include "CamDebug.h"
 #include "CamDefs.h"
 
-#include <usb/USBDevice.h>
 #include <OS.h>
 
 #undef B_WEBCAM_MKINTFUNC
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
index 2b429ac44c..25dfe78a59 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
@@ -3,21 +3,13 @@
 
 #include <image.h>
 #include <support/Vector.h>
-#include <usb/USBRoster.h>
+#include <usb/USBKit.h>
 #include <Locker.h>
 
 class WebCamMediaAddOn;
 class CamDevice;
 class CamDeviceAddon;
 
-namespace Z {
-namespace USB {
-	class BUSBDevice;
-}
-}
-
-using Z::USB::BUSBDevice;
-
 class CamRoster : public BUSBRoster
 {
 public: