From 079e6ac7fa1fbb201dd703eb70ef5f37065221b4 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Thu, 8 May 2008 23:23:24 +0000
Subject: [PATCH] Compiler warning cleanups

git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1140 05730e5d-ab1b-0410-a4ac-84af385074fa
---
 src/mumble/AudioWizard.cpp  | 16 ++++++++--------
 src/mumble/ConfigDialog.cpp |  8 ++++----
 src/mumble/PulseAudio.cpp   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp
index d1061cd97..fc9572a82 100644
--- a/src/mumble/AudioWizard.cpp
+++ b/src/mumble/AudioWizard.cpp
@@ -744,21 +744,21 @@ void AudioWizard::on_Ticker_timeout() {
 			qWarning("It's at %f %f", qgiSource->x(), qgiSource->y());
 		}
 	} else if (currentPage() == qwpPositional) {
-		float x, y;
+		float xp, yp;
 		if ((fX == 0.0f) && (fY == 0.0f)) {
 			fAngle += 0.05;
 
-			x = sin(fAngle) * 2.0f;
-			y = cos(fAngle) * 2.0f;
+			xp = sin(fAngle) * 2.0f;
+			yp = cos(fAngle) * 2.0f;
 		} else {
-			x = fX;
-			y = fY;
+			xp = fX;
+			yp = fY;
 		}
 
-		qgiSource->setPos(x, y);
-		asSource->fPos[0] = x;
+		qgiSource->setPos(xp, yp);
+		asSource->fPos[0] = xp;
 		asSource->fPos[1] = 0;
-		asSource->fPos[2] = y;
+		asSource->fPos[2] = yp;
 	}
 }
 
diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp
index a00e2a2c4..3d8187b09 100644
--- a/src/mumble/ConfigDialog.cpp
+++ b/src/mumble/ConfigDialog.cpp
@@ -134,14 +134,14 @@ ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) {
 void ConfigDialog::addPage(ConfigWidget *cw, unsigned int idx) {
 	QDesktopWidget dw;
 
-	int width = INT_MAX, height = INT_MAX;
+	int w = INT_MAX, h = INT_MAX;
 
 
 	for (int i=0;i<dw.numScreens();++i) {
 		QRect ds=dw.availableGeometry(i);
 		if (ds.isValid()) {
-			width = qMin(width, ds.width());
-			height = qMin(height, ds.height());
+			w = qMin(w, ds.width());
+			h = qMin(h, ds.height());
 		}
 	}
 
@@ -151,7 +151,7 @@ void ConfigDialog::addPage(ConfigWidget *cw, unsigned int idx) {
 
 	ms.rwidth() += 128;
 	ms.rheight() += 192;
-	if ((ms.width() > width) || (ms.height() > height)) {
+	if ((ms.width() > w) || (ms.height() > h)) {
 		QScrollArea *qsa=new QScrollArea(this);
 		qsa->setWidgetResizable(true);
 		qsa->setWidget(cw);
diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp
index 4acf07ebb..af0c0690a 100644
--- a/src/mumble/PulseAudio.cpp
+++ b/src/mumble/PulseAudio.cpp
@@ -68,7 +68,7 @@ class PulseAudioInit : public DeferInit {
 			pasys = new PulseAudioSystem();
 			pasys->qmWait.lock();
 			pasys->start(QThread::TimeCriticalPriority);
-			pasys->qwcWait.wait(&pasys->qmWait);
+			pasys->qwcWait.wait(&pasys->qmWait, 1000);
 			if (pasys->bPulseIsGood) {
 				airPulseAudio = new PulseAudioInputRegistrar();
 				aorPulseAudio = new PulseAudioOutputRegistrar();