diff options
Diffstat (limited to 'libtdepim')
41 files changed, 184 insertions, 184 deletions
diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index dde8f7dd..5a745b4f 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -143,8 +143,8 @@ bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uin bool AddresseeEmailSelection::itemMatches( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const { - return addressee.formattedName().tqstartsWith( pattern, false ) || - email( addressee, index ).tqstartsWith( pattern, false ); + return addressee.formattedName().startsWith( pattern, false ) || + email( addressee, index ).startsWith( pattern, false ); } bool AddresseeEmailSelection::itemEquals( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const @@ -172,13 +172,13 @@ bool AddresseeEmailSelection::distributionListMatches( const KABC::DistributionL const TQString &pattern ) const { // check whether the name of the distribution list matches the pattern or one of its entries. - bool ok = distributionList->name().tqstartsWith( pattern, false ); + bool ok = distributionList->name().startsWith( pattern, false ); KABC::DistributionList::Entry::List entries = distributionList->entries(); KABC::DistributionList::Entry::List::ConstIterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { - ok = ok || (*it).addressee.formattedName().tqstartsWith( pattern, false ) || - (*it).email.tqstartsWith( pattern, false ); + ok = ok || (*it).addressee.formattedName().startsWith( pattern, false ) || + (*it).email.startsWith( pattern, false ); } return ok; diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 687943ec..1e827d80 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -389,7 +389,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e ) } } else { // Let's see if this drop contains a comma separated list of emails - TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) ); + TQString dropData = TQString::fromUtf8( e->encodedData( "text/plain" ) ); TQStringList addrs = splitEmailAddrList( dropData ); if ( addrs.count() > 0 ) { setText( normalizeAddressesAndDecodeIDNs( dropData ) ); @@ -852,7 +852,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS TQPoint oldPosOfItemUnderMouse; if ( itemUnderMouse ) { oldTextUnderMouse = itemUnderMouse->text(); - oldPosOfItemUnderMouse = completionBox->tqitemRect( itemUnderMouse ).topLeft(); + oldPosOfItemUnderMouse = completionBox->itemRect( itemUnderMouse ).topLeft(); } completionBox->setItems( items ); @@ -882,7 +882,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS // if the mouse was over an item, before, but now that's elsewhere, // move the cursor, so folks don't accidently click the wrong item if ( newItemUnderMouse ) { - TQRect r = completionBox->tqitemRect( newItemUnderMouse ); + TQRect r = completionBox->itemRect( newItemUnderMouse ); TQPoint target = r.topLeft(); if ( oldPosOfItemUnderMouse != target ) { target.setX( target.x() + r.width()/2 ); diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 792d5762..b3fbae4c 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -303,7 +303,7 @@ void AddresseeSelector::initGUI() mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); - buttonLayout->tqsetAlignment( TQt::AlignBottom ); + buttonLayout->setAlignment( TQt::AlignBottom ); tqlayout->addLayout( buttonLayout, row, 1 ); // move button diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 15c7215e..23f01eb5 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -161,17 +161,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // the global background color). // TQString backgroundColor = KGlobalSettings::alternateBackgroundColor().name(); - TQString cellStyle = TQString::tqfromLatin1( + TQString cellStyle = TQString::fromLatin1( "style=\"" "padding-right: 2px; " "border-right: #000 dashed 1px; " "background: %1;\"").tqarg(backgroundColor); TQString backgroundColor2 = KGlobalSettings::baseColor().name(); - TQString cellStyle2 = TQString::tqfromLatin1( + TQString cellStyle2 = TQString::fromLatin1( "style=\"" "padding-left: 2px; " "background: %1;\"").tqarg(backgroundColor2); - TQString tableStyle = TQString::tqfromLatin1( + TQString tableStyle = TQString::fromLatin1( "style=\"" "border: solid 1px; " "margin: 0em;\""); @@ -179,17 +179,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // We'll be building a table to display the vCard in. // Each row of the table will be built using this string for its HTML. // - TQString rowFmtStr = TQString::tqfromLatin1( + TQString rowFmtStr = TQString::fromLatin1( "<tr>" "<td align=\"right\" valign=\"top\" width=\"30%\" "); // Tag unclosed rowFmtStr.append( cellStyle ); - rowFmtStr.append( TQString::tqfromLatin1( + rowFmtStr.append( TQString::fromLatin1( ">" // Close tag "<b>%1</b>" "</td>" "<td align=\"left\" valign=\"top\" width=\"70%\" ") ); // Tag unclosed rowFmtStr.append( cellStyle2 ); - rowFmtStr.append( TQString::tqfromLatin1( + rowFmtStr.append( TQString::fromLatin1( ">" // Close tag "%2" "</td>" @@ -228,9 +228,9 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr TQString url; if ( (*phoneIt).type() & KABC::PhoneNumber::Fax ) - url = TQString::tqfromLatin1( "fax:" ) + number; + url = TQString::fromLatin1( "fax:" ) + number; else - url = TQString::tqfromLatin1( "phone:" ) + number; + url = TQString::fromLatin1( "phone:" ) + number; if ( linkMask & PhoneLinks ) { TQString smsURL; @@ -239,7 +239,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr dynamicPart += rowFmtStr .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .tqarg( TQString::tqfromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); + .tqarg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); } else { dynamicPart += rowFmtStr .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) @@ -258,7 +258,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & EmailLinks ) { dynamicPart += rowFmtStr.tqarg( type ) - .tqarg( TQString::tqfromLatin1( "<a href=\"mailto:%1\">%2</a>" ) + .tqarg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" ) .tqarg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); } else { dynamicPart += rowFmtStr.tqarg( type ).tqarg( *emailIt ); @@ -393,22 +393,22 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // set image source to either a TQMimeSourceFactory key or a data:/ URL TQString imgSrc; if ( internalLoading ) { - imgSrc = TQString::tqfromLatin1( "im_status_%1_image").tqarg( addr.uid() ); + imgSrc = TQString::fromLatin1( "im_status_%1_image").tqarg( addr.uid() ); TQMimeSourceFactory::defaultFactory()->setPixmap( imgSrc, proxy->presenceIcon( addr.uid() ) ); } else imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) ); // make the status a link, if required - TQString imtqStatus; + TQString imStatus; if ( linkMask & IMLinks ) - imtqStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); + imStatus = TQString::fromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); else - imtqStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" ); + imStatus = TQString::fromLatin1( "<img src=\"%1\"> (%2)" ); // append our status to the rest of the dynamic part of the addressee dynamicPart += rowFmtStr .tqarg( i18n( "Presence" ) ) - .tqarg( imtqStatus + .tqarg( imStatus .tqarg( imgSrc ) .tqarg( proxy->presenceString( addr.uid() ) ) ); @@ -421,51 +421,51 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // do it this way to avoid cases where the substituted string // contains %1 and the like. // - TQString strAddr = TQString::tqfromLatin1( + TQString strAddr = TQString::fromLatin1( "<div align=\"center\">" "<table cellpadding=\"1\" cellspacing=\"0\" %1>" "<tr>").tqarg(tableStyle); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<td align=\"right\" valign=\"top\" width=\"30%\" rowspan=\"3\" %2>") .tqarg( cellStyle ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image "</td>") .tqarg( image ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<font size=\"+2\"><b>%2</b></font></td>" // name "</tr>") .tqarg( name ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "%3</td>" // role "</tr>") .tqarg( role ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "%4</td>" // organization "</tr>") .tqarg( organization ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr><td %2>") .tqarg( cellStyle ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( " </td><td %2> </td></tr>") .tqarg( cellStyle2 ) ); strAddr.append( dynamicPart ); strAddr.append( notes ); strAddr.append( customData ); - strAddr.append( TQString::tqfromLatin1( "</table></div>\n" ) ); + strAddr.append( TQString::fromLatin1( "</table></div>\n" ) ); if ( addr.resource() ) { TQString addrBookName = addr.resource()->resourceName(); @@ -526,7 +526,7 @@ void AddresseeView::updateView() TQString strAddr = vCardAsHTML( mAddressee, mKIMProxy, (LinkMask)mLinkMask, true, (FieldMask)fieldMask ); - strAddr = TQString::tqfromLatin1( + strAddr = TQString::fromLatin1( "<html>" "<body text=\"%1\" bgcolor=\"%2\">" // text and background color "%3" // dynamic part diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index fc88d52a..9dd43bc0 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index 1c161379..f87503f9 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -96,7 +96,7 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages, seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setqStatus( statusMsg ); + item->seStatus( statusMsg ); } void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, @@ -144,7 +144,7 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setqStatus( statusMsg ); + item->seStatus( statusMsg ); } void BroadcastStatus::setTransienStatusMsg( const TQString& msg ) diff --git a/libtdepim/categoryeditdialog_base.ui b/libtdepim/categoryeditdialog_base.ui index 11cd9874..39d69dc7 100644 --- a/libtdepim/categoryeditdialog_base.ui +++ b/libtdepim/categoryeditdialog_base.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/libtdepim/categoryselectdialog_base.ui b/libtdepim/categoryselectdialog_base.ui index 1e45bd46..b708e853 100644 --- a/libtdepim/categoryselectdialog_base.ui +++ b/libtdepim/categoryselectdialog_base.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index 05f20e39..379eb8ea 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -328,7 +328,7 @@ namespace KPIM { if ( mQuoteFont[i].bold() ) quoteCSS += " font-weight: bold ! important;\n"; if ( mShrinkQuotes ) - quoteCSS += " font-size: " + TQString::tqfromLatin1( quoteFontSizes[i] ) + quoteCSS += " font-size: " + TQString::fromLatin1( quoteFontSizes[i] ) + "% ! important;\n"; quoteCSS += "}\n\n"; } diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index 1a07655f..50c05593 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -154,13 +154,13 @@ void DesignerFields::load( DesignerFields::Storage *storage ) wdg->setChecked( false ); } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() ); - wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); + wdg->setDateTime( TQDateTime::currentDateTime() ); } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( widIt.data() ); - wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); + wdg->setDateTime( TQDateTime::currentDateTime() ); } else if ( widIt.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() ); - wdg->setDate( TQDate::tqcurrentDate() ); + wdg->setDate( TQDate::currentDate() ); } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() ); wdg->setCurrentItem( 0 ); diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 870d89ce..5f717b7c 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -323,7 +323,7 @@ void KCMDesignerFields::initGUI() hbox->addWidget( activeLabel ); // ### why is this needed? Looks like a KActiveLabel bug... - activeLabel->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); + activeLabel->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); hbox->addStretch( 1 ); diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index 44c4e696..df2b98c9 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -72,13 +72,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) // need at least one entry for popup to work setMaxCount( 1 ); - mDate = TQDate::tqcurrentDate(); + mDate = TQDate::currentDate(); TQString today = KGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); changeItem( today, 0 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); connect( lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( lineEnterPressed() ) ); @@ -138,13 +138,13 @@ void KDateEdit::popup() TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); - int dateFrameHeight = mPopup->tqsizeHint().height(); + int dateFrameHeight = mPopup->sizeHint().height(); if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() ) popupPoint.setY( popupPoint.y() - dateFrameHeight ); else popupPoint.setY( popupPoint.y() + height() ); - int dateFrameWidth = mPopup->tqsizeHint().width(); + int dateFrameWidth = mPopup->sizeHint().width(); if ( popupPoint.x() + dateFrameWidth > desk.right() ) popupPoint.setX( desk.right() - dateFrameWidth ); @@ -157,7 +157,7 @@ void KDateEdit::popup() if ( mDate.isValid() ) mPopup->setDate( mDate ); else - mPopup->setDate( TQDate::tqcurrentDate() ); + mPopup->setDate( TQDate::currentDate() ); mPopup->popup( popupPoint ); @@ -215,7 +215,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( text.isEmpty() ) result = TQDate(); else if ( mKeywordMap.contains( text.lower() ) ) { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { /* A day name has been entered. Convert to offset from today. diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp index 998c44e4..f6e7031e 100644 --- a/libtdepim/kdatepickerpopup.cpp +++ b/libtdepim/kdatepickerpopup.cpp @@ -97,12 +97,12 @@ void KDatePickerPopup::slotDateChanged( TQDate date ) void KDatePickerPopup::slotToday() { - emit dateChanged( TQDate::tqcurrentDate() ); + emit dateChanged( TQDate::currentDate() ); } void KDatePickerPopup::slotTomorrow() { - emit dateChanged( TQDate::tqcurrentDate().addDays( 1 ) ); + emit dateChanged( TQDate::currentDate().addDays( 1 ) ); } void KDatePickerPopup::slotNoDate() @@ -112,12 +112,12 @@ void KDatePickerPopup::slotNoDate() void KDatePickerPopup::slotNextWeek() { - emit dateChanged( TQDate::tqcurrentDate().addDays( 7 ) ); + emit dateChanged( TQDate::currentDate().addDays( 7 ) ); } void KDatePickerPopup::slotNextMonth() { - emit dateChanged( TQDate::tqcurrentDate().addMonths( 1 ) ); + emit dateChanged( TQDate::currentDate().addMonths( 1 ) ); } #include "kdatepickerpopup.moc" diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h index 44dc7c66..7bcfea3e 100644 --- a/libtdepim/kdatepickerpopup.h +++ b/libtdepim/kdatepickerpopup.h @@ -57,7 +57,7 @@ class KDE_EXPORT KDatePickerPopup: public TQPopupMenu @param parent The object's parent. @param name The object's name. */ - KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(), + KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::currentDate(), TQWidget *parent = 0, const char *name = 0 ); /** diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 64859199..de29d6a6 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -198,7 +198,7 @@ void KFolderTreeItem::setFolderSize( TQ_INT64 aSize ) TQ_INT64 recursiveSize = recursiveFolderSize(); if ( recursiveSize != mSize ) { if ( mType != Root ) - size += TQString::tqfromLatin1(" + %1").tqarg( KIO::convertSize( recursiveSize - mSize ) ); + size += TQString::fromLatin1(" + %1").tqarg( KIO::convertSize( recursiveSize - mSize ) ); else size = KIO::convertSize( recursiveSize ); } @@ -391,9 +391,9 @@ void KFolderTree::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h index 5ee25573..89c0e677 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -61,7 +61,7 @@ struct KPaintInfo { showTodo(false), showSpamHam(false), showWatchedIgnored(false), - showtqStatus(false), + showStatus(false), showSigned(false), showCrypto(false), showReceiver(false), @@ -108,7 +108,7 @@ struct KPaintInfo { bool showTodo; bool showSpamHam; bool showWatchedIgnored; - bool showtqStatus; + bool showStatus; bool showSigned; bool showCrypto; bool showReceiver; diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index dcfea6f4..58cffa13 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent ) this, TQT_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( - KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ), - TQString::tqfromLatin1( "[X-Komposer-Version] == 1" ) ) ); + KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), + TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) ); } PluginManager::~PluginManager() @@ -205,7 +205,7 @@ PluginManager::slotShutdownTimeout() kdWarning() << k_funcinfo << "Some plugins didn't shutdown in time!" << endl << "Remaining plugins: " - << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl + << remaining.join( TQString::fromLatin1( ", " ) ) << endl << "Forcing Komposer shutdown now." << endl; #endif @@ -229,18 +229,18 @@ PluginManager::loadAllPlugins() d->config = KSharedConfig::openConfig( "komposerrc" ); TQMap<TQString, TQString> entries = d->config->entryMap( - TQString::tqfromLatin1( "Plugins" ) ); + TQString::fromLatin1( "Plugins" ) ); TQMap<TQString, TQString>::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) + if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) { key.setLength( key.length() - 7 ); //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl; - if ( it.data() == TQString::tqfromLatin1( "true" ) ) + if ( it.data() == TQString::fromLatin1( "true" ) ) { if ( !plugin( key ) ) d->pluginsToLoad.push( key ); @@ -310,8 +310,8 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) int error = 0; Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>( - TQString::tqfromLatin1( "Komposer/Plugin" ), - TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), + TQString::fromLatin1( "Komposer/Plugin" ), + TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const return it.key()->name(); } - return TQString::tqfromLatin1( "Unknown" ); + return TQString::fromLatin1( "Unknown" ); } TQString @@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const return it.key()->pluginName(); } - return TQString::tqfromLatin1( "unknown" ); + return TQString::fromLatin1( "unknown" ); } TQString @@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const return it.key()->icon(); } - return TQString::tqfromLatin1( "Unknown" ); + return TQString::fromLatin1( "Unknown" ); } KPluginInfo* @@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru if ( !infoForPluginId( pluginId ) ) return false; - d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); + d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); d->config->sync(); return true; diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index 77e1c264..4f9a081a 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -76,7 +76,7 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, { m_box = new TQGroupBox( 0, TQt::Vertical, text, parent ); TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout->setAlignment( TQt::AlignTop ); m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); @@ -101,11 +101,11 @@ EditorSelection::readConfig() m_editorsCombo->clear(); KTrader::OfferList editors = KTrader::self()->query( - TQString::tqfromLatin1( "Komposer/Editor" ) ); + TQString::fromLatin1( "Komposer/Editor" ) ); KTrader::OfferList::ConstIterator it; int i = 0; for ( it = editors.begin(); it != editors.end(); ++it, ++i ) { - if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) ) + if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) ) continue; TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString(); diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index 27018ce5..347db891 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -288,28 +288,28 @@ void DefaultEditor::setAlignLeft( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignLeft ); + m_textEdit->setAlignment( AlignLeft ); } void DefaultEditor::setAlignRight( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignRight ); + m_textEdit->setAlignment( AlignRight ); } void DefaultEditor::setAlignCenter( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignCenter ); + m_textEdit->setAlignment( AlignCenter ); } void DefaultEditor::setAlignJustify( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignJustify ); + m_textEdit->setAlignment( AlignJustify ); } // diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 46669108..81602872 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -376,7 +376,7 @@ KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, void KPrefsWidDate::readConfig() { - mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::tqcurrentDate() ); + mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::currentDate() ); } void KPrefsWidDate::writeConfig() diff --git a/libtdepim/krsqueezedtextlabel.cpp b/libtdepim/krsqueezedtextlabel.cpp index 968b56d2..ad674aa8 100644 --- a/libtdepim/krsqueezedtextlabel.cpp +++ b/libtdepim/krsqueezedtextlabel.cpp @@ -24,30 +24,30 @@ KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void KRSqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize KRSqueezedTextLabel::tqminimumSizeHint() const +TQSize KRSqueezedTextLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize KRSqueezedTextLabel::tqsizeHint() const +TQSize KRSqueezedTextLabel::sizeHint() const { - return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); } void KRSqueezedTextLabel::setText( const TQString &text ) { @@ -75,11 +75,11 @@ void KRSqueezedTextLabel::squeezeTextToLabel() { } } -void KRSqueezedTextLabel::tqsetAlignment( int tqalignment ) +void KRSqueezedTextLabel::setAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::tqsetAlignment(tqalignment); + TQLabel::setAlignment(tqalignment); fullText = tmpFull; } diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index 3e216e72..e48f565d 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -49,12 +49,12 @@ public: KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; /** * Overridden for internal reasons; the API remains unaffected. */ - virtual void tqsetAlignment( int ); + virtual void setAlignment( int ); public slots: void setText( const TQString & ); diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index cf02d88f..e9752377 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -773,7 +773,7 @@ TQString KScoringRule::getExpireDateString() const bool KScoringRule::isExpired() const { - return (expires.isValid() && (expires < TQDate::tqcurrentDate())); + return (expires.isValid() && (expires < TQDate::currentDate())); } @@ -925,7 +925,7 @@ KScoringRule* KScoringManager::addRule(const ScorableArticle& a, TQString group, new KScoringExpression("From","CONTAINS", a.from(),"0")); if (score) rule->addAction(new ActionSetScore(score)); - rule->setExpireDate(TQDate::tqcurrentDate().addDays(30)); + rule->setExpireDate(TQDate::currentDate().addDays(30)); addRule(rule); KScoringEditor *edit = KScoringEditor::createEditor(this); edit->setRule(rule); diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 6e520e98..18d3a029 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -91,7 +91,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) ); // occupy at much width as possible - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); setFrameStyle(Box | Sunken); setLineWidth(1); } @@ -421,7 +421,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) groupsBox = new KComboBox( false, groupB, "groupsBox" ); groupsBox->setDuplicatesEnabled(false); groupsBox->insertStringList(manager->getGroups()); - groupsBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + groupsBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); groupL->addWidget( groupsBox, 3, 1 ); // expires @@ -508,7 +508,7 @@ void RuleEditWidget::slotEditRule(const TQString& ruleName) expireEdit->setEnabled(b); expireLabel->setEnabled(b); if (b) - expireEdit->setValue(TQDate::tqcurrentDate().daysTo(rule->getExpireDate())); + expireEdit->setValue(TQDate::currentDate().daysTo(rule->getExpireDate())); else expireEdit->setValue(30); if (rule->getLinkMode() == KScoringRule::AND) { @@ -546,7 +546,7 @@ void RuleEditWidget::updateRule(KScoringRule *rule) rule->setGroups(TQStringList::split(";",groups)); bool b = expireCheck->isChecked(); if (b) - rule->setExpireDate(TQDate::tqcurrentDate().addDays(expireEdit->value())); + rule->setExpireDate(TQDate::currentDate().addDays(expireEdit->value())); else rule->setExpireDate(TQDate()); actionEditor->updateRule(rule); @@ -655,7 +655,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, TQStringList l = m->getGroups(); filterBox->insertItem(i18n("<all groups>")); filterBox->insertStringList(l); - filterBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); connect(filterBox,TQT_SIGNAL(activated(const TQString&)), this,TQT_SLOT(slotGroupFilter(const TQString&))); slotGroupFilter(i18n("<all groups>")); @@ -881,7 +881,7 @@ KScoringEditor::KScoringEditor(KScoringManager* m, connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished())); ruleLister->slotRuleSelected(0); - resize(550, tqsizeHint().height()); + resize(550, sizeHint().height()); } void KScoringEditor::setDirty() @@ -918,7 +918,7 @@ void KScoringEditor::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),tqsizeHint().height()); + resize(width(),sizeHint().height()); } void KScoringEditor::slotApply() @@ -996,7 +996,7 @@ void KScoringEditorWidgetDialog::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),tqsizeHint().height()); + resize(width(),sizeHint().height()); } //============================================================================ diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index b611e126..e3c2ce4f 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -32,7 +32,7 @@ KGroupInfo::KGroupInfo(const TQString &name, const TQString &description, bool newGroup, bool subscribed, - tqStatus status, TQString path) + Status status, TQString path) : name(name), description(description), newGroup(newGroup), subscribed(subscribed), status(status), path(path) diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h index c819701d..af8fd37f 100644 --- a/libtdepim/ksubscription.h +++ b/libtdepim/ksubscription.h @@ -45,7 +45,7 @@ class KAccount; class KDE_EXPORT KGroupInfo { public: - enum tqStatus { + enum Status { unknown, readOnly, postingAllowed, @@ -54,11 +54,11 @@ class KDE_EXPORT KGroupInfo KGroupInfo( const TQString &name, const TQString &description = TQString(), bool newGroup = false, bool subscribed = false, - tqStatus status = unknown, TQString path = TQString() ); + Status status = unknown, TQString path = TQString() ); TQString name, description; bool newGroup, subscribed; - tqStatus status; + Status status; TQString path; bool operator== (const KGroupInfo &gi2); diff --git a/libtdepim/kvcarddrag.cpp b/libtdepim/kvcarddrag.cpp index 054a424e..d8e83d89 100644 --- a/libtdepim/kvcarddrag.cpp +++ b/libtdepim/kvcarddrag.cpp @@ -68,7 +68,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQByteArray &content ) if ( !canDecode( e ) ) { return false; } - content = e->tqencodedData( vcard_mime_string ); + content = e->encodedData( vcard_mime_string ); return true; } #else @@ -77,7 +77,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQString &content ) if ( !canDecode( e ) ) { return false; } - content = TQString::fromUtf8( e->tqencodedData( vcard_mime_string ) ); + content = TQString::fromUtf8( e->encodedData( vcard_mime_string ) ); return true; } #endif @@ -88,9 +88,9 @@ bool KVCardDrag::decode( TQMimeSource *e, KABC::Addressee::List& addressees ) return false; } #if defined(KABC_VCARD_ENCODING_FIX) - addressees = KABC::VCardConverter().parseVCardsRaw( e->tqencodedData( vcard_mime_string ).data() ); + addressees = KABC::VCardConverter().parseVCardsRaw( e->encodedData( vcard_mime_string ).data() ); #else - addressees = KABC::VCardConverter().parseVCards( e->tqencodedData( vcard_mime_string ) ); + addressees = KABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) ); #endif return true; } diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index f8497f08..563728da 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -49,7 +49,7 @@ static KStaticDeleter<KConfig> configDeleter; TQString LdapObject::toString() const { - TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).tqarg( dn ); + TQString result = TQString::fromLatin1( "\ndn: %1\n" ).tqarg( dn ); for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) { TQString attr = it.key(); for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) { diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index ed1aa293..0f991686 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -160,10 +160,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->tqsizeHint(); + buttonSize = mSearchButton->sizeHint(); mSearchButton->setText( i18n( "Search" ) ); - if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) - buttonSize = mSearchButton->tqsizeHint(); + if ( buttonSize.width() < mSearchButton->sizeHint().width() ) + buttonSize = mSearchButton->sizeHint(); mSearchButton->setFixedWidth( buttonSize.width() ); mSearchButton->setDefault( true ); @@ -186,7 +186,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) mResultListView->setShowSortIndicator( true ); topLayout->addWidget( mResultListView ); - resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) ); setButtonText( User1, i18n( "Unselect All" ) ); setButtonText( User2, i18n( "Select All" ) ); diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index 399c5d3b..25a5a664 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -361,7 +361,7 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath ) TQByteArray ba = pngFile.readAll(); pngFile.close(); - return TQString::tqfromLatin1("data:image/png;base64,%1") + return TQString::fromLatin1("data:image/png;base64,%1") .tqarg( KCodecs::base64Encode( ba ).data() ); } @@ -403,14 +403,14 @@ TQString LinkLocator::getEmoticon() #if KDE_IS_VERSION( 3, 3, 91 ) const TQString iconPath = locate( "emoticons", EmotIcons::theme() + - TQString::tqfromLatin1( "/" ) + - imageName + TQString::tqfromLatin1(".png") ); + TQString::fromLatin1( "/" ) + + imageName + TQString::fromLatin1(".png") ); #else const TQString iconPath = locate( "data", - TQString::tqfromLatin1( "kopete/pics/emoticons/" )+ + TQString::fromLatin1( "kopete/pics/emoticons/" )+ EmotIcons::theme() + - TQString::tqfromLatin1( "/" ) + - imageName + TQString::tqfromLatin1(".png") ); + TQString::fromLatin1( "/" ) + + imageName + TQString::fromLatin1(".png") ); #endif const TQString dataUrl = pngToDataUrl( iconPath ); diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp index a9e2e9fa..91cd1dca 100644 --- a/libtdepim/maillistdrag.cpp +++ b/libtdepim/maillistdrag.cpp @@ -150,7 +150,7 @@ TQDataStream& operator>> ( TQDataStream &s, MailList &mailList ) bool MailListDrag::decode( TQDropEvent* e, MailList& mailList ) { - TQByteArray payload = e->tqencodedData( MailListDrag::format() ); + TQByteArray payload = e->encodedData( MailListDrag::format() ); TQDataStream buffer( payload, IO_ReadOnly ); if ( payload.size() ) { e->accept(); @@ -221,16 +221,16 @@ bool MailListDrag::provides(const char *mimeType) const return TQStoredDrag::provides(mimeType); } -TQByteArray MailListDrag::tqencodedData(const char *mimeType) const +TQByteArray MailListDrag::encodedData(const char *mimeType) const { if (TQCString(mimeType) != "message/rfc822") { - return TQStoredDrag::tqencodedData(mimeType); + return TQStoredDrag::encodedData(mimeType); } TQByteArray rc; if (_src) { MailList ml; - TQByteArray enc = TQStoredDrag::tqencodedData(format()); + TQByteArray enc = TQStoredDrag::encodedData(format()); decode(enc, ml); KProgressDialog *dlg = new KProgressDialog(0, 0, TQString(), i18n("Retrieving and storing messages..."), true); diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h index 9ec1cba2..130ec29f 100644 --- a/libtdepim/maillistdrag.h +++ b/libtdepim/maillistdrag.h @@ -103,7 +103,7 @@ public: bool provides(const char *mimeType) const; - TQByteArray tqencodedData(const char *) const; + TQByteArray encodedData(const char *) const; /* Reset the list of mail summaries */ void setMailList( MailList ); diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp index ac05d84f..338a6c42 100644 --- a/libtdepim/overlaywidget.cpp +++ b/libtdepim/overlaywidget.cpp @@ -51,9 +51,9 @@ void OverlayWidget::reposition() p.setX( mAlignWidget->width() - width() ); p.setY( -height() ); // Position in the toplevelwidget's coordinates - TQPoint pTopLevel = mAlignWidget->mapTo( tqtopLevelWidget(), p ); + TQPoint pTopLevel = mAlignWidget->mapTo( topLevelWidget(), p ); // Position in the widget's parentWidget coordinates - TQPoint pParent = parentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel ); + TQPoint pParent = parentWidget()->mapFrom( topLevelWidget(), pTopLevel ); // Move 'this' to that position. move( pParent ); } diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index bd5b594c..b5b6c6ce 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -91,7 +91,7 @@ void TransactionItemView::resizeContents( int w, int h ) TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - TQSize sz = parentWidget()->tqsizeHint(); + TQSize sz = parentWidget()->sizeHint(); int currentWidth = parentWidget()->width(); // Don't resize to sz.width() every time when it only reduces a little bit if ( currentWidth < sz.width() || currentWidth > sz.width() + 100 ) @@ -99,19 +99,19 @@ void TransactionItemView::resizeContents( int w, int h ) parentWidget()->resize( currentWidth, sz.height() ); } -TQSize TransactionItemView::tqsizeHint() const +TQSize TransactionItemView::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize TransactionItemView::tqminimumSizeHint() const +TQSize TransactionItemView::minimumSizeHint() const { int f = 2 * frameWidth(); // Make room for a vertical scrollbar in all cases, to avoid a horizontal one - int vsbExt = verticalScrollBar()->tqsizeHint().width(); - int minw = tqtopLevelWidget()->width() / 3; - int maxh = tqtopLevelWidget()->height() / 2; - TQSize sz( mBigBox->tqminimumSizeHint() ); + int vsbExt = verticalScrollBar()->sizeHint().width(); + int minw = topLevelWidget()->width() / 3; + int maxh = topLevelWidget()->height() / 2; + TQSize sz( mBigBox->minimumSizeHint() ); sz.setWidth( TQMAX( sz.width(), minw ) + f + vsbExt ); sz.setHeight( TQMIN( sz.height(), maxh ) + f ); return sz; @@ -146,7 +146,7 @@ TransactionItem::TransactionItem( TQWidget* parent, { setSpacing( 2 ); setMargin( 2 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mFrame = new TQFrame( this ); mFrame->setFrameShape( TQFrame::HLine ); @@ -160,8 +160,8 @@ TransactionItem::TransactionItem( TQWidget* parent, mItemLabel = new TQLabel( item->label(), h ); // always interpret the label text as RichText, but disable word wrapping mItemLabel->setTextFormat( TQt::RichText ); - mItemLabel->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); - h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mItemLabel->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); + h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mProgress = new TQProgressBar( 100, h ); mProgress->setProgress( item->progress() ); @@ -175,17 +175,17 @@ TransactionItem::TransactionItem( TQWidget* parent, h = new TQHBox( this ); h->setSpacing( 5 ); - h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mSSLLabel = new SSLLabel( h ); - mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - mItemtqStatus = new TQLabel( item->status(), h ); + mSSLLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mItemStatus = new TQLabel( item->status(), h ); // always interpret the status text as RichText, but disable word wrapping - mItemtqStatus->setTextFormat( TQt::RichText ); - mItemtqStatus->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); - // richtext leads to tqsizeHint acting as if wrapping was enabled though, + mItemStatus->setTextFormat( TQt::RichText ); + mItemStatus->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); + // richtext leads to sizeHint acting as if wrapping was enabled though, // so make sure we only ever have the height of one line. - mItemtqStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); - mItemtqStatus->setFixedHeight( mItemLabel->tqsizeHint().height() ); + mItemStatus->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + mItemStatus->setFixedHeight( mItemLabel->sizeHint().height() ); setCrypto( item->usesCrypto() ); if( first ) hideHLine(); } @@ -209,9 +209,9 @@ void TransactionItem::setLabel( const TQString& label ) mItemLabel->setText( label ); } -void TransactionItem::setqStatus( const TQString& status ) +void TransactionItem::seStatus( const TQString& status ) { - mItemtqStatus->setText( status ); + mItemStatus->setText( status ); } void TransactionItem::setCrypto( bool on ) @@ -258,7 +258,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c TQVBox* rightBox = new TQVBox( this ); TQToolButton* pbClose = new TQToolButton( rightBox ); pbClose->setAutoRaise(true); - pbClose->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); pbClose->setFixedSize( 16, 16 ); pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); @@ -278,8 +278,8 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); - connect ( pm, TQT_SIGNAL( progressItemtqStatus( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactiontqStatus( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), + this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), @@ -353,12 +353,12 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item, } } -void ProgressDialog::slotTransactiontqStatus( ProgressItem *item, +void ProgressDialog::slotTransactionStatus( ProgressItem *item, const TQString& status ) { if ( mTransactionsToListviewItems.contains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; - ti->setqStatus( status ); + ti->seStatus( status ); } } diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h index b2511624..e144e34e 100644 --- a/libtdepim/progressdialog.h +++ b/libtdepim/progressdialog.h @@ -63,8 +63,8 @@ public: TransactionItem* addTransactionItem( ProgressItem *item, bool first ); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; public slots: void slotLayoutFirstItem(); @@ -90,7 +90,7 @@ public: void setProgress( int progress ); void setLabel( const TQString& ); - void setqStatus( const TQString& ); + void seStatus( const TQString& ); void setCrypto( bool ); void setTotalSteps( int totalSteps ); @@ -109,7 +109,7 @@ protected: TQProgressBar* mProgress; TQPushButton* mCancelButton; TQLabel* mItemLabel; - TQLabel* mItemtqStatus; + TQLabel* mItemStatus; TQFrame* mFrame; SSLLabel* mSSLLabel; ProgressItem* mItem; @@ -133,7 +133,7 @@ void slotTransactionAdded( KPIM::ProgressItem *item ); void slotTransactionCompleted( KPIM::ProgressItem *item ); void slotTransactionCanceled( KPIM::ProgressItem *item ); void slotTransactionProgress( KPIM::ProgressItem *item, unsigned int progress ); - void slotTransactiontqStatus( KPIM::ProgressItem *item, const TQString& ); + void slotTransactionStatus( KPIM::ProgressItem *item, const TQString& ); void slotTransactionLabel( KPIM::ProgressItem *item, const TQString& ); void slotTransactionUsesCrypto( KPIM::ProgressItem *item, bool ); void slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ); diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp index 544b62ce..2c6e1a3c 100644 --- a/libtdepim/progressmanager.cpp +++ b/libtdepim/progressmanager.cpp @@ -38,7 +38,7 @@ ProgressItem::ProgressItem( ProgressItem* parent, const TQString& id, const TQString& label, const TQString& status, bool canBeCanceled, bool usesCrypto ) - :mId( id ), mLabel( label ), mtqStatus( status ), mParent( parent ), + :mId( id ), mLabel( label ), mStatus( status ), mParent( parent ), mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ), mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ), mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false ) @@ -93,7 +93,7 @@ void ProgressItem::cancel() if ( kid->canBeCanceled() ) kid->cancel(); } - setqStatus( i18n( "Aborting..." ) ); + seStatus( i18n( "Aborting..." ) ); emit progressItemCanceled( this ); } @@ -111,10 +111,10 @@ void ProgressItem::setLabel( const TQString& v ) emit progressItemLabel( this, mLabel ); } -void ProgressItem::setqStatus( const TQString& v ) +void ProgressItem::seStatus( const TQString& v ) { - mtqStatus = v; - emit progressItemtqStatus( this, mtqStatus ); + mStatus = v; + emit progressItemStatus( this, mStatus ); } void ProgressItem::setUsesCrypto( bool v ) @@ -170,8 +170,8 @@ ProgressItem* ProgressManager::createProgressItemImpl( this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), + this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h index 2e4f4ee2..bb8e864a 100644 --- a/libtdepim/progressmanager.h +++ b/libtdepim/progressmanager.h @@ -70,13 +70,13 @@ class KDE_EXPORT ProgressItem : public TQObject /** * @return The string to be used for showing this item's current status. */ - const TQString& status() const { return mtqStatus; } + const TQString& status() const { return mStatus; } /** * Set the string to be used for showing this item's current status. * @p v will be interpreted as rich text, so it might have to be escaped. * @param v The status string. */ - void setqStatus( const TQString& v ); + void seStatus( const TQString& v ); /** * @return Whether this item can be cancelled. @@ -132,7 +132,7 @@ class KDE_EXPORT ProgressItem : public TQObject * Reset the progress value of this item to 0 and the status string to * the empty string. */ - void reset() { setProgress( 0 ); setqStatus( TQString() ); mCompleted = 0; } + void reset() { setProgress( 0 ); seStatus( TQString() ); mCompleted = 0; } void cancel(); @@ -189,7 +189,7 @@ signals: * @param The updated item. * @param The new message. */ - void progressItemtqStatus( KPIM::ProgressItem*, const TQString& ); + void progressItemStatus( KPIM::ProgressItem*, const TQString& ); /** * Emitted when the label of an item changed. Should be used by * progress dialogs to update the label of an item. @@ -229,7 +229,7 @@ signals: private: TQString mId; TQString mLabel; - TQString mtqStatus; + TQString mStatus; ProgressItem* mParent; bool mCanBeCanceled; unsigned int mProgress; @@ -382,8 +382,8 @@ class KDE_EXPORT ProgressManager : public TQObject void progressItemCompleted( KPIM::ProgressItem* ); /** @see ProgressItem::progressItemCanceled() */ void progressItemCanceled( KPIM::ProgressItem* ); - /** @see ProgressItem::progressItemtqStatus() */ - void progressItemtqStatus( KPIM::ProgressItem*, const TQString& ); + /** @see ProgressItem::progressItemStatus() */ + void progressItemStatus( KPIM::ProgressItem*, const TQString& ); /** @see ProgressItem::progressItemLabel() */ void progressItemLabel( KPIM::ProgressItem*, const TQString& ); /** @see ProgressItem::progressItemUsesCrypto() */ diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 218f9617..d7ffd57c 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -37,7 +37,7 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); mMessageLength = new TQLabel( "0/160", page ); - mMessageLength->tqsetAlignment( TQt::AlignRight ); + mMessageLength->setAlignment( TQt::AlignRight ); tqlayout->addWidget( mMessageLength, 0, 2 ); mText = new TQTextEdit( page ); diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index c417905a..99a035b8 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -67,7 +67,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog box = new TQHBoxLayout( this, 0, 0 ); m_pButton = new TQPushButton( this ); - m_pButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_pButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_pButton->setPixmap( SmallIcon( "up" ) ); box->addWidget( m_pButton ); @@ -88,12 +88,12 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog stack->addWidget( m_pProgressBar, 1 ); m_pLabel = new TQLabel( TQString(), this ); - m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_pLabel->setAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); m_pButton->setMaximumHeight( fontMetrics().height() ); - setMinimumWidth( tqminimumSizeHint().width() ); + setMinimumWidth( minimumSizeHint().width() ); mode = None; setMode(); diff --git a/libtdepim/tests/test_kregexp.cpp b/libtdepim/tests/test_kregexp.cpp index 511687d0..a44e3be0 100644 --- a/libtdepim/tests/test_kregexp.cpp +++ b/libtdepim/tests/test_kregexp.cpp @@ -9,8 +9,8 @@ main() // test for http://bugs.kde.org/show_bug.cgi?id=54886 KRegExp3 reg("^"); - TQString res = reg.replace(TQString::tqfromLatin1("Fun stuff"), - TQString::tqfromLatin1("[fun] ")); + TQString res = reg.replace(TQString::fromLatin1("Fun stuff"), + TQString::fromLatin1("[fun] ")); kdDebug() << res << endl; } diff --git a/libtdepim/tests/testutf7encoder.cpp b/libtdepim/tests/testutf7encoder.cpp index 2938cd66..a28a6bf3 100644 --- a/libtdepim/tests/testutf7encoder.cpp +++ b/libtdepim/tests/testutf7encoder.cpp @@ -9,7 +9,7 @@ void main( int argc, char * argv[] ) { TQTextEncoder * enc; - TQString arg = TQString::tqfromLatin1( argv[1] ); + TQString arg = TQString::fromLatin1( argv[1] ); int len; cout << "Original string:\n" |