From: APTX <marek321@gmail.com>
Date: Sat, 14 Jul 2012 01:30:54 +0000 (+0200)
Subject: Use new prepare in all the methods that used prepare
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=7e64e5184fcbe26c956f8157969989bfa99e5bcd;p=localmylist.git

Use new prepare in all the methods that used prepare
---

diff --git a/localmylist/database.cpp b/localmylist/database.cpp
index d095f70..caebdd1 100644
--- a/localmylist/database.cpp
+++ b/localmylist/database.cpp
@@ -234,8 +234,7 @@ return false;
 
 OpenFileData Database::firstUnwatchedByTitle(const QString &title)
 {
-	QSqlQuery q(d->db);
-	q.prepare(
+	QSqlQuery &q = prepare(
 	"SELECT f.fid, a.title_romaji, e.title_english, e.epno, fl.path FROM file f "
 	"	LEFT JOIN anime a ON f.aid = a.aid "
 	"	LEFT JOIN anime_title at ON f.aid = at.aid "
@@ -266,8 +265,7 @@ OpenFileData Database::firstUnwatchedByTitle(const QString &title)
 
 OpenFileData Database::firstUnwatchedByAid(int aid)
 {
-	QSqlQuery q(d->db);
-	q.prepare(
+	QSqlQuery &q = prepare(
 	"SELECT f.fid, a.title_romaji, e.title_english, e.epno, fl.path FROM file f "
 	"	LEFT JOIN anime a ON f.aid = a.aid "
 	"	LEFT JOIN episode e ON f.eid = e.eid "
@@ -288,8 +286,7 @@ OpenFileData Database::openFileByTitle(const QString &title, int epno)
 	if (epno == 0)
 		return firstUnwatchedByTitle(title);
 
-	QSqlQuery q(d->db);
-	q.prepare(
+	QSqlQuery &q = prepare(
 	"SELECT f.fid, a.title_romaji, e.title_english, e.epno, fl.path FROM file f "
 	"	LEFT JOIN anime a ON f.aid = a.aid "
 	"	LEFT JOIN anime_title at ON f.aid = at.aid "
@@ -320,8 +317,7 @@ OpenFileData Database::openFileByTitle(const QString &title, int epno)
 
 OpenFileData Database::openFileByEid(int eid)
 {
-	QSqlQuery q(d->db);
-	q.prepare(
+	QSqlQuery &q = prepare(
 		"SELECT f.fid, a.title_romaji, e.title_english, e.epno, fl.path FROM file f "
 		"	LEFT JOIN anime a ON f.aid = a.aid "
 		"	LEFT JOIN episode e ON f.eid = e.eid "
@@ -338,8 +334,7 @@ OpenFileData Database::openFileByEid(int eid)
 
 OpenFileData Database::openFile(int fid)
 {
-	QSqlQuery q(d->db);
-	q.prepare(
+	QSqlQuery &q = prepare(
 		"SELECT f.fid, a.title_romaji, e.title_english, e.epno, fl.path FROM file f "
 		"	LEFT JOIN anime a ON f.aid = a.aid "
 		"	LEFT JOIN episode e ON f.eid = e.eid "
@@ -412,8 +407,7 @@ int Database::isKnownFile(const QByteArray &ed2k, qint64 size)
 
 bool Database::addFileLocation(const FileLocation &fileLocation)
 {
-	QSqlQuery q(d->db);
-	q.prepare("INSERT INTO file_location VALUES(:fid, :hostId, :path, DEFAULT, DEFAULT)");
+	QSqlQuery &q = prepare("INSERT INTO file_location VALUES(:fid, :hostId, :path, DEFAULT, DEFAULT)");
 	q.bindValue(":fid", fileLocation.fid);
 	q.bindValue(":hostId", fileLocation.hostId);
 	q.bindValue(":path", fileLocation.path);
@@ -423,8 +417,7 @@ bool Database::addFileLocation(const FileLocation &fileLocation)
 
 bool Database::setFileLocation(const FileLocation &fileLocation)
 {
-	QSqlQuery q(d->db);
-	q.prepare("UPDATE file_location SET host_id = :hostId, path = :path, renamed = :renamed, failed_rename = :failedRename WHERE fid = :fid");
+	QSqlQuery &q = prepare("UPDATE file_location SET host_id = :hostId, path = :path, renamed = :renamed, failed_rename = :failedRename WHERE fid = :fid");
 	q.bindValue(":fid", fileLocation.fid);
 	q.bindValue(":hostId", fileLocation.hostId);
 	q.bindValue(":path", fileLocation.path);
@@ -993,8 +986,7 @@ bool Database::clearPendingMyListUpdate(const PendingMyListUpdate &request)
 
 QStringList Database::getWatchedDirectories(int hostId)
 {
-	QSqlQuery q(d->db);
-	q.prepare("SELECT directory FROM watched_directory WHERE host_id = :hostId");
+	QSqlQuery &q = prepare("SELECT directory FROM watched_directory WHERE host_id = :hostId");
 	q.bindValue(":hostId", hostId);
 
 	if (!exec(q))