tqt-updates-2023

Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
Emanoil Kotsev 8 months ago
parent 24e9ee48f3
commit 601661272f
Signed by: deloptes
GPG Key ID: F1EEB8CD9FB16A50

@ -49,7 +49,7 @@ static SecTQSharedDoubleBuffer* qdb_owner = 0;
static TQCleanupHandler<TQPixmap> qdb_pixmap_cleanup;
#ifdef Q_WS_MACX
#ifdef TQ_WS_MACX
bool SecTQSharedDoubleBuffer::dblbufr = FALSE;
#else
bool SecTQSharedDoubleBuffer::dblbufr = TRUE;
@ -68,7 +68,7 @@ bool SecTQSharedDoubleBuffer::dblbufr = TRUE;
*/
static const int hardLimitWidth = -1;
static const int hardLimitHeight = -1;
#if defined( Q_WS_QWS ) || defined( Q_WS_MAC9 )
#if defined( TQ_WS_QWS ) || defined( TQ_WS_MAC9 )
// Small in TQt/Embedded / Mac9 - 5K on 32bpp
static const int sharedLimitWidth = 64;
static const int sharedLimitHeight = 20;
@ -169,12 +169,12 @@ bool SecTQSharedDoubleBufferCleaner::event( TQEvent *e )
doCleanup();
stop();
}
#ifdef QT_CHECK_STATE
#ifdef TQT_CHECK_STATE
else {
tqWarning( "SecTQSharedDoubleBufferCleaner::event: invalid timer event received." );
return FALSE;
}
#endif // QT_CHECK_STATE
#endif // TQT_CHECK_STATE
return TRUE;
}
@ -322,10 +322,10 @@ SecTQSharedDoubleBuffer::~SecTQSharedDoubleBuffer()
bool SecTQSharedDoubleBuffer::begin( TQPainter* painter, int x, int y, int w, int h )
{
if ( isActive() ) {
#if defined(QT_CHECK_STATE)
#if defined(TQT_CHECK_STATE)
tqWarning( "SecTQSharedDoubleBuffer::begin: Buffer is already active."
"\n\tYou must end() the buffer before a second begin()" );
#endif // QT_CHECK_STATE
#endif // TQT_CHECK_STATE
return FALSE;
}
@ -342,11 +342,11 @@ bool SecTQSharedDoubleBuffer::begin( TQPainter* painter, int x, int y, int w, in
rh = h;
if ( ( pix = getPixmap() ) ) {
#ifdef Q_WS_X11
#ifdef TQ_WS_X11
if ( painter->device()->x11Screen() != pix->x11Screen() )
pix->x11SetScreen( painter->device()->x11Screen() );
TQPixmap::x11SetDefaultScreen( pix->x11Screen() );
#endif // Q_WS_X11
#endif // TQ_WS_X11
state |= BufferActive;
p = new TQPainter( pix );
@ -377,10 +377,10 @@ bool SecTQSharedDoubleBuffer::begin( TQPainter* painter, int x, int y, int w, in
bool SecTQSharedDoubleBuffer::begin( TQWidget* widget, int x, int y, int w, int h )
{
if ( isActive() ) {
#if defined(QT_CHECK_STATE)
#if defined(TQT_CHECK_STATE)
tqWarning( "SecTQSharedDoubleBuffer::begin: Buffer is already active."
"\n\tYou must end() the buffer before a second begin()" );
#endif // QT_CHECK_STATE
#endif // TQT_CHECK_STATE
return FALSE;
}
@ -393,11 +393,11 @@ bool SecTQSharedDoubleBuffer::begin( TQWidget* widget, int x, int y, int w, int
rh = h <= 0 ? wid->height() : h;
if ( ( pix = getPixmap() ) ) {
#ifdef Q_WS_X11
#ifdef TQ_WS_X11
if ( wid->x11Screen() != pix->x11Screen() )
pix->x11SetScreen( wid->x11Screen() );
TQPixmap::x11SetDefaultScreen( pix->x11Screen() );
#endif // Q_WS_X11
#endif // TQ_WS_X11
state |= BufferActive;
if ( flags & InitBG ) {
@ -434,10 +434,10 @@ bool SecTQSharedDoubleBuffer::begin( TQWidget* widget, int x, int y, int w, int
bool SecTQSharedDoubleBuffer::end()
{
if ( ! isActive() ) {
#if defined(QT_CHECK_STATE)
#if defined(TQT_CHECK_STATE)
tqWarning( "SecTQSharedDoubleBuffer::end: Buffer is not active."
"\n\tYou must call begin() before calling end()." );
#endif // QT_CHECK_STATE
#endif // TQT_CHECK_STATE
return FALSE;
}
@ -566,11 +566,11 @@ void SecTQSharedDoubleBuffer::releasePixmap()
if ( qdb_owner != this ) {
// sanity check
#ifdef QT_CHECK_STATE
#ifdef TQT_CHECK_STATE
tqWarning( "SecTQSharedDoubleBuffer::releasePixmap: internal error."
"\n\t%p does not own shared pixmap, %p does.",
(void*)this, (void*)qdb_owner );
#endif // QT_CHECK_STATE
#endif // TQT_CHECK_STATE
return;
}

@ -63,7 +63,7 @@ class TQWidget;
class TQPainter;
class TQPixmap;
class Q_EXPORT SecTQSharedDoubleBuffer
class TQ_EXPORT SecTQSharedDoubleBuffer
{
public:
enum DoubleBufferFlags {

@ -82,11 +82,11 @@
#include "secqinternal_p.h"
#include "private/qtextlayout_p.h"
#include "ntqvaluevector.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
#if defined(TQT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h"
#endif
#ifndef QT_NO_ACCEL
#ifndef TQT_NO_ACCEL
#include "ntqkeysequence.h"
#define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
#else
@ -235,7 +235,7 @@ struct SecTQLineEditPrivate : public TQt
inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; }
inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; }
void removeSelectedText();
#ifndef QT_NO_CLIPBOARD
#ifndef TQT_NO_CLIPBOARD
void copy( bool clipboard = TRUE ) const;
#endif
inline bool inSelection( int x ) const
@ -1018,14 +1018,14 @@ bool SecTQLineEdit::isReadOnly() const
void SecTQLineEdit::setReadOnly( bool enable )
{
d->readOnly = enable;
#ifndef QT_NO_CURSOR
#ifndef TQT_NO_CURSOR
setCursor( enable ? arrowCursor : ibeamCursor );
#endif
update();
}
#ifndef QT_NO_CLIPBOARD
#ifndef TQT_NO_CLIPBOARD
/*!
Copies the selected text to the clipboard and deletes it, if there
is any, and if echoMode() is \c Normal.
@ -1081,7 +1081,7 @@ void SecTQLineEditPrivate::copy( bool clipboard ) const
#endif
}
#endif // !QT_NO_CLIPBOARD
#endif // !TQT_NO_CLIPBOARD
/*!\reimp
*/
@ -1133,7 +1133,7 @@ bool SecTQLineEdit::event( TQEvent * e )
case Key_Z:
case Key_Left:
case Key_Right:
#if defined (Q_WS_WIN)
#if defined (TQ_WS_WIN)
case Key_Insert:
case Key_Delete:
#endif
@ -1177,7 +1177,7 @@ void SecTQLineEdit::mousePressEvent( TQMouseEvent* e )
void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
{
#ifndef QT_NO_CURSOR
#ifndef TQT_NO_CURSOR
if ( ( e->state() & MouseButtonMask ) == 0 ) {
if ( !d->readOnly )
setCursor( ( d->inSelection( e->pos().x() ) ? arrowCursor : ibeamCursor ) );
@ -1193,7 +1193,7 @@ void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
*/
void SecTQLineEdit::mouseReleaseEvent( TQMouseEvent* e )
{
#ifndef QT_NO_CLIPBOARD
#ifndef TQT_NO_CLIPBOARD
if (TQApplication::clipboard()->supportsSelection() ) {
if ( e->button() == LeftButton ) {
d->copy( FALSE );
@ -1252,7 +1252,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( !t.isEmpty() && (!e->ascii() || e->ascii()>=32) &&
e->key() != Key_Delete &&
e->key() != Key_Backspace ) {
#ifdef Q_WS_X11
#ifdef TQ_WS_X11
extern bool tqt_hebrew_keyboard_hack;
if ( tqt_hebrew_keyboard_hack ) {
// the X11 keyboard layout is broken and does not reverse
@ -1277,7 +1277,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( e->state() & ControlButton ) {
switch ( e->key() ) {
case Key_A:
#if defined(Q_WS_X11)
#if defined(TQ_WS_X11)
home( e->state() & ShiftButton );
#else
selectAll();
@ -1286,7 +1286,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
case Key_B:
cursorForward( e->state() & ShiftButton, -1 );
break;
#ifndef QT_NO_CLIPBOARD
#ifndef TQT_NO_CLIPBOARD
case Key_C:
copy();
break;
@ -1316,13 +1316,13 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
d->finishChange( priorState );
}
break;
#if defined(Q_WS_X11)
#if defined(TQ_WS_X11)
case Key_U:
if ( !d->readOnly )
clear();
break;
#endif
#ifndef QT_NO_CLIPBOARD
#ifndef TQT_NO_CLIPBOARD
case Key_V:
if ( !d->readOnly )
paste();
@ -1333,7 +1333,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
del();
}
break;
#if defined (Q_WS_WIN)
#if defined (TQ_WS_WIN)
case Key_Insert:
copy();
break;
@ -1397,20 +1397,20 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
}
break;
case Key_Home:
#ifdef Q_WS_MACX
#ifdef TQ_WS_MACX
case Key_Up:
#endif
home( e->state() & ShiftButton );
break;
case Key_End:
#ifdef Q_WS_MACX
#ifdef TQ_WS_MACX
case Key_Down:
#endif
end( e->state() & ShiftButton );
break;
case Key_Delete:
if ( !d->readOnly ) {
#if defined (Q_WS_WIN)
#if defined (TQ_WS_WIN)
if ( e->state() & ShiftButton ) {
cut();
break;
@ -1419,7 +1419,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
del();
}
break;
#if defined (Q_WS_WIN)
#if defined (TQ_WS_WIN)
case Key_Insert:
if ( !d->readOnly && e->state() & ShiftButton )
paste();
@ -1431,7 +1431,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( !d->readOnly )
undo();
break;
#ifndef QT_NO_CLIPBOARD
#ifndef TQT_NO_CLIPBOARD
case Key_F16: // Copy key on Sun keyboards
copy();
break;
@ -1720,7 +1720,7 @@ void SecTQLineEdit::clipboardChanged()
void SecTQLineEditPrivate::init( const SecTQString& txt )
{
#ifndef QT_NO_CURSOR
#ifndef TQT_NO_CURSOR
q->setCursor( readOnly ? arrowCursor : ibeamCursor );
#endif
q->setFocusPolicy( TQWidget::StrongFocus );
@ -1851,7 +1851,7 @@ void SecTQLineEditPrivate::finishChange( int validateFromState, bool setModified
emit q->textChanged( text );
}
emit q->textModified( text );
#if defined(QT_ACCESSIBILITY_SUPPORT)
#if defined(TQT_ACCESSIBILITY_SUPPORT)
TQAccessible::updateAccessibility( q, 0, TQAccessible::ValueChanged );
#endif
}

@ -80,7 +80,7 @@ class TQPopupMenu;
class TQTextParagraph;
class TQTextCursor;
class Q_EXPORT SecTQLineEdit : public TQFrame
class TQ_EXPORT SecTQLineEdit : public TQFrame
{
TQ_OBJECT
TQ_ENUMS( EchoMode )
@ -127,7 +127,7 @@ public:
int alignment() const;
#ifndef QT_NO_COMPAT
#ifndef TQT_NO_COMPAT
void cursorLeft( bool mark, int steps = 1 ) { cursorForward( mark, -steps ); }
void cursorRight( bool mark, int steps = 1 ) { cursorForward( mark, steps ); }
#endif
@ -153,7 +153,7 @@ public:
bool isUndoAvailable() const;
bool isRedoAvailable() const;
#ifndef QT_NO_COMPAT
#ifndef TQT_NO_COMPAT
bool hasMarkedText() const { return hasSelectedText(); }
SecTQString markedText() const { return selectedText(); }
#endif
@ -175,7 +175,7 @@ public slots:
virtual void setSelection( int, int );
virtual void setCursorPosition( int );
virtual void setAlignment( int flag );
#ifndef QT_NO_CLIPBOARD
#ifndef TQT_NO_CLIPBOARD
virtual void cut();
virtual void copy() const;
virtual void paste();
@ -204,7 +204,7 @@ protected:
void resizeEvent( TQResizeEvent * );
void drawContents( TQPainter * );
void windowActivationChange( bool );
#ifndef QT_NO_COMPAT
#ifndef TQT_NO_COMPAT
void repaintArea( int, int ) { update(); }
#endif

@ -80,8 +80,8 @@ static uint computeNewMax( uint len )
// IMPORTANT! If you change these, make sure you also change the
// "delete unicode" statement in ~SecTQStringData() in SecTQString.h correspondingly!
#define QT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
#define QT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
#define TQT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
#define TQT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
/*****************************************************************************
@ -188,7 +188,7 @@ static uint computeNewMax( uint len )
\sa TQChar TQCString TQByteArray SecTQConstString
*/
Q_EXPORT SecTQStringData *SecTQString::shared_null = 0;
TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0;
QT_STATIC_CONST_IMPL SecTQString SecTQString::null;
QT_STATIC_CONST_IMPL TQChar TQChar::null;
QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd);
@ -199,7 +199,7 @@ QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
SecTQStringData* SecTQString::makeSharedNull()
{
SecTQString::shared_null = new SecTQStringData;
#if defined( Q_OS_MAC )
#if defined( TQ_OS_MAC )
SecTQString *that = const_cast<SecTQString *>(&SecTQString::null);
that->d = SecTQString::shared_null;
#endif
@ -220,7 +220,7 @@ SecTQStringData* SecTQString::makeSharedNull()
*/
SecTQString::SecTQString( TQChar ch )
{
d = new SecTQStringData( QT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
d = new SecTQStringData( TQT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
d->unicode[0] = ch;
}
@ -239,7 +239,7 @@ SecTQString::SecTQString( int size, bool /*dummy*/ )
{
if ( size ) {
int l = size;
TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( l );
TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( l );
d = new SecTQStringData( uc, 0, l );
} else {
d = shared_null ? shared_null : (shared_null=new SecTQStringData);
@ -258,7 +258,7 @@ SecTQString::SecTQString( const TQString &str )
d = shared_null ? shared_null : makeSharedNull();
d->ref();
} else {
TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
if ( unicode )
memcpy(uc, unicode, length*sizeof(TQChar));
d = new SecTQStringData(uc,unicode ? length : 0,length);
@ -287,7 +287,7 @@ SecTQString::SecTQString( const TQChar* unicode, uint length )
d = shared_null ? shared_null : makeSharedNull();
d->ref();
} else {
TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
if ( unicode )
memcpy(uc, unicode, length*sizeof(TQChar));
d = new SecTQStringData(uc,unicode ? length : 0,length);
@ -429,7 +429,7 @@ void SecTQString::setLength( uint newLen )
( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
// detach, grow or shrink
uint newMax = computeNewMax( newLen );
TQChar* nd = QT_ALLOC_SECTQCHAR_VEC( newMax );
TQChar* nd = TQT_ALLOC_SECTQCHAR_VEC( newMax );
if ( nd ) {
uint len = TQMIN( d->len, newLen );
memcpy( nd, d->unicode, sizeof(TQChar) * len );
@ -594,10 +594,10 @@ SecTQString &SecTQString::insert( uint index, const TQChar* s, uint len )
if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
// Part of me - take a copy.
TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( len );
TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( len );
memcpy(tmp,s,len*sizeof(TQChar));
insert(index,tmp,len);
QT_DELETE_SECTQCHAR_VEC( tmp );
TQT_DELETE_SECTQCHAR_VEC( tmp );
return *this;
}
@ -669,10 +669,10 @@ SecTQString &SecTQString::replace( uint index, uint len, const TQChar* s, uint s
memcpy( d->unicode+index, s, len * sizeof(TQChar) );
} else if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
// Part of me - take a copy.
TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( slen );
TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( slen );
memcpy( tmp, s, slen * sizeof(TQChar) );
replace( index, len, tmp, slen );
QT_DELETE_SECTQCHAR_VEC( tmp );
TQT_DELETE_SECTQCHAR_VEC( tmp );
} else {
remove( index, len );
insert( index, s, slen );

@ -87,7 +87,7 @@ class SecTQCharRef;
template <class T> class TQDeepCopy;
#include <stdio.h>
// internal
struct Q_EXPORT SecTQStringData : public TQShared {
struct TQ_EXPORT SecTQStringData : public TQShared {
SecTQStringData() :
TQShared(), unicode(0), len(0), maxl(0) { ref(); }
SecTQStringData(TQChar *u, uint l, uint m) :
@ -96,12 +96,12 @@ struct Q_EXPORT SecTQStringData : public TQShared {
void deleteSelf();
TQChar *unicode;
#ifdef Q_OS_MAC9
#ifdef TQ_OS_MAC9
uint len;
#else
uint len : 30;
#endif
#ifdef Q_OS_MAC9
#ifdef TQ_OS_MAC9
uint maxl;
#else
uint maxl : 30;
@ -109,7 +109,7 @@ struct Q_EXPORT SecTQStringData : public TQShared {
};
class Q_EXPORT SecTQString
class TQ_EXPORT SecTQString
{
public:
SecTQString(); // make null string
@ -191,7 +191,7 @@ private:
friend class TQDeepCopy<SecTQString>;
};
class Q_EXPORT SecTQCharRef {
class TQ_EXPORT SecTQCharRef {
friend class SecTQString;
SecTQString& s;
uint p;
@ -201,7 +201,7 @@ public:
// most TQChar operations repeated here
// all this is not documented: We just say "like TQChar" and let it be.
#ifndef Q_QDOC
#ifndef TQ_QDOC
ushort unicode() const { return s.constref(p).unicode(); }
// An operator= for each TQChar cast constructors
@ -249,7 +249,7 @@ public:
inline SecTQCharRef SecTQString::at( uint i ) { return SecTQCharRef(this,i); }
inline SecTQCharRef SecTQString::operator[]( int i ) { return at((uint)i); }
class Q_EXPORT SecTQConstString : private SecTQString {
class TQ_EXPORT SecTQConstString : private SecTQString {
public:
SecTQConstString( const TQChar* unicode, uint length );
~SecTQConstString();
@ -297,7 +297,7 @@ inline bool SecTQString::isEmpty() const
SecTQString non-member operators
*****************************************************************************/
Q_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
TQ_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
{
SecTQString tmp( s1 );
tmp += s2;

Loading…
Cancel
Save