From 8547a313c339d4b39f22d6c8066cd57b5d0f6863 Mon Sep 17 00:00:00 2001 From: Torste Aikio Date: Tue, 22 Jun 2010 09:42:06 +0300 Subject: [PATCH] Normalized URLs --- src/advsettingsdlg.cpp | 4 +--- src/remote.cpp | 7 ++++--- src/remotedbmgr.cpp | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp index 3549f74..3ce0800 100644 --- a/src/advsettingsdlg.cpp +++ b/src/advsettingsdlg.cpp @@ -79,13 +79,11 @@ void AdvSettingsDlg::setDefaults() settings->setValue("cmd3", "CHDOWN"); settings->setValue("cmd4", "POWER"); settings->setValue("cmd5", "MUTE"); - settings->setValue("remoteUrl", - "http://mercury.wipsl.com/irwi/remotes/"); settings->setValue("bgAlpha", 192); settings->setValue("height", 147); settings->setValue("width", 250); settings->setValue("idleTimeout", 300); - settings->setValue("dbUrl", "http://mercury.wipsl.com/irwi/db/db.xml"); + settings->setValue("baseUrl", "http://mercury.wipsl.com/irwi/"); } void AdvSettingsDlg::showResetQuery() diff --git a/src/remote.cpp b/src/remote.cpp index a3e66b5..6f291ab 100644 --- a/src/remote.cpp +++ b/src/remote.cpp @@ -71,8 +71,9 @@ void Remote::saveToFile() this, SLOT(remoteDownloadFinished(QNetworkReply*))); } QSettings settings(this); - QString url = settings.value("remoteUrl", - "http://mercury.wipsl.com/irwi/uploaded/").toString() + QString url = settings.value("baseUrl", + "http://mercury.wipsl.com/irwi/").toString() + + "uploaded/" + m_name; m_remoteNAM->get(QNetworkRequest(QUrl(url))); settings.setValue("remoteName", m_name); @@ -105,7 +106,7 @@ void Remote::sendRating(Rating::Rating r) QSettings settings(this); m_ratingNAM->get(QNetworkRequest(QUrl( settings.value("baseUrl", - "http://mercury.wipsl.com/irwi/db.xml").toString() + "http://mercury.wipsl.com/irwi/").toString() + "vote/" + ((r == Rating::Up) ? "up" : "down") + "?name=" diff --git a/src/remotedbmgr.cpp b/src/remotedbmgr.cpp index 89043a9..67a6d4c 100644 --- a/src/remotedbmgr.cpp +++ b/src/remotedbmgr.cpp @@ -29,8 +29,8 @@ void RemoteDBMgr::getDBAsync() { if (db.isEmpty()) { QSettings settings(this); - netAM.get(QNetworkRequest(QUrl(settings.value("dbUrl", - "http://mercury.wipsl.com/irwi/db/db.xml").toString()))); + netAM.get(QNetworkRequest(QUrl(settings.value("baseUrl", + "http://mercury.wipsl.com/irwi/").toString() + "db/db.xml"))); } else { emit dbReady(&db); } -- 1.7.9.5