From 544e2f3f2e15489fc7acb839420c5cd0a91ce4ad Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Fri, 4 Mar 2011 15:40:45 +0100
Subject: [PATCH] Windows compiling fixes

---
 src/downloads/downloadmanager.cpp | 2 +-
 src/downloads/downloadmanager.h   | 2 ++
 src/navigation/websearchbar.cpp   | 2 +-
 src/webview/searchtoolbar.cpp     | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/downloads/downloadmanager.cpp b/src/downloads/downloadmanager.cpp
index 3f2ec978d..2701d710e 100644
--- a/src/downloads/downloadmanager.cpp
+++ b/src/downloads/downloadmanager.cpp
@@ -176,7 +176,7 @@ void DownloadManager::handleUnsupportedContent(QNetworkReply *reply)
     QPixmap fileIcon = m_iconProvider->icon(tempInfo).pixmap(30,30);
 
     QListWidgetItem* item = new QListWidgetItem(ui->list);
-    DownloadItem* downItem = new DownloadItem(item, reply, path, fileName, fileIcon);
+    DownloadItem* downItem = new DownloadItem(item, reply, path, fileName, fileIcon, this);
     connect(downItem, SIGNAL(deleteItem(DownloadItem*)), this, SLOT(deleteItem(DownloadItem*)));
     ui->list->setItemWidget(item, downItem);
     item->setSizeHint(downItem->sizeHint());
diff --git a/src/downloads/downloadmanager.h b/src/downloads/downloadmanager.h
index 40e2a8eb6..3e2691cbe 100644
--- a/src/downloads/downloadmanager.h
+++ b/src/downloads/downloadmanager.h
@@ -40,6 +40,8 @@
 #include <QTimer>
 #include <QNetworkReply>
 
+#include "ecwin7.h"
+
 namespace Ui {
     class DownloadManager;
 }
diff --git a/src/navigation/websearchbar.cpp b/src/navigation/websearchbar.cpp
index acba701c9..8c82f74f8 100644
--- a/src/navigation/websearchbar.cpp
+++ b/src/navigation/websearchbar.cpp
@@ -50,7 +50,7 @@ WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget *parent)
 
     setStyleSheet("QLineEdit { background: transparent; border-image: url(:/icons/locationbar/lineedit.png) ;border-width:4;color:black;}");
 
-    setLeftMargin(33);
+    setLeftMargin(30);
     setWidgetSpacing(0);
 }
 
diff --git a/src/webview/searchtoolbar.cpp b/src/webview/searchtoolbar.cpp
index 632ff9c1c..b752f3979 100644
--- a/src/webview/searchtoolbar.cpp
+++ b/src/webview/searchtoolbar.cpp
@@ -39,7 +39,7 @@ SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget *parent) :
 #ifdef Q_WS_X11
     m_closeButton->setIcon(QIcon(style()->standardIcon(QStyle::SP_DialogCloseButton).pixmap(16,16)));
 #else
-    closeButton->setIcon(QIcon(QIcon(":/icons/faenza/close.png").pixmap(16,16)));
+    m_closeButton->setIcon(QIcon(QIcon(":/icons/faenza/close.png").pixmap(16,16)));
 #endif
     connect(m_closeButton, SIGNAL(triggered()), this, SLOT(hideBar()));
 
@@ -51,7 +51,7 @@ SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget *parent) :
 #ifdef Q_WS_X11
     m_nextButton->setIcon(style()->standardIcon(QStyle::SP_ArrowForward));
 #else
-    nextButton->setIcon(QIcon(":/icons/faenza/forward.png"));
+    m_nextButton->setIcon(QIcon(":/icons/faenza/forward.png"));
 #endif
 
     connect(m_nextButton, SIGNAL(triggered()), this, SLOT(findNext()));
@@ -60,7 +60,7 @@ SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget *parent) :
 #ifdef Q_WS_X11
     m_previousButton->setIcon(style()->standardIcon(QStyle::SP_ArrowBack));
 #else
-    previousButton->setIcon(QIcon(":/icons/faenza/back.png"));
+    m_previousButton->setIcon(QIcon(":/icons/faenza/back.png"));
 #endif
     connect(m_previousButton, SIGNAL(triggered()), this, SLOT(findPrevious()));