[Basket-devel] [PATCH] LinkContent: Ported QHttp/KUrl calls.

[Kelvie W. <ke...@ie...>]

---
 src/notecontent.cpp |   10 +++++-----
 src/notecontent.h   |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index a219650..3525b77 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -1308,7 +1308,7 @@ void LinkContent::removePreview(const KFileItem*)
 }
 
 // QHttp slots for getting link title
-void LinkContent::httpReadyRead(const Q3HttpResponseHeader& )
+void LinkContent::httpReadyRead()
 {
 	Q_ULONG bytesAvailable = m_http->bytesAvailable();
 	if(bytesAvailable <= 0)
@@ -1370,13 +1370,13 @@ void LinkContent::startFetchingLinkTitle()
 			m_http = 0;
 		}
 		if(m_http == 0) {
-			m_http = new Q3Http(this);
+			m_http = new QHttp(this);
 			connect(m_http, SIGNAL(done(bool)), this, SLOT(httpDone(bool)));
-			connect(m_http, SIGNAL(readyRead(const Q3HttpResponseHeader&)), this,
-					SLOT(httpReadyRead(const Q3HttpResponseHeader&)));
+			connect(m_http, SIGNAL(readyRead(QHttpResponseHeader)), this,
+					SLOT(httpReadyRead()));
 		}
 		m_http->setHost(this->url().host(), this->url().port() == 0 ? 80: this->url().port());
-		QString path = this->url().encodedPathAndQuery(1);
+		QString path = this->url().encodedPathAndQuery(KUrl::AddTrailingSlash);
 		if(path == "")
 			path = "/";
 		//kDebug()  <<  "path: " << path;
diff --git a/src/notecontent.h b/src/notecontent.h
index d74c05e..96e447a 100644
--- a/src/notecontent.h
+++ b/src/notecontent.h
@@ -28,7 +28,7 @@
 #include <qmovie.h>
 #include <qcolor.h>
 #include <kurl.h>
-#include <q3http.h>
+#include <QHttp>
 
 #include "linklabel.h"
 
@@ -463,12 +463,12 @@ class LinkContent : public QObject, public NoteContent
 	bool        m_autoTitle;
 	bool        m_autoIcon;
 	LinkDisplay m_linkDisplay;
-	Q3Http*      m_http;
+	QHttp*      m_http;
 	QString*    m_httpBuff;
 	// File Preview Management:
   protected slots:
 	void httpDone(bool err);
-	void httpReadyRead(const Q3HttpResponseHeader& resp);
+	void httpReadyRead();
 	void newPreview(const KFileItem*, const QPixmap &preview);
 	void removePreview(const KFileItem*);
 	void startFetchingUrlPreview();
-- 
1.5.5.GIT