URL loading from cmdline or config file or default, depending where an URL can be found.

1 files changed, 46 insertions, 45 deletions

diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 527ef65..313bc64 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -7,47 +7,7 @@
 #include <QFileInfo>
 #include <QNetworkInterface>
 #include <QtWebKit>
-// -------------------------------------------------------------------------------------------
-void fbbrowser::forwardDownloadRequest(QString& filename)
-{
-	// Forge URL for filename from baseUrl
-	QUrl fileUrl;
-	fileUrl = baseUrl.resolved(QUrl(filename));
-	emit downloadFile(fileUrl);
-}
-// -------------------------------------------------------------------------------------------
-void fbbrowser::forwardUpdateProgress(int progress)
-{
-	emit updateProgress(progress);
-}
-// -------------------------------------------------------------------------------------------
-void fbbrowser::getMAC()
-{
-	QNetworkInterface *qNetI = new QNetworkInterface();
-	QList<QNetworkInterface> list;
-   	list=qNetI->allInterfaces();
-    QString str;
-	QString macAddress;
-	for (int i = 0; i < list.size(); ++i) {
-  		str = list.at(i).name();
-		macAddress = list.at(i).hardwareAddress();
-		qDebug() << str;
-		qDebug() << macAddress;
-	}
-	emit printMAC(macAddress);
-}
-// -------------------------------------------------------------------------------------------
-void fbbrowser::getTime()
-{
-	qDebug() << "---- call: showTime_Slot";
-	QString time = QTime::currentTime().toString("hh:mm:ss");
-	emit printTime(time);
-}
-// -------------------------------------------------------------------------------------------
-void fbbrowser::quit()
-{
-	emit killApp();
-}
+
 // -------------------------------------------------------------------------------------------
 fbbrowser::fbbrowser()
 {
@@ -55,16 +15,16 @@ fbbrowser::fbbrowser()
 	mw = new QMainWindow(this);
 	view = new QWebView(mw);
 
-	// Prepare loading of baseUrl.
+	// Prepare loading of baseURL.
 	// Maybe possible to let DM take care of these steps?
 	manager = new QNetworkAccessManager(this);
-	request.setUrl(baseUrl);
+	request.setUrl(baseURL);
     reply = manager->get(request);
 	// TODO: error differentiation
 	if(reply->error() == QNetworkReply::NoError)
 	{
-		qDebug() << "Loading: " << baseUrl.toString();
-		view->load(baseUrl);
+		qDebug() << "Loading: " << baseURL.toString();
+		view->load(baseURL);
 	}
 	else 
 	{
@@ -105,3 +65,44 @@ fbbrowser::~fbbrowser()
 	delete dm;
 	delete jso;
 }
+// -------------------------------------------------------------------------------------------
+void fbbrowser::forwardDownloadRequest(QString& filename)
+{
+	// Forge URL for filename from baseURL
+	QUrl fileUrl;
+	fileUrl = baseURL.resolved(QUrl(filename));
+	emit downloadFile(fileUrl);
+}
+// -------------------------------------------------------------------------------------------
+void fbbrowser::forwardUpdateProgress(int progress)
+{
+	emit updateProgress(progress);
+}
+// -------------------------------------------------------------------------------------------
+void fbbrowser::getMAC()
+{
+	QNetworkInterface *qNetI = new QNetworkInterface();
+	QList<QNetworkInterface> list;
+   	list=qNetI->allInterfaces();
+    QString str;
+	QString macAddress;
+	for (int i = 0; i < list.size(); ++i) {
+  		str = list.at(i).name();
+		macAddress = list.at(i).hardwareAddress();
+		qDebug() << str;
+		qDebug() << macAddress;
+	}
+	emit printMAC(macAddress);
+}
+// -------------------------------------------------------------------------------------------
+void fbbrowser::getTime()
+{
+	qDebug() << "---- call: showTime_Slot";
+	QString time = QTime::currentTime().toString("hh:mm:ss");
+	emit printTime(time);
+}
+// -------------------------------------------------------------------------------------------
+void fbbrowser::quit()
+{
+	emit killApp();
+}