--- infoscreen/MyWebView.cpp 2010/01/07 19:42:12 534 +++ infoscreen/MyWebView.cpp 2010/01/08 09:20:37 535 @@ -20,9 +20,9 @@ } -void MyWebView::start() { +void MyWebView::start(QString url, QString screenid) { try { - this->load( QUrl( generateUrl() ) ); + this->load( QUrl( generateUrl(url, screenid) ) ); } catch (std::exception& e) { showError(e.what() ); } @@ -35,7 +35,7 @@ this->setHtml( str ); } -QString MyWebView::generateUrl() { +QString MyWebView::generateUrl(QString url, QString screenid) { QDesktopWidget* desktop = QApplication::desktop(); QRect rect = desktop->screenGeometry(); @@ -45,12 +45,6 @@ height.setNum( rect.height() ); - QSettings settings("Caddi", "infoscreen"); - qDebug() << "Settings: " << settings.fileName(); - - QString url = settings.value("url").toString(); - QString screenid = settings.value("screenid").toString(); - if (url.length() == 0) { throw std::runtime_error("No url in config file"); }