summaryrefslogtreecommitdiffstats
path: root/libreoffice/3.3.2/patches/libreoffice-trinity.diff
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-21 20:24:19 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-21 20:24:19 -0500
commit2d5b63cb22e269e7db69963a34f0faf45f36b9ca (patch)
treef8dd311f115e2833356d818efdf086dd6dbeb9c9 /libreoffice/3.3.2/patches/libreoffice-trinity.diff
parentd6e83c661c322d384574186dc2a2c9bf23b85755 (diff)
downloadthirdparty-2d5b63cb22e269e7db69963a34f0faf45f36b9ca.tar.gz
thirdparty-2d5b63cb22e269e7db69963a34f0faf45f36b9ca.zip
TQt port the TDE file picker for LibreOffice
Also update LibreOffice debian packaging patches
Diffstat (limited to 'libreoffice/3.3.2/patches/libreoffice-trinity.diff')
-rw-r--r--libreoffice/3.3.2/patches/libreoffice-trinity.diff985
1 files changed, 476 insertions, 509 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 812e4b0..33a5530 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -1,38 +1,6 @@
-diff -urN libreoffice-build/configure.in libreoffice-build/configure.in
---- libreoffice-build/configure.in 2011-03-15 11:51:33.000000000 -0500
-+++ libreoffice-build/configure.in 2011-08-17 15:49:14.302963959 -0500
-@@ -81,6 +81,11 @@
- --disable-kde4 Disables KDE4 native widgets.],
- ,)
-
-+AC_ARG_ENABLE(tde,
-+[
-+ --disable-tde Disables TDE native widgets.],
-+,)
-+
- AC_ARG_ENABLE(mono,
- [
- --enable-mono Enables the compilation of the Mono bindings.],
-@@ -928,6 +933,16 @@
- OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
- fi
-
-+OOO_WIDGET_FLAGS=
-+if test "$enable_tde" != "no"; then
-+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
-+ OOO_WIDGET_FLAGS="--enable-tde"
-+ widget_sets="tde"
-+ fi
-+else
-+ OOO_WIDGET_FLAGS="--disable-tde"
-+fi
-+
- if test "$enable_gtk" != "no"; then
- if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
- OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
diff -urN libreoffice-build/patches/dev300/apply libreoffice-build/patches/dev300/apply
---- libreoffice-build/patches/dev300/apply 2011-08-19 15:12:59.000000000 -0500
-+++ libreoffice-build/patches/dev300/apply 2011-08-18 22:23:26.037967292 -0500
+--- libreoffice-build/patches/dev300/apply 2011-08-21 16:22:42.000000000 -0500
++++ libreoffice-build/patches/dev300/apply 2011-08-21 16:24:42.000000000 -0500
@@ -22,7 +22,7 @@
LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
@@ -64,7 +32,7 @@ diff -urN libreoffice-build/patches/dev300/apply libreoffice-build/patches/dev30
diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-build/patches/dev300/trinity-modules.diff
--- libreoffice-build/patches/dev300/trinity-modules.diff 1969-12-31 18:00:00.000000000 -0600
-+++ libreoffice-build/patches/dev300/trinity-modules.diff 2011-08-19 21:12:01.176913404 -0500
++++ libreoffice-build/patches/dev300/trinity-modules.diff 2011-08-21 16:24:42.000000000 -0500
@@ -0,0 +1,15748 @@
+diff -urN configure.in configure.in
+--- configure.in 2011-03-08 12:51:39.000000000 -0600
@@ -775,7 +743,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// -----------------------------------------------------------------------------
++sal_Bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const
++{
-++ QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
+++ TQString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
++
++ return aQtName.isNull();
++// TDE address book currently does not use NULL values.
@@ -789,7 +757,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// -----------------------------------------------------------------------------
++sal_Bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const
++{
-++ QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
+++ TQString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
++
++ return !aQtName.isNull();
++// TDE address book currently does not use NULL values.
@@ -809,7 +777,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// -----------------------------------------------------------------------------
++sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const
++{
-++ QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
+++ TQString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
++// Timestamps should not be compared according to their string value
++// The syntax for such queries should be like
++// {ts '2004-03-29 12:55:00.000000'}
@@ -828,7 +796,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// -----------------------------------------------------------------------------
++sal_Bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const
++{
-++ QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
+++ TQString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
++
++ if (aQtName.isNull()) return sal_False;
++
@@ -843,7 +811,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// -----------------------------------------------------------------------------
++sal_Bool KabConditionSimilar::eval(const ::KABC::Addressee &aAddressee) const
++{
-++ QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
+++ TQString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
++
++ if (aQtName.isNull()) return sal_False;
++
@@ -990,7 +958,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ protected:
++ sal_Int32 m_nFieldNumber;
++
-++ QString value(const ::KABC::Addressee &aAddressee) const;
+++ TQString value(const ::KABC::Addressee &aAddressee) const;
++
++ public:
++ KabConditionColumn(
@@ -2466,7 +2434,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
++
++ sal_Int32 nPosition = 1;
-++ QString aQtName;
+++ TQString aQtName;
++ ::rtl::OUString sName;
++
++ aQtName = ::KABC::Addressee::revisionLabel();
@@ -2582,7 +2550,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ if (table == getAddressBookTableName())
++ {
++ ODatabaseMetaDataResultSet::ORow aRow( 9 );
-++ QString aQtName = ::KABC::Addressee::revisionLabel();
+++ TQString aQtName = ::KABC::Addressee::revisionLabel();
++ ::rtl::OUString sName = (const sal_Unicode *) aQtName.ucs2();
++
++ aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue();
@@ -3638,7 +3606,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ {
++// -----------------------------------------------------------------------------
++// return the value of a TDE address book field, given an addressee and a field number
-++QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber)
+++TQString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber)
++{
++ switch (nFieldNumber)
++ {
@@ -3653,7 +3621,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// search the TDE address book field number of a given column name
++sal_uInt32 findKabField(const ::rtl::OUString& columnName) throw(SQLException)
++{
-++ QString aQtName;
+++ TQString aQtName;
++ ::rtl::OUString aName;
++
++ aQtName = KABC::Addressee::revisionLabel();
@@ -3738,7 +3706,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{
++ namespace kab
++ {
-++ QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber);
+++ TQString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber);
++ sal_uInt32 findKabField(const ::rtl::OUString& columnName) throw(::com::sun::star::sdbc::SQLException);
++ }
++}
@@ -3802,7 +3770,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{
++ sal_Int32 result;
++
-++ result = QString::compare(
+++ result = TQString::compare(
++ valueOfKabField(aAddressee1, m_nFieldNumber),
++ valueOfKabField(aAddressee2, m_nFieldNumber));
++// Timestamps should be compared differently than with their string value
@@ -3900,7 +3868,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ sal_Int32 m_nFieldNumber;
++ sal_Bool m_bAscending;
++
-++ QString value(const ::KABC::Addressee &aAddressee) const;
+++ TQString value(const ::KABC::Addressee &aAddressee) const;
++ public:
++ KabSimpleOrder(::rtl::OUString &sColumnName, sal_Bool bAscending);
++
@@ -4654,7 +4622,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ if (m_nRowPos != -1 && m_nRowPos != nAddressees && m_xMetaData.is())
++ {
++ sal_Int32 nFieldNumber = m_xMetaData->fieldAtColumn(columnIndex);
-++ QString aQtName;
+++ TQString aQtName;
++
++ switch (nFieldNumber)
++ {
@@ -4801,7 +4769,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ if (nFieldNumber == KAB_FIELD_REVISION)
++ {
-++ QDateTime nRevision(m_aKabAddressees[m_nRowPos].revision());
+++ TQDateTime nRevision(m_aKabAddressees[m_nRowPos].revision());
++
++ if (!nRevision.isNull())
++ {
@@ -5270,7 +5238,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ if (m_nRowPos != -1 && m_nRowPos != nAddressees)
++ {
-++ QString aQtName = m_aKabAddressees[m_nRowPos].uid();
+++ TQString aQtName = m_aKabAddressees[m_nRowPos].uid();
++ ::rtl::OUString sUniqueIdentifier = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2());
++ return makeAny(sUniqueIdentifier);
++ }
@@ -5287,7 +5255,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ for (sal_Int32 nRow = 0; nRow < nAddressees; nRow++)
++ {
-++ QString aQtName = m_aKabAddressees[nRow].uid();
+++ TQString aQtName = m_aKabAddressees[nRow].uid();
++ ::rtl::OUString sUniqueIdentifier = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2());
++
++ if (sUniqueIdentifier == sBookmark)
@@ -5777,7 +5745,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{
++ sal_uInt32 nFieldNumber = m_aKabFields[column - 1];
++ ::KABC::Field::List aFields = ::KABC::Field::allFields();
-++ QString aQtName;
+++ TQString aQtName;
++
++ switch (nFieldNumber)
++ {
@@ -7640,9 +7608,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ // set language
++ rtl_Locale *pProcessLocale;
++ osl_getProcessLocale(&pProcessLocale);
-++ // sal_Unicode and QChar are (currently) both 16 bits characters
-++ QString aLanguage(
-++ (const QChar *) pProcessLocale->Language->buffer,
+++ // sal_Unicode and TQChar are (currently) both 16 bits characters
+++ TQString aLanguage(
+++ (const TQChar *) pProcessLocale->Language->buffer,
++ (int) pProcessLocale->Language->length);
++ KGlobal::locale()->setLanguage(aLanguage);
++
@@ -7896,8 +7864,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// CommandEvent
++//////////////////////////////////////////////////////////////////////////
++
-++TDECommandEvent::TDECommandEvent( const QString &qCommand, QStringList *pStringList )
-++ : QCustomEvent( TypeId, pStringList ),
+++TDECommandEvent::TDECommandEvent( const TQString &qCommand, TQStringList *pStringList )
+++ : TQCustomEvent( TypeId, pStringList ),
++ m_eCommand( Unknown )
++{
++ struct {
@@ -7934,7 +7902,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// CommandThread
++//////////////////////////////////////////////////////////////////////////
++
-++TDECommandThread::TDECommandThread( QWidget *pObject )
+++TDECommandThread::TDECommandThread( TQWidget *pObject )
++ : m_pObject( pObject )
++{
++}
@@ -7945,10 +7913,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++void TDECommandThread::run()
++{
-++ QTextIStream qStream( stdin );
-++ qStream.setEncoding( QTextStream::UnicodeUTF8 );
+++ TQTextIStream qStream( stdin );
+++ qStream.setEncoding( TQTextStream::UnicodeUTF8 );
++
-++ QString qLine;
+++ TQString qLine;
++ bool bQuit = false;
++ while ( !bQuit && !qStream.atEnd() )
++ {
@@ -7957,16 +7925,16 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ }
++}
++
-++void TDECommandThread::handleCommand( const QString &rString, bool &bQuit )
+++void TDECommandThread::handleCommand( const TQString &rString, bool &bQuit )
++{
-++ QMutexLocker qMutexLocker( &m_aMutex );
+++ TQMutexLocker qMutexLocker( &m_aMutex );
++
++#if OSL_DEBUG_LEVEL > 0
++ ::std::cerr << "tdefilepicker received: " << rString.latin1() << ::std::endl;
++#endif
++
++ bQuit = false;
-++ QStringList *pTokens = tokenize( rString );
+++ TQStringList *pTokens = tokenize( rString );
++
++ if ( !pTokens )
++ return;
@@ -7976,7 +7944,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return;
++ }
++
-++ QString qCommand = pTokens->front();
+++ TQString qCommand = pTokens->front();
++ pTokens->pop_front();
++
++ if ( qCommand == "exit" )
@@ -7989,19 +7957,19 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ kapp->postEvent( m_pObject, new TDECommandEvent( qCommand, pTokens ) );
++}
++
-++QStringList* TDECommandThread::tokenize( const QString &rString )
+++TQStringList* TDECommandThread::tokenize( const TQString &rString )
++{
++ // Commands look like:
++ // command arg1 arg2 arg3 ...
++ // Args may be enclosed in '"', if they contain spaces.
++
-++ QStringList *pList = new QStringList();
+++ TQStringList *pList = new TQStringList();
++
-++ QString qBuffer;
+++ TQString qBuffer;
++ qBuffer.reserve( 1024 );
++
-++ const QChar *pUnicode = rString.unicode();
-++ const QChar *pEnd = pUnicode + rString.length();
+++ const TQChar *pUnicode = rString.unicode();
+++ const TQChar *pEnd = pUnicode + rString.length();
++ bool bQuoted = false;
++
++ for ( ; pUnicode != pEnd; ++pUnicode )
@@ -8073,7 +8041,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <tqmutex.h>
++#include <tqthread.h>
++
-++class TDECommandEvent : public QCustomEvent
+++class TDECommandEvent : public TQCustomEvent
++{
++public:
++ enum CommandEventType {
@@ -8102,34 +8070,34 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ Exec
++ };
-++ static const QEvent::Type TypeId = (QEvent::Type) ( (int) QEvent::User + 42 /*random magic value*/ );
+++ static const TQEvent::Type TypeId = (TQEvent::Type) ( (int) TQEvent::User + 42 /*random magic value*/ );
++
++protected:
++ CommandEventType m_eCommand;
++
++public:
-++ TDECommandEvent( const QString &qCommand, QStringList *pStringList );
+++ TDECommandEvent( const TQString &qCommand, TQStringList *pStringList );
++
++ CommandEventType command() const { return m_eCommand; }
-++ QStringList* stringList() { return static_cast< QStringList* >( data() ); }
+++ TQStringList* stringList() { return static_cast< TQStringList* >( data() ); }
++};
++
-++class TDECommandThread : public QThread
+++class TDECommandThread : public TQThread
++{
++protected:
-++ QObject *m_pObject;
+++ TQObject *m_pObject;
++
-++ QMutex m_aMutex;
+++ TQMutex m_aMutex;
++
++public:
-++ TDECommandThread( QWidget *pObject );
+++ TDECommandThread( TQWidget *pObject );
++ virtual ~TDECommandThread();
++
++ virtual void run();
++
++protected:
-++ void handleCommand( const QString &rString, bool &bQuit );
-++ QStringList* tokenize( const QString &rString );
+++ void handleCommand( const TQString &rString, bool &bQuit );
+++ TQStringList* tokenize( const TQString &rString );
++};
++
++#endif // _TDECOMMANDTHREAD_HXX_
@@ -8182,7 +8150,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <tqregexp.h>
++#include <tqvbox.h>
++
-++#ifdef QT_NO_EMIT
+++#ifdef TQT_NO_EMIT
++#define emit
++#endif
++
@@ -8202,20 +8170,20 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// TDEFileDialog
++//////////////////////////////////////////////////////////////////////////
++
-++TDEFileDialog::TDEFileDialog( const QString &startDir, const QString &filter,
-++ QWidget *parent, const char *name )
-++ : KFileDialog( startDir, filter, parent, name, true, m_pCustomWidget = new QVBox() ),
-++ m_pCombosAndButtons( new QHBox( m_pCustomWidget ) ),
-++ m_pLabels( new QVBox( m_pCombosAndButtons ) ),
-++ m_pComboBoxes( new QVBox( m_pCombosAndButtons ) ),
-++ m_pPushButtons( new QVBox( m_pCombosAndButtons ) ),
-++ m_pCheckBoxes( new QGrid( 2, m_pCustomWidget ) ),
+++TDEFileDialog::TDEFileDialog( const TQString &startDir, const TQString &filter,
+++ TQWidget *parent, const char *name )
+++ : KFileDialog( startDir, filter, parent, name, true, m_pCustomWidget = new TQVBox() ),
+++ m_pCombosAndButtons( new TQHBox( m_pCustomWidget ) ),
+++ m_pLabels( new TQVBox( m_pCombosAndButtons ) ),
+++ m_pComboBoxes( new TQVBox( m_pCombosAndButtons ) ),
+++ m_pPushButtons( new TQVBox( m_pCombosAndButtons ) ),
+++ m_pCheckBoxes( new TQGrid( 2, m_pCustomWidget ) ),
++ m_bIsSave( false ),
++ m_bIsExecuting( false ),
++ m_bCanNotifySelection( true )
++{
-++ connect( this, SIGNAL( fileHighlighted( const QString & ) ),
-++ this, SLOT( fileHighlightedCommand( const QString & ) ) );
+++ connect( this, SIGNAL( fileHighlighted( const TQString & ) ),
+++ this, SLOT( fileHighlightedCommand( const TQString & ) ) );
++
++ connect( this, SIGNAL( selectionChanged() ),
++ this, SLOT( selectionChangedCommand() ) );
@@ -8230,14 +8198,14 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{
++}
++
-++void TDEFileDialog::resizeEvent( QResizeEvent *pEvent )
+++void TDEFileDialog::resizeEvent( TQResizeEvent *pEvent )
++{
++ KFileDialog::resizeEvent( pEvent );
++
++ updateCustomWidgetLayout();
++}
++
-++void TDEFileDialog::showEvent( QShowEvent *pEvent )
+++void TDEFileDialog::showEvent( TQShowEvent *pEvent )
++{
++ KFileDialog::showEvent( pEvent );
++
@@ -8246,8 +8214,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++void TDEFileDialog::updateCustomWidgetLayout()
++{
-++ QPoint qReferencePoint = filterWidget->mapTo( this, QPoint( 0, 0 ) );
-++ QPoint qCustomPoint = m_pCustomWidget->mapTo( this, QPoint( 0, 0 ) );
+++ TQPoint qReferencePoint = filterWidget->mapTo( this, TQPoint( 0, 0 ) );
+++ TQPoint qCustomPoint = m_pCustomWidget->mapTo( this, TQPoint( 0, 0 ) );
++
++ int nLeft = qReferencePoint.x() - qCustomPoint.x();
++ int nRight = m_pCustomWidget->width() - filterWidget->width() - nLeft;
@@ -8261,12 +8229,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ m_pPushButtons->setFixedWidth( ( nRight > 0 )? nRight: 100 );
++}
++
-++void TDEFileDialog::customEvent( QCustomEvent *pEvent )
+++void TDEFileDialog::customEvent( TQCustomEvent *pEvent )
++{
++ if ( pEvent && pEvent->type() == TDECommandEvent::TypeId )
++ {
++ TDECommandEvent *pCommandEvent = static_cast< TDECommandEvent* >( pEvent );
-++ QStringList *pStringList = pCommandEvent->stringList();
+++ TQStringList *pStringList = pCommandEvent->stringList();
++
++ int nListSize = -1;
++ if ( pStringList )
@@ -8295,7 +8263,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ case TDECommandEvent::SetValue:
++ if ( nListSize >= 2 )
++ {
-++ QStringList qStringList = (*pStringList);
+++ TQStringList qStringList = (*pStringList);
++ qStringList.pop_front();
++ qStringList.pop_front();
++
@@ -8314,12 +8282,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ case TDECommandEvent::AppendFilterGroup:
++ if ( nListSize >= 1 )
++ {
-++ QStringList::const_iterator it = pStringList->begin();
+++ TQStringList::const_iterator it = pStringList->begin();
++ ++it; // We ignore the filter group name
++
++ while ( it != pStringList->end() )
++ {
-++ QString qTitle = *it;
+++ TQString qTitle = *it;
++ ++it;
++ if ( it != pStringList->end() )
++ {
@@ -8334,7 +8302,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ break;
++ case TDECommandEvent::GetCurrentFilter:
++ {
-++ QString qCurrentFilter = filterWidget->currentText();
+++ TQString qCurrentFilter = filterWidget->currentText();
++ sendCommand( "currentFilter " + escapeString( qCurrentFilter ) );
++ }
++ break;
@@ -8346,7 +8314,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ break;
++ case TDECommandEvent::GetDirectory:
++ {
-++ QString qDirectory = baseURL().url();
+++ TQString qDirectory = baseURL().url();
++ if ( qDirectory.startsWith( "file:/" ) && qDirectory.mid( 6, 1 ) != "/" )
++ qDirectory.replace( "file:/", "file:///" );
++ sendCommand( "currentDirectory " + escapeString( qDirectory ) );
@@ -8360,12 +8328,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ break;
++ case TDECommandEvent::GetFiles:
++ {
-++ QString qString;
+++ TQString qString;
++ qString.reserve( 1024 );
++
++ qString.append( "files" );
++
-++ if ( result() == QDialog::Accepted )
+++ if ( result() == TQDialog::Accepted )
++ {
++ KURL::List qList( selectedURLs() );
++ for ( KURL::List::const_iterator it = qList.begin(); it != qList.end(); ++it )
@@ -8392,7 +8360,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ case TDECommandEvent::SetType:
++ if ( nListSize >= 1 )
++ {
-++ QString qType( pStringList->front() );
+++ TQString qType( pStringList->front() );
++ if ( qType == "open" )
++ {
++ setIsSave( false );
@@ -8431,13 +8399,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ exec();
++
++ KURL qLocalSelectedURL = mostLocalURL( selectedURL() );
-++ QString qProtocol( qLocalSelectedURL.protocol() );
+++ TQString qProtocol( qLocalSelectedURL.protocol() );
++
-++ if ( isSave() && result() == QDialog::Accepted )
+++ if ( isSave() && result() == TQDialog::Accepted )
++ {
++ if ( qProtocol == "file" )
++ {
-++ QString qFileName( addExtension( qLocalSelectedURL.path() ) );
+++ TQString qFileName( addExtension( qLocalSelectedURL.path() ) );
++ bCanExit =
++ !QFile::exists( qFileName ) ||
++ ( KMessageBox::warningYesNo( 0,
@@ -8455,7 +8423,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ else
++ bCanExit = true;
++ }
-++ else if ( !isSave() && result() == QDialog::Accepted && !isSupportedProtocol( qProtocol ) )
+++ else if ( !isSave() && result() == TQDialog::Accepted && !isSupportedProtocol( qProtocol ) )
++ {
++ KMessageBox::information( 0,
++ i18n( "Protocol \"%1\" is supported only partially. "
@@ -8467,7 +8435,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } while ( !bCanExit );
++ setIsExecuting( false );
++
-++ if ( result() == QDialog::Accepted )
+++ if ( result() == TQDialog::Accepted )
++ sendCommand( "accept" );
++ else
++ sendCommand( "reject" );
@@ -8481,81 +8449,81 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ }
++}
++
-++void TDEFileDialog::appendControl( const QString &rId, const QString &rType, const QString &rTitle )
+++void TDEFileDialog::appendControl( const TQString &rId, const TQString &rType, const TQString &rTitle )
++{
-++ QString qLabel( rTitle );
+++ TQString qLabel( rTitle );
++ qLabel.replace( '~', '&' );
++
++ if ( rType == "checkbox" )
++ {
-++ QCheckBox *pCheckBox = new QCheckBox( qLabel, m_pCheckBoxes, rId.utf8() );
+++ TQCheckBox *pCheckBox = new TQCheckBox( qLabel, m_pCheckBoxes, rId.utf8() );
++
++ pCheckBox->setEnabled( true );
++ pCheckBox->setChecked( false );
++ }
++ else if ( rType == "listbox" )
++ {
-++ QLabel *pComboLabel = new QLabel( qLabel, m_pLabels );
-++ QComboBox *pComboBox = new QComboBox( m_pComboBoxes, rId.utf8() );
+++ TQLabel *pComboLabel = new TQLabel( qLabel, m_pLabels );
+++ TQComboBox *pComboBox = new TQComboBox( m_pComboBoxes, rId.utf8() );
++
++ pComboLabel->setBuddy( pComboBox );
++ pComboBox->setEnabled( true );
++ }
++ else if ( rType == "pushbutton" )
++ {
-++ QPushButton *pPushButton = new QPushButton( qLabel, m_pPushButtons, rId.utf8() );
+++ TQPushButton *pPushButton = new TQPushButton( qLabel, m_pPushButtons, rId.utf8() );
++ pPushButton->setEnabled( true );
++ }
++}
++
-++QWidget* TDEFileDialog::findControl( const QString &rId ) const
+++TQWidget* TDEFileDialog::findControl( const TQString &rId ) const
++{
-++ QObjectList *pList = m_pCustomWidget->queryList();
-++ QCString qName( rId.utf8() );
-++ QObjectList::const_iterator it = pList->begin();
+++ TQObjectList *pList = m_pCustomWidget->queryList();
+++ TQCString qName( rId.utf8() );
+++ TQObjectList::const_iterator it = pList->begin();
++
++ for ( ; it != pList->end() && qName != (*it)->name(); ++it )
++ ;
++
-++ QWidget *pWidget = NULL;
+++ TQWidget *pWidget = NULL;
++ if ( it != pList->end() )
-++ pWidget = static_cast< QWidget* >( *it );
+++ pWidget = static_cast< TQWidget* >( *it );
++
++ delete pList;
++
++ return pWidget;
++}
++
-++void TDEFileDialog::enableControl( const QString &rId, const QString &rValue )
+++void TDEFileDialog::enableControl( const TQString &rId, const TQString &rValue )
++{
-++ QWidget *pWidget = findControl( rId );
+++ TQWidget *pWidget = findControl( rId );
++
++ if ( pWidget )
++ pWidget->setEnabled( rValue.lower() == "true" );
++}
++
-++void TDEFileDialog::getValue( const QString &rId, const QString &rAction )
+++void TDEFileDialog::getValue( const TQString &rId, const TQString &rAction )
++{
-++ QWidget *pWidget = findControl( rId );
-++ QString qString;
+++ TQWidget *pWidget = findControl( rId );
+++ TQString qString;
++ qString.reserve( 1024 );
++ qString.append( "value" );
++
++ if ( pWidget )
++ {
-++ QCString qClassName = pWidget->className();
-++ if ( qClassName == "QCheckBox" )
+++ TQCString qClassName = pWidget->className();
+++ if ( qClassName == TQCHECKBOX_OBJECT_NAME_STRING )
++ {
-++ QCheckBox *pCheckBox = static_cast< QCheckBox* >( pWidget );
+++ TQCheckBox *pCheckBox = static_cast< TQCheckBox* >( pWidget );
++
++ if ( pCheckBox->isChecked() )
++ qString.append( " bool true" );
++ else
++ qString.append( " bool false" );
++ }
-++ else if ( qClassName == "QComboBox" )
+++ else if ( qClassName == TQCOMBOBOX_OBJECT_NAME_STRING )
++ {
-++ QComboBox *pComboBox = static_cast< QComboBox* >( pWidget );
+++ TQComboBox *pComboBox = static_cast< TQComboBox* >( pWidget );
++ if ( rAction == "getItems" )
++ {
++ qString.append( " stringList" );
@@ -8573,7 +8541,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ else if ( rAction == "getSelectedItemIndex" )
++ {
++ qString.append( " int " );
-++ qString.append( QString().setNum( pComboBox->currentItem() ) );
+++ qString.append( TQString().setNum( pComboBox->currentItem() ) );
++ }
++ // TODO getHelpURL
++ }
@@ -8583,23 +8551,23 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ sendCommand( qString );
++}
++
-++void TDEFileDialog::setValue( const QString &rId, const QString &rAction, const QStringList &rValue )
+++void TDEFileDialog::setValue( const TQString &rId, const TQString &rAction, const TQStringList &rValue )
++{
-++ QWidget *pWidget = findControl( rId );
+++ TQWidget *pWidget = findControl( rId );
++
++ if ( pWidget )
++ {
-++ QCString qClassName = pWidget->className();
-++ if ( qClassName == "QCheckBox" )
+++ TQCString qClassName = pWidget->className();
+++ if ( qClassName == TQCHECKBOX_OBJECT_NAME_STRING )
++ {
-++ QCheckBox *pCheckBox = static_cast< QCheckBox* >( pWidget );
+++ TQCheckBox *pCheckBox = static_cast< TQCheckBox* >( pWidget );
++
++ bool bValue = ( !rValue.isEmpty() ) && ( rValue.front().lower() == "true" );
++ pCheckBox->setChecked( bValue );
++ }
-++ else if ( qClassName == "QComboBox" )
+++ else if ( qClassName == TQCOMBOBOX_OBJECT_NAME_STRING )
++ {
-++ QComboBox *pComboBox = static_cast< QComboBox* >( pWidget );
+++ TQComboBox *pComboBox = static_cast< TQComboBox* >( pWidget );
++ if ( rAction == "addItem" )
++ {
++ if ( !rValue.isEmpty() )
@@ -8629,22 +8597,22 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ }
++}
++
-++void TDEFileDialog::appendFilter( const QString &rTitle, const QString &rFilter )
+++void TDEFileDialog::appendFilter( const TQString &rTitle, const TQString &rFilter )
++{
++ // Filters are separated by ';'
-++ QString qFilter( rFilter );
-++ qFilter.replace( QChar( ';' ), QChar( ' ' ) ).replace( "*.*", "*" );
+++ TQString qFilter( rFilter );
+++ qFilter.replace( TQChar( ';' ), TQChar( ' ' ) ).replace( "*.*", "*" );
++
++ // Workaround for too wide <All formats> (*.bmp;...) entry
-++ QString qTitle( rTitle );
-++ qTitle.replace( QRegExp( "^<([^>]*)> \\(.*" ), "<\\1>" );
+++ TQString qTitle( rTitle );
+++ qTitle.replace( TQRegExp( "^<([^>]*)> \\(.*" ), "<\\1>" );
++
++ m_aFilters.push_back( qMakePair( qTitle, qFilter ) );
++}
++
-++QString TDEFileDialog::filters() const
+++TQString TDEFileDialog::filters() const
++{
-++ QString qString, qTmp;
+++ TQString qString, qTmp;
++ bool bFirstFilter = true;
++
++ for ( FilterList::const_iterator it = m_aFilters.begin(); it != m_aFilters.end(); ++it )
@@ -8664,20 +8632,20 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return qString;
++}
++
-++QString TDEFileDialog::addExtension( const QString &rFileName ) const
+++TQString TDEFileDialog::addExtension( const TQString &rFileName ) const
++{
++ if ( !isSave() )
++ return rFileName;
++
-++ QString qExtension;
+++ TQString qExtension;
++
-++ QWidget *pExtensionWidget = findControl( "100" ); // CHECKBOX_AUTOEXTENSION
-++ QCheckBox *pExtensionCB = pExtensionWidget? static_cast< QCheckBox* >( pExtensionWidget->qt_cast( "QCheckBox" ) ): NULL;
+++ TQWidget *pExtensionWidget = findControl( "100" ); // CHECKBOX_AUTOEXTENSION
+++ TQCheckBox *pExtensionCB = pExtensionWidget? static_cast< TQCheckBox* >( pExtensionWidget->qt_cast( TQCHECKBOX_OBJECT_NAME_STRING ) ): NULL;
++ if ( pExtensionCB && pExtensionCB->isChecked() )
++ {
++ // FIXME: qFilter can be a MIME; we ignore it now...
-++ QStringList qFilterList = QStringList::split( " ", currentFilter() );
-++ for ( QStringList::const_iterator it = qFilterList.begin();
+++ TQStringList qFilterList = TQStringList::split( " ", currentFilter() );
+++ for ( TQStringList::const_iterator it = qFilterList.begin();
++ qExtension.isEmpty() && it != qFilterList.end();
++ ++it )
++ {
@@ -8699,7 +8667,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return rFileName + qExtension;
++}
++
-++bool TDEFileDialog::isSupportedProtocol( const QString &rProtocol ) const
+++bool TDEFileDialog::isSupportedProtocol( const TQString &rProtocol ) const
++{
++ // TODO Get this information directly from OOo
++ const char * pOOoProtocols[] = { "", "smb", "ftp", "http", "file", "mailto",
@@ -8744,7 +8712,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return rURL;
++}
++
-++QString TDEFileDialog::localCopy( const QString &rFileName ) const
+++TQString TDEFileDialog::localCopy( const TQString &rFileName ) const
++{
++ // 106 == MIB enum for UTF-8
++ KURL qLocalURL = mostLocalURL( KURL( rFileName, 106 ) );
@@ -8757,20 +8725,20 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ else
++ nExtensionPos = rFileName.find( '.' );
++
-++ KTempFile qTempFile( QString::null, ( nExtensionPos < 0 )? QString(): rFileName.mid( nExtensionPos ) );
+++ KTempFile qTempFile( TQString::null, ( nExtensionPos < 0 )? TQString(): rFileName.mid( nExtensionPos ) );
++ KURL qDestURL;
++ qDestURL.setPath( qTempFile.name() );
++
++ if ( !KIO::NetAccess::file_copy( rFileName, qDestURL, 0600, true, false, NULL ) )
++ {
++ KMessageBox::error( 0, KIO::NetAccess::lastErrorString() );
-++ return QString::null;
+++ return TQString::null;
++ }
++
++ return qDestURL.url();
++}
++
-++void TDEFileDialog::fileHighlightedCommand( const QString & )
+++void TDEFileDialog::fileHighlightedCommand( const TQString & )
++{
++ if ( canNotifySelection() )
++ {
@@ -8788,7 +8756,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ }
++}
++
-++void TDEFileDialog::sendCommand( const QString &rCommand )
+++void TDEFileDialog::sendCommand( const TQString &rCommand )
++{
++#if OSL_DEBUG_LEVEL > 0
++ ::std::cerr << "tdefilepicker sent: " << rCommand.latin1() << ::std::endl;
@@ -8798,7 +8766,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ::std::cout << rCommand.utf8() << ::std::endl;
++}
++
-++void TDEFileDialog::appendURL( QString &rBuffer, const KURL &rURL )
+++void TDEFileDialog::appendURL( TQString &rBuffer, const KURL &rURL )
++{
++ // From Martin Kretzschmar:
++ // file:///path/to/test%E0.odt is not a valid URL from OOo's point of
@@ -8807,7 +8775,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ // (which file:///path/test%E0.odt is not).
++ // Cf. the comment in sal/inc/osl/file.h.
++ // 106 == MIB enum for UTF-8
-++ QString qUrlStr = addExtension( rURL.url( 0, 106 ) );
+++ TQString qUrlStr = addExtension( rURL.url( 0, 106 ) );
++
++ if ( !isExecuting() && !isSupportedProtocol( rURL.protocol() ) )
++ qUrlStr = localCopy( qUrlStr );
@@ -8820,10 +8788,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ appendEscaped( rBuffer, qUrlStr );
++}
++
-++void TDEFileDialog::appendEscaped( QString &rBuffer, const QString &rString )
+++void TDEFileDialog::appendEscaped( TQString &rBuffer, const TQString &rString )
++{
-++ const QChar *pUnicode = rString.unicode();
-++ const QChar *pEnd = pUnicode + rString.length();
+++ const TQChar *pUnicode = rString.unicode();
+++ const TQChar *pEnd = pUnicode + rString.length();
++
++ rBuffer.append( '"' );
++ for ( ; pUnicode != pEnd; ++pUnicode )
@@ -8840,9 +8808,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ rBuffer.append( '"' );
++}
++
-++QString TDEFileDialog::escapeString( const QString &rString )
+++TQString TDEFileDialog::escapeString( const TQString &rString )
++{
-++ QString qString;
+++ TQString qString;
++ qString.reserve( 2*rString.length() + 2 ); // every char escaped + quotes
++
++ appendEscaped( qString, rString );
@@ -8851,7 +8819,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++}
++
++
-++void TDEFileFilterComboHack::setCurrentFilter( const QString& filter )
+++void TDEFileFilterComboHack::setCurrentFilter( const TQString& filter )
++{
++ setCurrentText( filter );
++ filterChanged();
@@ -8911,26 +8879,26 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <kfiledialog.h>
++#include <kfilefiltercombo.h>
++
-++class QGrid;
-++class QHBox;
-++class QVBox;
+++class TQGrid;
+++class TQHBox;
+++class TQVBox;
++
++class TDEFileDialog : public KFileDialog
++{
++ Q_OBJECT
++
++protected:
-++ typedef QPair< QString, QString > FilterEntry;
-++ typedef QValueList< FilterEntry > FilterList;
+++ typedef TQPair< TQString, TQString > FilterEntry;
+++ typedef TQValueList< FilterEntry > FilterList;
++
-++ QVBox *m_pCustomWidget;
-++ QHBox *m_pCombosAndButtons;
+++ TQVBox *m_pCustomWidget;
+++ TQHBox *m_pCombosAndButtons;
++
-++ QVBox *m_pLabels;
-++ QVBox *m_pComboBoxes;
-++ QVBox *m_pPushButtons;
+++ TQVBox *m_pLabels;
+++ TQVBox *m_pComboBoxes;
+++ TQVBox *m_pPushButtons;
++
-++ QGrid *m_pCheckBoxes;
+++ TQGrid *m_pCheckBoxes;
++
++ FilterList m_aFilters;
++
@@ -8947,27 +8915,27 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ bool m_bCanNotifySelection;
++
++public:
-++ TDEFileDialog( const QString &startDir, const QString &filter,
-++ QWidget *parent, const char *name );
+++ TDEFileDialog( const TQString &startDir, const TQString &filter,
+++ TQWidget *parent, const char *name );
++ virtual ~TDEFileDialog();
++
++protected:
-++ virtual void resizeEvent( QResizeEvent *pEvent );
-++ virtual void showEvent( QShowEvent *pEvent );
+++ virtual void resizeEvent( TQResizeEvent *pEvent );
+++ virtual void showEvent( TQShowEvent *pEvent );
++ void updateCustomWidgetLayout();
++
-++ virtual void customEvent( QCustomEvent *pEvent );
+++ virtual void customEvent( TQCustomEvent *pEvent );
++
++protected:
-++ void appendControl( const QString &rId, const QString &rType, const QString &rTitle );
-++ QWidget* findControl( const QString &rId ) const;
-++ void enableControl( const QString &rId, const QString &rValue );
-++ void getValue( const QString &rId, const QString &rAction );
-++ void setValue( const QString &rId, const QString &rAction, const QStringList &rValue );
+++ void appendControl( const TQString &rId, const TQString &rType, const TQString &rTitle );
+++ TQWidget* findControl( const TQString &rId ) const;
+++ void enableControl( const TQString &rId, const TQString &rValue );
+++ void getValue( const TQString &rId, const TQString &rAction );
+++ void setValue( const TQString &rId, const TQString &rAction, const TQStringList &rValue );
++
-++ void appendFilter( const QString &rTitle, const QString &rFilter );
-++ QString filters() const;
-++ QString addExtension( const QString &rFileName ) const;
+++ void appendFilter( const TQString &rTitle, const TQString &rFilter );
+++ TQString filters() const;
+++ TQString addExtension( const TQString &rFileName ) const;
++
++ void setIsSave( bool bIsSave ) { m_bIsSave = bIsSave; }
++ bool isSave( void ) const { return m_bIsSave; }
@@ -8975,28 +8943,28 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ void setIsExecuting( bool bIsExecuting ) { m_bIsExecuting = bIsExecuting; }
++ bool isExecuting( void ) const { return m_bIsExecuting; }
++
-++ bool isSupportedProtocol( const QString &rProtocol ) const;
+++ bool isSupportedProtocol( const TQString &rProtocol ) const;
++ KURL mostLocalURL( const KURL &rURL ) const;
-++ QString localCopy( const QString &rFileName ) const;
+++ TQString localCopy( const TQString &rFileName ) const;
++
++ void setCanNotifySelection( bool bCanNotifySelection ) { m_bCanNotifySelection = bCanNotifySelection; }
++ bool canNotifySelection( void ) const { return m_bCanNotifySelection; }
++
++protected slots:
-++ void fileHighlightedCommand( const QString & );
+++ void fileHighlightedCommand( const TQString & );
++ void selectionChangedCommand();
++
++protected:
-++ void sendCommand( const QString &rCommand );
-++ void appendURL( QString &rBuffer, const KURL &rURL );
-++ void appendEscaped( QString &rBuffer, const QString &rString );
-++ QString escapeString( const QString &rString );
+++ void sendCommand( const TQString &rCommand );
+++ void appendURL( TQString &rBuffer, const KURL &rURL );
+++ void appendEscaped( TQString &rBuffer, const TQString &rString );
+++ TQString escapeString( const TQString &rString );
++};
++
++class TDEFileFilterComboHack : public KFileFilterCombo
++{
++public:
-++ void setCurrentFilter( const QString& filter );
+++ void setCurrentFilter( const TQString& filter );
++};
++
++#endif // _TDEFILEPICKER_HXX_
@@ -9084,7 +9052,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ TDEModalityFilter qModalityFilter( nWinId );
++
-++ TDEFileDialog aFileDialog( NULL, QString(), NULL, "tdefiledialog" );
+++ TDEFileDialog aFileDialog( NULL, TQString(), NULL, "tdefiledialog" );
++
++ TDECommandThread qCommandThread( &aFileDialog );
++ qCommandThread.start();
@@ -9156,9 +9124,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ kapp->removeEventFilter( this );
++}
++
-++bool TDEModalityFilter::eventFilter( QObject *pObject, QEvent *pEvent )
+++bool TDEModalityFilter::eventFilter( TQObject *pObject, TQEvent *pEvent )
++{
-++ if ( pObject->isWidgetType() && pEvent->type() == QEvent::Show )
+++ if ( pObject->isWidgetType() && pEvent->type() == TQEvent::Show )
++ {
++ KDialogBase* pDlg = ::qt_cast< KDialogBase* >( pObject );
++ if ( pDlg != NULL && m_nWinId != 0 )
@@ -9209,7 +9177,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++#include <tqobject.h>
++
-++class TDEModalityFilter : public QObject
+++class TDEModalityFilter : public TQObject
++{
++private:
++ WId m_nWinId;
@@ -9218,7 +9186,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ TDEModalityFilter( WId nWinId );
++ virtual ~TDEModalityFilter();
++
-++ virtual bool eventFilter( QObject *pObject, QEvent *pEvent );
+++ virtual bool eventFilter( TQObject *pObject, TQEvent *pEvent );
++};
++
++#endif // _TDEMODALITYFILTER_HXX_
@@ -11495,7 +11463,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
++ if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExternalMailer"))) {
++ KEMailSettings aEmailSettings;
-++ QString aClientProgram;
+++ TQString aClientProgram;
++ ::rtl::OUString sClientProgram;
++
++ aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram );
@@ -11509,7 +11477,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")))
++ {
-++ QFont aFixedFont;
+++ TQFont aFixedFont;
++ short nFontHeight;
++
++ aFixedFont = KGlobalSettings::fixedFont();
@@ -11519,8 +11487,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")))
++ {
-++ QFont aFixedFont;
-++ QString aFontName;
+++ TQFont aFixedFont;
+++ TQString aFontName;
++ :: rtl::OUString sFontName;
++
++ aFixedFont = KGlobalSettings::fixedFont();
@@ -11538,10 +11506,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")))
++ {
-++ QString aDocumentsDir( KGlobalSettings::documentPath() );
+++ TQString aDocumentsDir( KGlobalSettings::documentPath() );
++ rtl::OUString sDocumentsDir;
++ rtl::OUString sDocumentsURL;
-++ if ( aDocumentsDir.endsWith(QChar('/')) )
+++ if ( aDocumentsDir.endsWith(TQChar('/')) )
++ aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
++ sDocumentsDir = (const sal_Unicode *) aDocumentsDir.ucs2();
++ osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
@@ -11550,7 +11518,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
++ {
-++ QString aFTPProxy;
+++ TQString aFTPProxy;
++ switch ( KProtocolManager::proxyType() )
++ {
++ case KProtocolManager::ManualProxy: // Proxies are manually configured
@@ -11577,7 +11545,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
++ {
-++ QString aFTPProxy;
+++ TQString aFTPProxy;
++ switch ( KProtocolManager::proxyType() )
++ {
++ case KProtocolManager::ManualProxy: // Proxies are manually configured
@@ -11604,7 +11572,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
++ {
-++ QString aHTTPProxy;
+++ TQString aHTTPProxy;
++ switch ( KProtocolManager::proxyType() )
++ {
++ case KProtocolManager::ManualProxy: // Proxies are manually configured
@@ -11631,7 +11599,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
++ {
-++ QString aHTTPProxy;
+++ TQString aHTTPProxy;
++ switch ( KProtocolManager::proxyType() )
++ {
++ case KProtocolManager::ManualProxy: // Proxies are manually configured
@@ -11658,7 +11626,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
++ {
-++ QString aHTTPSProxy;
+++ TQString aHTTPSProxy;
++ switch ( KProtocolManager::proxyType() )
++ {
++ case KProtocolManager::ManualProxy: // Proxies are manually configured
@@ -11685,7 +11653,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ } else if (id.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
++ {
-++ QString aHTTPSProxy;
+++ TQString aHTTPSProxy;
++ switch ( KProtocolManager::proxyType() )
++ {
++ case KProtocolManager::ManualProxy: // Proxies are manually configured
@@ -11710,7 +11678,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ true, uno::makeAny( nPort ) );
++ }
++ } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) {
-++ QString aNoProxyFor;
+++ TQString aNoProxyFor;
++ switch ( KProtocolManager::proxyType() )
++ {
++ case KProtocolManager::ManualProxy: // Proxies are manually configured
@@ -12187,7 +12155,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#define Region QtXRegion
++
++
-++/* ********* Qt headers */
+++/* ********* TQt headers */
++#include <tqaccessible.h>
++#include <tqcheckbox.h>
++#include <tqcombobox.h>
@@ -13111,55 +13079,55 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ protected:
++ /** Cached push button.
++
-++ It is necessary for the QStyle::drawControl(). The buttons are created
-++ on demand and they are still hidden (no QWidget::show() is called).
+++ It is necessary for the TQStyle::drawControl(). The buttons are created
+++ on demand and they are still hidden (no TQWidget::show() is called).
++ */
-++ QPushButton *m_pPushButton;
+++ TQPushButton *m_pPushButton;
++
++ /** Cached radio button.
++
++ @see m_pPushButton
++ */
-++ QRadioButton *m_pRadioButton;
+++ TQRadioButton *m_pRadioButton;
++
++ /** Cached check box.
++
++ @see m_pPushButton
++ */
-++ QCheckBox *m_pCheckBox;
+++ TQCheckBox *m_pCheckBox;
++
++ /** Cached combo box.
++
++ @see m_pPushButton
++ */
-++ QComboBox *m_pComboBox;
+++ TQComboBox *m_pComboBox;
++
++ /** Cached editable combo box.
++
++ Needed, because some styles do not like dynamic changes
-++ (QComboBox::setEditable()).
+++ (TQComboBox::setEditable()).
++
++ @see m_pPushButton
++ */
-++ QComboBox *m_pEditableComboBox;
+++ TQComboBox *m_pEditableComboBox;
++
++ /** Cached line edit box.
++
++ @see m_pPushButton
++ */
-++ QLineEdit *m_pLineEdit;
+++ TQLineEdit *m_pLineEdit;
++
++ /** Cached spin box.
++
++ @see m_pPushButton
++ */
-++ QSpinWidget *m_pSpinWidget;
+++ TQSpinWidget *m_pSpinWidget;
++
++ /** Cached spin box'es line edit.
++
++ @see m_pPushButton
++ */
-++ QLineEdit *m_pSpinEdit;
+++ TQLineEdit *m_pSpinEdit;
++
++ /** Cached tab.
++
@@ -13167,7 +13135,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ @see m_pPushButton
++ */
-++ QTab *m_pTabLeft, *m_pTabMiddle, *m_pTabRight, *m_pTabAlone;
+++ TQTab *m_pTabLeft, *m_pTabMiddle, *m_pTabRight, *m_pTabAlone;
++
++ /** Cached tab bar's parent widget.
++
@@ -13178,13 +13146,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ @see m_pPushButton, m_pTabWidget
++ */
-++ QWidget *m_pTabBarParent;
+++ TQWidget *m_pTabBarParent;
++
++ /** Cached tab bar widget.
++
++ @see m_pPushButton
++ */
-++ QTabBar *m_pTabBar;
+++ TQTabBar *m_pTabBar;
++
++ /** Cached tab widget.
++
@@ -13194,43 +13162,43 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ @see m_pPushButton, m_pTabBarParent
++ */
-++ QTabWidget *m_pTabWidget;
+++ TQTabWidget *m_pTabWidget;
++
++ /** Cached list view.
++
++ @see m_pPushButton
++ */
-++ QListView *m_pListView;
+++ TQListView *m_pListView;
++
++ /** Cached scroll bar.
++
++ @see m_pPushButton
++ */
-++ QScrollBar *m_pScrollBar;
+++ TQScrollBar *m_pScrollBar;
++
++ /** Cached dock area. Needed for proper functionality of tool bars.
++
++ @see m_pPushButton
++ */
-++ QMainWindow *m_pMainWindow;
+++ TQMainWindow *m_pMainWindow;
++
++ /** Cached tool bar.
++
++ @see m_pPushButton
++ */
-++ QToolBar *m_pToolBarHoriz, *m_pToolBarVert;
+++ TQToolBar *m_pToolBarHoriz, *m_pToolBarVert;
++
++ /** Cached tool button.
++
++ @see m_pPushButton
++ */
-++ QToolButton *m_pToolButton;
+++ TQToolButton *m_pToolButton;
++
++ /** Cached menu bar.
++
++ @see m_pPushButton
++ */
-++ QMenuBar *m_pMenuBar;
+++ TQMenuBar *m_pMenuBar;
++
++ /** Identifiers of menu bar items.
++ */
@@ -13240,7 +13208,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ @see m_pPushButton
++ */
-++ QPopupMenu *m_pPopupMenu;
+++ TQPopupMenu *m_pPopupMenu;
++
++ /** Identifiers of popup menu items.
++ */
@@ -13248,7 +13216,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ /** cached progress bar
++ */
-++ QProgressBar *m_pProgressBar;
+++ TQProgressBar *m_pProgressBar;
++
++ // TODO other widgets
++
@@ -13257,8 +13225,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ It creates an empty WidgetPainter with all the cached widgets initialized
++ to NULL. The widgets are created on demand and they are still hidden
-++ (no QWidget::show()), because they are needed just as a parameter for
-++ QStyle::drawControl().
+++ (no TQWidget::show()), because they are needed just as a parameter for
+++ TQStyle::drawControl().
++
++ @see m_pPushButton
++ */
@@ -13293,7 +13261,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ @param gc
++ The graphics context.
++ */
-++ BOOL drawStyledWidget( QWidget *pWidget,
+++ BOOL drawStyledWidget( TQWidget *pWidget,
++ ControlState nState, const ImplControlValue& aValue,
++ Display *dpy, XLIB_Window drawable, int nScreen, int nDepth, GC gc,
++ ControlPart nPart = PART_ENTIRE_CONTROL );
@@ -13306,19 +13274,19 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ @return valid push button.
++ */
-++ QPushButton *pushButton( const Rectangle& rControlRegion, BOOL bDefault );
+++ TQPushButton *pushButton( const Rectangle& rControlRegion, BOOL bDefault );
++
++ /** 'Get' method for radio button.
++
++ @see pushButton()
++ */
-++ QRadioButton *radioButton( const Rectangle& rControlRegion );
+++ TQRadioButton *radioButton( const Rectangle& rControlRegion );
++
++ /** 'Get' method for check box.
++
++ @see pushButton()
++ */
-++ QCheckBox *checkBox( const Rectangle& rControlRegion );
+++ TQCheckBox *checkBox( const Rectangle& rControlRegion );
++
++ /** 'Get' method for combo box.
++
@@ -13327,74 +13295,74 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ @see pushButton(), m_pEditableComboBox
++ */
-++ QComboBox *comboBox( const Rectangle& rControlRegion, BOOL bEditable );
+++ TQComboBox *comboBox( const Rectangle& rControlRegion, BOOL bEditable );
++
++ /** 'Get' method for line edit box.
++
++ @see pushButton()
++ */
-++ QLineEdit *lineEdit( const Rectangle& rControlRegion );
+++ TQLineEdit *lineEdit( const Rectangle& rControlRegion );
++
++ /** 'Get' method for spin box.
++
++ @see pushButton()
++ */
-++ QSpinWidget *spinWidget( const Rectangle& rControlRegion );
+++ TQSpinWidget *spinWidget( const Rectangle& rControlRegion );
++
++ /** 'Get' method for tab bar.
++
++ @see pushButton()
++ */
-++ QTabBar *tabBar( const Rectangle& rControlRegion );
+++ TQTabBar *tabBar( const Rectangle& rControlRegion );
++
++ /** 'Get' method for tab widget.
++
++ @see pushButton()
++ */
-++ QTabWidget *tabWidget( const Rectangle& rControlRegion );
+++ TQTabWidget *tabWidget( const Rectangle& rControlRegion );
++
++ /** 'Get' method for list view.
++
++ @see pushButton()
++ */
-++ QListView *listView( const Rectangle& rControlRegion );
+++ TQListView *listView( const Rectangle& rControlRegion );
++
++ /** 'Get' method for scroll bar.
++
++ @see pushButton()
++ */
-++ QScrollBar *scrollBar( const Rectangle& rControlRegion,
+++ TQScrollBar *scrollBar( const Rectangle& rControlRegion,
++ BOOL bHorizontal, const ImplControlValue& aValue );
++
++ /** 'Get' method for tool bar.
++
++ @see pushButton()
++ */
-++ QToolBar *toolBar( const Rectangle& rControlRegion, BOOL bHorizontal );
+++ TQToolBar *toolBar( const Rectangle& rControlRegion, BOOL bHorizontal );
++
++ /** 'Get' method for tool button.
++
++ @see pushButton()
++ */
-++ QToolButton *toolButton( const Rectangle& rControlRegion );
+++ TQToolButton *toolButton( const Rectangle& rControlRegion );
++
++ /** 'Get' method for menu bar.
++
++ @see pushButton()
++ */
-++ QMenuBar *menuBar( const Rectangle& rControlRegion );
+++ TQMenuBar *menuBar( const Rectangle& rControlRegion );
++
++ /** 'Get' method for popup menu.
++
++ @see pushButton()
++ */
-++ QPopupMenu *popupMenu( const Rectangle& rControlRegion );
+++ TQPopupMenu *popupMenu( const Rectangle& rControlRegion );
++
++ /** 'Get' method for progress bar
++
++ @see pushButton()
++ */
-++ QProgressBar *progressBar( const Rectangle& rControlRegion );
+++ TQProgressBar *progressBar( const Rectangle& rControlRegion );
++
++ // TODO other widgets
++
@@ -13411,10 +13379,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ @param aValue
++ Value held by the widget (on, off, ...)
++ */
-++ QStyle::SFlags vclStateValue2SFlags( ControlState nState, const ImplControlValue& aValue );
+++ TQStyle::SFlags vclStateValue2SFlags( ControlState nState, const ImplControlValue& aValue );
++
++ public:
-++ /** Convert VCL Rectangle to QRect.
+++ /** Convert VCL Rectangle to TQRect.
++
++ @param rControlRegion
++ The region to convert.
@@ -13422,7 +13390,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ @return
++ The bounding box of the region.
++ */
-++ static QRect region2QRect( const Rectangle& rControlRegion );
+++ static TQRect region2TQRect( const Rectangle& rControlRegion );
++};
++
++WidgetPainter::WidgetPainter( void )
@@ -13481,7 +13449,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ delete m_pProgressBar, m_pProgressBar = NULL;
++}
++
-++BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
+++BOOL WidgetPainter::drawStyledWidget( TQWidget *pWidget,
++ ControlState nState, const ImplControlValue& aValue,
++ Display *dpy, XLIB_Window drawable, int nScreen, int nDepth, GC gc,
++ ControlPart nPart )
@@ -13490,44 +13458,44 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return FALSE;
++
++ // Normalize the widget
-++ QPoint qWidgetPos( pWidget->pos() );
+++ TQPoint qWidgetPos( pWidget->pos() );
++ pWidget->move( 0, 0 );
++
++ // Enable/disable the widget
++ pWidget->setEnabled( nState & CTRL_STATE_ENABLED );
++
++ // Create pixmap to paint to
-++ QPixmap qPixmap( pWidget->width(), pWidget->height() );
-++ QPainter qPainter( &qPixmap );
-++ QRect qRect( 0, 0, pWidget->width(), pWidget->height() );
+++ TQPixmap qPixmap( pWidget->width(), pWidget->height() );
+++ TQPainter qPainter( &qPixmap );
+++ TQRect qRect( 0, 0, pWidget->width(), pWidget->height() );
++
++ // Use the background of the widget
-++ qPixmap.fill( pWidget, QPoint(0, 0) );
+++ qPixmap.fill( pWidget, TQPoint(0, 0) );
++
++ // Convert the flags
-++ QStyle::SFlags nStyle = vclStateValue2SFlags( nState, aValue );
+++ TQStyle::SFlags nStyle = vclStateValue2SFlags( nState, aValue );
++
++ // Store the widget class
++ const char *pClassName = pWidget->className();
++
++ // Draw the widget to the pixmap
-++ if ( strcmp( "QPushButton", pClassName ) == 0 )
+++ if ( strcmp( TQPUSHBUTTON_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
++ // Workaround for the Platinum style.
++ // Platinum takes the state directly from the widget, not from SFlags.
-++ QPushButton *pPushButton = static_cast<QPushButton *>( pWidget->qt_cast( "QPushButton" ) );
+++ TQPushButton *pPushButton = static_cast<TQPushButton *>( pWidget->qt_cast( TQPUSHBUTTON_OBJECT_NAME_STRING ) );
++ if ( pPushButton )
++ {
-++ pPushButton->setDown ( nStyle & QStyle::Style_Down );
-++ pPushButton->setOn ( nStyle & QStyle::Style_On );
-++ pPushButton->setEnabled( nStyle & QStyle::Style_Enabled );
+++ pPushButton->setDown ( nStyle & TQStyle::Style_Down );
+++ pPushButton->setOn ( nStyle & TQStyle::Style_On );
+++ pPushButton->setEnabled( nStyle & TQStyle::Style_Enabled );
++ }
++
-++ kapp->style().drawControl( QStyle::CE_PushButton,
+++ kapp->style().drawControl( TQStyle::CE_PushButton,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
++ }
-++ else if ( strcmp( "QRadioButton", pClassName ) == 0 )
+++ else if ( strcmp( TQRADIOBUTTON_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
++ // Bitblt from the screen, because the radio buttons are usually not
++ // rectangular, and there could be a bitmap under them
@@ -13540,52 +13508,52 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ 0, 0 );
++ XFreeGC( dpy, aTmpGC );
++
-++ kapp->style().drawControl( QStyle::CE_RadioButton,
+++ kapp->style().drawControl( TQStyle::CE_RadioButton,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
++ }
-++ else if ( strcmp( "QCheckBox", pClassName ) == 0 )
+++ else if ( strcmp( TQCHECKBOX_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ kapp->style().drawControl( QStyle::CE_CheckBox,
+++ kapp->style().drawControl( TQStyle::CE_CheckBox,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
++ }
-++ else if ( strcmp( "QComboBox", pClassName ) == 0 )
+++ else if ( strcmp( TQCOMBOBOX_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ kapp->style().drawComplexControl( QStyle::CC_ComboBox,
+++ kapp->style().drawComplexControl( TQStyle::CC_ComboBox,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
++
++ // Editable combo box uses the background of the associated edit box
-++ QComboBox *pComboBox = static_cast<QComboBox *>( pWidget->qt_cast( "QComboBox" ) );
+++ TQComboBox *pComboBox = static_cast<TQComboBox *>( pWidget->qt_cast( TQCOMBOBOX_OBJECT_NAME_STRING ) );
++ if ( pComboBox && pComboBox->editable() && pComboBox->lineEdit() )
++ {
-++ QColorGroup::ColorRole eColorRole = ( pComboBox->isEnabled() )?
-++ QColorGroup::Base: QColorGroup::Background;
+++ TQColorGroup::ColorRole eColorRole = ( pComboBox->isEnabled() )?
+++ TQColorGroup::Base: TQColorGroup::Background;
++ qPainter.fillRect(
-++ kapp->style().querySubControlMetrics( QStyle::CC_ComboBox,
-++ pComboBox, QStyle::SC_ComboBoxEditField ),
+++ kapp->style().querySubControlMetrics( TQStyle::CC_ComboBox,
+++ pComboBox, TQStyle::SC_ComboBoxEditField ),
++ pComboBox->lineEdit()->colorGroup().brush( eColorRole ) );
++ }
++ }
-++ else if ( strcmp( "QLineEdit", pClassName ) == 0 )
+++ else if ( strcmp( TQLINEEDIT_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ kapp->style().drawPrimitive( QStyle::PE_PanelLineEdit,
+++ kapp->style().drawPrimitive( TQStyle::PE_PanelLineEdit,
++ &qPainter, qRect,
-++ pWidget->colorGroup(), nStyle | QStyle::Style_Sunken );
+++ pWidget->colorGroup(), nStyle | TQStyle::Style_Sunken );
++ }
-++ else if ( strcmp( "QSpinWidget", pClassName ) == 0 )
+++ else if ( strcmp( TQSPINWIDGET_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
++ const SpinbuttonValue *pValue = static_cast<const SpinbuttonValue *> ( &aValue );
++
++ // Is any of the buttons pressed?
-++ QStyle::SCFlags eActive = QStyle::SC_None;
+++ TQStyle::SCFlags eActive = TQStyle::SC_None;
++ if ( pValue )
++ {
++ if ( pValue->mnUpperState & CTRL_STATE_PRESSED )
-++ eActive = QStyle::SC_SpinWidgetUp;
+++ eActive = TQStyle::SC_SpinWidgetUp;
++ else if ( pValue->mnLowerState & CTRL_STATE_PRESSED )
-++ eActive = QStyle::SC_SpinWidgetDown;
+++ eActive = TQStyle::SC_SpinWidgetDown;
++
++ // Update the enable/disable state of the widget
++ if ( ( nState & CTRL_STATE_ENABLED ) ||
@@ -13593,7 +13561,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ( pValue->mnLowerState & CTRL_STATE_ENABLED ) )
++ {
++ pWidget->setEnabled( true );
-++ nStyle |= QStyle::Style_Enabled;
+++ nStyle |= TQStyle::Style_Enabled;
++ }
++ else
++ pWidget->setEnabled( false );
@@ -13601,35 +13569,35 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ // Mouse-over effect
++ if ( (pValue->mnUpperState & CTRL_STATE_ROLLOVER) ||
++ (pValue->mnLowerState & CTRL_STATE_ROLLOVER) )
-++ nStyle |= QStyle::Style_MouseOver;
+++ nStyle |= TQStyle::Style_MouseOver;
++ }
++
++ // Spin widget uses the background of the associated edit box
-++ QSpinWidget *pSpinWidget = static_cast<QSpinWidget *>( pWidget->qt_cast( "QSpinWidget" ) );
+++ TQSpinWidget *pSpinWidget = static_cast<TQSpinWidget *>( pWidget->qt_cast( TQSPINWIDGET_OBJECT_NAME_STRING ) );
++ if ( pSpinWidget && pSpinWidget->editWidget() )
++ {
-++ QColorGroup::ColorRole eColorRole = ( pSpinWidget->isEnabled() )?
-++ QColorGroup::Base: QColorGroup::Background;
+++ TQColorGroup::ColorRole eColorRole = ( pSpinWidget->isEnabled() )?
+++ TQColorGroup::Base: TQColorGroup::Background;
++ qPainter.fillRect(
-++ kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget,
-++ pSpinWidget, QStyle::SC_SpinWidgetEditField ),
+++ kapp->style().querySubControlMetrics( TQStyle::CC_SpinWidget,
+++ pSpinWidget, TQStyle::SC_SpinWidgetEditField ),
++ pSpinWidget->editWidget()->colorGroup().brush( eColorRole ) );
++ }
++
++ // Adjust the frame (needed for Motif Plus style)
-++ QRect qFrameRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget,
-++ pWidget, QStyle::SC_SpinWidgetFrame );
+++ TQRect qFrameRect = kapp->style().querySubControlMetrics( TQStyle::CC_SpinWidget,
+++ pWidget, TQStyle::SC_SpinWidgetFrame );
++
-++ kapp->style().drawComplexControl( QStyle::CC_SpinWidget,
+++ kapp->style().drawComplexControl( TQStyle::CC_SpinWidget,
++ &qPainter, pWidget, qFrameRect,
++ pWidget->colorGroup(), nStyle,
-++ QStyle::SC_All, eActive );
+++ TQStyle::SC_All, eActive );
++ }
-++ else if ( strcmp( "QTabBar", pClassName ) == 0 )
+++ else if ( strcmp( TQTABBAR_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
++ const TabitemValue *pValue = static_cast<const TabitemValue *> ( &aValue );
++
-++ QTab *pTab = NULL;
+++ TQTab *pTab = NULL;
++ if ( pValue )
++ {
++ if ( ( pValue->isFirst() || pValue->isLeftAligned() ) && ( pValue->isLast() || pValue->isRightAligned() ) )
@@ -13646,28 +13614,28 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ pTab->setRect( qRect );
++
-++ kapp->style().drawControl( QStyle::CE_TabBarTab,
+++ kapp->style().drawControl( TQStyle::CE_TabBarTab,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle,
-++ QStyleOption( pTab ) );
+++ TQStyleOption( pTab ) );
++ }
-++ else if ( strcmp( "QTabWidget", pClassName ) == 0 )
+++ else if ( strcmp( TQTABWIDGET_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ kapp->style().drawPrimitive( QStyle::PE_PanelTabWidget,
+++ kapp->style().drawPrimitive( TQStyle::PE_PanelTabWidget,
++ &qPainter, qRect,
++ pWidget->colorGroup(), nStyle );
++ }
-++ else if ( strcmp( "QListView", pClassName ) == 0 )
+++ else if ( strcmp( TQLISTVIEW_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ kapp->style().drawPrimitive( QStyle::PE_Panel,
+++ kapp->style().drawPrimitive( TQStyle::PE_Panel,
++ &qPainter, qRect,
-++ pWidget->colorGroup(), nStyle | QStyle::Style_Sunken );
+++ pWidget->colorGroup(), nStyle | TQStyle::Style_Sunken );
++ }
-++ else if ( strcmp( "QScrollBar", pClassName ) == 0 )
+++ else if ( strcmp( TQSCROLLBAR_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
++ const ScrollbarValue *pValue = static_cast<const ScrollbarValue *> ( &aValue );
++
-++ QStyle::SCFlags eActive = QStyle::SC_None;
+++ TQStyle::SCFlags eActive = TQStyle::SC_None;
++ if ( pValue )
++ {
++ // Workaround for Style_MouseOver-aware themes.
@@ -13675,31 +13643,31 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ const char *pStyleName = kapp->style().className();
++ if ( strcmp( "QMotifPlusStyle", pStyleName ) == 0 )
++ {
-++ nStyle |= QStyle::Style_MouseOver;
+++ nStyle |= TQStyle::Style_MouseOver;
++ if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER )
-++ eActive = QStyle::SC_ScrollBarSlider;
+++ eActive = TQStyle::SC_ScrollBarSlider;
++ }
++ else if ( strcmp( "QSGIStyle", pStyleName ) == 0 )
++ {
-++ nStyle |= QStyle::Style_MouseOver;
+++ nStyle |= TQStyle::Style_MouseOver;
++ if ( pValue->mnButton1State & CTRL_STATE_ROLLOVER )
-++ eActive = QStyle::SC_ScrollBarSubLine;
+++ eActive = TQStyle::SC_ScrollBarSubLine;
++ else if ( pValue->mnButton2State & CTRL_STATE_ROLLOVER )
-++ eActive = QStyle::SC_ScrollBarAddLine;
+++ eActive = TQStyle::SC_ScrollBarAddLine;
++ else if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER )
-++ eActive = QStyle::SC_ScrollBarSlider;
+++ eActive = TQStyle::SC_ScrollBarSlider;
++ }
++
++ if ( pValue->mnButton1State & CTRL_STATE_PRESSED )
-++ eActive = QStyle::SC_ScrollBarSubLine;
+++ eActive = TQStyle::SC_ScrollBarSubLine;
++ else if ( pValue->mnButton2State & CTRL_STATE_PRESSED )
-++ eActive = QStyle::SC_ScrollBarAddLine;
+++ eActive = TQStyle::SC_ScrollBarAddLine;
++ else if ( pValue->mnThumbState & CTRL_STATE_PRESSED )
-++ eActive = QStyle::SC_ScrollBarSlider;
+++ eActive = TQStyle::SC_ScrollBarSlider;
++ else if ( pValue->mnPage1State & CTRL_STATE_PRESSED )
-++ eActive = QStyle::SC_ScrollBarSubPage;
+++ eActive = TQStyle::SC_ScrollBarSubPage;
++ else if ( pValue->mnPage2State & CTRL_STATE_PRESSED )
-++ eActive = QStyle::SC_ScrollBarAddPage;
+++ eActive = TQStyle::SC_ScrollBarAddPage;
++
++ // Update the enable/disable state of the widget
++ if ( ( nState & CTRL_STATE_ENABLED ) ||
@@ -13710,45 +13678,45 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ( pValue->mnPage2State & CTRL_STATE_ENABLED ) )
++ {
++ pWidget->setEnabled( true );
-++ nStyle |= QStyle::Style_Enabled;
+++ nStyle |= TQStyle::Style_Enabled;
++ }
++ else
++ pWidget->setEnabled( false );
++ }
++
++ // Is it a horizontal scroll bar?
-++ QScrollBar *pScrollBar = static_cast<QScrollBar *> ( pWidget->qt_cast( "QScrollBar" ) );
-++ QStyle::StyleFlags eHoriz = QStyle::Style_Default;
+++ TQScrollBar *pScrollBar = static_cast<TQScrollBar *> ( pWidget->qt_cast( TQSCROLLBAR_OBJECT_NAME_STRING ) );
+++ TQStyle::StyleFlags eHoriz = TQStyle::Style_Default;
++ if ( pScrollBar && pScrollBar->orientation() == Qt::Horizontal )
-++ eHoriz = QStyle::Style_Horizontal;
+++ eHoriz = TQStyle::Style_Horizontal;
++
-++ kapp->style().drawComplexControl( QStyle::CC_ScrollBar,
+++ kapp->style().drawComplexControl( TQStyle::CC_ScrollBar,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle | eHoriz,
-++ QStyle::SC_All, eActive );
+++ TQStyle::SC_All, eActive );
++ }
-++ else if ( strcmp( "QToolBar", pClassName ) == 0 )
+++ else if ( strcmp( TQTOOLBAR_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ QToolBar *pToolBar = static_cast< QToolBar * >( pWidget->qt_cast( "QToolBar" ) );
+++ TQToolBar *pToolBar = static_cast< TQToolBar * >( pWidget->qt_cast( TQTOOLBAR_OBJECT_NAME_STRING ) );
++ bool bIsHorizontal = false;
++ if ( pToolBar && pToolBar->orientation() == Qt::Horizontal )
++ {
-++ nStyle |= QStyle::Style_Horizontal;
+++ nStyle |= TQStyle::Style_Horizontal;
++ bIsHorizontal = true;
++ }
++
-++ kapp->style().drawControl( QStyle::CE_DockWindowEmptyArea,
+++ kapp->style().drawControl( TQStyle::CE_DockWindowEmptyArea,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
++
-++ kapp->style().drawPrimitive( QStyle::PE_PanelDockWindow,
+++ kapp->style().drawPrimitive( TQStyle::PE_PanelDockWindow,
++ &qPainter, qRect, pWidget->colorGroup(), nStyle );
++
++ if ( nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT )
++ {
++ const ToolbarValue *pValue = static_cast< const ToolbarValue * >( &aValue );
++
-++ QRect qThumbRect = region2QRect( pValue->maGripRect );
+++ TQRect qThumbRect = region2TQRect( pValue->maGripRect );
++ qThumbRect.moveBy( -qWidgetPos.x(), -qWidgetPos.y() );
++ if ( bIsHorizontal )
++ qThumbRect.addCoords( 0, 2, 0, -3 ); // make the thumb a bit nicer
@@ -13768,64 +13736,64 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ pWidget->colorGroup(), nStyle );
++ }
++ else
-++ kapp->style().drawPrimitive( QStyle::PE_DockWindowHandle,
+++ kapp->style().drawPrimitive( TQStyle::PE_DockWindowHandle,
++ &qPainter, qThumbRect, pWidget->colorGroup(), nStyle );
++ }
++ }
-++ else if ( strcmp( "QToolButton", pClassName ) == 0 )
+++ else if ( strcmp( TQTOOLBUTTON_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ if( (nStyle & QStyle::Style_MouseOver) )
-++ nStyle &= ~QStyle::Style_Off;
-++ kapp->style().drawComplexControl( QStyle::CC_ToolButton,
+++ if( (nStyle & TQStyle::Style_MouseOver) )
+++ nStyle &= ~TQStyle::Style_Off;
+++ kapp->style().drawComplexControl( TQStyle::CC_ToolButton,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle,
-++ QStyle::SC_ToolButton );
+++ TQStyle::SC_ToolButton );
++ }
-++ else if ( strcmp( "QMenuBar", pClassName ) == 0 )
+++ else if ( strcmp( TQMENUBAR_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
++ if ( nPart == PART_ENTIRE_CONTROL )
++ {
-++ kapp->style().drawControl( QStyle::CE_MenuBarEmptyArea,
+++ kapp->style().drawControl( TQStyle::CE_MenuBarEmptyArea,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
++ }
++ else if ( nPart == PART_MENU_ITEM )
++ {
-++ int nMenuItem = ( nStyle & QStyle::Style_Enabled )? m_nMenuBarEnabledItem: m_nMenuBarDisabledItem;
-++ QMenuItem *pMenuItem = static_cast<QMenuBar*>( pWidget )->findItem( nMenuItem );
+++ int nMenuItem = ( nStyle & TQStyle::Style_Enabled )? m_nMenuBarEnabledItem: m_nMenuBarDisabledItem;
+++ TQMenuItem *pMenuItem = static_cast<TQMenuBar*>( pWidget )->findItem( nMenuItem );
++
-++ if ( nStyle & QStyle::Style_Selected )
-++ nStyle |= QStyle::Style_Active | QStyle::Style_Down | QStyle::Style_HasFocus;
+++ if ( nStyle & TQStyle::Style_Selected )
+++ nStyle |= TQStyle::Style_Active | TQStyle::Style_Down | TQStyle::Style_HasFocus;
++
-++ kapp->style().drawControl( QStyle::CE_MenuBarItem,
+++ kapp->style().drawControl( TQStyle::CE_MenuBarItem,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle,
-++ QStyleOption( pMenuItem ) );
+++ TQStyleOption( pMenuItem ) );
++ }
++ }
-++ else if ( strcmp( "QPopupMenu", pClassName ) == 0 )
+++ else if ( strcmp( TQPOPUPMENU_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
-++ int nMenuItem = ( nStyle & QStyle::Style_Enabled )? m_nPopupMenuEnabledItem: m_nPopupMenuDisabledItem;
-++ QMenuItem *pMenuItem = static_cast<QPopupMenu*>( pWidget )->findItem( nMenuItem );
+++ int nMenuItem = ( nStyle & TQStyle::Style_Enabled )? m_nPopupMenuEnabledItem: m_nPopupMenuDisabledItem;
+++ TQMenuItem *pMenuItem = static_cast<TQPopupMenu*>( pWidget )->findItem( nMenuItem );
++
-++ if ( nStyle & QStyle::Style_Selected )
-++ nStyle |= QStyle::Style_Active;
+++ if ( nStyle & TQStyle::Style_Selected )
+++ nStyle |= TQStyle::Style_Active;
++
-++ kapp->style().drawControl( QStyle::CE_PopupMenuItem,
+++ kapp->style().drawControl( TQStyle::CE_PopupMenuItem,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle,
-++ QStyleOption( pMenuItem, 0, 0 ) );
+++ TQStyleOption( pMenuItem, 0, 0 ) );
++ }
-++ else if ( strcmp( "QProgressBar", pClassName ) == 0 )
+++ else if ( strcmp( TQPROGRESSBAR_OBJECT_NAME_STRING, pClassName ) == 0 )
++ {
++ long nProgressWidth = aValue.getNumericVal();
-++ QProgressBar* pProgress = static_cast<QProgressBar*>(pWidget);
+++ TQProgressBar* pProgress = static_cast<TQProgressBar*>(pWidget);
++ pProgress->setProgress( nProgressWidth, qRect.width() );
++
-++ kapp->style().drawControl( QStyle::CE_ProgressBarGroove,
+++ kapp->style().drawControl( TQStyle::CE_ProgressBarGroove,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
-++ kapp->style().drawControl( QStyle::CE_ProgressBarContents,
+++ kapp->style().drawControl( TQStyle::CE_ProgressBarContents,
++ &qPainter, pWidget, qRect,
++ pWidget->colorGroup(), nStyle );
++ }
@@ -13846,30 +13814,30 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return TRUE;
++}
++
-++QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion,
+++TQPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion,
++ BOOL bDefault )
++{
++ if ( !m_pPushButton )
-++ m_pPushButton = new QPushButton( NULL, "push_button" );
+++ m_pPushButton = new TQPushButton( NULL, "push_button" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ // Workaround for broken styles which do not add
-++ // QStyle::PM_ButtonDefaultIndicator to the size of the default button
+++ // TQStyle::PM_ButtonDefaultIndicator to the size of the default button
++ // (for example Keramik)
++ // FIXME Fix Keramik style to be consistant with Qt built-in styles. Aargh!
++ if ( bDefault )
++ {
-++ QSize qContentsSize( 50, 50 );
+++ TQSize qContentsSize( 50, 50 );
++ m_pPushButton->setDefault( false );
-++ QSize qNormalSize = kapp->style().sizeFromContents( QStyle::CT_PushButton,
+++ TQSize qNormalSize = kapp->style().sizeFromContents( TQStyle::CT_PushButton,
++ m_pPushButton, qContentsSize );
++ m_pPushButton->setDefault( true );
-++ QSize qDefSize = kapp->style().sizeFromContents( QStyle::CT_PushButton,
+++ TQSize qDefSize = kapp->style().sizeFromContents( TQStyle::CT_PushButton,
++ m_pPushButton, qContentsSize );
++
++ int nIndicatorSize = kapp->style().pixelMetric(
-++ QStyle::PM_ButtonDefaultIndicator, m_pPushButton );
+++ TQStyle::PM_ButtonDefaultIndicator, m_pPushButton );
++ if ( qNormalSize.width() == qDefSize.width() )
++ qRect.addCoords( nIndicatorSize, 0, -nIndicatorSize, 0 );
++ if ( qNormalSize.height() == qDefSize.height() )
@@ -13883,24 +13851,24 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pPushButton;
++}
++
-++QRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion )
+++TQRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion )
++{
++ if ( !m_pRadioButton )
-++ m_pRadioButton = new QRadioButton( NULL, "radio_button" );
+++ m_pRadioButton = new TQRadioButton( NULL, "radio_button" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ // Workaround for broken themes which do not honor the given size.
++ // Quite ugly, but I do not know about a better solution.
++ const char *pStyleName = kapp->style().className();
++ if ( strcmp( "KThemeStyle", pStyleName ) == 0 )
++ {
-++ QRect qOldRect( qRect );
+++ TQRect qOldRect( qRect );
++
++ qRect.setWidth( kapp->style().pixelMetric(
-++ QStyle::PM_ExclusiveIndicatorWidth, m_pRadioButton ) );
+++ TQStyle::PM_ExclusiveIndicatorWidth, m_pRadioButton ) );
++ qRect.setHeight( kapp->style().pixelMetric(
-++ QStyle::PM_ExclusiveIndicatorHeight, m_pRadioButton ) );
+++ TQStyle::PM_ExclusiveIndicatorHeight, m_pRadioButton ) );
++
++ qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2,
++ ( qOldRect.height() - qRect.height() ) / 2 );
@@ -13912,24 +13880,24 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pRadioButton;
++}
++
-++QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion )
+++TQCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion )
++{
++ if ( !m_pCheckBox )
-++ m_pCheckBox = new QCheckBox( NULL, "check_box" );
+++ m_pCheckBox = new TQCheckBox( NULL, "check_box" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ // Workaround for broken themes which do not honor the given size.
++ // Quite ugly, but I do not know about a better solution.
++ const char *pStyleName = kapp->style().className();
++ if ( strcmp( "KThemeStyle", pStyleName ) == 0 )
++ {
-++ QRect qOldRect( qRect );
+++ TQRect qOldRect( qRect );
++
++ qRect.setWidth( kapp->style().pixelMetric(
-++ QStyle::PM_IndicatorWidth, m_pCheckBox ) );
+++ TQStyle::PM_IndicatorWidth, m_pCheckBox ) );
++ qRect.setHeight( kapp->style().pixelMetric(
-++ QStyle::PM_IndicatorHeight, m_pCheckBox ) );
+++ TQStyle::PM_IndicatorHeight, m_pCheckBox ) );
++
++ qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2,
++ ( qOldRect.height() - qRect.height() ) / 2 );
@@ -13941,24 +13909,24 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pCheckBox;
++}
++
-++QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion,
+++TQComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion,
++ BOOL bEditable )
++{
-++ QComboBox *pComboBox = NULL;
+++ TQComboBox *pComboBox = NULL;
++ if ( bEditable )
++ {
++ if ( !m_pEditableComboBox )
-++ m_pEditableComboBox = new QComboBox( true, NULL, "combo_box_edit" );
+++ m_pEditableComboBox = new TQComboBox( true, NULL, "combo_box_edit" );
++ pComboBox = m_pEditableComboBox;
++ }
++ else
++ {
++ if ( !m_pComboBox )
-++ m_pComboBox = new QComboBox( false, NULL, "combo_box" );
+++ m_pComboBox = new TQComboBox( false, NULL, "combo_box" );
++ pComboBox = m_pComboBox;
++ }
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ pComboBox->move( qRect.topLeft() );
++ pComboBox->resize( qRect.size() );
@@ -13966,12 +13934,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return pComboBox;
++}
++
-++QLineEdit *WidgetPainter::lineEdit( const Rectangle& rControlRegion )
+++TQLineEdit *WidgetPainter::lineEdit( const Rectangle& rControlRegion )
++{
++ if ( !m_pLineEdit )
-++ m_pLineEdit = new QLineEdit( NULL, "line_edit" );
+++ m_pLineEdit = new TQLineEdit( NULL, "line_edit" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pLineEdit->move( qRect.topLeft() );
++ m_pLineEdit->resize( qRect.size() );
@@ -13979,17 +13947,17 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pLineEdit;
++}
++
-++QSpinWidget *WidgetPainter::spinWidget( const Rectangle& rControlRegion )
+++TQSpinWidget *WidgetPainter::spinWidget( const Rectangle& rControlRegion )
++{
++ if ( !m_pSpinWidget )
++ {
-++ m_pSpinWidget = new QSpinWidget( NULL, "spin_widget" );
+++ m_pSpinWidget = new TQSpinWidget( NULL, "spin_widget" );
++
-++ m_pSpinEdit = new QLineEdit( NULL, "line_edit_spin" );
+++ m_pSpinEdit = new TQLineEdit( NULL, "line_edit_spin" );
++ m_pSpinWidget->setEditWidget( m_pSpinEdit );
++ }
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pSpinWidget->move( qRect.topLeft() );
++ m_pSpinWidget->resize( qRect.size() );
@@ -13998,41 +13966,41 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pSpinWidget;
++}
++
-++QTabBar *WidgetPainter::tabBar( const Rectangle& rControlRegion )
+++TQTabBar *WidgetPainter::tabBar( const Rectangle& rControlRegion )
++{
++ if ( !m_pTabBar )
++ {
++ if ( !m_pTabBarParent )
-++ m_pTabBarParent = new QWidget( NULL, "tab_bar_parent" );
+++ m_pTabBarParent = new TQWidget( NULL, "tab_bar_parent" );
++
-++ m_pTabBar = new QTabBar( m_pTabBarParent, "tab_bar" );
+++ m_pTabBar = new TQTabBar( m_pTabBarParent, "tab_bar" );
++
-++ m_pTabLeft = new QTab();
-++ m_pTabMiddle = new QTab();
-++ m_pTabRight = new QTab();
-++ m_pTabAlone = new QTab();
+++ m_pTabLeft = new TQTab();
+++ m_pTabMiddle = new TQTab();
+++ m_pTabRight = new TQTab();
+++ m_pTabAlone = new TQTab();
++
++ m_pTabBar->addTab( m_pTabLeft );
++ m_pTabBar->addTab( m_pTabMiddle );
++ m_pTabBar->addTab( m_pTabRight );
++ }
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pTabBar->move( qRect.topLeft() );
++ m_pTabBar->resize( qRect.size() );
++
-++ m_pTabBar->setShape( QTabBar::RoundedAbove );
+++ m_pTabBar->setShape( TQTabBar::RoundedAbove );
++
++ return m_pTabBar;
++}
++
-++QTabWidget *WidgetPainter::tabWidget( const Rectangle& rControlRegion )
+++TQTabWidget *WidgetPainter::tabWidget( const Rectangle& rControlRegion )
++{
++ if ( !m_pTabWidget )
-++ m_pTabWidget = new QTabWidget( NULL, "tab_widget" );
+++ m_pTabWidget = new TQTabWidget( NULL, "tab_widget" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++ --qRect.rTop();
++
++ m_pTabWidget->move( qRect.topLeft() );
@@ -14041,12 +14009,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pTabWidget;
++}
++
-++QListView *WidgetPainter::listView( const Rectangle& rControlRegion )
+++TQListView *WidgetPainter::listView( const Rectangle& rControlRegion )
++{
++ if ( !m_pListView )
-++ m_pListView = new QListView( NULL, "list_view" );
+++ m_pListView = new TQListView( NULL, "list_view" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pListView->move( qRect.topLeft() );
++ m_pListView->resize( qRect.size() );
@@ -14054,17 +14022,17 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pListView;
++}
++
-++QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion,
+++TQScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion,
++ BOOL bHorizontal, const ImplControlValue& aValue )
++{
++ if ( !m_pScrollBar )
++ {
-++ m_pScrollBar = new QScrollBar( NULL, "scroll_bar" );
+++ m_pScrollBar = new TQScrollBar( NULL, "scroll_bar" );
++ m_pScrollBar->setTracking( false );
++ m_pScrollBar->setLineStep( 1 );
++ }
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pScrollBar->move( qRect.topLeft() );
++ m_pScrollBar->resize( qRect.size() );
@@ -14082,17 +14050,17 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pScrollBar;
++}
++
-++QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, BOOL bHorizontal )
+++TQToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, BOOL bHorizontal )
++{
++ if ( !m_pMainWindow )
-++ m_pMainWindow = new QMainWindow( NULL, "main_window" );
+++ m_pMainWindow = new TQMainWindow( NULL, "main_window" );
++
-++ QToolBar *pToolBar;
+++ TQToolBar *pToolBar;
++ if ( bHorizontal )
++ {
++ if ( !m_pToolBarHoriz )
++ {
-++ m_pToolBarHoriz = new QToolBar( m_pMainWindow, "tool_bar_horiz" );
+++ m_pToolBarHoriz = new TQToolBar( m_pMainWindow, "tool_bar_horiz" );
++ m_pMainWindow->moveDockWindow( m_pToolBarHoriz, Qt::DockTop );
++ }
++ pToolBar = m_pToolBarHoriz;
@@ -14101,13 +14069,13 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ {
++ if ( !m_pToolBarVert )
++ {
-++ m_pToolBarVert = new QToolBar( m_pMainWindow, "tool_bar_horiz" );
+++ m_pToolBarVert = new TQToolBar( m_pMainWindow, "tool_bar_horiz" );
++ m_pMainWindow->moveDockWindow( m_pToolBarVert, Qt::DockLeft );
++ }
++ pToolBar = m_pToolBarVert;
++ }
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ pToolBar->move( qRect.topLeft() );
++ pToolBar->resize( qRect.size() );
@@ -14115,12 +14083,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return pToolBar;
++}
++
-++QToolButton *WidgetPainter::toolButton( const Rectangle& rControlRegion)
+++TQToolButton *WidgetPainter::toolButton( const Rectangle& rControlRegion)
++{
++ if ( !m_pToolButton )
-++ m_pToolButton = new QToolButton( NULL, "tool_button" );
+++ m_pToolButton = new TQToolButton( NULL, "tool_button" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pToolButton->move( qRect.topLeft() );
++ m_pToolButton->resize( qRect.size() );
@@ -14128,11 +14096,11 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pToolButton;
++}
++
-++QMenuBar *WidgetPainter::menuBar( const Rectangle& rControlRegion)
+++TQMenuBar *WidgetPainter::menuBar( const Rectangle& rControlRegion)
++{
++ if ( !m_pMenuBar )
++ {
-++ m_pMenuBar = new QMenuBar( NULL, "menu_bar" );
+++ m_pMenuBar = new TQMenuBar( NULL, "menu_bar" );
++
++ m_nMenuBarEnabledItem = m_pMenuBar->insertItem( "" );
++ m_nMenuBarDisabledItem = m_pMenuBar->insertItem( "" );
@@ -14141,7 +14109,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ m_pMenuBar->setItemEnabled( m_nMenuBarDisabledItem, false );
++ }
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pMenuBar->move( qRect.topLeft() );
++ m_pMenuBar->resize( qRect.size() );
@@ -14149,11 +14117,11 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pMenuBar;
++}
++
-++QPopupMenu *WidgetPainter::popupMenu( const Rectangle& rControlRegion)
+++TQPopupMenu *WidgetPainter::popupMenu( const Rectangle& rControlRegion)
++{
++ if ( !m_pPopupMenu )
++ {
-++ m_pPopupMenu = new QPopupMenu( NULL, "popup_menu" );
+++ m_pPopupMenu = new TQPopupMenu( NULL, "popup_menu" );
++
++ m_nPopupMenuEnabledItem = m_pPopupMenu->insertItem( "" );
++ m_nPopupMenuDisabledItem = m_pPopupMenu->insertItem( "" );
@@ -14162,7 +14130,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ m_pPopupMenu->setItemEnabled( m_nPopupMenuDisabledItem, false );
++ }
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pPopupMenu->move( qRect.topLeft() );
++ m_pPopupMenu->resize( qRect.size() );
@@ -14170,12 +14138,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pPopupMenu;
++}
++
-++QProgressBar *WidgetPainter::progressBar( const Rectangle& rControlRegion )
+++TQProgressBar *WidgetPainter::progressBar( const Rectangle& rControlRegion )
++{
++ if ( !m_pProgressBar )
-++ m_pProgressBar = new QProgressBar( NULL, "progress_bar" );
+++ m_pProgressBar = new TQProgressBar( NULL, "progress_bar" );
++
-++ QRect qRect = region2QRect( rControlRegion );
+++ TQRect qRect = region2TQRect( rControlRegion );
++
++ m_pProgressBar->move( qRect.topLeft() );
++ m_pProgressBar->resize( qRect.size() );
@@ -14183,33 +14151,33 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return m_pProgressBar;
++}
++
-++QStyle::SFlags WidgetPainter::vclStateValue2SFlags( ControlState nState,
+++TQStyle::SFlags WidgetPainter::vclStateValue2SFlags( ControlState nState,
++ const ImplControlValue& aValue )
++{
-++ QStyle::SFlags nStyle =
-++ ( (nState & CTRL_STATE_DEFAULT)? QStyle::Style_ButtonDefault: QStyle::Style_Default ) |
-++ ( (nState & CTRL_STATE_ENABLED)? QStyle::Style_Enabled: QStyle::Style_Default ) |
-++ ( (nState & CTRL_STATE_FOCUSED)? QStyle::Style_HasFocus: QStyle::Style_Default ) |
-++ ( (nState & CTRL_STATE_PRESSED)? QStyle::Style_Down: QStyle::Style_Raised ) |
-++ ( (nState & CTRL_STATE_SELECTED)? QStyle::Style_Selected : QStyle::Style_Default ) |
-++ ( (nState & CTRL_STATE_ROLLOVER)? QStyle::Style_MouseOver: QStyle::Style_Default );
-++ //TODO ( (nState & CTRL_STATE_HIDDEN)? QStyle::Style_: QStyle::Style_Default ) |
+++ TQStyle::SFlags nStyle =
+++ ( (nState & CTRL_STATE_DEFAULT)? TQStyle::Style_ButtonDefault: TQStyle::Style_Default ) |
+++ ( (nState & CTRL_STATE_ENABLED)? TQStyle::Style_Enabled: TQStyle::Style_Default ) |
+++ ( (nState & CTRL_STATE_FOCUSED)? TQStyle::Style_HasFocus: TQStyle::Style_Default ) |
+++ ( (nState & CTRL_STATE_PRESSED)? TQStyle::Style_Down: TQStyle::Style_Raised ) |
+++ ( (nState & CTRL_STATE_SELECTED)? TQStyle::Style_Selected : TQStyle::Style_Default ) |
+++ ( (nState & CTRL_STATE_ROLLOVER)? TQStyle::Style_MouseOver: TQStyle::Style_Default );
+++ //TODO ( (nState & CTRL_STATE_HIDDEN)? TQStyle::Style_: TQStyle::Style_Default ) |
++
++ switch ( aValue.getTristateVal() )
++ {
-++ case BUTTONVALUE_ON: nStyle |= QStyle::Style_On; break;
-++ case BUTTONVALUE_OFF: nStyle |= QStyle::Style_Off; break;
-++ case BUTTONVALUE_MIXED: nStyle |= QStyle::Style_NoChange; break;
+++ case BUTTONVALUE_ON: nStyle |= TQStyle::Style_On; break;
+++ case BUTTONVALUE_OFF: nStyle |= TQStyle::Style_Off; break;
+++ case BUTTONVALUE_MIXED: nStyle |= TQStyle::Style_NoChange; break;
++ default: break;
++ }
++
++ return nStyle;
++}
++
-++QRect WidgetPainter::region2QRect( const Rectangle& rControlRegion )
+++TQRect WidgetPainter::region2TQRect( const Rectangle& rControlRegion )
++{
-++ return QRect( QPoint( rControlRegion.Left(), rControlRegion.Top() ),
-++ QPoint( rControlRegion.Right(), rControlRegion.Bottom() ) );
+++ return TQRect( TQPoint( rControlRegion.Left(), rControlRegion.Top() ),
+++ TQPoint( rControlRegion.Right(), rControlRegion.Bottom() ) );
++}
++
++/** Instance of WidgetPainter.
@@ -14301,12 +14269,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ BOOL bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT );
++
-++ QScrollBar *pScrollBar = pWidgetPainter->scrollBar( rControlRegion,
+++ TQScrollBar *pScrollBar = pWidgetPainter->scrollBar( rControlRegion,
++ bHorizontal, ImplControlValue() );
-++ QRect qRectSubLine = kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubLine );
-++ QRect qRectAddLine = kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddLine );
+++ TQRect qRectSubLine = kapp->style().querySubControlMetrics(
+++ TQStyle::CC_ScrollBar, pScrollBar, TQStyle::SC_ScrollBarSubLine );
+++ TQRect qRectAddLine = kapp->style().querySubControlMetrics(
+++ TQStyle::CC_ScrollBar, pScrollBar, TQStyle::SC_ScrollBarAddLine );
++
++ // There are 2 buttons on the right/bottom side of the scrollbar
++ BOOL bTwoSubButtons = FALSE;
@@ -14319,21 +14287,21 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ if ( bHorizontal )
++ {
++ qRectAddLine.setLeft( kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pScrollBar,
-++ QStyle::SC_ScrollBarAddPage ).right() + 1 );
+++ TQStyle::CC_ScrollBar, pScrollBar,
+++ TQStyle::SC_ScrollBarAddPage ).right() + 1 );
++ if ( qRectAddLine.width() > qRectSubLine.width() )
++ bTwoSubButtons = TRUE;
-++ if ( qRectSubLine.left() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).left() )
+++ if ( qRectSubLine.left() > kapp->style().querySubControlMetrics( TQStyle::CC_ScrollBar, pScrollBar, TQStyle::SC_ScrollBarSubPage ).left() )
++ bPlatinumStyle = TRUE;
++ }
++ else
++ {
++ qRectAddLine.setTop( kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pScrollBar,
-++ QStyle::SC_ScrollBarAddPage ).bottom() + 1 );
+++ TQStyle::CC_ScrollBar, pScrollBar,
+++ TQStyle::SC_ScrollBarAddPage ).bottom() + 1 );
++ if ( qRectAddLine.height() > qRectSubLine.height() )
++ bTwoSubButtons = TRUE;
-++ if ( qRectSubLine.top() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).top() )
+++ if ( qRectSubLine.top() > kapp->style().querySubControlMetrics( TQStyle::CC_ScrollBar, pScrollBar, TQStyle::SC_ScrollBarSubPage ).top() )
++ bPlatinumStyle = TRUE;
++ }
++
@@ -14570,10 +14538,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
++{
++ BOOL bReturn = FALSE;
-++ QRect qBoundingRect = WidgetPainter::region2QRect( rControlRegion );
-++ QRect qRect;
+++ TQRect qBoundingRect = WidgetPainter::region2TQRect( rControlRegion );
+++ TQRect qRect;
++
-++ QWidget *pWidget = NULL;
+++ TQWidget *pWidget = NULL;
++ switch ( nType )
++ {
++ // Metrics of the push button
@@ -14588,7 +14556,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ if ( nState & CTRL_STATE_DEFAULT )
++ {
++ int nIndicatorSize = kapp->style().pixelMetric(
-++ QStyle::PM_ButtonDefaultIndicator, pWidget );
+++ TQStyle::PM_ButtonDefaultIndicator, pWidget );
++ qBoundingRect.addCoords( -nIndicatorSize, -nIndicatorSize,
++ nIndicatorSize, nIndicatorSize );
++ bReturn = TRUE;
@@ -14603,8 +14571,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ if ( nPart == PART_ENTIRE_CONTROL )
++ {
-++ qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth, pWidget ) );
-++ qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorHeight, pWidget ) );
+++ qRect.setWidth( kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth, pWidget ) );
+++ qRect.setHeight( kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight, pWidget ) );
++
++ bReturn = TRUE;
++ }
@@ -14616,8 +14584,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++ if ( nPart == PART_ENTIRE_CONTROL )
++ {
-++ qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_IndicatorWidth, pWidget ) );
-++ qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_IndicatorHeight, pWidget ) );
+++ qRect.setWidth( kapp->style().pixelMetric( TQStyle::PM_IndicatorWidth, pWidget ) );
+++ qRect.setHeight( kapp->style().pixelMetric( TQStyle::PM_IndicatorHeight, pWidget ) );
++
++ bReturn = TRUE;
++ }
@@ -14631,17 +14599,17 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ {
++ case PART_BUTTON_DOWN:
++ qRect = kapp->style().querySubControlMetrics(
-++ QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxArrow );
+++ TQStyle::CC_ComboBox, pWidget, TQStyle::SC_ComboBoxArrow );
++ qRect.setLeft( kapp->style().querySubControlMetrics(
-++ QStyle::CC_ComboBox, pWidget,
-++ QStyle::SC_ComboBoxEditField ).right() + 1 );
+++ TQStyle::CC_ComboBox, pWidget,
+++ TQStyle::SC_ComboBoxEditField ).right() + 1 );
++ qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
++ bReturn = TRUE;
++ break;
++
++ case PART_SUB_EDIT:
++ qRect = kapp->style().querySubControlMetrics(
-++ QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField );
+++ TQStyle::CC_ComboBox, pWidget, TQStyle::SC_ComboBoxEditField );
++ qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
++ bReturn = TRUE;
++ break;
@@ -14655,21 +14623,21 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ {
++ case PART_BUTTON_UP:
++ qRect = kapp->style().querySubControlMetrics(
-++ QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetUp );
+++ TQStyle::CC_SpinWidget, pWidget, TQStyle::SC_SpinWidgetUp );
++ bReturn = TRUE;
++ qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
++ break;
++
++ case PART_BUTTON_DOWN:
++ qRect = kapp->style().querySubControlMetrics(
-++ QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetDown );
+++ TQStyle::CC_SpinWidget, pWidget, TQStyle::SC_SpinWidgetDown );
++ bReturn = TRUE;
++ qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
++ break;
++
++ case PART_SUB_EDIT:
++ qRect = kapp->style().querySubControlMetrics(
-++ QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetEditField );
+++ TQStyle::CC_SpinWidget, pWidget, TQStyle::SC_SpinWidgetEditField );
++ qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
++ bReturn = TRUE;
++ break;
@@ -14686,15 +14654,15 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ case PART_BUTTON_LEFT:
++ case PART_BUTTON_UP:
++ qRect = kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarSubLine );
+++ TQStyle::CC_ScrollBar, pWidget, TQStyle::SC_ScrollBarSubLine );
++
++ // Workaround for Platinum style scroll bars. It makes the
++ // left/up button invisible.
++ if ( nPart == PART_BUTTON_LEFT )
++ {
++ if ( qRect.left() > kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pWidget,
-++ QStyle::SC_ScrollBarSubPage ).left() )
+++ TQStyle::CC_ScrollBar, pWidget,
+++ TQStyle::SC_ScrollBarSubPage ).left() )
++ {
++ qRect.setLeft( 0 );
++ qRect.setRight( 0 );
@@ -14703,8 +14671,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ else
++ {
++ if ( qRect.top() > kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pWidget,
-++ QStyle::SC_ScrollBarSubPage ).top() )
+++ TQStyle::CC_ScrollBar, pWidget,
+++ TQStyle::SC_ScrollBarSubPage ).top() )
++ {
++ qRect.setTop( 0 );
++ qRect.setBottom( 0 );
@@ -14719,18 +14687,18 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ case PART_BUTTON_RIGHT:
++ case PART_BUTTON_DOWN:
++ qRect = kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarAddLine );
+++ TQStyle::CC_ScrollBar, pWidget, TQStyle::SC_ScrollBarAddLine );
++
++ // Workaround for Platinum and 3 button style scroll bars.
++ // It makes the right/down button bigger.
++ if ( nPart == PART_BUTTON_RIGHT )
++ qRect.setLeft( kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pWidget,
-++ QStyle::SC_ScrollBarAddPage ).right() + 1 );
+++ TQStyle::CC_ScrollBar, pWidget,
+++ TQStyle::SC_ScrollBarAddPage ).right() + 1 );
++ else
++ qRect.setTop( kapp->style().querySubControlMetrics(
-++ QStyle::CC_ScrollBar, pWidget,
-++ QStyle::SC_ScrollBarAddPage ).bottom() + 1 );
+++ TQStyle::CC_ScrollBar, pWidget,
+++ TQStyle::SC_ScrollBarAddPage ).bottom() + 1 );
++
++ qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
++
@@ -14778,7 +14746,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++
++/** Helper function to convert colors.
++*/
-++static Color toColor( const QColor &rColor )
+++static Color toColor( const TQColor &rColor )
++{
++ return Color( rColor.red(), rColor.green(), rColor.blue() );
++}
@@ -14797,51 +14765,51 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ return toColor( pConfig->readColorEntry( pKey ) );
++}
++
-++/** Helper function to add information to Font from QFont.
+++/** Helper function to add information to Font from TQFont.
++
++ Mostly grabbed from the Gtk+ vclplug (salnativewidgets-gtk.cxx).
++*/
-++static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& rLocale )
+++static Font toFont( const TQFont &rTQFont, const ::com::sun::star::lang::Locale& rLocale )
++{
++ psp::FastPrintFontInfo aInfo;
-++ QFontInfo qFontInfo( rQFont );
+++ TQFontInfo qFontInfo( rTQFont );
++
++ // set family name
-++ aInfo.m_aFamilyName = String( rQFont.family().utf8(), RTL_TEXTENCODING_UTF8 );
+++ aInfo.m_aFamilyName = String( rTQFont.family().utf8(), RTL_TEXTENCODING_UTF8 );
++
++ // set italic
++ aInfo.m_eItalic = ( qFontInfo.italic()? psp::italic::Italic: psp::italic::Upright );
++
++ // set weight
++ int nWeight = qFontInfo.weight();
-++ if ( nWeight <= QFont::Light )
+++ if ( nWeight <= TQFont::Light )
++ aInfo.m_eWeight = psp::weight::Light;
-++ else if ( nWeight <= QFont::Normal )
+++ else if ( nWeight <= TQFont::Normal )
++ aInfo.m_eWeight = psp::weight::Normal;
-++ else if ( nWeight <= QFont::DemiBold )
+++ else if ( nWeight <= TQFont::DemiBold )
++ aInfo.m_eWeight = psp::weight::SemiBold;
-++ else if ( nWeight <= QFont::Bold )
+++ else if ( nWeight <= TQFont::Bold )
++ aInfo.m_eWeight = psp::weight::Bold;
++ else
++ aInfo.m_eWeight = psp::weight::UltraBold;
++
++ // set width
-++ int nStretch = rQFont.stretch();
-++ if ( nStretch <= QFont::UltraCondensed )
+++ int nStretch = rTQFont.stretch();
+++ if ( nStretch <= TQFont::UltraCondensed )
++ aInfo.m_eWidth = psp::width::UltraCondensed;
-++ else if ( nStretch <= QFont::ExtraCondensed )
+++ else if ( nStretch <= TQFont::ExtraCondensed )
++ aInfo.m_eWidth = psp::width::ExtraCondensed;
-++ else if ( nStretch <= QFont::Condensed )
+++ else if ( nStretch <= TQFont::Condensed )
++ aInfo.m_eWidth = psp::width::Condensed;
-++ else if ( nStretch <= QFont::SemiCondensed )
+++ else if ( nStretch <= TQFont::SemiCondensed )
++ aInfo.m_eWidth = psp::width::SemiCondensed;
-++ else if ( nStretch <= QFont::Unstretched )
+++ else if ( nStretch <= TQFont::Unstretched )
++ aInfo.m_eWidth = psp::width::Normal;
-++ else if ( nStretch <= QFont::SemiExpanded )
+++ else if ( nStretch <= TQFont::SemiExpanded )
++ aInfo.m_eWidth = psp::width::SemiExpanded;
-++ else if ( nStretch <= QFont::Expanded )
+++ else if ( nStretch <= TQFont::Expanded )
++ aInfo.m_eWidth = psp::width::Expanded;
-++ else if ( nStretch <= QFont::ExtraExpanded )
+++ else if ( nStretch <= TQFont::ExtraExpanded )
++ aInfo.m_eWidth = psp::width::ExtraExpanded;
++ else
++ aInfo.m_eWidth = psp::width::UltraExpanded;
@@ -14862,7 +14830,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ // font height
++ int nPointHeight = qFontInfo.pointSize();
++ if ( nPointHeight <= 0 )
-++ nPointHeight = rQFont.pointSize();
+++ nPointHeight = rTQFont.pointSize();
++
++ // Create the font
++ Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
@@ -14934,7 +14902,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ }
++
++ // General settings
-++ QColorGroup qColorGroup = kapp->palette().active();
+++ TQColorGroup qColorGroup = kapp->palette().active();
++
++ Color aFore = toColor( qColorGroup.foreground() );
++ Color aBack = toColor( qColorGroup.background() );
@@ -15011,7 +14979,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ aStyleSettings.SetTitleFont( aFont );
++ aStyleSettings.SetFloatTitleFont( aFont );
++
-++ int flash_time = QApplication::cursorFlashTime();
+++ int flash_time = TQApplication::cursorFlashTime();
++ aStyleSettings.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
++
++ KMainWindow qMainWindow;
@@ -15023,7 +14991,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ if ( pMenuBar )
++ {
++ // Color
-++ QColorGroup qMenuCG = pMenuBar->colorGroup();
+++ TQColorGroup qMenuCG = pMenuBar->colorGroup();
++
++ // Menu text and background color, theme specific
++ Color aMenuFore = toColor( qMenuCG.foreground() );
@@ -15076,7 +15044,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ }
++
++ // Scroll bar size
-++ aStyleSettings.SetScrollBarSize( kapp->style().pixelMetric( QStyle::PM_ScrollBarExtent ) );
+++ aStyleSettings.SetScrollBarSize( kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) );
++
++ rSettings.SetStyleSettings( aStyleSettings );
++}
@@ -15352,7 +15320,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ m_pApplication = new VCLTDEApplication();
++ kapp->disableSessionManagement();
++
-++ Display* pDisp = QPaintDevice::x11AppDisplay();
+++ Display* pDisp = TQPaintDevice::x11AppDisplay();
++
++ SalDisplay *pSalDisplay = new SalTDEDisplay( pDisp );
++
@@ -15816,7 +15784,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
+ aRet.appendAscii( desktop_strings[DESKTOP_GNOME] );
diff -urN libreoffice-build/patches/unittesting/unittesting-vcl.diff libreoffice-build/patches/unittesting/unittesting-vcl.diff
--- libreoffice-build/patches/unittesting/unittesting-vcl.diff 2010-11-11 08:41:39.000000000 -0600
-+++ libreoffice-build/patches/unittesting/unittesting-vcl.diff 2011-08-18 22:40:48.267879029 -0500
++++ libreoffice-build/patches/unittesting/unittesting-vcl.diff 2011-08-21 16:24:42.000000000 -0500
@@ -10,7 +10,7 @@
+++ vcl/prj/build.lst
@@ -47,4 +47,3 @@ vc vcl\mac\source\window nmake - m vc__winm vc_inc NULL
@@ -15826,4 +15794,3 @@ diff -urN libreoffice-build/patches/unittesting/unittesting-vcl.diff libreoffice
vc vcl\util\linksvp nmake - u vc_lsvp vc_util NULL
-vc vcl\workben nmake - all vc_wrkb vc_util vc_salmain NULL
diff --git vcl/prj/tests.lst vcl/prj/tests.lst
-Binary files new.ORIGINAL.FROMARCHIVE.UNTOUCHABLE/libreoffice_3.3.2-1ubuntu4.debian.tar.gz and new.trinity.latest/libreoffice_3.3.2-1ubuntu4.debian.tar.gz differ
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-31 14:13:26 +0000