From 3d1052f54c4da04805688ce69f0987275827323b Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Thu, 22 Oct 2009 18:25:07 +0200
Subject: [PATCH] path fix

---
 cockatrice/src/counter.cpp | 1 -
 cockatrice/src/main.cpp    | 6 ++----
 oracle/src/window_main.cpp | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cockatrice/src/counter.cpp b/cockatrice/src/counter.cpp
index 16faa66e..f747dbd0 100644
--- a/cockatrice/src/counter.cpp
+++ b/cockatrice/src/counter.cpp
@@ -8,7 +8,6 @@ Counter::Counter(Player *_player, int _id, const QString &_name, QColor _color,
 {
 	if (radius > Player::counterAreaWidth / 2)
 		radius = Player::counterAreaWidth / 2;
-	
 	if (player->getLocal()) {
 		menu = new QMenu(name);
 		aSet = new QAction(this);
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 74da37ba..8a998f42 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 {
 //	qInstallMsgHandler(myMessageOutput);
 	QApplication app(argc, argv);
-	app.addLibraryPath("plugins");
+	app.addLibraryPath(app.applicationDirPath() + "/plugins");
 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
 	QCoreApplication::setOrganizationName("Cockatrice");
@@ -73,10 +73,8 @@ int main(int argc, char *argv[])
 	MainWindow ui(&translator);
 	qDebug("main(): MainWindow constructor finished");
 	
-	//set Icon
-	QIcon icon("resources/icon.svg");
+	QIcon icon(":/resources/icon.svg");
 	ui.setWindowIcon(icon);
-	//
 	
 	ui.show();
 	qDebug("main(): ui.show() finished");
diff --git a/oracle/src/window_main.cpp b/oracle/src/window_main.cpp
index 6f0fef5d..833a0766 100644
--- a/oracle/src/window_main.cpp
+++ b/oracle/src/window_main.cpp
@@ -5,7 +5,7 @@
 WindowMain::WindowMain(QWidget *parent)
 	: QMainWindow(parent)
 {
-	importer = new OracleImporter("../oracle", this);
+	importer = new OracleImporter(qApp->applicationDirPath() + "../oracle", this);
 	
 	QVBoxLayout *checkboxLayout = new QVBoxLayout;
 	QList<SetToDownload> &sets = importer->getSets();