From 749ac4ce99dd67ddff8a553af6569d2dce6e68b4 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Sun, 30 Aug 2009 09:25:44 +0100
Subject: Parenthesising expressions to get rid of warnings.


diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index e79b2ef..e73ddab 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -57,7 +57,7 @@ void QtChatTabs::handleWantsToActivate() {
 	Q_ASSERT(widget);
 	Q_ASSERT(tabs_->indexOf(widget) >= 0);
 	//Un-minimize and bring to front.
-	setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+	setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
 	tabs_->setCurrentWidget(widget);
 }
 
diff --git a/Swift/QtUI/QtRosterHeader.cpp b/Swift/QtUI/QtRosterHeader.cpp
index 2a01868..b8463b7 100644
--- a/Swift/QtUI/QtRosterHeader.cpp
+++ b/Swift/QtUI/QtRosterHeader.cpp
@@ -53,7 +53,7 @@ QtRosterHeader::QtRosterHeader(QWidget* parent) : QWidget(parent) {
 }
 
 void QtRosterHeader::mousePressEvent(QMouseEvent* event) {
-	if (nameLabel_->underMouse() || toolBar_->underMouse() && !statusWidget_->underMouse()) {
+	if (nameLabel_->underMouse() || (toolBar_->underMouse() && !statusWidget_->underMouse())) {
 		toggleExpanded();
 		event->accept();
 	} else {
-- 
cgit v0.10.2-6-g49f6