summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2009-08-30 08:25:44 (GMT)
committerKevin Smith <git@kismith.co.uk>2009-08-30 08:25:44 (GMT)
commit749ac4ce99dd67ddff8a553af6569d2dce6e68b4 (patch)
treede1a06d831dfeacac00373950c13f2d34b494059
parent509c20d24b59e09e7aeb5045abebad8a370bb3ba (diff)
downloadswift-contrib-749ac4ce99dd67ddff8a553af6569d2dce6e68b4.zip
swift-contrib-749ac4ce99dd67ddff8a553af6569d2dce6e68b4.tar.bz2
Parenthesising expressions to get rid of warnings.
-rw-r--r--Swift/QtUI/QtChatTabs.cpp2
-rw-r--r--Swift/QtUI/QtRosterHeader.cpp2
2 files changed, 2 insertions, 2 deletions
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 {