mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 18:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'emperorarthur/no_relative'

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-11-28 10:01:05 +01:00
commit 2bef714d34
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bsa/bsa_file.cpp
View File

@ -28,8 +28,6 @@
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/fstream.hpp>
#include "../files/constrainedfilestream.hpp"
using namespace std;
using namespace Bsa;

2
components/contentselector/model/contentmodel.cpp
View File

@ -7,7 +7,7 @@
#include <QTextCodec>
#include <QDebug>
#include "components/esm/esmreader.hpp"
#include <components/esm/esmreader.hpp>
ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon) :
QAbstractTableModel(parent),

2
components/contentselector/view/contentselector.cpp
View File

@ -1,6 +1,6 @@
#include "contentselector.hpp"
#include "../model/esmfile.hpp"
#include <components/contentselector/model/esmfile.hpp>
#include <QSortFilterProxyModel>

2
components/contentselector/view/contentselector.hpp
View File

@ -4,7 +4,7 @@
#include <QDialog>
#include "ui_contentselector.h"
#include "../model/contentmodel.hpp"
#include <components/contentselector/model/contentmodel.hpp>
class QSortFilterProxyModel;

11
components/nifbullet/bulletnifloader.cpp
View File

@ -12,12 +12,11 @@
#include <components/misc/stringops.hpp>
#include "../nif/niffile.hpp"
#include "../nif/node.hpp"
#include "../nif/data.hpp"
#include "../nif/property.hpp"
#include "../nif/controller.hpp"
#include "../nif/extra.hpp"
#include <components/nif/node.hpp>
#include <components/nif/data.hpp>
#include <components/nif/property.hpp>
#include <components/nif/controller.hpp>
#include <components/nif/extra.hpp>
namespace