From 7747c785845e5e5311fab2b5cfd82564ab51d19e Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Thu, 28 Apr 2011 22:23:42 +0200
Subject: [PATCH] Fixed the use of path.hpp, which is in a CMake component now
 Also fixed some leftover lines from a wrongly modified conflict

---
 apps/launcher/CMakeLists.txt    | 5 +----
 apps/launcher/datafilespage.cpp | 4 ++--
 apps/launcher/maindialog.cpp    | 2 --
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 7343aae10..00a50679c 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -10,8 +10,6 @@ set(LAUNCHER
   maindialog.hpp
   playpage.hpp
   combobox.hpp
-
-  ../openmw/path.cpp
 )
 
 set(MOC_HDRS
@@ -22,8 +20,6 @@ set(MOC_HDRS
   combobox.hpp
 )
 
-source_group(apps\\launcher FILES ${ESMTOOL})
-
 find_package(Qt4 REQUIRED)
 set(QT_USE_QTGUI 1)
 
@@ -36,6 +32,7 @@ include(${QT_USE_FILE})
 add_executable(launcher
   ${LAUNCHER}
   ${MISC} ${MISC_HEADER}
+  ${FILES} ${FILES_HEADER}
   ${TO_UTF8}
   ${ESM}
   ${RCC_SRCS}
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index dbed73b53..1b98087e9 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -3,7 +3,7 @@
 #include <QDebug> // TODO: Remove
 
 #include <components/esm/esm_reader.hpp>
-#include "../openmw/path.hpp"
+#include <components/files/path.hpp>
 
 #include "datafilespage.hpp"
 #include "lineedit.hpp"
@@ -195,7 +195,7 @@ void DataFilesPage::setupConfig()
         qDebug() << "Using config file from current directory";
         mLauncherConfig = new QSettings("launcher.cfg", QSettings::IniFormat);
     } else {
-        QString path = QString::fromStdString(OMW::Path::getPath(OMW::Path::GLOBAL_CFG_PATH,
+        QString path = QString::fromStdString(Files::getPath(Files::Path_ConfigGlobal,
                                                                  "openmw",
                                                                  "launcher.cfg"));
         qDebug() << "Using global config file from " << path;
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 5ba5168a9..669c9e019 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -103,8 +103,6 @@ void MainDialog::createIcons()
 
     QListWidgetItem *queryButton = new QListWidgetItem(mIconWidget);
     queryButton->setIcon(QIcon(":/images/openmw-plugin-icon.png"));
-    QListWidgetItem *queryButton = new QListWidgetItem(mIconWidget);
-    queryButton->setIcon(QIcon(":resources/openmw-plugin-icon.png"));
     queryButton->setText(tr("Data Files"));
     queryButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     queryButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);