From 0193e902466857b2b81e2b35cf172b314a10a6b2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Sun, 6 Mar 2011 17:10:29 +0100
Subject: baseUrl is now global variable

---
 src/main.cpp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index f8c0880..4172d79 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,12 +1,16 @@
 #include <QApplication>
+#include <QSettings>
 #include <QtCore>
 #include <getopt.h>
 #include <cstdlib>
 #include <iostream>
 #include "fbgui.h"
 
+extern QUrl baseUrl;
 
+// temporary settings testing stuff
 QMap<QString, QString> options;
+
 void printHelp()
 {
     // Prints usage information.
@@ -24,16 +28,8 @@ int main(int argc, char *argv[])
     app->setApplicationName("fbgui");
     app->setObjectName("test");
 
-	// Initialise fbgui
-    fbgui *gui = new fbgui();
-    gui->setParent(app);
 
     /* Parse cmdline argus. */
-
-	//qDebug() << "Received " << argc << "arguments:";
-	//for (int i = 0; i < argc; i++)
-	//	qDebug() << i + 1 << ": " << argv[i];
-
 	int longIndex = 0;
 	static const char *optString = "u:h";
 	static const struct option longOpts[] =
@@ -64,11 +60,8 @@ int main(int argc, char *argv[])
 	//
 
 	if (options.contains("url"))
-	{
-		QUrl url = options.value("url");
-		gui->setUrl(url);
-	}
-
+		// TODO: also check in conf before settings this.
+		baseUrl = options.value("url");
 	else
 	{
 		std::cout << "No URL specified. Exiting...";
@@ -77,6 +70,8 @@ int main(int argc, char *argv[])
 	// TODO: Read INI.
 
 	// Start fbgui.
+    fbgui *gui = new fbgui();
+    gui->setParent(app);
     gui->startBrowser();
 
     return app->exec();
-- 
cgit v1.2.3-55-g7522