qxorm-1.1.5-20110413.patch

qxorm-1.1.5-20110413.patch (text/plain), 10.11 KB, created by ruddy32 on 2011-04-13 13:49:44 UTC

diff -crB qxorm-1.1.5/QxOrm.pri qxorm-1.1.5.new/QxOrm.pri
*** qxorm-1.1.5/QxOrm.pri	2011-03-01 11:03:10.000000000 +0000
--- qxorm-1.1.5.new/QxOrm.pri	2011-04-13 13:55:06.000000000 +0000
***************
*** 53,61 ****
  QT += sql
  MOC_DIR = ./qt/moc
  RCC_DIR = ./qt/rcc/src
! UI_DIR = ./qt/ui
! UI_HEADERS_DIR = ./qt/ui/include
! UI_SOURCES_DIR = ./qt/ui/src
  
  #############################
  # Compiler / Linker Options #
--- 53,67 ----
  QT += sql
  MOC_DIR = ./qt/moc
  RCC_DIR = ./qt/rcc/src
! enable_gui {
! 	UI_DIR = ./qt/ui
! 	UI_HEADERS_DIR = ./qt/ui/include
! 	UI_SOURCES_DIR = ./qt/ui/src
! 	DEFINES += QXORM_USE_QTGUI
! }
! disable_gui {
! 	DEFINES -= QXORM_USE_QTGUI
! }
  
  #############################
  # Compiler / Linker Options #
diff -crB qxorm-1.1.5/QxOrm.pro qxorm-1.1.5.new/QxOrm.pro
*** qxorm-1.1.5/QxOrm.pro	2011-02-09 11:11:06.000000000 +0000
--- qxorm-1.1.5.new/QxOrm.pro	2011-04-13 12:28:00.000000000 +0000
***************
*** 144,169 ****
  HEADERS += ./include/QxSerialize/boost/QxExportDllBoostArchive.h
  HEADERS += ./include/QxSerialize/boost/QxImportDllBoostArchive.h
  
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QBrush.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QByteArray.h
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QColor.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QDate.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QDateTime.h
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QFont.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QHash.h
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QImage.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QLinkedList.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QList.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QMap.h
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QMatrix.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QObject.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QPair.h
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QPicture.h
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QPixmap.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QPoint.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QRect.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QRegExp.h
- HEADERS += ./include/QxSerialize/Qt/QxSerialize_QRegion.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QScopedPointer.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QSharedPointer.h
  HEADERS += ./include/QxSerialize/Qt/QxSerialize_QSize.h
--- 144,161 ----
***************
*** 273,278 ****
--- 265,281 ----
  HEADERS += ./include/QxOrm.h
  HEADERS += ./include/QxMemLeak.h
  
+ enable_gui {
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QBrush.h
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QColor.h
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QFont.h
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QImage.h
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QMatrix.h
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QPicture.h
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QPixmap.h
+     HEADERS += ./include/QxSerialize/Qt/QxSerialize_QRegion.h
+ }
+ 
  #################
  # Sources Files #
  #################
***************
*** 315,335 ****
  
  SOURCES += ./src/QxSerialize/boost/QxExportDllBoostArchive.cpp
  
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QBrush.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QByteArray.cpp
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QColor.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QDate.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QDateTime.cpp
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QFont.cpp
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QImage.cpp
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QMatrix.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QObject.cpp
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QPicture.cpp
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QPixmap.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QPoint.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QRect.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QRegExp.cpp
- SOURCES += ./src/QxSerialize/Qt/QxSerialize_QRegion.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QSize.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QString.cpp
  SOURCES += ./src/QxSerialize/Qt/QxSerialize_QStringList.cpp
--- 318,330 ----
***************
*** 347,349 ****
--- 342,356 ----
  SOURCES += ./src/QxService/QxTransaction.cpp
  
  SOURCES += ./src/main.cpp
+ 
+ enable_gui {
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QBrush.cpp
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QColor.cpp
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QFont.cpp
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QImage.cpp
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QMatrix.cpp
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QPicture.cpp
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QPixmap.cpp
+     SOURCES += ./src/QxSerialize/Qt/QxSerialize_QRegion.cpp
+ }
+ 
diff -crB qxorm-1.1.5/include/QxTraits/get_class_name_primitive.h qxorm-1.1.5.new/include/QxTraits/get_class_name_primitive.h
*** qxorm-1.1.5/include/QxTraits/get_class_name_primitive.h	2011-01-06 10:32:52.000000000 +0000
--- qxorm-1.1.5.new/include/QxTraits/get_class_name_primitive.h	2011-04-13 13:55:21.000000000 +0000
***************
*** 63,68 ****
--- 63,69 ----
  #include <QtCore/qurl.h>
  #include <QtCore/QWeakPointer>
  
+ #ifdef QXORM_USE_QTGUI
  #include <QtGui/qcolor.h>
  #include <QtGui/qfont.h>
  #include <QtGui/qimage.h>
***************
*** 71,76 ****
--- 72,78 ----
  #include <QtGui/qpicture.h>
  #include <QtGui/qpixmap.h>
  #include <QtGui/qregion.h>
+ #endif
  
  #if (QT_VERSION >= 0x040600)
  #include <QtCore/qscopedpointer.h>
***************
*** 99,123 ****
  QX_REGISTER_CLASS_NAME(QObject)
  QX_REGISTER_CLASS_NAME(QString)
  QX_REGISTER_CLASS_NAME(QStringList)
- QX_REGISTER_CLASS_NAME(QBrush)
  QX_REGISTER_CLASS_NAME(QByteArray)
- QX_REGISTER_CLASS_NAME(QColor)
  QX_REGISTER_CLASS_NAME(QDate)
  QX_REGISTER_CLASS_NAME(QDateTime)
- QX_REGISTER_CLASS_NAME(QFont)
- QX_REGISTER_CLASS_NAME(QImage)
- QX_REGISTER_CLASS_NAME(QMatrix)
- QX_REGISTER_CLASS_NAME(QPicture)
- QX_REGISTER_CLASS_NAME(QPixmap)
  QX_REGISTER_CLASS_NAME(QPoint)
  QX_REGISTER_CLASS_NAME(QRect)
  QX_REGISTER_CLASS_NAME(QRegExp)
- QX_REGISTER_CLASS_NAME(QRegion)
  QX_REGISTER_CLASS_NAME(QSize)
  QX_REGISTER_CLASS_NAME(QTime)
  QX_REGISTER_CLASS_NAME(QUrl)
  QX_REGISTER_CLASS_NAME(QVariant)
  
  QX_REGISTER_CLASS_NAME_TEMPLATE_1(std::allocator)
  QX_REGISTER_CLASS_NAME_TEMPLATE_1(std::vector)
  QX_REGISTER_CLASS_NAME_TEMPLATE_1(std::list)
--- 101,128 ----
  QX_REGISTER_CLASS_NAME(QObject)
  QX_REGISTER_CLASS_NAME(QString)
  QX_REGISTER_CLASS_NAME(QStringList)
  QX_REGISTER_CLASS_NAME(QByteArray)
  QX_REGISTER_CLASS_NAME(QDate)
  QX_REGISTER_CLASS_NAME(QDateTime)
  QX_REGISTER_CLASS_NAME(QPoint)
  QX_REGISTER_CLASS_NAME(QRect)
  QX_REGISTER_CLASS_NAME(QRegExp)
  QX_REGISTER_CLASS_NAME(QSize)
  QX_REGISTER_CLASS_NAME(QTime)
  QX_REGISTER_CLASS_NAME(QUrl)
  QX_REGISTER_CLASS_NAME(QVariant)
  
+ #ifdef QXORM_USE_QTGUI
+ QX_REGISTER_CLASS_NAME(QBrush)
+ QX_REGISTER_CLASS_NAME(QColor)
+ QX_REGISTER_CLASS_NAME(QFont)
+ QX_REGISTER_CLASS_NAME(QImage)
+ QX_REGISTER_CLASS_NAME(QMatrix)
+ QX_REGISTER_CLASS_NAME(QPicture)
+ QX_REGISTER_CLASS_NAME(QPixmap)
+ QX_REGISTER_CLASS_NAME(QRegion)
+ #endif
+ 
  QX_REGISTER_CLASS_NAME_TEMPLATE_1(std::allocator)
  QX_REGISTER_CLASS_NAME_TEMPLATE_1(std::vector)
  QX_REGISTER_CLASS_NAME_TEMPLATE_1(std::list)
diff -crB qxorm-1.1.5/include/QxTraits/is_equal.h qxorm-1.1.5.new/include/QxTraits/is_equal.h
*** qxorm-1.1.5/include/QxTraits/is_equal.h	2011-01-06 17:32:20.000000000 +0000
--- qxorm-1.1.5.new/include/QxTraits/is_equal.h	2011-04-13 13:55:30.000000000 +0000
***************
*** 46,57 ****
--- 46,59 ----
  #include <QtCore/qurl.h>
  #include <QtCore/qsharedpointer.h>
  
+ #ifdef QXORM_USE_QTGUI
  #include <QtGui/qcolor.h>
  #include <QtGui/qfont.h>
  #include <QtGui/qimage.h>
  #include <QtGui/qbrush.h>
  #include <QtGui/qmatrix.h>
  #include <QtGui/qregion.h>
+ #endif
  
  #include <QxDao/QxDaoPointer.h>
  
***************
*** 94,115 ****
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(std::wstring)
  
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QString)
- QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QBrush)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QByteArray)
- QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QColor)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QDate)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QDateTime)
- QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QFont)
- QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QImage)
- QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QMatrix)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QPoint)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QRect)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QRegExp)
- QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QRegion)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QSize)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QTime)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QUrl)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QVariant)
  
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL_TEMPLATE_1(boost::shared_ptr)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL_TEMPLATE_1(QSharedPointer)
--- 96,119 ----
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(std::wstring)
  
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QString)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QByteArray)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QDate)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QDateTime)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QPoint)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QRect)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QRegExp)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QSize)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QTime)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QUrl)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QVariant)
+ #ifdef QXORM_USE_QTGUI
+ QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QBrush)
+ QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QColor)
+ QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QFont)
+ QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QImage)
+ QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QMatrix)
+ QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL(QRegion)
+ #endif
  
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL_TEMPLATE_1(boost::shared_ptr)
  QX_TYPE_HAS_OPERATOR_EQUAL_EQUAL_TEMPLATE_1(QSharedPointer)