diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-09-16 06:36:17 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-09-16 06:36:17 +0000 |
| commit | b5e31868dc0d4d5094752ab2dba127311434e66f (patch) | |
| tree | 9ffa57312ec216426059ec16d011865e4c1af72f /sigmodr/models/MapWildListModel.cpp | |
| parent | 0f0dbfb0395810c1c205a1dc10cf1f226669fd00 (diff) | |
| download | sigen-b5e31868dc0d4d5094752ab2dba127311434e66f.tar.gz sigen-b5e31868dc0d4d5094752ab2dba127311434e66f.tar.xz sigen-b5e31868dc0d4d5094752ab2dba127311434e66f.zip | |
[FIX] Refactored out some code to ObjectModel
[FIX] Drag and drop now accepts URLs
[FIX] The main window can now accept drops
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@265 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigmodr/models/MapWildListModel.cpp')
| -rw-r--r-- | sigmodr/models/MapWildListModel.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sigmodr/models/MapWildListModel.cpp b/sigmodr/models/MapWildListModel.cpp index 6bf86699..f798f193 100644 --- a/sigmodr/models/MapWildListModel.cpp +++ b/sigmodr/models/MapWildListModel.cpp @@ -33,9 +33,6 @@ // KDE includes #include <KMenu> -// Qt includes -#include <QtCore/QFile> - Sigmodr::MapWildListModel::MapWildListModel(BaseModel* parent, Sigmod::MapWildList* wildList) : GroupObjectModel(parent, wildList) { @@ -78,11 +75,11 @@ bool Sigmodr::MapWildListModel::setData(const QVariant& value, int role) { if (role == Sigmodr::BaseModel::XmlRole) { - if (value.canConvert<QString>()) + QString data = value.toString(); + if (!data.isEmpty()) { - QFile file(value.toString()); QDomDocument xml; - if ((file.open(QIODevice::ReadOnly) && xml.setContent(&file)) || xml.setContent(value.toString())) + if (loadFromData(data, &xml)) { if (xml.doctype().name() == m_object->className()) { @@ -96,7 +93,6 @@ bool Sigmodr::MapWildListModel::setData(const QVariant& value, int role) addObject(qobject_cast<Sigmod::MapWildList*>(m_object)->newEncounter(xml.documentElement())); return true; } - file.close(); } } } |
