@@ -1,29 +1,46 @@ -# Copyright (c) 2009 Ingmar Vanhassel <ingmar@exherbo.org> +# Find QJSON - JSON handling library for Qt +# +# This module defines +# QJSON_FOUND - whether the qsjon library was found +# QJSON_LIBRARIES - the qjson library +# QJSON_INCLUDE_DIR - the include path of the qjson library # -# Redistribution and use is allowed according to the terms of the BSD license. -find_path(QJSON_INCLUDE_DIR json_driver.hh - PATH_SUFFIXES qjson -) +if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) -find_library(QJSON_LIBRARIES NAMES qjson) + # Already in cache + set (QJSON_FOUND TRUE) -if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) - set(QJSON_FOUND TRUE) -endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) +else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) -if (QJSON_FOUND) - if (NOT QJson_FIND_QUIETLY) - message(STATUS "Found QJson: libs - ${QJSON_LIBRARIES}; includes - ${QJSON_INCLUDE_DIR}") - endif (NOT QJson_FIND_QUIETLY) -else (QJSON_FOUND) - if (QJson_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find QJson") - endif (QJson_FIND_REQUIRED) -endif (QJSON_FOUND) - -mark_as_advanced( - QJSON_INCLUDE_DIR - QJSON_LIBRARIES -) + if (NOT WIN32) + # use pkg-config to get the values of QJSON_INCLUDE_DIRS + # and QJSON_LIBRARY_DIRS to add as hints to the find commands. + include (FindPkgConfig) + pkg_check_modules (QJSON REQUIRED QJson>=0.5) + endif (NOT WIN32) + find_library (QJSON_LIBRARIES + NAMES + qjson + PATHS + ${QJSON_LIBRARY_DIRS} + ${LIB_INSTALL_DIR} + ${KDE4_LIB_DIR} + ) + + find_path (QJSON_INCLUDE_DIR + NAMES + parser.h + PATH_SUFFIXES + qjson + PATHS + ${QJSON_INCLUDE_DIRS} + ${INCLUDE_INSTALL_DIR} + ${KDE4_INCLUDE_DIR} + ) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR) + +endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) cmake/modules/FindQJson.cmake @@ -40,7 +40,7 @@ #include <QtNetwork/QNetworkCookieJar> #include <QtNetwork/QNetworkDiskCache> -#include <qjson/json_driver.hh> +#include <qjson/parser.h> #include "facebook/chatservice.h" #include "facebook/chatmessage.h" @@ -614,10 +614,10 @@ void ChatService::decodeGetMessagesResponse( QIODevice *input ) input->read(QString("for (;;);").count()); QString json = input->readAll(); - JSonDriver parser; + QJson::Parser parser; bool status = true; - QVariant result = parser.parse(json, &status); + QVariant result = parser.parse(json.toAscii(), &status); qDebug() << json; @@ -757,7 +757,7 @@ void ChatService::decodeGetMessagesResponse( QIODevice *input ) } else { - qDebug() << "invalid reply: " << parser.error(); + qDebug() << "invalid reply: " << parser.errorString(); qDebug() << json; } @@ -793,9 +793,9 @@ void ChatService::decodeBuddyListResponse( QIODevice *responseInput ) responseInput->read(QString("for (;;);").count()); QString json = responseInput->readAll(); - JSonDriver parser; + QJson::Parser parser; bool status = true; - QVariant result = parser.parse(json, &status); + QVariant result = parser.parse(json.toAscii(), &status); if (!status) { facebook/chatservice.cpp @@ -19,7 +19,7 @@ #define FACEBOOKADDCONTACTPAGE_H #include <addcontactpage.h> -#include "ui_facebookaddui.h" +#include "ui_facebookadd.h" namespace Kopete { class Account; } namespace Kopete { class MetaContact; } facebookaddcontactpage.h c42ceeb7b76b79e235a2c365fff16a67b64b5e4d Alexandru Scvortov scvalex@gmail.com http://github.com/dmacvicar/kopete-facebook/commit/c314a9d6c4c6d08a50ad1aaf127018198a8c153b c314a9d6c4c6d08a50ad1aaf127018198a8c153b 2009-07-21T09:29:42-07:00 2009-07-21T09:29:42-07:00 fixed QJson and misc errors 0ad9e5fe6849c6ec05a4e22510c01325aed4cf09 Alexandru Scvortov scvalex@gmail.com