diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kaddressbook/printing | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaddressbook/printing')
-rw-r--r-- | kaddressbook/printing/detailledstyle.cpp | 32 | ||||
-rw-r--r-- | kaddressbook/printing/detailledstyle.h | 9 | ||||
-rw-r--r-- | kaddressbook/printing/ds_appearance.ui | 40 | ||||
-rw-r--r-- | kaddressbook/printing/kabentrypainter.cpp | 70 | ||||
-rw-r--r-- | kaddressbook/printing/kabentrypainter.h | 22 | ||||
-rw-r--r-- | kaddressbook/printing/mikesstyle.cpp | 24 | ||||
-rw-r--r-- | kaddressbook/printing/mikesstyle.h | 9 | ||||
-rw-r--r-- | kaddressbook/printing/printingwizard.cpp | 10 | ||||
-rw-r--r-- | kaddressbook/printing/printingwizard.h | 7 | ||||
-rw-r--r-- | kaddressbook/printing/printprogress.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/printing/printprogress.h | 9 | ||||
-rw-r--r-- | kaddressbook/printing/printsortmode.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/printing/printsortmode.h | 4 | ||||
-rw-r--r-- | kaddressbook/printing/printstyle.cpp | 14 | ||||
-rw-r--r-- | kaddressbook/printing/printstyle.h | 11 | ||||
-rw-r--r-- | kaddressbook/printing/selectionpage.cpp | 14 | ||||
-rw-r--r-- | kaddressbook/printing/selectionpage.h | 9 | ||||
-rw-r--r-- | kaddressbook/printing/stylepage.cpp | 14 | ||||
-rw-r--r-- | kaddressbook/printing/stylepage.h | 9 |
19 files changed, 163 insertions, 156 deletions
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 4cd597801..13e4fb4e4 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kapplication.h> @@ -63,9 +63,9 @@ const char *ContactHeaderForeColor = "ContactHeaderForeColor"; const char *ContactHeaderBGColor = "ContactHeaderBGColor"; -DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *name ) - : PrintStyle( parent, name ), - mPageAppearance( new AppearancePage( parent, "AppearancePage" ) ), +DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *tqparent, const char *name ) + : PrintStyle( tqparent, name ), + mPageAppearance( new AppearancePage( tqparent, "AppearancePage" ) ), mPainter( 0 ), mPrintProgress( 0 ) { @@ -108,9 +108,9 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na mPageAppearance->cbBackgroundColor->setChecked( config->readBoolEntry( ColoredContactHeaders, true ) ); mPageAppearance->kcbHeaderBGColor->setColor( - config->readColorEntry( ContactHeaderBGColor, &Qt::black ) ); + config->readColorEntry( ContactHeaderBGColor, &TQt::black ) ); mPageAppearance->kcbHeaderTextColor->setColor( - config->readColorEntry( ContactHeaderForeColor, &Qt::white ) ); + config->readColorEntry( ContactHeaderForeColor, &TQt::white ) ); mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() ); mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() ); @@ -131,10 +131,10 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro bool useKDEFonts; TQFont font; - TQColor foreColor = Qt::black; - TQColor headerColor = Qt::white; + TQColor foreColor = TQt::black; + TQColor headerColor = TQt::white; bool useHeaderColor = true; - TQColor backColor = Qt::black; + TQColor backColor = TQt::black; bool useBGColor; // save, always available defaults: @@ -222,10 +222,10 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro TQPaintDeviceMetrics metrics( printer ); - left = QMAX( printer->margins().width(), marginLeft ); - top = QMAX( printer->margins().height(), marginTop ); - width = metrics.width() - left - QMAX( printer->margins().width(), marginRight ); - height = metrics.height() - top - QMAX( printer->margins().height(), marginBottom ); + left = TQMAX( printer->margins().width(), marginLeft ); + top = TQMAX( printer->margins().height(), marginTop ); + width = metrics.width() - left - TQMAX( printer->margins().width(), marginRight ); + height = metrics.height() - top - TQMAX( printer->margins().height(), marginBottom ); painter.setViewport( left, top, width, height ); progress->addMessage( i18n( "Printing" ) ); @@ -272,9 +272,9 @@ bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts, return true; } -DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *parent, +DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *tqparent, const char *name ) - : PrintStyleFactory( parent, name ) + : PrintStyleFactory( tqparent, name ) { } diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h index e8515aa0d..977bcd494 100644 --- a/kaddressbook/printing/detailledstyle.h +++ b/kaddressbook/printing/detailledstyle.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DETAILLEDSTYLE_H @@ -36,9 +36,10 @@ namespace KABPrinting { class DetailledPrintStyle : public PrintStyle { Q_OBJECT + TQ_OBJECT public: - DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 ); + DetailledPrintStyle( PrintingWizard *tqparent, const char *name = 0 ); ~DetailledPrintStyle(); void print( const KABC::Addressee::List &contacts, PrintProgress* ); @@ -57,7 +58,7 @@ class DetailledPrintStyle : public PrintStyle class DetailledPrintStyleFactory : public PrintStyleFactory { public: - DetailledPrintStyleFactory( PrintingWizard *parent, const char *name = 0 ); + DetailledPrintStyleFactory( PrintingWizard *tqparent, const char *name = 0 ); PrintStyle *create() const; TQString description() const; diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 03ca4b58a..eb93bd76c 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>AppearancePage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AppearancePage</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelHeader</cstring> </property> @@ -72,7 +72,7 @@ <set>AlignVCenter|AlignLeft</set> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbFont</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbStandardFonts</cstring> </property> @@ -108,7 +108,7 @@ <bool>true</bool> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameFonts</cstring> </property> @@ -131,7 +131,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>labelDetailsFont</cstring> </property> @@ -142,7 +142,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>labelDetailsFontSize</cstring> </property> @@ -153,7 +153,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>labelBodyFont</cstring> </property> @@ -164,7 +164,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>labelFixedFontSize</cstring> </property> @@ -175,7 +175,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>labelFixed</cstring> </property> @@ -196,7 +196,7 @@ <cstring>kisbFixedFontSize</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>labelBodyFontSize</cstring> </property> @@ -238,7 +238,7 @@ <cstring>kfcFixedFont</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelHeaderFont</cstring> </property> @@ -267,7 +267,7 @@ <cstring>kfcHeadlineFont</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>labelHeaderFontSize</cstring> </property> @@ -278,7 +278,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>labelHeaderFontSize_2</cstring> </property> @@ -294,7 +294,7 @@ <cstring>kisbBodyFontSize</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>labelHeadlines</cstring> </property> @@ -319,7 +319,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbHeadline</cstring> </property> @@ -344,7 +344,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbBackgroundColor</cstring> </property> @@ -355,7 +355,7 @@ <bool>true</bool> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameBGColor</cstring> </property> @@ -393,7 +393,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>tlBackgroundColor</cstring> </property> @@ -404,7 +404,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>tlHeaderColor</cstring> </property> diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index c74e4e410..356b53dfb 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ @@ -133,9 +133,9 @@ int KABEntryPainter::hitsTalk( const TQPoint &p ) return hits( mTalkRects, p ); } -int KABEntryPainter::hits( const QRectList& list, const TQPoint &p ) +int KABEntryPainter::hits( const TQRectList& list, const TQPoint &p ) { - QRectList::const_iterator pos; + TQRectList::const_iterator pos; int count = 0; for ( pos = list.begin(); pos != list.end(); ++pos ) { @@ -174,7 +174,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // this is used to prepare some fields for printing and decide about // the tqlayout later: TQValueList<TQStringList> parts; - TQValueList<QRectList*> contents; + TQValueList<TQRectList*> contents; mEmailRects.clear(); mPhoneRects.clear(); @@ -189,9 +189,9 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, painter->setPen( mBackgroundColor ); text = addr.realName(); - // tqreplacement for: api->addressbook()->literalName(entry, text); + // replacement for: api->addressbook()->literalName(entry, text); rect = painter->boundingRect( Ruler1, y, Width, Height, - Qt::AlignVCenter | Qt::AlignLeft, text ); + TQt::AlignVCenter | TQt::AlignLeft, text ); rect.setHeight( (int)( 1.25 * rect.height() ) ); if ( !fake && mUseHeaderColor ) @@ -202,7 +202,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // create a little (1/8) space on top of the letters: float ypos = y + ( (float)rect.height() ) * 0.125; painter->drawText( Ruler1, (int)ypos, Width, rect.height(), - Qt::AlignVCenter | Qt::AlignLeft, text ); + TQt::AlignVCenter | TQt::AlignLeft, text ); } // paint the birthday to the right: @@ -213,7 +213,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // create a little (1/8) space on top of the letters: float ypos = y + ( (float)rect.height() ) * 0.125; painter->drawText( 0, (int)ypos, Width-Ruler1, rect.height(), - Qt::AlignVCenter | Qt::AlignRight, line1 ); + TQt::AlignVCenter | TQt::AlignRight, line1 ); } } @@ -229,9 +229,9 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( fake ) { rect = painter->boundingRect( Ruler1, y, Width-Ruler1, Height, - Qt::AlignTop | Qt::AlignLeft, line1 ); + TQt::AlignTop | TQt::AlignLeft, line1 ); } else { - painter->drawText( Ruler1, y, Width-Ruler1, Height, Qt::AlignTop | Qt::AlignLeft, + painter->drawText( Ruler1, y, Width-Ruler1, Height, TQt::AlignTop | TQt::AlignLeft, line1, -1, &rect ); } @@ -304,10 +304,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, int heights[ 4 ]= { 0, 0, 0, 0 }; TQValueList<TQStringList>::iterator pos = parts.begin(); - TQValueList<QRectList*>::iterator rpos = contents.begin(); + TQValueList<TQRectList*>::iterator rpos = contents.begin(); for ( uint counter = 0; counter < parts.count(); ++counter ) { - const int Offset = counter > 1 ? QMAX( heights[ 0 ], heights[ 1 ] ) : 0; + const int Offset = counter > 1 ? TQMAX( heights[ 0 ], heights[ 1 ] ) : 0; TQStringList list = *pos; painter->setFont( mHeadLineFont ); @@ -316,11 +316,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, limits[ counter ].top() + heights[counter] + Offset, limits[ counter ].width(), limits[ counter ].height(), - Qt::AlignTop | Qt::AlignLeft, *list.at( 0 ) ); + TQt::AlignTop | TQt::AlignLeft, *list.at( 0 ) ); } else { painter->drawText( limits[ counter ].left(), limits[ counter ].top() + heights[ counter ] + Offset, limits[ counter ].width(), - limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft, + limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft, *list.at( 0 ), -1, &rect ); } @@ -334,12 +334,12 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, rect = painter->boundingRect ( limits[ counter ].left() + Ruler1, limits[ counter ].top() + heights[ counter ] + Offset, limits[ counter ].width() - Ruler1, - limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft, + limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft, *list.at( c2 ) ); } else { painter->drawText( limits[ counter ].left() + Ruler1, limits[ counter ].top() + heights[ counter ] + Offset, limits[ counter ].width() - - Ruler1, limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft, + - Ruler1, limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft, *list.at( c2 ), -1, &rect ); } (*rpos)->push_back( rect ); @@ -350,7 +350,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, ++rpos; } - y = y + QMAX( heights[ 0 ], heights[ 1 ] ) + QMAX( heights[ 2 ], heights[ 3 ] ); + y = y + TQMAX( heights[ 0 ], heights[ 1 ] ) + TQMAX( heights[ 2 ], heights[ 3 ] ); // ^^^^^ done with emails, telephone, URLs and talk addresses // now print the addresses: @@ -359,11 +359,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, y += fmBody.lineSpacing() / 2; painter->setFont( mHeadLineFont ); if ( fake ) { - rect = painter->boundingRect( 0, y, Width, Height, Qt::AlignTop | Qt::AlignLeft, + rect = painter->boundingRect( 0, y, Width, Height, TQt::AlignTop | TQt::AlignLeft, addresses.count() == 1 ? i18n( "Address:" ) : i18n( "Addresses:" ) ); } else { - painter->drawText( 0, y, Width, Height, Qt::AlignTop | Qt::AlignLeft, + painter->drawText( 0, y, Width, Height, TQt::AlignTop | TQt::AlignLeft, addresses.count() == 1 ? i18n( "Address:" ) : i18n( "Addresses:" ), -1, &rect ); } @@ -400,7 +400,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, } line1 += TQString::tqfromLatin1( ":" ); - text = TQString::null; + text = TQString(); if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); @@ -425,20 +425,20 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( fake ) { rect = painter->boundingRect( Ruler1, y, Width - Ruler1, Height, - Qt::AlignTop | Qt::AlignLeft, line1 ); + TQt::AlignTop | TQt::AlignLeft, line1 ); } else { painter->drawText( Ruler1, y, Width - Ruler1, Height, - Qt::AlignTop | Qt::AlignLeft, line1, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line1, -1, &rect ); } y += rect.height(); if ( !line2.isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line2 ); + TQt::AlignTop | TQt::AlignLeft, line2 ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line2, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line2, -1, &rect ); } y += rect.height(); } @@ -446,10 +446,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !line3.isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line3 ); + TQt::AlignTop | TQt::AlignLeft, line3 ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line3, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line3, -1, &rect ); } y += rect.height(); } @@ -457,10 +457,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !line4.isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line4 ); + TQt::AlignTop | TQt::AlignLeft, line4 ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line4, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line4, -1, &rect ); } y += rect.height(); } @@ -469,11 +469,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !address.label().isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, + TQt::AlignTop | TQt::AlignLeft, i18n( "(Deliver to:)" ) ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, + TQt::AlignTop | TQt::AlignLeft, i18n( "(Deliver to:)" ), -1, &rect ); } @@ -481,10 +481,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, y += fmBody.lineSpacing() / 4; if ( fake ) { rect = painter->boundingRect( Ruler3, y, Width - Ruler3, Height, - Qt::AlignTop | Qt::AlignLeft, address.label() ); + TQt::AlignTop | TQt::AlignLeft, address.label() ); } else { painter->drawText( Ruler3, y, Width - Ruler3, Height, - Qt::AlignTop | Qt::AlignLeft, address.label(), -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, address.label(), -1, &rect ); } y += rect.height(); @@ -498,11 +498,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, y += fmBody.lineSpacing() / 2; if ( fake ) { rect = painter->boundingRect( 0, y, Width, Height, - Qt::AlignTop | Qt::AlignLeft | Qt::WordBreak, + TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak, addr.note() ); } else { painter->drawText( 0, y, Width, Height, - Qt::AlignTop | Qt::AlignLeft | Qt::WordBreak, + TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak, addr.note(), -1, &rect ); } diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h index 57ce69d88..6936128fb 100644 --- a/kaddressbook/printing/kabentrypainter.h +++ b/kaddressbook/printing/kabentrypainter.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KABENTRYPAINTER_H @@ -31,7 +31,7 @@ #include <tqrect.h> #include <tqvaluelist.h> -typedef TQValueList<TQRect> QRectList; +typedef TQValueList<TQRect> TQRectList; class KABEntryPainter { @@ -62,9 +62,9 @@ class KABEntryPainter TQPainter *p, int top = 0, bool fake = false, TQRect *rect = 0 ); - void setForegroundColor( const TQColor &color = Qt::black ); - void setBackgroundColor( const TQColor &color = Qt::black ); - void setHeaderColor( const TQColor &color = Qt::white ); + void setForegroundColor( const TQColor &color = TQt::black ); + void setBackgroundColor( const TQColor &color = TQt::black ); + void setHeaderColor( const TQColor &color = TQt::white ); void setHeaderFont( const TQFont &font = TQFont( "Helvetica", 12, TQFont::Normal, true ) ); void setHeadLineFont( const TQFont &font = TQFont( "Helvetica", 12, TQFont::Normal, true ) ); @@ -106,7 +106,7 @@ class KABEntryPainter int hitsURL( const TQPoint &p ); private: - int hits( const QRectList& rects, const TQPoint &p ); + int hits( const TQRectList& rects, const TQPoint &p ); TQColor mForegroundColor; TQColor mBackgroundColor; @@ -124,10 +124,10 @@ class KABEntryPainter bool mShowPhones; bool mShowURLs; - QRectList mEmailRects; - QRectList mPhoneRects; - QRectList mURLRects; - QRectList mTalkRects; + TQRectList mEmailRects; + TQRectList mPhoneRects; + TQRectList mURLRects; + TQRectList mTalkRects; }; #endif diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 26312ee1c..d7fb26b8d 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqpaintdevicemetrics.h> @@ -43,8 +43,8 @@ using namespace KABPrinting; const int mFieldSpacingHint = 2; -MikesStyle::MikesStyle( PrintingWizard *parent, const char *name ) - : PrintStyle( parent, name ) +MikesStyle::MikesStyle( PrintingWizard *tqparent, const char *name ) + : PrintStyle( tqparent, name ) { setPreview( "mike-style.png" ); } @@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr mBoldFont = p.font(); mBoldFont.setBold( true ); TQFontMetrics fm( mFont ); - TQPaintDeviceMetrics metrics( p.device() ); + TQPaintDeviceMetrics metrics( p.tqdevice() ); int height = 0; KABC::Addressee::List::ConstIterator it; @@ -141,14 +141,14 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, { TQFontMetrics fm( font ); TQFontMetrics bfm( bFont ); - TQPaintDeviceMetrics metrics( painter.device() ); + TQPaintDeviceMetrics metrics( painter.tqdevice() ); int margin = 10; int width = metrics.width() - 10; int xPos = 5; int yPos = 0; - TQBrush brush( Qt::lightGray ); + TQBrush brush( TQt::lightGray ); - painter.setPen( Qt::black ); + painter.setPen( TQt::black ); painter.drawRect( xPos, yPos, width, maxHeight ); // The header @@ -207,7 +207,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); } @@ -235,7 +235,7 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, for ( int i = numFields / 2; i < numFields; i++ ) halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1); - height = QMAX( height, halfHeight ); + height = TQMAX( height, halfHeight ); // Add the title and the spacing height += bfm.height() + ((numFields / 2 + 3) * mFieldSpacingHint); @@ -244,8 +244,8 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, } -MikesStyleFactory::MikesStyleFactory( PrintingWizard *parent, const char *name ) - : PrintStyleFactory( parent, name ) +MikesStyleFactory::MikesStyleFactory( PrintingWizard *tqparent, const char *name ) + : PrintStyleFactory( tqparent, name ) { } diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h index dbfabf178..6b61287d6 100644 --- a/kaddressbook/printing/mikesstyle.h +++ b/kaddressbook/printing/mikesstyle.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef MIKESSTYLE_H @@ -36,9 +36,10 @@ class PrintProgress; class MikesStyle : public PrintStyle { Q_OBJECT + TQ_OBJECT public: - MikesStyle( PrintingWizard *parent, const char *name ); + MikesStyle( PrintingWizard *tqparent, const char *name ); ~MikesStyle(); void print( const KABC::Addressee::List&, PrintProgress* ); @@ -54,7 +55,7 @@ class MikesStyle : public PrintStyle class MikesStyleFactory : public PrintStyleFactory { public: - MikesStyleFactory( PrintingWizard *parent, const char *name = 0 ); + MikesStyleFactory( PrintingWizard *tqparent, const char *name = 0 ); PrintStyle *create() const; TQString description() const; diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 8f2e98f20..949ebd519 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcombobox.h> @@ -53,9 +53,9 @@ using namespace KABPrinting; PrintingWizard::PrintingWizard( KPrinter *printer, KABC::AddressBook* ab, - const TQStringList& selection, TQWidget *parent, + const TQStringList& selection, TQWidget *tqparent, const char* name ) - : KWizard( parent, name ), mPrinter( printer ), mAddressBook( ab ), + : KWizard( tqparent, name ), mPrinter( printer ), mAddressBook( ab ), mSelection( selection ), mStyle( 0 ) { mSelectionPage = new SelectionPage( this ); @@ -162,7 +162,7 @@ void PrintingWizard::print() if ( mSelectionPage->useSelection() ) { TQStringList::ConstIterator it; for ( it = mSelection.begin(); it != mSelection.end(); ++it ) { - KABC::Addressee addr = addressBook()->tqfindByUid( *it ); + KABC::Addressee addr = addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h index ab82a8bcb..54442075c 100644 --- a/kaddressbook/printing/printingwizard.h +++ b/kaddressbook/printing/printingwizard.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTINGWIZARD_H @@ -50,6 +50,7 @@ namespace KABPrinting { class PrintingWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: /** @@ -58,7 +59,7 @@ class PrintingWizard : public KWizard PrintingWizard( KPrinter *printer, KABC::AddressBook* ab, const TQStringList& selection, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~PrintingWizard(); /** diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index a66ca960e..9e0e3aa91 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -34,8 +34,8 @@ using namespace KABPrinting; -PrintProgress::PrintProgress( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +PrintProgress::PrintProgress( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { setCaption( i18n( "Printing: Progress" ) ); diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h index 916d82058..a27c5fc3f 100644 --- a/kaddressbook/printing/printprogress.h +++ b/kaddressbook/printing/printprogress.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTPROGRESS_H @@ -37,12 +37,13 @@ namespace KABPrinting { information. It is provided to all print styles during a print process. It displays messages and a a progress bar. */ -class PrintProgress : public QWidget +class PrintProgress : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PrintProgress( TQWidget *parent, const char *name = 0 ); + PrintProgress( TQWidget *tqparent, const char *name = 0 ); ~PrintProgress(); /** diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp index 215a5fa09..685a47ac0 100644 --- a/kaddressbook/printing/printsortmode.cpp +++ b/kaddressbook/printing/printsortmode.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/field.h> diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h index a7992cc6c..69125419b 100644 --- a/kaddressbook/printing/printsortmode.h +++ b/kaddressbook/printing/printsortmode.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTSORTMODE_H diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp index 90b196237..02e563eea 100644 --- a/kaddressbook/printing/printstyle.cpp +++ b/kaddressbook/printing/printstyle.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kstandarddirs.h> @@ -32,8 +32,8 @@ using namespace KABPrinting; -PrintStyle::PrintStyle( PrintingWizard* parent, const char* name ) - : TQObject( parent, name ), mWizard( parent ), mSortField( 0 ) +PrintStyle::PrintStyle( PrintingWizard* tqparent, const char* name ) + : TQObject( tqparent, name ), mWizard( tqparent ), mSortField( 0 ) { } @@ -76,7 +76,7 @@ PrintingWizard *PrintStyle::wizard() void PrintStyle::addPage( TQWidget *page, const TQString &title ) { - if ( mPageList.find( page ) == -1 ) { // not yet in the list + if ( mPageList.tqfind( page ) == -1 ) { // not yet in the list mPageList.append( page ); mPageTitles.append( title ); } @@ -118,8 +118,8 @@ bool PrintStyle::preferredSortType() return mSortType; } -PrintStyleFactory::PrintStyleFactory( PrintingWizard* parent, const char* name ) - : mParent( parent ), mName( name ) +PrintStyleFactory::PrintStyleFactory( PrintingWizard* tqparent, const char* name ) + : mParent( tqparent ), mName( name ) { } diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h index 19dbf3bc5..f7e471e25 100644 --- a/kaddressbook/printing/printstyle.h +++ b/kaddressbook/printing/printstyle.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTSTYLE_H @@ -57,12 +57,13 @@ class PrintProgress; to the wizard object. */ -class PrintStyle : public QObject +class PrintStyle : public TQObject { Q_OBJECT + TQ_OBJECT public: - PrintStyle( PrintingWizard* parent, const char* name = 0 ); + PrintStyle( PrintingWizard* tqparent, const char* name = 0 ); virtual ~PrintStyle(); /** @@ -150,7 +151,7 @@ class PrintStyle : public QObject class PrintStyleFactory { public: - PrintStyleFactory( PrintingWizard* parent, const char* name = 0 ); + PrintStyleFactory( PrintingWizard* tqparent, const char* name = 0 ); virtual ~PrintStyleFactory(); virtual PrintStyle *create() const = 0; diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index e926d0dba..bf0a49a08 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kdialog.h> @@ -38,8 +38,8 @@ #include "selectionpage.h" -SelectionPage::SelectionPage( TQWidget* parent, const char* name ) - : TQWidget( parent, name ) +SelectionPage::SelectionPage( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { setCaption( i18n( "Choose Which Contacts to Print" ) ); @@ -51,12 +51,12 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); - mButtonGroup->setColumnLayout( 0, Qt::Vertical ); + mButtonGroup->setColumnLayout( 0, TQt::Vertical ); mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -76,7 +76,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mUseCategories = new TQRadioButton( i18n( "Category &members" ), mButtonGroup ); TQWhatsThis::add( mUseCategories, i18n( "Only print contacts who are members of a category that is checked on the list to the left.\n" "This option is disabled if you have no categories." ) ); - groupLayout->addWidget( mUseCategories, 3, 0, Qt::AlignTop ); + groupLayout->addWidget( mUseCategories, 3, 0, TQt::AlignTop ); mFiltersCombo = new TQComboBox( false, mButtonGroup ); TQWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to print." ) ); diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h index 031b0b5e2..dded01ecd 100644 --- a/kaddressbook/printing/selectionpage.h +++ b/kaddressbook/printing/selectionpage.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SELECTIONPAGE_H #define SELECTIONPAGE_H @@ -32,12 +32,13 @@ class TQListView; class TQListViewItem; class TQRadioButton; -class SelectionPage : public QWidget +class SelectionPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SelectionPage( TQWidget* parent = 0, const char* name = 0 ); + SelectionPage( TQWidget* tqparent = 0, const char* name = 0 ); ~SelectionPage(); void setFilters( const TQStringList& ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 172e7df7c..721cffaa0 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqbuttongroup.h> @@ -34,8 +34,8 @@ #include "stylepage.h" -StylePage::StylePage( KABC::AddressBook *ab, TQWidget* parent, const char* name ) - : TQWidget( parent, name ), mAddressBook( ab ) +StylePage::StylePage( KABC::AddressBook *ab, TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ), mAddressBook( ab ) { initGUI(); @@ -121,10 +121,10 @@ void StylePage::initGUI() topLayout->addMultiCellWidget( label, 0, 0, 0, 1 ); TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); - group->setColumnLayout( 0, Qt::Vertical ); + group->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( Qt::AlignTop ); + sortLayout->tqsetAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -141,7 +141,7 @@ void StylePage::initGUI() topLayout->addWidget( group, 1, 0 ); group = new TQButtonGroup( i18n( "Print Style" ), this ); - group->setColumnLayout( 0, Qt::Vertical ); + group->setColumnLayout( 0, TQt::Vertical ); TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(), KDialog::spacingHint() ); diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h index 91be390fc..24d424597 100644 --- a/kaddressbook/printing/stylepage.h +++ b/kaddressbook/printing/stylepage.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef STYLEPAGE_H @@ -35,12 +35,13 @@ class TQPixmap; class TQRadioButton; class KComboBox; -class StylePage : public QWidget +class StylePage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 ); + StylePage( KABC::AddressBook *ab, TQWidget* tqparent = 0, const char* name = 0 ); ~StylePage(); /** |