src: Updating code style to conform (more or less) to ndn-cxx style
Also, adding .clang-format that describes the applied style. Note that
this style requires a slightly customized version of clang-format.
diff --git a/apps/ndn-app.hpp b/apps/ndn-app.hpp
index 2157a7f..edede34 100644
--- a/apps/ndn-app.hpp
+++ b/apps/ndn-app.hpp
@@ -44,83 +44,86 @@
/**
* @ingroup ndn-apps
* @brief Base class that all NDN applications should be derived from.
- *
+ *
* The class implements virtual calls onInterest, onNack, and onData
*/
-class App: public Application
-{
+class App : public Application {
public:
- static TypeId GetTypeId ();
+ static TypeId
+ GetTypeId();
/**
* @brief Default constructor
*/
- App ();
- virtual ~App ();
+ App();
+ virtual ~App();
/**
* @brief Get application ID (ID of applications face)
*/
uint32_t
- GetId () const;
-
+ GetId() const;
+
/**
* @brief Method that will be called every time new Interest arrives
* @param interest Interest header
- * @param packet "Payload" of the interests packet. The actual payload should be zero, but packet itself
+ * @param packet "Payload" of the interests packet. The actual payload should be zero, but
+ * packet itself
* may be useful to get packet tags
*/
virtual void
- OnInterest (Ptr<const Interest> interest);
+ OnInterest(Ptr<const Interest> interest);
/**
* @brief Method that will be called every time new NACK arrives
* @param interest Interest header
*/
virtual void
- OnNack (Ptr<const Interest> interest);
-
+ OnNack(Ptr<const Interest> interest);
+
/**
* @brief Method that will be called every time new Data arrives
* @param contentObject Data header
- * @param payload payload (potentially virtual) of the Data packet (may include packet tags of original packet)
+ * @param payload payload (potentially virtual) of the Data packet (may include packet tags of
+ * original packet)
*/
virtual void
- OnData (Ptr<const Data> contentObject);
-
+ OnData(Ptr<const Data> contentObject);
+
protected:
/**
* @brief Do cleanup when application is destroyed
*/
virtual void
- DoDispose ();
+ DoDispose();
// inherited from Application base class. Originally they were private
virtual void
- StartApplication (); ///< @brief Called at time specified by Start
+ StartApplication(); ///< @brief Called at time specified by Start
virtual void
- StopApplication (); ///< @brief Called at time specified by Stop
+ StopApplication(); ///< @brief Called at time specified by Stop
protected:
- bool m_active; ///< @brief Flag to indicate that application is active (set by StartApplication and StopApplication)
- Ptr<Face> m_face; ///< @brief automatically created application face through which application communicates
+ bool m_active; ///< @brief Flag to indicate that application is active (set by StartApplication
+ /// and StopApplication)
+ Ptr<Face> m_face; ///< @brief automatically created application face through which application
+ /// communicates
- TracedCallback<Ptr<const Interest>,
- Ptr<App>, Ptr<Face> > m_receivedInterests; ///< @brief App-level trace of received Interests
+ TracedCallback<Ptr<const Interest>, Ptr<App>, Ptr<Face>>
+ m_receivedInterests; ///< @brief App-level trace of received Interests
- TracedCallback<Ptr<const Interest>,
- Ptr<App>, Ptr<Face> > m_receivedNacks; ///< @brief App-level trace of received NACKs
+ TracedCallback<Ptr<const Interest>, Ptr<App>, Ptr<Face>>
+ m_receivedNacks; ///< @brief App-level trace of received NACKs
- TracedCallback<Ptr<const Data>,
- Ptr<App>, Ptr<Face> > m_receivedDatas; ///< @brief App-level trace of received Data
+ TracedCallback<Ptr<const Data>, Ptr<App>, Ptr<Face>>
+ m_receivedDatas; ///< @brief App-level trace of received Data
+ TracedCallback<Ptr<const Interest>, Ptr<App>, Ptr<Face>>
+ m_transmittedInterests; ///< @brief App-level trace of transmitted Interests
- TracedCallback<Ptr<const Interest>,
- Ptr<App>, Ptr<Face> > m_transmittedInterests; ///< @brief App-level trace of transmitted Interests
-
- TracedCallback<Ptr<const Data>,
- Ptr<App>, Ptr<Face> > m_transmittedDatas; ///< @brief App-level trace of transmitted Data
+ TracedCallback<Ptr<const Data>, Ptr<App>, Ptr<Face>>
+ m_transmittedDatas; ///< @brief App-level trace of transmitted Data
};
} // namespace ndn