diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-28 15:40:10 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-28 15:40:10 (GMT) |
| commit | cca6d17a40e3435b3e41c09a5eba20f50b28e9ae (patch) | |
| tree | f1135171e2c56f03f65405e54ceb47fb5d756d2c /examples/dbus/remotecontrolledcar/controller/controller.h | |
| parent | c58ac55bbe65866db85ba1338642c00fe5cc2a70 (diff) | |
| parent | 9fc350e8358f55c13169a9383bd2bd85592bb231 (diff) | |
| download | Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.zip Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.tar.gz Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.tar.bz2 | |
Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into integration
Conflicts:
examples/dbus/dbus-chat/chat_adaptor.cpp
examples/dbus/dbus-chat/chat_adaptor.h
examples/dbus/dbus-chat/chat_interface.cpp
examples/dbus/dbus-chat/chat_interface.h
examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
examples/dbus/remotecontrolledcar/car/car_adaptor_p.h
examples/dbus/remotecontrolledcar/controller/car_interface.cpp
examples/dbus/remotecontrolledcar/controller/car_interface_p.h
Diffstat (limited to 'examples/dbus/remotecontrolledcar/controller/controller.h')
| -rw-r--r-- | examples/dbus/remotecontrolledcar/controller/controller.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h index 07a1355..caadff9 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.h +++ b/examples/dbus/remotecontrolledcar/controller/controller.h @@ -43,8 +43,7 @@ #define CONTROLLER_H #include "ui_controller.h" - -class CarInterface; +#include "car_interface.h" class Controller : public QWidget { @@ -64,7 +63,7 @@ private slots: private: Ui::Controller ui; - CarInterface *car; + com::trolltech::Examples::CarInterface *car; }; #endif |