jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

replaced (func.size() > 1) with (!func.empty()) in generator (no change in functionality, only easier to read)

Browse source
This commit is contained in:
Andreas Volz 2011-11-28 11:55:44 +01:00
parent 74c1ee31c2
commit b100e9d32a
2 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tools/generate_adaptor.cpp
View file

@ -278,7 +278,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -316,7 +316,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
string arg_name = arg.get("name");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -354,7 +354,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
string arg_name = arg.get("name");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -406,7 +406,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -434,7 +434,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
<< tab << tab << "::DBus::SignalMessage sig(\"" << signal.get("name") <<"\");" << endl;
// generate the signal body
if (args.size() > 0)
if (!args.empty())
{
body << tab << tab << "::DBus::MessageIter wi = sig.writer();" << endl;
@ -446,7 +446,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -508,7 +508,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -521,7 +521,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
}
// generate 'out' variables
if (args_out.size() > 0)
if (!args_out.empty())
{
unsigned int i = 1;
for (Xml::Nodes::iterator ao = args_out.begin(); ao != args_out.end(); ++ao, ++i)
@ -542,7 +542,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
}
// generate 'out' object variables
if (args_out.size() > 0)
if (!args_out.empty())
{
unsigned int i = 1;
for (Xml::Nodes::iterator ao = args_out.begin(); ao != args_out.end(); ++ao, ++i)
@ -552,7 +552,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -574,7 +574,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -597,7 +597,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -625,7 +625,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -648,7 +648,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
body << tab << tab << "::DBus::ReturnMessage reply(call);" << endl;
if (args_out.size() > 0)
if (!args_out.empty())
{
body << tab << tab << "::DBus::MessageIter wi = reply.writer();" << endl;
@ -661,7 +661,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}

26
tools/generate_proxy.cpp
View file

@ -212,7 +212,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
bool annotation_noreply_value = false;
// parse method level noreply annotations
if (annotations_noreply.size() > 0)
if (!annotations_noreply.empty())
{
string annotation_noreply_value_str = annotations_noreply.front()->get("value");
@ -222,7 +222,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
}
}
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -254,7 +254,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -294,7 +294,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -328,7 +328,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
body << tab << "{" << endl
<< tab << tab << "::DBus::CallMessage call;" << endl;
if (args_in.size() > 0)
if (!args_in.empty())
{
body << tab << tab << "::DBus::MessageIter wi = call.writer();" << endl
<< endl;
@ -344,7 +344,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -389,7 +389,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
body << tab << tab << "::DBus::Message ret = invoke_method (call);" << endl;
}
if (args_out.size() > 0)
if (!args_out.empty())
{
body << tab << tab << "::DBus::MessageIter ri = ret.reader();" << endl
<< endl;
@ -402,7 +402,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -438,7 +438,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -498,7 +498,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -544,7 +544,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
body << tab << "void " << stub_name(signal.get("name")) << "(const ::DBus::SignalMessage &sig)" << endl
<< tab << "{" << endl;
if (args.size() > 0)
if (!args.empty())
{
body << tab << tab << "::DBus::MessageIter ri = sig.reader();" << endl
<< endl;
@ -559,7 +559,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}
@ -598,7 +598,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
if (!annotations_object.empty())
{
arg_object = annotations_object.front()->get("value");
}