--- a/src/simulator/scheduler.h	Tue Sep 05 12:54:53 2006 +0200
+++ b/src/simulator/scheduler.h	Tue Sep 05 13:13:39 2006 +0200
@@ -36,18 +36,18 @@
  * event list. If you want to provide a new event list scheduler, 
  * you need to create a subclass of this base class and implement 
  * all the private pure virtual methods defined here. Namely:
- *   - ns3::Scheduler::real_insert
- *   - ns3::Scheduler::real_is_empty
- *   - ns3::Scheduler::real_peek_next
- *   - ns3::Scheduler::real_peek_next_key
- *   - ns3::Scheduler::real_remove_next
- *   - ns3::Scheduler::real_remove
- *   - ns3::Scheduler::real_is_valid
+ *   - ns3::Scheduler::realInsert
+ *   - ns3::Scheduler::realIsEmpty
+ *   - ns3::Scheduler::realPeekNext
+ *   - ns3::Scheduler::realPeekNextKey
+ *   - ns3::Scheduler::realRemoveNext
+ *   - ns3::Scheduler::realRemove
+ *   - ns3::Scheduler::realIsValid
  *
  * If you need to provide a new event list scheduler without
  * editing the main simulator class, you need to also implement
  * a subclass of the ns3::SchedulerFactory base class and
- * feed it to ns3::Simulator::set_external.
+ * feed it to ns3::Simulator::setExternal.
  */
 class Scheduler {
  public:
@@ -63,12 +63,12 @@
 	virtual ~Scheduler () = 0;
 
 	EventId insert (EventImpl *event, EventKey key);
-	bool is_empty (void) const;
-	EventImpl *peek_next (void) const;
-	Scheduler::EventKey peek_next_key (void) const ;
-	void remove_next (void);
+	bool isEmpty (void) const;
+	EventImpl *peekNext (void) const;
+	Scheduler::EventKey peekNextKey (void) const ;
+	void removeNext (void);
 	EventImpl *remove (EventId id, EventKey *key);
-	bool is_valid (EventId id);
+	bool isValid (EventId id);
 
 private:
 	/**
@@ -78,29 +78,29 @@
 	 *
 	 * This method takes ownership of the event pointer.
 	 */
-	virtual EventId real_insert (EventImpl *event, EventKey key) = 0;
+	virtual EventId realInsert (EventImpl *event, EventKey key) = 0;
 	/**
 	 * \returns true if the event list is empty and false otherwise.
 	 */
-	virtual bool real_is_empty (void) const = 0;
+	virtual bool realIsEmpty (void) const = 0;
 	/**
 	 * \returns a pointer to the next earliest event. The caller
 	 *          takes ownership of the returned pointer.
 	 *
 	 * This method cannot be invoked if the list is empty.
 	 */
-	virtual EventImpl *real_peek_next (void) const = 0;
+	virtual EventImpl *realPeekNext (void) const = 0;
 	/**
 	 * \returns the timecode associated with the next earliest event.
 	 *
 	 * This method cannot be invoked if the list is empty.
 	 */
-	virtual Scheduler::EventKey real_peek_next_key (void) const = 0;
+	virtual Scheduler::EventKey realPeekNextKey (void) const = 0;
 	/**
 	 * This method cannot be invoked if the list is empty.
 	 * Remove the next earliest event from the event list.
 	 */
-	virtual void real_remove_next (void) = 0;
+	virtual void realRemoveNext (void) = 0;
 	/**
 	 * \param id the id of the event to remove
 	 * \param key the timecode of the event removed
@@ -109,13 +109,13 @@
 	 *
 	 * This methods cannot be invoked if the list is empty.
 	 */
-	virtual EventImpl *real_remove (EventId id, EventKey *key) = 0;
+	virtual EventImpl *realRemove (EventId id, EventKey *key) = 0;
 	/**
 	 * \param id event id to validate
 	 * \returns true if the event id identifies an existing valid
 	 *          event stored in the event list and false otherwise.
 	 */
-	virtual bool real_is_valid (EventId id) = 0;
+	virtual bool realIsValid (EventId id) = 0;
 };
 
 }; // namespace ns3