From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kaddressbook/printing/detailledstyle.cpp | 4 ++-- kaddressbook/printing/ds_appearance.ui | 30 +++++++++++++++--------------- kaddressbook/printing/kabentrypainter.cpp | 20 ++++++++++---------- kaddressbook/printing/mikesstyle.cpp | 6 +++--- kaddressbook/printing/printingwizard.cpp | 4 ++-- kaddressbook/printing/printprogress.cpp | 2 +- kaddressbook/printing/selectionpage.cpp | 8 ++++---- kaddressbook/printing/stylepage.cpp | 8 ++++---- 8 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kaddressbook/printing') diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 39046481..4cd59780 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na mPageAppearance->kcbHeaderTextColor->setColor( config->readColorEntry( ContactHeaderForeColor, &Qt::white ) ); - mPageAppearance->layout()->setMargin( KDialog::marginHint() ); - mPageAppearance->layout()->setSpacing( KDialog::spacingHint() ); + mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() ); + mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() ); } DetailledPrintStyle::~DetailledPrintStyle() diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 2fe5ce20..03ca4b58 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -4,7 +4,7 @@ AppearancePage - + 0 0 @@ -68,7 +68,7 @@ false - + AlignVCenter|AlignLeft @@ -138,7 +138,7 @@ Details font: - + AlignVCenter|AlignRight @@ -149,7 +149,7 @@ Size: - + AlignVCenter|AlignRight @@ -160,7 +160,7 @@ Body font: - + AlignVCenter|AlignRight @@ -171,7 +171,7 @@ Size: - + AlignVCenter|AlignRight @@ -182,7 +182,7 @@ Fixed font: - + AlignVCenter|AlignRight @@ -203,7 +203,7 @@ Size: - + AlignVCenter|AlignRight @@ -245,7 +245,7 @@ Contact header font: - + AlignVCenter|AlignRight @@ -274,7 +274,7 @@ Size: - + AlignVCenter|AlignRight @@ -285,7 +285,7 @@ Size: - + AlignVCenter|AlignRight @@ -301,7 +301,7 @@ Headlines: - + AlignVCenter|AlignRight @@ -400,7 +400,7 @@ Headline background color: - + AlignVCenter|AlignRight @@ -411,7 +411,7 @@ Headline text color: - + AlignVCenter|AlignRight @@ -475,5 +475,5 @@ setDisabled(bool) - + diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index c7432d5d..c74e4e41 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -139,7 +139,7 @@ int KABEntryPainter::hits( const QRectList& list, const TQPoint &p ) int count = 0; for ( pos = list.begin(); pos != list.end(); ++pos ) { - if ( (*pos).contains( p ) ) + if ( (*pos).tqcontains( p ) ) return count; ++count; @@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, KABC::Address address; // this is used to prepare some fields for printing and decide about - // the layout later: + // the tqlayout later: TQValueList parts; TQValueList contents; @@ -189,7 +189,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, painter->setPen( mBackgroundColor ); text = addr.realName(); - // replacement for: api->addressbook()->literalName(entry, text); + // tqreplacement for: api->addressbook()->literalName(entry, text); rect = painter->boundingRect( Ruler1, y, Width, Height, Qt::AlignVCenter | Qt::AlignLeft, text ); rect.setHeight( (int)( 1.25 * rect.height() ) ); @@ -241,7 +241,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !( addr.prefix().isEmpty() ) ) y += fmBody.lineSpacing() / 2; - // fill the parts stringlist, it contains "parts" (printable areas) + // fill the parts stringlist, it tqcontains "parts" (printable areas) // that will be combined to fill the page as effectively as possible: // Email addresses: if ( !addr.emails().isEmpty() && mShowEmails ) { @@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, line1 = i18n( "Preferred Address" ); } - line1 += TQString::fromLatin1( ":" ); + line1 += TQString::tqfromLatin1( ":" ); text = TQString::null; if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); if ( !text.isEmpty() ) { - line1 = line1 + TQString::fromLatin1( " (" ) + text + - TQString::fromLatin1( ")" ); + line1 = line1 + TQString::tqfromLatin1( " (" ) + text + + TQString::tqfromLatin1( ")" ); } line1 = line1.stripWhiteSpace(); line2 = address.street(); if ( !address.postOfficeBox().isEmpty() ) - line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox(); + line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox(); // print address in american style, this will need localisation: line3 = address.locality() + ( address.region().isEmpty() ? - TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) + + TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) + address.region() ) + ( address.postalCode().isEmpty() - ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " ) + ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " ) + address.postalCode() ); line4 = address.country(); diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 9ecc57f5..26312ee1 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); p.setPen( Qt::black ); p.drawText( 0, fm.height(), text ); @@ -226,14 +226,14 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, // Determine which half of the fields is higher for ( int i = 0; i < numFields / 2; i++ ) - halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1); + halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1); height = halfHeight; // now the second half halfHeight = 0; for ( int i = numFields / 2; i < numFields; i++ ) - halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1); + halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1); height = QMAX( height, halfHeight ); diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 2bf6deaf..8f2e98f2 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -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()->findByUid( *it ); + KABC::Addressee addr = addressBook()->tqfindByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -186,7 +186,7 @@ void PrintingWizard::print() const TQStringList tmp( (*it).categories() ); TQStringList::ConstIterator tmpIt; for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt ) - if ( categories.contains( *tmpIt ) ) { + if ( categories.tqcontains( *tmpIt ) ) { list.append( *it ); break; } diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 43aec8cf..a66ca960 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name ) mProgressBar->setProgress( 0 ); topLayout->addWidget( mProgressBar, 1, 0 ); - resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) ); + resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) ); } PrintProgress::~PrintProgress() diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 3e8bde5f..e926d0db 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -52,11 +52,11 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->layout()->setMargin( KDialog::marginHint() ); + mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); - groupLayout->setAlignment( Qt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); + groupLayout->tqsetAlignment( Qt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 88e2e71c..172e7df7 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -122,9 +122,9 @@ void StylePage::initGUI() TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->setAlignment( Qt::AlignTop ); + sortLayout->tqsetAlignment( Qt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -142,7 +142,7 @@ void StylePage::initGUI() group = new TQButtonGroup( i18n( "Print Style" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(), + TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(), KDialog::spacingHint() ); mStyleCombo = new KComboBox( false, group ); @@ -153,7 +153,7 @@ void StylePage::initGUI() font.setPointSize( 20 ); mPreview->setFont( font ); mPreview->setScaledContents( true ); - mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); styleLayout->addWidget( mPreview ); topLayout->addWidget( group, 1, 1 ); -- cgit v1.2.3