Merge pull request #5374 from ZappoMan/warningFixes

Warning fixes and removing dead code

Brad Davis committed 11 years ago

Commit 6d4c7cd2 parents 57f9abe 65a79cf12 files · +20 −24Browse files

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

Unified · Split

@@ -332,11 +332,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 331 unmodified lines
332	332	_isThrottleFPSEnabled(false),
333	333	_aboutToQuit(false),
334	334	_notifiedPacketVersionMismatchThisDomain(false),
	335	+ _glWidget(new GLCanvas()),
335	336	_domainConnectionRefusals(QList<QString>()),
336	337	_maxOctreePPS(maxOctreePacketsPerSecond.get()),
337	338	_lastFaceTrackerUpdate(0),
338		− _applicationOverlay(),
339		− _glWidget(new GLCanvas())
	339	+ _applicationOverlay()
340	340	{
341	341	setInstance(this);
342	342	#ifdef Q_OS_WIN

Keyboard shortcuts