GSoC C++-ificiation merge and cleanup.

(bzr r9946)

2 files changed, 25 insertions, 28 deletions

diff --git a/src/jabber_whiteboard/node-tracker.cpp b/src/jabber_whiteboard/node-tracker.cpp
index a506d472a..9f40a7dc6 100644
--- a/src/jabber_whiteboard/node-tracker.cpp
+++ b/src/jabber_whiteboard/node-tracker.cpp
@@ -37,8 +37,8 @@ namespace Whiteboard {
  * A special node is a node that can only appear once in a document.
  */
 char const* specialnodekeys[] = {
-	DOCUMENT_ROOT_NODE,
-	DOCUMENT_NAMEDVIEW_NODE,
+    DOCUMENT_ROOT_NODE,
+    DOCUMENT_NAMEDVIEW_NODE,
 };
 
 /**
@@ -47,8 +47,8 @@ char const* specialnodekeys[] = {
  * A special node is a node that can only appear once in a document.
  */
 char const* specialnodenames[] = {
-	DOCUMENT_ROOT_NAME,
-	DOCUMENT_NAMEDVIEW_NAME,
+    DOCUMENT_ROOT_NAME,
+    DOCUMENT_NAMEDVIEW_NAME,
 };
 
 XMLNodeTracker::XMLNodeTracker(SessionManager* sm) :
@@ -94,7 +94,7 @@ XMLNodeTracker::setSessionManager(const SessionManager *val)
 
 void 
 XMLNodeTracker::put(const Glib::ustring &key, const XML::Node &nodeArg)
-{	
+{
     keyNodeTable.put(key, &nodeArg);
 }
 
@@ -159,7 +159,7 @@ XMLNodeTracker::isTracking(const XML::Node &node)
 bool
 XMLNodeTracker::isRootNode(const XML::Node &node)
 {
-    XML::Node* docroot = sp_document_repr_root(_sm->getDocument());
+    XML::Node* docroot = _sm->getDocument()->getReprRoot();
     return (docroot == &node);
 }
 
@@ -182,7 +182,7 @@ XMLNodeTracker::remove(const XML::Node &nodeArg)
 bool 
 XMLNodeTracker::isSpecialNode(const Glib::ustring &name)
 {
-    return (_specialnodes.find(name.data()) != _specialnodes.end());	
+    return (_specialnodes.find(name.data()) != _specialnodes.end());
 }
 
 Glib::ustring
@@ -273,23 +273,22 @@ XMLNodeTracker::dump()
     }
 }
 
-void
-XMLNodeTracker::reset()
+void XMLNodeTracker::reset()
 {
     _clear();
 
     // Find and insert special nodes
     // root node
-    put(_rootKey, *(sp_document_repr_root(_sm->getDocument())));
+    put(_rootKey, *(_sm->getDocument()->getReprRoot()));
 
     // namedview node
     SPObject* namedview = sp_item_group_get_child_by_name(
                  (SPGroup *)_sm->getDocument()->root,
                   NULL, DOCUMENT_NAMEDVIEW_NAME);
     if (!namedview) {
-            g_warning("namedview node does not exist; it will be created during synchronization");
+        g_warning("namedview node does not exist; it will be created during synchronization");
     } else {
-            put(_namedviewKey, *(SP_OBJECT_REPR(namedview)));
+        put(_namedviewKey, *(SP_OBJECT_REPR(namedview)));
     }
 }
 
diff --git a/src/jabber_whiteboard/session-manager.cpp b/src/jabber_whiteboard/session-manager.cpp
index 0dcd744c3..60d0b7378 100644
--- a/src/jabber_whiteboard/session-manager.cpp
+++ b/src/jabber_whiteboard/session-manager.cpp
@@ -4,6 +4,7 @@
  * Authors:
  * David Yip <yipdw@rose-hulman.edu>
  * Bob Jamison (Pedro port)
+ *   Abhishek Sharma
  *
  * Copyright (c) 2005 Authors
  *
@@ -56,15 +57,15 @@ SessionManager *sessionManagerInstance = NULL;
 
 void SessionManager::showClient()
 {
-	SessionManager::instance().gui.show();
+    SessionManager::instance().gui.show();
 }
 
-SessionManager&
-SessionManager::instance()
+SessionManager &SessionManager::instance()
 {
-    if (!sessionManagerInstance)
+    if (!sessionManagerInstance) {
         sessionManagerInstance = new SessionManager();
-	return *sessionManagerInstance;
+    }
+    return *sessionManagerInstance;
 }
 
 SessionManager::SessionManager() 
@@ -226,8 +227,8 @@ SessionManager::processWhiteboardEvent(Pedro::XmppEvent const& event)
 {
     Pedro::Element* root = event.getDOM();
     if (root == NULL) {
-	g_warning("Received null DOM; ignoring message.");
-	return;
+        g_warning("Received null DOM; ignoring message.");
+        return;
     }
 
     Pedro::DOMString session = root->getTagAttribute("wb", "session");
@@ -296,11 +297,11 @@ SessionManager::checkInvitationQueue()
     if (invitations.size() > 0) 
     {
         // There's an invitation to process; process it.
-	Invitation invitation = invitations.front();
+        Invitation invitation = invitations.front();
         Glib::ustring from = invitation.first;
         Glib::ustring sessionId = invitation.second;
 
-	Glib::ustring primary = 
+        Glib::ustring primary = 
             "<span weight=\"bold\" size=\"larger\">" + 
             String::ucompose(_("<b>%1</b> has invited you to a whiteboard session."), from) + 
             "</span>\n\n" + 
@@ -366,7 +367,7 @@ makeInkboardDocument(int code, gchar const* rootname, State::SessionType type, G
     Glib::ustring name = String::ucompose(
         _("Inkboard session (%1 to %2)"), SessionManager::instance().getClient().getJid(), to);
 
-    doc = sp_document_create(rdoc, NULL, NULL, name.c_str(), TRUE);
+    doc = SPDocument::createDoc(rdoc, NULL, NULL, name.c_str(), TRUE);
     g_return_val_if_fail(doc != NULL, NULL);
 
     return doc;
@@ -378,17 +379,14 @@ makeInkboardDocument(int code, gchar const* rootname, State::SessionType type, G
 // in file.cpp.
 //
 // \see sp_file_new
-SPDesktop*
-makeInkboardDesktop(SPDocument* doc)
+SPDesktop *makeInkboardDesktop(SPDocument* doc)
 {
-    SPDesktop* dt;
-
     SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL));
     g_return_val_if_fail(dtw != NULL, NULL);
-    sp_document_unref(doc);
+    doc->doUnref();
 
     sp_create_window(dtw, TRUE);
-    dt = static_cast<SPDesktop*>(dtw->view);
+    SPDesktop *dt = static_cast<SPDesktop*>(dtw->view);
     sp_namedview_window_from_document(dt);
     sp_namedview_update_layers_from_document(dt);