refactor: cleanup and sync
* Fix Jenkins scripts and sync with ndn-cxx
* Sync waf-tools
* Remove ChronoSync submodule
* Remove commented/dead code and includes
* Use ScopedEventId and ScopedRegisteredPrefixHandle
* Set setCanBePrefix to true explicitly everywhere
* Fix macOS build, add GHA CI
* Use NDN_THROW for throwing errors
* Other smaller fixes
Change-Id: I615e0e239511b97101852e1d7c620a2071a18ff8
diff --git a/src/contact-panel.cpp b/src/contact-panel.cpp
index 8841d5d..04b68d5 100644
--- a/src/contact-panel.cpp
+++ b/src/contact-panel.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
/*
- * Copyright (c) 2013, Regents of the University of California
+ * Copyright (c) 2020, Regents of the University of California
* Yingdi Yu
*
* BSD license, See the LICENSE file for more information
@@ -18,12 +18,6 @@
#include <QtSql/QSqlField>
#include <QtSql/QSqlError>
-#ifndef Q_MOC_RUN
-#include "logging.h"
-#endif
-
-// INIT_LOGGER("ContactPanel");
-
namespace chronochat {
ContactPanel::ContactPanel(QWidget *parent)
@@ -129,15 +123,10 @@
void
ContactPanel::onCloseDBModule()
{
- // _LOG_DEBUG("close db module");
- if (m_trustScopeModel) {
+ if (m_trustScopeModel)
delete m_trustScopeModel;
- // _LOG_DEBUG("trustScopeModel closed");
- }
- if (m_endorseDataModel) {
+ if (m_endorseDataModel)
delete m_endorseDataModel;
- // _LOG_DEBUG("endorseDataModel closed");
- }
}
void
@@ -211,8 +200,8 @@
// private slots
void
-ContactPanel::onSelectionChanged(const QItemSelection &selected,
- const QItemSelection &deselected)
+ContactPanel::onSelectionChanged(const QItemSelection& selected,
+ const QItemSelection& deselected)
{
QModelIndexList items = selected.indexes();
QString alias = m_contactListModel->data(items.first(), Qt::DisplayRole).toString();
@@ -341,5 +330,4 @@
#if WAF
#include "contact-panel.moc"
-// #include "contact-panel.cpp.moc"
#endif