History

remove now extraneous newlines after switch to QDebug

Stephen Birarda committed 13 years ago

Commit 89d3cfd1 parent afe49bc22 files · +199 −199Browse files

Showing the changes to interface/src/Application.cpp (1 of 22 files). Show all

Unified · Split

interface/src/Application.cpp+13−13
@@ -210,7 +210,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 209 unmodified lines
210{210{
211 _applicationStartupTime = startup_time;211 _applicationStartupTime = startup_time;
212 _window->setWindowTitle("Interface");212 _window->setWindowTitle("Interface");
213 qDebug("Interface Startup:\n");213 qDebug("Interface Startup:");
214 214
215 unsigned int listenPort = 0; // bind to an ephemeral port by default215 unsigned int listenPort = 0; // bind to an ephemeral port by default
216 const char** constArgv = const_cast<const char**>(argv);216 const char** constArgv = const_cast<const char**>(argv);
@@ -233,7 +233,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 16 unmodified lines
233 233
234 // Handle Local Domain testing with the --local command line234 // Handle Local Domain testing with the --local command line
235 if (cmdOptionExists(argc, constArgv, "--local")) {235 if (cmdOptionExists(argc, constArgv, "--local")) {
236 qDebug("Local Domain MODE!\n");236 qDebug("Local Domain MODE!");
237 237
238 NodeList::getInstance()->setDomainIPToLocalhost();238 NodeList::getInstance()->setDomainIPToLocalhost();
239 }239 }
@@ -297,7 +297,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 57 unmodified lines
297}297}
298 298
299void Application::initializeGL() {299void Application::initializeGL() {
300 qDebug( "Created Display Window.\n" );300 qDebug( "Created Display Window." );
301 301
302 // initialize glut for shape drawing; Qt apparently initializes it on OS X302 // initialize glut for shape drawing; Qt apparently initializes it on OS X
303 #ifndef __APPLE__303 #ifndef __APPLE__
@@ -312,10 +312,10 @@ void Application::initializeGL() { · 8 unmodified lines
312 _viewFrustumOffsetCamera.setFarClip(500.0 * TREE_SCALE);312 _viewFrustumOffsetCamera.setFarClip(500.0 * TREE_SCALE);
313 313
314 initDisplay();314 initDisplay();
315 qDebug( "Initialized Display.\n" );315 qDebug( "Initialized Display." );
316 316
317 init();317 init();
318 qDebug( "Init() complete.\n" );318 qDebug( "Init() complete." );
319 319
320 // Check to see if the user passed in a command line option for randomizing colors320 // Check to see if the user passed in a command line option for randomizing colors
321 bool wantColorRandomizer = !arguments().contains("--NoColorRandomizer");321 bool wantColorRandomizer = !arguments().contains("--NoColorRandomizer");
@@ -324,13 +324,13 @@ void Application::initializeGL() { · 2 unmodified lines
324 // Voxel File. If so, load it now.324 // Voxel File. If so, load it now.
325 if (!_voxelsFilename.isEmpty()) {325 if (!_voxelsFilename.isEmpty()) {
326 _voxels.loadVoxelsFile(_voxelsFilename.constData(), wantColorRandomizer);326 _voxels.loadVoxelsFile(_voxelsFilename.constData(), wantColorRandomizer);
327 qDebug("Local Voxel File loaded.\n");327 qDebug("Local Voxel File loaded.");
328 }328 }
329 329
330 // create thread for receipt of data via UDP330 // create thread for receipt of data via UDP
331 if (_enableNetworkThread) {331 if (_enableNetworkThread) {
332 pthread_create(&_networkReceiveThread, NULL, networkReceive, NULL);332 pthread_create(&_networkReceiveThread, NULL, networkReceive, NULL);
333 qDebug("Network receive thread created.\n"); 333 qDebug("Network receive thread created.");
334 }334 }
335 335
336 // call terminate before exiting336 // call terminate before exiting
@@ -351,7 +351,7 @@ void Application::initializeGL() { · 14 unmodified lines
351 float startupTime = (usecTimestampNow() - usecTimestamp(&_applicationStartupTime)) / 1000000.0;351 float startupTime = (usecTimestampNow() - usecTimestamp(&_applicationStartupTime)) / 1000000.0;
352 _justStarted = false;352 _justStarted = false;
353 char title[50];353 char title[50];
354 sprintf(title, "Interface: %4.2f seconds\n", startupTime);354 sprintf(title, "Interface: %4.2f seconds", startupTime);
355 qDebug("%s", title);355 qDebug("%s", title);
356 _window->setWindowTitle(title);356 _window->setWindowTitle(title);
357 357
@@ -1446,7 +1446,7 @@ void Application::importVoxels() { · 1088 unmodified lines
1446 if (fileNameString.endsWith(".png", Qt::CaseInsensitive)) {1446 if (fileNameString.endsWith(".png", Qt::CaseInsensitive)) {
1447 QImage pngImage = QImage(fileName);1447 QImage pngImage = QImage(fileName);
1448 if (pngImage.height() != pngImage.width()) {1448 if (pngImage.height() != pngImage.width()) {
1449 qDebug("ERROR: Bad PNG size: height != width.\n");1449 qDebug("ERROR: Bad PNG size: height != width.");
1450 return;1450 return;
1451 }1451 }
1452 1452
@@ -1758,7 +1758,7 @@ void Application::init() { · 305 unmodified lines
1758 _audio.setJitterBufferSamples(_audioJitterBufferSamples);1758 _audio.setJitterBufferSamples(_audioJitterBufferSamples);
1759 }1759 }
1760 1760
1761 qDebug("Loaded settings.\n");1761 qDebug("Loaded settings.");
1762 1762
1763 sendAvatarVoxelURLMessage(_myAvatar.getVoxels()->getVoxelURL());1763 sendAvatarVoxelURLMessage(_myAvatar.getVoxels()->getVoxelURL());
1764 1764
@@ -2771,7 +2771,7 @@ glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { · 1006 unmodified lines
2771// render the coverage map on screen2771// render the coverage map on screen
2772void Application::renderCoverageMapV2() {2772void Application::renderCoverageMapV2() {
2773 2773
2774 //qDebug("renderCoverageMap()\n");2774 //qDebug("renderCoverageMap()");
2775 2775
2776 glDisable(GL_LIGHTING);2776 glDisable(GL_LIGHTING);
2777 glLineWidth(2.0);2777 glLineWidth(2.0);
@@ -2816,7 +2816,7 @@ void Application::renderCoverageMapsV2Recursively(CoverageMapV2* map) { · 38 unmodified lines
2816// render the coverage map on screen2816// render the coverage map on screen
2817void Application::renderCoverageMap() {2817void Application::renderCoverageMap() {
2818 2818
2819 //qDebug("renderCoverageMap()\n");2819 //qDebug("renderCoverageMap()");
2820 2820
2821 glDisable(GL_LIGHTING);2821 glDisable(GL_LIGHTING);
2822 glLineWidth(2.0);2822 glLineWidth(2.0);
@@ -3147,7 +3147,7 @@ void Application::eyedropperVoxelUnderCursor() { · 324 unmodified lines
3147}3147}
3148 3148
3149void Application::goHome() {3149void Application::goHome() {
3150 qDebug("Going Home!\n");3150 qDebug("Going Home!");
3151 _myAvatar.setPosition(START_LOCATION);3151 _myAvatar.setPosition(START_LOCATION);
3152}3152}
3153 3153

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t