Now compiles kdelibs/dcop folder properly...

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1158880 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 4c3c7eaa2d
commit c9dc390776

@ -986,6 +986,9 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
# Convert a few items that have changed too subtly to override in the TQT interface layer # Convert a few items that have changed too subtly to override in the TQT interface layer
find ./ -type f -iname "*.c*" -exec sed -i 's/->children()/->tqchildren()/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/->children()/->tqchildren()/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/access != QMetaData::/tqaccess != QMetaData::/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/access != QMetaData::/tqaccess != QMetaData::/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/colorTable()/ptrColorTable()/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/QStyleOption::Default/QStyleOption::TQSO_Default/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/::qt_cast/tqqt_cast/g' {} \;
# Back out some common mistakes # Back out some common mistakes
find ./ -type f -iname "*.c*" -exec sed -i 's/\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)TQ/\1Q/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)TQ/\1Q/g' {} \;

@ -21,3 +21,7 @@ Boston, MA 02110-1301, USA.
#include <tqt.h> #include <tqt.h>
#include <private/tqucomextra_p.h> #include <private/tqucomextra_p.h>
#ifdef USE_QT4
#endif

@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QUComExtra_P class // Reimplement the QUComExtra_P class
// For Qt3, no changes are needed // For Qt3, no changes are needed
#include <private/tqucomextra_p.h> #include <tqucomextra_p.h>
#endif // USE_QT3 #endif // USE_QT3
@ -38,7 +38,10 @@ Boston, MA 02110-1301, USA.
// Reimplement the QUComExtra_P class // Reimplement the QUComExtra_P class
// For Qt4, some changes are needed // For Qt4, some changes are needed
//#include <Qt/q3asciidict.h> class QUObject: public QObject {
public:
// bool qt_invoke();
};
#endif // USE_QT4 #endif // USE_QT4

@ -40,6 +40,92 @@ Boston, MA 02110-1301, USA.
//#include <Qt/qcleanuphandler.h> //#include <Qt/qcleanuphandler.h>
#include "tqptrlist.h"
template<class Type>
class TQCleanupHandler
{
public:
TQCleanupHandler() : cleanupObjects( 0 ) {}
~TQCleanupHandler() { clear(); }
Type* add( Type **object ) {
if ( !cleanupObjects )
cleanupObjects = new Q3PtrList<Type*>;
cleanupObjects->insert( 0, object );
return *object;
}
void remove( Type **object ) {
if ( !cleanupObjects )
return;
if ( cleanupObjects->findRef( object ) >= 0 )
(void) cleanupObjects->take();
}
bool isEmpty() const {
return cleanupObjects ? cleanupObjects->isEmpty() : TRUE;
}
void clear() {
if ( !cleanupObjects )
return;
Q3PtrListIterator<Type*> it( *cleanupObjects );
Type **object;
while ( ( object = it.current() ) ) {
delete *object;
*object = 0;
cleanupObjects->remove( object );
}
delete cleanupObjects;
cleanupObjects = 0;
}
private:
Q3PtrList<Type*> *cleanupObjects;
};
template<class Type>
class TQSingleCleanupHandler
{
public:
TQSingleCleanupHandler() : object( 0 ) {}
~TQSingleCleanupHandler() {
if ( object ) {
delete *object;
*object = 0;
}
}
Type* set( Type **o ) {
object = o;
return *object;
}
void reset() { object = 0; }
private:
Type **object;
};
template<class Type>
class TQSharedCleanupHandler
{
public:
TQSharedCleanupHandler() : object( 0 ) {}
~TQSharedCleanupHandler() {
if ( object ) {
if ( (*object)->deref() )
delete *object;
*object = 0;
}
}
Type* set( Type **o ) {
object = o;
return *object;
}
void reset() { object = 0; }
private:
Type **object;
};
#endif // USE_QT4 #endif // USE_QT4
#endif /* TQCLEANUPHANDLER_H */ #endif /* TQCLEANUPHANDLER_H */

@ -38,6 +38,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QCommonStyle class // Reimplement the QCommonStyle class
// For Qt4, some changes are needed // For Qt4, some changes are needed
#include <tqstyle.h>
#include <Qt/qcommonstyle.h> #include <Qt/qcommonstyle.h>
#endif // USE_QT4 #endif // USE_QT4

@ -29,4 +29,8 @@ static TQEventLoop *eventLoop ()
return static_cast<TQEventLoop *>(QAbstractEventDispatcher::instance()); return static_cast<TQEventLoop *>(QAbstractEventDispatcher::instance());
} }
bool TQEventLoop::processEvents( ProcessEventsFlags flags ) {
return QEventLoop::processEvents((ProcessEventsFlag)flags);
}
#endif #endif

@ -41,10 +41,21 @@ Boston, MA 02110-1301, USA.
#include <Qt/qeventloop.h> #include <Qt/qeventloop.h>
#include <Qt/qabstracteventdispatcher.h> #include <Qt/qabstracteventdispatcher.h>
class TQEventLoop : public QAbstractEventDispatcher { class TQEventLoop : public QAbstractEventDispatcher, QEventLoop {
public: public:
static TQEventLoop *eventLoop (); static TQEventLoop *eventLoop ();
//void WaitForMore ();
enum ProcessEvents {
AllEvents = QEventLoop::AllEvents,
ExcludeUserInput = QEventLoop::ExcludeUserInputEvents,
ExcludeSocketNotifiers = QEventLoop::ExcludeSocketNotifiers,
WaitForMore = QEventLoop::WaitForMoreEvents
};
typedef uint ProcessEventsFlags;
bool processEvents( ProcessEventsFlags flags );
}; };
#endif // USE_QT4 #endif // USE_QT4

@ -21,3 +21,49 @@ Boston, MA 02110-1301, USA.
#include <tqt.h> #include <tqt.h>
#include <tqimage.h> #include <tqimage.h>
#ifdef USE_QT4
QRgb *QImage::ptrColorTable() const {
return colorTable().data();
}
TQImageIO::TQImageIO() {
m_imageReader = new QImageReader();
m_imageWriter = new QImageWriter();
}
TQImageIO::TQImageIO( QIODevice *ioDevice, const char *format ) {
m_imageReader = new QImageReader(ioDevice, format);
m_imageWriter = new QImageWriter(ioDevice, format);
}
TQImageIO::TQImageIO( const QString &fileName, const char* format ) {
m_imageReader = new QImageReader(fileName, format);
m_imageWriter = new QImageWriter(fileName, format);
}
TQImageIO::~TQImageIO() {
delete m_imageReader;
delete m_imageWriter;
}
bool TQImageIO::read() {
m_currentImage = m_imageReader->read();
if (m_currentImage.isNull() == true)
return false;
return true;
}
bool TQImageIO::write() {
return m_imageWriter->write(m_currentImage);
}
const QImage &TQImageIO::image() const {
return m_currentImage;
}
void TQImageIO::setImage( const QImage & image ) {
m_currentImage = image;
}
#endif // USE_QT4

@ -38,7 +38,29 @@ Boston, MA 02110-1301, USA.
// Reimplement the QImage class // Reimplement the QImage class
// For Qt4, some changes are needed // For Qt4, some changes are needed
#include <Qt/qimage.h> #include <tqt4/Qt/qimage.h>
#include <Qt/qimagereader.h>
#include <Qt/qimagewriter.h>
class TQImageIO {
public:
TQImageIO();
TQImageIO( QIODevice *ioDevice, const char *format );
TQImageIO( const QString &fileName, const char* format );
~TQImageIO();
bool read();
bool write();
const QImage &image() const;
void setImage( const QImage & );
protected:
QImageReader *m_imageReader;
QImageWriter *m_imageWriter;
QImage m_currentImage;
};
#endif // USE_QT4 #endif // USE_QT4

@ -34,7 +34,7 @@ Boston, MA 02110-1301, USA.
int QMetaObject::numSlots( bool super ) const // number of slots int QMetaObject::numSlots( bool super ) const // number of slots
{ {
int i; int i;
int n; int n=0;
for (i=0;i<methodCount();i++) { for (i=0;i<methodCount();i++) {
if (method(i).methodType() == QMetaMethod::Slot) { if (method(i).methodType() == QMetaMethod::Slot) {
n++; n++;
@ -56,7 +56,7 @@ int QMetaObject::numSlots( bool super ) const // number of slots
int QMetaObject::numSignals( bool super ) const // number of signals int QMetaObject::numSignals( bool super ) const // number of signals
{ {
int i; int i;
int n; int n=0;
for (i=0;i<methodCount();i++) { for (i=0;i<methodCount();i++) {
if (method(i).methodType() == QMetaMethod::Signal) { if (method(i).methodType() == QMetaMethod::Signal) {
n++; n++;
@ -125,12 +125,14 @@ const QMetaMethod* QMetaObject::signal( int index, bool super ) const
If \a super is TRUE, inherited signals are included. If \a super is TRUE, inherited signals are included.
*/ */
QStringList QMetaObject::signalNames( bool super ) const TQT_QT_STRING_LIST_TYPE QMetaObject::signalNames( bool super ) const
{ {
QStringList l( FALSE ); TQT_QT_STRING_LIST_TYPE l( FALSE );
int n = numSignals( super ); int n = methodCount();
for( int i = 0; i < n; ++i ) { for( int i = 0; i < n; ++i ) {
l.append( signal(i, super)->signature() ); if (method(i).methodType() == QMetaMethod::Signal) {
l.append( normalizedSignature(signal(i, super)->signature()) );
}
} }
return l; return l;
} }
@ -142,13 +144,160 @@ QStringList QMetaObject::signalNames( bool super ) const
\sa numSlots() \sa numSlots()
*/ */
QStringList QMetaObject::slotNames( bool super ) const TQT_QT_STRING_LIST_TYPE QMetaObject::slotNames( bool super ) const
{ {
QStringList l( FALSE ); TQT_QT_STRING_LIST_TYPE l( FALSE );
int n = numSlots( super ); int n = methodCount();
for( int i = 0; i < n; ++i ) for( int i = 0; i < n; ++i )
l.append( slot( i, super)->signature() ); if (method(i).methodType() == QMetaMethod::Slot) {
l.append( normalizedSignature(slot( i, super)->signature()) );
}
return l; return l;
} }
/*! \internal
Returns the index of the slot with name \n or -1 if no such slot exists.
If \a super is TRUE, inherited slots are included.
FIXME: Superclass handling is badly broken
*/
int QMetaObject::findSlot( const char* n, bool super ) const
{
TQT_QT_STRING_LIST_TYPE l( FALSE );
int m = methodCount();
for( int i = 0; i < m; ++i ) {
if ( normalizedSignature(slot( i, super)->signature()) == QByteArray(n) ) {
if (method(i).methodType() == QMetaMethod::Slot) {
return i;
}
}
}
return -1;
}
/*! \internal
Returns the index of the signal with name \n or -1 if no such signal exists.
If \a super is TRUE, inherited signals are included.
FIXME: Superclass handling is badly broken
*/
int QMetaObject::findSignal( const char* n, bool super ) const
{
TQT_QT_STRING_LIST_TYPE l( FALSE );
int m = methodCount();
for( int i = 0; i < m; ++i ) {
if ( normalizedSignature(signal( i, super)->signature()) == QByteArray(n) ) {
if (method(i).methodType() == QMetaMethod::Signal) {
return i;
}
}
}
return -1;
}
#ifndef QT_NO_PROPERTIES
/*!
Returns the number of properties for this class.
If \a super is TRUE, inherited properties are included.
\sa propertyNames()
*/
int QMetaObject::numProperties( bool super ) const // number of signals
{
int i;
int n=0;
for (i=0;i<propertyCount();i++) {
// if (property(i).propertyType() == QMetaProperty::Property) {
n++;
// }
}
if ( !super || !superClass() )
return n;
return n + superClass()->numProperties( super );
}
/*!
Returns the property meta data for the property at index \a index
or 0 if no such property exists.
If \a super is TRUE, inherited properties are included.
\sa propertyNames()
FIXME: Superclass handling is badly broken
*/
const QMetaProperty* QMetaObject::property( int index, bool super ) const
{
QMetaProperty mp;
const QMetaProperty *pr;
int idx = index - ( super ? propertyOffset() : 0 );
// if ( d->propData && idx >= 0 && idx < (int)d->numPropData )
if ( idx >= 0 && idx < numProperties(true) )
mp = property(idx);
pr = &mp;
return pr;
if ( !super || !superClass() )
return 0;
return superClass()->property( index, super );
}
/*!
Returns a list with the names of all this class's properties.
If \a super is TRUE, inherited properties are included.
\sa property()
*/
TQT_QT_STRING_LIST_TYPE QMetaObject::propertyNames( bool super ) const
{
// TQT_QT_STRING_LIST_TYPE l( FALSE );
//
// if ( superclass && super ) {
// QStrList sl = superclass->propertyNames( super );
// for ( QStrListIterator slit( sl ); slit.current(); ++slit )
// l.append( slit.current() );
// }
//
// for( int i = 0; i < d->numPropData; ++i ) {
// if ( d->propData[i].isValid() )
// l.append( d->propData[i].name() );
// }
//
// return l;
TQT_QT_STRING_LIST_TYPE l( FALSE );
int n = numProperties( super );
for( int i = 0; i < n; ++i )
l.append( property( i, super)->name() );
return l;
}
/*!
Returns the index for the property with name \a name or -1 if no
such property exists.
If \a super is TRUE, inherited properties are included.
\sa property(), propertyNames()
FIXME: Superclass handling is badly broken
*/
int QMetaObject::findProperty( const char *name, bool super ) const
{
return indexOfProperty( name );
}
#endif // QT_NO_PROPERTIES
bool QMetaProperty::writable() const
{
return isWritable();
}
#endif // USE_QT4 #endif // USE_QT4

@ -41,7 +41,7 @@ Boston, MA 02110-1301, USA.
// For Qt4, some changes are needed // For Qt4, some changes are needed
#include <tqt4/Qt/qobjectdefs.h> #include <tqt4/Qt/qobjectdefs.h>
#include <Qt/qmetaobject.h> #include <tqt4/Qt/qmetaobject.h>
#endif // USE_QT4 #endif // USE_QT4

@ -40,8 +40,15 @@ static const QObjectList *objectTrees() {
const QObjectList *QObject::ptrchildren() const { const QObjectList *QObject::ptrchildren() const {
QObjectList ql; QObjectList ql;
QObjectList *qlr;
ql = this->children(); ql = this->children();
return &ql; qlr = &ql;
return qlr;
}
bool QObject::qt_invoke(int slot, QUObject* uo) {
QMetaMethod method = uo->metaObject()->method(slot);
return method.invoke(this, Qt::DirectConnection);
} }
#endif #endif

@ -21,3 +21,11 @@ Boston, MA 02110-1301, USA.
#include <tqt.h> #include <tqt.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#ifdef USE_QT4
bool QPixmap::convertFromImage(const QImage &img, int flags) {
return convertFromImage(img, (Qt::ImageConversionFlags)flags);
}
#endif // USE_QT4

@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QPixmap class // Reimplement the QPixmap class
// For Qt4, some changes are needed // For Qt4, some changes are needed
#include <Qt/qpixmap.h> #include <tqt4/Qt/qpixmap.h>
#endif // USE_QT4 #endif // USE_QT4

@ -21,3 +21,20 @@ Boston, MA 02110-1301, USA.
#include <tqt.h> #include <tqt.h>
#include <tqpointarray.h> #include <tqpointarray.h>
#ifdef USE_QT4
/*!
\internal
Constructs a point array with \a nPoints points, taken from the
\a points array.
Equivalent to setPoints(nPoints, points).
*/
Q3PointArray::Q3PointArray( int nPoints, const QCOORD *points )
{
setPoints( nPoints, points );
}
#endif // USE_QT4

@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QAccel class // Reimplement the QAccel class
// For Qt4, some changes are needed // For Qt4, some changes are needed
#include <Qt/q3pointarray.h> #include <tqt4/Qt/q3pointarray.h>
#endif // USE_QT4 #endif // USE_QT4

@ -21,3 +21,9 @@ Boston, MA 02110-1301, USA.
#include <tqt.h> #include <tqt.h>
#include <tqstyle.h> #include <tqstyle.h>
#ifdef USE_QT4
TQStyle::TQStyle() : QStyle() {}
#endif // USE_QT4

@ -39,6 +39,13 @@ Boston, MA 02110-1301, USA.
// For Qt4, some changes are needed // For Qt4, some changes are needed
#include <Qt/qstyle.h> #include <Qt/qstyle.h>
#include <Qt/qstyleoption.h>
class TQStyle : public QStyle {
public:
TQStyle();
virtual ~TQStyle();
};
#endif // USE_QT4 #endif // USE_QT4

@ -50,6 +50,32 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT3 #ifdef USE_QT3
#define tqchildren children #define tqchildren children
#define tqaccess access #define tqaccess access
#define tqcolorTable colorTable
#define TQSO_Default Default
#define tqqt_cast ::qt_cast
#define TQAlignCenter AlignCenter
#define TQNoBrush NoBrush
#define tqred red
#define tqgreen green
#define tqblue blue
#define tqcyan cyan
#define tqmagenta magenta
#define tqyellow yellow
#define tqdarkRed darkRed
#define tqdarkGreen darkGreen
#define tqdarkBlue darkBlue
#define tqdarkCyan darkCyan
#define tqdarkMagenta darkMagenta
#define tqdarkYellow darkYellow
#define tqwhite white
#define tqlightGray lightGray
#define tqgray gray
#define tqdarkGray darkGray
#define tqblack black
#define tqcolor0 color0
#define tqcolor1 color1
#define TQAccel QAccel #define TQAccel QAccel
#define TQAccessible QAccessible #define TQAccessible QAccessible
@ -531,21 +557,170 @@ Boston, MA 02110-1301, USA.
#endif #endif
#ifdef USE_QT4 #ifdef USE_QT4
//#define TQT_QT_STRING_LIST_TYPE QStringList
#define TQT_QT_STRING_LIST_TYPE Q3StrList
#ifdef __cplusplus
class TQT_QT_STRING_LIST_TYPE;
class QUObject;
#include <tqt4/Qt/qobjectdefs.h> #include <tqt4/Qt/qobjectdefs.h>
#include <tqt4/Qt/qlist.h> #include <tqt4/Qt/qlist.h>
#include <tqt4/Qt/qbytearray.h> #include <tqt4/Qt/qbytearray.h>
#include <tqt4/Qt/qobject.h> #include <tqt4/Qt/qobject.h>
#include <tqucomextra_p.h>
#include <tqt4/Qt/qmetaobject.h>
#include <tqeventloop.h> #include <tqeventloop.h>
#include <tqt4/Qt/qimage.h>
#include <tqt4/Qt/qpixmap.h>
#include <tqt4/Qt/qwidget.h>
#include <tqt4/Qt/qapplication.h> #include <tqt4/Qt/qapplication.h>
#include <tqt4/Qt/q3cstring.h> #include <tqt4/Qt/q3cstring.h>
#include <tqt4/Qt/q3pointarray.h>
#include <Qt/q3strlist.h>
#include <Qt/q3popupmenu.h>
#include <tqlistiterator.h> #include <tqlistiterator.h>
#endif // __cplusplus
#define tqchildren ptrchildren #define tqchildren ptrchildren
#define tqaccess access() #define tqaccess access()
#define tqcolorTable ptrColorTable
#define TQSO_Default SO_Default
#define tqqt_cast qobject_cast
#define TQAlignCenter Qt::AlignCenter
#define TQNoBrush Qt::NoBrush
#define QMetaData QMetaMethod #define QMetaData QMetaMethod
#define ColorOnly Qt::ColorOnly
#define MonoOnly Qt::MonoOnly
#define ColorMode_Mask Qt::ColorMode_Mask
#define tqred Qt::red
#define tqgreen Qt::green
#define tqblue Qt::blue
#define tqcyan Qt::cyan
#define tqmagenta Qt::magenta
#define tqyellow Qt::yellow
#define tqdarkRed Qt::darkRed
#define tqdarkGreen Qt::darkGreen
#define tqdarkBlue Qt::darkBlue
#define tqdarkCyan Qt::darkCyan
#define tqdarkMagenta Qt::darkMagenta
#define tqdarkYellow Qt::darkYellow
#define tqwhite Qt::white
#define tqlightGray Qt::lightGray
#define tqgray Qt::gray
#define tqdarkGray Qt::darkGray
#define tqblack Qt::black
#define tqcolor0 Qt::color0
#define tqcolor1 Qt::color1
#define SubRect SubElement
#define SR_PushButtonContents SE_PushButtonContents
#define SR_PushButtonFocusRect SE_PushButtonFocusRect
#define SR_CheckBoxIndicator SE_CheckBoxIndicator
#define SR_CheckBoxContents SE_CheckBoxContents
#define SR_CheckBoxFocusRect SE_CheckBoxFocusRect
#define SR_RadioButtonIndicator SE_RadioButtonIndicator
#define SR_RadioButtonContents SE_RadioButtonContents
#define SR_RadioButtonFocusRect SE_RadioButtonFocusRect
#define SR_ComboBoxFocusRect SE_ComboBoxFocusRect
#define SR_SliderFocusRect SE_SliderFocusRect
#define SR_DockWindowHandleRect SE_DockWindowHandleRect
#define SR_ProgressBarGroove SE_ProgressBarGroove
#define SR_ProgressBarContents SE_ProgressBarContents
#define SR_ProgressBarLabel SE_ProgressBarLabel
#define SR_ToolButtonContents SE_ToolButtonContents
#define SR_DialogButtonAccept SE_DialogButtonAccept
#define SR_DialogButtonReject SE_DialogButtonReject
#define SR_DialogButtonApply SE_DialogButtonApply
#define SR_DialogButtonHelp SE_DialogButtonHelp
#define SR_DialogButtonAll SE_DialogButtonAll
#define SR_DialogButtonAbort SE_DialogButtonAbort
#define SR_DialogButtonIgnore SE_DialogButtonIgnore
#define SR_DialogButtonRetry SE_DialogButtonRetry
#define SR_DialogButtonCustom SE_DialogButtonCustom
#define SR_ToolBoxTabContents SE_ToolBoxTabContents
#define SR_CustomBase SE_CustomBase
#define StylePixmap StandardPixmap
// #define SP_TitleBarMinButton SC_TitleBarMinButton
// #define SP_TitleBarMaxButton SC_TitleBarMaxButton
// #define SP_TitleBarCloseButton SC_TitleBarCloseButton
// #define SP_TitleBarNormalButton SC_TitleBarNormalButton
// #define SP_TitleBarShadeButton SC_TitleBarShadeButton
// #define SP_TitleBarUnshadeButton SC_TitleBarUnshadeButton
// #define SP_DockWindowCloseButton SC_DockWindowCloseButton
// #define SP_MessageBoxInformation SC_MessageBoxInformation
// #define SP_MessageBoxWarning SC_MessageBoxWarning
// #define SP_MessageBoxCritical SC_MessageBoxCritical
// #define SP_MessageBoxQuestion SC_MessageBoxQuestion
// #define SP_CustomBase SC_CustomBase
#define StyleFlags StateFlags
#define Style_Default QStyle::State_Default
#define Style_Enabled QStyle::State_Enabled
#define Style_Raised QStyle::State_Raised
#define Style_Sunken QStyle::State_Sunken
#define Style_Off QStyle::State_Off
#define Style_NoChange QStyle::State_NoChange
#define Style_On QStyle::State_On
#define Style_Down QStyle::State_DownArrow
#define Style_Horizontal QStyle::State_Horizontal
#define Style_HasFocus QStyle::State_HasFocus
#define Style_To QStyle::State_To
#define Style_Bottom QStyle::State_Bottom
#define Style_FocusAtBorder QStyle::State_FocusAtBorder
#define Style_AutoRaise QStyle::State_AutoRaise
#define Style_MouseOver QStyle::State_MouseOver
#define Style_Up QStyle::State_UpArrow
#define Style_Selected QStyle::State_Selected
#define Style_Active QStyle::State_Active
#define Style_ButtonDefault QStyle::State_ButtonDefault
#define PE_ArrowDown PE_IndicatorArrowDown
#define PE_ArrowUp PE_IndicatorArrowUp
#define PE_ButtonTool PE_PanelButtonTool
#define PE_DockWindowHandle PE_IndicatorToolBarHandle
#define PE_DockWindowSeparator PE_Q3DockWindowSeparator
// Verify this one -------------v
#define PE_FocusRect PE_FrameFocusRect
#define PE_Panel PE_Frame
#define PE_RubberBand CE_RubberBand
#define PE_ScrollBarAddLine CE_ScrollBarAddLine
#define PE_ScrollBarAddPage CE_ScrollBarAddPage
#define PE_ScrollBarFirst CE_ScrollBarFirst
#define PE_ScrollBarLast CE_ScrollBarLast
#define PE_ScrollBarSlider CE_ScrollBarSlider
#define PE_ScrollBarSubLine CE_ScrollBarSubLine
#define PE_ScrollBarSubPage CE_ScrollBarSubPage
#define SC_ListView SC_Q3ListView
#define SC_ListViewBranch SC_Q3ListViewBranch
#define SC_ListViewExpand SC_Q3ListViewExpand
#define WState Qt::WidgetAttribute
#define WState_Polished Qt::WA_WState_Polished
#define SH_PopupMenu_Scrollable SH_Menu_Scrollable
#define SH_PopupMenu_SloppySubMenus SH_Menu_SloppySubMenus
#define SH_PopupMenu_SubMenuPopupDelay SH_Menu_SubMenuPopupDelay
#define SH_PopupMenu_AllowActiveAndDisabled SH_Menu_AllowActiveAndDisabled
#define SH_PopupMenu_MouseTracking SH_Menu_MouseTracking
#define CE_PopupMenuScroller CE_MenuScroller
#define PM_DockWindowHandleExtent PM_DockWidgetHandleExtent
#define PM_MenuBarFrameWidth PM_ToolBarFrameWidth
#define PM_DockWindowFrameWidth PM_DockWidgetFrameWidth
#define PM_PopupMenuScrollerHeight PM_MenuScrollerHeight
#define TQAccel Q3Accel #define TQAccel Q3Accel
#define TQAccessible QAccessible #define TQAccessible QAccessible
#define TQAccessibleObject QAccessibleObject #define TQAccessibleObject QAccessibleObject
@ -599,9 +774,9 @@ Boston, MA 02110-1301, USA.
#define TQCanvasText Q3CanvasText #define TQCanvasText Q3CanvasText
#define TQCDEStyle QCDEStyle #define TQCDEStyle QCDEStyle
#define TQCheckBox QCheckBox #define TQCheckBox QCheckBox
#define TQCleanupHandler QCleanupHandler // #define TQCleanupHandler QCleanupHandler
#define TQSingleCleanupHandler QSingleCleanupHandler // #define TQSingleCleanupHandler QSingleCleanupHandler
#define TQSharedCleanupHandler QSharedCleanupHandler // #define TQSharedCleanupHandler QSharedCleanupHandler
#define TQShared Q3Shared #define TQShared Q3Shared
#define TQColor QColor #define TQColor QColor
#define TQColorDialog QColorDialog #define TQColorDialog QColorDialog
@ -760,7 +935,7 @@ Boston, MA 02110-1301, USA.
#define TQImageFormatPlugin QImageFormatPlugin #define TQImageFormatPlugin QImageFormatPlugin
#define TQImageTextKeyLang QImageTextKeyLang #define TQImageTextKeyLang QImageTextKeyLang
#define TQImage QImage #define TQImage QImage
#define TQImageIO QImageIO //#define TQImageIO QImageIO
#define TQInputContextFactory QInputContextFactory #define TQInputContextFactory QInputContextFactory
#define TQInputContext QInputContext #define TQInputContext QInputContext
#define TQIntCache Q3IntCache #define TQIntCache Q3IntCache
@ -932,7 +1107,7 @@ Boston, MA 02110-1301, USA.
#define TQStrIVec QStrIVec #define TQStrIVec QStrIVec
#define TQStyleFactory QStyleFactory #define TQStyleFactory QStyleFactory
#define TQStyleOption QStyleOption #define TQStyleOption QStyleOption
#define TQStyle QStyle //#define TQStyle QStyle
#define TQStyleHintReturn QStyleHintReturn #define TQStyleHintReturn QStyleHintReturn
#define TQStylePlugin QStylePlugin #define TQStylePlugin QStylePlugin
#define TQStyleSheetItem Q3StyleSheetItem #define TQStyleSheetItem Q3StyleSheetItem

@ -0,0 +1,75 @@
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the Qt3Support module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef Q3POINTARRAY_H
#define Q3POINTARRAY_H
#include <QtGui/qpolygon.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Qt3SupportLight)
class Q_COMPAT_EXPORT Q3PointArray : public QPolygon
{
public:
inline Q3PointArray() : QPolygon() {}
inline Q3PointArray(const QRect &r, bool closed=false) : QPolygon(r, closed) {}
inline Q3PointArray(const QPolygon& a) : QPolygon(a) {}
Q3PointArray( int nPoints, const QCOORD *points );
inline Q3PointArray copy() const { return *this; }
inline bool isNull() { return isEmpty(); }
void makeEllipse(int x, int y, int w, int h);
#ifndef QT_NO_WMATRIX
void makeArc(int x, int y, int w, int h, int a1, int a2);
void makeArc(int x, int y, int w, int h, int a1, int a2, const QMatrix &matrix);
#endif
Q3PointArray cubicBezier() const;
};
QT_END_NAMESPACE
QT_END_HEADER
#endif // Q3POINTARRAY_H

@ -0,0 +1,362 @@
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QIMAGE_H
#define QIMAGE_H
#include <QtGui/qtransform.h>
#include <QtGui/qpaintdevice.h>
#include <QtGui/qrgb.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qrect.h>
#include <QtCore/qstring.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
class QIODevice;
class QStringList;
class QMatrix;
class QTransform;
class QVariant;
template <class T> class QList;
template <class T> class QVector;
struct QImageData;
class QImageDataMisc; // internal
#ifndef QT_NO_IMAGE_TEXT
class Q_GUI_EXPORT QImageTextKeyLang {
public:
QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
QImageTextKeyLang() { }
QByteArray key;
QByteArray lang;
bool operator< (const QImageTextKeyLang& other) const
{ return key < other.key || (key==other.key && lang < other.lang); }
bool operator== (const QImageTextKeyLang& other) const
{ return key==other.key && lang==other.lang; }
inline bool operator!= (const QImageTextKeyLang &other) const
{ return !operator==(other); }
};
#endif //QT_NO_IMAGE_TEXT
class Q_GUI_EXPORT QImage : public QPaintDevice
{
public:
enum InvertMode { InvertRgb, InvertRgba };
enum Format {
Format_Invalid,
Format_Mono,
Format_MonoLSB,
Format_Indexed8,
Format_RGB32,
Format_ARGB32,
Format_ARGB32_Premultiplied,
Format_RGB16,
Format_ARGB8565_Premultiplied,
Format_RGB666,
Format_ARGB6666_Premultiplied,
Format_RGB555,
Format_ARGB8555_Premultiplied,
Format_RGB888,
Format_RGB444,
Format_ARGB4444_Premultiplied,
#if 0
// reserved for future use
Format_RGB15,
Format_Grayscale16,
Format_Grayscale8,
Format_Grayscale4,
Format_Grayscale4LSB,
Format_Grayscale2,
Format_Grayscale2LSB
#endif
#ifndef qdoc
NImageFormats
#endif
};
QImage();
QImage(const QSize &size, Format format);
QImage(int width, int height, Format format);
QImage(uchar *data, int width, int height, Format format);
QImage(const uchar *data, int width, int height, Format format);
QImage(uchar *data, int width, int height, int bytesPerLine, Format format);
QImage(const uchar *data, int width, int height, int bytesPerLine, Format format);
#ifndef QT_NO_IMAGEFORMAT_XPM
explicit QImage(const char * const xpm[]);
#endif
explicit QImage(const QString &fileName, const char *format = 0);
#ifndef QT_NO_CAST_FROM_ASCII
explicit QImage(const char *fileName, const char *format = 0);
#endif
QImage(const QImage &);
~QImage();
QImage &operator=(const QImage &);
bool isNull() const;
int devType() const;
bool operator==(const QImage &) const;
bool operator!=(const QImage &) const;
operator QVariant() const;
void detach();
bool isDetached() const;
QImage copy(const QRect &rect = QRect()) const;
inline QImage copy(int x, int y, int w, int h) const
{ return copy(QRect(x, y, w, h)); }
Format format() const;
QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const Q_REQUIRED_RESULT;
QImage convertToFormat(Format f, const QVector<QRgb> &colorTable, Qt::ImageConversionFlags flags = Qt::AutoColor) const Q_REQUIRED_RESULT;
int width() const;
int height() const;
QSize size() const;
QRect rect() const;
int depth() const;
#ifdef QT_DEPRECATED
QT_DEPRECATED int numColors() const;
#endif
int colorCount() const;
QRgb color(int i) const;
void setColor(int i, QRgb c);
#ifdef QT_DEPRECATED
QT_DEPRECATED void setNumColors(int);
#endif
void setColorCount(int);
bool allGray() const;
bool isGrayscale() const;
uchar *bits();
const uchar *bits() const;
#ifdef QT_DEPRECATED
QT_DEPRECATED int numBytes() const;
#endif
int byteCount() const;
uchar *scanLine(int);
uchar *scanLine(int) const;
int bytesPerLine() const;
bool valid(int x, int y) const;
bool valid(const QPoint &pt) const;
int pixelIndex(int x, int y) const;
int pixelIndex(const QPoint &pt) const;
QRgb pixel(int x, int y) const;
QRgb pixel(const QPoint &pt) const;
void setPixel(int x, int y, uint index_or_rgb);
void setPixel(const QPoint &pt, uint index_or_rgb);
QVector<QRgb> colorTable() const;
QRgb *ptrColorTable() const;
void setColorTable(const QVector<QRgb> colors);
void fill(uint pixel);
bool hasAlphaChannel() const;
void setAlphaChannel(const QImage &alphaChannel);
QImage alphaChannel() const;
QImage createAlphaMask(Qt::ImageConversionFlags flags = Qt::AutoColor) const;
#ifndef QT_NO_IMAGE_HEURISTIC_MASK
QImage createHeuristicMask(bool clipTight = true) const;
#endif
QImage createMaskFromColor(QRgb color, Qt::MaskMode mode = Qt::MaskInColor) const;
inline QImage scaled(int w, int h, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
Qt::TransformationMode mode = Qt::FastTransformation) const
{ return scaled(QSize(w, h), aspectMode, mode); }
QImage scaled(const QSize &s, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
Qt::TransformationMode mode = Qt::FastTransformation) const;
QImage scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
QImage scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
QImage transformed(const QMatrix &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
static QMatrix trueMatrix(const QMatrix &, int w, int h);
QImage transformed(const QTransform &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
static QTransform trueMatrix(const QTransform &, int w, int h);
QImage mirrored(bool horizontally = false, bool vertically = true) const;
QImage rgbSwapped() const;
void invertPixels(InvertMode = InvertRgb);
bool load(QIODevice *device, const char* format);
bool load(const QString &fileName, const char* format=0);
bool loadFromData(const uchar *buf, int len, const char *format = 0);
inline bool loadFromData(const QByteArray &data, const char* aformat=0)
{ return loadFromData(reinterpret_cast<const uchar *>(data.constData()), data.size(), aformat); }
bool save(const QString &fileName, const char* format=0, int quality=-1) const;
bool save(QIODevice *device, const char* format=0, int quality=-1) const;
static QImage fromData(const uchar *data, int size, const char *format = 0);
inline static QImage fromData(const QByteArray &data, const char *format = 0)
{ return fromData(reinterpret_cast<const uchar *>(data.constData()), data.size(), format); }
int serialNumber() const;
qint64 cacheKey() const;
QPaintEngine *paintEngine() const;
// Auxiliary data
int dotsPerMeterX() const;
int dotsPerMeterY() const;
void setDotsPerMeterX(int);
void setDotsPerMeterY(int);
QPoint offset() const;
void setOffset(const QPoint&);
#ifndef QT_NO_IMAGE_TEXT
QStringList textKeys() const;
QString text(const QString &key = QString()) const;
void setText(const QString &key, const QString &value);
// The following functions are obsolete as of 4.1
QString text(const char* key, const char* lang=0) const;
QList<QImageTextKeyLang> textList() const;
QStringList textLanguages() const;
QString text(const QImageTextKeyLang&) const;
void setText(const char* key, const char* lang, const QString&);
#endif
#ifdef QT3_SUPPORT
enum Endian { BigEndian, LittleEndian, IgnoreEndian };
QT3_SUPPORT_CONSTRUCTOR QImage(int width, int height, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
QT3_SUPPORT_CONSTRUCTOR QImage(const QSize&, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
QT3_SUPPORT_CONSTRUCTOR QImage(uchar *data, int w, int h, int depth, const QRgb *colortable, int numColors, Endian bitOrder);
#ifdef Q_WS_QWS
QT3_SUPPORT_CONSTRUCTOR QImage(uchar *data, int w, int h, int depth, int pbl, const QRgb *colortable, int numColors, Endian bitOrder);
#endif
inline QT3_SUPPORT Endian bitOrder() const {
Format f = format();
return f == Format_Mono ? BigEndian : (f == Format_MonoLSB ? LittleEndian : IgnoreEndian);
}
QT3_SUPPORT QImage convertDepth(int, Qt::ImageConversionFlags flags = Qt::AutoColor) const;
QT3_SUPPORT QImage convertDepthWithPalette(int, QRgb* p, int pc, Qt::ImageConversionFlags flags = Qt::AutoColor) const;
QT3_SUPPORT QImage convertBitOrder(Endian) const;
QT3_SUPPORT bool hasAlphaBuffer() const;
QT3_SUPPORT void setAlphaBuffer(bool);
QT3_SUPPORT uchar **jumpTable();
QT3_SUPPORT const uchar * const *jumpTable() const;
inline QT3_SUPPORT void reset() { *this = QImage(); }
static inline QT3_SUPPORT Endian systemByteOrder()
{ return QSysInfo::ByteOrder == QSysInfo::BigEndian ? BigEndian : LittleEndian; }
inline QT3_SUPPORT QImage swapRGB() const { return rgbSwapped(); }
inline QT3_SUPPORT QImage mirror(bool horizontally = false, bool vertically = true) const
{ return mirrored(horizontally, vertically); }
QT3_SUPPORT bool create(const QSize&, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
QT3_SUPPORT bool create(int width, int height, int depth, int numColors=0, Endian bitOrder=IgnoreEndian);
inline QT3_SUPPORT QImage xForm(const QMatrix &matrix) const { return transformed(QTransform(matrix)); }
inline QT3_SUPPORT QImage smoothScale(int w, int h, Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) const
{ return scaled(QSize(w, h), mode, Qt::SmoothTransformation); }
inline QImage QT3_SUPPORT smoothScale(const QSize &s, Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) const
{ return scaled(s, mode, Qt::SmoothTransformation); }
inline QT3_SUPPORT QImage scaleWidth(int w) const { return scaledToWidth(w); }
inline QT3_SUPPORT QImage scaleHeight(int h) const { return scaledToHeight(h); }
inline QT3_SUPPORT void invertPixels(bool invertAlpha) { invertAlpha ? invertPixels(InvertRgba) : invertPixels(InvertRgb); }
inline QT3_SUPPORT QImage copy(int x, int y, int w, int h, Qt::ImageConversionFlags) const
{ return copy(QRect(x, y, w, h)); }
inline QT3_SUPPORT QImage copy(const QRect &rect, Qt::ImageConversionFlags) const
{ return copy(rect); }
static QT3_SUPPORT Endian systemBitOrder();
inline QT3_SUPPORT_CONSTRUCTOR QImage(const QByteArray &data)
{ d = 0; *this = QImage::fromData(data); }
#endif
protected:
virtual int metric(PaintDeviceMetric metric) const;
private:
friend class QWSOnScreenSurface;
QImageData *d;
friend class QRasterPixmapData;
friend class QPixmapCacheEntry;
friend Q_GUI_EXPORT qint64 qt_image_id(const QImage &image);
friend const QVector<QRgb> *qt_image_colortable(const QImage &image);
public:
typedef QImageData * DataPtr;
inline DataPtr &data_ptr() { return d; }
};
Q_DECLARE_SHARED(QImage)
Q_DECLARE_TYPEINFO(QImage, Q_MOVABLE_TYPE);
// Inline functions...
Q_GUI_EXPORT_INLINE bool QImage::valid(const QPoint &pt) const { return valid(pt.x(), pt.y()); }
Q_GUI_EXPORT_INLINE int QImage::pixelIndex(const QPoint &pt) const { return pixelIndex(pt.x(), pt.y());}
Q_GUI_EXPORT_INLINE QRgb QImage::pixel(const QPoint &pt) const { return pixel(pt.x(), pt.y()); }
Q_GUI_EXPORT_INLINE void QImage::setPixel(const QPoint &pt, uint index_or_rgb) { setPixel(pt.x(), pt.y(), index_or_rgb); }
// QImage stream functions
#if !defined(QT_NO_DATASTREAM)
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QImage &);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QImage &);
#endif
#ifdef QT3_SUPPORT
Q_GUI_EXPORT QT3_SUPPORT void bitBlt(QImage* dst, int dx, int dy, const QImage* src,
int sx=0, int sy=0, int sw=-1, int sh=-1, Qt::ImageConversionFlags flags = Qt::AutoColor);
#endif
QT_END_NAMESPACE
QT_END_HEADER
#endif // QIMAGE_H

@ -0,0 +1,240 @@
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QMETAOBJECT_H
#define QMETAOBJECT_H
#include <QtCore/qobjectdefs.h>
#include <QtCore/qvariant.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Core)
template <typename T> class QList;
class Q_CORE_EXPORT QMetaMethod
{
public:
inline QMetaMethod() : mobj(0),handle(0) {}
const char *signature() const;
const char *typeName() const;
QList<QByteArray> parameterTypes() const;
QList<QByteArray> parameterNames() const;
const char *tag() const;
enum Access { Private, Protected, Public };
Access access() const;
enum MethodType { Method, Signal, Slot, Constructor };
MethodType methodType() const;
enum Attributes { Compatibility = 0x1, Cloned = 0x2, Scriptable = 0x4 };
int attributes() const;
int methodIndex() const;
inline const QMetaObject *enclosingMetaObject() const { return mobj; }
bool invoke(QObject *object,
Qt::ConnectionType connectionType,
QGenericReturnArgument returnValue,
QGenericArgument val0 = QGenericArgument(0),
QGenericArgument val1 = QGenericArgument(),
QGenericArgument val2 = QGenericArgument(),
QGenericArgument val3 = QGenericArgument(),
QGenericArgument val4 = QGenericArgument(),
QGenericArgument val5 = QGenericArgument(),
QGenericArgument val6 = QGenericArgument(),
QGenericArgument val7 = QGenericArgument(),
QGenericArgument val8 = QGenericArgument(),
QGenericArgument val9 = QGenericArgument()) const;
inline bool invoke(QObject *object,
QGenericReturnArgument returnValue,
QGenericArgument val0 = QGenericArgument(0),
QGenericArgument val1 = QGenericArgument(),
QGenericArgument val2 = QGenericArgument(),
QGenericArgument val3 = QGenericArgument(),
QGenericArgument val4 = QGenericArgument(),
QGenericArgument val5 = QGenericArgument(),
QGenericArgument val6 = QGenericArgument(),
QGenericArgument val7 = QGenericArgument(),
QGenericArgument val8 = QGenericArgument(),
QGenericArgument val9 = QGenericArgument()) const
{
return invoke(object, Qt::AutoConnection, returnValue,
val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
}
inline bool invoke(QObject *object,
Qt::ConnectionType connectionType,
QGenericArgument val0 = QGenericArgument(0),
QGenericArgument val1 = QGenericArgument(),
QGenericArgument val2 = QGenericArgument(),
QGenericArgument val3 = QGenericArgument(),
QGenericArgument val4 = QGenericArgument(),
QGenericArgument val5 = QGenericArgument(),
QGenericArgument val6 = QGenericArgument(),
QGenericArgument val7 = QGenericArgument(),
QGenericArgument val8 = QGenericArgument(),
QGenericArgument val9 = QGenericArgument()) const
{
return invoke(object, connectionType, QGenericReturnArgument(),
val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
}
inline bool invoke(QObject *object,
QGenericArgument val0 = QGenericArgument(0),
QGenericArgument val1 = QGenericArgument(),
QGenericArgument val2 = QGenericArgument(),
QGenericArgument val3 = QGenericArgument(),
QGenericArgument val4 = QGenericArgument(),
QGenericArgument val5 = QGenericArgument(),
QGenericArgument val6 = QGenericArgument(),
QGenericArgument val7 = QGenericArgument(),
QGenericArgument val8 = QGenericArgument(),
QGenericArgument val9 = QGenericArgument()) const
{
return invoke(object, Qt::AutoConnection, QGenericReturnArgument(),
val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
}
private:
const QMetaObject *mobj;
uint handle;
friend struct QMetaObject;
};
Q_DECLARE_TYPEINFO(QMetaMethod, Q_MOVABLE_TYPE);
class Q_CORE_EXPORT QMetaEnum
{
public:
inline QMetaEnum() : mobj(0),handle(0) {}
const char *name() const;
bool isFlag() const;
int keyCount() const;
const char *key(int index) const;
int value(int index) const;
const char *scope() const;
int keyToValue(const char *key) const;
const char* valueToKey(int value) const;
int keysToValue(const char * keys) const;
QByteArray valueToKeys(int value) const;
inline const QMetaObject *enclosingMetaObject() const { return mobj; }
inline bool isValid() const { return name() != 0; }
private:
const QMetaObject *mobj;
uint handle;
friend struct QMetaObject;
};
Q_DECLARE_TYPEINFO(QMetaEnum, Q_MOVABLE_TYPE);
class Q_CORE_EXPORT QMetaProperty
{
public:
QMetaProperty();
const char *name() const;
const char *typeName() const;
QVariant::Type type() const;
int userType() const;
int propertyIndex() const;
bool isReadable() const;
bool isWritable() const;
bool isResettable() const;
bool isDesignable(const QObject *obj = 0) const;
bool isScriptable(const QObject *obj = 0) const;
bool isStored(const QObject *obj = 0) const;
bool isEditable(const QObject *obj = 0) const;
bool isUser(const QObject *obj = 0) const;
bool isConstant() const;
bool isFinal() const;
bool isFlagType() const;
bool isEnumType() const;
QMetaEnum enumerator() const;
bool hasNotifySignal() const;
QMetaMethod notifySignal() const;
int notifySignalIndex() const;
QVariant read(const QObject *obj) const;
bool write(QObject *obj, const QVariant &value) const;
bool reset(QObject *obj) const;
bool hasStdCppSet() const;
inline bool isValid() const { return isReadable(); }
inline const QMetaObject *enclosingMetaObject() const { return mobj; }
private:
const QMetaObject *mobj;
uint handle;
int idx;
QMetaEnum menum;
friend struct QMetaObject;
public:
bool writable() const;
};
class Q_CORE_EXPORT QMetaClassInfo
{
public:
inline QMetaClassInfo() : mobj(0),handle(0) {}
const char *name() const;
const char *value() const;
inline const QMetaObject *enclosingMetaObject() const { return mobj; }
private:
const QMetaObject *mobj;
uint handle;
friend struct QMetaObject;
};
Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMETAOBJECT_H

@ -191,6 +191,7 @@ public:
inline const QObjectList &children() const { return d_ptr->children; } inline const QObjectList &children() const { return d_ptr->children; }
const QObjectList *ptrchildren() const; const QObjectList *ptrchildren() const;
static const QObjectList *objectTrees(); static const QObjectList *objectTrees();
bool qt_invoke(int slot, QUObject *uo);
void setParent(QObject *); void setParent(QObject *);
void installEventFilter(QObject *); void installEventFilter(QObject *);

@ -450,8 +450,16 @@ struct Q_CORE_EXPORT QMetaObject
int numSignals( bool super = FALSE ) const; int numSignals( bool super = FALSE ) const;
const QMetaMethod *slot( int index, bool super = FALSE ) const; const QMetaMethod *slot( int index, bool super = FALSE ) const;
const QMetaMethod *signal( int index, bool super = FALSE ) const; const QMetaMethod *signal( int index, bool super = FALSE ) const;
QStringList slotNames( bool super = FALSE ) const; TQT_QT_STRING_LIST_TYPE slotNames( bool super = FALSE ) const;
QStringList signalNames( bool super = FALSE ) const; TQT_QT_STRING_LIST_TYPE signalNames( bool super = FALSE ) const;
int findSlot( const char *, bool super = FALSE ) const;
int findSignal( const char *, bool super = FALSE ) const;
#ifndef QT_NO_PROPERTIES
int numProperties( bool super = FALSE ) const;
const QMetaProperty *property( int index, bool super ) const;
TQT_QT_STRING_LIST_TYPE propertyNames( bool super = FALSE ) const;
int findProperty( const char *name, bool super ) const;
#endif
struct { // private data struct { // private data
const QMetaObject *superdata; const QMetaObject *superdata;

@ -0,0 +1,330 @@
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QPIXMAP_H
#define QPIXMAP_H
#include <QtGui/qpaintdevice.h>
#include <QtGui/qcolor.h>
#include <QtCore/qnamespace.h>
#include <QtCore/qstring.h> // char*->QString conversion
#include <QtCore/qsharedpointer.h>
#include <QtGui/qimage.h>
#include <QtGui/qtransform.h>
QT_BEGIN_HEADER
#if defined(Q_OS_SYMBIAN)
class CFbsBitmap;
class RSgImage;
#endif
QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
class QImageWriter;
class QColor;
class QVariant;
class QX11Info;
class QPixmapData;
class Q_GUI_EXPORT QPixmap : public QPaintDevice
{
public:
QPixmap();
explicit QPixmap(QPixmapData *data);
QPixmap(int w, int h);
QPixmap(const QSize &);
QPixmap(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
#ifndef QT_NO_IMAGEFORMAT_XPM
QPixmap(const char * const xpm[]);
#endif
QPixmap(const QPixmap &);
~QPixmap();
QPixmap &operator=(const QPixmap &);
operator QVariant() const;
bool isNull() const; // ### Qt 5: make inline
int devType() const;
int width() const; // ### Qt 5: make inline
int height() const; // ### Qt 5: make inline
QSize size() const;
QRect rect() const;
int depth() const;
static int defaultDepth();
void fill(const QColor &fillColor = Qt::white);
void fill(const QWidget *widget, const QPoint &ofs);
inline void fill(const QWidget *widget, int xofs, int yofs) { fill(widget, QPoint(xofs, yofs)); }
QBitmap mask() const;
void setMask(const QBitmap &);
QPixmap alphaChannel() const;
void setAlphaChannel(const QPixmap &);
bool hasAlpha() const;
bool hasAlphaChannel() const;
#ifndef QT_NO_IMAGE_HEURISTIC_MASK
QBitmap createHeuristicMask(bool clipTight = true) const;
#endif
QBitmap createMaskFromColor(const QColor &maskColor) const; // ### Qt 5: remove
QBitmap createMaskFromColor(const QColor &maskColor, Qt::MaskMode mode) const;
static QPixmap grabWindow(WId, int x=0, int y=0, int w=-1, int h=-1);
static QPixmap grabWidget(QWidget *widget, const QRect &rect);
static inline QPixmap grabWidget(QWidget *widget, int x=0, int y=0, int w=-1, int h=-1)
{ return grabWidget(widget, QRect(x, y, w, h)); }
inline QPixmap scaled(int w, int h, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
Qt::TransformationMode mode = Qt::FastTransformation) const
{ return scaled(QSize(w, h), aspectMode, mode); }
QPixmap scaled(const QSize &s, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio,
Qt::TransformationMode mode = Qt::FastTransformation) const;
QPixmap scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
QPixmap scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
QPixmap transformed(const QMatrix &, Qt::TransformationMode mode = Qt::FastTransformation) const;
static QMatrix trueMatrix(const QMatrix &m, int w, int h);
QPixmap transformed(const QTransform &, Qt::TransformationMode mode = Qt::FastTransformation) const;
static QTransform trueMatrix(const QTransform &m, int w, int h);
QImage toImage() const;
static QPixmap fromImage(const QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool load(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool loadFromData(const uchar *buf, uint len, const char* format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
inline bool loadFromData(const QByteArray &data, const char* format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
bool save(const QString& fileName, const char* format = 0, int quality = -1) const;
bool save(QIODevice* device, const char* format = 0, int quality = -1) const;
#if defined(Q_WS_WIN)
enum HBitmapFormat {
NoAlpha,
PremultipliedAlpha,
Alpha
};
HBITMAP toWinHBITMAP(HBitmapFormat format = NoAlpha) const;
HICON toWinHICON() const;
static QPixmap fromWinHBITMAP(HBITMAP hbitmap, HBitmapFormat format = NoAlpha);
static QPixmap fromWinHICON(HICON hicon);
#endif
#if defined(Q_WS_MAC)
CGImageRef toMacCGImageRef() const;
static QPixmap fromMacCGImageRef(CGImageRef image);
#endif
#if defined(Q_OS_SYMBIAN)
CFbsBitmap *toSymbianCFbsBitmap() const;
static QPixmap fromSymbianCFbsBitmap(CFbsBitmap *bitmap);
RSgImage* toSymbianRSgImage() const;
static QPixmap fromSymbianRSgImage(RSgImage *sgImage);
#endif
inline QPixmap copy(int x, int y, int width, int height) const;
QPixmap copy(const QRect &rect = QRect()) const;
inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = 0);
void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0);
int serialNumber() const;
qint64 cacheKey() const;
bool isDetached() const;
void detach();
bool isQBitmap() const;
#if defined(Q_WS_QWS)
const uchar *qwsBits() const;
int qwsBytesPerLine() const;
QRgb *clut() const;
#ifdef QT_DEPRECATED
QT_DEPRECATED int numCols() const;
#endif
int colorCount() const;
#elif defined(Q_WS_MAC)
Qt::HANDLE macQDHandle() const;
Qt::HANDLE macQDAlphaHandle() const;
Qt::HANDLE macCGHandle() const;
#elif defined(Q_WS_X11)
enum ShareMode { ImplicitlyShared, ExplicitlyShared };
static QPixmap fromX11Pixmap(Qt::HANDLE pixmap, ShareMode mode = ImplicitlyShared);
static int x11SetDefaultScreen(int screen);
void x11SetScreen(int screen);
const QX11Info &x11Info() const;
Qt::HANDLE x11PictureHandle() const;
#endif
#if defined(Q_WS_X11) || defined(Q_WS_QWS)
Qt::HANDLE handle() const;
#endif
QPaintEngine *paintEngine() const;
inline bool operator!() const { return isNull(); }
protected:
int metric(PaintDeviceMetric) const;
#ifdef QT3_SUPPORT
public:
enum ColorMode { Auto, Color, Mono };
QT3_SUPPORT_CONSTRUCTOR QPixmap(const QString& fileName, const char *format, ColorMode mode);
QT3_SUPPORT bool load(const QString& fileName, const char *format, ColorMode mode);
QT3_SUPPORT bool loadFromData(const uchar *buf, uint len, const char* format, ColorMode mode);
QT3_SUPPORT_CONSTRUCTOR QPixmap(const QImage& image);
QT3_SUPPORT QPixmap &operator=(const QImage &);
inline QT3_SUPPORT QImage convertToImage() const { return toImage(); }
QT3_SUPPORT bool convertFromImage(const QImage &, ColorMode mode);
QT3_SUPPORT bool convertFromImage(const QImage &img, Qt::ImageConversionFlags flags = Qt::AutoColor)
{ (*this) = fromImage(img, flags); return !isNull(); }
QT3_SUPPORT bool convertFromImage(const QImage &img, int flags);
inline QT3_SUPPORT operator QImage() const { return toImage(); }
inline QT3_SUPPORT QPixmap xForm(const QMatrix &matrix) const { return transformed(QTransform(matrix)); }
inline QT3_SUPPORT bool selfMask() const { return false; }
private:
void resize_helper(const QSize &s);
public:
inline QT3_SUPPORT void resize(const QSize &s) { resize_helper(s); }
inline QT3_SUPPORT void resize(int width, int height) { resize_helper(QSize(width, height)); }
#endif
private:
QExplicitlySharedDataPointer<QPixmapData> data;
bool doImageIO(QImageWriter *io, int quality) const;
// ### Qt5: remove the following three lines
enum Type { PixmapType, BitmapType }; // must match QPixmapData::PixelType
QPixmap(const QSize &s, Type);
void init(int, int, Type = PixmapType);
QPixmap(const QSize &s, int type);
void init(int, int, int);
void deref();
#if defined(Q_WS_WIN)
void initAlphaPixmap(uchar *bytes, int length, struct tagBITMAPINFO *bmi);
#endif
Q_DUMMY_COMPARISON_OPERATOR(QPixmap)
#ifdef Q_WS_MAC
friend CGContextRef qt_mac_cg_context(const QPaintDevice*);
friend CGImageRef qt_mac_create_imagemask(const QPixmap&, const QRectF&);
friend IconRef qt_mac_create_iconref(const QPixmap&);
friend quint32 *qt_mac_pixmap_get_base(const QPixmap*);
friend int qt_mac_pixmap_get_bytes_per_line(const QPixmap*);
#endif
friend class QPixmapData;
friend class QX11PixmapData;
friend class QMacPixmapData;
friend class QS60PixmapData;
friend class QBitmap;
friend class QPaintDevice;
friend class QPainter;
friend class QGLWidget;
friend class QX11PaintEngine;
friend class QCoreGraphicsPaintEngine;
friend class QWidgetPrivate;
friend class QRasterPaintEngine;
friend class QRasterBuffer;
friend class QPixmapCacheEntry;
#if !defined(QT_NO_DATASTREAM)
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &);
#endif
friend Q_GUI_EXPORT qint64 qt_pixmap_id(const QPixmap &pixmap);
public:
QPixmapData* pixmapData() const;
public:
typedef QExplicitlySharedDataPointer<QPixmapData> DataPtr;
inline DataPtr &data_ptr() { return data; }
};
Q_DECLARE_SHARED(QPixmap)
inline QPixmap QPixmap::copy(int ax, int ay, int awidth, int aheight) const
{
return copy(QRect(ax, ay, awidth, aheight));
}
inline void QPixmap::scroll(int dx, int dy, int ax, int ay, int awidth, int aheight, QRegion *exposed)
{
scroll(dx, dy, QRect(ax, ay, awidth, aheight), exposed);
}
inline bool QPixmap::loadFromData(const QByteArray &buf, const char *format,
Qt::ImageConversionFlags flags)
{
return loadFromData(reinterpret_cast<const uchar *>(buf.constData()), buf.size(), format, flags);
}
/*****************************************************************************
QPixmap stream functions
*****************************************************************************/
#if !defined(QT_NO_DATASTREAM)
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QPixmap &);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &);
#endif
/*****************************************************************************
QPixmap (and QImage) helper functions
*****************************************************************************/
#ifdef QT3_SUPPORT
QT3_SUPPORT Q_GUI_EXPORT void copyBlt(QPixmap *dst, int dx, int dy, const QPixmap *src,
int sx=0, int sy=0, int sw=-1, int sh=-1);
#endif // QT3_SUPPORT
QT_END_NAMESPACE
QT_END_HEADER
#endif // QPIXMAP_H

File diff suppressed because it is too large Load Diff

@ -21,3 +21,11 @@ Boston, MA 02110-1301, USA.
#include <tqt.h> #include <tqt.h>
#include <tqwidget.h> #include <tqwidget.h>
#ifdef USE_QT4
Qt::WidgetAttribute QWidget::testWState( Qt::WidgetAttribute s ) const {
return (Qt::WidgetAttribute)(data->widget_attributes & s);
}
#endif // USE_QT4

@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QWidget class // Reimplement the QWidget class
// For Qt4, some changes are needed // For Qt4, some changes are needed
#include <Qt/qwidget.h> #include <tqt4/Qt/qwidget.h>
#endif // USE_QT4 #endif // USE_QT4

Loading…
Cancel
Save