diff --git a/examples/ktcli/ktcli.cpp b/examples/ktcli/ktcli.cpp
--- a/examples/ktcli/ktcli.cpp
+++ b/examples/ktcli/ktcli.cpp
@@ -173,7 +173,7 @@
 {
 	try
 	{
-        tc->init(this, bt::LoadFile(path + "/torrent"), path, QString::null);
+        tc->init(this, bt::LoadFile(path + "/torrent"), path, QString());
 		tc->createFiles();
 		return true;
 	}
diff --git a/src/dht/kbucket.cpp b/src/dht/kbucket.cpp
--- a/src/dht/kbucket.cpp
+++ b/src/dht/kbucket.cpp
@@ -105,7 +105,7 @@
 
 	bool KBucket::insert(const KBucketEntry & entry)
 	{
-		QList<KBucketEntry>::iterator i = qFind(entries.begin(), entries.end(), entry);
+		QList<KBucketEntry>::iterator i = std::find(entries.begin(), entries.end(), entry);
 
 		// If in the list, move it to the end
 		if (i != entries.end())
diff --git a/src/diskio/deletedatafilesjob.cpp b/src/diskio/deletedatafilesjob.cpp
--- a/src/diskio/deletedatafilesjob.cpp
+++ b/src/diskio/deletedatafilesjob.cpp
@@ -67,7 +67,7 @@
 			return;
 		
 		if (active_job->error())
-			active_job->ui()->showErrorMessage();
+			active_job->uiDelegate()->showErrorMessage();
 		active_job = 0;
 		
 		if (directory_tree)
diff --git a/src/diskio/movedatafilesjob.h b/src/diskio/movedatafilesjob.h
--- a/src/diskio/movedatafilesjob.h
+++ b/src/diskio/movedatafilesjob.h
@@ -59,7 +59,6 @@
 		
 	private Q_SLOTS:
 		void onJobDone(KJob* j);
-		void onCanceled(KJob* j);
 		void onRecoveryJobDone(KJob* j);
 		void onTransferred(KJob *job, KJob::Unit unit, qulonglong amount);
 		void onSpeed(KJob* job, unsigned long speed);
diff --git a/src/diskio/movedatafilesjob.cpp b/src/diskio/movedatafilesjob.cpp
--- a/src/diskio/movedatafilesjob.cpp
+++ b/src/diskio/movedatafilesjob.cpp
@@ -98,7 +98,7 @@
 			
 			active_job = 0;
 			if (j->error())
-				((KIO::Job*)j)->ui()->showErrorMessage();
+				((KIO::Job*)j)->uiDelegate()->showErrorMessage();
 	
 			// shit happened cancel all previous moves
 			err = true;
@@ -115,15 +115,6 @@
 		}
 	}
 	
-	void MoveDataFilesJob::onCanceled(KJob* j)
-	{
-		Q_UNUSED(j);
-		setError(KIO::ERR_USER_CANCELED);
-		active_job = 0;
-		err = true;
-		recover(true);
-	}
-	
 	void MoveDataFilesJob::start()
 	{
 		registerWithTracker();
@@ -171,7 +162,6 @@
 		active_dst = i.value();
 		Out(SYS_GEN|LOG_DEBUG) << "Moving " << active_src << " -> " << active_dst << endl;
 		connect(active_job, &KIO::Job::result, this, &MoveDataFilesJob::onJobDone);
-		connect(active_job, &KIO::Job::canceled, this, &MoveDataFilesJob::onCanceled);
 		connect(active_job,SIGNAL(processedAmount(KJob*,KJob::Unit,qulonglong)),
 				this,SLOT(onTransferred(KJob*,KJob::Unit,qulonglong)));
 		connect(active_job,SIGNAL(speed(KJob*,ulong)),
diff --git a/src/diskio/singlefilecache.cpp b/src/diskio/singlefilecache.cpp
--- a/src/diskio/singlefilecache.cpp
+++ b/src/diskio/singlefilecache.cpp
@@ -49,7 +49,7 @@
 		cache_file = tmpdir + "cache";
 		QFileInfo fi(cache_file);
 		if(fi.isSymLink())  // old style symlink
-			output_file = fi.readLink();
+			output_file = fi.symLinkTarget();
 		else
 			output_file = datadir + tor.getNameSuggestion();
 	}
diff --git a/src/net/portlist.cpp b/src/net/portlist.cpp
--- a/src/net/portlist.cpp
+++ b/src/net/portlist.cpp
@@ -59,7 +59,7 @@
 		
 	void PortList::removePort(bt::Uint16 number,Protocol proto)
 	{
-		PortList::iterator itr = qFind(begin(),end(),Port(number,proto,false));
+		PortList::iterator itr = std::find(begin(),end(),Port(number,proto,false));
 		if (itr == end())
 			return;