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/chat-dialog-backend.hpp b/src/chat-dialog-backend.hpp
index e9543bb..0c417c3 100644
--- a/src/chat-dialog-backend.hpp
+++ b/src/chat-dialog-backend.hpp
@@ -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
*
* BSD license, See the LICENSE file for more information
*
@@ -25,18 +25,20 @@
namespace chronochat {
-class NodeInfo {
+class NodeInfo
+{
public:
QString sessionPrefix;
chronosync::SeqNo seqNo;
};
-class UserInfo {
+class UserInfo
+{
public:
ndn::Name sessionPrefix;
bool hasNick;
std::string userNick;
- ndn::scheduler::EventId timeoutEventId;
+ ndn::scheduler::ScopedEventId timeoutEventId;
};
class ChatDialogBackend : public QThread
@@ -98,7 +100,7 @@
void
prepareChatMessage(const QString& text,
time_t timestamp,
- ChatMessage &msg);
+ ChatMessage& msg);
void
updatePrefixes();