Updated list of search engines as proposed by Gregory Guy.

This resolves bug 1984.

2 files changed, 23 insertions, 25 deletions

diff --git a/plugins/search/searchenginelist.cpp b/plugins/search/searchenginelist.cpp
index a117f79..3381bf0 100644
--- a/plugins/search/searchenginelist.cpp
+++ b/plugins/search/searchenginelist.cpp
@@ -104,15 +104,18 @@ namespace kt
 		TQTextStream out(&fptr);
 		out << "# PLEASE DO NOT MODIFY THIS FILE. Use KTorrent configuration dialog for adding new search engines." << ::endl;
 		out << "# SEARCH ENGINES list" << ::endl;
-		out << "KTorrents http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0" << ::endl;
-		out << "bittorrent.com http://www.bittorrent.com/search_result.myt?search=FOOBAR" << ::endl; 
-		out << "isohunt.com http://isohunt.com/torrents.php?ihq=FOOBAR&op=and" << ::endl; 
-		out << "mininova.org http://www.mininova.org/search.php?search=FOOBAR" << ::endl; 
-		out << "thepiratebay.org http://thepiratebay.org/search.php?q=FOOBAR" << ::endl; 
-		out << "bitoogle.com http://bitoogle.com/search.php?q=FOOBAR" << ::endl; 
-		out << "bytenova.org http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8" << ::endl; 
-		out << "torrentspy.com http://torrentspy.com/search.asp?query=FOOBAR" << ::endl; 
-		out << "torrentz.com http://www.torrentz.com/search_FOOBAR" << ::endl; 
+		out << "isohunt.to http://isohunt.to/torrents/?ihq=FOOBAR"               << ::endl; 
+		out << "mininova.org http://www.mininova.org/search.php?search=FOOBAR"   << ::endl; 
+		out << "thepiratebay.se http://thepiratebay.se/search.php?q=FOOBAR"      << ::endl; 
+		out << "kickass.to http://kickass.to/usearch/FOOBAR"                        << ::endl;
+		out << "torrentfunk.com http://www.torrentfunk.com/all/torrents/FOOBAR.html" << ::endl;
+		out << "yourbittorrent.com http://yourbittorrent.com/?q=FOOBAR"              << ::endl;
+		out << "torlock.com http://www.torlock.com/all/torrents/FOOBAR.html"         << ::endl;
+		out << "torrentz.eu http://torrentz.eu/search?f=FOOBAR"                     << ::endl;
+		out << "torrentcrazy.com http://torrentcrazy.com/s/FOOBAR"                   << ::endl;
+		out << "bitsnoop.com http://bitsnoop.com/search/all/FOOBAR/c/d/1/"           << ::endl;
+		out << "torrents.net http://www.torrents.net/find/FOOBAR/"                   << ::endl;
+		out << "btmon.com http://www.btmon.com/torrent/?f=FOOBAR"                    << ::endl;
 	}
 		
 	KURL SearchEngineList::getSearchURL(bt::Uint32 engine) const
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index fdfb941..cc9e6d3 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -159,23 +159,18 @@ namespace kt
  
 	void SearchPrefPageWidget::addDefaultClicked()
 	{
-		TQListViewItem* se = new TQListViewItem(m_engines, "KTorrents", "http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0");
-		
-		se = new TQListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR");
-     
-		se = new TQListViewItem(m_engines, "isohunt.com", "http://isohunt.com/torrents.php?ihq=FOOBAR&op=and");
-     
+		TQListViewItem* se = new TQListViewItem(m_engines, "isohunt.to", "http://isohunt.to/torrents/?ihq=FOOBAR");    
 		se = new TQListViewItem(m_engines, "mininova.org", "http://www.mininova.org/search.php?search=FOOBAR");
-     
-		se = new TQListViewItem(m_engines, "thepiratebay.org", "http://thepiratebay.org/search.php?q=FOOBAR");
-     
-		se = new TQListViewItem(m_engines, "bitoogle.com", "http://bitoogle.com/search.php?q=FOOBAR");
-     
-		se = new TQListViewItem(m_engines, "bytenova.org", "http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8");
-     
-		se = new TQListViewItem(m_engines, "torrentspy.com", "http://torrentspy.com/search.asp?query=FOOBAR");
-
-		se = new TQListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/search_FOOBAR");
+		se = new TQListViewItem(m_engines, "thepiratebay.se", "http://thepiratebay.se/search.php?q=FOOBAR");
+		se = new TQListViewItem(m_engines, "kickass.to", "http://kickass.to/usearch/FOOBAR");
+		se = new TQListViewItem(m_engines, "torrentfunk.com", "http://www.torrentfunk.com/all/torrents/FOOBAR.html");     
+		se = new TQListViewItem(m_engines, "yourbittorrent.com", "http://yourbittorrent.com/?q=FOOBAR");
+		se = new TQListViewItem(m_engines, "torlock.com", "http://www.torlock.com/all/torrents/FOOBAR.html");
+		se = new TQListViewItem(m_engines, "torrentz.eu", "http://torrentz.eu/search?f=FOOBAR");
+		se = new TQListViewItem(m_engines, "torrentcrazy.com", "http://torrentcrazy.com/s/FOOBAR");
+		se = new TQListViewItem(m_engines, "bitsnoop.com", "http://bitsnoop.com/search/all/FOOBAR/c/d/1/");
+		se = new TQListViewItem(m_engines, "torrents.net", "http://www.torrents.net/find/FOOBAR/");
+		se = new TQListViewItem(m_engines, "btmon.com", "http://www.btmon.com/torrent/?f=FOOBAR");
 	}
  
 	void SearchPrefPageWidget::removeAllClicked()