projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual: install manual conversion result files generated by cmake
[pulseview.git]
/
pv
/
widgets
/
popuptoolbutton.cpp
diff --git
a/pv/widgets/popuptoolbutton.cpp
b/pv/widgets/popuptoolbutton.cpp
index 75aa76a552777e2fe44aa056cd7f8711f401e9e5..3fc2eb20aa9be8e15c6f267a5aed8ebb6769c0bb 100644
(file)
--- a/
pv/widgets/popuptoolbutton.cpp
+++ b/
pv/widgets/popuptoolbutton.cpp
@@
-14,11
+14,10
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include <
assert.h
>
+#include <
cassert
>
#include "popuptoolbutton.hpp"
#include "popuptoolbutton.hpp"
@@
-27,7
+26,7
@@
namespace widgets {
PopupToolButton::PopupToolButton(QWidget *parent) :
QToolButton(parent),
PopupToolButton::PopupToolButton(QWidget *parent) :
QToolButton(parent),
- popup_(
NULL
)
+ popup_(
nullptr
)
{
connect(this, SIGNAL(clicked(bool)), this, SLOT(on_clicked(bool)));
}
{
connect(this, SIGNAL(clicked(bool)), this, SLOT(on_clicked(bool)));
}
@@
-45,7
+44,7
@@
void PopupToolButton::set_popup(Popup *popup)
void PopupToolButton::on_clicked(bool)
{
void PopupToolButton::on_clicked(bool)
{
- if(!popup_)
+ if
(!popup_)
return;
const QRect r = rect();
return;
const QRect r = rect();
@@
-54,5
+53,5
@@
void PopupToolButton::on_clicked(bool)
popup_->show();
}
popup_->show();
}
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv