From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 18 Dec 2008 23:47:37 +0000 (+0100)
Subject: Meh, apparently MSVC doesn't accept 'or' in preprocessor defines either :P
X-Git-Tag: 0.4.0~363
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a7a8099ce2a9d8d25f963a8d297db498ecbc26a5;ds=sidebyside

Meh, apparently MSVC doesn't accept 'or' in preprocessor defines either :P
---

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 5e3f7263..eadf8f77 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -73,7 +73,7 @@ void BufferView::init() {
   sortByColumn(0, Qt::AscendingOrder);
 
   // activated() fails on X11 and Qtopia at least
-#if defined Q_WS_QWS or defined Q_WS_X11
+#if defined Q_WS_QWS || defined Q_WS_X11
   connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex)));
 #else
   // afaik this is better on Mac and Windows
diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index ad13a2fb..e0a5893b 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -50,7 +50,7 @@ NickView::NickView(QWidget *parent)
 
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(showContextMenu(const QPoint&)));
 
-#if defined Q_WS_QWS or defined Q_WS_X11
+#if defined Q_WS_QWS || defined Q_WS_X11
   connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex)));
 #else
   // afaik this is better on Mac and Windows