Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 10:58:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up extra new lines and LogDisplay line break

Browse source
This commit is contained in:
Stephen Birarda 2013-07-16 12:53:43 -07:00
parent 1b48d4f0fc
commit 16d603e203
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -165,7 +165,7 @@ void GLCanvas::wheelEvent(QWheelEvent* event) {
} }
void messageHandler(QtMsgType type, const char* message) { void messageHandler(QtMsgType type, const char* message) {
printf("%s\n", message); printf("%s", message);
LogDisplay::instance.addMessage(message); LogDisplay::instance.addMessage(message);
} }
@ -215,7 +215,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
{ {
_applicationStartupTime = startup_time; _applicationStartupTime = startup_time;
_window->setWindowTitle("Interface"); _window->setWindowTitle("Interface");
qDebug("Interface Startup:\n");
qInstallMsgHandler(messageHandler); qInstallMsgHandler(messageHandler);

7
interface/src/LogDisplay.cpp
View file

@ -97,9 +97,8 @@ void LogDisplay::addMessage(const char* ptr) {
fprintf(_stream, "%s", ptr); fprintf(_stream, "%s", ptr);
} }
while (true) { while (*ptr != '\0') {
// process the characters // process the characters
bool isEndOfMessage = (*ptr == '\0');
char c = *ptr++; char c = *ptr++;
if (c == '\t') { if (c == '\t') {
@ -151,10 +150,6 @@ void LogDisplay::addMessage(const char* ptr) {
_writeLineStartPos = _writePos; _writeLineStartPos = _writePos;
_writtenInLine = 0; _writtenInLine = 0;
} }
if (isEndOfMessage) {
break;
}
} }
pthread_mutex_unlock(& _mutex); pthread_mutex_unlock(& _mutex);

2
libraries/shared/src/Node.cpp
View file

@ -150,5 +150,5 @@ QDebug operator<<(QDebug debug, const Node &node) {
debug << "#" << node.getNodeID() << node.getTypeName() << node.getType(); debug << "#" << node.getNodeID() << node.getTypeName() << node.getType();
debug.nospace() << publicAddressBuffer << ":" << publicAddressPort; debug.nospace() << publicAddressBuffer << ":" << publicAddressPort;
return debug.space(); return debug.nospace();
} }

4
libraries/shared/src/NodeList.cpp
View file

@ -420,7 +420,7 @@ void NodeList::addNodeToList(Node* newNode) {
++_numNodes; ++_numNodes;
qDebug() << "Added " << *newNode; qDebug() << "Added" << *newNode << "\n";
} }
unsigned NodeList::broadcastToNodes(unsigned char *broadcastData, size_t dataBytes, const char* nodeTypes, int numNodeTypes) { 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 if ((checkTimeUSecs - node->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS
&& node->getType() != NODE_TYPE_VOXEL_SERVER) { && node->getType() != NODE_TYPE_VOXEL_SERVER) {
qDebug() << "Killed" << *node; qDebug() << "Killed" << *node << "\n";
node->setAlive(false); node->setAlive(false);
} }