summaryrefslogtreecommitdiff
path: root/src/nexusinterface.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2014-01-16 20:43:42 +0100
committerTannin <devnull@localhost>2014-01-16 20:43:42 +0100
commit40d20ab294ad7afd4b5747b306e45d0f8712a386 (patch)
treeca97a4b4c404fc426e3239b0d0262624cca6c65d /src/nexusinterface.cpp
parent6ed82866b07414e91dfe0c47ee5f580bfd4fe479 (diff)
- added an about dialog
- updated json library
Diffstat (limited to 'src/nexusinterface.cpp')
-rw-r--r--src/nexusinterface.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 309915aa..6b87822a 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -20,14 +20,13 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "nexusinterface.h"
#include "nxmaccessmanager.h"
#include "utility.h"
-#include "json.h"
+#include <json.h>
#include "selectiondialog.h"
#include <QApplication>
#include <utility.h>
#include <regex>
#include <util.h>
-using QtJson::Json;
using namespace MOBase;
using namespace MOShared;
@@ -458,7 +457,7 @@ void NexusInterface::requestFinished(std::list<NXMRequestInfo>::iterator iter)
emit nxmRequestFailed(iter->m_ModID, iter->m_UserData, iter->m_ID, nexusError);
} else {
bool ok;
- QVariant result = Json::parse(data, ok);
+ QVariant result = QtJson::parse(data, ok);
if (result.isValid() && ok) {
switch (iter->m_Type) {
case NXMRequestInfo::TYPE_DESCRIPTION: {