mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 03:15:32 +00:00
Code Issues Releases Wiki Activity

Fixed the use of path.hpp, which is in a CMake component now

Browse source 
Also fixed some leftover lines from a wrongly modified conflict
This commit is contained in:
Pieter van der Kloet 2011-04-28 22:23:42 +02:00
parent 7b554897e7
commit 7747c78584
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/launcher/CMakeLists.txt
View file

@ -10,8 +10,6 @@ set(LAUNCHER
maindialog.hpp maindialog.hpp
playpage.hpp playpage.hpp
combobox.hpp combobox.hpp
../openmw/path.cpp
) )
set(MOC_HDRS set(MOC_HDRS
@ -22,8 +20,6 @@ set(MOC_HDRS
combobox.hpp combobox.hpp
) )
source_group(apps\\launcher FILES ${ESMTOOL})
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
set(QT_USE_QTGUI 1) set(QT_USE_QTGUI 1)
@ -36,6 +32,7 @@ include(${QT_USE_FILE})
add_executable(launcher add_executable(launcher
${LAUNCHER} ${LAUNCHER}
${MISC} ${MISC_HEADER} ${MISC} ${MISC_HEADER}
${FILES} ${FILES_HEADER}
${TO_UTF8} ${TO_UTF8}
${ESM} ${ESM}
${RCC_SRCS} ${RCC_SRCS}

4
apps/launcher/datafilespage.cpp
View file

@ -3,7 +3,7 @@
#include <QDebug> // TODO: Remove #include <QDebug> // TODO: Remove
#include <components/esm/esm_reader.hpp> #include <components/esm/esm_reader.hpp>
#include "../openmw/path.hpp" #include <components/files/path.hpp>
#include "datafilespage.hpp" #include "datafilespage.hpp"
#include "lineedit.hpp" #include "lineedit.hpp"
@ -195,7 +195,7 @@ void DataFilesPage::setupConfig()
qDebug() << "Using config file from current directory"; qDebug() << "Using config file from current directory";
mLauncherConfig = new QSettings("launcher.cfg", QSettings::IniFormat); mLauncherConfig = new QSettings("launcher.cfg", QSettings::IniFormat);
} else { } else {
QString path = QString::fromStdString(OMW::Path::getPath(OMW::Path::GLOBAL_CFG_PATH, QString path = QString::fromStdString(Files::getPath(Files::Path_ConfigGlobal,
"openmw", "openmw",
"launcher.cfg")); "launcher.cfg"));
qDebug() << "Using global config file from " << path; qDebug() << "Using global config file from " << path;

2
apps/launcher/maindialog.cpp
View file

@ -103,8 +103,6 @@ void MainDialog::createIcons()
QListWidgetItem *queryButton = new QListWidgetItem(mIconWidget); QListWidgetItem *queryButton = new QListWidgetItem(mIconWidget);
queryButton->setIcon(QIcon(":/images/openmw-plugin-icon.png")); 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->setText(tr("Data Files"));
queryButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom); queryButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
queryButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); queryButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);