1 files changed, 11 insertions, 8 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index 81820a3..2536d39 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -41,7 +41,7 @@ QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent, bool disableAutoScro
 	connect(webView_, SIGNAL(clearRequested()), SLOT(handleClearRequested()));
 	connect(webView_, SIGNAL(fontGrowRequested()), SLOT(increaseFontSize()));
 	connect(webView_, SIGNAL(fontShrinkRequested()), SLOT(decreaseFontSize()));
-#ifdef Q_WS_X11
+#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC)
 	/* To give a border on Linux, where it looks bad without */
 	QStackedWidget* stack = new QStackedWidget(this);
 	stack->addWidget(webView_);
@@ -128,7 +128,7 @@ void QtChatView::addMessageTop(boost::shared_ptr<ChatSnippet> snippet) {
 		double size = 1.0 + 0.2 * fontSizeSteps_;
 		QString sizeString(QString().setNum(size, 'g', 3) + "em");
 		const QWebElementCollection spans = firstElement_.findAll("span.swift_resizable");
-		foreach (QWebElement span, spans) {
+		Q_FOREACH (QWebElement span, spans) {
 			span.setStyleProperty("font-size", sizeString);
 		}
 	}
@@ -142,6 +142,7 @@ QWebElement QtChatView::snippetToDOM(boost::shared_ptr<ChatSnippet> snippet) {
 }
 
 void QtChatView::addToDOM(boost::shared_ptr<ChatSnippet> snippet) {
+	//qDebug() << snippet->getContent();
 	rememberScrolledToBottom();
 	bool insert = snippet->getAppendToPrevious();
 	QWebElement continuationElement = lastElement_.findFirst("#insert");
@@ -160,10 +161,12 @@ void QtChatView::addToDOM(boost::shared_ptr<ChatSnippet> snippet) {
 		double size = 1.0 + 0.2 * fontSizeSteps_;
 		QString sizeString(QString().setNum(size, 'g', 3) + "em");
 		const QWebElementCollection spans = lastElement_.findAll("span.swift_resizable");
-		foreach (QWebElement span, spans) {
+		Q_FOREACH (QWebElement span, spans) {
 			span.setStyleProperty("font-size", sizeString);
 		}
 	}
+	//qDebug() << "-----------------";
+	//qDebug() << webPage_->mainFrame()->toHtml();
 }
 
 void QtChatView::addLastSeenLine() {
@@ -226,13 +229,13 @@ void QtChatView::replaceMessage(const QString& newMessage, const QString& id, co
 void QtChatView::showEmoticons(bool show) {
 	{
 		const QWebElementCollection spans = document_.findAll("span.swift_emoticon_image");
-		foreach (QWebElement span, spans) {
+		Q_FOREACH (QWebElement span, spans) {
 			span.setStyleProperty("display", show ? "inline" : "none");
 		}
 	}
 	{
 		const QWebElementCollection spans = document_.findAll("span.swift_emoticon_text");
-		foreach (QWebElement span, spans) {
+		Q_FOREACH (QWebElement span, spans) {
 			span.setStyleProperty("display", show ? "none" : "inline");
 		}
 	}
@@ -321,7 +324,7 @@ void QtChatView::resizeFont(int fontSizeSteps) {
 	QString sizeString(QString().setNum(size, 'g', 3) + "em");
 	//qDebug() << "Setting to " << sizeString;
 	const QWebElementCollection spans = document_.findAll("span.swift_resizable");
-	foreach (QWebElement span, spans) {
+	Q_FOREACH (QWebElement span, spans) {
 		span.setStyleProperty("font-size", sizeString);
 	}
 	webView_->setFontSizeIsMinimal(size == 1.0);
@@ -365,9 +368,9 @@ void QtChatView::resetView() {
 	connect(webPage_->mainFrame(), SIGNAL(contentsSizeChanged(const QSize&)), this, SLOT(handleFrameSizeChanged()), Qt::UniqueConnection);
 }
 
-QWebElement findElementWithID(QWebElement document, QString elementName, QString id) {
+static QWebElement findElementWithID(QWebElement document, QString elementName, QString id) {
 	QWebElementCollection elements = document.findAll(elementName);
-	foreach(QWebElement element, elements) {
+	Q_FOREACH(QWebElement element, elements) {
 		if (element.attribute("id") == id) {
 			return element;
 		}