[Qemu-devel] [PATCH v3 028/197] more renames

[Anthony Liguori]

---
 hw/object.h |    4 ++--
 hw/qdev.h   |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/object.h b/hw/object.h
index 1ac2f92..834e89e 100644
--- a/hw/object.h
+++ b/hw/object.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef QOBJECT_H
-#define QOBJECT_H
+#ifndef QEMU_OBJECT_H
+#define QEMU_OBJECT_H
 
 #include "qemu-common.h"
 
diff --git a/hw/qdev.h b/hw/qdev.h
index 0702b18..aabaaa3 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -6,7 +6,7 @@
 #include "qemu-char.h"
 #include "qemu-option.h"
 #include "qapi/qapi-visit-core.h"
-#include "qobject.h"
+#include "object.h"
 
 typedef struct Property Property;
 
@@ -68,13 +68,13 @@ typedef struct DeviceProperty
 } DeviceProperty;
 
 typedef struct DeviceClass {
-    QObjectClass parent_class;
+    ObjectClass parent_class;
 } DeviceClass;
 
 /* This structure should not be accessed directly.  We declare it here
    so that it can be embedded in individual device state structures.  */
 struct DeviceState {
-    QObject parent_obj;
+    Object parent_obj;
 
     const char *id;
     enum DevState state;
-- 
1.7.4.1