Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix using namespace #14

Merged
merged 1 commit into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/actionCanRead.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

using namespace std;
using namespace yarp::os;
using namespace yarp::dev;

ACTIONREGISTER_DEF_TYPE(YarpActions::ActionCanRead, yarpactions::yarpcanread);

Expand Down
11 changes: 3 additions & 8 deletions src/actionCanRead.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
#include <yarp/sig/Vector.h>


using namespace yarp::dev;
using namespace yarp::sig;
using namespace yarp::os;
using namespace yarp;

namespace YarpActions
{

Expand All @@ -35,13 +30,13 @@ class ActionCanRead : public ActionYarp
void beforeExecute() override;

protected:
ICanBus *iCanBus_;
ICanBufferFactory *iBufferFactory_;
yarp::dev::ICanBus *iCanBus_;
yarp::dev::ICanBufferFactory *iBufferFactory_;
std::string messageId_, data_, polyDriverTag_;
int readTimeout_;
const int CAN_DRIVER_BUFFER_SIZE_ = 2047;
const int localBufferSize_ = 512;
CanBuffer inBuffer_;
yarp::dev::CanBuffer inBuffer_;

ACTIONREGISTER_DEC_TYPE(ActionCanRead)
};
Expand Down
1 change: 1 addition & 0 deletions src/actionCanWrite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

using namespace std;
using namespace yarp::os;
using namespace yarp::dev;

ACTIONREGISTER_DEF_TYPE(YarpActions::ActionCanWrite, yarpactions::yarpcanwrite);

Expand Down
11 changes: 3 additions & 8 deletions src/actionCanWrite.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
#include <yarp/sig/Vector.h>


using namespace yarp::dev;
using namespace yarp::sig;
using namespace yarp::os;
using namespace yarp;

namespace YarpActions
{

Expand All @@ -36,12 +31,12 @@ class ActionCanWrite : public ActionYarp
void beforeExecute() override;

protected:
ICanBus *iCanBus_;
ICanBufferFactory *iBufferFactory_;
yarp::dev::ICanBus *iCanBus_;
yarp::dev::ICanBufferFactory *iBufferFactory_;
std::string messageId_, data_, polyDriverTag_;
const int CAN_DRIVER_BUFFER_SIZE_ = 2047;
const int localBufferSize_ = 512;
CanBuffer outBuffer_;
yarp::dev::CanBuffer outBuffer_;

ACTIONREGISTER_DEC_TYPE(ActionCanWrite)
};
Expand Down
8 changes: 2 additions & 6 deletions src/actionPolydriverClose.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@

#include <memory>

using namespace YarpActions;
using namespace yarp::dev;
using namespace yarp::os;

namespace YarpAction {

class ActionPolydriverClose : public ActionYarp {
class ActionPolydriverClose : public YarpActions::ActionYarp {
public:
ActionPolydriverClose(const CommandAttributes &parameters,
const std::string &testCode);
Expand All @@ -30,7 +26,7 @@ class ActionPolydriverClose : public ActionYarp {

private:
std::string tag_;
Property property_;
yarp::os::Property property_;

ACTIONREGISTER_DEC_TYPE(ActionPolydriverClose)
};
Expand Down
7 changes: 2 additions & 5 deletions src/actionPolydriverOpener.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@

#include <memory>

using namespace YarpActions;
using namespace yarp::dev;
using namespace yarp::os;

namespace YarpAction {

class ActionPolydriverOpener : public ActionYarp {
class ActionPolydriverOpener : public YarpActions::ActionYarp {
public:
ActionPolydriverOpener(const CommandAttributes &parameters,
const std::string &testCode);
Expand All @@ -30,7 +27,7 @@ class ActionPolydriverOpener : public ActionYarp {

private:
std::string tag_;
Property property_;
yarp::os::Property property_;

ACTIONREGISTER_DEC_TYPE(ActionPolydriverOpener)
};
Expand Down
1 change: 0 additions & 1 deletion src/actionSendDirectPosition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include <cmath>

using namespace yarp::os;
using namespace yarp::sig;
using namespace yarp::dev;

Expand Down
3 changes: 0 additions & 3 deletions src/actionSendPosition.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
#include <yarp/dev/PolyDriver.h>
#include <yarp/dev/ControlBoardInterfaces.h>

using namespace yarp::os;
using namespace yarp::sig;
using namespace yarp::dev;

namespace YarpActions
{
Expand Down
2 changes: 0 additions & 2 deletions src/actionSendPwm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

#include <cmath>


using namespace yarp::os;
using namespace yarp::sig;
using namespace yarp::dev;

Expand Down
1 change: 0 additions & 1 deletion src/actionSendPwmTrain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "report.h"


using namespace yarp::os;
using namespace yarp::sig;
using namespace yarp::dev;

Expand Down