From b5e31868dc0d4d5094752ab2dba127311434e66f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 16 Sep 2008 06:36:17 +0000 Subject: [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 --- sigmodr/models/GlobalScriptGroupModel.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'sigmodr/models/GlobalScriptGroupModel.cpp') diff --git a/sigmodr/models/GlobalScriptGroupModel.cpp b/sigmodr/models/GlobalScriptGroupModel.cpp index 83d2902d..e9651378 100644 --- a/sigmodr/models/GlobalScriptGroupModel.cpp +++ b/sigmodr/models/GlobalScriptGroupModel.cpp @@ -28,9 +28,6 @@ // KDE includes #include -// Qt includes -#include - Sigmodr::GlobalScriptGroupModel::GlobalScriptGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Global Scripts") { @@ -57,18 +54,14 @@ bool Sigmodr::GlobalScriptGroupModel::setData(const QVariant& value, int role) { if (role == Sigmodr::BaseModel::XmlRole) { - if (value.canConvert()) + 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) && (xml.doctype().name() == "GlobalScript")) { - if (xml.doctype().name() == "GlobalScript") - { - addObject(qobject_cast(m_object)->newGlobalScript(xml.documentElement())); - return true; - } - file.close(); + addObject(qobject_cast(m_object)->newGlobalScript(xml.documentElement())); + return true; } } } -- cgit