From 16d603e203dca018679bb1bcd1465f114a1d0351 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Jul 2013 12:53:43 -0700
Subject: [PATCH] clean up extra new lines and LogDisplay line break

---
 interface/src/Application.cpp     | 3 +--
 interface/src/LogDisplay.cpp      | 7 +------
 libraries/shared/src/Node.cpp     | 2 +-
 libraries/shared/src/NodeList.cpp | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e5455eb604..0b29d6714d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -165,7 +165,7 @@ void GLCanvas::wheelEvent(QWheelEvent* event) {
 }
 
 void messageHandler(QtMsgType type, const char* message) {
-    printf("%s\n", message);
+    printf("%s", message);
     LogDisplay::instance.addMessage(message);
 }
 
@@ -215,7 +215,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
 {
     _applicationStartupTime = startup_time;
     _window->setWindowTitle("Interface");
-    qDebug("Interface Startup:\n");
     
     qInstallMsgHandler(messageHandler);
     
diff --git a/interface/src/LogDisplay.cpp b/interface/src/LogDisplay.cpp
index 49e4886b00..247ea4beb5 100644
--- a/interface/src/LogDisplay.cpp
+++ b/interface/src/LogDisplay.cpp
@@ -97,9 +97,8 @@ void LogDisplay::addMessage(const char* ptr) {
         fprintf(_stream, "%s", ptr);
     }
 
-    while (true) {
+    while (*ptr != '\0') {
         // process the characters
-        bool isEndOfMessage = (*ptr == '\0');
         char c = *ptr++;
 
         if (c == '\t') { 
@@ -151,10 +150,6 @@ void LogDisplay::addMessage(const char* ptr) {
             _writeLineStartPos = _writePos;
             _writtenInLine = 0;
         }
-        
-        if (isEndOfMessage) {
-            break;
-        }
     }
 
     pthread_mutex_unlock(& _mutex);
diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp
index 41936d3a99..d7cf429558 100644
--- a/libraries/shared/src/Node.cpp
+++ b/libraries/shared/src/Node.cpp
@@ -150,5 +150,5 @@ QDebug operator<<(QDebug debug, const Node &node) {
     
     debug << "#" << node.getNodeID() << node.getTypeName() << node.getType();
     debug.nospace() << publicAddressBuffer << ":" << publicAddressPort;
-    return debug.space();
+    return debug.nospace();
 }
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 2f811f48c2..87ee133dbb 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -420,7 +420,7 @@ void NodeList::addNodeToList(Node* newNode) {
     
     ++_numNodes;
     
-    qDebug() << "Added " << *newNode;
+    qDebug() << "Added" << *newNode << "\n";
 }
 
 unsigned NodeList::broadcastToNodes(unsigned char *broadcastData, size_t dataBytes, const char* nodeTypes, int numNodeTypes) {
@@ -475,7 +475,7 @@ void *removeSilentNodes(void *args) {
             if ((checkTimeUSecs - node->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS
             	&& node->getType() != NODE_TYPE_VOXEL_SERVER) {
             
-                qDebug() << "Killed" << *node;
+                qDebug() << "Killed" << *node << "\n";
                 
                 node->setAlive(false);
             }