Permalink
Browse files

Fix QxtFifo and move qxtweb modules in their respective folder

  • Loading branch information...
1 parent fd60cf4 commit bf2067c4148b6ac2f5ca78c24d38d5aa3ad845a7 @xhochy xhochy committed Apr 9, 2013
Showing with 75 additions and 1,547 deletions.
  1. +1 −1 CMakeLists.txt
  2. +16 −15 thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
  3. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtboundcfunction.h
  4. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtboundfunction.h
  5. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtboundfunctionbase.h
  6. +5 −8 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtfifo.cpp
  7. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtfifo.h
  8. +0 −2 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtglobal.h
  9. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtmetaobject.cpp
  10. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtmetaobject.h
  11. +37 −29 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtmetatype.h
  12. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtnull.cpp
  13. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtnull.h
  14. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → core}/qxtnullable.h
  15. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → network}/qxtsslserver.cpp
  16. +1 −1 thirdparty/qxt/qxtweb-standalone/{qxtweb → network}/qxtsslserver.h
  17. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractHttpConnector
  18. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebService
  19. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebSessionManager
  20. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHtmlTemplate
  21. +0 −1 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHttpServerConnector
  22. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHttpSessionManager
  23. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtMail
  24. +0 −1 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtScgiServerConnector
  25. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtSendmail
  26. +0 −1 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWeb
  27. +0 −1 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebCgiService
  28. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebContent
  29. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebErrorEvent
  30. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebEvent
  31. +0 −1 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebFileUploadEvent
  32. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebPageEvent
  33. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRedirectEvent
  34. +0 −1 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRemoveCookieEvent
  35. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRequestEvent
  36. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebServiceDirectory
  37. +0 −2 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebSlotService
  38. +0 −1 thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebStoreCookieEvent
  39. +0 −251 thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.cpp
  40. +0 −46 thirdparty/qxt/qxtweb-standalone/qxtweb/qxtweb.h
  41. +0 −445 thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.cpp
  42. +0 −64 thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.h
  43. +0 −512 thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebjsonrpcservice.cpp
  44. +0 −56 thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebjsonrpcservice.h
  45. +0 −66 thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebjsonrpcservice_p.h
  46. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qhttpheader.cpp
  47. +9 −8 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qhttpheader.h
  48. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtabstracthttpconnector.cpp
  49. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtabstracthttpconnector.h
  50. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtabstractwebservice.cpp
  51. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtabstractwebservice.h
  52. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtabstractwebsessionmanager.cpp
  53. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtabstractwebsessionmanager.h
  54. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtabstractwebsessionmanager_p.h
  55. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxthtmltemplate.cpp
  56. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxthtmltemplate.h
  57. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxthttpserverconnector.cpp
  58. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxthttpsessionmanager.cpp
  59. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxthttpsessionmanager.h
  60. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtscgiserverconnector.cpp
  61. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebcgiservice_p.h
  62. +5 −5 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebcontent.cpp
  63. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebcontent.h
  64. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebevent.cpp
  65. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebevent.h
  66. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebservicedirectory.cpp
  67. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebservicedirectory.h
  68. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebservicedirectory_p.h
  69. +1 −1 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebslotservice.cpp
  70. 0 thirdparty/qxt/qxtweb-standalone/{qxtweb → web}/qxtwebslotservice.h
View
@@ -241,7 +241,7 @@ ENDIF( WIN32 )
#TODO: support external qxt
set(QXTWEB_FOUND TRUE)
set(QXTWEB_LIBRARIES qxtweb-standalone)
-set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb ${CMAKE_CURRENT_BINARY_DIR})
+set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/web ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/network ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/core ${CMAKE_CURRENT_BINARY_DIR})
### libportfwd
set(LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include)
@@ -7,16 +7,18 @@ ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
setup_qt()
-SET(qxtweb "qxtweb")
+SET( qxtcore "core" )
+SET( qxtnet "network" )
+SET( qxtweb "web" )
-ADD_DEFINITIONS(-Wall -O2 -DNDEBUG)
-IF(NOT WIN32)
- ADD_DEFINITIONS(-fPIC)
+ADD_DEFINITIONS( -Wall -O2 -DNDEBUG )
+IF( NOT WIN32 )
+ ADD_DEFINITIONS( -fPIC )
ENDIF()
ADD_DEFINITIONS( -DBUILD_QXT_CORE -DBUILD_QXT_WEB )
-INCLUDE_DIRECTORIES( ${qxtweb} )
+INCLUDE_DIRECTORIES( ${qxtweb} ${qxtcore} ${qxtnet} )
macro(create_qxtweb_fancy_header simpleHeader fancyHeader)
file(WRITE ${CMAKE_BINARY_DIR}/QxtWeb/${fancyHeader} "#include \"${simpleHeader}\"" )
@@ -41,24 +43,23 @@ SET( sources
${qxtweb}/qxtwebcontent.cpp
${qxtweb}/qxtwebevent.cpp
${qxtweb}/qxtwebservicedirectory.cpp
- ${qxtweb}/qxtwebslotservice.cpp
- ${qxtweb}/qxtwebcgiservice.cpp
${qxtweb}/qhttpheader.cpp
+ ${qxtweb}/qxtwebslotservice.cpp
# Ripped bits of QxtCore:
- ${qxtweb}/qxtmetaobject.cpp
- ${qxtweb}/qxtnull.cpp
- ${qxtweb}/qxtfifo.cpp
+ ${qxtcore}/qxtmetaobject.cpp
+ ${qxtcore}/qxtnull.cpp
+ ${qxtcore}/qxtfifo.cpp
# QxtNetwork
- ${qxtweb}/qxtsslserver.cpp
+ ${qxtnet}/qxtsslserver.cpp
# automoc hack
- ${qxtweb}/qxtboundfunction.h
+ ${qxtcore}/qxtboundfunction.h
)
-ADD_LIBRARY(qxtweb-standalone STATIC
+ADD_LIBRARY( qxtweb-standalone STATIC
${mocstuff}
${headers}
${sources}
@@ -69,6 +70,6 @@ target_link_libraries( qxtweb-standalone
${QT_LIBRARIES}
)
-qt5_use_modules(qxtweb-standalone Network)
+qt5_use_modules( qxtweb-standalone Network )
-set_target_properties(qxtweb-standalone PROPERTIES AUTOMOC TRUE)
+set_target_properties( qxtweb-standalone PROPERTIES AUTOMOC TRUE )
@@ -137,17 +137,14 @@ QxtFifo::QxtFifo(const QByteArray &prime, QObject *parent) : QIODevice(parent)
QXT_INIT_PRIVATE(QxtFifo);
setOpenMode(QIODevice::ReadWrite);
// Since we're being constructed, access to the internals is safe
-
- QxtFifoNode *head;
- int available;
+ QxtFifoNode* node;
#if QT_VERSION >= 0x50000
- head = qxt_d().head.load();
- available = qxt_d().available.load();
+ node = qxt_d().head.load();
#else
- head = qxt_d().head;
- available = qxt_d().available;
+ node = qxt_d().head;
#endif
-
+ node->content = prime;
+ qxt_d().available.QXT_ADD( prime.size() );
}
/*!
@@ -51,8 +51,6 @@
#define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE
-#define QXT_STATIC
-
#if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN)
# if defined(BUILD_QXT_CORE)
# define QXT_CORE_EXPORT Q_DECL_EXPORT
@@ -1,27 +1,33 @@
+
/****************************************************************************
- **
- ** Copyright (C) Qxt Foundation. Some rights reserved.
- **
- ** This file is part of the QxtCore module of the Qxt library.
- **
- ** This library is free software; you can redistribute it and/or modify it
- ** under the terms of the Common Public License, version 1.0, as published
- ** by IBM, and/or under the terms of the GNU Lesser General Public License,
- ** version 2.1, as published by the Free Software Foundation.
- **
- ** This file is provided "AS IS", without WARRANTIES OR CONDITIONS OF ANY
- ** KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
- ** WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
- ** FITNESS FOR A PARTICULAR PURPOSE.
- **
- ** You should have received a copy of the CPL and the LGPL along with this
- ** file. See the LICENSE file and the cpl1.0.txt/lgpl-2.1.txt files
- ** included with the source distribution for more information.
- ** If you did not receive a copy of the licenses, contact the Qxt Foundation.
- **
- ** <http://libqxt.org> <foundation@libqxt.org>
- **
- ****************************************************************************/
+** Copyright (c) 2006 - 2011, the LibQxt project.
+** See the Qxt AUTHORS file for a list of authors and copyright holders.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in the
+** documentation and/or other materials provided with the distribution.
+** * Neither the name of the LibQxt project nor the
+** names of its contributors may be used to endorse or promote products
+** derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+** <http://libqxt.org> <foundation@libqxt.org>
+*****************************************************************************/
#ifndef QXTMETATYPE_H
#define QXTMETATYPE_H
@@ -32,13 +38,19 @@
#include <QtDebug>
#include <qxtglobal.h>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#define qxtcreate create
+#else
+#define qxtcreate construct
+#endif
+
template <typename T>
class /*QXT_CORE_EXPORT*/ QxtMetaType
{
public:
static inline T* construct(const T* copy = 0)
{
- return QMetaType::construct(qMetaTypeId<T>(), reinterpret_cast<const void*>(copy));
+ return QMetaType::qxtcreate(qMetaTypeId<T>(), reinterpret_cast<const void*>(copy));
}
static inline void destroy(T* data)
@@ -111,11 +123,7 @@ class /*QXT_CORE_EXPORT*/ QxtMetaType<void>
inline void* qxtConstructByName(const char* typeName, const void* copy = 0)
{
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
- return QMetaType::create(QMetaType::type(typeName), copy);
-#else
- return QMetaType::construct(QMetaType::type(typeName), copy);
-#endif
+ return QMetaType::qxtcreate(QMetaType::type(typeName), copy);
}
inline void qxtDestroyByName(const char* typeName, void* data)
@@ -39,7 +39,7 @@
#include <QSslSocket>
class QxtSslServerPrivate;
-class QxtSslServer : public QTcpServer
+class QXT_NETWORK_EXPORT QxtSslServer : public QTcpServer
{
Q_OBJECT
public:
@@ -1,2 +0,0 @@
-#include "qxtabstracthttpconnector.h"
-
@@ -1,2 +0,0 @@
-#include "qxtabstractwebservice.h"
-
@@ -1,2 +0,0 @@
-#include "qxtabstractwebsessionmanager.h"
-
@@ -1,2 +0,0 @@
-#include "qxthtmltemplate.h"
-
@@ -1 +0,0 @@
-#include "qxtabstracthttpconnector.h"
@@ -1,2 +0,0 @@
-#include "qxthttpsessionmanager.h"
-
@@ -1,2 +0,0 @@
-#include "qxtmail.h"
-
@@ -1 +0,0 @@
-#include "qxtabstracthttpconnector.h"
@@ -1,2 +0,0 @@
-#include "qxtsendmail.h"
-
@@ -1 +0,0 @@
-#include "qxtweb.h"
@@ -1 +0,0 @@
-#include "qxtwebcgiservice.h"
@@ -1,2 +0,0 @@
-#include "qxtwebcontent.h"
-
@@ -1,2 +0,0 @@
-#include "qxtwebevent.h"
-
@@ -1,2 +0,0 @@
-#include "qxtwebevent.h"
-
@@ -1 +0,0 @@
-#include "qxtwebevent.h"
@@ -1,2 +0,0 @@
-#include "qxtwebevent.h"
-
@@ -1,2 +0,0 @@
-#include "qxtwebevent.h"
-
@@ -1 +0,0 @@
-#include "qxtwebevent.h"
@@ -1,2 +0,0 @@
-#include "qxtwebevent.h"
-
@@ -1,2 +0,0 @@
-#include "qxtwebservicedirectory.h"
-
@@ -1,2 +0,0 @@
-#include "qxtwebslotservice.h"
-
@@ -1 +0,0 @@
-#include "qxtwebevent.h"
Oops, something went wrong.

0 comments on commit bf2067c

Please sign in to comment.