projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ead4af1
)
Minor whitespace fixes.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 29 Nov 2014 12:15:57 +0000
(13:15 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 29 Nov 2014 12:15:57 +0000
(13:15 +0100)
android/loghandler.cpp
patch
|
blob
|
history
extdef.h
patch
|
blob
|
history
main.cpp
patch
|
blob
|
history
pv/data/decode/decoder.hpp
patch
|
blob
|
history
pv/data/decoderstack.cpp
patch
|
blob
|
history
pv/prop/binding/deviceoptions.cpp
patch
|
blob
|
history
pv/widgets/popup.cpp
patch
|
blob
|
history
signalhandler.cpp
patch
|
blob
|
history
diff --git
a/android/loghandler.cpp
b/android/loghandler.cpp
index 8e7806c89f95716616b7f67d906ad885eb6a2948..0b99b049d36bde0b67806e4f555fa028001488f9 100644
(file)
--- a/
android/loghandler.cpp
+++ b/
android/loghandler.cpp
@@
-101,4
+101,3
@@
void AndroidLogHandler::install_callbacks()
}
} // namespace pv
}
} // namespace pv
-
diff --git
a/extdef.h
b/extdef.h
index 8af615c0b443eadb36acecc9d9eaead37280283d..0e928657f811e55b355aef7ed3305172659fe923 100644
(file)
--- a/
extdef.h
+++ b/
extdef.h
@@
-21,7
+21,7
@@
#ifndef PULSEVIEW_EXTDEF_H
#define PULSEVIEW_EXTDEF_H
#ifndef PULSEVIEW_EXTDEF_H
#define PULSEVIEW_EXTDEF_H
-#define countof(x) (sizeof(x)
/
sizeof(x[0]))
+#define countof(x) (sizeof(x)
/
sizeof(x[0]))
#define begin_element(x) (&x[0])
#define end_element(x) (&x[countof(x)])
#define begin_element(x) (&x[0])
#define end_element(x) (&x[countof(x)])
diff --git
a/main.cpp
b/main.cpp
index 8fac92340c1326b3aafd38a5d678b69a06b9046a..74d13fdc4af1b0eeb9e9b3d3e1d64169597b8dd9 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-154,7
+154,7
@@
int main(int argc, char *argv[])
QObject::connect(handler,
SIGNAL(term_received()),
&w, SLOT(close()));
QObject::connect(handler,
SIGNAL(term_received()),
&w, SLOT(close()));
- } else {
+ } else {
qWarning() <<
"Could not prepare signal handler.";
}
qWarning() <<
"Could not prepare signal handler.";
}
diff --git
a/pv/data/decode/decoder.hpp
b/pv/data/decode/decoder.hpp
index fbe59059cf6190167d8cc0333c27e01008e094eb..aa79e01c93d4894f312d0b63c9cc3c99bde8b5bc 100644
(file)
--- a/
pv/data/decode/decoder.hpp
+++ b/
pv/data/decode/decoder.hpp
@@
-70,7
+70,7
@@
public:
srd_decoder_inst* create_decoder_inst(
srd_session *session, int unit_size) const;
srd_decoder_inst* create_decoder_inst(
srd_session *session, int unit_size) const;
- std::set< std::shared_ptr<pv::data::Logic> > get_data();
+ std::set< std::shared_ptr<pv::data::Logic> > get_data();
private:
const srd_decoder *const decoder_;
private:
const srd_decoder *const decoder_;
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index da831e3be097fe6446bb688ae953860f9964ef10..1c47016055fddae6dda477713487836b34b52793 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-392,7
+392,7
@@
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
assert(decc);
auto row_iter = d->rows_.end();
assert(decc);
auto row_iter = d->rows_.end();
-
+
// Try looking up the sub-row of this class
const auto r = d->class_rows_.find(make_pair(decc, a.format()));
if (r != d->class_rows_.end())
// Try looking up the sub-row of this class
const auto r = d->class_rows_.find(make_pair(decc, a.format()));
if (r != d->class_rows_.end())
diff --git
a/pv/prop/binding/deviceoptions.cpp
b/pv/prop/binding/deviceoptions.cpp
index 68e3237f10af4ef9b9e16878c1ec25d68a61f273..8412104daf0eb3328cac1764a13395560d9fa875 100644
(file)
--- a/
pv/prop/binding/deviceoptions.cpp
+++ b/
pv/prop/binding/deviceoptions.cpp
@@
-186,4
+186,3
@@
QString DeviceOptions::print_voltage_threshold(Glib::VariantBase gvar)
} // binding
} // prop
} // pv
} // binding
} // prop
} // pv
-
diff --git
a/pv/widgets/popup.cpp
b/pv/widgets/popup.cpp
index 7143c24a9aba9ce568bc933d3283ee67c648660c..68f79f0f6fbeafe6066bc0a3bc96e4ad11d037d8 100644
(file)
--- a/
pv/widgets/popup.cpp
+++ b/
pv/widgets/popup.cpp
@@
-146,7
+146,7
@@
QPolygon Popup::arrow_polygon() const
const int l = ArrowLength + ArrowOverlap;
switch (pos_)
const int l = ArrowLength + ArrowOverlap;
switch (pos_)
-
{
+ {
case Right:
poly << QPoint(p.x() + l, p.y() - l);
break;
case Right:
poly << QPoint(p.x() + l, p.y() - l);
break;
@@
-155,7
+155,7
@@
QPolygon Popup::arrow_polygon() const
poly << QPoint(p.x() - l, p.y() + l);
break;
poly << QPoint(p.x() - l, p.y() + l);
break;
-
case Left:
+ case Left:
case Top:
poly << QPoint(p.x() - l, p.y() - l);
break;
case Top:
poly << QPoint(p.x() - l, p.y() - l);
break;
@@
-164,13
+164,13
@@
QPolygon Popup::arrow_polygon() const
poly << p;
switch (pos_)
poly << p;
switch (pos_)
-
{
+ {
case Right:
case Bottom:
poly << QPoint(p.x() + l, p.y() + l);
break;
case Right:
case Bottom:
poly << QPoint(p.x() + l, p.y() + l);
break;
-
case Left:
+ case Left:
poly << QPoint(p.x() - l, p.y() + l);
break;
poly << QPoint(p.x() - l, p.y() + l);
break;
@@
-311,4
+311,3
@@
void Popup::showEvent(QShowEvent*)
} // namespace widgets
} // namespace pv
} // namespace widgets
} // namespace pv
-
diff --git
a/signalhandler.cpp
b/signalhandler.cpp
index 66acc1fd7aaf71b24b350c6509f3460a6463ac04..71f66f559b4b6b5711b83dfafce691e8aa2dc17c 100644
(file)
--- a/
signalhandler.cpp
+++ b/
signalhandler.cpp
@@
-66,8
+66,7
@@
void SignalHandler::on_socket_notifier_activated()
socket_notifier_->setEnabled(false);
int sig_number;
socket_notifier_->setEnabled(false);
int sig_number;
- if(read(sockets_[1], &sig_number, sizeof(int)) !=
- sizeof(int)) {
+ if(read(sockets_[1], &sig_number, sizeof(int)) != sizeof(int)) {
qDebug() << "Failed to catch signal";
abort();
}
qDebug() << "Failed to catch signal";
abort();
}
@@
-87,8
+86,7
@@
void SignalHandler::on_socket_notifier_activated()
void SignalHandler::handle_signals(int sig_number)
{
void SignalHandler::handle_signals(int sig_number)
{
- if(write(sockets_[0], &sig_number, sizeof(int)) !=
- sizeof(int)) {
+ if(write(sockets_[0], &sig_number, sizeof(int)) != sizeof(int)) {
// Failed to handle signal
abort();
}
// Failed to handle signal
abort();
}