Fix some gcc and cppcheck warnings

47 files changed, 128 insertions, 203 deletions

diff --git a/src/ACL.h b/src/ACL.h
index 300a794c9..9df29ca60 100644
--- a/src/ACL.h
+++ b/src/ACL.h
@@ -40,7 +40,7 @@ class ServerUser;
 class ChanACL : public QObject {
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(ChanACL);
+		Q_DISABLE_COPY(ChanACL)
 	public:
 		enum Perm {
 			None = 0x0,
diff --git a/src/Connection.h b/src/Connection.h
index f5e1ff875..5a6235cb9 100644
--- a/src/Connection.h
+++ b/src/Connection.h
@@ -84,7 +84,7 @@ class Connection : public QObject {
 #endif
 };
 
-Q_DECLARE_METATYPE(QAbstractSocket::SocketError);
+Q_DECLARE_METATYPE(QAbstractSocket::SocketError)
 
 #else
 class Connection;
diff --git a/src/bonjour/bonjourserviceresolver.cpp b/src/bonjour/bonjourserviceresolver.cpp
index 5ad3236b6..c92ba2c33 100644
--- a/src/bonjour/bonjourserviceresolver.cpp
+++ b/src/bonjour/bonjourserviceresolver.cpp
@@ -37,8 +37,7 @@ BonjourServiceResolver::ResolveRecord::ResolveRecord(const BonjourRecord &r, Bon
 }
 
 BonjourServiceResolver::ResolveRecord::~ResolveRecord() {
-	if (bonjourSocket)
-		delete bonjourSocket;
+	delete bonjourSocket;
 	if (dnssref)
 		DNSServiceRefDeallocate(dnssref);
 }
diff --git a/src/mumble/ALSAAudio.cpp b/src/mumble/ALSAAudio.cpp
index 9d7eddacb..997dd48be 100644
--- a/src/mumble/ALSAAudio.cpp
+++ b/src/mumble/ALSAAudio.cpp
@@ -94,12 +94,9 @@ void ALSAInit::initialize() {
 
 void ALSAInit::destroy() {
 	QMutexLocker qml(&qmALSA);
-	if (pairALSA)
-		delete pairALSA;
-	if (paorALSA)
-		delete paorALSA;
-	if (cards)
-		delete cards;
+	delete pairALSA;
+	delete paorALSA;
+	delete cards;
 }
 
 ALSAAudioInputRegistrar::ALSAAudioInputRegistrar() : AudioInputRegistrar(QLatin1String("ALSA"),5) {
@@ -541,8 +538,8 @@ void ALSAAudioOutput::run() {
 			ALSA_ERRCHECK(avail = snd_pcm_avail_update(pcm_handle));
 			while (avail >= static_cast<int>(period_size)) {
 				stillRun = mix(outbuff, static_cast<int>(period_size));
-				snd_pcm_sframes_t w = 0;
 				if (stillRun) {
+					snd_pcm_sframes_t w = 0;
 					ALSA_ERRCHECK(w=snd_pcm_writei(pcm_handle, outbuff, period_size));
 					if (w < 0) {
 						avail = w;
diff --git a/src/mumble/ASIOInput.cpp b/src/mumble/ASIOInput.cpp
index 628865d77..79c79a441 100644
--- a/src/mumble/ASIOInput.cpp
+++ b/src/mumble/ASIOInput.cpp
@@ -75,7 +75,6 @@ class ASIOInit : public DeferInit {
 void ASIOInit::initialize() {
 	HKEY hkDevs;
 	HKEY hk;
-	DWORD idx = 0;
 	WCHAR keyname[255];
 	DWORD keynamelen = 255;
 	FILETIME ft;
@@ -94,6 +93,7 @@ void ASIOInit::initialize() {
 	blacklist << QLatin1String("{232685c6-6548-49d8-846d-4141a3ef7560}"); // ASIO4ALL
 #endif
 	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\ASIO", 0, KEY_READ, &hkDevs) == ERROR_SUCCESS) {
+		DWORD idx = 0;
 		while (RegEnumKeyEx(hkDevs, idx++, keyname, &keynamelen, NULL, NULL, NULL, &ft)  == ERROR_SUCCESS) {
 			QString name=QString::fromUtf16(reinterpret_cast<ushort *>(keyname),keynamelen);
 			if (RegOpenKeyEx(hkDevs, keyname, 0, KEY_READ, &hk) == ERROR_SUCCESS) {
@@ -125,10 +125,8 @@ void ASIOInit::initialize() {
 }
 
 void ASIOInit::destroy() {
-	if (airASIO)
-		delete airASIO;
-	if (crASIO)
-		delete crASIO;
+	delete airASIO;
+	delete crASIO;
 }
 
 static class ASIOInit asioinit;
@@ -279,14 +277,12 @@ void ASIOConfig::on_qpbConfig_clicked() {
 	CLSID clsid;
 	IASIO *iasio;
 
-	bool ok = false;
-
 	CLSIDFromString(const_cast<wchar_t *>(reinterpret_cast<const wchar_t *>(qsCls.utf16())), &clsid);
 	if (CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, clsid, reinterpret_cast<void **>(&iasio)) == S_OK) {
 		SleepEx(10, false);
 		if (iasio->init(winId())) {
 			SleepEx(10, false);
-			ok = (iasio->controlPanel() == ASE_OK);
+			iasio->controlPanel();
 			SleepEx(10, false);
 		} else {
 			SleepEx(10, false);
@@ -531,14 +527,12 @@ ASIOInput::~ASIOInput() {
 		iasio->Release();
 		iasio = NULL;
 	}
-	if (abiInfo) {
-		delete [] abiInfo;
-		abiInfo = NULL;
-	}
-	if (aciInfo) {
-		delete [] aciInfo;
-		aciInfo = NULL;
-	}
+
+	delete [] abiInfo;
+	abiInfo = NULL;
+
+	delete [] aciInfo;
+	aciInfo = NULL;
 }
 
 void ASIOInput::run() {
diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp
index 4883036af..59421e666 100644
--- a/src/mumble/Audio.cpp
+++ b/src/mumble/Audio.cpp
@@ -271,10 +271,9 @@ void LoopUser::addFrame(const QByteArray &packet) {
 		return;
 	}
 
-	bool restart = (qtLastFetch.elapsed() > 100);
-
 	{
 		QMutexLocker l(&qmLock);
+		bool restart = (qtLastFetch.elapsed() > 100);
 
 		double time = qtTicker.elapsed();
 
diff --git a/src/mumble/Audio.h b/src/mumble/Audio.h
index 5631b19ab..705b17263 100644
--- a/src/mumble/Audio.h
+++ b/src/mumble/Audio.h
@@ -40,7 +40,7 @@ typedef QPair<QString,QVariant> audioDevice;
 
 class CELTCodec {
 	private:
-		Q_DISABLE_COPY(CELTCodec);
+		Q_DISABLE_COPY(CELTCodec)
 	protected:
 		const CELTMode *cmMode;
 		QString qsVersion;
diff --git a/src/mumble/AudioConfigDialog.cpp b/src/mumble/AudioConfigDialog.cpp
index 61575cfa0..5bd877732 100644
--- a/src/mumble/AudioConfigDialog.cpp
+++ b/src/mumble/AudioConfigDialog.cpp
@@ -55,17 +55,14 @@ void AudioInputDialog::showEvent(QShowEvent *) {
 }
 
 AudioInputDialog::AudioInputDialog(Settings &st) : ConfigWidget(st) {
-	QList<QString> keys;
-	QString key;
-
 	qtTick = new QTimer(this);
 	qtTick->setObjectName(QLatin1String("Tick"));
 
 	setupUi(this);
 
 	if (AudioInputRegistrar::qmNew) {
-		keys=AudioInputRegistrar::qmNew->keys();
-		foreach(key, keys) {
+		QList<QString> keys = AudioInputRegistrar::qmNew->keys();
+		foreach(QString key, keys) {
 			qcbSystem->addItem(key);
 		}
 	}
@@ -382,14 +379,11 @@ void AudioInputDialog::on_Tick_timeout() {
 }
 
 AudioOutputDialog::AudioOutputDialog(Settings &st) : ConfigWidget(st) {
-	QList<QString> keys;
-	QString key;
-
 	setupUi(this);
 
 	if (AudioOutputRegistrar::qmNew) {
-		keys=AudioOutputRegistrar::qmNew->keys();
-		foreach(key, keys) {
+		QList<QString> keys = AudioOutputRegistrar::qmNew->keys();
+		foreach(QString key, keys) {
 			qcbSystem->addItem(key);
 		}
 	}
diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
index 097cf6781..11f797369 100644
--- a/src/mumble/AudioInput.cpp
+++ b/src/mumble/AudioInput.cpp
@@ -203,15 +203,11 @@ AudioInput::~AudioInput() {
 
 	delete [] psMic;
 	delete [] psClean;
-	if (psSpeaker)
-		delete [] psSpeaker;
-
-	if (pfMicInput)
-		delete [] pfMicInput;
-	if (pfEchoInput)
-		delete [] pfEchoInput;
-	if (pfOutput)
-		delete [] pfOutput;
+	delete [] psSpeaker;
+
+	delete [] pfMicInput;
+	delete [] pfEchoInput;
+	delete [] pfOutput;
 }
 
 bool AudioInput::isTransmitting() const {
@@ -337,12 +333,9 @@ void AudioInput::initializeMixer() {
 		speex_resampler_destroy(srsMic);
 	if (srsEcho)
 		speex_resampler_destroy(srsEcho);
-	if (pfMicInput)
-		delete [] pfMicInput;
-	if (pfEchoInput)
-		delete [] pfEchoInput;
-	if (pfOutput)
-		delete [] pfOutput;
+	delete [] pfMicInput;
+	delete [] pfEchoInput;
+	delete [] pfOutput;
 
 	if (iMicFreq != iSampleRate)
 		srsMic = speex_resampler_init(1, iMicFreq, iSampleRate, 3, &err);
@@ -427,8 +420,7 @@ void AudioInput::addMic(const void *data, unsigned int nsamp) {
 				}
 
 				if (echo) {
-					if (psSpeaker)
-						delete [] psSpeaker;
+					delete [] psSpeaker;
 					psSpeaker = echo;
 				}
 			}
diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
index 97ed44540..9b843856a 100644
--- a/src/mumble/AudioOutput.cpp
+++ b/src/mumble/AudioOutput.cpp
@@ -101,10 +101,8 @@ AudioOutputUser::AudioOutputUser(const QString name) : qsName(name) {
 }
 
 AudioOutputUser::~AudioOutputUser() {
-	if (pfBuffer)
-		delete [] pfBuffer;
-	if (pfVolume)
-		delete [] pfVolume;
+	delete [] pfBuffer;
+	delete [] pfVolume;
 }
 
 void AudioOutputUser::resizeBuffer(unsigned int newsize) {
@@ -262,10 +260,8 @@ AudioOutputSample::~AudioOutputSample() {
 	if (srs)
 		speex_resampler_destroy(srs);
 
-	if (sfHandle) {
-		delete sfHandle;
-		sfHandle = NULL;
-	}
+	delete sfHandle;
+	sfHandle = NULL;
 }
 
 SoundFile* AudioOutputSample::loadSndfile(const QString &filename) {
@@ -722,12 +718,9 @@ AudioOutput::~AudioOutput() {
 	wait();
 	wipe();
 
-	if (fSpeakers)
-		delete [] fSpeakers;
-	if (fSpeakerVolume)
-		delete [] fSpeakerVolume;
-	if (bSpeakerPositional)
-		delete [] bSpeakerPositional;
+	delete [] fSpeakers;
+	delete [] fSpeakerVolume;
+	delete [] bSpeakerPositional;
 }
 
 // Here's the theory.
@@ -847,12 +840,9 @@ void AudioOutput::removeBuffer(AudioOutputUser *aop) {
 }
 
 void AudioOutput::initializeMixer(const unsigned int *chanmasks, bool forceheadphone) {
-	if (fSpeakers)
-		delete fSpeakers;
-	if (bSpeakerPositional)
-		delete bSpeakerPositional;
-	if (fSpeakerVolume)
-		delete fSpeakerVolume;
+	delete fSpeakers;
+	delete bSpeakerPositional;
+	delete fSpeakerVolume;
 
 	fSpeakers = new float[iChannels * 3];
 	bSpeakerPositional = new bool[iChannels];
diff --git a/src/mumble/AudioOutput.h b/src/mumble/AudioOutput.h
index 50bff85ed..61b29abf0 100644
--- a/src/mumble/AudioOutput.h
+++ b/src/mumble/AudioOutput.h
@@ -155,7 +155,7 @@ class AudioOutputSpeech : public AudioOutputUser {
 class SoundFile : public QObject {
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(SoundFile);
+		Q_DISABLE_COPY(SoundFile)
 	protected:
 		SNDFILE *sfFile;
 		SF_INFO siInfo;
diff --git a/src/mumble/BanEditor.h b/src/mumble/BanEditor.h
index 32071d913..ef54367ca 100644
--- a/src/mumble/BanEditor.h
+++ b/src/mumble/BanEditor.h
@@ -38,7 +38,7 @@
 
 class BanEditor : public QDialog, public Ui::BanEditor {
 	private:
-		Q_OBJECT;
+		Q_OBJECT
 		Q_DISABLE_COPY(BanEditor)
 	protected:
 		QList<Ban> qlBans;
diff --git a/src/mumble/BonjourClient.cpp b/src/mumble/BonjourClient.cpp
index 3caa90882..de1292fa9 100644
--- a/src/mumble/BonjourClient.cpp
+++ b/src/mumble/BonjourClient.cpp
@@ -48,8 +48,6 @@ BonjourClient::BonjourClient() {
 }
 
 BonjourClient::~BonjourClient() {
-	if (bsbBrowser)
-		delete bsbBrowser;
-	if (bsrResolver)
-		delete bsrResolver;
+	delete bsbBrowser;
+	delete bsrResolver;
 }
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp
index 0af0dcda6..91c4fc6da 100644
--- a/src/mumble/Cert.cpp
+++ b/src/mumble/Cert.cpp
@@ -528,7 +528,6 @@ QByteArray CertWizard::exportCert(const Settings::KeyPair &kp) {
 	BIO *mem = NULL;
 	STACK_OF(X509) *certs = sk_X509_new_null();
 	const unsigned char *p;
-	long size;
 	char *data = NULL;
 
 	if (kp.first.isEmpty())
@@ -578,6 +577,7 @@ QByteArray CertWizard::exportCert(const Settings::KeyPair &kp) {
 			pkcs = PKCS12_create(SSL_STRING(""), SSL_STRING("Mumble Identity"), pkey, x509, certs, nid, nid, 0, 0, 0);
 
 			if (pkcs) {
+				long size;
 				mem = BIO_new(BIO_s_mem());
 				i2d_PKCS12_bio(mem, pkcs);
 				BIO_flush(mem);
diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp
index 2fab607e6..1a83b5d1a 100644
--- a/src/mumble/ConnectDialog.cpp
+++ b/src/mumble/ConnectDialog.cpp
@@ -100,8 +100,7 @@ ServerView::ServerView(QWidget *p) : QTreeWidget(p) {
 
 ServerView::~ServerView() {
 	delete siFavorite;
-	if (siLAN)
-		delete siLAN;
+	delete siLAN;
 	delete siPublic;
 }
 
diff --git a/src/mumble/ConnectDialog.h b/src/mumble/ConnectDialog.h
index 9e99a1588..896473e4a 100644
--- a/src/mumble/ConnectDialog.h
+++ b/src/mumble/ConnectDialog.h
@@ -56,7 +56,7 @@ struct PublicInfo {
 
 struct PingStats {
 private:
-	Q_DISABLE_COPY(PingStats);
+	Q_DISABLE_COPY(PingStats)
 protected:
 	void init();
 public:
@@ -83,8 +83,8 @@ public:
 class ServerItem;
 
 class ServerView : public QTreeWidget {
-		Q_OBJECT;
-		Q_DISABLE_COPY(ServerView);
+		Q_OBJECT
+		Q_DISABLE_COPY(ServerView)
 	public:
 		ServerItem *siFavorite, *siLAN, *siPublic;
 		QMap<QString, QString> qmContinentNames;
@@ -108,7 +108,7 @@ class ServerView : public QTreeWidget {
 #include "ui_ConnectDialogEdit.h"
 
 class ServerItem : public QTreeWidgetItem, public PingStats {
-		Q_DISABLE_COPY(ServerItem);
+		Q_DISABLE_COPY(ServerItem)
 	protected:
 		void init();
 	public:
@@ -175,7 +175,7 @@ class ServerItem : public QTreeWidgetItem, public PingStats {
 class ConnectDialogEdit : public QDialog, protected Ui::ConnectDialogEdit {
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(ConnectDialogEdit);
+		Q_DISABLE_COPY(ConnectDialogEdit)
 	protected:
 		bool bOk;
 	public slots:
diff --git a/src/mumble/CoreAudio.cpp b/src/mumble/CoreAudio.cpp
index 69be56d52..4ca0d0b83 100644
--- a/src/mumble/CoreAudio.cpp
+++ b/src/mumble/CoreAudio.cpp
@@ -67,10 +67,8 @@ void CoreAudioInit::initialize() {
 }
 
 void CoreAudioInit::destroy() {
-	if (cairReg)
-		delete cairReg;
-	if (caorReg)
-		delete caorReg;
+	delete cairReg;
+	delete caorReg;
 }
 
 CFStringRef CoreAudioSystem::QStringToCFString(const QString &str) {
@@ -132,8 +130,7 @@ const QHash<QString, QString> CoreAudioSystem::getDevices(bool input) {
 		err = AudioDeviceGetProperty(devs[i], 0, input, kAudioDevicePropertyStreamConfiguration, &len, bufs);
 		if (! bufs || err != noErr) {
 			qWarning("CoreAudioSystem: Failed to get AudioStreamConfiguration from device.");
-			if (bufs)
-				free(bufs);
+			free(bufs);
 			continue;
 		}
 
diff --git a/src/mumble/CrashReporter.cpp b/src/mumble/CrashReporter.cpp
index 0ecf0778a..61f1442b7 100644
--- a/src/mumble/CrashReporter.cpp
+++ b/src/mumble/CrashReporter.cpp
@@ -82,8 +82,7 @@ CrashReporter::CrashReporter(QWidget *p) : QDialog(p) {
 
 CrashReporter::~CrashReporter() {
 	g.qs->setValue(QLatin1String("crashemail"), qleEmail->text());
-	if (qnrReply)
-		delete qnrReply;
+	delete qnrReply;
 }
 
 void CrashReporter::uploadFinished() {
diff --git a/src/mumble/DirectSound.cpp b/src/mumble/DirectSound.cpp
index 4ca6710d6..1780fadc0 100644
--- a/src/mumble/DirectSound.cpp
+++ b/src/mumble/DirectSound.cpp
@@ -102,10 +102,8 @@ void DirectSoundInit::initialize() {
 }
 
 void DirectSoundInit::destroy() {
-	if (airReg)
-		delete airReg;
-	if (aorReg)
-		delete aorReg;
+	delete airReg;
+	delete aorReg;
 }
 
 
diff --git a/src/mumble/FileEngine.h b/src/mumble/FileEngine.h
index f38a4b1ef..ec01b4c76 100644
--- a/src/mumble/FileEngine.h
+++ b/src/mumble/FileEngine.h
@@ -35,7 +35,7 @@
 
 class MumbleFileEngineHandler : public QAbstractFileEngineHandler {
 	private:
-		Q_DISABLE_COPY(MumbleFileEngineHandler);
+		Q_DISABLE_COPY(MumbleFileEngineHandler)
 	public:
 		MumbleFileEngineHandler();
 		QAbstractFileEngine *create(const QString &) const;
@@ -43,7 +43,7 @@ class MumbleFileEngineHandler : public QAbstractFileEngineHandler {
 
 class MumbleImageFileEngine : public QAbstractFileEngine {
 	private:
-		Q_DISABLE_COPY(MumbleImageFileEngine);
+		Q_DISABLE_COPY(MumbleImageFileEngine)
 	protected:
 		QBuffer qbData;
 		QUrl quUrl;
diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp
index 879923e74..c5445b92d 100644
--- a/src/mumble/Global.cpp
+++ b/src/mumble/Global.cpp
@@ -62,6 +62,10 @@ Global::Global() {
 	qs = NULL;
 
 	ocIntercept = NULL;
+	bc = NULL;
+	lcd = NULL;
+	o = NULL;
+	l = NULL;
 
 	bQuit = false;
 
diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp
index 4b0fddaf8..840ebbf3d 100644
--- a/src/mumble/GlobalShortcut.cpp
+++ b/src/mumble/GlobalShortcut.cpp
@@ -443,9 +443,7 @@ void ShortcutTargetDialog::on_qpbAdd_clicked() {
 
 void ShortcutTargetDialog::on_qpbRemove_clicked() {
 	QListWidgetItem *itm = qlwUsers->currentItem();
-	if (itm) {
-		delete itm;
-	}
+	delete itm;
 }
 
 ShortcutTargetWidget::ShortcutTargetWidget(QWidget *p) : QFrame(p) {
diff --git a/src/mumble/GlobalShortcut.h b/src/mumble/GlobalShortcut.h
index f30124630..b59a2ef0e 100644
--- a/src/mumble/GlobalShortcut.h
+++ b/src/mumble/GlobalShortcut.h
@@ -113,7 +113,7 @@ class ShortcutToggleWidget : public QComboBox {
 class ShortcutTargetDialog : public QDialog, public Ui::GlobalShortcutTarget {
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(ShortcutTargetDialog);
+		Q_DISABLE_COPY(ShortcutTargetDialog)
 	protected:
 		QMap<QString, QString> qmHashNames;
 		ShortcutTarget stTarget;
diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp
index b6bcb062a..03917d719 100644
--- a/src/mumble/GlobalShortcut_unix.cpp
+++ b/src/mumble/GlobalShortcut_unix.cpp
@@ -315,7 +315,7 @@ QString GlobalShortcutX::buttonName(const QVariant &v) {
 			return QLatin1String("0x")+QString::number(key,16);
 		} else {
 			const char *str=XKeysymToString(ks);
-			if (strlen(str) == 0) {
+			if (*str == '\0') {
 				return QLatin1String("KS0x")+QString::number(ks, 16);
 			} else {
 				return QLatin1String(str);
diff --git a/src/mumble/LCD.cpp b/src/mumble/LCD.cpp
index e2a030366..e17b3917e 100644
--- a/src/mumble/LCD.cpp
+++ b/src/mumble/LCD.cpp
@@ -90,8 +90,7 @@ void LCDDeviceManager::destroy() {
 	foreach(LCDEngine *e, qlEngines) {
 		delete e;
 	}
-	if (crLCD)
-		delete crLCD;
+	delete crLCD;
 }
 
 static LCDDeviceManager devmgr;
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index bc4f7c249..d6bd6fd65 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -1415,24 +1415,18 @@ void MainWindow::qmChannel_aboutToShow() {
 			qmChannel->addAction(a);
 	}
 
-	bool add, addtemp, remove, acl, rename, descUpdate, link, unlink, unlinkall, msg;
-	add = addtemp = remove = acl = rename = descUpdate = link = unlink = unlinkall = msg = false;
+	bool add, remove, acl, link, unlink, unlinkall, msg;
+	add = remove = acl = link = unlink = unlinkall = msg = false;
 
 	if (g.uiSession != 0) {
 		add = true;
-		addtemp = true;
 		acl = true;
 		msg = true;
-		descUpdate = true;
 
 		Channel *c = getContextMenuChannel();
 		Channel *home = ClientUser::get(g.uiSession)->cChannel;
 
-		if (c && c->bTemporary)
-			addtemp = false;
-
 		if (c && c->iId != 0) {
-			rename = true;
 			remove = true;
 		}
 		if (! c)
diff --git a/src/mumble/Overlay.cpp b/src/mumble/Overlay.cpp
index c1731a958..f185ea04d 100644
--- a/src/mumble/Overlay.cpp
+++ b/src/mumble/Overlay.cpp
@@ -222,6 +222,7 @@ void OverlayConfig::load(const Settings &r) {
 
 bool OverlayConfig::expert(bool expert) {
 #ifdef Q_OS_LINUX
+	Q_UNUSED(expert);
 	qgbExceptions->setVisible(false);
 #else
 	qgbExceptions->setVisible(expert);
@@ -1394,12 +1395,12 @@ void OverlayEditor::on_qsZoom_valueChanged(int zoom) {
 	oes.resync();
 }
 
-OverlayUser::OverlayUser(ClientUser *cu, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), cuUser(cu), uiSize(height), tsColor(Settings::Passive), os(osptr) {
+OverlayUser::OverlayUser(ClientUser *cu, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), os(osptr), uiSize(height), cuUser(cu), tsColor(Settings::Passive) {
 	setup();
 	updateLayout();
 }
 
-OverlayUser::OverlayUser(Settings::TalkState ts, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), cuUser(NULL), uiSize(height), tsColor(ts), os(osptr) {
+OverlayUser::OverlayUser(Settings::TalkState ts, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), os(osptr), uiSize(height), cuUser(NULL), tsColor(ts) {
 	qsChannelName = Overlay::tr("Channel");
 
 	setup();
@@ -1764,7 +1765,7 @@ QRectF OverlayGroup::boundingRect() const {
 }
 
 
-OverlayUserGroup::OverlayUserGroup(OverlaySettings *osptr) : OverlayGroup(), os(osptr), bShowExamples(false), qgeiHandle(NULL) {
+OverlayUserGroup::OverlayUserGroup(OverlaySettings *osptr) : OverlayGroup(), os(osptr), qgeiHandle(NULL), bShowExamples(false) {
 }
 
 OverlayUserGroup::~OverlayUserGroup() {
@@ -1780,10 +1781,8 @@ void OverlayUserGroup::reset() {
 		delete ou;
 	qmUsers.clear();
 
-	if (qgeiHandle) {
-		delete qgeiHandle;
-		qgeiHandle = NULL;
-	}
+	delete qgeiHandle;
+	qgeiHandle = NULL;
 }
 
 int OverlayUserGroup::type() const {
@@ -1821,7 +1820,7 @@ void OverlayUserGroup::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
 
 	QMenu *qmColumns = qm.addMenu(OverlayClient::tr("Columns"));
 	QAction *qaColumns[6];
-	for (int i=1;i<=5;++i) {
+	for (unsigned int i=1;i<=5;++i) {
 		qaColumns[i] = qmColumns->addAction(QString::number(i));
 		qaColumns[i]->setCheckable(true);
 		qaColumns[i]->setChecked(i == os->uiColumns);
@@ -1954,10 +1953,8 @@ void OverlayUserGroup::updateUsers() {
 			qgeiHandle->installSceneEventFilter(this);
 		}
 	} else {
-		if (qgeiHandle) {
-			delete qgeiHandle;
-			qgeiHandle = NULL;
-		}
+		delete qgeiHandle;
+		qgeiHandle = NULL;
 	}
 
 	ClientUser *self = ClientUser::get(g.uiSession);
@@ -2047,8 +2044,7 @@ void OverlayUserGroup::updateUsers() {
 
 void OverlayUserGroup::userDestroyed(QObject *obj) {
 	OverlayUser *ou = qmUsers.take(obj);
-	if (ou)
-		delete ou;
+	delete ou;
 }
 
 
@@ -2095,14 +2091,9 @@ OverlayClient::OverlayClient(QLocalSocket *socket, QObject *p) : QObject(p) {
 }
 
 OverlayClient::~OverlayClient() {
-	if (qgpiFPS)
-		delete qgpiFPS;
-
-	if (qgpiCursor)
-		delete qgpiCursor;
-
-	if (qgpiLogo)
-		delete qgpiLogo;
+	delete qgpiFPS;
+	delete qgpiCursor;
+	delete qgpiLogo;
 
 	qlsSocket->abort();
 
@@ -2380,8 +2371,7 @@ void OverlayClient::readyRead() {
 						uiHeight = omi->uiHeight;
 						qrLast = QRect();
 
-						if (smMem)
-							delete smMem;
+						delete smMem;
 
 						smMem = new SharedMemory2(this, uiWidth * uiHeight * 4);
 						if (! smMem->data()) {
@@ -2445,10 +2435,8 @@ void OverlayClient::reset() {
 	if (! uiWidth || ! uiHeight || ! smMem)
 		return;
 
-	if (qgpiLogo) {
-		delete qgpiLogo;
-		qgpiLogo = NULL;
-	}
+	delete qgpiLogo;
+	qgpiLogo = NULL;
 
 	ougUsers.reset();
 
@@ -2670,8 +2658,7 @@ Overlay::Overlay() : QObject() {
 
 Overlay::~Overlay() {
 	setActive(false);
-	if (d)
-		delete d;
+	delete d;
 
 	// Need to be deleted first, since destructor references lingering QLocalSockets
 	foreach(OverlayClient *oc, qlClients)
diff --git a/src/mumble/Overlay.h b/src/mumble/Overlay.h
index a58549bd2..4e36983e1 100644
--- a/src/mumble/Overlay.h
+++ b/src/mumble/Overlay.h
@@ -68,7 +68,7 @@ class OverlayGroup : public QGraphicsItem {
 
 class OverlayUser : public OverlayGroup {
 	private:
-		Q_DISABLE_COPY(OverlayUser);
+		Q_DISABLE_COPY(OverlayUser)
 	public:
 		enum { Type = UserType + 1 };
 	protected:
@@ -263,7 +263,7 @@ class OverlayConfig : public ConfigWidget, public Ui::OverlayConfig {
 
 class OverlayMouse : public QGraphicsPixmapItem {
 	private:
-		Q_DISABLE_COPY(OverlayMouse);
+		Q_DISABLE_COPY(OverlayMouse)
 	public:
 		bool contains(const QPointF &) const;
 		bool collidesWithPath(const QPainterPath &, Qt::ItemSelectionMode = Qt::IntersectsItemShape) const;
@@ -274,7 +274,7 @@ class OverlayClient : public QObject {
 		friend class Overlay;
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(OverlayClient);
+		Q_DISABLE_COPY(OverlayClient)
 	protected:
 		OverlayMsg omMsg;
 		QLocalSocket *qlsSocket;
@@ -326,7 +326,7 @@ class OverlayClient : public QObject {
 class OverlayPrivate : public QObject {
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(OverlayPrivate);
+		Q_DISABLE_COPY(OverlayPrivate)
 	public:
 		OverlayPrivate(QObject *p) : QObject(p) {};
 };
diff --git a/src/mumble/PAAudio.cpp b/src/mumble/PAAudio.cpp
index 189774b24..4560df761 100644
--- a/src/mumble/PAAudio.cpp
+++ b/src/mumble/PAAudio.cpp
@@ -79,10 +79,8 @@ void PAInit::initialize() {
 }
 
 void PAInit::destroy() {
-	if (pairReg)
-		delete pairReg;
-	if (paorReg)
-		delete paorReg;
+	delete pairReg;
+	delete paorReg;
 	if (bInit) {
 		PaError err = Pa_Terminate();
 		if (err != paNoError) {
diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp
index 8f83944c6..f5fec6099 100644
--- a/src/mumble/PulseAudio.cpp
+++ b/src/mumble/PulseAudio.cpp
@@ -80,14 +80,10 @@ class PulseAudioInit : public DeferInit {
 			}
 		};
 		void destroy() {
-			if (airPulseAudio)
-				delete airPulseAudio;
-			if (aorPulseAudio)
-				delete aorPulseAudio;
-			if (pasys) {
-				delete pasys;
-				pasys = NULL;
-			}
+			delete airPulseAudio;
+			delete aorPulseAudio;
+			delete pasys;
+			pasys = NULL;
 		};
 };
 
@@ -645,7 +641,7 @@ PulseAudioInput::PulseAudioInput() {
 	bRunning = true;
 	if (pasys)
 		pasys->wakeup_lock();
-};
+}
 
 PulseAudioInput::~PulseAudioInput() {
 	bRunning = false;
diff --git a/src/mumble/RichTextEditor.h b/src/mumble/RichTextEditor.h
index 746efc787..0a08c8eef 100644
--- a/src/mumble/RichTextEditor.h
+++ b/src/mumble/RichTextEditor.h
@@ -36,7 +36,7 @@
 class RichTextHtmlEdit : public QTextEdit {
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(RichTextHtmlEdit);
+		Q_DISABLE_COPY(RichTextHtmlEdit)
 	protected:
 		void insertFromMimeData(const QMimeData *source);
 	public:
diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h
index 5f87329e8..63abbbd5f 100644
--- a/src/mumble/ServerHandler.h
+++ b/src/mumble/ServerHandler.h
@@ -59,7 +59,6 @@ class ServerHandler : public QThread {
 		QString qsHostName;
 		QString qsUserName;
 		QString qsPassword;
-		QString qsDigest;
 		unsigned short usPort;
 		bool bUdp;
 		bool bStrong;
diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h
index 4326cbeb7..ece51c2fd 100644
--- a/src/mumble/Settings.h
+++ b/src/mumble/Settings.h
@@ -71,7 +71,7 @@ quint32 qHash(const QList<ShortcutTarget> &);
 
 QDataStream &operator<<(QDataStream &, const ShortcutTarget &);
 QDataStream &operator>>(QDataStream &, ShortcutTarget &);
-Q_DECLARE_METATYPE(ShortcutTarget);
+Q_DECLARE_METATYPE(ShortcutTarget)
 
 struct OverlaySettings {
 	enum OverlayShow { Talking, HomeChannel, LinkedChannels };
diff --git a/src/mumble/Tokens.h b/src/mumble/Tokens.h
index da6740146..d6bb5592c 100644
--- a/src/mumble/Tokens.h
+++ b/src/mumble/Tokens.h
@@ -36,7 +36,7 @@
 
 class Tokens : public QDialog, public Ui::Tokens {
 	private:
-		Q_OBJECT;
+		Q_OBJECT
 		Q_DISABLE_COPY(Tokens)
 	protected:
 		QByteArray qbaDigest;
diff --git a/src/mumble/UserEdit.h b/src/mumble/UserEdit.h
index b3d2a08cd..9fdeff636 100644
--- a/src/mumble/UserEdit.h
+++ b/src/mumble/UserEdit.h
@@ -37,7 +37,7 @@
 
 class UserEdit : public QDialog, public Ui::UserEdit {
 	private:
-		Q_OBJECT;
+		Q_OBJECT
 		Q_DISABLE_COPY(UserEdit)
 	protected:
 		QMap<int, QString> qmUsers;
diff --git a/src/mumble/UserModel.h b/src/mumble/UserModel.h
index 2351f810e..e5dc28547 100644
--- a/src/mumble/UserModel.h
+++ b/src/mumble/UserModel.h
@@ -41,7 +41,7 @@ struct ModelItem {
 	friend class UserModel;
 
 private:
-	Q_DISABLE_COPY(ModelItem);
+	Q_DISABLE_COPY(ModelItem)
 public:
 	Channel *cChan;
 	ClientUser *pUser;
diff --git a/src/mumble/UserView.h b/src/mumble/UserView.h
index e6934a2e6..006c011d3 100644
--- a/src/mumble/UserView.h
+++ b/src/mumble/UserView.h
@@ -49,7 +49,7 @@ class UserDelegate : public QStyledItemDelegate {
 class UserView : public QTreeView {
 	private:
 		Q_OBJECT
-		Q_DISABLE_COPY(UserView);
+		Q_DISABLE_COPY(UserView)
 	protected:
 		void mouseReleaseEvent(QMouseEvent *);
 		bool event(QEvent *);
diff --git a/src/mumble/WASAPI.cpp b/src/mumble/WASAPI.cpp
index e49aebe6d..5118429d3 100644
--- a/src/mumble/WASAPI.cpp
+++ b/src/mumble/WASAPI.cpp
@@ -101,10 +101,8 @@ void WASAPIInit::initialize() {
 }
 
 void WASAPIInit::destroy() {
-	if (wirReg)
-		delete wirReg;
-	if (worReg)
-		delete worReg;
+	delete wirReg;
+	delete worReg;
 }
 
 
@@ -596,11 +594,8 @@ cleanup:
 	if (hEvent != NULL)
 		CloseHandle(hEvent);
 
-	if (tbuff)
-		delete [] tbuff;
-
-	if (sbuff)
-		delete [] sbuff;
+	delete [] tbuff;
+	delete [] sbuff;
 }
 
 WASAPIOutput::WASAPIOutput() {
@@ -713,7 +708,6 @@ void WASAPIOutput::run() {
 	UINT32 bufferFrameCount;
 	REFERENCE_TIME def, min, latency, want;
 	UINT32 numFramesAvailable;
-	UINT32 packetLength = 0;
 	UINT32 wantLength;
 	HANDLE hEvent;
 	BYTE *pData;
@@ -886,7 +880,7 @@ void WASAPIOutput::run() {
 			if (FAILED(hr))
 				goto cleanup;
 
-			packetLength = bufferFrameCount - numFramesAvailable;
+			UINT32 packetLength = bufferFrameCount - numFramesAvailable;
 
 			if (lastspoke != (g.bAttenuateOthers || mixed)) {
 				lastspoke = g.bAttenuateOthers || mixed;
diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp
index 6abc42984..aeaf90c24 100644
--- a/src/mumble/mumble_pch.hpp
+++ b/src/mumble/mumble_pch.hpp
@@ -71,6 +71,11 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/bind.hpp>
 #ifdef Q_CC_GNU
+#undef BOOST_TYPEOF
+#undef BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP
+#undef BOOST_TYPEOF_REGISTER_TYPE
+#undef BOOST_TYPEOF_REGISTER_TEMPLATE
+
 #define BOOST_TYPEOF(expr) __typeof__(expr)
 #define BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP() "mumble_pch.hpp"
 #define BOOST_TYPEOF_REGISTER_TYPE(expr)
diff --git a/src/mumble/os_win.cpp b/src/mumble/os_win.cpp
index 816a1b805..2294ef146 100644
--- a/src/mumble/os_win.cpp
+++ b/src/mumble/os_win.cpp
@@ -199,11 +199,11 @@ void os_init() {
 #ifdef QT_NO_DEBUG
 #ifdef COMPAT_CLIENT
 	errno_t res = 0;
-	size_t reqSize, bSize;
+	size_t reqSize;
 	_wgetenv_s(&reqSize, NULL, 0, L"APPDATA");
 	if (reqSize > 0) {
 		reqSize += strlen("/Mumble/Console11x.txt");
-		bSize = reqSize;
+		size_t bSize = reqSize;
 
 		STACKVAR(wchar_t, buff, reqSize+1);
 
diff --git a/src/mumble/smallft.cpp b/src/mumble/smallft.cpp
index 6388074f6..2e5ee9ca5 100644
--- a/src/mumble/smallft.cpp
+++ b/src/mumble/smallft.cpp
@@ -1254,8 +1254,8 @@ void mumble_drft_init(drft_lookup *l,int n) {
 
 void mumble_drft_clear(drft_lookup *l) {
 	if (l) {
-		if (l->trigcache)free(l->trigcache);
-		if (l->splitcache)free(l->splitcache);
+		free(l->trigcache);
+		free(l->splitcache);
 		memset(l,0,sizeof(*l));
 	}
 }
diff --git a/src/murmur/BonjourServer.cpp b/src/murmur/BonjourServer.cpp
index da0f8e140..56294ba50 100644
--- a/src/murmur/BonjourServer.cpp
+++ b/src/murmur/BonjourServer.cpp
@@ -48,6 +48,5 @@ BonjourServer::BonjourServer() {
 }
 
 BonjourServer::~BonjourServer() {
-	if (bsrRegister)
-		delete bsrRegister;
+	delete bsrRegister;
 }
diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp
index 58f82ca3d..ebcbd572c 100644
--- a/src/murmur/Meta.cpp
+++ b/src/murmur/Meta.cpp
@@ -79,8 +79,7 @@ MetaParams::MetaParams() {
 }
 
 MetaParams::~MetaParams() {
-	if (qsSettings)
-		delete qsSettings;
+	delete qsSettings;
 }
 
 void MetaParams::read(QString fname) {
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index 725ea3646..a0cae471f 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -58,8 +58,7 @@ void IceStart() {
 }
 
 void IceStop() {
-	if (mi)
-		delete mi;
+	delete mi;
 	mi = NULL;
 }
 
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 4f6d8afdd..e80eee27d 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -1418,8 +1418,7 @@ void Server::clearACLCache(User *p) {
 
 		if (p) {
 			ChanACL::ChanCache *h = acCache.take(p);
-			if (h)
-				delete h;
+			delete h;
 
 			flushClientPermissionCache(static_cast<ServerUser *>(p), mppq);
 		} else {
diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
index 76ac78865..6933a2f15 100644
--- a/src/murmur/ServerDB.cpp
+++ b/src/murmur/ServerDB.cpp
@@ -69,8 +69,6 @@ ServerDB::ServerDB() {
 		qFatal("ServerDB: Database driver %s not available", qPrintable(Meta::mp.qsDBDriver));
 	}
 	db = new QSqlDatabase(QSqlDatabase::addDatabase(Meta::mp.qsDBDriver));
-	QStringList datapaths;
-	int i;
 
 	bool found = false;
 
@@ -79,6 +77,9 @@ ServerDB::ServerDB() {
 			db->setDatabaseName(Meta::mp.qsDatabase);
 			found = db->open();
 		} else {
+			QStringList datapaths;
+			int i;
+
 			datapaths << Meta::mp.qdBasePath.absolutePath();
 			datapaths << QDir::currentPath();
 			datapaths << QCoreApplication::instance()->applicationDirPath();
diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp
index 7898d7b35..4e1b20144 100644
--- a/src/murmur/main.cpp
+++ b/src/murmur/main.cpp
@@ -435,10 +435,8 @@ int main(int argc, char **argv) {
 	IceStop();
 #endif
 
-	if (qfLog) {
-		delete qfLog;
-		qfLog = NULL;
-	}
+	delete qfLog;
+	qfLog = NULL;
 
 	delete meta;